From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 5 Jun 2013 08:17:13 +0000 (+0200)
Subject: Fix burst command with specified address
X-Git-Tag: 1.28-pre1~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=066254b6c8510bf28189ba99d8d99c2c05dba0d3;p=thirdparty%2Fchrony.git

Fix burst command with specified address

This was broken in commit 0f8def4ca4237495f13a93384ded9245495e3c8f.
---

diff --git a/client.c b/client.c
index 26efbabe..1ddaeefa 100644
--- a/client.c
+++ b/client.c
@@ -589,18 +589,20 @@ process_cmd_burst(CMD_Request *msg, char *line)
   s2 = CPS_SplitWord(s1);
   CPS_SplitWord(s2);
 
-  if (sscanf(s1, "%d/%d", &n_good_samples, &n_total_samples) != 2 ||
-      (*s2 && !read_mask_address(s2, &mask, &address))) {
+  if (sscanf(s1, "%d/%d", &n_good_samples, &n_total_samples) != 2) {
     fprintf(stderr, "Invalid syntax for burst command\n");
     return 0;
   }
 
+  mask.family = address.family = IPADDR_UNSPEC;
+  if (*s2 && !read_mask_address(s2, &mask, &address)) {
+    return 0;
+  }
+
   msg->command = htons(REQ_BURST);
   msg->data.burst.n_good_samples = ntohl(n_good_samples);
   msg->data.burst.n_total_samples = ntohl(n_total_samples);
 
-  mask.family = address.family = IPADDR_UNSPEC;
-
   UTI_IPHostToNetwork(&mask, &msg->data.burst.mask);
   UTI_IPHostToNetwork(&address, &msg->data.burst.address);