Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not disclose endianness/sizeof(long) on probe packet. idea from openbsd

This commit is contained in:
itojun 2004-01-26 02:21:30 +00:00
parent 3e0cc7e92c
commit 22b15c680d
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sbin/ping/ping.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ping.c,v 1.74 2004/01/05 23:23:33 jmmv Exp $ */ /* $NetBSD: ping.c,v 1.75 2004/01/26 02:21:30 itojun Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -58,7 +58,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: ping.c,v 1.74 2004/01/05 23:23:33 jmmv Exp $"); __RCSID("$NetBSD: ping.c,v 1.75 2004/01/26 02:21:30 itojun Exp $");
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -147,6 +147,10 @@ int nrepeats = 0;
#define CLR(seq) (A(seq) &= (~B(seq))) #define CLR(seq) (A(seq) &= (~B(seq)))
#define TST(seq) (A(seq) & B(seq)) #define TST(seq) (A(seq) & B(seq))
struct tv32 {
int32_t tv32_sec;
int32_t tv32_usec;
};
u_char *packet; u_char *packet;
@ -157,11 +161,11 @@ char *fill_pat;
int s; /* Socket file descriptor */ int s; /* Socket file descriptor */
int sloop; /* Socket file descriptor/loopback */ int sloop; /* Socket file descriptor/loopback */
#define PHDR_LEN sizeof(struct timeval) /* size of timestamp header */ #define PHDR_LEN sizeof(struct tv32) /* size of timestamp header */
struct sockaddr_in whereto, send_addr; /* Who to ping */ struct sockaddr_in whereto, send_addr; /* Who to ping */
struct sockaddr_in src_addr; /* from where */ struct sockaddr_in src_addr; /* from where */
struct sockaddr_in loc_addr; /* 127.1 */ struct sockaddr_in loc_addr; /* 127.1 */
int datalen = 64-PHDR_LEN; /* How much data */ int datalen = 64 - PHDR_LEN; /* How much data */
#ifndef __NetBSD__ #ifndef __NetBSD__
static char *progname; static char *progname;
@ -686,8 +690,8 @@ doit(void)
if (ntransmitted < npackets && d_last > 0) { if (ntransmitted < npackets && d_last > 0) {
/* send if within 100 usec or late for next packet */ /* send if within 100 usec or late for next packet */
sec = diffsec(&next_tx,&now); sec = diffsec(&next_tx,&now);
if (sec <= 0.0001 if (sec <= 0.0001 ||
|| (lastrcvd && (pingflags & F_FLOOD))) { (lastrcvd && (pingflags & F_FLOOD))) {
pinger(); pinger();
sec = diffsec(&next_tx,&now); sec = diffsec(&next_tx,&now);
} }
@ -701,7 +705,8 @@ doit(void)
* worst case seen, or 10 times as long as the * worst case seen, or 10 times as long as the
* maximum interpacket interval, whichever is longer. * maximum interpacket interval, whichever is longer.
*/ */
sec = MAX(2*tmax,10*interval) - diffsec(&now,&last_tx); sec = MAX(2 * tmax, 10 * interval) -
diffsec(&now, &last_tx);
if (d_last < sec) if (d_last < sec)
sec = d_last; sec = d_last;
if (sec <= 0) if (sec <= 0)
@ -813,6 +818,7 @@ jiggle(int delta)
static void static void
pinger(void) pinger(void)
{ {
struct tv32 tv32;
int i, cc, sw; int i, cc, sw;
opack_icmp.icmp_code = 0; opack_icmp.icmp_code = 0;
@ -856,9 +862,11 @@ pinger(void)
opack_icmp.icmp_type = ICMP_ECHO; opack_icmp.icmp_type = ICMP_ECHO;
opack_icmp.icmp_id = ident; opack_icmp.icmp_id = ident;
tv32.tv32_sec = htonl(now.tv_sec);
tv32.tv32_usec = htonl(now.tv_usec);
if (pingflags & F_TIMING) if (pingflags & F_TIMING)
(void) memcpy(&opack_icmp.icmp_data[0], &now, sizeof(now)); (void) memcpy(&opack_icmp.icmp_data[0], &tv32, sizeof(tv32));
cc = datalen+PHDR_LEN; cc = datalen + PHDR_LEN;
opack_icmp.icmp_cksum = 0; opack_icmp.icmp_cksum = 0;
opack_icmp.icmp_cksum = in_cksum((u_int16_t *)&opack_icmp, cc); opack_icmp.icmp_cksum = in_cksum((u_int16_t *)&opack_icmp, cc);
@ -987,7 +995,11 @@ pr_pack(u_char *buf,
nreceived++; nreceived++;
if (pingflags & F_TIMING) { if (pingflags & F_TIMING) {
struct timeval tv; struct timeval tv;
(void) memcpy(&tv, icp->icmp_data, sizeof(tv)); struct tv32 tv32;
(void) memcpy(&tv32, icp->icmp_data, sizeof(tv32));
tv.tv_sec = ntohl(tv32.tv32_sec);
tv.tv_usec = ntohl(tv32.tv32_usec);
triptime = diffsec(&last_rx, &tv); triptime = diffsec(&last_rx, &tv);
tsum += triptime; tsum += triptime;
tsumsq += triptime * triptime; tsumsq += triptime * triptime;