emo/ndhc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use non-blocking sockets for the listen socket.

Browse Source
This commit is contained in:
Nicholas J. Kain 2010-12-26 15:05:00 -05:00
parent 8b97107b8d
commit ea4041983d
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ndhc/socket.c
View File

@ -38,6 +38,14 @@
#include "strl.h" #include "strl.h"
#include "dhcpd.h" /* For SERVER_PORT and CLIENT_PORT */ #include "dhcpd.h" /* For SERVER_PORT and CLIENT_PORT */
static int set_sock_nonblock(int fd)
{
int ret = 0, flags;
flags = fcntl(fd, F_GETFL);
ret = fcntl(fd, F_SETFL, flags | O_NONBLOCK);
return ret;
}
/* Given an interface name in @interface, return its index number, /* Given an interface name in @interface, return its index number,
* IPv4 address, and MAC in @ifindex, @addr (optional), and @mac.*/ * IPv4 address, and MAC in @ifindex, @addr (optional), and @mac.*/
int read_interface(char *interface, int *ifindex, uint32_t *addr, uint8_t *mac) int read_interface(char *interface, int *ifindex, uint32_t *addr, uint8_t *mac)
@ -115,6 +123,8 @@ int listen_socket(unsigned int ip, int port, char *inf)
&interface, sizeof interface) < 0) &interface, sizeof interface) < 0)
goto out_fd; goto out_fd;
set_sock_nonblock(fd);
memset(&addr, 0, sizeof addr); memset(&addr, 0, sizeof addr);
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_port = htons(port); addr.sin_port = htons(port);
@ -191,6 +201,8 @@ int raw_socket(int ifindex)
log_line("Attached filter to raw socket fd %d", fd); log_line("Attached filter to raw socket fd %d", fd);
} }
set_sock_nonblock(fd);
sock.sll_family = AF_PACKET; sock.sll_family = AF_PACKET;
sock.sll_protocol = htons(ETH_P_IP); sock.sll_protocol = htons(ETH_P_IP);
sock.sll_ifindex = ifindex; sock.sll_ifindex = ifindex;