diff options
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/Kbuild.src | 2 | ||||
-rw-r--r-- | libbb/create_icmp6_socket.c | 38 | ||||
-rw-r--r-- | libbb/create_icmp_socket.c | 36 |
3 files changed, 0 insertions, 76 deletions
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index 61eec26..c5d86c0 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src @@ -27,8 +27,6 @@ lib-y += concat_subpath_file.o lib-y += copy_file.o lib-y += copyfd.o lib-y += crc32.o -lib-y += create_icmp6_socket.o -lib-y += create_icmp_socket.o lib-y += default_error_retval.o lib-y += device_open.o lib-y += dump.o diff --git a/libbb/create_icmp6_socket.c b/libbb/create_icmp6_socket.c deleted file mode 100644 index 368c690..0000000 --- a/libbb/create_icmp6_socket.c +++ /dev/null @@ -1,38 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * Utility routines. - * - * create raw socket for icmp (IPv6 version) protocol - * and drop root privileges if running setuid - * - * Licensed under GPLv2, see file LICENSE in this source tree. - */ - -#include "libbb.h" - -#if ENABLE_FEATURE_IPV6 -int FAST_FUNC create_icmp6_socket(void) -{ - int sock; -#if 0 - struct protoent *proto; - proto = getprotobyname("ipv6-icmp"); - /* if getprotobyname failed, just silently force - * proto->p_proto to have the correct value for "ipv6-icmp" */ - sock = socket(AF_INET6, SOCK_RAW, - (proto ? proto->p_proto : IPPROTO_ICMPV6)); -#else - sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6); -#endif - if (sock < 0) { - if (errno == EPERM) - bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); - bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket); - } - - /* drop root privs if running setuid */ - xsetuid(getuid()); - - return sock; -} -#endif diff --git a/libbb/create_icmp_socket.c b/libbb/create_icmp_socket.c deleted file mode 100644 index 5856269..0000000 --- a/libbb/create_icmp_socket.c +++ /dev/null @@ -1,36 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * Utility routines. - * - * create raw socket for icmp protocol - * and drop root privileges if running setuid - * - * Licensed under GPLv2, see file LICENSE in this source tree. - */ - -#include "libbb.h" - -int FAST_FUNC create_icmp_socket(void) -{ - int sock; -#if 0 - struct protoent *proto; - proto = getprotobyname("icmp"); - /* if getprotobyname failed, just silently force - * proto->p_proto to have the correct value for "icmp" */ - sock = socket(AF_INET, SOCK_RAW, - (proto ? proto->p_proto : 1)); /* 1 == ICMP */ -#else - sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */ -#endif - if (sock < 0) { - if (errno == EPERM) - bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); - bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket); - } - - /* drop root privs if running setuid */ - xsetuid(getuid()); - - return sock; -} |