shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-28 05:57:33 +03:00
Code

libsystemd-dhcp: Return proper error if bind fails

Browse Source 
This also fixes a minor indentation damage.

[tomegun: use close_noint_nofail() instead and drop 'err' variables]
This commit is contained in:
Patrik Flykt 2013-12-20 17:16:11 +02:00 committed by Tom Gundersen
parent 3b349af69a
commit 1c8035a897
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libsystemd-dhcp/dhcp-network.c
View File

@ -31,7 +31,7 @@
#include "dhcp-internal.h"
int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
{
{
int s;
s = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK,
@ -46,7 +46,7 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
memset(link->ll.sll_addr, 0xff, ETH_ALEN);
if (bind(s, &link->sa, sizeof(link->ll)) < 0) {
close(s);
close_nointr_nofail(s);
return -errno;
}
@ -56,10 +56,8 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
const void *packet, size_t len)
{
int err = 0;
if (sendto(s, packet, len, 0, &link->sa, sizeof(link->ll)) < 0)
err = -errno;
return -errno;
return err;
return 0;
}