diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-12 22:14:34 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-12 22:14:34 +0000 |
commit | 4e6d5117b839cef41cd3919966f95bf25d24d8d9 (patch) | |
tree | 277c292905fefcdf40530c8c29e87d6b8c5f7864 /libbb/create_icmp6_socket.c | |
parent | 4e6c8120a53709c4a352db42e997303844c74584 (diff) | |
download | busybox-w32-4e6d5117b839cef41cd3919966f95bf25d24d8d9.tar.gz busybox-w32-4e6d5117b839cef41cd3919966f95bf25d24d8d9.tar.bz2 busybox-w32-4e6d5117b839cef41cd3919966f95bf25d24d8d9.zip |
inetd: make it NOMMU-capable and IPv6-friendly. Lots of renames
of variable/function names
Total: -2474 bytes
text data bss dec hex filename
802215 661 7452 810328 c5d58 busybox_old
800120 661 7428 808209 c5511 busybox_unstripped
Diffstat (limited to 'libbb/create_icmp6_socket.c')
-rw-r--r-- | libbb/create_icmp6_socket.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libbb/create_icmp6_socket.c b/libbb/create_icmp6_socket.c index 51899cdc5..a22ac5d02 100644 --- a/libbb/create_icmp6_socket.c +++ b/libbb/create_icmp6_socket.c | |||
@@ -2,27 +2,26 @@ | |||
2 | /* | 2 | /* |
3 | * Utility routines. | 3 | * Utility routines. |
4 | * | 4 | * |
5 | * create raw socket for icmp (IPv6 version) protocol test permission | 5 | * create raw socket for icmp (IPv6 version) protocol |
6 | * and drop root privileges if running setuid | 6 | * and drop root privileges if running setuid |
7 | * | ||
8 | */ | 7 | */ |
9 | 8 | ||
10 | //#include <sys/types.h> | ||
11 | //#include <netdb.h> | ||
12 | //#include <sys/socket.h> | ||
13 | #include "libbb.h" | 9 | #include "libbb.h" |
14 | 10 | ||
15 | #if ENABLE_FEATURE_IPV6 | 11 | #if ENABLE_FEATURE_IPV6 |
16 | int create_icmp6_socket(void) | 12 | int create_icmp6_socket(void) |
17 | { | 13 | { |
18 | struct protoent *proto; | ||
19 | int sock; | 14 | int sock; |
20 | 15 | #if 0 | |
16 | struct protoent *proto; | ||
21 | proto = getprotobyname("ipv6-icmp"); | 17 | proto = getprotobyname("ipv6-icmp"); |
22 | /* if getprotobyname failed, just silently force | 18 | /* if getprotobyname failed, just silently force |
23 | * proto->p_proto to have the correct value for "ipv6-icmp" */ | 19 | * proto->p_proto to have the correct value for "ipv6-icmp" */ |
24 | sock = socket(AF_INET6, SOCK_RAW, | 20 | sock = socket(AF_INET6, SOCK_RAW, |
25 | (proto ? proto->p_proto : IPPROTO_ICMPV6)); | 21 | (proto ? proto->p_proto : IPPROTO_ICMPV6)); |
22 | #else | ||
23 | sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6); | ||
24 | #endif | ||
26 | if (sock < 0) { | 25 | if (sock < 0) { |
27 | if (errno == EPERM) | 26 | if (errno == EPERM) |
28 | bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); | 27 | bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); |