diff options
author | Denys Vlasenko | 2013-06-28 00:30:46 +0200 |
---|---|---|
committer | Denys Vlasenko | 2013-06-28 00:30:46 +0200 |
commit | 59f46676a9c03303809f40d1a27c4d2e9e640697 (patch) | |
tree | cb95d1c4f3da2e3ebc9358917a2aac3dafa6cc50 /libbb/create_icmp_socket.c | |
parent | 4928e9f7d0a17898300f20567a331417fafc16c1 (diff) | |
download | busybox-59f46676a9c03303809f40d1a27c4d2e9e640697.zip busybox-59f46676a9c03303809f40d1a27c4d2e9e640697.tar.gz |
Move create_icmp[6]_socket to its only user, and simplify it
function old new delta
run_applet_and_exit 711 714 +3
sendping_tail 239 236 -3
common_ping_main 1798 1770 -28
create_icmp_socket 65 - -65
create_icmp6_socket 65 - -65
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 1/2 up/down: 3/-161) Total: -158 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb/create_icmp_socket.c')
-rw-r--r-- | libbb/create_icmp_socket.c | 36 |
1 files changed, 0 insertions, 36 deletions
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; -} |