8229df47c3
0.81.1 of the i4b code - namely support of the I4B_VR_REQ ioctl via the i4brbchX device. Ppp controls the phone number, but idle timers and SYNC/RAW decisions are still made by isdnd (in isdnd.rc). This involves a new datalink state machine phase. The ``wait for carrier'' phase happens after dialing but before logging in. The whole dial state should really be abstracted so that each device type can deal with it in its own way (thinking about PPPoE) - but that'll have to wait. The ``set cd'' symantics remain the same for tty devices, but we now delay until we either get CD or timeout waiting (at which time we drop the link if we require CD). For i4b devices we always insist on carrier. Thanks to hm@ for his help, and especially for pointing out that I *don't* need to re-implement isdnd (that was a huge waste of time !) :-]
191 lines
5.1 KiB
C
191 lines
5.1 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.31 1999/06/02 15:59:09 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 <string.h> /* strlen/memcpy */
|
|
#include <termios.h>
|
|
|
|
#include "layer.h"
|
|
#include "mbuf.h"
|
|
#include "log.h"
|
|
#include "timer.h"
|
|
#include "fsm.h"
|
|
#include "proto.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 */
|
|
|
|
static struct mbuf *
|
|
vj_LayerPush(struct bundle *bundle, struct link *l, struct mbuf *bp, int pri,
|
|
u_short *proto)
|
|
{
|
|
int type;
|
|
struct ip *pip;
|
|
u_short cproto = bundle->ncp.ipcp.peer_compproto >> 16;
|
|
|
|
bp = mbuf_Contiguous(bp);
|
|
pip = (struct ip *)MBUF_CTOP(bp);
|
|
if (*proto == PROTO_IP && pip->ip_p == IPPROTO_TCP &&
|
|
cproto == PROTO_VJCOMP) {
|
|
type = sl_compress_tcp(bp, pip, &bundle->ncp.ipcp.vj.cslc,
|
|
&bundle->ncp.ipcp.vj.slstat,
|
|
bundle->ncp.ipcp.peer_compproto & 0xff);
|
|
log_Printf(LogDEBUG, "vj_LayerWrite: type = %x\n", type);
|
|
switch (type) {
|
|
case TYPE_IP:
|
|
break;
|
|
|
|
case TYPE_UNCOMPRESSED_TCP:
|
|
*proto = PROTO_VJUNCOMP;
|
|
log_Printf(LogDEBUG, "vj_LayerPush: PROTO_IP -> PROTO_VJUNCOMP\n");
|
|
mbuf_SetType(bp, MB_VJOUT);
|
|
break;
|
|
|
|
case TYPE_COMPRESSED_TCP:
|
|
*proto = PROTO_VJCOMP;
|
|
log_Printf(LogDEBUG, "vj_LayerPush: PROTO_IP -> PROTO_VJUNCOMP\n");
|
|
mbuf_SetType(bp, MB_VJOUT);
|
|
break;
|
|
|
|
default:
|
|
log_Printf(LogERROR, "vj_LayerPush: Unknown frame type %x\n", type);
|
|
mbuf_Free(bp);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
return 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 */
|
|
|
|
bp = mbuf_Contiguous(bp);
|
|
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;
|
|
} else
|
|
mbuf_SetType(bp, MB_VJIN);
|
|
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_VJIN);
|
|
memcpy(MBUF_CTOP(nbp), bufp, len);
|
|
mbuf_SetType(bp, MB_VJIN);
|
|
nbp->next = bp;
|
|
return nbp;
|
|
}
|
|
|
|
static struct mbuf *
|
|
vj_LayerPull(struct bundle *bundle, struct link *l, struct mbuf *bp,
|
|
u_short *proto)
|
|
{
|
|
u_char type;
|
|
|
|
switch (*proto) {
|
|
case PROTO_VJCOMP:
|
|
type = TYPE_COMPRESSED_TCP;
|
|
log_Printf(LogDEBUG, "vj_LayerPull: PROTO_VJCOMP -> PROTO_IP\n");
|
|
break;
|
|
case PROTO_VJUNCOMP:
|
|
type = TYPE_UNCOMPRESSED_TCP;
|
|
log_Printf(LogDEBUG, "vj_LayerPull: PROTO_VJUNCOMP -> PROTO_IP\n");
|
|
break;
|
|
default:
|
|
return bp;
|
|
}
|
|
|
|
*proto = PROTO_IP;
|
|
return VjUncompressTcp(&bundle->ncp.ipcp, bp, type);
|
|
}
|
|
|
|
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 with%s slot compression",
|
|
(int)((val>>8)&15)+1, val & 1 ? "" : "out");
|
|
else
|
|
strcpy(asc, "VJ disabled");
|
|
return asc;
|
|
}
|
|
|
|
struct layer vjlayer = { LAYER_VJ, "vj", vj_LayerPush, vj_LayerPull };
|