3b0f8d2ed6
o Remove bundle2lcp(), bundle2ccp() and bundle2link().
They're too resource-hungry and we have `owner pointers'
to do their job.
o Make our FSM understand LCPs that are always ST_OPENED
(with a minimum code that != 1).
o Send FSM code rejects for invalid codes.
o Make our bundle fsm_parent deal with multiple links.
o Make timer diagnostics pretty and allow access via ~t
in `term' mode (not just when logging debug) and
`show timers'. Only show timers every second in debug
mode, otherwise we get too many diagnostics to be useful
(we probably still do). Also, don't restrict ~m in term
mode to depend on debug logging.
o Rationalise our bundles' phases.
o Create struct mp (multilink protocol). This is both an
NCP and a type of struct link. It feeds off other NCPs
for output, passing fragmented packets into the queues
of available datalinks. It also gets PROTO_MP input,
reassembles the fragments into ppp frames, and passes
them back to the HDLC layer that the fragments were passed
from.
** It's not yet possible to enter multilink mode :-( **
o Add `set weight' (requires context) for deciding on a links
weighting in multilink mode. Weighting is simplistic (and
probably badly implemented) for now.
o Remove the function pointers in struct link. They ended up
only applying to physical links.
o Configure our tun device with an MTU equal to the MRU from
struct mp's LCP and a speed equal to the sum of our link
speeds.
o `show {lcp,ccp,proto}' and `set deflate' now have optional
context and use ChooseLink() to decide on which `struct link'
to use. This allows behaviour as before when in non-multilink
mode, and allows access to the MP logical link in multilink
mode.
o Ignore reconnect and redial values when in -direct mode and
when cleaning up. Always redial when in -ddial or -dedicated
mode (unless cleaning up).
o Tell our links to `staydown' when we close them due to a signal.
o Remove remaining `#ifdef SIGALRM's (ppp doesn't function without
alarms).
o Don't bother strdup()ing our physical link name.
o Various other cosmetic changes.
173 lines
4.5 KiB
C
173 lines
4.5 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.16.2.10 1998/03/20 19:48:28 brian Exp $
|
|
*
|
|
* TODO:
|
|
*/
|
|
#include <sys/types.h>
|
|
#include <netinet/in.h>
|
|
#include <netinet/in_systm.h>
|
|
#include <netinet/ip.h>
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "command.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"
|
|
#include "bundle.h"
|
|
#include "vjcomp.h"
|
|
|
|
#define MAX_VJHEADER 16 /* Maximum size of compressed header */
|
|
|
|
void
|
|
SendPppFrame(struct link *l, struct mbuf * bp, struct bundle *bundle)
|
|
{
|
|
int type;
|
|
u_short proto;
|
|
u_short cproto = bundle->ncp.ipcp.peer_compproto >> 16;
|
|
|
|
LogPrintf(LogDEBUG, "SendPppFrame: proto = %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);
|
|
LogPrintf(LogDEBUG, "SendPppFrame: 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:
|
|
LogPrintf(LogERROR, "Unknown frame type %x\n", type);
|
|
pfree(bp);
|
|
return;
|
|
}
|
|
} else
|
|
proto = PROTO_IP;
|
|
|
|
if (!ccp_Compress(&l->ccp, l, PRI_NORMAL, proto, bp))
|
|
HdlcOutput(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 = plength(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);
|
|
if (len <= 0) {
|
|
pfree(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 = mbread(bp, bufp, rlen);
|
|
len = sl_uncompress_tcp(&bufp, olen, type, &ipcp->vj.cslc, &ipcp->vj.slstat);
|
|
if (len <= 0) {
|
|
pfree(bp);
|
|
return NULL;
|
|
}
|
|
len -= olen;
|
|
len += rlen;
|
|
nbp = mballoc(len, MB_VJCOMP);
|
|
memcpy(MBUF_CTOP(nbp), bufp, len);
|
|
nbp->next = bp;
|
|
return (nbp);
|
|
}
|
|
|
|
struct mbuf *
|
|
VjCompInput(struct ipcp *ipcp, struct mbuf *bp, int proto)
|
|
{
|
|
u_char type;
|
|
|
|
LogPrintf(LogDEBUG, "VjCompInput: proto %02x\n", proto);
|
|
LogDumpBp(LogDEBUG, "Raw packet info:", bp);
|
|
|
|
switch (proto) {
|
|
case PROTO_VJCOMP:
|
|
type = TYPE_COMPRESSED_TCP;
|
|
break;
|
|
case PROTO_VJUNCOMP:
|
|
type = TYPE_UNCOMPRESSED_TCP;
|
|
break;
|
|
default:
|
|
LogPrintf(LogERROR, "VjCompInput...???\n");
|
|
return (bp);
|
|
}
|
|
bp = VjUncompressTcp(ipcp, bp, type);
|
|
return (bp);
|
|
}
|
|
|
|
const char *
|
|
vj2asc(u_int32_t val)
|
|
{
|
|
static char asc[50];
|
|
|
|
sprintf(asc, "%d VJ slots %s slot compression",
|
|
(int)((val>>8)&15)+1, val & 1 ? "with" : "without");
|
|
return asc;
|
|
}
|