9b03b51375
ppp based on these patches for about 3 weeks with no downtime. The original submitters comments: Two features iijppp has over kernel ppp that I like are predictor1 compression and demand dialing. Here are a few bug fixes. I expanded the priority queueing scheme and discovered it was broken due to the assignment at ip.c line 300. All packets were being queued at the same priority. Fixing priority queueing broke predictor1 compression. Packets were compressed before being queued and predictor1 worked as long as the packets were popped off the queue in the same order they were pushed onto the queue. There were a few byte order problems in IP header tests also. There is a recursion problem in SendLqrReport(). LcpClose() is called when "Too many echo packets are lost" which winds up in SendLqrReport() again. I believe the original intention was to just stop the LQR timer with the call to StopLqr() but the side effects hurt. Submitted by: John Capo <jc@irbs.com>
404 lines
9.2 KiB
C
404 lines
9.2 KiB
C
/*
|
|
* PPP IP Protocol Interface
|
|
*
|
|
* Written by Toshiharu OHNO (tony-o@iij.ad.jp)
|
|
*
|
|
* Copyright (C) 1993, Internet Initiative Japan, Inc. All rights reserverd.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted
|
|
* provided that the above copyright notice and this paragraph are
|
|
* duplicated in all such forms and that any documentation,
|
|
* advertising materials, and other materials related to such
|
|
* distribution and use acknowledge that the software was developed
|
|
* by the Internet Initiative Japan. The name of the
|
|
* IIJ may not be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*
|
|
* $Id: ip.c,v 1.7 1996/01/11 17:48:49 phk Exp $
|
|
*
|
|
* TODO:
|
|
* o Return ICMP message for filterd packet
|
|
* and optionaly record it into log.
|
|
*/
|
|
#include "fsm.h"
|
|
#include "lcpproto.h"
|
|
#include "hdlc.h"
|
|
#include <netinet/in_systm.h>
|
|
#include <netinet/ip.h>
|
|
#include <netinet/ip_icmp.h>
|
|
#include <netinet/udp.h>
|
|
#include <netinet/tcp.h>
|
|
#include <arpa/inet.h>
|
|
#include "vars.h"
|
|
#include "filter.h"
|
|
|
|
extern void SendPppFrame();
|
|
extern void LcpClose();
|
|
|
|
static struct pppTimer IdleTimer;
|
|
|
|
static void IdleTimeout()
|
|
{
|
|
LogPrintf(LOG_PHASE, "Idle timer expired.\n");
|
|
LcpClose();
|
|
}
|
|
|
|
/*
|
|
* Start Idle timer. If timeout is reached, we call LcpClose() to
|
|
* close LCP and link.
|
|
*/
|
|
void
|
|
StartIdleTimer()
|
|
{
|
|
if (!(mode & MODE_DEDICATED)) {
|
|
StopTimer(&IdleTimer);
|
|
IdleTimer.func = IdleTimeout;
|
|
IdleTimer.load = VarIdleTimeout * SECTICKS;
|
|
IdleTimer.state = TIMER_STOPPED;
|
|
StartTimer(&IdleTimer);
|
|
}
|
|
}
|
|
|
|
void
|
|
StopIdleTimer()
|
|
{
|
|
StopTimer(&IdleTimer);
|
|
}
|
|
|
|
/*
|
|
* If any IP layer traffic is detected, refresh IdleTimer.
|
|
*/
|
|
static void
|
|
RestartIdleTimer()
|
|
{
|
|
if (!(mode & MODE_DEDICATED) && ipKeepAlive ) {
|
|
StartTimer(&IdleTimer);
|
|
ipIdleSecs = 0;
|
|
}
|
|
}
|
|
|
|
static u_short interactive_ports[32] = {
|
|
544, 513, 514, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
0, 0, 0, 0, 0, 21, 22, 23, 0, 0, 0, 0, 0, 0, 0, 543,
|
|
};
|
|
|
|
#define INTERACTIVE(p) (interactive_ports[(p) & 0x1F] == (p))
|
|
|
|
static char *TcpFlags[] = {
|
|
"FIN", "SYN", "RST", "PSH", "ACK", "URG",
|
|
};
|
|
|
|
static char *Direction[] = { "INP", "OUT", "OUT", "IN/OUT" };
|
|
static struct filterent *Filters[] = { ifilters, ofilters, dfilters, afilters };
|
|
|
|
static int
|
|
PortMatch(op, pport, rport)
|
|
int op;
|
|
u_short pport, rport;
|
|
{
|
|
switch (op) {
|
|
case OP_EQ:
|
|
return(pport == rport);
|
|
case OP_GT:
|
|
return(pport > rport);
|
|
case OP_LT:
|
|
return(pport < rport);
|
|
default:
|
|
return(0);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Check a packet against with defined filters
|
|
*/
|
|
static int
|
|
FilterCheck(pip, direction)
|
|
struct ip *pip;
|
|
int direction;
|
|
{
|
|
struct filterent *fp = Filters[direction];
|
|
int gotinfo, cproto, estab, n;
|
|
struct tcphdr *th;
|
|
struct udphdr *uh;
|
|
struct icmp *ih;
|
|
char *ptop;
|
|
u_short sport, dport;
|
|
|
|
if (fp->action) {
|
|
cproto = gotinfo = estab = 0;
|
|
sport = dport = 0;
|
|
for (n = 0; n < MAXFILTERS; n++) {
|
|
if (fp->action) {
|
|
/* permit fragments on in and out filter */
|
|
if ((direction == FL_IN || direction == FL_OUT) &&
|
|
(ntohs(pip->ip_off) & IP_OFFMASK) != 0) {
|
|
return(A_PERMIT);
|
|
}
|
|
#ifdef DEBUG
|
|
logprintf("rule = %d\n", n);
|
|
#endif
|
|
if ((pip->ip_src.s_addr & fp->smask.s_addr) == fp->saddr.s_addr
|
|
&& (pip->ip_dst.s_addr & fp->dmask.s_addr) == fp->daddr.s_addr) {
|
|
if (fp->proto) {
|
|
if (!gotinfo) {
|
|
ptop = (char *)pip + (pip->ip_hl << 2);
|
|
|
|
switch (pip->ip_p) {
|
|
case IPPROTO_ICMP:
|
|
cproto = P_ICMP; ih = (struct icmp *)ptop;
|
|
sport = ih->icmp_type; estab = 1;
|
|
break;
|
|
case IPPROTO_UDP:
|
|
cproto = P_UDP; uh = (struct udphdr *)ptop;
|
|
sport = ntohs(uh->uh_sport); dport = ntohs(uh->uh_dport);
|
|
estab = 1;
|
|
break;
|
|
case IPPROTO_TCP:
|
|
cproto = P_TCP; th = (struct tcphdr *)ptop;
|
|
sport = ntohs(th->th_sport); dport = ntohs(th->th_dport);
|
|
estab = (th->th_flags & TH_ACK);
|
|
#ifdef DEBUG
|
|
if (estab == 0)
|
|
logprintf("flag = %02x, sport = %d, dport = %d\n", th->th_flags, sport, dport);
|
|
#endif
|
|
break;
|
|
default:
|
|
return(A_DENY); /* We'll block unknown type of packet */
|
|
}
|
|
gotinfo = 1;
|
|
#ifdef DEBUG
|
|
logprintf("dir = %d, proto = %d, srcop = %d, dstop = %d, estab = %d\n",
|
|
direction, cproto, fp->opt.srcop, fp->opt.dstop, estab);
|
|
#endif
|
|
}
|
|
#ifdef DEBUG
|
|
logprintf("check0: rule = %d, proto = %d, sport = %d, dport = %d\n",
|
|
n, cproto, sport, dport);
|
|
logprintf("check0: action = %d\n", fp->action);
|
|
#endif
|
|
if (cproto == fp->proto) {
|
|
if ((fp->opt.srcop == OP_NONE ||
|
|
PortMatch(fp->opt.srcop, sport, fp->opt.srcport))
|
|
&&
|
|
(fp->opt.dstop == OP_NONE ||
|
|
PortMatch(fp->opt.dstop, dport, fp->opt.dstport))
|
|
&&
|
|
(fp->opt.estab == 0 || estab)) {
|
|
return(fp->action);
|
|
}
|
|
}
|
|
} else {
|
|
/* Address is mached. Make a decision. */
|
|
#ifdef DEBUG
|
|
logprintf("check1: action = %d\n", fp->action);
|
|
#endif
|
|
return(fp->action);
|
|
}
|
|
}
|
|
}
|
|
fp++;
|
|
}
|
|
return(A_DENY); /* No rule is mached. Deny this packet */
|
|
}
|
|
return(A_PERMIT); /* No rule is given. Permit this packet */
|
|
}
|
|
|
|
static void
|
|
IcmpError(pip, code)
|
|
struct ip *pip;
|
|
int code;
|
|
{
|
|
#ifdef notdef
|
|
struct mbuf *bp;
|
|
|
|
if (pip->ip_p != IPPROTO_ICMP) {
|
|
bp = mballoc(cnt, MB_IPIN);
|
|
bcopy(ptr, MBUF_CTOP(bp), cnt);
|
|
SendPppFrame(bp);
|
|
RestartIdleTimer();
|
|
ipOutOctets += cnt;
|
|
}
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* For debugging aid.
|
|
*/
|
|
int
|
|
PacketCheck(cp, nb, direction)
|
|
char *cp;
|
|
int nb;
|
|
int direction;
|
|
{
|
|
struct ip *pip;
|
|
struct tcphdr *th;
|
|
struct udphdr *uh;
|
|
struct icmp *icmph;
|
|
char *ptop;
|
|
int mask, len, n;
|
|
int logit;
|
|
int pri = PRI_NORMAL;
|
|
|
|
logit = (loglevel & (1 << LOG_TCPIP));
|
|
|
|
pip = (struct ip *)cp;
|
|
|
|
if (logit) logprintf("%s ", Direction[direction]);
|
|
|
|
ptop = (cp + (pip->ip_hl << 2));
|
|
|
|
switch (pip->ip_p) {
|
|
case IPPROTO_ICMP:
|
|
if (logit) {
|
|
icmph = (struct icmp *)ptop;
|
|
logprintf("ICMP: %s:%d ---> ", inet_ntoa(pip->ip_src), icmph->icmp_type);
|
|
logprintf("%s:%d\n", inet_ntoa(pip->ip_dst), icmph->icmp_type);
|
|
}
|
|
break;
|
|
case IPPROTO_UDP:
|
|
if (logit) {
|
|
uh = (struct udphdr *)ptop;
|
|
logprintf("UDP: %s:%d ---> ", inet_ntoa(pip->ip_src), ntohs(uh->uh_sport));
|
|
logprintf("%s:%d\n", inet_ntoa(pip->ip_dst), ntohs(uh->uh_dport));
|
|
}
|
|
break;
|
|
case IPPROTO_TCP:
|
|
th = (struct tcphdr *)ptop;
|
|
if (pip->ip_tos == IPTOS_LOWDELAY)
|
|
pri = PRI_FAST;
|
|
else if ((ntohs(pip->ip_off) & IP_OFFMASK) == 0) {
|
|
if (INTERACTIVE(ntohs(th->th_sport)) || INTERACTIVE(ntohs(th->th_dport)))
|
|
pri = PRI_FAST;
|
|
}
|
|
|
|
if (logit) {
|
|
len = ntohs(pip->ip_len) - (pip->ip_hl << 2) - (th->th_off << 2);
|
|
logprintf("TCP: %s:%d ---> ", inet_ntoa(pip->ip_src), ntohs(th->th_sport));
|
|
logprintf("%s:%d", inet_ntoa(pip->ip_dst), ntohs(th->th_dport));
|
|
n = 0;
|
|
for (mask = TH_FIN; mask != 0x40; mask <<= 1) {
|
|
if (th->th_flags & mask)
|
|
logprintf(" %s", TcpFlags[n]);
|
|
n++;
|
|
}
|
|
logprintf(" seq:%x ack:%x (%d/%d)\n",
|
|
ntohl(th->th_seq), ntohl(th->th_ack), len, nb);
|
|
if ((th->th_flags & TH_SYN) && nb > 40) {
|
|
u_short *sp;
|
|
|
|
ptop += 20;
|
|
sp = (u_short *)ptop;
|
|
if (ntohs(sp[0]) == 0x0204)
|
|
logprintf(" MSS = %d\n", ntohs(sp[1]));
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
|
|
if ((FilterCheck(pip, direction) & A_DENY)) {
|
|
#ifdef DEBUG
|
|
logprintf("blocked.\n");
|
|
#endif
|
|
if (direction == 0) IcmpError(pip, pri);
|
|
return(-1);
|
|
} else {
|
|
if ( FilterCheck(pip, FL_KEEP ) & A_DENY ) { /* Check Keep Alive filter */
|
|
ipKeepAlive = FALSE;
|
|
} else {
|
|
ipKeepAlive = TRUE;
|
|
}
|
|
return(pri);
|
|
}
|
|
}
|
|
|
|
void
|
|
IpInput(bp)
|
|
struct mbuf *bp; /* IN: Pointer to IP pakcet */
|
|
{
|
|
u_char *cp;
|
|
struct mbuf *wp;
|
|
int nb, nw;
|
|
u_char tunbuff[MAX_MRU];
|
|
|
|
cp = tunbuff;
|
|
nb = 0;
|
|
for (wp = bp; wp; wp = wp->next) { /* Copy to continuois region */
|
|
bcopy(MBUF_CTOP(wp), cp, wp->cnt);
|
|
cp += wp->cnt;
|
|
nb += wp->cnt;
|
|
}
|
|
|
|
if ( PacketCheck(tunbuff, nb, FL_IN ) < 0) {
|
|
pfree(bp);
|
|
return;
|
|
}
|
|
|
|
ipInOctets += nb;
|
|
/*
|
|
* Pass it to tunnel device
|
|
*/
|
|
nw = write(tun_out, tunbuff, nb);
|
|
if (nw != nb)
|
|
fprintf(stderr, "wrote %d, got %d\r\n", nb, nw);
|
|
pfree(bp);
|
|
|
|
RestartIdleTimer();
|
|
}
|
|
|
|
static struct mqueue IpOutputQueues[PRI_FAST+1];
|
|
|
|
void
|
|
IpEnqueue(pri, ptr, count)
|
|
int pri;
|
|
char *ptr;
|
|
int count;
|
|
{
|
|
struct mbuf *bp;
|
|
|
|
bp = mballoc(count, MB_IPQ);
|
|
bcopy(ptr, MBUF_CTOP(bp), count);
|
|
Enqueue(&IpOutputQueues[pri], bp);
|
|
}
|
|
|
|
int
|
|
IsIpEnqueued()
|
|
{
|
|
struct mqueue *queue;
|
|
int exist = FALSE;
|
|
for (queue = &IpOutputQueues[PRI_FAST]; queue >= IpOutputQueues; queue--) {
|
|
if ( queue->qlen > 0 ) {
|
|
exist = TRUE;
|
|
break;
|
|
}
|
|
}
|
|
return( exist );
|
|
}
|
|
|
|
void
|
|
IpStartOutput()
|
|
{
|
|
struct mqueue *queue;
|
|
struct mbuf *bp;
|
|
int pri, cnt;
|
|
|
|
if (IpcpFsm.state != ST_OPENED)
|
|
return;
|
|
pri = PRI_FAST;
|
|
for (queue = &IpOutputQueues[PRI_FAST]; queue >= IpOutputQueues; queue--) {
|
|
if (queue->top) {
|
|
bp = Dequeue(queue);
|
|
if (bp) {
|
|
cnt = plength(bp);
|
|
SendPppFrame(bp);
|
|
RestartIdleTimer();
|
|
ipOutOctets += cnt;
|
|
break;
|
|
}
|
|
}
|
|
pri--;
|
|
}
|
|
}
|