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

Timestamp:

Dec 9, 2008 9:33:51 AM (16 years ago)

Author:

vboxsync

Message:

slirp:ICMP send of icmp packet happens (wireshark for detection)

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_icmp.c (modified) (2 diffs)
• socket.c (modified) (2 diffs)
• socket.h (modified) (1 diff)

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

@@ -111 +111 @@
         return 1;
     } 
-    pData->icmp_socket.s = IcmpCreateFile();
+    pData->icmp_socket.sh = IcmpCreateFile();
     pData->phEvents[VBOX_ICMP_EVENT_INDEX] = CreateEvent(NULL, FALSE, FALSE, NULL);
     pData->szIcmpBuffer = sizeof(ICMP_ECHO_REPLY) * 10;
@@ -331 +331 @@
                 memset(&ipopt, 0, sizeof(IP_OPTION_INFORMATION));
                 ipopt.Ttl = ip->ip_ttl;
-                status = IcmpSendEcho2(pData->icmp_socket.s, pData->phEvents[VBOX_ICMP_EVENT_INDEX],
+                status = IcmpSendEcho2(pData->icmp_socket.sh, pData->phEvents[VBOX_ICMP_EVENT_INDEX],
                                        NULL, NULL, addr.sin_addr.s_addr, icp->icmp_data, 
                                        icmplen - offsetof(struct icmp, icmp_data) , &ipopt,

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

@@ -844 +844 @@
         int len;
         int i;
+        struct ip *ip;
+        struct mbuf *m;
+        struct icmp *icp;
         ICMP_ECHO_REPLY *icr;
         u_char code = ~0;
@@ -870 +873 @@
                         break;
                         case IP_SUCCESS: /* echo replied */
+                                m = m_get(pData);
+                                ip = mtod(m, struct ip *);
+                                ip->ip_src.s_addr = icr[i].Address;
+                                ip->ip_p = IPPROTO_ICMP;
+                                ip->ip_dst.s_addr = inet_addr("10.0.0.15"); /*XXX:hack here*/
+                                ip->ip_hl = sizeof(struct ip) >> 2;
+
+                                icp = (struct icmp *)&ip[1]; /* no options */
+                                icp->icmp_type = ICMP_ECHOREPLY;
+                                icp->icmp_code = 0;
+                                memcpy(icp->icmp_data, icr[i].Data, icr[i].DataSize);
+
+                                ip->ip_len = sizeof(struct ip) + ICMP_MINLEN + icr[i].DataSize; 
+                                m->m_len = ip->ip_len;
+
+                                icmp_reflect(pData, m);
+                                m_free(pData, m);
                         case IP_TTL_EXPIRED_TRANSIT: /* TTL expired */
-                        __asm {int 3}
+                                LogRel(("ICMP: message with Status: %x was received from %x\n", icr[i].Status, icr[i].Address));
+                                LogRel(("ICMP: IP(v %hd, l %hd )\n", ip->ip_v, ip->ip_hl));
                         break;
                         default:
-                                LogRel(("ICMP: message with Status: %x was received from %R[IP4]\n", icr[i].Status, icr[i].Address));
+                                LogRel(("ICMP(default): message with Status: %x was received from %s\n", icr[i].Status, icr[i].Address));
                         break;
                 }

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

@@ -23 +23 @@
     struct socket   *so_prev;    /* For a linked list of sockets */
 
+#ifndef RT_OS_WINDOWS
     int s;                       /* The actual socket */
+#else
+    union {
+            int s;
+            HANDLE sh;
+    };
+#endif
 
     /* XXX union these with not-yet-used sbuf params */