Changeset 36901 in vbox for trunk/src

Timestamp:

Apr 29, 2011 6:03:48 PM (14 years ago)

Author:

vboxsync

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

71480

Message:

NAT: Each service should use right ethernet address (see xTracker/5664)

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bsd/sys/mbuf.h (modified) (1 diff)
• dnsproxy/dnsproxy.c (modified) (1 diff)
• slirp.c (modified) (3 diffs)
• slirp.h (modified) (1 diff)
• tftp.c (modified) (3 diffs)
• udp.c (modified) (1 diff)

trunk/src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h

@@ -1043 +1043 @@
 #define PACKET_TAG_CARP                         28 /* CARP info */
 #ifdef VBOX
-#define PACKET_TAG_ALIAS                        0xab01
-#define PACKET_TAG_ETHER                        0xab02
+# define        PACKET_TAG_ALIAS                        0xab01
+# define        PACKET_TAG_ETHER                        0xab02
+# define        PACKET_SERVICE                          0xab03
 #endif
 

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

@@ -133 +133 @@
             return;
         }
-        m = m_getcl(pData, M_NOWAIT, MT_HEADER, M_PKTHDR);
+        m = slirpDnsMbufAlloc(pData);
         if (m == NULL)
         {

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

@@ -1435 +1435 @@
                     case CTL_DNS:
                     case CTL_ALIAS:
+                    case CTL_TFTP:
+                        if (!slirpMbufTagService(pData, mr, (uint8_t)(htip & ~pData->netmask)))
+                        {
+                            static bool fTagErrorReported;
+                            if (!fTagErrorReported)
+                            {
+                                LogRel(("NAT: couldn't add the tag(PACKET_SERVICE:%d) to mbuf:%p\n",
+                                            (uint8_t)(htip & ~pData->netmask), m));
+                                fTagErrorReported = true;
+                            }
+                        }
                         rah->ar_sha[5] = (uint8_t)(htip & ~pData->netmask);
                         break;
@@ -1559 +1570 @@
     if (memcmp(eh->h_source, special_ethaddr, ETH_ALEN) != 0)
     {
+        struct m_tag *t = m_tag_first(m);
+        uint8_t u8ServiceId = CTL_ALIAS;
         memcpy(eh->h_dest, eh->h_source, ETH_ALEN);
         memcpy(eh->h_source, special_ethaddr, ETH_ALEN);
@@ -1568 +1581 @@
             goto done;
         }
+        if (   t
+            && (t = m_tag_find(m, PACKET_SERVICE, NULL)))
+        {
+            Assert(t);
+            u8ServiceId = *(uint8_t *)&t[1];
+        }
+        eh->h_source[5] = u8ServiceId;
     }
     /*

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

@@ -473 +473 @@
         return 0;
 }
-#endif
-
+
+static inline bool slirpMbufTagService(PNATState pData, struct mbuf *m, uint8_t u8ServiceId)
+{
+    struct m_tag * t = NULL;
+    /* if_encap assumes that all packets goes through aliased address(gw) */
+    if (u8ServiceId == CTL_ALIAS)
+        return true;
+    t = m_tag_get(PACKET_SERVICE, sizeof(uint8_t), 0);
+    if (!t)
+        return false;
+    *(uint8_t *)&t[1] = u8ServiceId;
+    m_tag_prepend(m, t);
+    return true;
+}
+
+/**
+ * This function tags mbuf allocated for special services.
+ * @todo: add service id verification.
+ */
+static inline struct mbuf *slirpServiceMbufAlloc(PNATState pData, uint8_t u8ServiceId)
+{
+    struct mbuf *m = NULL;
+    m = m_getcl(pData, M_DONTWAIT, MT_HEADER, M_PKTHDR);
+    if (!m)
+        return m;
+    if(!slirpMbufTagService(pData, m, u8ServiceId))
+    {
+        m_freem(pData, m);
+        return NULL;
+    }
+    return m;
+}
+
+static inline struct mbuf *slirpTftpMbufAlloc(PNATState pData)
+{
+    return slirpServiceMbufAlloc(pData, CTL_TFTP);
+}
+static inline struct mbuf *slirpDnsMbufAlloc(PNATState pData)
+{
+    return slirpServiceMbufAlloc(pData, CTL_DNS);
+}
+#endif
+

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

@@ -145 +145 @@
     int n = 0;
 
-    m = m_getcl(pData, M_DONTWAIT, MT_HEADER, M_PKTHDR);
+    m = slirpTftpMbufAlloc(pData);
     if (!m)
         return -1;
@@ -181 +181 @@
     int nobytes;
 
-    m = m_getcl(pData, M_DONTWAIT, MT_HEADER, M_PKTHDR);
+    m = slirpTftpMbufAlloc(pData);
     if (!m)
         return -1;
@@ -229 +229 @@
         return -1;
 
-    m = m_getcl(pData, M_DONTWAIT, MT_HEADER, M_PKTHDR);
+    m = slirpTftpMbufAlloc(pData);
     if (!m)
         return -1;

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

@@ -189 +189 @@
         dst.sin_port = uh->uh_sport;
 
+        slirpMbufTagService(pData, m, CTL_DNS);
         /* udp_output2() expects a pointer to the body of UDP packet. */
         m->m_data += sizeof(struct udpiphdr);