7x31
/
anylink
mirror of https://github.com/bjdgyc/anylink.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加调试信息

This commit is contained in:
bjdgyc 2022-11-25 16:55:56 +08:00
parent 62554cfba0
commit 4f9a1c0484
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/handler/link_cstp.go
View File

@ -15,7 +15,7 @@ import (
func LinkCstp(conn net.Conn, bufRW *bufio.ReadWriter, cSess *sessdata.ConnSession) { func LinkCstp(conn net.Conn, bufRW *bufio.ReadWriter, cSess *sessdata.ConnSession) {
base.Debug("LinkCstp connect ip:", cSess.IpAddr, "user:", cSess.Username, "rip:", conn.RemoteAddr()) base.Debug("LinkCstp connect ip:", cSess.IpAddr, "user:", cSess.Username, "rip:", conn.RemoteAddr())
defer func() { defer func() {
base.Debug("LinkCstp return", cSess.IpAddr) base.Debug("LinkCstp return", cSess.Username, cSess.IpAddr)
_ = conn.Close() _ = conn.Close()
cSess.Close() cSess.Close()
}() }()
@ -34,14 +34,14 @@ func LinkCstp(conn net.Conn, bufRW *bufio.ReadWriter, cSess *sessdata.ConnSessio
// 设置超时限制 // 设置超时限制
err = conn.SetReadDeadline(utils.NowSec().Add(dead)) err = conn.SetReadDeadline(utils.NowSec().Add(dead))
if err != nil { if err != nil {
base.Error("SetDeadline: ", err) base.Error("SetDeadline: ", cSess.Username, err)
return return
} }
// hdata := make([]byte, BufferSize) // hdata := make([]byte, BufferSize)
pl := getPayload() pl := getPayload()
n, err = bufRW.Read(pl.Data) n, err = bufRW.Read(pl.Data)
if err != nil { if err != nil {
base.Error("read hdata: ", err) base.Error("read hdata: ", cSess.Username, err)
return return
} }
@ -57,7 +57,7 @@ func LinkCstp(conn net.Conn, bufRW *bufio.ReadWriter, cSess *sessdata.ConnSessio
// base.Debug("recv keepalive", cSess.IpAddr) // base.Debug("recv keepalive", cSess.IpAddr)
case 0x05: // DISCONNECT case 0x05: // DISCONNECT
cSess.UserLogoutCode = dbdata.UserLogoutClient cSess.UserLogoutCode = dbdata.UserLogoutClient
base.Debug("DISCONNECT", cSess.IpAddr) base.Debug("DISCONNECT", cSess.Username, cSess.IpAddr)
return return
case 0x03: // DPD-REQ case 0x03: // DPD-REQ
// base.Debug("recv DPD-REQ", cSess.IpAddr) // base.Debug("recv DPD-REQ", cSess.IpAddr)
@ -72,7 +72,7 @@ func LinkCstp(conn net.Conn, bufRW *bufio.ReadWriter, cSess *sessdata.ConnSessio
dataLen = binary.BigEndian.Uint16(pl.Data[4:6]) // 4,5 dataLen = binary.BigEndian.Uint16(pl.Data[4:6]) // 4,5
// 修复 cstp 数据长度溢出报错 // 修复 cstp 数据长度溢出报错
if 8+dataLen > BufferSize { if 8+dataLen > BufferSize {
base.Error("recv error dataLen", dataLen) base.Error("recv error dataLen", cSess.Username, dataLen)
continue continue
} }
// 去除数据头 // 去除数据头
@ -89,7 +89,7 @@ func LinkCstp(conn net.Conn, bufRW *bufio.ReadWriter, cSess *sessdata.ConnSessio
func cstpWrite(conn net.Conn, bufRW *bufio.ReadWriter, cSess *sessdata.ConnSession) { func cstpWrite(conn net.Conn, bufRW *bufio.ReadWriter, cSess *sessdata.ConnSession) {
defer func() { defer func() {
base.Debug("cstpWrite return", cSess.IpAddr) base.Debug("cstpWrite return", cSess.Username, cSess.IpAddr)
_ = conn.Close() _ = conn.Close()
cSess.Close() cSess.Close()
}() }()
@ -130,7 +130,7 @@ func cstpWrite(conn net.Conn, bufRW *bufio.ReadWriter, cSess *sessdata.ConnSessi
n, err = conn.Write(pl.Data) n, err = conn.Write(pl.Data)
if err != nil { if err != nil {
base.Error("write err", err) base.Error("write err", cSess.Username, err)
return return
} }

12
server/handler/link_dtls.go
View File

@ -20,7 +20,7 @@ func LinkDtls(conn net.Conn, cSess *sessdata.ConnSession) {
} }
defer func() { defer func() {
base.Debug("LinkDtls return", cSess.IpAddr) base.Debug("LinkDtls return", cSess.Username, cSess.IpAddr)
_ = conn.Close() _ = conn.Close()
dSess.Close() dSess.Close()
}() }()
@ -36,14 +36,14 @@ func LinkDtls(conn net.Conn, cSess *sessdata.ConnSession) {
for { for {
err = conn.SetReadDeadline(utils.NowSec().Add(dead)) err = conn.SetReadDeadline(utils.NowSec().Add(dead))
if err != nil { if err != nil {
base.Error("SetDeadline: ", err) base.Error("SetDeadline: ", cSess.Username, err)
return return
} }
pl := getPayload() pl := getPayload()
n, err = conn.Read(pl.Data) n, err = conn.Read(pl.Data)
if err != nil { if err != nil {
base.Error("read hdata: ", err) base.Error("read hdata: ", cSess.Username, err)
return return
} }
@ -59,7 +59,7 @@ func LinkDtls(conn net.Conn, cSess *sessdata.ConnSession) {
// base.Debug("recv keepalive", cSess.IpAddr) // base.Debug("recv keepalive", cSess.IpAddr)
case 0x05: // DISCONNECT case 0x05: // DISCONNECT
cSess.UserLogoutCode = dbdata.UserLogoutClient cSess.UserLogoutCode = dbdata.UserLogoutClient
base.Debug("DISCONNECT DTLS", cSess.IpAddr) base.Debug("DISCONNECT DTLS", cSess.Username, cSess.IpAddr)
return return
case 0x03: // DPD-REQ case 0x03: // DPD-REQ
// base.Debug("recv DPD-REQ", cSess.IpAddr) // base.Debug("recv DPD-REQ", cSess.IpAddr)
@ -85,7 +85,7 @@ func LinkDtls(conn net.Conn, cSess *sessdata.ConnSession) {
func dtlsWrite(conn net.Conn, dSess *sessdata.DtlsSession, cSess *sessdata.ConnSession) { func dtlsWrite(conn net.Conn, dSess *sessdata.DtlsSession, cSess *sessdata.ConnSession) {
defer func() { defer func() {
base.Debug("dtlsWrite return", cSess.IpAddr) base.Debug("dtlsWrite return", cSess.Username, cSess.IpAddr)
_ = conn.Close() _ = conn.Close()
dSess.Close() dSess.Close()
}() }()
@ -122,7 +122,7 @@ func dtlsWrite(conn net.Conn, dSess *sessdata.DtlsSession, cSess *sessdata.ConnS
} }
n, err := conn.Write(pl.Data) n, err := conn.Write(pl.Data)
if err != nil { if err != nil {
base.Error("write err", err) base.Error("write err", cSess.Username, err)
return return
} }