Skip to content

Commit 30454b2

Browse files
Fei Chenmeta-codesync[bot]
authored andcommitted
remove INLINE_DECAP_IPIP from edge_*/fna_* flavors since GUE_ENCAP is default
Summary: all edge_* flavors are using edge_defines and gue_define and all fna_* flavors are using fna_defines and gue_define. there is no need to have have INLINE_DECAP_IPIP defined in edge_defines and fna_defines. Removing it. Created gue decap unit tests for all edge_/fna_ flavors. I don't see how OSS code config those INLINE_DECAP macros. Maybe no change is needed there. Would confirm. https://github.com/facebookincubator/katran/blob/main/katran/lib/Makefile-bpf Reviewed By: p-shah256 Differential Revision: D92073353 fbshipit-source-id: 4bf292aedd353662d74f64954ec18f61f3553c41
1 parent 36c92b9 commit 30454b2

2 files changed

Lines changed: 1 addition & 7 deletions

File tree

katran/lib/bpf/balancer_consts.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -383,12 +383,6 @@ v2 tracks misses for TCP non syns */
383383
* LOCAL_DELIVERY_OPTIMIZATION - allow to do optimization on local traffic,
384384
* where vip and real address are specified the same machine
385385
*/
386-
#ifdef INLINE_DECAP
387-
#ifndef INLINE_DECAP_IPIP
388-
#define INLINE_DECAP_IPIP
389-
#endif // of INLINE_DECAP_IPIP
390-
#endif
391-
392386
#ifdef INLINE_DECAP_IPIP
393387
#ifndef INLINE_DECAP_GENERIC
394388
#define INLINE_DECAP_GENERIC

katran/lib/testing/fixtures/KatranDecapStatsTestFixtures.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ extern "C" {
5959
namespace katran {
6060
namespace testing {
6161

62-
const std::vector<PacketAttributes> DecapTestFixtures = {
62+
const std::vector<PacketAttributes> GUEDecapTestFixtures = {
6363
//1
6464
{
6565
.description = "GUE IPv6-in-IPv6 decap for IPv6 VIP fc00:1::1 port 80",

0 commit comments

Comments
 (0)