piece out sam3

This commit is contained in:
eyedeekay
2025-02-17 21:48:51 -05:00
parent 5a1b4e14d9
commit c1d7c642b4
11 changed files with 25 additions and 23 deletions

View File

@ -98,7 +98,7 @@ func (sam *SAM) EnsureKeyfile(fname string) (keys i2pkeys.I2PKeys, err error) {
sam.SAMEmit.I2PConfig.DestinationKeys = &keys sam.SAMEmit.I2PConfig.DestinationKeys = &keys
// save keys // save keys
var f io.WriteCloser var f io.WriteCloser
f, err = os.OpenFile(fname, os.O_WRONLY|os.O_CREATE, 0600) f, err = os.OpenFile(fname, os.O_WRONLY|os.O_CREATE, 0o600)
if err == nil { if err == nil {
err = i2pkeys.StoreKeysIncompat(keys, f) err = i2pkeys.StoreKeysIncompat(keys, f)
f.Close() f.Close()

View File

@ -1,7 +1,9 @@
package common package common
const DEFAULT_SAM_MIN = "3.1" const (
const DEFAULT_SAM_MAX = "3.3" DEFAULT_SAM_MIN = "3.1"
DEFAULT_SAM_MAX = "3.3"
)
const ( const (
SESSION_OK = "SESSION STATUS RESULT=OK DESTINATION=" SESSION_OK = "SESSION STATUS RESULT=OK DESTINATION="

View File

@ -17,7 +17,7 @@ func (s *DatagramSession) B32() string {
return b32 return b32
} }
func (s *DatagramSession) Dial(net string, addr string) (*DatagramSession, error) { func (s *DatagramSession) Dial(net, addr string) (*DatagramSession, error) {
log.WithFields(logrus.Fields{ log.WithFields(logrus.Fields{
"net": net, "net": net,
"addr": addr, "addr": addr,

View File

@ -41,7 +41,7 @@ func (sam *PrimarySession) DialTCP(network string, laddr, raddr net.Addr) (net.C
return ts.Dial(network, raddr.String()) return ts.Dial(network, raddr.String())
} }
func (sam *PrimarySession) DialTCPI2P(network string, laddr, raddr string) (net.Conn, error) { func (sam *PrimarySession) DialTCPI2P(network, laddr, raddr string) (net.Conn, error) {
log.WithFields(logrus.Fields{"network": network, "laddr": laddr, "raddr": raddr}).Debug("DialTCPI2P() called") log.WithFields(logrus.Fields{"network": network, "laddr": laddr, "raddr": raddr}).Debug("DialTCPI2P() called")
ts, ok := sam.stsess[network+raddr[0:4]] ts, ok := sam.stsess[network+raddr[0:4]]
var err error var err error