d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a hop count datatype bogon pointed out in PR#2642 (though my fix

Browse Source 
was slightly different than the one submitted).
Submitted by:	Elmar Bartel <bartel@informatik.tu-muenchen.de>
This commit is contained in:
Jordan K. Hubbard 1997-02-07 20:03:49 +00:00
parent d19c44723d
commit 9a969423ea
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=22413
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libexec/bootpd/bootpgw/bootpgw.c
View File

@ -124,7 +124,7 @@ struct timeval actualtimeout =
15 * 60L, /* tv_sec */
0 /* tv_usec */
};
u_int maxhops = 4; /* Number of hops allowed for requests. */
u_char maxhops = 4; /* Number of hops allowed for requests. */
u_int minwait = 3; /* Number of seconds client must wait before
its bootrequest packets are forwarded. */
@ -281,7 +281,7 @@ main(argc, argv)
"bootpgw: invalid hop count limit\n");
break;
}
maxhops = (u_int)n;
maxhops = (u_char)n;
break;
case 'i': /* inetd mode */
@ -528,7 +528,8 @@ static void
handle_request()
{
struct bootp *bp = (struct bootp *) pktbuf;
u_short secs, hops;
u_short secs;
u_char hops;
/* XXX - SLIP init: Set bp_ciaddr = recv_addr here? */
@ -542,13 +543,13 @@ handle_request()
return;
/* Has this packet hopped too many times? */
hops = ntohs(bp->bp_hops);
hops = bp->bp_hops;
if (++hops > maxhops) {
report(LOG_NOTICE, "reqest from %s reached hop limit",
inet_ntoa(recv_addr.sin_addr));
return;
}
bp->bp_hops = htons(hops);
bp->bp_hops = hops;
/*
* Here one might discard a request from the same subnet as the