Fix distribute #8040
Merged
Fix distribute #8040
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
polychaeta
reviewed
Feb 8, 2021
There was a problem hiding this comment.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/d1c25e012d2b366d001c7b0ef13bcc3d/raw/4abbb7242057d29f0855251c05db1887db803b97/cr_8040_1612815922.diff | git apply
diff --git a/ripd/rip_cli.c b/ripd/rip_cli.c
index 1156bedb2..46b32832a 100644
--- a/ripd/rip_cli.c
+++ b/ripd/rip_cli.c
@@ -1019,15 +1019,14 @@ DEFPY_YANG (clear_ip_rip,
return ret;
}
-DEFUN (rip_distribute_list,
- rip_distribute_list_cmd,
- "distribute-list [prefix] WORD <in|out> [WORD]",
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(rip_distribute_list, rip_distribute_list_cmd,
+ "distribute-list [prefix] WORD <in|out> [WORD]",
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[1]->type == WORD_TKN) ? 1 : 0;
@@ -1039,16 +1038,15 @@ DEFUN (rip_distribute_list,
argv[1 + prefix]->arg, ifname);
}
-DEFUN (rip_no_distribute_list,
- rip_no_distribute_list_cmd,
- "no distribute-list [prefix] WORD <in|out> [WORD]",
- NO_STR
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(rip_no_distribute_list, rip_no_distribute_list_cmd,
+ "no distribute-list [prefix] WORD <in|out> [WORD]",
+ NO_STR
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[2]->type == WORD_TKN) ? 1 : 0;
diff --git a/ripngd/ripng_cli.c b/ripngd/ripng_cli.c
index 5f979b7dd..525464c23 100644
--- a/ripngd/ripng_cli.c
+++ b/ripngd/ripng_cli.c
@@ -503,16 +503,15 @@ DEFPY_YANG (clear_ipv6_rip,
return ret;
}
-DEFUN (ripng_ipv6_distribute_list,
- ripng_ipv6_distribute_list_cmd,
- "ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
- "IPv6\n"
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(ripng_ipv6_distribute_list, ripng_ipv6_distribute_list_cmd,
+ "ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
+ "IPv6\n"
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[2]->type == WORD_TKN) ? 1 : 0;
@@ -524,17 +523,16 @@ DEFUN (ripng_ipv6_distribute_list,
argv[2 + prefix]->arg, ifname);
}
-DEFUN (ripng_no_ipv6_distribute_list,
- ripng_no_ipv6_distribute_list_cmd,
- "no ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
- NO_STR
- "IPv6\n"
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(ripng_no_ipv6_distribute_list, ripng_no_ipv6_distribute_list_cmd,
+ "no ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
+ NO_STR
+ "IPv6\n"
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[3]->type == WORD_TKN) ? 1 : 0;
If you are a new contributor to FRR, please see our contributing guidelines.
After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.
qlyoung
reviewed
Feb 8, 2021
babeld/babeld.c
Outdated
| if (argv[argc - 1]->type == VARIABLE_TKN) | ||
| ifname = argv[argc - 1]->arg; | ||
|
|
||
| return distribute_list_parser(prefix, true, argv[2 + prefix]->arg, |
There was a problem hiding this comment.
should be ->text although it happens to work since distribute_direction only checks the first char 🙄
doc/user/ripngd.rst
Outdated
| ! | ||
| access-list private permit 10 10.0.0.0/8 | ||
| access-list private deny any | ||
| ! |
doc/user/ripngd.rst
Outdated
| it will be applied against a specific interface. | ||
|
|
||
| The `distribute-list` command can be used to filter the RIPNG path. | ||
| `distribute-list` can apply access-lists to a chosen interface. First, one |
There was a problem hiding this comment.
its double `` for code, like you wrote eth0 below
| ! | ||
|
|
||
|
|
||
| `distribute-list` can be applied to both incoming and outgoing data. |
lib/distribute.c
Outdated
|
|
||
| /* Get interface name corresponding distribute list. */ | ||
| distfn(ctx, ifname, type, argv[1 + prefix]->arg); | ||
| assert("Expecting in or out only, fix your code"); |
There was a problem hiding this comment.
This assert is always true and never aborts the program, you mean
assert(!"Expecting in or out only, fix your code");
lib/distribute.c
Outdated
| /* | ||
| * Making the compiler happy. We should never get here | ||
| */ | ||
| return DISTRIBUTE_V4_IN; |
There was a problem hiding this comment.
I believe what you want here is __builtin_unreachable()
Outdated results 💚Basic BGPD CI results: SUCCESS, 0 tests failed
For details, please contact louberger |
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedTopotests Ubuntu 16.04 i386 part 5: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO5U16I386-17004/test Topology Tests failed for Topotests Ubuntu 16.04 i386 part 5: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17004/artifact/TOPO5U16I386/ErrorLog/log_topotests.txt Successful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsTopotests Ubuntu 16.04 i386 part 5: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO5U16I386-17004/test Topology Tests failed for Topotests Ubuntu 16.04 i386 part 5: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17004/artifact/TOPO5U16I386/ErrorLog/log_topotests.txt Warnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build: |
donaldsharp
force-pushed
the
fix_distribute
branch
from
5df9e5d to
a1eaaa4
Compare
Outdated results 💚Basic BGPD CI results: SUCCESS, 0 tests failed
For details, please contact louberger |
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedTopotests Ubuntu 18.04 amd64 part 6: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO6U18AMD64-17551/test Topology Tests failed for Topotests Ubuntu 18.04 amd64 part 6: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17551/artifact/TOPO6U18AMD64/ErrorLog/log_topotests.txt Successful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsTopotests Ubuntu 18.04 amd64 part 6: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO6U18AMD64-17551/test Topology Tests failed for Topotests Ubuntu 18.04 amd64 part 6: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17551/artifact/TOPO6U18AMD64/ErrorLog/log_topotests.txt |
|
ci:rerun |
qlyoung
reviewed
Mar 10, 2021
babeld/babeld.c
Outdated
| ifname = argv[argc - 1]->arg; | ||
|
|
||
| return distribute_list_no_parser(vty, prefix, true, | ||
| argv[3 + prefix]->arg, |
There was a problem hiding this comment.
Sorry I should have noted, the same ->text usage change should have been done in the rest of the places as well
doc/user/ripd.rst
Outdated
| @@ -236,11 +236,13 @@ Filtering RIP Routes | |||
|
|
|||
| RIP routes can be filtered by a distribute-list. | |||
|
|
|||
| .. clicmd:: distribute-list ACCESS_LIST DIRECT IFNAME | |||
| .. clicmd:: no distribute-list [prefix] LIST <in|out> IFNAME | |||
doc/user/ripngd.rst
Outdated
| command. ACCESS_LIST is an access-list name. `direct` is ``in`` or | ||
| ``out``. If `direct` is ``in``, the access-list is applied only to incoming | ||
| packets.:: | ||
| .. clicmd:: no distribute-list [prefix] LIST <in|out> IFNAME |
Continuous Integration Result: SUCCESSFULContinuous Integration Result: SUCCESSFULCongratulations, this patch passed basic tests Tested-by: NetDEF / OpenSourceRouting.org CI System CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17567/ This is a comment from an automated CI system. Warnings Generated during build:Checkout code: Successful with additional warnings |
rwestphal
approved these changes
Mar 15, 2021
donaldsharp
force-pushed
the
fix_distribute
branch
from
a1eaaa4 to
7d89b1c
Compare
polychaeta
reviewed
Mar 26, 2021
There was a problem hiding this comment.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/aa93700dd4c157bbeaab70b77b1985ee/raw/4abbb7242057d29f0855251c05db1887db803b97/cr_8040_1616763717.diff | git apply
diff --git a/ripd/rip_cli.c b/ripd/rip_cli.c
index 1156bedb2..46b32832a 100644
--- a/ripd/rip_cli.c
+++ b/ripd/rip_cli.c
@@ -1019,15 +1019,14 @@ DEFPY_YANG (clear_ip_rip,
return ret;
}
-DEFUN (rip_distribute_list,
- rip_distribute_list_cmd,
- "distribute-list [prefix] WORD <in|out> [WORD]",
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(rip_distribute_list, rip_distribute_list_cmd,
+ "distribute-list [prefix] WORD <in|out> [WORD]",
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[1]->type == WORD_TKN) ? 1 : 0;
@@ -1039,16 +1038,15 @@ DEFUN (rip_distribute_list,
argv[1 + prefix]->arg, ifname);
}
-DEFUN (rip_no_distribute_list,
- rip_no_distribute_list_cmd,
- "no distribute-list [prefix] WORD <in|out> [WORD]",
- NO_STR
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(rip_no_distribute_list, rip_no_distribute_list_cmd,
+ "no distribute-list [prefix] WORD <in|out> [WORD]",
+ NO_STR
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[2]->type == WORD_TKN) ? 1 : 0;
diff --git a/ripngd/ripng_cli.c b/ripngd/ripng_cli.c
index 5f979b7dd..525464c23 100644
--- a/ripngd/ripng_cli.c
+++ b/ripngd/ripng_cli.c
@@ -503,16 +503,15 @@ DEFPY_YANG (clear_ipv6_rip,
return ret;
}
-DEFUN (ripng_ipv6_distribute_list,
- ripng_ipv6_distribute_list_cmd,
- "ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
- "IPv6\n"
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(ripng_ipv6_distribute_list, ripng_ipv6_distribute_list_cmd,
+ "ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
+ "IPv6\n"
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[2]->type == WORD_TKN) ? 1 : 0;
@@ -524,17 +523,16 @@ DEFUN (ripng_ipv6_distribute_list,
argv[2 + prefix]->arg, ifname);
}
-DEFUN (ripng_no_ipv6_distribute_list,
- ripng_no_ipv6_distribute_list_cmd,
- "no ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
- NO_STR
- "IPv6\n"
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(ripng_no_ipv6_distribute_list, ripng_no_ipv6_distribute_list_cmd,
+ "no ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
+ NO_STR
+ "IPv6\n"
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[3]->type == WORD_TKN) ? 1 : 0;
If you are a new contributor to FRR, please see our contributing guidelines.
After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.
Outdated results 💚Basic BGPD CI results: SUCCESS, 0 tests failed
For details, please contact louberger |
Continuous Integration Result: SUCCESSFULContinuous Integration Result: SUCCESSFULCongratulations, this patch passed basic tests Tested-by: NetDEF / OpenSourceRouting.org CI System CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-18016/ This is a comment from an automated CI system. Warnings Generated during build:Checkout code: Successful with additional warnings |
donaldsharp
force-pushed
the
fix_distribute
branch
from
7d89b1c to
421f197
Compare
polychaeta
reviewed
Mar 26, 2021
There was a problem hiding this comment.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/6855f8a4b3399a95949d3698b70496b0/raw/1176528d33a0d0c009048f71abccffc57bde2981/cr_8040_1616778616.diff | git apply
diff --git a/ripd/rip_cli.c b/ripd/rip_cli.c
index 43e5b21fa..b34789cdf 100644
--- a/ripd/rip_cli.c
+++ b/ripd/rip_cli.c
@@ -1019,15 +1019,14 @@ DEFPY_YANG (clear_ip_rip,
return ret;
}
-DEFUN (rip_distribute_list,
- rip_distribute_list_cmd,
- "distribute-list [prefix] WORD <in|out> [WORD]",
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(rip_distribute_list, rip_distribute_list_cmd,
+ "distribute-list [prefix] WORD <in|out> [WORD]",
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[1]->type == WORD_TKN) ? 1 : 0;
@@ -1039,16 +1038,15 @@ DEFUN (rip_distribute_list,
argv[1 + prefix]->arg, ifname);
}
-DEFUN (rip_no_distribute_list,
- rip_no_distribute_list_cmd,
- "no distribute-list [prefix] WORD <in|out> [WORD]",
- NO_STR
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(rip_no_distribute_list, rip_no_distribute_list_cmd,
+ "no distribute-list [prefix] WORD <in|out> [WORD]",
+ NO_STR
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[2]->type == WORD_TKN) ? 1 : 0;
diff --git a/ripngd/ripng_cli.c b/ripngd/ripng_cli.c
index 7e0d01408..3d594900a 100644
--- a/ripngd/ripng_cli.c
+++ b/ripngd/ripng_cli.c
@@ -503,16 +503,15 @@ DEFPY_YANG (clear_ipv6_rip,
return ret;
}
-DEFUN (ripng_ipv6_distribute_list,
- ripng_ipv6_distribute_list_cmd,
- "ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
- "IPv6\n"
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(ripng_ipv6_distribute_list, ripng_ipv6_distribute_list_cmd,
+ "ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
+ "IPv6\n"
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[2]->type == WORD_TKN) ? 1 : 0;
@@ -524,17 +523,16 @@ DEFUN (ripng_ipv6_distribute_list,
argv[2 + prefix]->arg, ifname);
}
-DEFUN (ripng_no_ipv6_distribute_list,
- ripng_no_ipv6_distribute_list_cmd,
- "no ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
- NO_STR
- "IPv6\n"
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(ripng_no_ipv6_distribute_list, ripng_no_ipv6_distribute_list_cmd,
+ "no ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
+ NO_STR
+ "IPv6\n"
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[3]->type == WORD_TKN) ? 1 : 0;
If you are a new contributor to FRR, please see our contributing guidelines.
After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.
Outdated results 💚Basic BGPD CI results: SUCCESS, 0 tests failed
For details, please contact louberger |
qlyoung
approved these changes
Mar 26, 2021
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedTopotests Ubuntu 16.04 i386 part 1: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TP1U1604I386-18020/test Topology Tests failed for Topotests Ubuntu 16.04 i386 part 1: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-18020/artifact/TP1U1604I386/ErrorLog/log_topotests.txt Successful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsTopotests Ubuntu 16.04 i386 part 1: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TP1U1604I386-18020/test Topology Tests failed for Topotests Ubuntu 16.04 i386 part 1: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-18020/artifact/TP1U1604I386/ErrorLog/log_topotests.txt |
|
ci:rerun |
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedTopotests debian 10 amd64 part 4: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO4DEB10AMD64-18801/test Topology Tests failed for Topotests debian 10 amd64 part 4: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-18801/artifact/TOPO4DEB10AMD64/ErrorLog/log_topotests.txt Successful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsTopotests debian 10 amd64 part 4: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO4DEB10AMD64-18801/test Topology Tests failed for Topotests debian 10 amd64 part 4: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-18801/artifact/TOPO4DEB10AMD64/ErrorLog/log_topotests.txt |
Abstract the parsing of distribute lists so that we don't have as much cut-n-paste code. This is a setup commit for future work. In effect current distribute-list handling is all kinds of messed up a) eigrp and babel both attempt to use distribute-lists, they just plain don't work. b) `distribute-list` is only sent to rip. `ipv6 distribute-list` is sent to ripngd. If you use `distribute-list` under `router ripng` it sends the command to rip but ripd is in the wrong mode and it never works. c) Should ripngd care about v4 and v6 specific distribute-lists? This dichotomy was added for babel but babel has been broke about this since day 1( see a ). All in all we need to unwind this whole mess. Make distribute-list commands specific to the daemons( so that we can be in the right sub-mode ). But the parsing is going to be the same across all daemons. So let's provide that functionality in `lib/distribute.c` Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Allow the `distribute-list...` command in ripd and ripngd to work correctly. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
The distribute-list command was being registered but never setup properly in EIGRP. Put it into place. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
The `distribute-list` commands were registered but never setup properly to work. Put the commands in place. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
The distribute_list_init command is not used and is setup code that will never be used because it makes assumptions about how distribute-lists work that are fundamentally incorrect. Remove the code. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
donaldsharp
force-pushed
the
fix_distribute
branch
from
421f197 to
8a7be4d
Compare
polychaeta
reviewed
May 4, 2021
There was a problem hiding this comment.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/6b1f0f5afacd7520b3103808762a76b0/raw/1176528d33a0d0c009048f71abccffc57bde2981/cr_8040_1620159908.diff | git apply
diff --git a/ripd/rip_cli.c b/ripd/rip_cli.c
index 43e5b21fa..b34789cdf 100644
--- a/ripd/rip_cli.c
+++ b/ripd/rip_cli.c
@@ -1019,15 +1019,14 @@ DEFPY_YANG (clear_ip_rip,
return ret;
}
-DEFUN (rip_distribute_list,
- rip_distribute_list_cmd,
- "distribute-list [prefix] WORD <in|out> [WORD]",
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(rip_distribute_list, rip_distribute_list_cmd,
+ "distribute-list [prefix] WORD <in|out> [WORD]",
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[1]->type == WORD_TKN) ? 1 : 0;
@@ -1039,16 +1038,15 @@ DEFUN (rip_distribute_list,
argv[1 + prefix]->arg, ifname);
}
-DEFUN (rip_no_distribute_list,
- rip_no_distribute_list_cmd,
- "no distribute-list [prefix] WORD <in|out> [WORD]",
- NO_STR
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(rip_no_distribute_list, rip_no_distribute_list_cmd,
+ "no distribute-list [prefix] WORD <in|out> [WORD]",
+ NO_STR
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[2]->type == WORD_TKN) ? 1 : 0;
diff --git a/ripngd/ripng_cli.c b/ripngd/ripng_cli.c
index 7e0d01408..3d594900a 100644
--- a/ripngd/ripng_cli.c
+++ b/ripngd/ripng_cli.c
@@ -503,16 +503,15 @@ DEFPY_YANG (clear_ipv6_rip,
return ret;
}
-DEFUN (ripng_ipv6_distribute_list,
- ripng_ipv6_distribute_list_cmd,
- "ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
- "IPv6\n"
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(ripng_ipv6_distribute_list, ripng_ipv6_distribute_list_cmd,
+ "ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
+ "IPv6\n"
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[2]->type == WORD_TKN) ? 1 : 0;
@@ -524,17 +523,16 @@ DEFUN (ripng_ipv6_distribute_list,
argv[2 + prefix]->arg, ifname);
}
-DEFUN (ripng_no_ipv6_distribute_list,
- ripng_no_ipv6_distribute_list_cmd,
- "no ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
- NO_STR
- "IPv6\n"
- "Filter networks in routing updates\n"
- "Specify a prefix\n"
- "Access-list name\n"
- "Filter incoming routing updates\n"
- "Filter outgoing routing updates\n"
- "Interface name\n")
+DEFUN(ripng_no_ipv6_distribute_list, ripng_no_ipv6_distribute_list_cmd,
+ "no ipv6 distribute-list [prefix] WORD <in|out> [WORD]",
+ NO_STR
+ "IPv6\n"
+ "Filter networks in routing updates\n"
+ "Specify a prefix\n"
+ "Access-list name\n"
+ "Filter incoming routing updates\n"
+ "Filter outgoing routing updates\n"
+ "Interface name\n")
{
const char *ifname = NULL;
int prefix = (argv[3]->type == WORD_TKN) ? 1 : 0;
If you are a new contributor to FRR, please see our contributing guidelines.
After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.
💚 Basic BGPD CI results: SUCCESS, 0 tests failedResults table
For details, please contact louberger |
Continuous Integration Result: SUCCESSFULCongratulations, this patch passed basic tests Tested-by: NetDEF / OpenSourceRouting.org CI System CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-18811/ This is a comment from an automated CI system. Warnings Generated during build:Checkout code: Successful with additional warningsCLANG Static Analyzer Summary
No Changes in Static Analysis warnings compared to base2 Static Analyzer issues remaining.See details at |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
see individual commits. But effectively FRR's
distribute-list ...commands are messed up a whole bunch. Try to sort it out better.