d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFp4 @229470:

Browse Source 
Remove unused argument from send_packet().

Reviewed by:	brooks
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Pawel Jakub Dawidek 2013-07-03 21:45:29 +00:00
parent 181ab08d9e
commit 592291c1e7
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sbin/dhclient/bpf.c
View File

@ -251,8 +251,7 @@ if_register_receive(struct interface_info *info)
ssize_t
send_packet(struct interface_info *interface, struct dhcp_packet *raw,
size_t len, struct in_addr from, struct sockaddr_in *to,
struct hardware *hto)
size_t len, struct in_addr from, struct sockaddr_in *to)
{
unsigned char buf[256];
struct iovec iov[2];
@ -261,7 +260,7 @@ send_packet(struct interface_info *interface, struct dhcp_packet *raw,
/* Assemble the headers... */
if (to->sin_addr.s_addr == INADDR_BROADCAST)
assemble_hw_header(interface, buf, &bufp, hto);
assemble_hw_header(interface, buf, &bufp, NULL);
assemble_udp_ip_header(buf, &bufp, from.s_addr,
to->sin_addr.s_addr, to->sin_port, (unsigned char *)raw, len);

6
sbin/dhclient/dhclient.c
View File

@ -1232,7 +1232,7 @@ again:
/* Send out a packet. */
(void)send_packet(ip, &ip->client->packet, ip->client->packet_length,
inaddr_any, &sockaddr_broadcast, NULL);
inaddr_any, &sockaddr_broadcast);
add_timeout(cur_time + ip->client->interval, send_discover, ip);
}
@ -1463,7 +1463,7 @@ cancel:
/* Send out a packet. */
(void) send_packet(ip, &ip->client->packet, ip->client->packet_length,
from, &destination, NULL);
from, &destination);
add_timeout(cur_time + ip->client->interval, send_request, ip);
}
@ -1479,7 +1479,7 @@ send_decline(void *ipp)
/* Send out a packet. */
(void) send_packet(ip, &ip->client->packet, ip->client->packet_length,
inaddr_any, &sockaddr_broadcast, NULL);
inaddr_any, &sockaddr_broadcast);
}
void

2
sbin/dhclient/dhcpd.h
View File

@ -301,7 +301,7 @@ 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,
struct in_addr, struct sockaddr_in *, struct hardware *);
struct in_addr, struct sockaddr_in *);
ssize_t receive_packet(struct interface_info *, unsigned char *, size_t,
struct sockaddr_in *, struct hardware *);