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.
212 lines
4.9 KiB
C
212 lines
4.9 KiB
C
/*-
|
|
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $Id: link.c,v 1.1.2.14 1998/03/20 19:48:08 brian Exp $
|
|
*
|
|
*/
|
|
|
|
#include <sys/param.h>
|
|
#include <netinet/in.h>
|
|
#include <netinet/in_systm.h>
|
|
#include <netinet/ip.h>
|
|
|
|
#include <stdio.h>
|
|
#include <termios.h>
|
|
|
|
#include "command.h"
|
|
#include "mbuf.h"
|
|
#include "log.h"
|
|
#include "defs.h"
|
|
#include "timer.h"
|
|
#include "lqr.h"
|
|
#include "hdlc.h"
|
|
#include "throughput.h"
|
|
#include "lcpproto.h"
|
|
#include "loadalias.h"
|
|
#include "vars.h"
|
|
#include "fsm.h"
|
|
#include "iplist.h"
|
|
#include "slcompress.h"
|
|
#include "ipcp.h"
|
|
#include "filter.h"
|
|
#include "descriptor.h"
|
|
#include "async.h"
|
|
#include "lcp.h"
|
|
#include "ccp.h"
|
|
#include "link.h"
|
|
#include "mp.h"
|
|
#include "bundle.h"
|
|
#include "prompt.h"
|
|
|
|
void
|
|
link_AddInOctets(struct link *l, int n)
|
|
{
|
|
throughput_addin(&l->throughput, n);
|
|
}
|
|
|
|
void
|
|
link_AddOutOctets(struct link *l, int n)
|
|
{
|
|
throughput_addout(&l->throughput, n);
|
|
}
|
|
|
|
void
|
|
link_SequenceQueue(struct link *l)
|
|
{
|
|
LogPrintf(LogDEBUG, "link_SequenceQueue\n");
|
|
while (l->Queue[PRI_NORMAL].qlen)
|
|
Enqueue(l->Queue + PRI_LINK, Dequeue(l->Queue + PRI_NORMAL));
|
|
}
|
|
|
|
int
|
|
link_QueueLen(struct link *l)
|
|
{
|
|
int i, len;
|
|
|
|
for (i = 0, len = 0; i < LINK_QUEUES; i++)
|
|
len += l->Queue[i].qlen;
|
|
|
|
return len;
|
|
}
|
|
|
|
int
|
|
link_QueueBytes(struct link *l)
|
|
{
|
|
int i, len, bytes;
|
|
struct mbuf *m;
|
|
|
|
bytes = 0;
|
|
for (i = 0, len = 0; i < LINK_QUEUES; i++) {
|
|
len = l->Queue[i].qlen;
|
|
m = l->Queue[i].top;
|
|
while (len--) {
|
|
bytes += plength(m);
|
|
m = m->pnext;
|
|
}
|
|
}
|
|
|
|
return bytes;
|
|
}
|
|
|
|
struct mbuf *
|
|
link_Dequeue(struct link *l)
|
|
{
|
|
int pri;
|
|
struct mbuf *bp;
|
|
|
|
for (bp = (struct mbuf *)0, pri = LINK_QUEUES - 1; pri >= 0; pri--)
|
|
if (l->Queue[pri].qlen) {
|
|
bp = Dequeue(l->Queue + pri);
|
|
LogPrintf(LogDEBUG, "link_Dequeue: Dequeued from queue %d,"
|
|
" containing %d more packets\n", pri, l->Queue[pri].qlen);
|
|
break;
|
|
}
|
|
|
|
return bp;
|
|
}
|
|
|
|
/*
|
|
* Write to the link. Actualy, requested packets are queued, and go out
|
|
* at some later time depending on the physical link implementation.
|
|
*/
|
|
void
|
|
link_Write(struct link *l, int pri, const char *ptr, int count)
|
|
{
|
|
struct mbuf *bp;
|
|
|
|
if(pri < 0 || pri >= LINK_QUEUES)
|
|
pri = 0;
|
|
|
|
bp = mballoc(count, MB_LINK);
|
|
memcpy(MBUF_CTOP(bp), ptr, count);
|
|
|
|
Enqueue(l->Queue + pri, bp);
|
|
}
|
|
|
|
void
|
|
link_Output(struct link *l, int pri, struct mbuf *bp)
|
|
{
|
|
struct mbuf *wp;
|
|
int len;
|
|
|
|
if(pri < 0 || pri >= LINK_QUEUES)
|
|
pri = 0;
|
|
|
|
len = plength(bp);
|
|
wp = mballoc(len, MB_LINK);
|
|
mbread(bp, MBUF_CTOP(wp), len);
|
|
Enqueue(l->Queue + pri, wp);
|
|
}
|
|
|
|
static struct protostatheader {
|
|
u_short number;
|
|
const char *name;
|
|
} ProtocolStat[NPROTOSTAT] = {
|
|
{ PROTO_IP, "IP" },
|
|
{ PROTO_VJUNCOMP, "VJ_UNCOMP" },
|
|
{ PROTO_VJCOMP, "VJ_COMP" },
|
|
{ PROTO_COMPD, "COMPD" },
|
|
{ PROTO_LCP, "LCP" },
|
|
{ PROTO_IPCP, "IPCP" },
|
|
{ PROTO_CCP, "CCP" },
|
|
{ PROTO_PAP, "PAP" },
|
|
{ PROTO_LQR, "LQR" },
|
|
{ PROTO_CHAP, "CHAP" },
|
|
{ PROTO_MP, "MULTILINK" },
|
|
{ 0, "Others" }
|
|
};
|
|
|
|
void
|
|
link_ProtocolRecord(struct link *l, u_short proto, int type)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < NPROTOSTAT; i++)
|
|
if (ProtocolStat[i].number == proto)
|
|
break;
|
|
|
|
if (type == PROTO_IN)
|
|
l->proto_in[i]++;
|
|
else
|
|
l->proto_out[i]++;
|
|
}
|
|
|
|
void
|
|
link_ReportProtocolStatus(struct link *l)
|
|
{
|
|
int i;
|
|
|
|
prompt_Printf(&prompt, " Protocol in out "
|
|
"Protocol in out\n");
|
|
for (i = 0; i < NPROTOSTAT; i++) {
|
|
prompt_Printf(&prompt, " %-9s: %8lu, %8lu",
|
|
ProtocolStat[i].name, l->proto_in[i], l->proto_out[i]);
|
|
if ((i % 2) == 0)
|
|
prompt_Printf(&prompt, "\n");
|
|
}
|
|
if (!(i % 2))
|
|
prompt_Printf(&prompt, "\n");
|
|
}
|