Changeset 926 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Feb 15, 2007 3:34:02 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

18659

Message:

Eliminate unnecessary global vars in slirp

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (33 diffs)
• socket.c (modified) (42 diffs)

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -32 +32 @@
 struct ex_list *exec_list;
 
+#ifndef VBOX
 /* XXX: suppress those select globals */
 fd_set *global_readfds, *global_writefds, *global_xfds;
+#endif /* !VBOX */
 
 char slirp_hostname[33];
@@ -57 +59 @@
         FixedInfo = GlobalAlloc(GPTR, BufLen);
     }
-        
+
     if ((ret = GetNetworkParams(FixedInfo, &BufLen)) != ERROR_SUCCESS) {
 #ifndef VBOX
@@ -322 +324 @@
 {
         gettimeofday(&tt, 0);
-        
+
         curtime = (u_int)tt.tv_sec * (u_int)1000;
         curtime += (u_int)tt.tv_usec / (u_int)1000;
-        
+
         if ((tt.tv_usec % 1000) >= 500)
            curtime++;
@@ -339 +341 @@
     int tmp_time;
 
+#ifndef VBOX
     /* fail safe */
     global_readfds = NULL;
     global_writefds = NULL;
     global_xfds = NULL;
+#endif /* !VBOX */
 
     nfds = *pnfds;
@@ -356 +360 @@
                 do_slowtimo = ((tcb.so_next != &tcb) ||
                                ((struct ipasfrag *)&ipq != u32_to_ptr(ipq.next, struct ipasfrag *)));
-                
+
                 for (so = tcb.so_next; so != &tcb; so = so_next) {
                         so_next = so->so_next;
-                        
+
                         /*
                          * See if we need a tcp_fasttimo
@@ -365 +369 @@
                         if (time_fasttimo == 0 && so->so_tcpcb->t_flags & TF_DELACK)
                            time_fasttimo = curtime; /* Flag when we want a fasttimo */
-                        
+
                         /*
                          * NOFDREF can include still connecting to local-host,
@@ -372 +376 @@
                         if (so->so_state & SS_NOFDREF || so->s == -1)
                            continue;
-                        
+
                         /*
                          * Set for reading sockets which are accepting
@@ -381 +385 @@
                                 continue;
                         }
-                        
+
                         /*
                          * Set for writing sockets which are connecting
@@ -390 +394 @@
                                 continue;
                         }
-                        
+
                         /*
                          * Set for writing if we are connected, can send more, and
@@ -399 +403 @@
                                 UPD_NFDS(so->s);
                         }
-                        
+
                         /*
                          * Set for reading (and urgent data) if we are connected, can
@@ -410 +414 @@
                         }
                 }
-                
+
                 /*
                  * UDP sockets
@@ -416 +420 @@
                 for (so = udb.so_next; so != &udb; so = so_next) {
                         so_next = so->so_next;
-                        
+
                         /*
                          * See if it's timed out
@@ -427 +431 @@
                                         do_slowtimo = 1; /* Let socket expire */
                         }
-                        
+
                         /*
                          * When UDP packets are received from over the
@@ -444 +448 @@
                 }
         }
-        
+
         /*
          * Setup timeout to use minimum CPU usage, especially when idle
          */
-        
+
         /*
          * First, see the timeout needed by *timo
@@ -466 +470 @@
                 else if (timeout.tv_usec > 510000)
                    timeout.tv_usec = 510000;
-                
+
                 /* Can only fasttimo if we also slowtimo */
                 if (time_fasttimo) {
@@ -472 +476 @@
                         if (tmp_time < 0)
                            tmp_time = 0;
-                        
+
                         /* Choose the smallest of the 2 */
                         if (tmp_time < timeout.tv_usec)
@@ -479 +483 @@
         }
         *pnfds = nfds;
-}       
+}
 
 void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds)
@@ -486 +490 @@
     int ret;
 
+#ifndef VBOX
     global_readfds = readfds;
     global_writefds = writefds;
     global_xfds = xfds;
+#endif /* !VBOX */
 
         /* Update time */
         updtime();
