儲存庫 vbox 的更動 49745

時間撮記:

2013-12-2 下午11:40:35 (11 年 以前)

作者:

vboxsync

訊息:

pxping_recv4: propagate DF flag if OS provides a socket option for that.

檔案:

• trunk/src/VBox/NetworkServices/NAT/pxping.c (修改) (3 筆差異)

trunk/src/VBox/NetworkServices/NAT/pxping.c

@@ -80 +80 @@
     int ttl;
     int tos;
+    int df;
 
     SOCKET sock6;
@@ -262 +263 @@
         g_pxping.ttl = -1;
         g_pxping.tos = 0;
+        g_pxping.df = -1;
 
         g_pxping.pmhdl4.callback = pxping_pmgr_pump;
@@ -481 +483 @@
         }
     }
+
+#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_WINDOWS)
+    {
+        const int df_flag = IPH_OFFSET(iph) & PP_HTONS(IP_DF);
+
+#if   defined(RT_OS_LINUX)
+        const char * const dfoptname = "IP_MTU_DISCOVER";
+        const int dfopt = IP_MTU_DISCOVER;
+        int df = df_flag ? IP_PMTUDISC_PROBE : IP_PMTUDISC_DONT;
+#elif defined(RT_OS_SOLARIS)
+        const char * const dfoptname = "IP_DONTFRAG";
+        const int dfopt = IP_DONTFRAG;
+        int df = !!df_flag;
+#elif defined(RT_OS_WINDOWS)
+        const char * const dfoptname = "IP_DONTFRAGMENT";
+        const int dfopt = IP_DONTFRAGMENT;
+        DWORD df = !!df_flag;
+#endif
+        if (df != pxping->df) {
+            status = setsockopt(pxping->sock4, IPPROTO_IP, dfopt,
+                                (char *)&df, sizeof(df));
+            if (status == 0) {
+                pxping->df = df;
+            }
+            else {
+                perror(dfoptname);
+            }
+        }
+    }
+#endif /* don't fragment */
 
     proxy_sendto(pxping->sock4, p,