diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-02 22:31:05 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-02 22:31:05 +0000 |
commit | 80edead5ea731c0c144def4d249eb88fb16001ef (patch) | |
tree | 1aca5341f9b412edd03f9edf32ea5f649a2bf242 /networking/udhcp/socket.c | |
parent | c01af95c398b21203cd991917101e29b21821284 (diff) | |
download | busybox-w32-80edead5ea731c0c144def4d249eb88fb16001ef.tar.gz busybox-w32-80edead5ea731c0c144def4d249eb88fb16001ef.tar.bz2 busybox-w32-80edead5ea731c0c144def4d249eb88fb16001ef.zip |
udhcp: slight shrink
udhcpd_main 1171 1208 +37
udhcpc_main 2363 2387 +24
dhcprelay_main 1145 1146 +1
dhcprelay_stopflag 4 1 -3
dhcprelay_signal_handler 11 8 -3
client_background 46 42 -4
udhcp_read_interface 230 211 -19
udhcp_make_pidfile 76 - -76
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 3/4 up/down: 62/-105) Total: -43 bytes
text data bss dec hex filename
770052 1096 11228 782376 bf028 busybox_old
769980 1096 11228 782304 befe0 busybox_unstripped
Diffstat (limited to 'networking/udhcp/socket.c')
-rw-r--r-- | networking/udhcp/socket.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c index 648f7623c..1e62f8e40 100644 --- a/networking/udhcp/socket.c +++ b/networking/udhcp/socket.c | |||
@@ -44,11 +44,11 @@ int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t | |||
44 | struct sockaddr_in *our_ip; | 44 | struct sockaddr_in *our_ip; |
45 | 45 | ||
46 | memset(&ifr, 0, sizeof(ifr)); | 46 | memset(&ifr, 0, sizeof(ifr)); |
47 | fd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); | 47 | fd = xsocket(AF_INET, SOCK_RAW, IPPROTO_RAW); |
48 | if (fd < 0) { | 48 | // if (fd < 0) { |
49 | bb_perror_msg("socket failed"); | 49 | // bb_perror_msg("socket failed"); |
50 | return -1; | 50 | // return -1; |
51 | } | 51 | // } |
52 | 52 | ||
53 | ifr.ifr_addr.sa_family = AF_INET; | 53 | ifr.ifr_addr.sa_family = AF_INET; |
54 | strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name)); | 54 | strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name)); |
@@ -83,6 +83,7 @@ int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t | |||
83 | arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]); | 83 | arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]); |
84 | } | 84 | } |
85 | 85 | ||
86 | close(fd); | ||
86 | return 0; | 87 | return 0; |
87 | } | 88 | } |
88 | 89 | ||