-        
+
         /*
          * See if anything has timed out
@@ -507 +513 @@
                 }
         }
-        
+
         /*
          * Check sockets
@@ -517 +523 @@
                 for (so = tcb.so_next; so != &tcb; so = so_next) {
                         so_next = so->so_next;
-                        
+
                         /*
                          * FD_ISSET is meaningless on these sockets
@@ -524 +530 @@
                         if (so->so_state & SS_NOFDREF || so->s == -1)
                            continue;
-                        
+
                         /*
                          * Check for URG data
@@ -544 +550 @@
                                 } /* else */
                                 ret = soread(so);
-                                
+
                                 /* Output it if we read something */
                                 if (ret > 0)
                                    tcp_output(sototcpcb(so));
                         }
-                        
+
                         /*
                          * Check sockets for writing
@@ -560 +566 @@
                             /* Connected */
                             so->so_state &= ~SS_ISFCONNECTING;
-                        
+
                             ret = send(so->s, &ret, 0, 0);
                             if (ret < 0) {
@@ -567 +573 @@
                                   errno == EINPROGRESS || errno == ENOTCONN)
                                 continue;
-                        
+
                               /* else failed */
                               so->so_state = SS_NOFDREF;
                             }
                             /* else so->so_state &= ~SS_ISFCONNECTING; */
-                        
+
                             /*
                              * Continue tcp_input
@@ -587 +593 @@
                            */
                         }
-                        
+
                         /*
                          * Probe a still-connecting, non-blocking socket
@@ -595 +601 @@
                         if (so->so_state & SS_ISFCONNECTING) {
                           ret = recv(so->s, (char *)&ret, 0,0);
-                        
+
                           if (ret < 0) {
                             /* XXX */
@@ -601 +607 @@
                                 errno == EINPROGRESS || errno == ENOTCONN)
                               continue; /* Still connecting, continue */
-                        
+
                             /* else failed */
                             so->so_state = SS_NOFDREF;
-                        
+
                             /* tcp_input will take care of it */
                           } else {
@@ -617 +623 @@
                             } else
                               so->so_state &= ~SS_ISFCONNECTING;
-                        
+
                           }
                           tcp_input((struct mbuf *)NULL, sizeof(struct ip),so);
@@ -623 +629 @@
 #endif
                 }
-                
+
                 /*
                  * Now UDP sockets.
@@ -631 +637 @@
                 for (so = udb.so_next; so != &udb; so = so_next) {
                         so_next = so->so_next;
-                        
+
                         if (so->s != -1 && FD_ISSET(so->s, readfds)) {
                             sorecvfrom(so);
@@ -637 +643 @@
                 }
         }
-        
+
         /*
          * See if we can start outputting
@@ -644 +650 @@
            if_start();
 
+#ifndef VBOX
         /* clear global file descriptor sets.
          * these reside on the stack in vl.c
@@ -652 +659 @@
          global_writefds = NULL;
          global_xfds = NULL;
+#endif /* !VBOX */
 }
 

trunk/src/VBox/Devices/Network/slirp/socket.c

@@ -1 +1 @@
 /*
  * Copyright (c) 1995 Danny Gasparovski.
- * 
- * Please read the file COPYRIGHT for the 
+ *
+ * Please read the file COPYRIGHT for the
  * terms and conditions of the copyright.
  */
