Changeset 15104 in vbox

Timestamp:

Dec 8, 2008 12:15:26 PM (16 years ago)

Author:

vboxsync

Message:

processing of ICMP packets was added
initialization of icmp receiving buffer was added
the addressing of IcmpSendEcho2 was corrected

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -78 +78 @@
 #ifndef RT_OS_WINDOWS
         pData->icmp_socket.s = socket(PF_INET, SOCK_RAW, IPPROTO_ICMP);
+        insque(pData, &pData->icmp_socket, &udb);
 #else
         pData->icmp_socket.s = IcmpCreateFile();
         pData->phEvents[VBOX_ICMP_EVENT_INDEX] = CreateEvent(NULL, FALSE, FALSE, NULL);
+                pData->szIcmpBuffer = sizeof(ICMP_ECHO_REPLY) * 10;
+                pData->pvIcmpBuffer = malloc(pData->szIcmpBuffer);
 #endif
-        insque(pData, &pData->icmp_socket, &udb);
         LIST_INIT(&pData->icmp_msg_head);
         return (0);
@@ -247 +249 @@
 #ifdef RT_OS_WINDOWS      
       IP_OPTION_INFORMATION ipopt;
+      int error;
 #endif
       addr.sin_family = AF_INET;
@@ -280 +283 @@
       memset(&ipopt, 0, sizeof(IP_OPTION_INFORMATION));
       ipopt.Ttl = ip->ip_ttl;
-      status = IcmpSendEcho2(pData->icmp_socket.s, pData->phEvents[VBOX_ICMP_EVENT_INDEX], NULL, NULL, &addr, icp, icmplen, &ipopt, pData->pvIcmpBuffer, pData->szIcmpBuffer, 0);
-      if (status == 0) {
-            LogRel(("error(%d) occured while sending ICMP\n", GetLastError()));
+      status = IcmpSendEcho2(pData->icmp_socket.s, pData->phEvents[VBOX_ICMP_EVENT_INDEX], NULL, NULL, addr.sin_addr.s_addr, icp, icmplen, &ipopt, 
+                                          pData->pvIcmpBuffer, pData->szIcmpBuffer, 1000);
+      if (status == 0 && (error = GetLastError()) != ERROR_IO_PENDING) {
+            error = GetLastError(); 
+        LogRel(("error(%d) occured while sending ICMP\n", GetLastError()));
+            switch(error) {
+                        case ERROR_INVALID_PARAMETER:
+                                LogRel(("icmp_socket:%lx is invalid\n", pData->icmp_socket.s));
+                                break;
+                        case ERROR_NOT_SUPPORTED:
+                                LogRel(("operation is unsupported \n"));
+                                break;
+                        case ERROR_NOT_ENOUGH_MEMORY:
+                                LogRel(("OOM!!!\n"));
+                                break;
+                        case IP_BUF_TOO_SMALL:
+                                LogRel(("Buffer too small\n"));
+                                break;
+                        default:
+                                LogRel(("Other error!!!\n"));
+                                break;
+            }
       }
 #endif

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

@@ -848 +848 @@
               return;
         }
+        LogRel(("IcmpParseReplies returns %ld\n", len));
         icr = (ICMP_ECHO_REPLY *)pData->pvIcmpBuffer;
         for (i = 0; i < len; ++i) {
@@ -862 +863 @@
                                 icmp_error(pData, so->so_m, ICMP_UNREACH, code, 0, "Error occured!!!");
                         break;
+                        case IP_SUCCESS: /* echo replied */
+                        case IP_TTL_EXPIRED_TRANSIT: /* TTL expired */
+                        __asm {int 3}
+                        break;
+                        default:
+                                LogRel(("ICMP: message with Status: %x was received from %R[IP4]\n", icr[i].Status, icr[i].Address));
+                        break;
                 }
         }