chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libsystemd-dhcp: revert merge into libsystemd
[elogind.git]
/
src
/
libsystemd-dhcp
/
dhcp-network.c
diff --git
a/src/libsystemd-dhcp/dhcp-network.c
b/src/libsystemd-dhcp/dhcp-network.c
index ce27f425c358418402ff36ac7e832af0b4807ddc..b2de67e8a74d013f585b8eacc6b724eb05b64e01 100644
(file)
--- a/
src/libsystemd-dhcp/dhcp-network.c
+++ b/
src/libsystemd-dhcp/dhcp-network.c
@@
-34,6
+34,9
@@
int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
{
int s;
{
int s;
+ assert(index > 0);
+ assert(link);
+
s = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK,
htons(ETH_P_IP));
if (s < 0)
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)
{
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;
if (sendto(s, packet, len, 0, &link->sa, sizeof(link->ll)) < 0)
return -errno;