git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-print: Implement printing for OFPUTIL_NXT_FLOW_MOD.
[sliver-openvswitch.git]
/
lib
/
dhcp-client.c
diff --git
a/lib/dhcp-client.c
b/lib/dhcp-client.c
index
7168361
..
74fa44c
100644
(file)
--- a/
lib/dhcp-client.c
+++ b/
lib/dhcp-client.c
@@
-35,10
+35,10
@@
#include "poll-loop.h"
#include "sat-math.h"
#include "timeval.h"
#include "poll-loop.h"
#include "sat-math.h"
#include "timeval.h"
-
-#define THIS_MODULE VLM_dhcp_client
#include "vlog.h"
#include "vlog.h"
+VLOG_DEFINE_THIS_MODULE(dhcp_client);
+
#define DHCLIENT_STATES \
DHCLIENT_STATE(INIT, 1 << 0) \
DHCLIENT_STATE(INIT_REBOOT, 1 << 1) \
#define DHCLIENT_STATES \
DHCLIENT_STATE(INIT, 1 << 0) \
DHCLIENT_STATE(INIT_REBOOT, 1 << 1) \
@@
-851,7
+851,7
@@
state_transition(struct dhclient *cli, enum dhclient_state state)
bool am_bound;
if (cli->state != state) {
bool am_bound;
if (cli->state != state) {
- VLOG_DBG("%s: entering %s", cli_name, state_name(state));
+ VLOG_DBG("%s: entering %s", cli_name, state_name(state));
cli->state = state;
}
cli->state_entered = time_now();
cli->state = state;
}
cli->state_entered = time_now();
@@
-942,7
+942,7
@@
do_receive_msg(struct dhclient *cli, struct dhcp_msg *msg)
for (; cli->received < 50; cli->received++) {
const struct ip_header *ip;
const struct dhcp_header *dhcp;
for (; cli->received < 50; cli->received++) {
const struct ip_header *ip;
const struct dhcp_header *dhcp;
-
flow_t
flow;
+
struct flow
flow;
int error;
ofpbuf_clear(&b);
int error;
ofpbuf_clear(&b);
@@
-980,7
+980,7
@@
do_receive_msg(struct dhclient *cli, struct dhcp_msg *msg)
if (!error) {
if (VLOG_IS_DBG_ENABLED()) {
VLOG_DBG_RL(&rl, "%s: received %s", cli_name,
if (!error) {
if (VLOG_IS_DBG_ENABLED()) {
VLOG_DBG_RL(&rl, "%s: received %s", cli_name,
- dhcp_msg_to_string(msg, false, &cli->s));
+ dhcp_msg_to_string(msg, false, &cli->s));
} else {
VLOG_INFO_RL(&rl, "%s: received %s",
cli_name, dhcp_type_name(msg->type));
} else {
VLOG_INFO_RL(&rl, "%s: received %s",
cli_name, dhcp_type_name(msg->type));
@@
-1062,7
+1062,7
@@
do_send_msg(struct dhclient *cli, const struct dhcp_msg *msg)
if (b.size <= ETH_TOTAL_MAX) {
if (VLOG_IS_DBG_ENABLED()) {
VLOG_DBG("%s: sending %s",
if (b.size <= ETH_TOTAL_MAX) {
if (VLOG_IS_DBG_ENABLED()) {
VLOG_DBG("%s: sending %s",
- cli_name, dhcp_msg_to_string(msg, false, &cli->s));
+ cli_name, dhcp_msg_to_string(msg, false, &cli->s));
} else {
VLOG_INFO("%s: sending %s", cli_name, dhcp_type_name(msg->type));
}
} else {
VLOG_INFO("%s: sending %s", cli_name, dhcp_type_name(msg->type));
}