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

Style cleanups in dhcp.c.

Browse Source
This commit is contained in:
Nicholas J. Kain 2014-04-16 00:24:40 -04:00
parent d8260b4e63
commit ca85a6ba9f
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/dhcp.c
View File

@ -129,15 +129,16 @@ static ssize_t send_dhcp_cooked(struct client_state_t *cs,
// Read a packet from a cooked socket. Returns -1 on fatal error, -2 on // Read a packet from a cooked socket. Returns -1 on fatal error, -2 on
// transient error. // transient error.
static ssize_t get_cooked_packet(struct dhcpmsg *packet, int fd) static ssize_t get_cooked_packet(struct client_state_t *cs,
struct dhcpmsg *packet)
{ {
memset(packet, 0, sizeof *packet); memset(packet, 0, sizeof *packet);
ssize_t bytes = safe_read(fd, (char *)packet, sizeof *packet); ssize_t bytes = safe_read(cs->listenFd, (char *)packet, sizeof *packet);
if (bytes < 0) { if (bytes < 0) {
if (errno == EAGAIN || errno == EWOULDBLOCK) if (errno == EAGAIN || errno == EWOULDBLOCK)
return -2; return -2;
log_line("%s: Read on listen socket failed: %s", log_warning("%s: (%s) read error %s", client_config.interface,
client_config.interface, strerror(errno)); __func__, strerror(errno));
return -1; return -1;
} }
return bytes; return bytes;
@ -435,25 +436,24 @@ static int validate_dhcp_packet(struct client_state_t *cs, size_t len,
void handle_packet(struct client_state_t *cs) void handle_packet(struct client_state_t *cs)
{ {
uint8_t msgtype;
struct dhcpmsg packet; struct dhcpmsg packet;
ssize_t r;
if (cs->listenMode == LM_NONE) switch (cs->listenMode) {
return; case LM_RAW: r = get_raw_packet(cs, &packet); break;
ssize_t r = cs->listenMode == LM_RAW ? case LM_COOKED: r = get_cooked_packet(cs, &packet); break;
get_raw_packet(cs, &packet) : get_cooked_packet(&packet, cs->listenFd); default: return;
}
if (r < 0) { if (r < 0) {
// Transient issue handled by packet collection functions. // Not a transient issue handled by packet collection functions.
if (r == -2 || (r == -1 && errno == EINTR)) if (r != -2) {
return; log_error("%s: Error reading from listening socket: %s. Reopening.",
log_error("%s: Error reading from listening socket: %s. Reopening.", client_config.interface, strerror(errno));
client_config.interface, strerror(errno)); change_listen_mode(cs, cs->listenMode);
change_listen_mode(cs, cs->listenMode); }
return; return;
} }
size_t len = (size_t)r; uint8_t msgtype;
if (!validate_dhcp_packet(cs, (size_t)r, &packet, &msgtype))
if (!validate_dhcp_packet(cs, len, &packet, &msgtype))
return; return;
packet_action(cs, &packet, msgtype); packet_action(cs, &packet, msgtype);
} }