X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fdiscovery.c;h=37d32e43fb76a1b5063fa59430fc99c1abffca65;hb=a5d5354945b1376c851f8b599f420f65bf076db6;hp=008ad62ca9c3ae6770ae44427d2d4fea05f12e82;hpb=5136ce492c414f377f7be9ae32b259abb9f76580;p=openvswitch diff --git a/ofproto/discovery.c b/ofproto/discovery.c index 008ad62c..37d32e43 100644 --- a/ofproto/discovery.c +++ b/ofproto/discovery.c @@ -33,7 +33,7 @@ #include "stream-ssl.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(discovery) +VLOG_DEFINE_THIS_MODULE(discovery); struct discovery { char *dpif_name; @@ -60,7 +60,7 @@ discovery_status_cb(struct status_reply *sr, void *d_) if (d->dhcp) { status_reply_put(sr, "state=%s", dhclient_get_state(d->dhcp)); status_reply_put(sr, "state-elapsed=%u", - dhclient_get_state_elapsed(d->dhcp)); + dhclient_get_state_elapsed(d->dhcp)); if (dhclient_is_bound(d->dhcp)) { uint32_t ip = dhclient_get_ip(d->dhcp); uint32_t netmask = dhclient_get_netmask(d->dhcp); @@ -198,6 +198,7 @@ discovery_set_accept_controller_re(struct discovery *d, const char *re_) char *buffer = xmalloc(length); regerror(error, regex, buffer, length); VLOG_WARN("%s: %s: %s", d->dpif_name, re, buffer); + free(buffer); free(regex); free(re); return EINVAL; @@ -218,7 +219,7 @@ void discovery_question_connectivity(struct discovery *d) { if (d->dhcp) { - dhclient_force_renew(d->dhcp, 15); + dhclient_force_renew(d->dhcp, 15); } } @@ -261,7 +262,7 @@ void discovery_wait(struct discovery *d) { if (d->dhcp) { - dhclient_wait(d->dhcp); + dhclient_wait(d->dhcp); } }