5g-team
/
fping
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reformat

Browse Source
version3
David Schweikert 8 years ago
parent 7a5f9b29d2
commit a993bf5043
3 changed files with 82 additions and 65 deletions
Show Stats Download Patch File Download Diff File

3
ChangeLog
Unescape Escape View File

@ -1,5 +1,6 @@
Unreleased (version 3 branch) Unreleased (version 3 branch)
* Fix compatibility issue with GNU Hurd * Fix portability issue with GNU Hurd
* Fix C89 portability issue
2017-02-09 David Schweikert <david@schweikert.ch> 2017-02-09 David Schweikert <david@schweikert.ch>
* Version 3.16 * Version 3.16

1
src/.clang-format
Unescape Escape View File

@ -1 +1,2 @@
BasedOnStyle: WebKit BasedOnStyle: WebKit
BreakBeforeBraces: Stroustrup

123
src/fping.c
Unescape Escape View File

@ -573,7 +573,8 @@ int main(int argc, char** argv)
fprintf(stderr, "%s: -O (set TOS) for IPv6 not supported on this platform\n", prog); fprintf(stderr, "%s: -O (set TOS) for IPv6 not supported on this platform\n", prog);
#endif #endif
#endif #endif
} else { }
else {
usage(1); usage(1);
} }
break; break;
@ -599,7 +600,6 @@ int main(int argc, char** argv)
if (unreachable_flag && alive_flag) { if (unreachable_flag && alive_flag) {
fprintf(stderr, "%s: specify only one of a, u\n", argv[0]); fprintf(stderr, "%s: specify only one of a, u\n", argv[0]);
exit(1); exit(1);
} }
if (count_flag && loop_flag) { if (count_flag && loop_flag) {
@ -760,7 +760,6 @@ int main(int argc, char** argv)
while (*argv) { while (*argv) {
add_name(*argv); add_name(*argv);
++argv; ++argv;
} }
} }
else if (filename) { else if (filename) {
@ -787,16 +786,20 @@ int main(int argc, char** argv)
} }
fclose(ping_file); fclose(ping_file);
} else if (*argv && generate_flag) { }
else if (*argv && generate_flag) {
if (argc == 1) { if (argc == 1) {
/* one target: we expect a cidr range (n.n.n.n/m) */ /* one target: we expect a cidr range (n.n.n.n/m) */
add_cidr(argv[0]); add_cidr(argv[0]);
} else if (argc == 2) { }
else if (argc == 2) {
add_range(argv[0], argv[1]); add_range(argv[0], argv[1]);
} else { }
else {
usage(1); usage(1);
} }
} else { }
else {
usage(1); usage(1);
} }
@ -832,7 +835,6 @@ int main(int argc, char** argv)
buf[n] = '\0'; buf[n] = '\0';
cursor->pad = buf; cursor->pad = buf;
} }
cursor = cursor->ev_next; cursor = cursor->ev_next;
@ -972,7 +974,7 @@ void add_range(char* start, char* end)
fprintf(stderr, "Error: -g works only with IPv4 addresses\n"); fprintf(stderr, "Error: -g works only with IPv4 addresses\n");
exit(1); exit(1);
} }
end_long = ntohl(((struct sockaddr_in *) addr_res->ai_addr)->sin_addr.s_addr); end_long = ntohl(((struct sockaddr_in*)addr_res->ai_addr)->sin_addr.s_addr);
freeaddrinfo(addr_res); freeaddrinfo(addr_res);
if (end_long > start_long + MAX_GENERATE) { if (end_long > start_long + MAX_GENERATE) {
@ -1067,7 +1069,8 @@ void main_loop()
if (ev_first) { if (ev_first) {
if (ev_first->ev_time.tv_sec == 0) { if (ev_first->ev_time.tv_sec == 0) {
wait_time = 0; wait_time = 0;
} else { }
else {
wait_time = timeval_diff(&ev_first->ev_time, &current_time); wait_time = timeval_diff(&ev_first->ev_time, &current_time);
if (wait_time < 0) if (wait_time < 0)
wait_time = 0; wait_time = 0;
@ -1079,7 +1082,8 @@ void main_loop()
lt = timeval_diff(&current_time, &last_send_time); lt = timeval_diff(&current_time, &last_send_time);
if (lt < interval) { if (lt < interval) {
wait_time = interval - lt; wait_time = interval - lt;
} else { }
else {
wait_time = 0; wait_time = 0;
} }
} }
@ -1090,7 +1094,8 @@ void main_loop()
fprintf(stderr, "next event in %d ms (%s)\n", wait_time / 100, ev_first->host); fprintf(stderr, "next event in %d ms (%s)\n", wait_time / 100, ev_first->host);
} }
#endif #endif
} else { }
else {
wait_time = interval; wait_time = interval;
} }
@ -1162,7 +1167,6 @@ void finish()
printf(" is unreachable"); printf(" is unreachable");
printf("\n"); printf("\n");
} }
} }
} }
@ -1183,7 +1187,6 @@ void finish()
exit(1); exit(1);
exit(0); exit(0);
} }
/************************************************************ /************************************************************
@ -1223,7 +1226,8 @@ void print_per_system_stats(void)
} }
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} else { }
else {
if (h->num_recv <= h->num_sent) { if (h->num_recv <= h->num_sent) {
fprintf(stderr, " xmt/rcv/%%loss = %d/%d/%d%%", fprintf(stderr, " xmt/rcv/%%loss = %d/%d/%d%%",
h->num_sent, h->num_recv, h->num_sent > 0 ? ((h->num_sent - h->num_recv) * 100) / h->num_sent : 0); h->num_sent, h->num_recv, h->num_sent > 0 ? ((h->num_sent - h->num_recv) * 100) / h->num_sent : 0);
@ -1233,8 +1237,8 @@ void print_per_system_stats(void)
outage_ms = (h->num_sent - h->num_recv) * perhost_interval / 100; outage_ms = (h->num_sent - h->num_recv) * perhost_interval / 100;
fprintf(stderr, ", outage(ms) = %d", outage_ms); fprintf(stderr, ", outage(ms) = %d", outage_ms);
} }
}
} else { else {
fprintf(stderr, " xmt/rcv/%%return = %d/%d/%d%%", fprintf(stderr, " xmt/rcv/%%return = %d/%d/%d%%",
h->num_sent, h->num_recv, h->num_sent, h->num_recv,
((h->num_recv * 100) / h->num_sent)); ((h->num_recv * 100) / h->num_sent));
@ -1340,12 +1344,10 @@ void print_netdata(void)
printf("SET min = %d\n", h->min_reply_i); printf("SET min = %d\n", h->min_reply_i);
printf("SET avg = %d\n", avg); printf("SET avg = %d\n", avg);
printf("SET max = %d\n", h->max_reply_i); printf("SET max = %d\n", h->max_reply_i);
} }
printf("END\n"); printf("END\n");
h->num_sent_i = h->num_recv_i = h->max_reply_i = h->min_reply_i = h->total_time_i = 0; h->num_sent_i = h->num_recv_i = h->max_reply_i = h->min_reply_i = h->total_time_i = 0;
} }
sent_charts = 1; sent_charts = 1;
@ -1402,7 +1404,8 @@ void print_per_system_splits(void)
outage_ms_i = (h->num_sent_i - h->num_recv_i) * perhost_interval / 100; outage_ms_i = (h->num_sent_i - h->num_recv_i) * perhost_interval / 100;
fprintf(stderr, ", outage(ms) = %d", outage_ms_i); fprintf(stderr, ", outage(ms) = %d", outage_ms_i);
} }
} else { }
else {
fprintf(stderr, " xmt/rcv/%%return = %d/%d/%d%%", fprintf(stderr, " xmt/rcv/%%return = %d/%d/%d%%",
h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ? ((h->num_recv_i * 100) / h->num_sent_i) : 0); h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ? ((h->num_recv_i * 100) / h->num_sent_i) : 0);
} }
@ -1452,7 +1455,6 @@ void print_global_stats(void)
max_reply = 0; max_reply = 0;
total_replies = 1; total_replies = 1;
sum_replies = 0; sum_replies = 0;
} }
fprintf(stderr, " %s ms (min round trip time)\n", sprint_tm(min_reply)); fprintf(stderr, " %s ms (min round trip time)\n", sprint_tm(min_reply));
@ -1462,7 +1464,6 @@ void print_global_stats(void)
fprintf(stderr, " %12.3f sec (elapsed real time)\n", fprintf(stderr, " %12.3f sec (elapsed real time)\n",
timeval_diff(&end_time, &start_time) / 100000.0); timeval_diff(&end_time, &start_time) / 100000.0);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
/************************************************************ /************************************************************
@ -1513,7 +1514,8 @@ int send_ping(int s, HOST_ENTRY* h)
h->resp_times[h->num_sent] = RESP_ERROR; h->resp_times[h->num_sent] = RESP_ERROR;
ret = 0; ret = 0;
} else { }
else {
/* mark this trial as outstanding */ /* mark this trial as outstanding */
if (!loop_flag) if (!loop_flag)
h->resp_times[h->num_sent] = RESP_WAITING; h->resp_times[h->num_sent] = RESP_WAITING;
@ -1549,7 +1551,8 @@ select_again:
if (errno == EINTR) { if (errno == EINTR) {
/* interrupted system call: redo the select */ /* interrupted system call: redo the select */
goto select_again; goto select_again;
} else { }
else {
perror("select"); perror("select");
} }
} }
@ -1645,7 +1648,8 @@ int wait_for_reply(long wait_time)
if (wait_time < 100000) { if (wait_time < 100000) {
to.tv_sec = 0; to.tv_sec = 0;
to.tv_usec = wait_time * 10; to.tv_usec = wait_time * 10;
} else { }
else {
to.tv_sec = wait_time / 100000; to.tv_sec = wait_time / 100000;
to.tv_usec = (wait_time % 100000) * 10; to.tv_usec = (wait_time % 100000) * 10;
} }
@ -1743,7 +1747,8 @@ int wait_for_reply(long wait_time)
if (h->discard_next_recv_i) { if (h->discard_next_recv_i) {
h->discard_next_recv_i = 0; h->discard_next_recv_i = 0;
} else { }
else {
h->num_recv_i++; h->num_recv_i++;
if (!h->max_reply_i || this_reply > h->max_reply_i) if (!h->max_reply_i || this_reply > h->max_reply_i)
h->max_reply_i = this_reply; h->max_reply_i = this_reply;
@ -1787,18 +1792,15 @@ int wait_for_reply(long wait_time)
fprintf(stderr, " [<- %s]", buf); fprintf(stderr, " [<- %s]", buf);
} }
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
} }
else else
h->resp_times[this_count] = this_reply; h->resp_times[this_count] = this_reply;
} }
else { else {
/* count is out of bounds?? */ /* count is out of bounds?? */
fprintf(stderr, "%s : duplicate for [%d], %d bytes, %s ms\n", fprintf(stderr, "%s : duplicate for [%d], %d bytes, %s ms\n",
h->host, this_count, result, sprint_tm(this_reply)); h->host, this_count, result, sprint_tm(this_reply));
} }
} }
@ -1837,8 +1839,8 @@ int wait_for_reply(long wait_time)
if (h->num_recv <= h->num_sent) { if (h->num_recv <= h->num_sent) {
printf("%d%% loss)", printf("%d%% loss)",
((h->num_sent - h->num_recv) * 100) / h->num_sent); ((h->num_sent - h->num_recv) * 100) / h->num_sent);
}
} else { else {
printf("%d%% return)", printf("%d%% return)",
(h->num_recv_total * 100) / h->num_sent); (h->num_recv_total * 100) / h->num_sent);
} }
@ -1850,7 +1852,6 @@ int wait_for_reply(long wait_time)
} }
printf("\n"); printf("\n");
} }
/* remove this job, if we are done */ /* remove this job, if we are done */
@ -1911,7 +1912,8 @@ int handle_random_icmp(FPING_ICMPHDR* p, struct sockaddr* addr, socklen_t addr_l
if (icmp_code > ICMP_UNREACH_MAXTYPE) { if (icmp_code > ICMP_UNREACH_MAXTYPE) {
print_warning("ICMP Unreachable (Invalid Code) from %s for ICMP Echo sent to %s", print_warning("ICMP Unreachable (Invalid Code) from %s for ICMP Echo sent to %s",
addr_ascii, h->host); addr_ascii, h->host);
} else { }
else {
print_warning("%s from %s for ICMP Echo sent to %s", print_warning("%s from %s for ICMP Echo sent to %s",
icmp_unreach_str[icmp_code], addr_ascii, h->host); icmp_unreach_str[icmp_code], addr_ascii, h->host);
} }
@ -1935,7 +1937,8 @@ int handle_random_icmp(FPING_ICMPHDR* p, struct sockaddr* addr, socklen_t addr_l
if (icmp_type <= ICMP_TYPE_STR_MAX) { if (icmp_type <= ICMP_TYPE_STR_MAX) {
print_warning("%s from %s for ICMP Echo sent to %s", print_warning("%s from %s for ICMP Echo sent to %s",
icmp_type_str[icmp_type], addr_ascii, h->host); icmp_type_str[icmp_type], addr_ascii, h->host);
} else { }
else {
print_warning("ICMP %d from %s for ICMP Echo sent to %s", print_warning("ICMP %d from %s for ICMP Echo sent to %s",
icmp_type, addr_ascii, h->host); icmp_type, addr_ascii, h->host);
} }
@ -1944,7 +1947,6 @@ int handle_random_icmp(FPING_ICMPHDR* p, struct sockaddr* addr, socklen_t addr_l
print_warning(" (%s)", addr_ascii); print_warning(" (%s)", addr_ascii);
print_warning("\n"); print_warning("\n");
} }
return 2; return 2;
@ -1959,7 +1961,6 @@ int handle_random_icmp(FPING_ICMPHDR* p, struct sockaddr* addr, socklen_t addr_l
case ICMP_MASKREPLY: case ICMP_MASKREPLY:
default: default:
return 0; return 0;
} }
} }
@ -2015,7 +2016,8 @@ void add_name(char* name)
/* name_flag: addr -> name lookup requested) */ /* name_flag: addr -> name lookup requested) */
if (!name_flag) { if (!name_flag) {
printname = name; printname = name;
} else { }
else {
int ret; int ret;
ret = getnameinfo(res->ai_addr, res->ai_addrlen, namebuf, ret = getnameinfo(res->ai_addr, res->ai_addrlen, namebuf,
sizeof(namebuf) / sizeof(char), NULL, 0, 0); sizeof(namebuf) / sizeof(char), NULL, 0, 0);
@ -2024,7 +2026,8 @@ void add_name(char* name)
print_warning("%s: can't reverse-lookup (%s)\n", name, gai_strerror(ret)); print_warning("%s: can't reverse-lookup (%s)\n", name, gai_strerror(ret));
} }
printname = name; printname = name;
} else { }
else {
printname = namebuf; printname = namebuf;
} }
} }
@ -2045,10 +2048,12 @@ void add_name(char* name)
char nameaddrbuf[512]; char nameaddrbuf[512];
snprintf(nameaddrbuf, sizeof(nameaddrbuf) / sizeof(char), "%s (%s)", printname, addrbuf); snprintf(nameaddrbuf, sizeof(nameaddrbuf) / sizeof(char), "%s (%s)", printname, addrbuf);
add_addr(name, nameaddrbuf, res->ai_addr, res->ai_addrlen); add_addr(name, nameaddrbuf, res->ai_addr, res->ai_addrlen);
} else { }
else {
add_addr(name, addrbuf, res->ai_addr, res->ai_addrlen); add_addr(name, addrbuf, res->ai_addr, res->ai_addrlen);
} }
} else { }
else {
add_addr(name, printname, res->ai_addr, res->ai_addrlen); add_addr(name, printname, res->ai_addr, res->ai_addrlen);
} }
@ -2114,7 +2119,6 @@ void add_addr(char* name, char* host, struct sockaddr* ipaddr, socklen_t ipaddr_
i[n] = RESP_UNUSED; i[n] = RESP_UNUSED;
p->resp_times = i; p->resp_times = i;
} }
#if defined(DEBUG) || defined(_DEBUG) #if defined(DEBUG) || defined(_DEBUG)
@ -2128,7 +2132,6 @@ void add_addr(char* name, char* host, struct sockaddr* ipaddr, socklen_t ipaddr_
i[n] = RESP_UNUSED; i[n] = RESP_UNUSED;
p->sent_times = i; p->sent_times = i;
} }
#endif /* DEBUG || _DEBUG */ #endif /* DEBUG || _DEBUG */
@ -2245,9 +2248,11 @@ long timeval_diff(struct timeval* a, struct timeval* b)
long sec_diff = a->tv_sec - b->tv_sec; long sec_diff = a->tv_sec - b->tv_sec;
if (sec_diff == 0) { if (sec_diff == 0) {
return (a->tv_usec - b->tv_usec) / 10; return (a->tv_usec - b->tv_usec) / 10;
} else if (sec_diff < 100) { }
else if (sec_diff < 100) {
return (sec_diff * 1000000 + a->tv_usec - b->tv_usec) / 10; return (sec_diff * 1000000 + a->tv_usec - b->tv_usec) / 10;
} else { }
else {
/* For such large differences, we don't really care about the microseconds... */ /* For such large differences, we don't really care about the microseconds... */
return sec_diff * 100000; return sec_diff * 100000;
} }
@ -2289,19 +2294,24 @@ char* sprint_tm(int t)
if (t < 0) { if (t < 0) {
/* negative (unexpected) */ /* negative (unexpected) */
sprintf(buf, "%.2g", (double)t / 100); sprintf(buf, "%.2g", (double)t / 100);
} else if (t < 100) { }
else if (t < 100) {
/* <= 0.99 ms */ /* <= 0.99 ms */
sprintf(buf, "0.%02d", t); sprintf(buf, "0.%02d", t);
} else if (t < 1000) { }
else if (t < 1000) {
/* 1.00 - 9.99 ms */ /* 1.00 - 9.99 ms */
sprintf(buf, "%d.%02d", t / 100, t % 100); sprintf(buf, "%d.%02d", t / 100, t % 100);
} else if (t < 10000) { }
else if (t < 10000) {
/* 10.0 - 99.9 ms */ /* 10.0 - 99.9 ms */
sprintf(buf, "%d.%d", t / 100, (t % 100) / 10); sprintf(buf, "%d.%d", t / 100, (t % 100) / 10);
} else if (t < 100000000) { }
else if (t < 100000000) {
/* 100 - 1'000'000 ms */ /* 100 - 1'000'000 ms */
sprintf(buf, "%d", t / 100); sprintf(buf, "%d", t / 100);
} else { }
else {
sprintf(buf, "%.2e", (double)(t / 100)); sprintf(buf, "%.2e", (double)(t / 100));
} }
@ -2328,7 +2338,8 @@ select_again:
if (timo < 100000) { if (timo < 100000) {
to.tv_sec = 0; to.tv_sec = 0;
to.tv_usec = timo * 10; to.tv_usec = timo * 10;
} else { }
else {
to.tv_sec = timo / 100000; to.tv_sec = timo / 100000;
to.tv_usec = (timo % 100000) * 10; to.tv_usec = (timo % 100000) * 10;
} }
@ -2342,7 +2353,8 @@ select_again:
if (errno == EINTR) { if (errno == EINTR) {
/* interrupted system call: redo the select */ /* interrupted system call: redo the select */
goto select_again; goto select_again;
} else { }
else {
errno_crash_and_burn("select"); errno_crash_and_burn("select");
} }
} }
@ -2367,10 +2379,12 @@ int addr_cmp(struct sockaddr* a, struct sockaddr* b)
{ {
if (a->sa_family != b->sa_family) { if (a->sa_family != b->sa_family) {
return a->sa_family - b->sa_family; return a->sa_family - b->sa_family;
} else { }
else {
if (a->sa_family == AF_INET) { if (a->sa_family == AF_INET) {
return ((struct sockaddr_in*)a)->sin_addr.s_addr - ((struct sockaddr_in*)b)->sin_addr.s_addr; return ((struct sockaddr_in*)a)->sin_addr.s_addr - ((struct sockaddr_in*)b)->sin_addr.s_addr;
} else if (a->sa_family == AF_INET6) { }
else if (a->sa_family == AF_INET6) {
return memcmp(&((struct sockaddr_in6*)a)->sin6_addr, return memcmp(&((struct sockaddr_in6*)a)->sin6_addr,
&((struct sockaddr_in6*)b)->sin6_addr, &((struct sockaddr_in6*)b)->sin6_addr,
sizeof(((struct sockaddr_in6*)a)->sin6_addr)); sizeof(((struct sockaddr_in6*)a)->sin6_addr));
@ -2435,7 +2449,8 @@ void ev_enqueue(HOST_ENTRY* h)
i->ev_prev = h; i->ev_prev = h;
if (i_prev != NULL) { if (i_prev != NULL) {
i_prev->ev_next = h; i_prev->ev_next = h;
} else { }
else {
ev_first = h; ev_first = h;
} }
return; return;

Write Preview
Loading…
Cancel
Save