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

Timestamp:

Dec 8, 2008 5:33:32 AM (16 years ago)

Author:

vboxsync

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

40474

Message:

slirp: icmp should be compilable on Windows now

File:

• trunk/src/VBox/Devices/Network/slirp/socket.c (modified) (6 diffs)

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

@@ -18 +18 @@
 
 #ifdef VBOX_WITH_SLIRP_ICMP
-static void send_icmp_to_guest(PNATState, char *, struct socket *);
+static void send_icmp_to_guest(PNATState, char *, size_t, struct socket *, const struct sockaddr_in *);
 static void sorecvfrom_icmp_win(PNATState, struct socket *);
 #endif
@@ -433 +433 @@
 
     if (so->so_type == IPPROTO_ICMP) {   /* This is a "ping" reply */
+#if !defined(VBOX_WITH_SLIRP_ICMP) || (defined(VBOX_WITH_SLIRP_ICMP) && !defined(RT_OS_WINDOWS)) 
           sorecvfrom_icmp_unix(pData, so);
+#endif
+#if defined(VBOX_WITH_SLIRP_ICMP) && !defined(RT_OS_WINDOWS)
+          sorecvfrom_icmp_win(pData, so);
+#endif
           udp_detach(pData, so);
     } else {                                /* A "normal" UDP packet */
@@ -766 +771 @@
 #ifdef VBOX_WITH_SLIRP_ICMP
 static void 
-send_icmp_to_guest(PNATState pData, char *buff, struct socket *so)
+send_icmp_to_guest(PNATState pData, char *buff, size_t len, struct socket *so, const struct sockaddr_in *addr)
 {
         struct ip *ip;
@@ -795 +800 @@
         Assert(m != NULL);
         
-        src = addr.sin_addr.s_addr;
+        src = addr->sin_addr.s_addr;
         
         ip = mtod(m, struct ip *);
@@ -830 +835 @@
         free(icm);
 }
-#endif
-static void sorecvfrom_icmp_win(PNATState pData, struct socket *so){
-#if 0
+
+static void 
+sorecvfrom_icmp_win(PNATState pData, struct socket *so)
+{
+        int len;
         int i;
+        ICMP_ECHO_REPLY *icr;
+        u_char code = ~0;
         len = IcmpParseReplies(pData->pvIcmpBuffer, pData->szIcmpBuffer);
-#endif
-}
+        if (len <= 0) {
+              LogRel(("Error (%d) occured on ICMP receiving \n", GetLastError()));  
+              return;
+        }
+        icr = (ICMP_ECHO_REPLY *)pData->pvIcmpBuffer;
+        for (i = 0; i < len; ++i) {
+                switch(icr[i].Status) {
+                        case IP_DEST_HOST_UNREACHABLE:
+                                code=ICMP_UNREACH_HOST;
+                        case IP_DEST_NET_UNREACHABLE:
+                                code=ICMP_UNREACH_NET;
+                }
+        }
+}
+#endif
+
 static void sorecvfrom_icmp_unix(PNATState pData, struct socket *so)
 {
@@ -864 +887 @@
     {
 #ifdef VBOX_WITH_SLIRP_ICMP
-        send_icmp_to_guest(pData, buff, so);
+        send_icmp_to_guest(pData, buff, len, so, &addr);
 #else
         icmp_reflect(pData, so->so_m);