commit 640752bc4c9e63aa52d1f543b5cbaa6e97518907
author Maciej Żenczykowski <maze@google.com> Tue Aug 09 23:02:57 2022 +0000
committer Maciej Żenczykowski <maze@google.com> Tue Aug 09 23:03:20 2022 +0000
tree 53e8de5c460d64da751b7ea7cfcb3cdd465ab349
parent f39f7f83b0d356c865c3a09fe64ac3af38111e52

dscpPolicy - sport is network endian, dport is host endian

be more consistent, and thus also less htons() calls

Test: TreeHugger, atest DscpPolicyTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia331a33a615a598e061db53ae180fffaef7a4342

bpf_progs/dscpPolicy.c

diff --git a/bpf_progs/dscpPolicy.c b/bpf_progs/dscpPolicy.c
index 08fbcb1..3e4456f 100644
--- a/bpf_progs/dscpPolicy.c
+++ b/bpf_progs/dscpPolicy.c
@@ -57,7 +57,7 @@
     uint64_t cookie = bpf_get_socket_cookie(skb);
     if (!cookie) return;
 
-    uint16_t sport = 0;
+    __be16 sport = 0;
     uint16_t dport = 0;
     uint8_t protocol = 0;  // TODO: Use are reserved value? Or int (-1) and cast to uint below?
     struct in6_addr src_ip = {};
@@ -106,14 +106,14 @@
             udp = data + hdr_size;
             if ((void*)(udp + 1) > data_end) return;
             sport = udp->source;
-            dport = udp->dest;
+            dport = ntohs(udp->dest);
         } break;
         case IPPROTO_TCP: {
             struct tcphdr* tcp;
             tcp = data + hdr_size;
             if ((void*)(tcp + 1) > data_end) return;
             sport = tcp->source;
-            dport = tcp->dest;
+            dport = ntohs(tcp->dest);
         } break;
         default:
             return;
@@ -183,8 +183,8 @@
             if (sport != policy->src_port) continue;
             score += 0xFFFF;
         }
-        if (ntohs(dport) < policy->dst_port_start) continue;
-        if (ntohs(dport) > policy->dst_port_end) continue;
+        if (dport < policy->dst_port_start) continue;
+        if (dport > policy->dst_port_end) continue;
         score += 0xFFFF + policy->dst_port_start - policy->dst_port_end;
 
         if (score > best_score) {