Include sys-queue.h early to override system queue definitions on BSD
[qemu] / slirp / if.c
index 67a7b6f..0f04e13 100644 (file)
@@ -7,17 +7,10 @@
 
 #include <slirp.h>
 
-int     if_queued = 0;                  /* Number of packets queued so far */
-
-struct  mbuf if_fastq;                  /* fast queue (for interactive data) */
-struct  mbuf if_batchq;                 /* queue for non-interactive data */
-struct mbuf *next_m;                   /* Pointer to next mbuf to output */
-
 #define ifs_init(ifm) ((ifm)->ifs_next = (ifm)->ifs_prev = (ifm))
 
-void
-ifs_insque(ifm, ifmhead)
-       struct mbuf *ifm, *ifmhead;
+static void
+ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead)
 {
        ifm->ifs_next = ifmhead->ifs_next;
        ifmhead->ifs_next = ifm;
@@ -25,103 +18,22 @@ ifs_insque(ifm, ifmhead)
        ifm->ifs_next->ifs_prev = ifm;
 }
 
-void
-ifs_remque(ifm)
-       struct mbuf *ifm;
+static void
+ifs_remque(struct mbuf *ifm)
 {
        ifm->ifs_prev->ifs_next = ifm->ifs_next;
        ifm->ifs_next->ifs_prev = ifm->ifs_prev;
 }
 
 void
-if_init()
-{
-       if_fastq.ifq_next = if_fastq.ifq_prev = &if_fastq;
-       if_batchq.ifq_next = if_batchq.ifq_prev = &if_batchq;
-        //     sl_compress_init(&comp_s);
-       next_m = &if_batchq;
-}
-
-#if 0
-/*
- * This shouldn't be needed since the modem is blocking and
- * we don't expect any signals, but what the hell..
- */
-inline int
-writen(fd, bptr, n)
-       int fd;
-       char *bptr;
-       int n;
+if_init(Slirp *slirp)
 {
-       int ret;
-       int total;
-
-       /* This should succeed most of the time */
-       ret = send(fd, bptr, n,0);
-       if (ret == n || ret <= 0)
-          return ret;
-
-       /* Didn't write everything, go into the loop */
-       total = ret;
-       while (n > total) {
-               ret = send(fd, bptr+total, n-total,0);
-               if (ret <= 0)
-                  return ret;
-               total += ret;
-       }
-       return total;
+    slirp->if_fastq.ifq_next = slirp->if_fastq.ifq_prev = &slirp->if_fastq;
+    slirp->if_batchq.ifq_next = slirp->if_batchq.ifq_prev = &slirp->if_batchq;
+    slirp->next_m = &slirp->if_batchq;
 }
 
 /*
- * if_input - read() the tty, do "top level" processing (ie: check for any escapes),
- * and pass onto (*ttyp->if_input)
- *
- * XXXXX Any zeros arriving by themselves are NOT placed into the arriving packet.
- */
-#define INBUFF_SIZE 2048 /* XXX */
-void
-if_input(ttyp)
-       struct ttys *ttyp;
-{
-       u_char if_inbuff[INBUFF_SIZE];
-       int if_n;
-
-       DEBUG_CALL("if_input");
-       DEBUG_ARG("ttyp = %lx", (long)ttyp);
-
-       if_n = recv(ttyp->fd, (char *)if_inbuff, INBUFF_SIZE,0);
-
-       DEBUG_MISC((dfd, " read %d bytes\n", if_n));
-
-       if (if_n <= 0) {
-               if (if_n == 0 || (errno != EINTR && errno != EAGAIN)) {
-                       if (ttyp->up)
-                          link_up--;
-                       tty_detached(ttyp, 0);
-               }
-               return;
-       }
-       if (if_n == 1) {
-               if (*if_inbuff == '0') {
-                       ttyp->ones = 0;
-                       if (++ttyp->zeros >= 5)
-                          slirp_exit(0);
-                       return;
-               }
-               if (*if_inbuff == '1') {
-                       ttyp->zeros = 0;
-                       if (++ttyp->ones >= 5)
-                          tty_detached(ttyp, 0);
-                       return;
-               }
-       }
-       ttyp->ones = ttyp->zeros = 0;
-
-       (*ttyp->if_input)(ttyp, if_inbuff, if_n);
-}
-#endif
-
-/*
  * if_output: Queue packet into an output queue.
  * There are 2 output queue's, if_fastq and if_batchq.
  * Each output queue is a doubly linked list of double linked lists
@@ -135,10 +47,9 @@ if_input(ttyp)
  * it'll temporarily get downgraded to the batchq)
  */
 void
