go-i2p/go-sam-go
1
0
Fork 0
mirror of https://github.com/go-i2p/go-sam-go.git synced 2025-07-06 23:58:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

eliminate a bunch of broken crap and start over from common

Browse Source
This commit is contained in:
eyedeekay
2025-05-27 18:25:13 -04:00
parent 479f2d20cc
commit d3f085b2c8
45 changed files with 190 additions and 3131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
stream/session.go
View File

@ -11,49 +11,49 @@ import (
// Read reads data from the stream.
func (s *StreamSession) Read(buf []byte) (int, error) {
return s.Conn.Read(buf)
return s.SAM().Conn.Read(buf)
}
// Write sends data over the stream.
func (s *StreamSession) Write(data []byte) (int, error) {
return s.Conn.Write(data)
return s.SAM().Conn.Write(data)
}
func (s *StreamSession) SetDeadline(t time.Time) error {
log.WithField("deadline", t).Debug("Setting deadline for StreamSession")
return s.Conn.SetDeadline(t)
return s.SAM().Conn.SetDeadline(t)
}
func (s *StreamSession) SetReadDeadline(t time.Time) error {
log.WithField("readDeadline", t).Debug("Setting read deadline for StreamSession")
return s.Conn.SetReadDeadline(t)
return s.SAM().Conn.SetReadDeadline(t)
}
func (s *StreamSession) SetWriteDeadline(t time.Time) error {
log.WithField("writeDeadline", t).Debug("Setting write deadline for StreamSession")
return s.Conn.SetWriteDeadline(t)
return s.SAM().Conn.SetWriteDeadline(t)
}
func (s *StreamSession) From() string {
return s.Fromport
return s.SAM().Fromport
}
func (s *StreamSession) To() string {
return s.Toport
return s.SAM().Toport
}
func (s *StreamSession) SignatureType() string {
return s.SignatureType()
return s.SAM().SignatureType()
}
func (s *StreamSession) Close() error {
log.WithField("id", s.ID()).Debug("Closing StreamSession")
return s.Conn.Close()
log.WithField("id", s.SAM().ID()).Debug("Closing StreamSession")
return s.SAM().Conn.Close()
}
// Returns the I2P destination (the address) of the stream session
func (s *StreamSession) Addr() i2pkeys.I2PAddr {
return s.Addr()
return s.Keys().Address
}
func (s *StreamSession) LocalAddr() net.Addr {
@ -62,13 +62,13 @@ func (s *StreamSession) LocalAddr() net.Addr {
// Returns the keys associated with the stream session
func (s *StreamSession) Keys() i2pkeys.I2PKeys {
return *s.DestinationKeys
return *s.SAM().DestinationKeys
}
// lookup name, convenience function
func (s *StreamSession) Lookup(name string) (i2pkeys.I2PAddr, error) {
log.WithField("name", name).Debug("Looking up address")
sam, err := common.NewSAM(s.Sam())
sam, err := common.NewSAM(s.SAM().Sam())
if err == nil {
addr, err := sam.Lookup(name)
defer sam.Close()