Cosmetic: Make struct mbuf more like kernel mbufs.

1 files changed, 21 insertions, 19 deletions

diff --git a/usr.sbin/ppp/mbuf.h b/usr.sbin/ppp/mbuf.h
index 7b0669b..64e3721 100644
--- a/usr.sbin/ppp/mbuf.h
+++ b/usr.sbin/ppp/mbuf.h
@@ -21,26 +21,26 @@
  */
 
 struct mbuf {
-  short size;			/* size allocated (excluding header) */
-  short offset;			/* offset from header end to start position */
-  short cnt;			/* available byte count in buffer */
-  short type;			/* MB_* below */
-  struct mbuf *next;		/* link to next mbuf */
-  struct mbuf *pnext;		/* link to next packet */
+  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 */
   /* buffer space is malloc()d directly after the header */
 };
 
 struct mqueue {
   struct mbuf *top;
   struct mbuf *last;
-  int qlen;
+  size_t len;
 };
 
 #define MBUF_CTOP(bp) \
-	((bp) ? (u_char *)((bp)+1) + (bp)->offset : NULL)
+	((bp) ? (u_char *)((bp)+1) + (bp)->m_offset : NULL)
 
 #define CONST_MBUF_CTOP(bp) \
-	((bp) ? (const u_char *)((bp)+1) + (bp)->offset : NULL)
+	((bp) ? (const u_char *)((bp)+1) + (bp)->m_offset : NULL)
 
 #define MB_IPIN		0
 #define MB_IPOUT	1
@@ -85,17 +85,19 @@ struct mqueue {
 
 struct cmdargs;
 
-extern int mbuf_Length(struct mbuf *);
-extern struct mbuf *mbuf_Alloc(int, int);
-extern struct mbuf *mbuf_FreeSeg(struct mbuf *);
-extern void mbuf_Free(struct mbuf *);
+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 *);
 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);
-extern struct mbuf *mbuf_Prepend(struct mbuf *, const void *, size_t, size_t);
-extern struct mbuf *mbuf_Truncate(struct mbuf *, size_t);
+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);
+
 extern int mbuf_Show(struct cmdargs const *);
-extern void mbuf_Enqueue(struct mqueue *, struct mbuf *);
-extern struct mbuf *mbuf_Dequeue(struct mqueue *);
-extern struct mbuf *mbuf_Contiguous(struct mbuf *);
-extern void mbuf_SetType(struct mbuf *, int);
+
+extern void m_enqueue(struct mqueue *, struct mbuf *);
+extern struct mbuf *m_dequeue(struct mqueue *);