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

ping: add -p to specify data pattern

Browse Source 
function                                             old     new   delta
common_ping_main                                    1788    1831     +43
sendping6                                             56      82     +26
sendping4                                             82     108     +26
packed_usage                                       29959   29938     -21
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/1 up/down: 95/-21)             Total: 74 bytes

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Florian Fainelli 2014-08-27 16:01:25 +02:00 committed by Denys Vlasenko
parent 962c4e8220
commit 6ff0551157
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
networking/ping.c
View File

@ -100,8 +100,9 @@
//usage: "\n (after all -c CNT packets are sent)" //usage: "\n (after all -c CNT packets are sent)"
//usage: "\n -w SEC Seconds until ping exits (default:infinite)" //usage: "\n -w SEC Seconds until ping exits (default:infinite)"
//usage: "\n (can exit earlier with -c CNT)" //usage: "\n (can exit earlier with -c CNT)"
//usage: "\n -q Quiet, only displays output at start" //usage: "\n -q Quiet, only display output at start"
//usage: "\n and when finished" //usage: "\n and when finished"
//usage: "\n -p Pattern to use for payload"
//usage: //usage:
//usage:# define ping6_trivial_usage //usage:# define ping6_trivial_usage
//usage: "[OPTIONS] HOST" //usage: "[OPTIONS] HOST"
@ -110,8 +111,9 @@
//usage: "\n -c CNT Send only CNT pings" //usage: "\n -c CNT Send only CNT pings"
//usage: "\n -s SIZE Send SIZE data bytes in packets (default:56)" //usage: "\n -s SIZE Send SIZE data bytes in packets (default:56)"
//usage: "\n -I IFACE/IP Use interface or IP address as source" //usage: "\n -I IFACE/IP Use interface or IP address as source"
//usage: "\n -q Quiet, only displays output at start" //usage: "\n -q Quiet, only display output at start"
//usage: "\n and when finished" //usage: "\n and when finished"
//usage: "\n -p Pattern to use for payload"
//usage: //usage:
//usage:#endif //usage:#endif
//usage: //usage:
@ -330,7 +332,7 @@ static int common_ping_main(sa_family_t af, char **argv)
/* Full(er) version */ /* Full(er) version */
#define OPT_STRING ("qvc:s:t:w:W:I:n4" IF_PING6("6")) #define OPT_STRING ("qvc:s:t:w:W:I:np:4" IF_PING6("6"))
enum { enum {
OPT_QUIET = 1 << 0, OPT_QUIET = 1 << 0,
OPT_VERBOSE = 1 << 1, OPT_VERBOSE = 1 << 1,
@ -341,8 +343,9 @@ enum {
OPT_W = 1 << 6, OPT_W = 1 << 6,
OPT_I = 1 << 7, OPT_I = 1 << 7,
/*OPT_n = 1 << 8, - ignored */ /*OPT_n = 1 << 8, - ignored */
OPT_IPV4 = 1 << 9, OPT_p = 1 << 9,
OPT_IPV6 = (1 << 10) * ENABLE_PING6, OPT_IPV4 = 1 << 10,
OPT_IPV6 = (1 << 11) * ENABLE_PING6,
}; };
@ -355,6 +358,7 @@ struct globals {
unsigned opt_ttl; unsigned opt_ttl;
unsigned long ntransmitted, nreceived, nrepeats; unsigned long ntransmitted, nreceived, nrepeats;
uint16_t myid; uint16_t myid;
uint8_t pattern;
unsigned tmin, tmax; /* in us */ unsigned tmin, tmax; /* in us */
unsigned long long tsum; /* in us, sum of all times */ unsigned long long tsum; /* in us, sum of all times */
unsigned deadline; unsigned deadline;
@ -485,7 +489,7 @@ static void sendping4(int junk UNUSED_PARAM)
{ {
struct icmp *pkt = G.snd_packet; struct icmp *pkt = G.snd_packet;
//memset(pkt, 0, datalen + ICMP_MINLEN + 4); - G.snd_packet was xzalloced memset(pkt, G.pattern, datalen + ICMP_MINLEN + 4);
pkt->icmp_type = ICMP_ECHO; pkt->icmp_type = ICMP_ECHO;
/*pkt->icmp_code = 0;*/ /*pkt->icmp_code = 0;*/
pkt->icmp_cksum = 0; /* cksum is calculated with this field set to 0 */ pkt->icmp_cksum = 0; /* cksum is calculated with this field set to 0 */
@ -508,7 +512,7 @@ static void sendping6(int junk UNUSED_PARAM)
{ {
struct icmp6_hdr *pkt = G.snd_packet; struct icmp6_hdr *pkt = G.snd_packet;
//memset(pkt, 0, datalen + sizeof(struct icmp6_hdr) + 4); memset(pkt, G.pattern, datalen + sizeof(struct icmp6_hdr) + 4);
pkt->icmp6_type = ICMP6_ECHO_REQUEST; pkt->icmp6_type = ICMP6_ECHO_REQUEST;
/*pkt->icmp6_code = 0;*/ /*pkt->icmp6_code = 0;*/
/*pkt->icmp6_cksum = 0;*/ /*pkt->icmp6_cksum = 0;*/
@ -850,13 +854,13 @@ static void ping(len_and_sockaddr *lsa)
static int common_ping_main(int opt, char **argv) static int common_ping_main(int opt, char **argv)
{ {
len_and_sockaddr *lsa; len_and_sockaddr *lsa;
char *str_s; char *str_s, *str_p;
INIT_G(); INIT_G();
/* exactly one argument needed; -v and -q don't mix; -c NUM, -t NUM, -w NUM, -W NUM */ /* exactly one argument needed; -v and -q don't mix; -c NUM, -t NUM, -w NUM, -W NUM */
opt_complementary = "=1:q--v:v--q:c+:t+:w+:W+"; opt_complementary = "=1:q--v:v--q:c+:t+:w+:W+";
opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &opt_ttl, &deadline, &timeout, &str_I); opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &opt_ttl, &deadline, &timeout, &str_I, &str_p);
if (opt & OPT_s) if (opt & OPT_s)
datalen = xatou16(str_s); // -s datalen = xatou16(str_s); // -s
if (opt & OPT_I) { // -I if (opt & OPT_I) { // -I
@ -867,6 +871,9 @@ static int common_ping_main(int opt, char **argv)
str_I = NULL; /* don't try to bind to device later */ str_I = NULL; /* don't try to bind to device later */
} }
} }
if (opt & OPT_p)
G.pattern = xstrtou_range(str_p, 16, 0, 255);
myid = (uint16_t) getpid(); myid = (uint16_t) getpid();
hostname = argv[optind]; hostname = argv[optind];
#if ENABLE_PING6 #if ENABLE_PING6