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

udhcp: new config option "Rewrite the lease file at every new acknowledge"

Browse Source 
(Mats Erik Andersson <mats@blue2net.com> (Blue2Net AB))
udhcp: consistently treat server_config.start/end IPs as host-order
       fix IP parsing for 64bit machines
       fix unsafe hton macro usage in read_opt()
       do not chdir("/") when daemonizing
       fix help text
This commit is contained in:
Denis Vlasenko
2007-07-01 17:05:57 +00:00
parent dc7a5eae36
commit c82b5108e1
10 changed files with 153 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
networking/udhcp/socket.c
View File

@ -43,7 +43,7 @@ int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t
struct ifreq ifr;
struct sockaddr_in *our_ip;
memset(&ifr, 0, sizeof(struct ifreq));
memset(&ifr, 0, sizeof(ifr));
fd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
if (fd < 0) {
bb_perror_msg("socket failed");
@ -54,7 +54,8 @@ int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t
strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name));
if (addr) {
if (ioctl(fd, SIOCGIFADDR, &ifr) != 0) {
bb_perror_msg("SIOCGIFADDR failed, is the interface up and configured?");
bb_perror_msg("SIOCGIFADDR failed (is interface %s "
"up and configured?)", interface);
close(fd);
return -1;
}
@ -117,7 +118,7 @@ int listen_socket(uint32_t ip, int port, const char *inf)
return -1;
}
if (bind(fd, (struct sockaddr *)&addr, sizeof(struct sockaddr)) == -1) {
if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
close(fd);
return -1;
}