tux/trok
1
0
Fork 0
mirror of https://github.com/tuxdotrs/trok.git synced 2025-12-15 18:40:06 +05:30
Code Issues Packages Projects Releases Wiki Activity

fix(server): tcp tunnel missing initial bytes

Browse Source
This commit is contained in:
tux
2025-12-12 02:18:26 +05:30
parent b1e8faab7c
commit cb31ac762c
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/lib/protocol.go
View File

@@ -29,6 +29,10 @@ func InitProtocolHandler(conn net.Conn) *ProtocolHandler {
}
}
func (p *ProtocolHandler) Reader() *bufio.Reader {
return p.reader
}
func (p *ProtocolHandler) ReadMessage() (*Message, error) {
data, err := p.reader.ReadString('\n')
if err != nil {

10
internal/server/trok.go
View File

@@ -67,7 +67,7 @@ func (t *Trok) ControlConnHandler(conn net.Conn) {
t.handleCMDHELO(p, m)
case "ACPT":
t.handleCMDACPT(conn, m)
t.handleCMDACPT(p, conn, m)
default:
log.Info().Msgf("invalid command")
@@ -101,7 +101,7 @@ func (t *Trok) handleCMDHELO(p *lib.ProtocolHandler, m *lib.Message) {
}
}
func (t *Trok) handleCMDACPT(conn net.Conn, m *lib.Message) {
func (t *Trok) handleCMDACPT(p *lib.ProtocolHandler, conn net.Conn, m *lib.Message) {
log.Info().Msgf("[CMD] %s [ARG] %s", m.CMD, m.ARG)
t.mutex.Lock()
@@ -117,7 +117,7 @@ func (t *Trok) handleCMDACPT(conn net.Conn, m *lib.Message) {
return
}
t.Bind(pc.conn, conn)
t.Bind(pc.conn, conn, p.Reader())
}
func (t *Trok) PublicConnHandler(ln net.Listener, uidChan chan<- string) {
@@ -144,9 +144,9 @@ func (t *Trok) PublicConnHandler(ln net.Listener, uidChan chan<- string) {
}
}
func (t *Trok) Bind(src, dst net.Conn) {
func (t *Trok) Bind(src net.Conn, dst net.Conn, dstReader io.Reader) {
defer src.Close()
defer dst.Close()
go io.Copy(src, dst)
go io.Copy(src, dstReader)
io.Copy(dst, src)
}