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

Timestamp:

Oct 7, 2013 9:41:00 PM (11 years ago)

Author:

vboxsync

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

89644

Message:

Devices: Whitespace and svn:keyword cleanups by scm.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• dnsproxy/dnsproxy.c (modified) (13 diffs)
• slirp.c (modified) (2 diffs)

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

@@ -120 +120 @@
     /* be paranoid */
     AssertPtrReturnVoid(arg);
-    
+
     de = TAILQ_PREV(req->dns_server, dns_list_head, de_list);
-    
+
     if (de == NULL)
     {
@@ -137 +137 @@
         struct mbuf *m = NULL;
         char *data;
-        
+
         m = slirpDnsMbufAlloc(pData);
         if (m == NULL)
@@ -168 +168 @@
 
         /* expiration will be bumped in dnsproxy_query */
-        
+
         dnsproxy_query(pData, so, m, iphlen);
         /* should we free so->so_m ? */
         return;
     }
- 
- socket_clean_up:   
+
+ socket_clean_up:
     /* This socket (so) will be detached, so we need to remove timeout(&_arg) references
-     * before leave 
+     * before leave
      */
     so->so_timeout = NULL;
@@ -309 +309 @@
 #else /* VBOX */
     AssertPtr(pData);
-    
+
     /* m->m_data points to IP header */
 #if 0
@@ -340 +340 @@
 
 
-    req = so->so_timeout_arg; 
+    req = so->so_timeout_arg;
 
     if (!req)
@@ -347 +347 @@
         Assert(!so->so_timeout_arg);
 
-        if ((req = RTMemAllocZ(sizeof(struct request) + byte)) == NULL) 
+        if ((req = RTMemAllocZ(sizeof(struct request) + byte)) == NULL)
         {
             LogRel(("calloc failed\n"));
@@ -382 +382 @@
 
     req->recursion = 0;
-        
+
     DPRINTF(("External query RD=%d\n", RD(buf)));
-        
+
     if (retransmit == 0)
         hash_add_request(pData, req);
@@ -394 +394 @@
     /* let's slirp to care about expiration */
     so->so_expire = curtime + recursive_timeout * 1000;
- 
+
     memset(&addr, 0, sizeof(struct sockaddr_in));
     addr.sin_family = AF_INET;
@@ -408 +408 @@
     /* send it to our authoritative server */
     Log2(("NAT: request will be sent to %RTnaipv4 on %R[natsock]\n", addr.sin_addr, so));
-    
+
     byte = sendto(so->s, buf, (unsigned int)byte, 0,
                   (struct sockaddr *)&addr,
                   sizeof(struct sockaddr_in));
-    if (byte == -1) 
+    if (byte == -1)
     {
         /* XXX: is it really enough? */
@@ -425 +425 @@
     ++authoritative_queries;
 
-# if 0    
-    /* XXX: this stuff for _debugging_ only, 
-     * first enforce guest to send next request 
-     * and second for faster getting timeout callback 
-     * other option is adding couple entries in resolv.conf with 
+# if 0
+    /* XXX: this stuff for _debugging_ only,
+     * first enforce guest to send next request
+     * and second for faster getting timeout callback
+     * other option is adding couple entries in resolv.conf with
      * invalid nameservers.
      *
-     * For testing purposes could be used 
-     * namebench -S -q 10000 -m random or -m chunk 
+     * For testing purposes could be used
+     * namebench -S -q 10000 -m random or -m chunk
      */
     /* RTThreadSleep(3000); */
@@ -497 +497 @@
         LogRel(("sendto failed: %s\n", strerror(errno)));
         ++dropped_answers;
-    } 
+    }
     else
         ++answered_queries;
@@ -509 +509 @@
 
     AssertPtr(pData);
-    
+
     /* XXX: mbuf->data points to ??? */
     byte = m->m_len;
@@ -524 +524 @@
 
     /* find corresponding query */
-    if (query == NULL) 
+    if (query == NULL)
     {
-        /* XXX: if we haven't found anything for this request ... 
+        /* XXX: if we haven't found anything for this request ...
          * What we are expecting later?
          */

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

@@ -354 +354 @@
     /* set default addresses */
     inet_aton("127.0.0.1", &loopback_addr);
-    
+
     if (!fUseHostResolver)
     {
@@ -744 +744 @@
                 if (so->so_timeout != NULL)
                 {
-                    /* so_timeout - might change the so_expire value or 
-                     * drop so_timeout* from so. 
+                    /* so_timeout - might change the so_expire value or
+                     * drop so_timeout* from so.
                      */
                     so->so_timeout(pData, so, so->so_timeout_arg);
-                    /* on 4.2 so->  
+                    /* on 4.2 so->
                      */
                     if (   so_next->so_prev != so /* so_timeout freed the socket */