Changeset 17191 in vbox

Timestamp:

Feb 27, 2009 8:43:04 AM (16 years ago)

Author:

vboxsync

Message:

spaces

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip.h (modified) (1 diff)
• ip_icmp.c (modified) (1 diff)
• ip_input.c (modified) (2 diffs)
• sbuf.c (modified) (3 diffs)
• slirp.c (modified) (2 diffs)
• slirp.h (modified) (1 diff)
• socket.c (modified) (12 diffs)
• tcp_input.c (modified) (8 diffs)
• tcp_subr.c (modified) (1 diff)
• tcp_timer.c (modified) (2 diffs)
• udp.c (modified) (5 diffs)

trunk/src/VBox/Devices/Network/slirp/ip.h

@@ -222 +222 @@
 #define IPREASS_HASH(x,y) \
 (((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK)
-TAILQ_HEAD(ipqhead,ipq_t);
+TAILQ_HEAD(ipqhead, ipq_t);
 
 /*

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

@@ -395 +395 @@
                         Log((dfd,"icmp_input udp sendto tx errno = %d-%s\n",
                                     errno, strerror(errno)));
-                        icmp_error(pData, m, ICMP_UNREACH,ICMP_UNREACH_NET, 0, strerror(errno));
+                        icmp_error(pData, m, ICMP_UNREACH, ICMP_UNREACH_NET, 0, strerror(errno));
                     }
                 }

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

@@ -107 +107 @@
      * if (ip->ip_sum) {
      */
-    if(cksum(m,hlen))
+    if (cksum(m, hlen))
     {
         ipstat.ips_badsum++;
@@ -143 +143 @@
     if (ip->ip_ttl==0 || ip->ip_ttl == 1)
     {
-        icmp_error(pData, m, ICMP_TIMXCEED,ICMP_TIMXCEED_INTRANS, 0,"ttl");
+        icmp_error(pData, m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS, 0, "ttl");
         goto bad;
     }

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

@@ -166 +166 @@
             if (nn > len)
                 nn = len;
-            memcpy(sb->sb_data,m->m_data+n,nn);
+            memcpy(sb->sb_data, m->m_data+n, nn);
             n += nn;
         }
@@ -195 +195 @@
         if (len > sb->sb_cc)
             len = sb->sb_cc;
-        memcpy(to,from,len);
+        memcpy(to, from, len);
     }
     else
@@ -203 +203 @@
         if (off > len)
             off = len;
-        memcpy(to,from,off);
+        memcpy(to, from, off);
         len -= off;
         if (len)
-            memcpy(to+off,sb->sb_data,len);
-    }
-}
-
+            memcpy(to+off, sb->sb_data, len);
+    }
+}
+

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

@@ -477 +477 @@
     {
         WSADATA Data;
-        WSAStartup(MAKEWORD(2,0), &Data);
+        WSAStartup(MAKEWORD(2, 0), &Data);
     }
 # if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC)
@@ -1322 +1322 @@
             if ((htip & pData->netmask) == ntohl(special_addr.s_addr))
             {
-                if (   CTL_CHECK(htip,CTL_DNS)
+                if (   CTL_CHECK(htip, CTL_DNS)
                     || CTL_CHECK(htip, CTL_ALIAS)
                     || CTL_CHECK(htip, CTL_TFTP))

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

@@ -327 +327 @@
 
 #ifndef RT_OS_WINDOWS
-# define min(x,y) ((x) < (y) ? (x) : (y))
-# define max(x,y) ((x) > (y) ? (x) : (y))
+# define min(x, y) ((x) < (y) ? (x) : (y))
+# define max(x, y) ((x) > (y) ? (x) : (y))
 #endif
 

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

@@ -194 +194 @@
     DEBUG_MISC((dfd, " ... read nn = %d bytes\n", nn));
 #else
-    nn = recv(so->s, iov[0].iov_base, iov[0].iov_len,0);
+    nn = recv(so->s, iov[0].iov_base, iov[0].iov_len, 0);
 #endif
     if (nn <= 0)
@@ -226 +226 @@
             /* nn == 0 means peer has performed an orderly shutdown */
             DEBUG_MISC((dfd, " --- soread() disconnected, nn = %d, errno = %d-%s\n",
-                        nn, errno,strerror(errno)));
+                        nn, errno, strerror(errno)));
             sofcantrcvmore(so);
             tcp_sockclosed(pData, sototcpcb(so));
