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.
208 lines
4.3 KiB
C
208 lines
4.3 KiB
C
/*
|
|
* PPP Memory handling module
|
|
*
|
|
* 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: mbuf.c,v 1.13.2.5 1998/02/16 00:00:42 brian Exp $
|
|
*
|
|
*/
|
|
#include <sys/param.h>
|
|
#include <netinet/in.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sysexits.h>
|
|
#include <termios.h>
|
|
|
|
#include "command.h"
|
|
#include "mbuf.h"
|
|
#include "log.h"
|
|
#include "defs.h"
|
|
#include "loadalias.h"
|
|
#include "vars.h"
|
|
#include "descriptor.h"
|
|
#include "prompt.h"
|
|
#include "main.h"
|
|
|
|
static struct memmap {
|
|
struct mbuf *queue;
|
|
int count;
|
|
} MemMap[MB_MAX + 2];
|
|
|
|
static int totalalloced;
|
|
|
|
int
|
|
plength(struct mbuf * bp)
|
|
{
|
|
int len;
|
|
|
|
for (len = 0; bp; bp = bp->next)
|
|
len += bp->cnt;
|
|
return (len);
|
|
}
|
|
|
|
struct mbuf *
|
|
mballoc(int cnt, int type)
|
|
{
|
|
u_char *p;
|
|
struct mbuf *bp;
|
|
|
|
if (type > MB_MAX)
|
|
LogPrintf(LogERROR, "Bad mbuf type %d\n", type);
|
|
bp = (struct mbuf *) malloc(sizeof(struct mbuf));
|
|
if (bp == NULL) {
|
|
LogPrintf(LogALERT, "failed to allocate memory: %u\n", sizeof(struct mbuf));
|
|
AbortProgram(EX_OSERR);
|
|
}
|
|
memset(bp, '\0', sizeof(struct mbuf));
|
|
p = (u_char *) malloc(cnt);
|
|
if (p == NULL) {
|
|
LogPrintf(LogALERT, "failed to allocate memory: %d\n", cnt);
|
|
AbortProgram(EX_OSERR);
|
|
}
|
|
MemMap[type].count += cnt;
|
|
totalalloced += cnt;
|
|
bp->base = p;
|
|
bp->size = bp->cnt = cnt;
|
|
bp->type = type;
|
|
bp->pnext = NULL;
|
|
return (bp);
|
|
}
|
|
|
|
struct mbuf *
|
|
mbfree(struct mbuf * bp)
|
|
{
|
|
struct mbuf *nbp;
|
|
|
|
if (bp) {
|
|
nbp = bp->next;
|
|
MemMap[bp->type].count -= bp->size;
|
|
totalalloced -= bp->size;
|
|
free(bp->base);
|
|
free(bp);
|
|
return (nbp);
|
|
}
|
|
return (bp);
|
|
}
|
|
|
|
void
|
|
pfree(struct mbuf * bp)
|
|
{
|
|
while (bp)
|
|
bp = mbfree(bp);
|
|
}
|
|
|
|
struct mbuf *
|
|
mbread(struct mbuf * bp, u_char * ptr, int len)
|
|
{
|
|
int nb;
|
|
|
|
while (bp && len > 0) {
|
|
if (len > bp->cnt)
|
|
nb = bp->cnt;
|
|
else
|
|
nb = len;
|
|
memcpy(ptr, MBUF_CTOP(bp), nb);
|
|
ptr += nb;
|
|
bp->cnt -= nb;
|
|
len -= nb;
|
|
bp->offset += nb;
|
|
if (bp->cnt == 0) {
|
|
#ifdef notdef
|
|
bp = bp->next;
|
|
#else
|
|
bp = mbfree(bp);
|
|
#endif
|
|
}
|
|
}
|
|
return (bp);
|
|
}
|
|
|
|
void
|
|
mbwrite(struct mbuf * bp, u_char * ptr, int cnt)
|
|
{
|
|
int plen;
|
|
int nb;
|
|
|
|
plen = plength(bp);
|
|
if (plen < cnt)
|
|
cnt = plen;
|
|
|
|
while (cnt > 0) {
|
|
nb = (cnt < bp->cnt) ? cnt : bp->cnt;
|
|
memcpy(MBUF_CTOP(bp), ptr, nb);
|
|
cnt -= bp->cnt;
|
|
bp = bp->next;
|
|
}
|
|
}
|
|
|
|
int
|
|
ShowMemMap(struct cmdargs const *arg)
|
|
{
|
|
/* Watch it - ~m calls us with arg == NULL */
|
|
int i;
|
|
|
|
for (i = 0; i <= MB_MAX; i += 2)
|
|
prompt_Printf(&prompt, "%d: %d %d: %d\n",
|
|
i, MemMap[i].count, i + 1, MemMap[i + 1].count);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
LogMemory()
|
|
{
|
|
LogPrintf(LogDEBUG, "LogMemory: mem alloced: %d\n", totalalloced);
|
|
LogPrintf(LogDEBUG, "LogMemory: 1: %d 2: %d 3: %d 4: %d\n",
|
|
MemMap[1].count, MemMap[2].count, MemMap[3].count, MemMap[4].count);
|
|
LogPrintf(LogDEBUG, "LogMemory: 5: %d 6: %d 7: %d 8: %d\n",
|
|
MemMap[5].count, MemMap[6].count, MemMap[7].count, MemMap[8].count);
|
|
}
|
|
|
|
struct mbuf *
|
|
Dequeue(struct mqueue *q)
|
|
{
|
|
struct mbuf *bp;
|
|
|
|
LogPrintf(LogDEBUG, "Dequeue: queue len = %d\n", q->qlen);
|
|
bp = q->top;
|
|
if (bp) {
|
|
q->top = q->top->pnext;
|
|
q->qlen--;
|
|
if (q->top == NULL) {
|
|
q->last = q->top;
|
|
if (q->qlen)
|
|
LogPrintf(LogERROR, "Dequeue: Not zero (%d)!!!\n", q->qlen);
|
|
}
|
|
}
|
|
|
|
return bp;
|
|
}
|
|
|
|
void
|
|
Enqueue(struct mqueue *queue, struct mbuf *bp)
|
|
{
|
|
if (queue->last) {
|
|
queue->last->pnext = bp;
|
|
queue->last = bp;
|
|
} else
|
|
queue->last = queue->top = bp;
|
|
queue->qlen++;
|
|
LogPrintf(LogDEBUG, "Enqueue: len = %d\n", queue->qlen);
|
|
}
|