From 95159e5585762c06c654945070ba54262b7dcec9 Mon Sep 17 00:00:00 2001 From: Jeff Halter <868228+jhalter@users.noreply.github.com> Date: Sat, 15 Jun 2024 11:13:16 -0700 Subject: Refactoring and cleanup * Split CLI client into separate project * Convert more functions to follow common Golang idioms e.g io.Reader, io.Writer * Use ldflags for versioning * Misc cleanup and simplification --- hotline/tracker.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'hotline/tracker.go') diff --git a/hotline/tracker.go b/hotline/tracker.go index a56059f..6ee2a9f 100644 --- a/hotline/tracker.go +++ b/hotline/tracker.go @@ -16,7 +16,7 @@ type TrackerRegistration struct { Port [2]byte // Server's listening TCP port number UserCount int // Number of users connected to this particular server PassID [4]byte // Random number generated by the server - Name string // Server name + Name string // Server Name Description string // Description of the server } @@ -67,7 +67,7 @@ type TrackerHeader struct { Version [2]byte // Old protocol (1) or new (2) } -// Message type 2 1 Sending list of servers +// Message type 2 1 Sending list of servers // Message data size 2 Remaining size of this request // Number of servers 2 Number of servers in the server list // Number of servers 2 Same as previous field @@ -83,8 +83,8 @@ type ServerRecord struct { Port [2]byte NumUsers [2]byte // Number of users connected to this particular server Unused [2]byte - NameSize byte // Length of name string - Name []byte // Server name + NameSize byte // Length of Name string + Name []byte // Server Name DescriptionSize byte Description []byte } @@ -125,7 +125,7 @@ func GetListing(addr string) ([]ServerRecord, error) { for { scanner.Scan() var srv ServerRecord - _, err = srv.Read(scanner.Bytes()) + _, err = srv.Write(scanner.Bytes()) if err != nil { return nil, err } @@ -175,8 +175,8 @@ func serverScanner(data []byte, _ bool) (advance int, token []byte, err error) { return 12 + nameLen + descLen, data[0 : 12+nameLen+descLen], nil } -// Read implements io.Reader for ServerRecord -func (s *ServerRecord) Read(b []byte) (n int, err error) { +// Write implements io.Writer for ServerRecord +func (s *ServerRecord) Write(b []byte) (n int, err error) { copy(s.IPAddr[:], b[0:4]) copy(s.Port[:], b[4:6]) copy(s.NumUsers[:], b[6:8]) -- cgit