@@ -30 +30 @@
 {
         struct socket *so;
-        
+
         for (so = head->so_next; so != head; so = so->so_next) {
-                if (so->so_lport == lport && 
+                if (so->so_lport == lport &&
                     so->so_laddr.s_addr == laddr.s_addr &&
                     so->so_faddr.s_addr == faddr.s_addr &&
@@ -38 +38 @@
                    break;
         }
-        
+
         if (so == head)
            return (struct socket *)NULL;
         return so;
-        
+
 }
 
@@ -54 +54 @@
 {
   struct socket *so;
-        
+
   so = (struct socket *)malloc(sizeof(struct socket));
   if(so) {
@@ -79 +79 @@
   else if (so == udp_last_so)
     udp_last_so = &udb;
-        
+
   m_free(so->so_m);
-        
-  if(so->so_next && so->so_prev) 
+
+  if(so->so_next && so->so_prev)
     remque(so);  /* crashes if so is not in a queue */
 
@@ -102 +102 @@
         struct iovec iov[2];
         int mss = so->so_tcpcb->t_maxseg;
-        
+
         DEBUG_CALL("soread");
         DEBUG_ARG("so = %lx", (long )so);
-        
-        /* 
+
+        /*
          * No need to check if there's enough room to read.
          * soread wouldn't have been called if there weren't
          */
-        
+
         len = sb->sb_datalen - sb->sb_cc;
-        
+
         iov[0].iov_base = sb->sb_wptr;
         if (sb->sb_wptr < sb->sb_rptr) {
@@ -151 +151 @@
                 }
         }
-        
+
 #ifdef HAVE_READV
         nn = readv(so->s, (struct iovec *)iov, n);
@@ -157 +157 @@
 #else
         nn = recv(so->s, iov[0].iov_base, iov[0].iov_len,0);
-#endif  
+#endif
         if (nn <= 0) {
                 if (nn < 0 && (errno == EINTR || errno == EAGAIN))
@@ -168 +168 @@
                 }
         }
-        
+
 #ifndef HAVE_READV
         /*
@@ -185 +185 @@
                 nn += ret;
         }
-        
+
         DEBUG_MISC((dfd, " ... read nn = %d bytes\n", nn));
 #endif
-        
+
         /* Update fields */
         sb->sb_cc += nn;
@@ -196 +196 @@
         return nn;
 }
-        
+
 /*
  * Get urgent data
- * 
+ *
  * When the socket is created, we set it SO_OOBINLINE,
  * so when OOB data arrives, we soread() it and everything
@@ -212 +212 @@
         DEBUG_CALL("sorecvoob");
         DEBUG_ARG("so = %lx", (long)so);
-        
+
         /*
          * We take a guess at how much urgent data has arrived.
@@ -218 +218 @@
          * read() should get all the urgent data.  This guess will
          * be wrong however if more data arrives just after the
-         * urgent data, or the read() doesn't return all the 
+         * urgent data, or the read() doesn't return all the
          * urgent data.
          */
@@ -238 +238 @@
         struct sbuf *sb = &so->so_rcv;
         char buff[2048]; /* XXX Shouldn't be sending more oob data than this */
-        
+
         int n, len;
-        
+
         DEBUG_CALL("sosendoob");
         DEBUG_ARG("so = %lx", (long)so);
         DEBUG_ARG("sb->sb_cc = %d", sb->sb_cc);
-        
+
         if (so->so_urgc > 2048)
            so->so_urgc = 2048; /* XXXX */
-        
+
         if (sb->sb_rptr < sb->sb_wptr) {
                 /* We can send it directly */
                 n = send(so->s, sb->sb_rptr, so->so_urgc, (MSG_OOB)); /* |MSG_DONTWAIT)); */
                 so->so_urgc -= n;
-                
+
                 DEBUG_MISC((dfd, " --- sent %d bytes urgent data, %d urgent bytes left\n", n, so->so_urgc));
         } else {
-                /* 
+                /*
                  * Since there's no sendv or sendtov like writev,
                  * we must copy all data to a linear buffer then
@@ -275 +275 @@
                 if (n != len)
                    DEBUG_ERROR((dfd, "Didn't send all data urgently XXXXX\n"));
-#endif          
+#endif
                 DEBUG_MISC((dfd, " ---2 sent %d bytes urgent data, %d urgent bytes left\n", n, so->so_urgc));
         }
-        
+
         sb->sb_cc -= n;
         sb->sb_rptr += n;
         if (sb->sb_rptr >= (sb->sb_data + sb->sb_datalen))
                 sb->sb_rptr -= sb->sb_datalen;
-        
+
         return n;
 }
 
 /*
- * Write data from so_rcv to so's socket, 
+ * Write data from so_rcv to so's socket,
  * updating all sbuf field as necessary
  */
@@ -299 +299 @@
         int len = sb->sb_cc;
         struct iovec iov[2];
-        
+
         DEBUG_CALL("sowrite");
         DEBUG_ARG("so = %lx", (long)so);
-        
+
         if (so->so_urgc) {
                 sosendoob(so);
@@ -313 +313 @@
          * sowrite wouldn't have been called otherwise
          */
-        
+
         len = sb->sb_cc;
-        
+
         iov[0].iov_base = sb->sb_rptr;
         if (sb->sb_rptr < sb->sb_wptr) {
@@ -338 +338 @@
 #ifdef HAVE_READV
         nn = writev(so->s, (const struct iovec *)iov, n);
-        
+
         DEBUG_MISC((dfd, "  ... wrote nn = %d bytes\n", nn));
 #else
@@ -346 +346 @@
         if (nn < 0 && (errno == EAGAIN || errno == EINTR))
                 return 0;
-        
+
         if (nn <= 0) {
                 DEBUG_MISC((dfd, " --- sowrite disconnected, so->so_state = %x, errno = %d\n",
@@ -354 +354 @@
                 return -1;
         }
-        
+
 #ifndef HAVE_READV
         if (n == 2 && nn == iov[0].iov_len) {
@@ -364 +364 @@
         DEBUG_MISC((dfd, "  ... wrote nn = %d bytes\n", nn));
 #endif
-        
+
         /* Update sbuf */
         sb->sb_cc -= nn;
@@ -370 +370 @@
         if (sb->sb_rptr >= (sb->sb_data + sb->sb_datalen))
                 sb->sb_rptr -= sb->sb_datalen;
-        
+
         /*
          * If in DRAIN mode, and there's no more data, set
@@ -377 +377 @@
         if ((so->so_state & SS_FWDRAIN) && sb->sb_cc == 0)
                 sofcantsendmore(so);
-        
+
         return nn;
 }
@@ -394 +394 @@
         socklen_t addrlen = sizeof(struct sockaddr_in);
 #endif /* VBOX */
-        
+
         DEBUG_CALL("sorecvfrom");
         DEBUG_ARG("so = %lx", (long)so);
-        
+
         if (so->so_type == IPPROTO_ICMP) {   /* This is a "ping" reply */
           char buff[256];
           int len;
-                
-          len = recvfrom(so->s, buff, 256, 0, 
+
+          len = recvfrom(so->s, buff, 256, 0,
                          (struct sockaddr *)&addr, &addrlen);
           /* XXX Check if reply is "correct"? */
-          
+
           if(len == -1 || len == 0) {
             u_char code=ICMP_UNREACH_PORT;
@@ -411 +411 @@
             if(errno == EHOSTUNREACH) code=ICMP_UNREACH_HOST;
             else if(errno == ENETUNREACH) code=ICMP_UNREACH_NET;
-            
+
             DEBUG_MISC((dfd," udp icmp rx errno = %d-%s\n",
                         errno,strerror(errno)));
@@ -427 +427 @@
           if (!(m = m_get())) return;
           m->m_data += if_maxlinkhdr;
-                
-          /* 
+
+          /*
            * XXX Shouldn't FIONREAD packets destined for port 53,
            * but I don't know the max packet size for DNS lookups
@@ -435 +435 @@
           /* if (so->so_fport != htons(53)) { */
           ioctlsocket(so->s, FIONREAD, &n);
-          
+
           if (n > len) {
             n = (m->m_data - m->m_dat) + m->m_len + n + 1;
@@ -442 +442 @@
           }
           /* } */
-                
+
           m->m_len = recvfrom(so->s, m->m_data, len, 0,
                               (struct sockaddr *)&addr, &addrlen);
-          DEBUG_MISC((dfd, " did recvfrom %d, errno = %d-%s\n", 
+          DEBUG_MISC((dfd, " did recvfrom %d, errno = %d-%s\n",
                       m->m_len, errno,strerror(errno)));
           if(m->m_len<0) {
@@ -452 +452 @@
             if(errno == EHOSTUNREACH) code=ICMP_UNREACH_HOST;
             else if(errno == ENETUNREACH) code=ICMP_UNREACH_NET;
-            
+
             DEBUG_MISC((dfd," rx error, tx icmp ICMP_UNREACH:%i\n", code));
             icmp_error(so->so_m, ICMP_UNREACH,code, 0,strerror(errno));
@@ -475 +475 @@
              *          }
              */
-            
-            /* 
+
+            /*
              * If this packet was destined for CTL_ADDR,
              * make it look like that's where it came from, done by udp_output
@@ -499 +499 @@
         DEBUG_ARG("so = %lx", (long)so);
         DEBUG_ARG("m = %lx", (long)m);
-        
+
         addr.sin_family = AF_INET;
         if ((so->so_faddr.s_addr & htonl(0xffffff00)) == special_addr.s_addr) {
@@ -517 +517 @@
 
         DEBUG_MISC((dfd, " sendto()ing, addr.sin_port=%d, addr.sin_addr.s_addr=%.16s\n", ntohs(addr.sin_port), inet_ntoa(addr.sin_addr)));
-        
+
         /* Don't care what port we get */
         ret = sendto(so->s, m->m_data, m->m_len, 0,
@@ -523 +523 @@
         if (ret < 0)
                 return -1;
-        
+
         /*
          * Kill the socket if there's no reply in 4 minutes,
@@ -558 +558 @@
         DEBUG_ARG("lport = %d", lport);
         DEBUG_ARG("flags = %x", flags);
-        
+
         if ((so = socreate()) == NULL) {
           /* free(so);      Not sofree() ??? free(NULL) == NOP */
           return NULL;
         }
-        
+
         /* Don't tcp_attach... we don't need so_snd nor so_rcv */
         if ((so->so_tcpcb = tcp_newtcpcb(so)) == NULL) {
@@ -570 +570 @@
         }
         insque(so,&tcb);
-        
-        /* 
+
+        /*
          * SS_FACCEPTONCE sockets must time out.
          */
         if (flags & SS_FACCEPTONCE)
            so->so_tcpcb->t_timer[TCPT_KEEP] = TCPTV_KEEP_INIT*2;
-        
+
         so->so_state = (SS_FACCEPTCONN|flags);
         so->so_lport = lport; /* Kept in network format */
         so->so_laddr.s_addr = laddr; /* Ditto */
-        
+
         addr.sin_family = AF_INET;
         addr.sin_addr.s_addr = INADDR_ANY;
         addr.sin_port = port;
-        
+
         if (((s = socket(AF_INET,SOCK_STREAM,0)) < 0) ||
             (setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int)) < 0) ||
@@ -591 +591 @@
 #ifndef VBOX
                 int tmperrno = errno; /* Don't clobber the real reason we failed */
-                
+
                 close(s);
                 sofree(so);
@@ -618 +618 @@
         }
         setsockopt(s,SOL_SOCKET,SO_OOBINLINE,(char *)&opt,sizeof(int));
-        
+
         getsockname(s,(struct sockaddr *)&addr,&addrlen);
         so->so_fport = addr.sin_port;
@@ -630 +630 @@
 }
 
-/* 
+/*
  * Data is available in so_rcv
  * Just write() the data to the socket
@@ -642 +642 @@
 /*      FD_CLR(so->s,&writefds); */
 }
-        
+
 /*
  * Data has been freed in so_snd
@@ -684 +684 @@
         if ((so->so_state & SS_NOFDREF) == 0) {
                 shutdown(so->s,0);
+#ifndef VBOX
                 if(global_writefds) {
                   FD_CLR(so->s,global_writefds);
                 }
+#endif /* !VBOX */
         }
         so->so_state &= ~(SS_ISFCONNECTING);
@@ -701 +703 @@
         if ((so->so_state & SS_NOFDREF) == 0) {
             shutdown(so->s,1);           /* send FIN to fhost */
+#ifndef VBOX
             if (global_readfds) {
                 FD_CLR(so->s,global_readfds);
@@ -707 +710 @@
                 FD_CLR(so->s,global_xfds);
             }
+#endif /* !VBOX */
         }
         so->so_state &= ~(SS_ISFCONNECTING);