picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libsystemd-dhcp: add some asserts

Browse source
This commit is contained in:
Tom Gundersen 2013-12-18 10:52:22 +01:00
parent 3dd7140035
commit 23f30ed312
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libsystemd-dhcp/dhcp-client.c
View file

@ -1061,7 +1061,7 @@ int sd_dhcp_client_start(sd_dhcp_client *client)
int r;
assert_return(client, -EINVAL);
assert_return(client->index >= 0, -EINVAL);
assert_return(client->index > 0, -EINVAL);
assert_return(client->state == DHCP_STATE_INIT ||
client->state == DHCP_STATE_INIT_REBOOT, -EBUSY);

7
src/libsystemd-dhcp/dhcp-network.c
View file

@ -34,6 +34,9 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
{
int s;
assert(index > 0);
assert(link);
s = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK,
htons(ETH_P_IP));
if (s < 0)
@ -77,6 +80,10 @@ int dhcp_network_bind_udp_socket(int index, be32_t client_address)
int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
const void *packet, size_t len)
{
assert(link);
assert(packet);
assert(len);
if (sendto(s, packet, len, 0, &link->sa, sizeof(link->ll)) < 0)
return -errno;