diff options
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/arping.c | 12 | ||||
| -rw-r--r-- | networking/inetd.c | 2 | ||||
| -rw-r--r-- | networking/traceroute.c | 10 |
3 files changed, 18 insertions, 6 deletions
diff --git a/networking/arping.c b/networking/arping.c index 5665ddb2b..04eb728a7 100644 --- a/networking/arping.c +++ b/networking/arping.c @@ -52,6 +52,18 @@ static int req_recv; #define MS_TDIFF(tv1,tv2) ( ((tv1).tv_sec-(tv2).tv_sec)*1000 + \ ((tv1).tv_usec-(tv2).tv_usec)/1000 ) +#if 0 +static void set_signal(int signo, void (*handler) (void)) +{ + struct sigaction sa; + + memset(&sa, 0, sizeof(sa)); + sa.sa_handler = (void (*)(int)) handler; + sa.sa_flags = SA_RESTART; + sigaction(signo, &sa, NULL); +} +#endif + static int send_pack(int sock, struct in_addr *src_addr, struct in_addr *dst_addr, struct sockaddr_ll *ME, struct sockaddr_ll *HE) diff --git a/networking/inetd.c b/networking/inetd.c index 54294b635..d3d2cca20 100644 --- a/networking/inetd.c +++ b/networking/inetd.c @@ -1,4 +1,3 @@ -/* vi: set sw=4 ts=4: */ /* $Slackware: inetd.c 1.79s 2001/02/06 13:18:00 volkerdi Exp $ */ /* $OpenBSD: inetd.c,v 1.79 2001/01/30 08:30:57 deraadt Exp $ */ /* $NetBSD: inetd.c,v 1.11 1996/02/22 11:14:41 mycroft Exp $ */ @@ -1802,3 +1801,4 @@ daytime_dg (int s, servtab_t *sep ATTRIBUTE_UNUSED) (void) sendto (s, buffer, strlen (buffer), 0, &sa, sizeof (sa)); } #endif /* CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME */ +/* vi: set sw=4 ts=4: */ diff --git a/networking/traceroute.c b/networking/traceroute.c index c2084fc1e..b7046a054 100644 --- a/networking/traceroute.c +++ b/networking/traceroute.c @@ -548,7 +548,7 @@ static int wait_for_reply(int sock, struct sockaddr_in *fromp, const struct timeval *tp) { fd_set fds; - struct timeval now, tvwait; + struct timeval now, wait; struct timezone tz; int cc = 0; socklen_t fromlen = sizeof(*fromp); @@ -556,12 +556,12 @@ wait_for_reply(int sock, struct sockaddr_in *fromp, const struct timeval *tp) FD_ZERO(&fds); FD_SET(sock, &fds); - tvwait.tv_sec = tp->tv_sec + waittime; - tvwait.tv_usec = tp->tv_usec; + wait.tv_sec = tp->tv_sec + waittime; + wait.tv_usec = tp->tv_usec; (void)gettimeofday(&now, &tz); - tvsub(&tvwait, &now); + tvsub(&wait, &now); - if (select(sock + 1, &fds, NULL, NULL, &tvwait) > 0) + if (select(sock + 1, &fds, NULL, NULL, &wait) > 0) cc = recvfrom(sock, (char *)packet, sizeof(packet), 0, (struct sockaddr *)fromp, &fromlen); |