diff options
| -rw-r--r-- | contrib/lease-tools/dhcp_release.c | 1 | ||||
| -rw-r--r-- | contrib/lease-tools/dhcp_release6.c | 37 |
2 files changed, 24 insertions, 14 deletions
diff --git a/contrib/lease-tools/dhcp_release.c b/contrib/lease-tools/dhcp_release.c index c1c835b..84f5610 100644 --- a/contrib/lease-tools/dhcp_release.c +++ b/contrib/lease-tools/dhcp_release.c @@ -280,6 +280,7 @@ int main(int argc, char **argv) /* This voodoo fakes up a packet coming from the correct interface, which really matters for a DHCP server */ + memset(&ifr, 0, sizeof(ifr)); strncpy(ifr.ifr_name, argv[1], sizeof(ifr.ifr_name)-1); ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0'; if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)) == -1) diff --git a/contrib/lease-tools/dhcp_release6.c b/contrib/lease-tools/dhcp_release6.c index d680222..9b3438f 100644 --- a/contrib/lease-tools/dhcp_release6.c +++ b/contrib/lease-tools/dhcp_release6.c @@ -318,6 +318,12 @@ void usage(const char* arg, FILE* stream) fprintf (stream, "Usage: %s %s\n", arg, usage_string); } +static void fail_fatal(const char *errstr, int exitcode) +{ + perror(errstr); + exit(exitcode); +} + int send_release_packet(const char* iface, struct dhcp6_packet* packet) { struct sockaddr_in6 server_addr, client_addr; @@ -343,18 +349,19 @@ int send_release_packet(const char* iface, struct dhcp6_packet* packet) client_addr.sin6_port = htons(DHCP6_CLIENT_PORT); client_addr.sin6_flowinfo = 0; client_addr.sin6_scope_id =0; - inet_pton(AF_INET6, "::", &client_addr.sin6_addr); - bind(sock, (struct sockaddr*)&client_addr, sizeof(struct sockaddr_in6)); - inet_pton(AF_INET6, DHCP6_MULTICAST_ADDRESS, &server_addr.sin6_addr); + if (inet_pton(AF_INET6, "::", &client_addr.sin6_addr) <= 0) + fail_fatal("inet_pton", 5); + if (bind(sock, (struct sockaddr*)&client_addr, sizeof(struct sockaddr_in6)) != 0) + perror("bind"); /* continue on bind error */ + if (inet_pton(AF_INET6, DHCP6_MULTICAST_ADDRESS, &server_addr.sin6_addr) <= 0) + fail_fatal("inet_pton", 5); server_addr.sin6_port = htons(DHCP6_SERVER_PORT); - int16_t recv_size = 0; + ssize_t recv_size = 0; + int result; for (i = 0; i < 5; i++) { if (sendto(sock, packet->buf, packet->len, 0, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) - { - perror("sendto failed"); - exit(4); - } + fail_fatal("sendto failed", 4); recv_size = recvfrom(sock, response, sizeof(response), MSG_DONTWAIT, NULL, 0); if (recv_size == -1) @@ -367,16 +374,18 @@ int send_release_packet(const char* iface, struct dhcp6_packet* packet) else { perror("recvfrom"); + result = UNSPEC_FAIL; } } - - int16_t result = parse_packet(response, recv_size); - if (result == NOT_REPLY_CODE) + else { - sleep(1); - continue; + result = parse_packet(response, recv_size); + if (result == NOT_REPLY_CODE) + { + sleep(1); + continue; + } } - close(sock); return result; } |