-if_output(so, ifm)
-       struct socket *so;
-       struct mbuf *ifm;
+if_output(struct socket *so, struct mbuf *ifm)
 {
+       Slirp *slirp = ifm->slirp;
        struct mbuf *ifq;
        int on_fastq = 1;
 
@@ -163,7 +74,8 @@ if_output(so, ifm)
         * We mustn't put this packet back on the fastq (or we'll send it out of order)
         * XXX add cache here?
         */
-       for (ifq = if_batchq.ifq_prev; ifq != &if_batchq; ifq = ifq->ifq_prev) {
+       for (ifq = slirp->if_batchq.ifq_prev; ifq != &slirp->if_batchq;
+            ifq = ifq->ifq_prev) {
                if (so == ifq->ifq_so) {
                        /* A match! */
                        ifm->ifq_so = so;
@@ -174,7 +86,7 @@ if_output(so, ifm)
 
        /* No match, check which queue to put it on */
        if (so && (so->so_iptos & IPTOS_LOWDELAY)) {
-               ifq = if_fastq.ifq_prev;
+               ifq = slirp->if_fastq.ifq_prev;
                on_fastq = 1;
                /*
                 * Check if this packet is a part of the last
@@ -186,7 +98,7 @@ if_output(so, ifm)
                        goto diddit;
                }
        } else
-               ifq = if_batchq.ifq_prev;
+               ifq = slirp->if_batchq.ifq_prev;
 
        /* Create a new doubly linked list for this session */
        ifm->ifq_so = so;
@@ -194,7 +106,7 @@ if_output(so, ifm)
        insque(ifm, ifq);
 
 diddit:
-       ++if_queued;
+       slirp->if_queued++;
 
        if (so) {
                /* Update *_queued */
@@ -214,7 +126,7 @@ diddit:
                        remque(ifm->ifs_next);
 
                        /* ...And insert in the new.  That'll teach ya! */
-                       insque(ifm->ifs_next, &if_batchq);
+                       insque(ifm->ifs_next, &slirp->if_batchq);
                }
        }
 
@@ -222,10 +134,7 @@ diddit:
        /*
         * This prevents us from malloc()ing too many mbufs
         */
-       if (link_up) {
-               /* if_start will check towrite */
-               if_start();
-       }
+       if_start(ifm->slirp);
 #endif
 }
 
@@ -242,40 +151,40 @@ diddit:
  * to the first, etc. etc.
  */
 void
-if_start(void)
+if_start(Slirp *slirp)
 {
        struct mbuf *ifm, *ifqt;
 
        DEBUG_CALL("if_start");
 
-       if (if_queued == 0)
+       if (slirp->if_queued == 0)
           return; /* Nothing to do */
 
  again:
         /* check if we can really output */
-        if (!slirp_can_output())
+        if (!slirp_can_output(slirp->opaque))
             return;
 
        /*
         * See which queue to get next packet from
         * If there's something in the fastq, select it immediately
         */
-       if (if_fastq.ifq_next != &if_fastq) {
-               ifm = if_fastq.ifq_next;
+       if (slirp->if_fastq.ifq_next != &slirp->if_fastq) {
+               ifm = slirp->if_fastq.ifq_next;
        } else {
                /* Nothing on fastq, see if next_m is valid */
-               if (next_m != &if_batchq)
-                  ifm = next_m;
+               if (slirp->next_m != &slirp->if_batchq)
+                  ifm = slirp->next_m;
                else
-                  ifm = if_batchq.ifq_next;
+                  ifm = slirp->if_batchq.ifq_next;
 
                /* Set which packet to send on next iteration */
-               next_m = ifm->ifq_next;
+               slirp->next_m = ifm->ifq_next;
        }
        /* Remove it from the queue */
        ifqt = ifm->ifq_prev;
        remque(ifm);
-       --if_queued;
+       slirp->if_queued--;
 
        /* If there are more packets for this session, re-queue them */
        if (ifm->ifs_next != /* ifm->ifs_prev != */ ifm) {
@@ -291,10 +200,10 @@ if_start(void)
        }
 
        /* Encapsulate the packet for sending */
-        if_encap(ifm->m_data, ifm->m_len);
+        if_encap(slirp, (uint8_t *)ifm->m_data, ifm->m_len);
 
         m_free(ifm);
 
-       if (if_queued)
+       if (slirp->if_queued)
           goto again;
 }