diff options
| author | Martin Winter <mwinter@opensourcerouting.org> | 2017-04-17 14:47:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-17 14:47:08 -0700 |
| commit | 3060be2af51b4a6936b60843ec398607a992002f (patch) | |
| tree | 6dc457a82f0e6e2271d58f5c8c2945517199a621 | |
| parent | 64919312d26b399d3214665d97bf38bfac5e09e9 (diff) | |
| parent | 5260e25d2000dcd65b9e7f710f20482e1bb9f2df (diff) | |
Merge pull request #371 from donaldsharp/as_path_fix_3.0
bgpd: Fix 'set as-path prepend last-as 10'
| -rw-r--r-- | bgpd/bgp_route.c | 2 | ||||
| -rw-r--r-- | bgpd/bgp_routemap.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 4e87ea1ece..32cf0bcb89 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -8562,8 +8562,6 @@ static int bgp_show_regexp (struct vty *vty, const char *regstr, afi_t afi, safi_t safi, enum bgp_show_type type) { - return CMD_SUCCESS; - regex_t *regex; int rc; diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index bafc81eaf8..9b5a7a5ebb 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -1437,7 +1437,7 @@ route_set_aspath_prepend_compile (const char *arg) { unsigned int num; - if (sscanf(arg, "last-as %u", &num) == 1 && num > 0 && num < 10) + if (sscanf(arg, "last-as %u", &num) == 1 && num > 0 && num <= 10) return (void*)(uintptr_t)num; return route_aspath_compile(arg); @@ -3677,12 +3677,12 @@ DEFUN (set_aspath_prepend_asn, DEFUN (set_aspath_prepend_lastas, set_aspath_prepend_lastas_cmd, - "set as-path prepend last-as (1-9)", + "set as-path prepend last-as (1-10)", SET_STR "Transform BGP AS_PATH attribute\n" "Prepend to the as-path\n" "Use the peer's AS-number\n" - "Number of times to insert") + "Number of times to insert\n") { return set_aspath_prepend_asn (self, vty, argc, argv); } |