fix typo for epoll, add winkernel checks

microsoft · Nov 1, 2024 · aee8df6 · aee8df6
1 parent 0c44652
commit aee8df6
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 36 deletions.
diff --git a/src/platform/datapath_epoll.c b/src/platform/datapath_epoll.c
@@ -348,7 +348,7 @@ CxPlatDataPathCalculateFeatureSupport(
     //
     // TTL should always be available / enabled on Linux.
     //
-    Datapath->Features != CXPLAT_DATAPATH_FEATURE_TTL;
+    Datapath->Features |= CXPLAT_DATAPATH_FEATURE_TTL;
 }
 
 void

diff --git a/src/platform/datapath_winkernel.c b/src/platform/datapath_winkernel.c
@@ -1692,42 +1692,44 @@ CxPlatSocketCreateUdp(
         goto Error;
     }
 
-    Option = TRUE;
-    Status =
-        CxPlatDataPathSetControlSocket(
-            Binding,
-            WskSetOption,
-            IP_HOPLIMIT,
-            IPPROTO_IP,
-            sizeof(Option),
-            &Option);
-    if (QUIC_FAILED(Status)) {
-        QuicTraceEvent(
-            DatapathErrorStatus,
-            "[data][%p] ERROR, %u, %s.",
-            Binding,
-            Status,
-            "Set IP_HOPLIMIT");
-        goto Error;
-    }
+    if (Datapath->Features & CXPLAT_DATAPATH_FEATURE_TTL) {
+        Option = TRUE;
+        Status =
+            CxPlatDataPathSetControlSocket(
+                Binding,
+                WskSetOption,
+                IP_HOPLIMIT,
+                IPPROTO_IP,
+                sizeof(Option),
+                &Option);
+        if (QUIC_FAILED(Status)) {
+            QuicTraceEvent(
+                DatapathErrorStatus,
+                "[data][%p] ERROR, %u, %s.",
+                Binding,
+                Status,
+                "Set IP_HOPLIMIT");
+            goto Error;
+        }
 
-    Option = TRUE;
-    Status =
-        CxPlatDataPathSetControlSocket(
-            Binding,
-            WskSetOption,
-            IPV6_HOPLIMIT,
-            IPPROTO_IPV6,
-            sizeof(Option),
-            &Option);
-    if (QUIC_FAILED(Status)) {
-        QuicTraceEvent(
-            DatapathErrorStatus,
-            "[data][%p] ERROR, %u, %s.",
-            Binding,
-            Status,
-            "Set IPV6_HOPLIMIT");
-        goto Error;
+        Option = TRUE;
+        Status =
+            CxPlatDataPathSetControlSocket(
+                Binding,
+                WskSetOption,
+                IPV6_HOPLIMIT,
+                IPPROTO_IPV6,
+                sizeof(Option),
+                &Option);
+        if (QUIC_FAILED(Status)) {
+            QuicTraceEvent(
+                DatapathErrorStatus,
+                "[data][%p] ERROR, %u, %s.",
+                Binding,
+                Status,
+                "Set IPV6_HOPLIMIT");
+            goto Error;
+        }
     }
 
     if (Datapath->Features & CXPLAT_DATAPATH_FEATURE_RECV_COALESCING) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -348,7 +348,7 @@ CxPlatDataPathCalculateFeatureSupport( @@
         //
         // TTL should always be available / enabled on Linux.
         //
-        Datapath->Features != CXPLAT_DATAPATH_FEATURE_TTL;
+        Datapath->Features |= CXPLAT_DATAPATH_FEATURE_TTL;
     }
     void
@@ Expand Down @@