Add version checking for Votifier methods

options/vote.go

@@ -4,12 +4,13 @@ import "time"
 
 // Vote is the options used by the SendVote() function
 type Vote struct {
- PublicKey string
- ServiceName string
- Username string
- Token string
- UUID string
- IPAddress string
- Timestamp time.Time
- Timeout time.Duration
+ RequireVersion int
+ PublicKey string
+ ServiceName string
+ Username string
+ Token string
+ UUID string
+ IPAddress string
+ Timestamp time.Time
+ Timeout time.Duration
 }

status.go

@@ -155,7 +155,7 @@ func getStatus(host string, port uint16, options ...options.JavaStatus) (*respon
  latency = time.Since(pingStart)
  }
 
- return formatJavaStatusResponse(serverResponse, srvRecord, latency, opts)
+ return formatJavaStatusResponse(serverResponse, srvRecord, latency)
 }
 
 func parseJavaStatusOptions(opts ...options.JavaStatus) options.JavaStatus {
@@ -303,7 +303,7 @@ func readJavaStatusPongPacket(r io.Reader, payload int64) error {
  return nil
 }
 
-func formatJavaStatusResponse(serverResponse rawJavaStatus, srvRecord *response.SRVRecord, latency time.Duration, opts options.JavaStatus) (*response.JavaStatus, error) {
+func formatJavaStatusResponse(serverResponse rawJavaStatus, srvRecord *response.SRVRecord, latency time.Duration) (*response.JavaStatus, error) {
  motd, err := formatting.Parse(serverResponse.Description)
 
  if err != nil {

vote.go

@@ -111,6 +111,10 @@ func sendVote(host string, port uint16, opts options.Vote) error {
  switch strings.Split(version, ".")[0] {
  case "1":
  {
+ if opts.RequireVersion != 0 && opts.RequireVersion != 1 {
+ return fmt.Errorf("vote: version mismatch (server is running Votifier 1, expected to send version %d vote)", opts.RequireVersion)
+ }
+
  if len(opts.PublicKey) < 1 {
  return ErrPublicKeyRequired
  }
@@ -163,6 +167,10 @@ func sendVote(host string, port uint16, opts options.Vote) error {
  }
  case "2":
  {
+ if opts.RequireVersion != 0 && opts.RequireVersion != 2 {
+ return fmt.Errorf("vote: version mismatch (server is running Votifier 2, expected to send version %d vote)", opts.RequireVersion)
+ }
+
  if len(opts.Token) < 1 {
  return ErrTokenRequired
  }