reuse single buffers

split up long conditionals

pkg/udpproxy/session.go

@@ -29,6 +29,7 @@ func newSession(caddr *net.UDPAddr, raddr *net.UDPAddr, proxyConn *net.UDPConn)
 		proxyConn:  proxyConn,
 		caddr:      caddr,
 		updateTime: time.Now(),
+		validator:  newValidator(),
 	}
 
 	go session.listen()
@@ -37,8 +38,8 @@ func newSession(caddr *net.UDPAddr, raddr *net.UDPAddr, proxyConn *net.UDPConn)
 }
 
 func (s *session) listen() error {
-	for {
 	buf := make([]byte, 2048)
+	for {
 		n, err := s.serverConn.Read(buf)
 		if err != nil {
 			log.Error(err)
@@ -64,8 +65,12 @@ func (s *session) proxyFrom(buf []byte) error {
 	}
 
 	if s.isRconResponsePacket(buf) {
+		if s.isBadRconResponse(buf) {
+			log.Infof("Response: Bad rcon from %s", s.caddr.IP)
+		} else {
 			log.Debugf("Response: %s", string(buf[10:]))
 		}
+	}
 
 	return nil
 }
@@ -85,8 +90,8 @@ func (s *session) proxyTo(buf []byte) error {
 	}
 
 	if s.isRconRequestPacket(buf) {
-		parts := strings.Split(string(buf), " ")
-		log.Infof("From [%s] To [%s] Command: %s", s.caddr.IP, s.serverConn.RemoteAddr(), strings.Join(parts[2:], " "))
+		parts := strings.SplitN(string(buf), " ", 3)
+		log.Infof("From [%s] To [%s] Command: %s", s.caddr.IP, s.serverConn.RemoteAddr(), parts[len(parts)-1])
 	}
 
 	return nil

pkg/udpproxy/udpproxy.go

@@ -46,8 +46,8 @@ func (c *Client) ListenAndServe() error {
 
 	go c.pruneSessions()
 
-	for {
 	buf := make([]byte, 2048)
+	for {
 		n, caddr, err := c.proxyConn.ReadFromUDP(buf)
 		if err != nil {
 			log.Error(err)

pkg/udpproxy/validator.go

@@ -1,14 +1,40 @@
 package udpproxy
 
+import "bytes"
+
 type validator struct {
+	rconRequestHeader       []byte
+	getstatusRequestHeader  []byte
+	getinfoRequestHeader    []byte
+	rconResponseHeader      []byte
+	getstatusResponseHeader []byte
+	getinfoResponseHeader   []byte
+	badRconIdentifier       []byte
+}
+
+func newValidator() validator {
+	v := validator{}
+	v.rconRequestHeader = []byte("\xff\xff\xff\xffrcon")
+	v.getstatusRequestHeader = []byte("\xff\xff\xff\xffgetstatus")
+	v.getinfoRequestHeader = []byte("\xff\xff\xff\xffgetinfo")
+	v.rconResponseHeader = []byte("\xff\xff\xff\xffprint\n")
+	v.getstatusResponseHeader = []byte("\xff\xff\xff\xffstatusResponse\n")
+	v.getinfoResponseHeader = []byte("\xff\xff\xff\xffinfoResponse\n")
+	v.badRconIdentifier = []byte("Bad rcon")
+	return v
+}
+
+func (v *validator) compare(buf, c []byte) bool {
+	return bytes.Equal(buf[:len(c)], c)
 }
 
 func (v *validator) isRconRequestPacket(buf []byte) bool {
-	return string(buf[:8]) == "\xff\xff\xff\xffrcon"
+	return v.compare(buf, v.rconRequestHeader)
 }
 
 func (v *validator) isQueryRequestPacket(buf []byte) bool {
-	return string(buf[:13]) == "\xff\xff\xff\xffgetstatus" || string(buf[:11]) == "\xff\xff\xff\xffgetinfo"
+	return v.compare(buf, v.getstatusRequestHeader) ||
+		v.compare(buf, v.getinfoRequestHeader)
 }
 
 func (v *validator) isValidRequestPacket(buf []byte) bool {
@@ -16,13 +42,18 @@ func (v *validator) isValidRequestPacket(buf []byte) bool {
 }
 
 func (v *validator) isRconResponsePacket(buf []byte) bool {
-	return string(buf[:9]) == "\xff\xff\xff\xffprint"
+	return v.compare(buf, v.rconResponseHeader)
 }
 
 func (v *validator) isQueryResponsePacket(buf []byte) bool {
-	return string(buf[:18]) == "\xff\xff\xff\xffstatusResponse" || string(buf[:16]) == "\xff\xff\xff\xffinfoResponse"
+	return v.compare(buf, v.getstatusResponseHeader) ||
+		v.compare(buf, v.getinfoResponseHeader)
 }
 
 func (v *validator) isValidResponsePacket(buf []byte) bool {
 	return v.isRconResponsePacket(buf) || v.isQueryResponsePacket(buf)
 }
+
+func (v *validator) isBadRconResponse(buf []byte) bool {
+	return v.compare(buf[len(v.rconResponseHeader):], v.badRconIdentifier)
+}