projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Distribute some forgotten files that are needed by "make check".
[openvswitch]
/
lib
/
dhcp-client.c
diff --git
a/lib/dhcp-client.c
b/lib/dhcp-client.c
index a9163c78ace5be42daeacf1ad80fdf38dcb89603..720cd2faddbbac80d1a7d1bcf04751a44b6df9f2 100644
(file)
--- a/
lib/dhcp-client.c
+++ b/
lib/dhcp-client.c
@@
-172,7
+172,7
@@
dhclient_create(const char *netdev_name,
return error;
}
return error;
}
- cli = x
calloc(1,
sizeof *cli);
+ cli = x
zalloc(
sizeof *cli);
cli->modify_request = modify_request;
cli->validate_offer = validate_offer;
cli->aux = aux;
cli->modify_request = modify_request;
cli->validate_offer = validate_offer;
cli->aux = aux;
@@
-411,7
+411,7
@@
dhclient_configure_netdev(struct dhclient *cli)
}
if (!error && router.s_addr) {
}
if (!error && router.s_addr) {
- error = netdev_add_router(router);
+ error = netdev_add_router(
cli->netdev,
router);
if (error) {
VLOG_ERR("failed to add default route to "IP_FMT" on %s: %s",
IP_ARGS(&router), netdev_get_name(cli->netdev),
if (error) {
VLOG_ERR("failed to add default route to "IP_FMT" on %s: %s",
IP_ARGS(&router), netdev_get_name(cli->netdev),
@@
-927,7
+927,7
@@
do_receive_msg(struct dhclient *cli, struct dhcp_msg *msg)
flow_extract(&b, 0, &flow);
if (flow.dl_type != htons(ETH_TYPE_IP)
|| flow.nw_proto != IP_TYPE_UDP
flow_extract(&b, 0, &flow);
if (flow.dl_type != htons(ETH_TYPE_IP)
|| flow.nw_proto != IP_TYPE_UDP
- || flow.tp_dst != htons(
68
)
+ || flow.tp_dst != htons(
DHCP_CLIENT_PORT
)
|| !(eth_addr_is_broadcast(flow.dl_dst)
|| eth_addr_equals(flow.dl_dst, cli_mac))) {
continue;
|| !(eth_addr_is_broadcast(flow.dl_dst)
|| eth_addr_equals(flow.dl_dst, cli_mac))) {
continue;
@@
-1009,8
+1009,8
@@
do_send_msg(struct dhclient *cli, const struct dhcp_msg *msg)
nh.ip_dst = INADDR_BROADCAST;
nh.ip_csum = csum(&nh, sizeof nh);
nh.ip_dst = INADDR_BROADCAST;
nh.ip_csum = csum(&nh, sizeof nh);
- th.udp_src = htons(
66
);
- th.udp_dst = htons(
67
);
+ th.udp_src = htons(
DHCP_CLIENT_PORT
);
+ th.udp_dst = htons(
DHCP_SERVER_PORT
);
th.udp_len = htons(UDP_HEADER_LEN + b.size);
th.udp_csum = 0;
udp_csum = csum_add32(0, nh.ip_src);
th.udp_len = htons(UDP_HEADER_LEN + b.size);
th.udp_csum = 0;
udp_csum = csum_add32(0, nh.ip_src);