Compare commits

...

4 Commits

Author SHA1 Message Date
a01df2e905 only log client IP (remove port)
log game server address
2024-03-08 02:42:01 +00:00
d8015c921c add logrus dependency 2024-03-08 02:29:40 +00:00
a513c7ecc6 add new env var Q3RCON_HOST 2024-03-08 02:29:27 +00:00
6f49cc5b63 log rcon commands level INFO 2024-03-08 02:29:01 +00:00
5 changed files with 41 additions and 6 deletions

View File

@ -15,22 +15,33 @@ func start(proxy string) {
return x[0], x[1] return x[0], x[1]
}() }()
c, err := udpproxy.New(fmt.Sprintf("0.0.0.0:%s", port), fmt.Sprintf("127.0.0.1:%s", target)) c, err := udpproxy.New(fmt.Sprintf("%s:%s", host, port), fmt.Sprintf("127.0.0.1:%s", target))
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
log.Printf("q3rcon-proxy initialized: [proxy] (0.0.0.0:%s) [target] (127.0.0.1:%s)", port, target) log.Printf("q3rcon-proxy initialized: [proxy] (%s:%s) [target] (127.0.0.1:%s)", host, port, target)
log.Fatal(c.ListenAndServe()) log.Fatal(c.ListenAndServe())
} }
func main() { var (
proxies := os.Getenv("Q3RCON_PROXY") proxies, host string
)
func init() {
proxies = os.Getenv("Q3RCON_PROXY")
if proxies == "" { if proxies == "" {
log.Fatal("env Q3RCON_PROXY required") log.Fatal("env Q3RCON_PROXY required")
} }
host = os.Getenv("Q3RCON_HOST")
if host == "" {
host = "0.0.0.0"
}
}
func main() {
for _, proxy := range strings.Split(proxies, ";") { for _, proxy := range strings.Split(proxies, ";") {
go start(proxy) go start(proxy)
} }

4
go.mod
View File

@ -1,3 +1,7 @@
module github.com/onyx-and-iris/q3rcon-proxy module github.com/onyx-and-iris/q3rcon-proxy
go 1.18 go 1.18
require github.com/sirupsen/logrus v1.9.3
require golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect

15
go.sum
View File

@ -0,0 +1,15 @@
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

View File

@ -1,9 +1,11 @@
package udpproxy package udpproxy
import ( import (
"log"
"net" "net"
"strings"
"time" "time"
log "github.com/sirupsen/logrus"
) )
type Session struct { type Session struct {
@ -62,6 +64,8 @@ func (s *Session) proxyTo(buf []byte) error {
log.Println(err) log.Println(err)
return err return err
} }
parts := strings.Split(string(buf), " ")
log.Info("From [", s.caddr.IP, "] To [", s.serverConn.RemoteAddr().String(), "] Command: ", strings.Join(parts[2:], " "))
return nil return nil
} }

View File

@ -1,10 +1,11 @@
package udpproxy package udpproxy
import ( import (
"log"
"net" "net"
"sync" "sync"
"time" "time"
log "github.com/sirupsen/logrus"
) )
type Client struct { type Client struct {