X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdhcp.c;h=e6d5735e80c251432d49d0de831a79dabb3b2a89;hb=23a98ffed7f9bb5b4e0f196a0f085e1fdd3029b5;hp=f0c36442dca39da56eec1c688aaa3e29b4cbf302;hpb=a14bc59fb8f27db193d74662dc9c5cb8237177ef;p=sliver-openvswitch.git

diff --git a/lib/dhcp.c b/lib/dhcp.c
index f0c36442d..e6d5735e8 100644
--- a/lib/dhcp.c
+++ b/lib/dhcp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008 Nicira Networks.
+ * Copyright (c) 2008, 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.
@@ -24,10 +24,10 @@
 #include <stdlib.h>
 #include "dynamic-string.h"
 #include "ofpbuf.h"
-
-#define THIS_MODULE VLM_dhcp
 #include "vlog.h"
 
+VLOG_DEFINE_THIS_MODULE(dhcp)
+
 /* Information about a DHCP argument type. */
 struct arg_type {
     const char *name;           /* Name. */
@@ -497,7 +497,7 @@ dhcp_option_equals(const struct dhcp_option *a, const struct dhcp_option *b)
 {
     return ((a->data != NULL) == (b->data != NULL)
             && a->n == b->n
-            && !memcmp(a->data, b->data, a->n));
+            && (!a->data || !memcmp(a->data, b->data, a->n)));
 }
 
 /* Replaces 'ds' by a string representation of 'msg'.  If 'multiline' is
@@ -674,7 +674,7 @@ dhcp_parse(struct dhcp_msg *msg, const struct ofpbuf *b_)
     msg->giaddr = dhcp->giaddr;
     memcpy(msg->chaddr, dhcp->chaddr, ETH_ADDR_LEN);
 
-    cookie = ofpbuf_try_pull(&b, sizeof cookie);
+    cookie = ofpbuf_try_pull(&b, sizeof *cookie);
     if (cookie) {
         if (ntohl(*cookie) == DHCP_OPTS_COOKIE) {
             uint8_t overload;