onyx_online/q3rcon-proxy
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/q3rcon-proxy.git synced 2025-01-18 08:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

isQueryResponsePacket() and isValidResponsePacket() added

Browse Source 
fixes bug relaying query responses
This commit is contained in:
onyx-and-iris 2024-03-20 21:03:37 +00:00
parent ca33a6a390
commit 725e6cfb3d
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/udpproxy/session.go
View File

@ -34,22 +34,30 @@ func newSession(caddr *net.UDPAddr, raddr *net.UDPAddr, proxyConn *net.UDPConn)
return session, nil
}
func (s *Session) isRconPacket(buf []byte) bool {
func (s *Session) isRconRequestPacket(buf []byte) bool {
return string(buf[:8]) == "\xff\xff\xff\xffrcon"
}
func (s *Session) isQueryPacket(buf []byte) bool {
func (s *Session) isQueryRequestPacket(buf []byte) bool {
return string(buf[:13]) == "\xff\xff\xff\xffgetstatus" || string(buf[:11]) == "\xff\xff\xff\xffgetinfo"
}
func (s *Session) isValidPacket(buf []byte) bool {
return s.isRconPacket(buf) || s.isQueryPacket(buf)
func (s *Session) isValidRequestPacket(buf []byte) bool {
return s.isRconRequestPacket(buf) || s.isQueryRequestPacket(buf)
}
func (s *Session) isResponsePacket(buf []byte) bool {
func (s *Session) isRconResponsePacket(buf []byte) bool {
return string(buf[:9]) == "\xff\xff\xff\xffprint"
}
func (s *Session) isQueryResponsePacket(buf []byte) bool {
return string(buf[:18]) == "\xff\xff\xff\xffstatusResponse" || string(buf[:16]) == "\xff\xff\xff\xffinfoResponse"
}
func (s *Session) isValidResponsePacket(buf []byte) bool {
return s.isRconResponsePacket(buf) || s.isQueryResponsePacket(buf)
}
func (s *Session) listen() error {
for {
buf := make([]byte, 2048)
@ -64,8 +72,8 @@ func (s *Session) listen() error {
}
func (s *Session) proxyFrom(buf []byte) error {
if !s.isResponsePacket(buf) {
err := errors.New("not a response packet")
if !s.isValidResponsePacket(buf) {
err := errors.New("not a rcon or query response packet")
log.Error(err.Error())
return err
}
@ -77,7 +85,7 @@ func (s *Session) proxyFrom(buf []byte) error {
return err
}
if log.GetLevel() == log.DebugLevel {
if s.isRconResponsePacket(buf) {
parts := strings.Split(string(buf[10:]), " ")
log.Debugf("Response: %s", strings.Join(parts, " "))
}
@ -86,8 +94,8 @@ func (s *Session) proxyFrom(buf []byte) error {
}
func (s *Session) proxyTo(buf []byte) error {
if !s.isValidPacket(buf) {
err := errors.New("not a rcon or query packet")
if !s.isValidRequestPacket(buf) {
err := errors.New("not a rcon or query request packet")
log.Error(err.Error())
return err
}
@ -99,7 +107,7 @@ func (s *Session) proxyTo(buf []byte) error {
return err
}
if s.isRconPacket(buf) {
if s.isRconRequestPacket(buf) {
parts := strings.Split(string(buf), " ")
log.Infof("From [%s] To [%s] Command: %s", s.caddr.IP.String(), s.serverConn.RemoteAddr().String(), strings.Join(parts[2:], " "))
}