X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fpackets.c;h=2dc82fe12e0d138cf821218fd7633cbfa24f58a4;hb=a23aab1fc2f66b63ba9b7e4b9c9a8f6d58c367d0;hp=29c4e7e4a9e3a9bd9820d69fb9afb84f5d6ee8bb;hpb=a4af00400a835eb87569ba40e21874c05e872c0f;p=openvswitch

diff --git a/lib/packets.c b/lib/packets.c
index 29c4e7e4..2dc82fe1 100644
--- a/lib/packets.c
+++ b/lib/packets.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,11 +20,16 @@
 #include <stdlib.h>
 #include "ofpbuf.h"
 
+/* Parses 's' as a 16-digit hexadecimal number representing a datapath ID.  On
+ * success stores the dpid into '*dpidp' and returns true, on failure stores 0
+ * into '*dpidp' and returns false.
+ *
+ * Rejects an all-zeros dpid as invalid. */
 bool
 dpid_from_string(const char *s, uint64_t *dpidp)
 {
-    *dpidp = (strlen(s) == 12 && strspn(s, "0123456789abcdefABCDEF") == 12
-              ? strtoll(s, NULL, 16)
+    *dpidp = (strlen(s) == 16 && strspn(s, "0123456789abcdefABCDEF") == 16
+              ? strtoull(s, NULL, 16)
               : 0);
     return *dpidp != 0;
 }