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

If a packet causes a dial, continue to test whether it's

Browse Source 
blocked in the output filter.  If so, proceed with the
dial despite dropping the packet.
This commit is contained in:
brian 1997-12-28 02:46:26 +00:00
parent 02739ba22b
commit 2d96434340
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/ppp/ip.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: ip.c,v 1.32 1997/11/22 03:37:33 brian Exp $
* $Id: ip.c,v 1.33 1997/12/24 09:29:01 brian Exp $
*
* TODO:
* o Return ICMP message for filterd packet
@ -273,7 +273,7 @@ PacketCheck(char *cp, int nb, int direction)
int logit, loglen;
static char logbuf[200];
logit = LogIsKept(LogTCPIP);
logit = LogIsKept(LogTCPIP) && direction != FL_DIAL;
loglen = 0;
pip = (struct ip *) cp;

20
usr.sbin/ppp/main.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: main.c,v 1.111 1997/12/24 09:29:06 brian Exp $
* $Id: main.c,v 1.112 1997/12/27 13:45:53 brian Exp $
*
* TODO:
* o Add commands for traffic summary, version display, etc.
@ -1098,20 +1098,10 @@ DoLoop(void)
* Process on-demand dialup. Output packets are queued within tunnel
* device until IPCP is opened.
*/
if (LcpFsm.state <= ST_CLOSED && (mode & MODE_AUTO)) {
pri = PacketCheck(rbuff, n, FL_DIAL);
if (pri >= 0) {
#ifndef NOALIAS
if (mode & MODE_ALIAS) {
VarPacketAliasOut(rbuff, sizeof rbuff);
n = ntohs(((struct ip *) rbuff)->ip_len);
}
#endif
IpEnqueue(pri, rbuff, n);
dial_up = 1; /* XXX */
}
continue;
}
if (LcpFsm.state <= ST_CLOSED && (mode & MODE_AUTO) &&
(pri = PacketCheck(rbuff, n, FL_DIAL)) >= 0)
dial_up = 1;
pri = PacketCheck(rbuff, n, FL_OUT);
if (pri >= 0) {
#ifndef NOALIAS