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

Timestamp:

Dec 7, 2008 11:44:04 AM (16 years ago)

Author:

vboxsync

Message:

introducing ICMP support in Windows (not working)

File:

• trunk/src/VBox/Devices/Network/slirp/ip_icmp.c (modified) (5 diffs)

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

@@ -37 +37 @@
 #include "slirp.h"
 #include "ip_icmp.h"
+#ifdef RT_OS_WINDOWS
+#include <Icmpapi.h>
+#include <Iphlpapi.h>
+#endif
 
 
@@ -72 +76 @@
         pData->icmp_socket.so_type = IPPROTO_ICMP;
         pData->icmp_socket.so_state = SS_ISFCONNECTED;
+#ifndef RT_OS_WINDOWS
         pData->icmp_socket.s = socket(PF_INET, SOCK_RAW, IPPROTO_ICMP);
+#else
+        pData->icmp_socket.s = IcmpCreateFile();
+#endif
         insque(pData, &pData->icmp_socket, &udb);
         LIST_INIT(&pData->icmp_msg_head);
@@ -236 +244 @@
       }
 #else /* !VBOX_WITH_SLIRP_ICMP */
+#ifdef RT_OS_WINDOWS      
+      IP_OPTION_INFORMATION ipopt;
+#endif
       addr.sin_family = AF_INET;
       if ((ip->ip_dst.s_addr & htonl(pData->netmask)) == special_addr.s_addr) {
@@ -253 +264 @@
       icmp_attach(pData, m);
       /* Send the packet */
+#ifndef RT_OS_WINDOWS
       status = setsockopt(pData->icmp_socket.s, IPPROTO_IP, IP_TTL, (void *)&ip->ip_ttl, sizeof(ip->ip_ttl));
       if (status < 0) {
@@ -264 +276 @@
         m_free(pData, m);
       }
+#else
+      memset(&ipopt, 0, sizeof(IP_OPTION_INFORMATION));
+      ipopt.Ttl = ip->ip_ttl;
+      m->m_ext = malloc(1500);
+      status = IcmpSendEcho(pData->icmp_socket.s, VBOX_SOCKET_EVENT, &addr, icp, icmplen, m->m_ext, 1500, 0);
+      if (status == 0) {
+            LogRel(("error(%d) occured while sending ICMP\n", GetLastError()));
+      }
+#endif
 
 #endif /* VBOX_WITH_SLIRP_ICMP */