@@ -247 +247 @@
     {
         int ret;
-        ret = recv(so->s, iov[1].iov_base, iov[1].iov_len,0);
+        ret = recv(so->s, iov[1].iov_base, iov[1].iov_len, 0);
         if (ret > 0)
             nn += ret;
@@ -367 +367 @@
 sowrite(PNATState pData, struct socket *so)
 {
-    int  n,nn;
+    int n, nn;
     struct sbuf *sb = &so->so_rcv;
     size_t len = sb->sb_cc;
@@ -450 +450 @@
     {
         int ret;
-        ret = send(so->s, iov[1].iov_base, iov[1].iov_len,0);
+        ret = send(so->s, iov[1].iov_base, iov[1].iov_len, 0);
         if (ret > 0)
             nn += ret;
@@ -538 +538 @@
                             (struct sockaddr *)&addr, &addrlen);
         Log2((" did recvfrom %d, errno = %d-%s\n",
-                    m->m_len, errno,strerror(errno)));
+                    m->m_len, errno, strerror(errno)));
         if(m->m_len < 0)
         {
@@ -549 +549 @@
 
             Log2((dfd," rx error, tx icmp ICMP_UNREACH:%i\n", code));
-            icmp_error(pData, so->so_m, ICMP_UNREACH,code, 0,strerror(errno));
+            icmp_error(pData, so->so_m, ICMP_UNREACH, code, 0, strerror(errno));
             so->so_m = NULL;
             m_free(pData, m);
@@ -720 +720 @@
     addr.sin_port = port;
 
-    if (   ((s = socket(AF_INET,SOCK_STREAM,0)) < 0)
-        || (setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int)) < 0)
+    if (   ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+        || (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,(char *)&opt, sizeof(int)) < 0)
         || (bind(s,(struct sockaddr *)&addr, sizeof(addr)) < 0)
-        || (listen(s,1) < 0))
+        || (listen(s, 1) < 0))
     {
 #ifdef RT_OS_WINDOWS
@@ -744 +744 @@
         return NULL;
     }
-    setsockopt(s,SOL_SOCKET,SO_OOBINLINE,(char *)&opt,sizeof(int));
+    setsockopt(s, SOL_SOCKET, SO_OOBINLINE,(char *)&opt, sizeof(int));
 
     getsockname(s,(struct sockaddr *)&addr,&addrlen);
@@ -808 +808 @@
     if ((so->so_state & SS_NOFDREF) == 0)
     {
-        shutdown(so->s,0);
+        shutdown(so->s, 0);
     }
     so->so_state &= ~(SS_ISFCONNECTING);
@@ -861 +861 @@
 {
     struct ip *ip;
-    uint32_t dst,src;
+    uint32_t dst, src;
     char ip_copy[256];
     struct icmp *icp;
@@ -1097 +1097 @@
 
         DEBUG_MISC((dfd," udp icmp rx errno = %d-%s\n",
-                    errno,strerror(errno)));
-        icmp_error(pData, so->so_m, ICMP_UNREACH,code, 0,strerror(errno));
+                    errno, strerror(errno)));
+        icmp_error(pData, so->so_m, ICMP_UNREACH, code, 0, strerror(errno));
         so->so_m = NULL;
     }

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

@@ -50 +50 @@
 
 /* for modulo comparisons of timestamps */
-#define TSTMP_LT(a,b)   ((int)((a)-(b)) < 0)
-#define TSTMP_GEQ(a,b)  ((int)((a)-(b)) >= 0)
+#define TSTMP_LT(a, b)   ((int)((a)-(b)) < 0)
+#define TSTMP_GEQ(a, b)  ((int)((a)-(b)) >= 0)
 
 #ifndef TCP_ACK_HACK
@@ -657 +657 @@
             if (so->so_emu)
             {
-                if (tcp_emu(pData, so,m)) sbappend(pData, so, m);
+                if (tcp_emu(pData, so, m))
+                    sbappend(pData, so, m);
             }
             else
