Russtopia/xs
2
1
Fork 0
mirror of https://gogs.blitter.com/RLabs/xs synced 2024-08-14 10:26:42 +00:00
Code Issues Projects Releases Wiki Activity

Corrected tun chan Ctl cmd comments

Browse source
This commit is contained in:
Russ Magee 2018-11-11 20:25:34 -08:00
parent 2a9e6af2ae
commit 6f1fcbbf7a
3 changed files with 8 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
hkexnet/consts.go
View file

@ -58,42 +58,24 @@ const (
CSOTunSetup // client -> server tunnel setup request (dstport) CSOTunSetup // client -> server tunnel setup request (dstport)
CSOTunSetupAck // server -> client tunnel setup ack CSOTunSetupAck // server -> client tunnel setup ack
CSOTunAccept // client -> server: tunnel client got an Accept() CSOTunAccept // client -> server: tunnel client got an Accept()
// (Do we need a CSOTunAcceptAck server->client?) CSOTunRefused // server -> client: tunnel rport connection refused
CSOTunRefused // server -> client: tunnel rport connection refused CSOTunData // packet contains tunnel data [rport:data]
CSOTunData // packet contains tunnel data [rport:data] CSOTunDisconn // server -> client: tunnel rport disconnected
CSOTunDisconn // server -> client: tunnel rport disconnected CSOTunHangup // client -> server: tunnel lport hung up
CSOTunHangup // client -> server: tunnel lport hung up
) )
// TunEndpoint.tunCtl control values - used to control workers for client or server tunnels // TunEndpoint.tunCtl control values - used to control workers for client or server tunnels
// depending on the code // depending on the code
const ( const (
TunCtl_Client_Listen = 'a' TunCtl_Client_Listen = 'a'
// [CSOTunAccept]
// status: server has ack'd tun setup request
// action: client should accept (after re-listening, if required) on lport
TunCtl_Server_Dial = 'd' // server has dialled OK, client side can accept() conns TunCtl_Server_Dial = 'd' // server has dialled OK, client side can accept() conns
// [CSOTunAccept] // [CSOTunAccept]
// status: client listen() worker accepted conn on lport // status: client wants to open tunnel to rport
// action:server side should dial() rport on client's behalf // action:server side should dial() rport on client's behalf
// -rlm 20181111 - useless as serverTun worker might in within a Read() or Write(),
// so timeouts must be used and tun.Died flag
// --
//TunCtl_Info_Hangup = 'h' // client side has hung up
// [CSOTunHangup]
// status: client side conn hung up from lport
// action:server side should hang up on rport, on client's behalf
TunCtl_Info_ConnRefused = 'r' // server side couldn't complete tunnel
// [CSOTunRefused]
// status:server side could not dial() remote side
// -rlm 20181111 - useless as clientTun worker might in within a Read() or Write(),
// so timeouts must be used and tun.Died flag
// --
//TunCtl_Info_LostConn = 'x' // server side disconnected
// [CSOTunDisconn]
// status:server side lost connection to rport
// action:client should disconnect accepted lport connection
) )
// Channel status Op byte type // Channel status Op byte type

2
hkexnet/hkextun.go
View file

@ -230,8 +230,6 @@ func (hc *Conn) StartClientTunnel(lport, rport uint16) {
delete((*hc.tuns), rport) delete((*hc.tuns), rport)
} // end for-accept } // end for-accept
} // end Listen() block } // end Listen() block
} else if cmd == 'r' {
logger.LogDebug(fmt.Sprintf("[ClientTun] Server replied TunRefused %v\n", (*hc.tuns)[rport]))
} }
} // end t.Ctl for } // end t.Ctl for
}() }()

1
hkexsh/hkexsh.go
View file

@ -346,7 +346,6 @@ func reqTunnel(hc *hkexnet.Conn, lp uint16, p string /*net.Addr*/, rp uint16) {
var bTmp bytes.Buffer var bTmp bytes.Buffer
binary.Write(&bTmp, binary.BigEndian, lp) binary.Write(&bTmp, binary.BigEndian, lp)
binary.Write(&bTmp, binary.BigEndian, rp) binary.Write(&bTmp, binary.BigEndian, rp)
fmt.Printf("bTmp:%x\n", bTmp.Bytes())
logger.LogDebug(fmt.Sprintln("[Client sending CSOTunSetup]")) logger.LogDebug(fmt.Sprintln("[Client sending CSOTunSetup]"))
hc.WritePacket(bTmp.Bytes(), hkexnet.CSOTunSetup) hc.WritePacket(bTmp.Bytes(), hkexnet.CSOTunSetup)