diff options
| author | pjd <pjd@FreeBSD.org> | 2013-07-03 21:57:24 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2013-07-03 21:57:24 +0000 |
| commit | 1bb08cf6ef3fc73abf64cccbfb8383d67b2adedb (patch) | |
| tree | 5f6953b39a84aa44b2bff19fbf6545288745d9f2 /sbin/dhclient | |
| parent | ca2a1d2a81b8f55541ac0c4ccc211bbe649c25ff (diff) | |
| download | FreeBSD-src-1bb08cf6ef3fc73abf64cccbfb8383d67b2adedb.zip FreeBSD-src-1bb08cf6ef3fc73abf64cccbfb8383d67b2adedb.tar.gz | |
MFp4 @229473:
No caller checks send_packet() return value, so make it void.
Reviewed by: brooks
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sbin/dhclient')
| -rw-r--r-- | sbin/dhclient/bpf.c | 3 | ||||
| -rw-r--r-- | sbin/dhclient/dhclient.c | 6 | ||||
| -rw-r--r-- | sbin/dhclient/dhcpd.h | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sbin/dhclient/bpf.c b/sbin/dhclient/bpf.c index 920932e..a840294 100644 --- a/sbin/dhclient/bpf.c +++ b/sbin/dhclient/bpf.c @@ -249,7 +249,7 @@ if_register_receive(struct interface_info *info) error("Cannot lock bpf"); } -ssize_t +void send_packet(struct interface_info *interface, struct dhcp_packet *raw, size_t len, struct in_addr from, struct in_addr to) { @@ -290,7 +290,6 @@ send_packet(struct interface_info *interface, struct dhcp_packet *raw, if (result < 0) warning("send_packet: %m"); - return (result); } ssize_t diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index f17c11e..2de8d39 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1225,7 +1225,7 @@ again: (int)ip->client->interval); /* Send out a packet. */ - (void)send_packet(ip, &ip->client->packet, ip->client->packet_length, + send_packet(ip, &ip->client->packet, ip->client->packet_length, inaddr_any, inaddr_broadcast); add_timeout(cur_time + ip->client->interval, send_discover, ip); @@ -1450,7 +1450,7 @@ cancel: REMOTE_PORT); /* Send out a packet. */ - (void) send_packet(ip, &ip->client->packet, ip->client->packet_length, + send_packet(ip, &ip->client->packet, ip->client->packet_length, from, to); add_timeout(cur_time + ip->client->interval, send_request, ip); @@ -1465,7 +1465,7 @@ send_decline(void *ipp) inet_ntoa(inaddr_broadcast), REMOTE_PORT); /* Send out a packet. */ - (void) send_packet(ip, &ip->client->packet, ip->client->packet_length, + send_packet(ip, &ip->client->packet, ip->client->packet_length, inaddr_any, inaddr_broadcast); } diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index d642692..1d0898d 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -300,7 +300,7 @@ struct hash_bucket *new_hash_bucket(void); int if_register_bpf(struct interface_info *); void if_register_send(struct interface_info *); void if_register_receive(struct interface_info *); -ssize_t send_packet(struct interface_info *, struct dhcp_packet *, size_t, +void send_packet(struct interface_info *, struct dhcp_packet *, size_t, struct in_addr, struct in_addr); ssize_t receive_packet(struct interface_info *, unsigned char *, size_t, struct sockaddr_in *, struct hardware *); |
