jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-04 10:19:26 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Deal with a case where the returned packed was smaller than the

Browse Source 
transmitted packet (because the remote host stripped off our icmp_data).

Submitted by:	 Maxim Konovalov <maxim@macomnet.ru>
This commit is contained in:
Matthew N. Dodd 2003-04-07 12:05:50 +00:00
parent 5c514aeee8
commit 47e9b3ea64
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=113217
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sbin/ping/ping.c
View File

@ -955,17 +955,20 @@ pr_pack(buf, cc, from, tv)
#endif
tp += phdr_len;
/* Copy to avoid alignment problems: */
memcpy(&tv1, tp, sizeof(tv1));
tvsub(tv, &tv1);
triptime = ((double)tv->tv_sec) * 1000.0 +
((double)tv->tv_usec) / 1000.0;
tsum += triptime;
tsumsq += triptime * triptime;
if (triptime < tmin)
tmin = triptime;
if (triptime > tmax)
tmax = triptime;
if (cc - ICMP_MINLEN - phdr_len >= sizeof(tv1)) {
/* Copy to avoid alignment problems: */
memcpy(&tv1, tp, sizeof(tv1));
tvsub(tv, &tv1);
triptime = ((double)tv->tv_sec) * 1000.0 +
((double)tv->tv_usec) / 1000.0;
tsum += triptime;
tsumsq += triptime * triptime;
if (triptime < tmin)
tmin = triptime;
if (triptime > tmax)
tmax = triptime;
} else
timing = 0;
}
seq = ntohs(icp->icmp_seq);
@ -1008,7 +1011,9 @@ pr_pack(buf, cc, from, tv)
/* check the data */
cp = (u_char*)&icp->icmp_data[phdr_len];
dp = &outpack[MINICMPLEN + phdr_len];
for (i = phdr_len; i < datalen; ++i, ++cp, ++dp) {
cc -= ICMP_MINLEN + phdr_len;
for (i = phdr_len; i < datalen && cc != 0;
++i, ++cp, ++dp, cc--) {
if (*cp != *dp) {
(void)printf("\nwrong data byte #%d should be 0x%x but was 0x%x",
i, *dp, *cp);