d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ef50a72c92
freebsd-nq/usr.sbin/ppp/mbuf.h

107 lines
3.1 KiB
C
Raw Normal View History

1995-01-31 06:29:58 +00:00
/*
* 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. 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$ -> $FreeBSD$
1999-08-28 01:35:59 +00:00
* $FreeBSD$
1995-01-31 06:29:58 +00:00
*
* TODO:
*/
struct mbuf {
Cosmetic: Make struct mbuf more like kernel mbufs.
1999-12-20 20:29:47 +00:00
size_t m_size; /* size allocated (excluding header) */
short m_offset; /* offset from header end to start position */
size_t m_len; /* available byte count in buffer */
short m_type; /* MB_* below */
struct mbuf *m_next; /* link to next mbuf */
struct mbuf *m_nextpkt; /* link to next packet */
Consolidate the two malloc()s that are done when allocating an mbuf.
1998-08-21 18:10:15 +00:00
/* buffer space is malloc()d directly after the header */
1995-01-31 06:29:58 +00:00
};
struct mqueue {
struct mbuf *top;
struct mbuf *last;
Cosmetic: Make struct mbuf more like kernel mbufs.
1999-12-20 20:29:47 +00:00
size_t len;
1995-01-31 06:29:58 +00:00
};
Deal with the fact that as we now mbuf_Read the fsm header in fsm_Input() we often end up with a NULL mbuf. Deal with a possible NULL mbuf being passed into mbuf_Prepend(). Adjust some spacing to make things more consistent.
1999-05-09 20:02:29 +00:00
#define MBUF_CTOP(bp) \
Cosmetic: Make struct mbuf more like kernel mbufs.
1999-12-20 20:29:47 +00:00
((bp) ? (u_char *)((bp)+1) + (bp)->m_offset : NULL)
Deal with the fact that as we now mbuf_Read the fsm header in fsm_Input() we often end up with a NULL mbuf. Deal with a possible NULL mbuf being passed into mbuf_Prepend(). Adjust some spacing to make things more consistent.
1999-05-09 20:02:29 +00:00
#define CONST_MBUF_CTOP(bp) \
Cosmetic: Make struct mbuf more like kernel mbufs.
1999-12-20 20:29:47 +00:00
((bp) ? (const u_char *)((bp)+1) + (bp)->m_offset : NULL)
1995-01-31 06:29:58 +00:00
o Alter the mbuf type as it's processed by different layers. o Show more information about missing MP fragments in ``show mp''. o Do away with mbuf_Log(). It was showing mbuf stats twice on receipt of LCP/CCP/IPCP packets.... ???!!? o Pre-allocate a bit extra when creating LQR packets to avoid having to allocate another mbuf in mbuf_Prepend().
1999-06-02 15:59:09 +00:00
#define MB_IPIN 0
#define MB_IPOUT 1
o Add the -foreground switch. This switch behaves like -background except that ppp stays in the foreground. o Add the -quiet switch to quieten ppps startup o Add the -nat flag and discourage the use of the -alias flag. Both do the same thing. o Correct some nat usage strings. o Change the internal ``alias'' command to ``nat''.
1999-08-19 18:15:52 +00:00
#define MB_NATIN 2
#define MB_NATOUT 3
o Alter the mbuf type as it's processed by different layers. o Show more information about missing MP fragments in ``show mp''. o Do away with mbuf_Log(). It was showing mbuf stats twice on receipt of LCP/CCP/IPCP packets.... ???!!? o Pre-allocate a bit extra when creating LQR packets to avoid having to allocate another mbuf in mbuf_Prepend().
1999-06-02 15:59:09 +00:00
#define MB_MPIN 4
#define MB_MPOUT 5
#define MB_VJIN 6
#define MB_VJOUT 7
#define MB_ICOMPDIN 8
#define MB_ICOMPDOUT 9
#define MB_COMPDIN 10
#define MB_COMPDOUT 11
#define MB_LQRIN 12
#define MB_LQROUT 13
#define MB_ECHOIN 14
#define MB_ECHOOUT 15
#define MB_PROTOIN 16
#define MB_PROTOOUT 17
#define MB_ACFIN 18
#define MB_ACFOUT 19
#define MB_SYNCIN 20
#define MB_SYNCOUT 21
#define MB_HDLCIN 22
#define MB_HDLCOUT 23
#define MB_ASYNCIN 24
#define MB_ASYNCOUT 25
#define MB_CBCPIN 26
#define MB_CBCPOUT 27
#define MB_CHAPIN 28
#define MB_CHAPOUT 29
#define MB_PAPIN 30
#define MB_PAPOUT 31
#define MB_CCPIN 32
#define MB_CCPOUT 33
#define MB_IPCPIN 34
#define MB_IPCPOUT 35
#define MB_LCPIN 36
#define MB_LCPOUT 37
#define MB_UNKNOWN 38
#define MB_MAX MB_UNKNOWN
1995-01-31 06:29:58 +00:00
Increase M_MAXLEN from 2048 - sizeof struct mbuf to 4096 - sizeof struct mbuf, and set MAX_MRU and MAX_MTU back to 2048. 2048 is big enough as an MTU/MRU, but we need to be able to allocate larger mbufs after reassembling IP fragments.
1999-12-30 13:27:15 +00:00
#define M_MAXLEN (4096 - sizeof(struct mbuf))
Implement mbuf allocation internally by maintaining 8 buckets of different sized mbufs, and mallocing them in chunks of 20 mbufs at a time. This improves back-to-back throughput by between 7 and 8%
1999-12-20 20:29:51 +00:00
o Move alias function pointers into loadalias.c o Move Var*Version into command.c o Remove struct pppVars (and there was much rejoicing) ! o Forward-decl some structs in .h files to avoid include ordering requirements and remove a few more redundant #includes.
1998-04-07 00:54:26 +00:00
struct cmdargs;
Cosmetic: Make struct mbuf more like kernel mbufs.
1999-12-20 20:29:47 +00:00
extern int m_length(struct mbuf *);
extern struct mbuf *m_get(size_t, int);
extern struct mbuf *m_free(struct mbuf *);
extern void m_freem(struct mbuf *);
o Redesign the layering mechanism and make the aliasing code part of the layering. We now ``stack'' layers as soon as we open the device (when we figure out what we're dealing with). A static set of `dispatch' routines are also declared for dealing with incoming packets after they've been `pulled' up through the stacked layers. Physical devices are now assigned handlers based on the device type when they're opened. For the moment there are three device types; ttys, execs and tcps. o Increment version number to 2.2 o Make an entry in [uw]tmp for non-tty -direct invocations (after pap/chap authentication). o Make throughput counters quad_t's o Account for the absolute number of mbuf malloc()s and free()s in ``show mem''. o ``show modem'' becomes ``show physical''.
1999-05-08 11:07:56 +00:00
extern void mbuf_Write(struct mbuf *, const void *, size_t);
extern struct mbuf *mbuf_Read(struct mbuf *, void *, size_t);
extern size_t mbuf_View(struct mbuf *, void *, size_t);
Cosmetic: Make struct mbuf more like kernel mbufs.
1999-12-20 20:29:47 +00:00
extern struct mbuf *m_prepend(struct mbuf *, const void *, size_t, size_t);
extern struct mbuf *m_adj(struct mbuf *, ssize_t);
extern struct mbuf *m_pullup(struct mbuf *);
extern void m_settype(struct mbuf *, int);
Ensure that there's a bit of extra space in our buffer when it's passed to libalias. If there's not enough space, things like ftp PORT commands start failing.... Reported by: Gianmarco Giovannelli <gmarco@giovannelli.it>
2000-01-03 20:09:23 +00:00
extern struct mbuf *m_append(struct mbuf *, const void *, size_t);
Cosmetic: Make struct mbuf more like kernel mbufs.
1999-12-20 20:29:47 +00:00
Cosmetic: Make our external function names consistent.
1998-05-01 19:26:12 +00:00
extern int mbuf_Show(struct cmdargs const *);
Cosmetic: Make struct mbuf more like kernel mbufs.
1999-12-20 20:29:47 +00:00
extern void m_enqueue(struct mqueue *, struct mbuf *);
extern struct mbuf *m_dequeue(struct mqueue *);
Reference in New Issue Copy Permalink