Changeset 15138 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Dec 9, 2008 8:05:22 AM (16 years ago)

Author:

vboxsync

Message:

slirp: error handling; typos

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_icmp.c (modified) (3 diffs)
• socket.c (modified) (3 diffs)

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

@@ -79 +79 @@
 #ifndef RT_OS_WINDOWS
     pData->icmp_socket.s = socket(PF_INET, SOCK_RAW, IPPROTO_ICMP);
+    if (pData->icmp_socket.s == -1)
+    {
+        int rc = RTErrConvertFromErrno(errno);
+        LogRel(("NAT: ICMP/ping not available (could open ICMP socket, error %Rrc)\n", rc, rc));
+        return 1;
+    }
     insque(pData, &pData->icmp_socket, &udb);
 #else /* RT_OS_WINDOWS */
@@ -312 +318 @@
                 if (status < 0)
                 {
-                    LogRel(("error(%s) occured while setting TTL attribute of IP packet\n", strerror(errno)));
+                    LogRel(("NAT: Error (%s) occurred while setting TTL attribute of IP packet\n", strerror(errno)));
                 }
                 if (sendto(pData->icmp_socket.s, icp, icmplen, 0,
@@ -332 +338 @@
                 {
                     error = GetLastError(); 
-                    LogRel(("error(%d) occured while sending ICMP (", error));
+                    LogRel(("NAT: Error (%d) occurred while sending ICMP (", error));
                     switch (error) 
                     {

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

@@ -793 +793 @@
         icm = icmp_find_original_mbuf(pData, ip);
         
-        if (icm == NULL) {
-            LogRel(("Can't find the corresponding packet for the received ICMP\n"));
+        if (icm == NULL)
+        {
+            LogRel(("NAT: Can't find the corresponding packet for the received ICMP\n"));
             return;
         }
-        
+
         m = icm->im_m;
         Assert(m != NULL);
@@ -846 +847 @@
         u_char code = ~0;
         len = pData->pfIcmpParseReplies(pData->pvIcmpBuffer, pData->szIcmpBuffer);
-        if (len <= 0) {
-              LogRel(("Error (%d) occured on ICMP receiving \n", GetLastError()));  
+        if (len <= 0)
+        {
+              LogRel(("NAT: Error (%d) occurred on ICMP receiving\n", GetLastError()));
               return;
         }
         LogRel(("IcmpParseReplies returns %ld\n", len));
         icr = (ICMP_ECHO_REPLY *)pData->pvIcmpBuffer;
-        for (i = 0; i < len; ++i) {
+        for (i = 0; i < len; ++i)
+        {
                 switch(icr[i].Status) 
                 {
@@ -864 +867 @@
                         case IP_DEST_PORT_UNREACHABLE:
                                 code = (code != ~0 ? code : ICMP_UNREACH_PORT);
-                                icmp_error(pData, so->so_m, ICMP_UNREACH, code, 0, "Error occured!!!");
+                                icmp_error(pData, so->so_m, ICMP_UNREACH, code, 0, "Error occurred!!!");
                         break;
                         case IP_SUCCESS: /* echo replied */