originalmk/archat-server
1
0
Fork 0
mirror of https://github.com/originalmk/archat-server.git synced 2024-11-20 09:38:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'conncheck' into acceptallorigins

Browse Source
This commit is contained in:
Maciej Krzyżanowski 2024-06-04 10:43:22 +02:00
commit 3ef2a3e99c
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
client/client.go
View File

@ -24,7 +24,7 @@ import (
type InitiationInfo struct { type InitiationInfo struct {
otherSideNick string otherSideNick string
punchLaddrUsed string punchLaddrUsed *net.UDPAddr
} }
type Context struct { type Context struct {
@ -145,13 +145,23 @@ func (cliCtx *Context) handleStartChatD(reqFrame cm.RFrame) (res cm.Response, er
return nil, nil return nil, nil
} }
conn, err := net.Dial("udp", cliCtx.settings.UdpAddr) raddr, err := net.ResolveUDPAddr("udp", cliCtx.settings.UdpAddr)
if err != nil {
logger.Error(err)
return nil, nil
}
conn, err := net.DialUDP("udp", nil, raddr)
defer func() {
conn.Close()
logger.Debug("UDP 'connection' closed", "laddr", conn.LocalAddr())
}()
if err != nil { if err != nil {
logger.Error("error udp dialing for punch", err) logger.Error("error udp dialing for punch", err)
return nil, nil return nil, nil
} }
cliCtx.initiations[idx].punchLaddrUsed = conn.LocalAddr().String() cliCtx.initiations[idx].punchLaddrUsed, _ = conn.LocalAddr().(*net.UDPAddr)
enc := json.NewEncoder(conn) enc := json.NewEncoder(conn)
err = enc.Encode(cm.PunchRequest{PunchCode: startChatDReq.PunchCode}) err = enc.Encode(cm.PunchRequest{PunchCode: startChatDReq.PunchCode})
@ -187,15 +197,6 @@ func (ctx *Context) handleChatStartFinish(reqFrame common.RFrame) (res common.Re
relatedInitiation := ctx.initiations[idx] relatedInitiation := ctx.initiations[idx]
logger.Debug("punch laddr used", "laddr", relatedInitiation.punchLaddrUsed) logger.Debug("punch laddr used", "laddr", relatedInitiation.punchLaddrUsed)
logger.Debug("resolving udp addrs")
laddr, err := net.ResolveUDPAddr("udp", relatedInitiation.punchLaddrUsed)
if err != nil {
logger.Error(err)
return nil, nil
}
logger.Debug("resolved laddr", "laddr", laddr.String())
raddr, err := net.ResolveUDPAddr("udp", startChatFinishReq.OtherSideAddress) raddr, err := net.ResolveUDPAddr("udp", startChatFinishReq.OtherSideAddress)
if err != nil { if err != nil {
logger.Error(err) logger.Error(err)
@ -203,31 +204,37 @@ func (ctx *Context) handleChatStartFinish(reqFrame common.RFrame) (res common.Re
} }
logger.Debug("resolved raddr", "raddr", raddr.String()) logger.Debug("resolved raddr", "raddr", raddr.String())
logger.Debug("dialing udp") logger.Debug("dialing udp")
conn, err := net.DialUDP("udp", laddr, raddr)
conn, err := net.DialUDP("udp", relatedInitiation.punchLaddrUsed, raddr)
if err != nil { if err != nil {
logger.Error(err) logger.Error(err)
return nil, nil return nil, nil
} }
log.Debugf("dialed udp L%s<->R%s", laddr.String(), raddr.String())
for i := 0; i < 3; i++ { logger.Debugf("dialed udp L%s<->R%s", relatedInitiation.punchLaddrUsed.String(), raddr.String())
log.Debugf("writing Hello to other peer")
go func() {
logger.Debug("waiting for message from other peer")
bb := make([]byte, 1024)
conn.SetDeadline(time.Now().Add(time.Second * 5))
n, _, err := conn.ReadFrom(bb)
if err != nil {
logger.Error(err)
return
}
bb = bb[:n]
logger.Debug("got info from other peer", "info", string(bb))
}()
for i := 0; i < 5; i++ {
logger.Debugf("writing Hello to other peer")
_, err = conn.Write([]byte("Hello")) _, err = conn.Write([]byte("Hello"))
if err != nil { if err != nil {
logger.Error(err) logger.Error(err)
return nil, nil return nil, nil
} }
log.Debug("waiting for message from other peer")
bb := make([]byte, 1024)
//conn.SetDeadline(time.Now().Add(time.Second * 5))
n, _, err := conn.ReadFrom(bb)
if err != nil {
logger.Error(err)
return nil, nil
}
bb = bb[:n]
logger.Debug("got info from other peer", "info", string(bb))
time.Sleep(time.Second) time.Sleep(time.Second)
} }