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

UDP listen sockets should be requested with 'U' instead of 'u'.

Browse Source
This commit is contained in:
Nicholas J. Kain 2014-04-15 20:54:35 -04:00
parent b3578737df
commit baa394af9a
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dhcp.c
View File

@ -57,12 +57,9 @@ typedef enum {
static int get_udp_unicast_socket(struct client_state_t *cs) static int get_udp_unicast_socket(struct client_state_t *cs)
{ {
char buf[32]; char buf[32];
size_t buflen = 0;
buf[0] = 'u'; buf[0] = 'u';
buflen += 1; memcpy(buf + 1, &cs->clientAddr, sizeof cs->clientAddr);
memcpy(buf + buflen, &cs->clientAddr, sizeof cs->clientAddr); return request_sockd_fd(buf, 1 + sizeof cs->clientAddr, NULL);
buflen += sizeof cs->clientAddr;
return request_sockd_fd(buf, buflen, NULL);
} }
static int get_raw_broadcast_socket(void) static int get_raw_broadcast_socket(void)
@ -70,12 +67,9 @@ static int get_raw_broadcast_socket(void)
return request_sockd_fd("s", 1, NULL); return request_sockd_fd("s", 1, NULL);
} }
static int get_udp_listen_socket(struct client_state_t *cs) static int get_udp_listen_socket(void)
{ {
char buf[32]; return request_sockd_fd("U", 1, NULL);
buf[0] = 'u';
memcpy(buf + 1, &cs->clientAddr, sizeof cs->clientAddr);
return request_sockd_fd(buf, 1 + sizeof cs->clientAddr, NULL);
} }
static int get_raw_listen_socket(struct client_state_t *cs) static int get_raw_listen_socket(struct client_state_t *cs)
@ -369,7 +363,7 @@ static void change_listen_mode(struct client_state_t *cs, int new_mode)
switch (cs->listenMode) { switch (cs->listenMode) {
default: return; default: return;
case LM_RAW: cs->listenFd = get_raw_listen_socket(cs); break; case LM_RAW: cs->listenFd = get_raw_listen_socket(cs); break;
case LM_COOKED: cs->listenFd = get_udp_listen_socket(cs); break; case LM_COOKED: cs->listenFd = get_udp_listen_socket(); break;
} }
if (cs->listenFd < 0) if (cs->listenFd < 0)
suicide("%s: FATAL: Couldn't listen on socket: %s", suicide("%s: FATAL: Couldn't listen on socket: %s",