commit 3d352897c5f8310132b9d630b09e92e2879d12d8
author Lorenzo Colitti <lorenzo@google.com> Thu Feb 26 15:35:54 2015 +0900
committer Lorenzo Colitti <lorenzo@google.com> Fri Feb 27 10:13:53 2015 +0900
tree 07a0c747ba5ba7c7f467c792d82c6bccec038930
parent 1c7c426ab377c3a005a36d612ebbb16de86fb7d4

Fix socket mark parsing.

1. The mark is unsigned. Treat it as such.
2. Allow marks to be input in hex (and octal), not just decimal.

Change-Id: I8710abb1d79530e1bf5972ec42bd05bfd30a085d

ping_common.c

diff --git a/ping_common.c b/ping_common.c
index d58d3c4..cc9342d 100644
--- a/ping_common.c
+++ b/ping_common.c
@@ -5,7 +5,7 @@
 
 int options;
 
-int mark;
+__u32 mark;
 int sndbuf;
 int ttl;
 int rtt;
@@ -294,9 +294,9 @@
 	case 'm':
 	{
 		char *endp;
-		mark = (int)strtoul(optarg, &endp, 10);
-		if (mark < 0 || *endp != '\0') {
-			fprintf(stderr, "mark cannot be negative\n");
+		mark = strtoul(optarg, &endp, 0);
+		if (*endp != '\0') {
+			fprintf(stderr, "ping: invalid mark %s\n", optarg);
 			exit(2);
 		}
 		options |= F_MARK;