diff options
| author |   hsandid <halsandi@cisco.com> | 2024-03-26 18:44:19 +0100 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2024-03-29 13:31:50 +0000 |
| commit | 3e147f08efc82c1c9d131bd03ee2efd493775570 (patch) | |
| tree | 9edb411f80133c7e59082c37f69bd2fc0f498e79 | |
| parent | dcb5eb5a18bf42cb4d39ae29822664f2cb57622c (diff) | |
misc: deprecate lawful-intercept
Type: refactor
Change-Id: Ifd7f5b351401cdcaaaf57fefc5dbbfdaf235054e
Signed-off-by: hsandid <halsandi@cisco.com>
| -rw-r--r-- | extras/deprecated/vnet/lawful-intercept/lawful_intercept.c (renamed from src/vnet/lawful-intercept/lawful_intercept.c) | 0 | ||||
| -rw-r--r-- | extras/deprecated/vnet/lawful-intercept/lawful_intercept.h (renamed from src/vnet/lawful-intercept/lawful_intercept.h) | 0 | ||||
| -rw-r--r-- | extras/deprecated/vnet/lawful-intercept/node.c (renamed from src/vnet/lawful-intercept/node.c) | 0 | ||||
| -rw-r--r-- | src/vnet/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | src/vnet/classify/vnet_classify.c | 11 | ||||
| -rw-r--r-- | src/vnet/l2/l2_classify.h | 1 | ||||
| -rw-r--r-- | src/vnet/l2/l2_input_classify.c | 1 |
7 files changed, 5 insertions, 25 deletions
diff --git a/src/vnet/lawful-intercept/lawful_intercept.c b/extras/deprecated/vnet/lawful-intercept/lawful_intercept.c index 61b1a6165f4..61b1a6165f4 100644 --- a/src/vnet/lawful-intercept/lawful_intercept.c +++ b/extras/deprecated/vnet/lawful-intercept/lawful_intercept.c diff --git a/src/vnet/lawful-intercept/lawful_intercept.h b/extras/deprecated/vnet/lawful-intercept/lawful_intercept.h index ba74204fb9e..ba74204fb9e 100644 --- a/src/vnet/lawful-intercept/lawful_intercept.h +++ b/extras/deprecated/vnet/lawful-intercept/lawful_intercept.h diff --git a/src/vnet/lawful-intercept/node.c b/extras/deprecated/vnet/lawful-intercept/node.c index 86f135b9ea1..86f135b9ea1 100644 --- a/src/vnet/lawful-intercept/node.c +++ b/extras/deprecated/vnet/lawful-intercept/node.c diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt index 973a6c9434b..fb8d294009d 100644 --- a/src/vnet/CMakeLists.txt +++ b/src/vnet/CMakeLists.txt @@ -895,23 +895,6 @@ list(APPEND VNET_HEADERS ) ############################################################################## -# lawful intercept -############################################################################## - -list(APPEND VNET_SOURCES - lawful-intercept/lawful_intercept.c - lawful-intercept/node.c -) - -list(APPEND VNET_MULTIARCH_SOURCES - lawful-intercept/node.c -) - -list(APPEND VNET_HEADERS - lawful-intercept/lawful_intercept.h -) - -############################################################################## # SPAN (port mirroring) ############################################################################## diff --git a/src/vnet/classify/vnet_classify.c b/src/vnet/classify/vnet_classify.c index fc694492f4e..77c1c81f9c4 100644 --- a/src/vnet/classify/vnet_classify.c +++ b/src/vnet/classify/vnet_classify.c @@ -1331,12 +1331,11 @@ unformat_classify_mask (unformat_input_t * input, va_list * args) return 0; } -#define foreach_l2_input_next \ -_(drop, DROP) \ -_(ethernet, ETHERNET_INPUT) \ -_(ip4, IP4_INPUT) \ -_(ip6, IP6_INPUT) \ -_(li, LI) +#define foreach_l2_input_next \ + _ (drop, DROP) \ + _ (ethernet, ETHERNET_INPUT) \ + _ (ip4, IP4_INPUT) \ + _ (ip6, IP6_INPUT) uword unformat_l2_input_next_index (unformat_input_t * input, va_list * args) diff --git a/src/vnet/l2/l2_classify.h b/src/vnet/l2/l2_classify.h index 68a2bb98e64..3c86fb5ca86 100644 --- a/src/vnet/l2/l2_classify.h +++ b/src/vnet/l2/l2_classify.h @@ -39,7 +39,6 @@ typedef enum L2_INPUT_CLASSIFY_NEXT_ETHERNET_INPUT, L2_INPUT_CLASSIFY_NEXT_IP4_INPUT, L2_INPUT_CLASSIFY_NEXT_IP6_INPUT, - L2_INPUT_CLASSIFY_NEXT_LI, L2_INPUT_CLASSIFY_N_NEXT, } l2_input_classify_next_t; diff --git a/src/vnet/l2/l2_input_classify.c b/src/vnet/l2/l2_input_classify.c index 248158310a1..cc031bd46a5 100644 --- a/src/vnet/l2/l2_input_classify.c +++ b/src/vnet/l2/l2_input_classify.c @@ -461,7 +461,6 @@ VLIB_REGISTER_NODE (l2_input_classify_node) = { [L2_INPUT_CLASSIFY_NEXT_ETHERNET_INPUT] = "ethernet-input-not-l2", [L2_INPUT_CLASSIFY_NEXT_IP4_INPUT] = "ip4-input", [L2_INPUT_CLASSIFY_NEXT_IP6_INPUT] = "ip6-input", - [L2_INPUT_CLASSIFY_NEXT_LI] = "li-hit", }, }; |