diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-21 07:05:06 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-21 07:05:06 +0000 |
| commit | 6de8994440165e2f30c50d2d7c1f332d9cd649bd (patch) | |
| tree | d1e2794c09b2b73e93e64c84444cb52806498494 /networking/udhcp/dhcpd.c | |
| parent | 19903f0d447116baef455eddc14458b1dfd1c834 (diff) | |
| download | busybox-6de8994440165e2f30c50d2d7c1f332d9cd649bd.tar.gz | |
udhcpc: regularize the names of receiving functions,
pause on "serious failure to receive".
Some misc fixes are also folded in here.
Diffstat (limited to 'networking/udhcp/dhcpd.c')
| -rw-r--r-- | networking/udhcp/dhcpd.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index 263719657..a6264ad2f 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c @@ -145,7 +145,7 @@ int udhcpd_main(int argc ATTRIBUTE_UNUSED, char **argv) default: continue; /* signal or error (probably EINTR) */ } - bytes = udhcp_recv_packet(&packet, server_socket); /* this waits for a packet - idle */ + bytes = udhcp_recv_kernel_packet(&packet, server_socket); /* this waits for a packet - idle */ if (bytes < 0) { if (bytes == -1 && errno != EINTR) { DEBUG("error on read, %s, reopening socket", strerror(errno)); @@ -180,7 +180,7 @@ int udhcpd_main(int argc ATTRIBUTE_UNUSED, char **argv) case DHCPDISCOVER: DEBUG("Received DISCOVER"); - if (sendOffer(&packet) < 0) { + if (send_offer(&packet) < 0) { bb_error_msg("send OFFER failed"); } break; @@ -200,20 +200,19 @@ int udhcpd_main(int argc ATTRIBUTE_UNUSED, char **argv) if (server_id_align == server_config.server && requested && requested_align == lease->yiaddr ) { - sendACK(&packet, lease->yiaddr); + send_ACK(&packet, lease->yiaddr); } } else if (requested) { /* INIT-REBOOT State */ if (lease->yiaddr == requested_align) - sendACK(&packet, lease->yiaddr); + send_ACK(&packet, lease->yiaddr); else - sendNAK(&packet); + send_NAK(&packet); } else if (lease->yiaddr == packet.ciaddr) { /* RENEWING or REBINDING State */ - sendACK(&packet, lease->yiaddr); - } else { - /* don't know what to do!!!! */ - sendNAK(&packet); + send_ACK(&packet, lease->yiaddr); + } else { /* don't know what to do!!!! */ + send_NAK(&packet); } /* what to do if we have no record of the client */ @@ -229,13 +228,13 @@ int udhcpd_main(int argc ATTRIBUTE_UNUSED, char **argv) memset(lease->chaddr, 0, 16); /* make some contention for this address */ } else - sendNAK(&packet); + send_NAK(&packet); } else { uint32_t r = ntohl(requested_align); if (r < server_config.start_ip || r > server_config.end_ip ) { - sendNAK(&packet); + send_NAK(&packet); } /* else remain silent */ } |