@@ -743 +744 @@
                 u_char code = ICMP_UNREACH_NET;
                 DEBUG_MISC((dfd," tcp fconnect errno = %d-%s\n",
-                            errno,strerror(errno)));
+                            errno, strerror(errno)));
                 if (errno == ECONNREFUSED)
                 {
@@ -761 +762 @@
                     m->m_len  += sizeof(struct tcpiphdr)+off-sizeof(struct tcphdr);
                     *ip = save_ip;
-                    icmp_error(pData, m, ICMP_UNREACH,code, 0,strerror(errno));
+                    icmp_error(pData, m, ICMP_UNREACH, code, 0, strerror(errno));
                     tp->t_socket->so_m = NULL;
                 }
@@ -835 +836 @@
             {
                 if (tiflags & TH_ACK)
-                    tp = tcp_drop(pData, tp,0); /* XXX Check t_softerror! */
+                    tp = tcp_drop(pData, tp, 0); /* XXX Check t_softerror! */
                 Log2(("RST(%x) is on SYN_SENT =>drop\n", tiflags));
                 goto drop;
@@ -1114 +1115 @@
     if (tiflags & TH_SYN)
     {
-        tp = tcp_drop(pData, tp,0);
+        tp = tcp_drop(pData, tp, 0);
         goto dropwithreset;
     }
@@ -1283 +1284 @@
 #endif
                 if (tp->t_rtt && SEQ_GT(ti->ti_ack, tp->t_rtseq))
-                    tcp_xmit_timer(pData, tp,tp->t_rtt);
+                    tcp_xmit_timer(pData, tp, tp->t_rtt);
 
             /*
@@ -1521 +1522 @@
                 if (so->so_emu) 
                 {
-                    if (tcp_emu(pData, so,m))
+                    if (tcp_emu(pData, so, m))
                         sbappend(pData, so, m);
                 }

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

@@ -377 +377 @@
     DEBUG_ARG("so = %lx", (long )so);
 
-    if ((ret = so->s = socket(AF_INET,SOCK_STREAM,0)) >= 0)
+    if ((ret = so->s = socket(AF_INET, SOCK_STREAM, 0)) >= 0)
     {
         int opt, s = so->s;

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

@@ -51 +51 @@
     so = tcb.so_next;
     if (so)
-        QSOCKET_FOREACH (so, so_next,tcp)
+        QSOCKET_FOREACH (so, so_next, tcp)
         /* { */
             if (   (tp = (struct tcpcb *)so->so_tcpcb)
@@ -95 +95 @@
             if (tp->t_timer[i] && --tp->t_timer[i] == 0)
             {
-                tcp_timers(pData, tp,i);
+                tcp_timers(pData, tp, i);
                 if (ipnxt->so_prev != ip)
                     goto tpgone;

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

@@ -205 +205 @@
         {
             DEBUG_MISC((dfd," udp_attach errno = %d-%s\n",
-                        errno,strerror(errno)));
+                        errno, strerror(errno)));
             sofree(pData, so);
             goto bad;
@@ -251 +251 @@
         *ip = save_ip;
         DEBUG_MISC((dfd,"udp tx errno = %d-%s\n", errno, strerror(errno)));
-        icmp_error(pData, m, ICMP_UNREACH,ICMP_UNREACH_NET, 0, strerror(errno));
+        icmp_error(pData, m, ICMP_UNREACH, ICMP_UNREACH_NET, 0, strerror(errno));
         /* in case we receive ICMP on this socket we'll aware that ICMP has been already sent to host*/
         so->so_m = NULL; 
@@ -358 +358 @@
     int status;
 
-    if ((so->s = socket(AF_INET,SOCK_DGRAM,0)) != -1)
+    if ((so->s = socket(AF_INET, SOCK_DGRAM, 0)) != -1)
     {
         /*
@@ -709 +709 @@
         return NULL;
 
-    so->s = socket(AF_INET,SOCK_DGRAM,0);
+    so->s = socket(AF_INET, SOCK_DGRAM, 0);
     if (so->s == -1)
     {
@@ -733 +733 @@
         return NULL;
     }
-    setsockopt(so->s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int));
-/*  setsockopt(so->s,SOL_SOCKET,SO_OOBINLINE,(char *)&opt,sizeof(int)); */
+    setsockopt(so->s, SOL_SOCKET, SO_REUSEADDR,(char *)&opt, sizeof(int));
+/*  setsockopt(so->s, SOL_SOCKET, SO_OOBINLINE,(char *)&opt, sizeof(int)); */
 
     getsockname(so->s,(struct sockaddr *)&addr,&addrlen);