f0cdd9c021
input routines and take advantage of the new init/continue
interface in libradius. This allows a timely response on
other links in an MP setup while RADIUS requests are in
progress as well as the ability to handle other data from
the peer in parallel. It should also make the future addition
of PAM support trivial.
While I'm in there, validate pap & chap header IDs if
``idcheck'' is enabled (the default) for other FSM packet
types.
NOTE: This involved integrating the generation of chap
challenges and the validation of chap responses
(and commenting what's going on in those routines).
I currently have no way of testing ppps ability
to respond to M$Chap CHALLENGEs correctly, so if
someone could do the honours, it'd be much
appreciated (it *looks* ok!).
Sponsored by: Internet Business Solutions Ltd., Switzerland
180 lines
4.7 KiB
C
180 lines
4.7 KiB
C
/*
|
|
* Input/Output VJ Compressed packets
|
|
*
|
|
* 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, Inc. 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: vjcomp.c,v 1.24 1999/01/28 01:56:34 brian Exp $
|
|
*
|
|
* TODO:
|
|
*/
|
|
#include <sys/param.h>
|
|
#include <netinet/in.h>
|
|
#include <netinet/in_systm.h>
|
|
#include <netinet/ip.h>
|
|
#include <sys/un.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "mbuf.h"
|
|
#include "log.h"
|
|
#include "timer.h"
|
|
#include "fsm.h"
|
|
#include "lcpproto.h"
|
|
#include "slcompress.h"
|
|
#include "lqr.h"
|
|
#include "hdlc.h"
|
|
#include "defs.h"
|
|
#include "iplist.h"
|
|
#include "throughput.h"
|
|
#include "ipcp.h"
|
|
#include "lcp.h"
|
|
#include "ccp.h"
|
|
#include "link.h"
|
|
#include "filter.h"
|
|
#include "descriptor.h"
|
|
#include "mp.h"
|
|
#ifndef NORADIUS
|
|
#include "radius.h"
|
|
#endif
|
|
#include "bundle.h"
|
|
#include "vjcomp.h"
|
|
|
|
#define MAX_VJHEADER 16 /* Maximum size of compressed header */
|
|
|
|
void
|
|
vj_SendFrame(struct link *l, struct mbuf * bp, struct bundle *bundle)
|
|
{
|
|
int type;
|
|
u_short proto;
|
|
u_short cproto = bundle->ncp.ipcp.peer_compproto >> 16;
|
|
|
|
log_Printf(LogDEBUG, "vj_SendFrame: COMPPROTO = %x\n",
|
|
bundle->ncp.ipcp.peer_compproto);
|
|
if (((struct ip *) MBUF_CTOP(bp))->ip_p == IPPROTO_TCP
|
|
&& cproto == PROTO_VJCOMP) {
|
|
type = sl_compress_tcp(bp, (struct ip *)MBUF_CTOP(bp),
|
|
&bundle->ncp.ipcp.vj.cslc,
|
|
&bundle->ncp.ipcp.vj.slstat,
|
|
bundle->ncp.ipcp.peer_compproto & 0xff);
|
|
log_Printf(LogDEBUG, "vj_SendFrame: type = %x\n", type);
|
|
switch (type) {
|
|
case TYPE_IP:
|
|
proto = PROTO_IP;
|
|
break;
|
|
case TYPE_UNCOMPRESSED_TCP:
|
|
proto = PROTO_VJUNCOMP;
|
|
break;
|
|
case TYPE_COMPRESSED_TCP:
|
|
proto = PROTO_VJCOMP;
|
|
break;
|
|
default:
|
|
log_Printf(LogALERT, "Unknown frame type %x\n", type);
|
|
mbuf_Free(bp);
|
|
return;
|
|
}
|
|
} else
|
|
proto = PROTO_IP;
|
|
|
|
if (!ccp_Compress(&l->ccp, l, PRI_NORMAL, proto, bp))
|
|
hdlc_Output(l, PRI_NORMAL, proto, bp);
|
|
}
|
|
|
|
static struct mbuf *
|
|
VjUncompressTcp(struct ipcp *ipcp, struct mbuf * bp, u_char type)
|
|
{
|
|
u_char *bufp;
|
|
int len, olen, rlen;
|
|
struct mbuf *nbp;
|
|
u_char work[MAX_HDR + MAX_VJHEADER]; /* enough to hold TCP/IP header */
|
|
|
|
olen = len = mbuf_Length(bp);
|
|
if (type == TYPE_UNCOMPRESSED_TCP) {
|
|
|
|
/*
|
|
* Uncompressed packet does NOT change its size, so that we can use mbuf
|
|
* space for uncompression job.
|
|
*/
|
|
bufp = MBUF_CTOP(bp);
|
|
len = sl_uncompress_tcp(&bufp, len, type, &ipcp->vj.cslc, &ipcp->vj.slstat,
|
|
(ipcp->my_compproto >> 8) & 255);
|
|
if (len <= 0) {
|
|
mbuf_Free(bp);
|
|
bp = NULL;
|
|
}
|
|
return (bp);
|
|
}
|
|
|
|
/*
|
|
* Handle compressed packet. 1) Read upto MAX_VJHEADER bytes into work
|
|
* space. 2) Try to uncompress it. 3) Compute amount of necesary space. 4)
|
|
* Copy unread data info there.
|
|
*/
|
|
if (len > MAX_VJHEADER)
|
|
len = MAX_VJHEADER;
|
|
rlen = len;
|
|
bufp = work + MAX_HDR;
|
|
bp = mbuf_Read(bp, bufp, rlen);
|
|
len = sl_uncompress_tcp(&bufp, olen, type, &ipcp->vj.cslc, &ipcp->vj.slstat,
|
|
(ipcp->my_compproto >> 8) & 255);
|
|
if (len <= 0) {
|
|
mbuf_Free(bp);
|
|
return NULL;
|
|
}
|
|
len -= olen;
|
|
len += rlen;
|
|
nbp = mbuf_Alloc(len, MB_VJCOMP);
|
|
memcpy(MBUF_CTOP(nbp), bufp, len);
|
|
nbp->next = bp;
|
|
return (nbp);
|
|
}
|
|
|
|
struct mbuf *
|
|
vj_Input(struct ipcp *ipcp, struct mbuf *bp, int proto)
|
|
{
|
|
u_char type;
|
|
|
|
log_Printf(LogDEBUG, "vj_Input: proto %02x\n", proto);
|
|
log_DumpBp(LogDEBUG, "Raw packet info:", bp);
|
|
|
|
switch (proto) {
|
|
case PROTO_VJCOMP:
|
|
type = TYPE_COMPRESSED_TCP;
|
|
break;
|
|
case PROTO_VJUNCOMP:
|
|
type = TYPE_UNCOMPRESSED_TCP;
|
|
break;
|
|
default:
|
|
log_Printf(LogWARN, "vj_Input...???\n");
|
|
return (bp);
|
|
}
|
|
bp = VjUncompressTcp(ipcp, bp, type);
|
|
return (bp);
|
|
}
|
|
|
|
const char *
|
|
vj2asc(u_int32_t val)
|
|
{
|
|
static char asc[50]; /* The return value is used immediately */
|
|
|
|
if (val)
|
|
snprintf(asc, sizeof asc, "%d VJ slots %s slot compression",
|
|
(int)((val>>8)&15)+1, val & 1 ? "with" : "without");
|
|
else
|
|
strcpy(asc, "VJ disabled");
|
|
return asc;
|
|
}
|