justin/openttd-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

go fmt and support monthly/yearly commands

Browse Source
This commit is contained in:
Justin Hawkins 2020-11-19 15:13:30 +10:30
parent 8abf5c7af3
commit 2a715ac172
1 changed files with 68 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
pkg/admin.go
View File

@ -14,12 +14,11 @@ import (
"time" "time"
) )
type OpenTTDServer struct { type OpenTTDServer struct {
connection net.Conn connection net.Conn
rconDaily []string rconDaily []string
rconMonthly []string rconMonthly []string
rconYearly []string rconYearly []string
} }
const ( const (
@ -61,7 +60,7 @@ const (
adminPacketServerRCON_END = 125 ///< The server indicates that the remote console command has completed. adminPacketServerRCON_END = 125 ///< The server indicates that the remote console command has completed.
adminPacketServerPONG = 126 ///< The server replies to a ping request from the admin. adminPacketServerPONG = 126 ///< The server replies to a ping request from the admin.
invalidAdminPacket = 255 ///< An invalid marker for admin packets. invalidAdminPacket = 255 ///< An invalid marker for admin packets.
adminUpdateDATE = 0 ///< Updates about the date of the game. adminUpdateDATE = 0 ///< Updates about the date of the game.
adminUpdateCLIENT_INFO = 1 ///< Updates about the information of clients. adminUpdateCLIENT_INFO = 1 ///< Updates about the information of clients.
@ -87,24 +86,24 @@ const (
// var conn int // var conn int
// Connect to the OpenTTD server on the admin port // Connect to the OpenTTD server on the admin port
func ( server *OpenTTDServer ) Connect(host string, port int, password string, botName string, botVersion string) { func (server *OpenTTDServer) Connect(host string, port int, password string, botName string, botVersion string) {
// fmt.Printf("array: %v (%T) %d\n", toSend, toSend, size) // fmt.Printf("array: %v (%T) %d\n", toSend, toSend, size)
connectString := fmt.Sprintf("%s:%d", host, port) connectString := fmt.Sprintf("%s:%d", host, port)
conn, err := net.Dial("tcp", connectString) conn, err := net.Dial("tcp", connectString)
if err != nil { if err != nil {
fmt.Printf("%v", err) fmt.Printf("%v", err)
panic(err) panic(err)
} }
server.connection = conn server.connection = conn
// start listening // start listening
go server.listenSocket() go server.listenSocket()
// login // login
var toSend []byte var toSend []byte
toSend = append(toSend[:], adminPacketAdminJOIN) // type toSend = append(toSend[:], adminPacketAdminJOIN) // type
toSend = append(toSend[:], []byte(password)...) // password toSend = append(toSend[:], []byte(password)...) // password
toSend = append(toSend[:], 0x0) toSend = append(toSend[:], 0x0)
toSend = append(toSend[:], []byte(botName)...) // client name toSend = append(toSend[:], []byte(botName)...) // client name
toSend = append(toSend[:], 0x0) toSend = append(toSend[:], 0x0)
@ -115,14 +114,14 @@ func ( server *OpenTTDServer ) Connect(host string, port int, password string, b
toSend = append([]byte{byte(size), 0x0}, toSend[:]...) toSend = append([]byte{byte(size), 0x0}, toSend[:]...)
server.connection.Write(toSend) server.connection.Write(toSend)
// register for daily updates // register for daily updates
updateDateCmd := make([]byte, 2) updateDateCmd := make([]byte, 2)
binary.LittleEndian.PutUint16(updateDateCmd,adminUpdateDATE) binary.LittleEndian.PutUint16(updateDateCmd, adminUpdateDATE)
updateDateDaily := make([]byte, 2) updateDateDaily := make([]byte, 2)
binary.LittleEndian.PutUint16(updateDateDaily,adminFrequencyDAILY) binary.LittleEndian.PutUint16(updateDateDaily, adminFrequencyDAILY)
toSend = []byte{} toSend = []byte{}
toSend = append(toSend, updateDateCmd...) toSend = append(toSend, updateDateCmd...)
toSend = append(toSend, updateDateDaily...) toSend = append(toSend, updateDateDaily...)
server.sendSocket(adminPacketAdminUPDATE_FREQUENCY, toSend) server.sendSocket(adminPacketAdminUPDATE_FREQUENCY, toSend)
@ -140,35 +139,51 @@ func ( server *OpenTTDServer ) Connect(host string, port int, password string, b
} }
// RegisterDateChange to send a command periodically // RegisterDateChange to send a command periodically
func ( server *OpenTTDServer ) RegisterDateChange (period string, command string) { func (server *OpenTTDServer) RegisterDateChange(period string, command string) {
if period == "daily" { if period == "daily" {
server.rconDaily = append(server.rconDaily, command) server.rconDaily = append(server.rconDaily, command)
} else if period == "monthly" { } else if period == "monthly" {
server.rconMonthly = append(server.rconMonthly, command) server.rconMonthly = append(server.rconMonthly, command)
} else if period == "yearly" { } else if period == "yearly" {
server.rconYearly = append(server.rconYearly, command) server.rconYearly = append(server.rconYearly, command)
} else { } else {
panic("bad period " + period) panic("bad period " + period)
} }
return return
} }
func (server *OpenTTDServer ) dateChanged(dt time.Time) { func (server *OpenTTDServer) dateChanged(dt time.Time) {
for _, rconCommand := range server.rconDaily { // do every daily one
for _, rconCommand := range server.rconDaily {
server.rconCommand(rconCommand) server.rconCommand(rconCommand)
} }
// monthly ones on the 1st
if dt.Day() == 1 {
for _, rconCommand := range server.rconMonthly {
server.rconCommand(rconCommand)
}
}
// yearly on the 1st of jan
if dt.Day() == 1 && dt.Month() == 1 {
for _, rconCommand := range server.rconYearly {
server.rconCommand(rconCommand)
}
}
} }
func (server OpenTTDServer ) rconCommand(command string) { func (server OpenTTDServer) rconCommand(command string) {
var rconCommand []byte var rconCommand []byte
rconCommand = append(rconCommand, command...) rconCommand = append(rconCommand, command...)
rconCommand = append(rconCommand, 0000) rconCommand = append(rconCommand, 0000)
server.sendSocket(adminPacketAdminRCON, rconCommand) server.sendSocket(adminPacketAdminRCON, rconCommand)
} }
func ( server *OpenTTDServer ) sendSocket( protocol int, data []byte) { func (server *OpenTTDServer) sendSocket(protocol int, data []byte) {
fmt.Printf("Going to send using protocol %v this data: %v\n", protocol, data) fmt.Printf("Going to send using protocol %v this data: %v\n", protocol, data)
toSend := make([]byte, 3) // start with 3 bytes for the length and protocol toSend := make([]byte, 3) // start with 3 bytes for the length and protocol
size := uint16(len(data) + 3) // size 2 bytes, plus protocol size := uint16(len(data) + 3) // size 2 bytes, plus protocol
@ -180,7 +195,7 @@ func ( server *OpenTTDServer ) sendSocket( protocol int, data []byte) {
server.connection.Write(toSend) server.connection.Write(toSend)
} }
func ( server *OpenTTDServer ) listenSocket() { func (server *OpenTTDServer) listenSocket() {
fmt.Printf("Listening to socket...\n") fmt.Printf("Listening to socket...\n")
var chunk []byte var chunk []byte
@ -192,12 +207,12 @@ SocketLoop:
socketData := make([]byte, 1024) socketData := make([]byte, 1024)
s, err := server.connection.Read(socketData) s, err := server.connection.Read(socketData)
if err != nil { if err != nil {
if cErr, ok := err.(*net.OpError); ok { if cErr, ok := err.(*net.OpError); ok {
if cErr.Err.Error() == "read: connection reset by peer" { if cErr.Err.Error() == "read: connection reset by peer" {
fmt.Println("Connection reset by peer - check the openttd log for details") fmt.Println("Connection reset by peer - check the openttd log for details")
os.Exit(1) os.Exit(1)
} }
} }
panic(err) panic(err)
} }
@ -245,7 +260,7 @@ SocketLoop:
epochDate := time.Date(0, time.January, 1, 0, 0, 0, 0, time.UTC) epochDate := time.Date(0, time.January, 1, 0, 0, 0, 0, time.UTC)
dt := epochDate.AddDate(0, 0, int(date)) dt := epochDate.AddDate(0, 0, int(date))
fmt.Printf(" * Date is %v\n", dt) fmt.Printf(" * Date is %v\n", dt)
server.dateChanged(dt) server.dateChanged(dt)
// uint32 // uint32
} else if packetType == adminPacketServerCHAT { } else if packetType == adminPacketServerCHAT {
// fmt.Printf(" - Got a chat packet:\n%v", packetData) // fmt.Printf(" - Got a chat packet:\n%v", packetData)
@ -256,14 +271,14 @@ SocketLoop:
chatMsg := extractString(packetData[6:]) chatMsg := extractString(packetData[6:])
chatData := binary.LittleEndian.Uint64(packetData[len(packetData)-8:]) chatData := binary.LittleEndian.Uint64(packetData[len(packetData)-8:])
fmt.Printf("action %v desttype %v, client id %v msg %v data %v\n", chatAction, chatDestType, chatClientID, string(chatMsg), chatData) fmt.Printf("action %v desttype %v, client id %v msg %v data %v\n", chatAction, chatDestType, chatClientID, string(chatMsg), chatData)
} else if packetType == adminPacketServerRCON { } else if packetType == adminPacketServerRCON {
colour := binary.LittleEndian.Uint16(packetData[0:2]) colour := binary.LittleEndian.Uint16(packetData[0:2])
string := extractString(packetData[2:]) string := extractString(packetData[2:])
fmt.Printf("rcon: colour %v : %s\n", colour, string) fmt.Printf("rcon: colour %v : %s\n", colour, string)
} else if packetType == adminPacketServerRCON_END { } else if packetType == adminPacketServerRCON_END {
string := extractString(packetData[0:]) string := extractString(packetData[0:])
fmt.Printf("rcon end : %s\n", string) fmt.Printf("rcon end : %s\n", string)
} else { } else {
fmt.Printf(" - Got an unknown packet %v\n", packetType) fmt.Printf(" - Got an unknown packet %v\n", packetType)
fmt.Printf(" - received from server: %v [%v]\n", string(packetData), packetData) fmt.Printf(" - received from server: %v [%v]\n", string(packetData), packetData)
} }