idk/Go_I2p
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

more merge conflicts

Browse Source
This commit is contained in:
eyedeekay
2024-10-03 22:45:33 -04:00
parent 2b18b2941d
commit 3a51a1229e
3 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/transport/ntcp/session.go
View File

@@ -1,11 +1,5 @@
package ntcp
import "github.com/go-i2p/go-i2p/lib/transport/noise"
// Session implements TransportSession
// An established transport session
<<<<<<< HEAD
type Session noise.NoiseSession
=======
type Session struct{}
>>>>>>> 9f4154ff457f962bc3b5d77e266b5d87b4de3742

7
lib/transport/ntcp/transport.go
View File

@@ -1,7 +1,5 @@
package ntcp
import "github.com/go-i2p/go-i2p/lib/transport/noise"
/**
* https://geti2p.net/spec/ntcp2
**/
@@ -12,10 +10,5 @@ const (
NTCP_MESSAGE_MAX_SIZE = 65537
)
<<<<<<< HEAD
// NTCPTransport is an ntcp transport implementing transport.Transport interface
type NTCPTransport noise.NoiseTransport
=======
// Transport is an ntcp transport implementing transport.Transport interface
type Transport struct{}
>>>>>>> 9f4154ff457f962bc3b5d77e266b5d87b4de3742