儲存庫 vbox 的更動 15194

時間撮記:

2008-12-9 下午05:05:42 (16 年 以前)

作者:

vboxsync

訊息:

Slirp:ICMP: Proper shutdowning of ICMP raw socket on Unix and ICMP file handle on Windows

位置:

trunk/src/VBox/Devices/Network/slirp

檔案:

• ip_icmp.c (修改) (3 筆差異)
• slirp.c (修改) (1 筆差異)
• slirp_state.h (修改) (1 筆差異)

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

@@ -92 +92 @@
         pData->pfIcmpParseReplies = (long (WINAPI *)(void *, long))
                                     GetProcAddress(pData->hmIcmpLibrary, "IcmpParseReplies");
+        pData->pfIcmpCloseHandle = (BOOL (WINAPI *)(HANDLE)) 
+                                    GetProcAddress(pData->hmIcmpLibrary, "IcmpCloseHandle");
     }
     if (pData->pfIcmpParseReplies == NULL)
@@ -104 +106 @@
         pData->pfIcmpParseReplies = (long (WINAPI *)(void *, long))
                                     GetProcAddress(pData->hmIcmpLibrary, "IcmpParseReplies");
+        pData->pfIcmpCloseHandle = (BOOL (WINAPI *)(HANDLE)) 
+                                    GetProcAddress(pData->hmIcmpLibrary, "IcmpCloseHandle");
     }
     if (pData->pfIcmpParseReplies == NULL)
@@ -111 +115 @@
         return 1;
     } 
+    if (pData->pfIcmpCloseHandle == NULL)
+    {
+        LogRel(("NAT: Can't find IcmpCloseHandle symbol\n"));
+        FreeLibrary(pData->hmIcmpLibrary);
+        return 1;
+    }
     pData->icmp_socket.sh = IcmpCreateFile();
     pData->phEvents[VBOX_ICMP_EVENT_INDEX] = CreateEvent(NULL, FALSE, FALSE, NULL);

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

@@ -369 +369 @@
     LogRel(("NAT: cpvHashUsed=%RU32 cpvHashCollisions=%RU32 cpvHashInserts=%RU64 cpvHashDone=%RU64\n",
             pData->cpvHashUsed, pData->cpvHashCollisions, pData->cpvHashInserts, pData->cpvHashDone));
+#endif
+
+#ifdef VBOX_WITH_SLIRP_ICMP
+# ifdef RT_OS_WINDOWS
+    pData->pfIcmpCloseHandle(pData->icmp_socket.sh);
+# else
+    closesocket(pData->icmp_socket.s);
+# endif
 #endif
 

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

@@ -144 +144 @@
      */
     long (WINAPI * pfIcmpParseReplies)(void *, long);
+    BOOL (WINAPI * pfIcmpCloseHandle)(HANDLE);
     HMODULE hmIcmpLibrary;
 #endif