fixing name of the macro

with current logic macros for toobig is being run even w/o icmp_toobig_generation. hence naming is not correct. as a side not new added test fixture (facebookincubator#33) doing exactly the same as (facebookincubator#1 and facebookincubator#2 in KatranOptionalTestFixtures; and nop if katran was built w/o katran_introspection). initially idea behind KatranTestFixutres was that there only tests which should works/make sense under vanilla build (aka w/o any additional defines)
tehnerd · Jun 9, 2020 · 1091c2d · 1091c2d
1 parent 7355f08
commit 1091c2d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/katran/lib/bpf/balancer_kern.c b/katran/lib/bpf/balancer_kern.c
@@ -448,7 +448,7 @@ static inline int process_packet(void *data, __u64 off, void *data_end,
   }
 
   if (data_end - data > MAX_PCKT_SIZE) {
-    REPORT_ICMP_TOOBIG(xdp, data, data_end - data, false);
+    REPORT_PACKET_TOOBIG(xdp, data, data_end - data, false);
 #ifdef ICMP_TOOBIG_GENERATION
     __u32 stats_key = MAX_VIPS + ICMP_TOOBIG_CNTRS;
     data_stats = bpf_map_lookup_elem(&stats, &stats_key);

diff --git a/katran/lib/bpf/introspection.h b/katran/lib/bpf/introspection.h
@@ -20,7 +20,7 @@
 // introspection events, they are defined regardless because they are used in
 // constants which does not depend on the introspection flag
 #define TCP_NONSYN_LRUMISS 0
-#define ICMP_TOOBIG 1
+#define PACKET_TOOBIG 1
 
 #ifdef KATRAN_INTROSPECTION
 // Introspection enabled, enable helpers
@@ -32,11 +32,11 @@
 #define REPORT_TCP_NONSYN_LRUMISS(xdp, data, size, meta_only)   \
                REPORT_EVENT(xdp, TCP_NONSYN_LRUMISS,            \
                             data, size, meta_only)
-#define REPORT_ICMP_TOOBIG(xdp, data, size, meta_only)          \
+#define REPORT_PACKET_TOOBIG(xdp, data, size, meta_only)          \
                REPORT_EVENT(xdp, ICMP_TOOBIG,                   \
                             data, size, meta_only)
 #else
 // Introspection disabled, define helpers to be nop
 #define REPORT_TCP_NONSYN_LRUMISS(...) {}
-#define REPORT_ICMP_TOOBIG(...) {}
+#define REPORT_PACKET_TOOBIG(...) {}
 #endif
diff --git a/katran/lib/testing/KatranTestFixtures.h b/katran/lib/testing/KatranTestFixtures.h
@@ -237,7 +237,7 @@ const std::vector<std::pair<std::string, std::string>> inputTestFixtures = {
   {
     // Ether(src="0x1", dst="0x2")/IP(src="192.168.1.1", dst="10.200.1.1")/UDP(sport=31337, dport=80)/<random payload of length 1473, forming a packet of length 1515>
     "AgAAAAAAAQAAAAAACABFAAXdAAEAAEARp53AqAEBCsgBAXppAFAFybmiNzk3ODgzMzcwMzI5NTc3MTA2MzQ0NzM4MDI1MjMwNTczNTY0OTMzMTY3MDI0ODI5Mzg4MDgxMTk5NjQ4NjEzODQwMTgxOTQ4NzUzODg0NjAzMjQ3NzczNjY5NTc2MzY3MDQ1ODE2OTA2Mjg0MjEwOTYyMDg4MjY5NDUyMTQ2OTgzMTQ2NzczMzAzNTcyNDQ1NDE0NDkzNzAwMTI2Mzc5OTQ3NTE5NTk0NjE3Mjc5MzU3OTI5Nzc3NTcwOTI5MzI1ODYwODMwMDM5MDk2MDkxMjAzNTI2MjkxMjY0ODY0NTEzNTQyOTA2NjkyNjQ1NzY5NTgyNTE5NzEwNzA4MTQ2ODA2MjExNzI0NzY2NDgyMzk0MTY0MDA1NDE2Njg4MDc5MTk3MzkxMjA2MzkwMjkxODAwMTUzNTQ3NjAzMTYxMzU3NjU3OTA1MzQ3ODM2NDM1MzYzMzYyMjU4MzUwMzMzMzI3OTY4MzAyMDQ5MTAyNzMwOTE2NDY5NjQ5NjMxNTMyODgzMzg3Mzk3NTgzOTE2MDA0NTU0MDMwODUwMTM5ODUxMzc2NDM4MzIyMjQ1NzU4OTQ2MDYwNDMwOTIxMjY0OTc3MDYxMDE1Nzc4NzQ5ODE2MjMxNDc1NTc0NjgzODE2ODM4NjE5MjU5ODA3NjU1OTMxMjIwNzk1Njk3NjgyMjg0OTU0OTA2ODgwMjYwNjMyNDU5NTAzMzgyNTM1NjczMzQ3MjMyMzQwNjcyNzEyODcyMDg1OTcwNjIxMDA5MDc2NzgyNDM3NDExNzcxNzkxNTUxMzI5ODQyNzExODIxMDc0OTkzMDA0Nzc3MTQ3ODQ2Nzc3OTY4NTk5MDY2MjExNDc2OTc0ODYyNDAwMDI1OTY1NTg5ODcxMzI1MzgwMjY5MDY2MzgzMjAxMjM2MDQ2MTk0MjI2MDk3NDEyMDE3Mzg3MDg4MzI3NTM4MTMwNTIxMTIyNDIwODI3NDA2NjgzMzcwNjczODQ0MTkzNzI0NTk1NTYzNzgzMDQ0NzE0MzA1Mjk3MTA3MTc5NDE2Njc2NzY0NTYxMDQ4ODkyODM1NzM3MTQyNzYxMTUwNTAzNzQ0MTU0OTUzOTQ2MDM1OTcyOTI0NzMxMjM4NTM5ODUwNDYxNDQ4MzE4NDk0NDk2MjY4MzczMTAwMjA2NjUzMjM1NTE2Nzc1NzE2NTI2OTM0NjMyNzI4MjYwNjAyNDgwOTc0NzY5MjU1MzQ5NTIzNzE4OTIxNjk1MDAzMzAzMjU2OTA4NzgwOTQzMDU1NzA4MzU2ODA5NTMxOTk0MzYzNzY1ODYxNzU4NDIxNjcyNTI1NzQ3MzExNzU4ODg4NTM1NTY3MjA1NzQxMjY0OTUwMTU5NzAyNDg5ODE2MzU2MjEzMTc1NDY1NzM5ODU1ODY2MTUzMDEyODUyMzE5ODM3MTMzMTY5NjA5MTA4Mzk5MDQ5NTY5MzkyNzg3MDU5MDA3MzIwMzQ4NDg1NTg3MTQwMjI1NjMwMDAxODA2NjIzOTk3MjYxNDQzMTM1MzgwNTU5MDYxNDczMjMyMzE2MzIzMjgwNTQ4NjYxNDUyODA5ODQyOTcxMDg5OTE1OTk0MTQzODk5ODUzNDI5MTE1MDA0OTQxOTU4NjI5MjI4ODk3NDY5MTczNjk1ODM2OTg2OTA5NzE3NjA1Nzg0NDcxOTk1MjI2NTc5NjgzNTAzMDAxMzQ2MjI5Njk2OTk0NTkyNDc3MDU1NzcxNDk2NDU5MzMxODgxNTE4MjMyODM3NTEzMzg1NjU4MjkwNjUxMTc5MTk4MjEzMzg3MTQwNzYyNDQ1NTAwMjgxNzExMDI3NTcxMTg1NDAwNjMxMTk0NTQ2MDA2ODU1NTgzNzQwNTk3OTQxMjQ5Njk4NzA5MDEyODM0MTIxNzY3MzQyNDU4ODYyMzExNzYwMjQ0Nzk5OTc2MzI1OTc4NTMxNjY1NTM3NjI5OTQ4NjAy",
-    "UDP: big packet of length 1515. trigger IMCP TOOBIG"
+    "UDP: big packet of length 1515. trigger PACKET TOOBIG"
   },
 };
 

diff --git a/katran/lib/testing/katran_tester.cpp b/katran/lib/testing/katran_tester.cpp
@@ -146,7 +146,7 @@ void testKatranMonitor(katran::KatranLb& lb) {
   std::this_thread::sleep_for(std::chrono::seconds(1));
   constexpr std::array<uint32_t, 2> events = {
     TCP_NONSYN_LRUMISS,
-    ICMP_TOOBIG,
+    PACKET_TOOBIG,
   };
 
   for (const auto event : events) {