bgpd: Fix "malformed communities" for accept-own-nexthop

"set community accept-own-nexthop" returns "malformed communities"
error. This is because the token matching hits an earlier "accept-own"
and leaves "-nexthop" as a separate token to be processed.
Reorder the switch cases so that both are processed correctly.

Signed-off-by: Appu Joseph <apjo@kaloom.com>

diff --git a/bgpd/bgp_community.c b/bgpd/bgp_community.c
index 0d60fbf47932525980b6869e3ef5e86d90f4c5a9..b6cc2b839f36afeb3bc69e36a8839c39652d24c0 100644 (file)
--- a/bgpd/bgp_community.c
+++ b/bgpd/bgp_community.c
@@ -677,6 +677,14 @@ community_gettoken(const char *buf, enum community_token *token, uint32_t *val)
                        p += strlen("graceful-shutdown");
                        return p;
                }
+               if (strncmp(p, "accept-own-nexthop",
+                           strlen("accept-own-nexthop"))
+                   == 0) {
+                       *val = COMMUNITY_ACCEPT_OWN_NEXTHOP;
+                       *token = community_token_accept_own_nexthop;
+                       p += strlen("accept-own-nexthop");
+                       return p;
+               }
                if (strncmp(p, "accept-own", strlen("accept-own"))
                    == 0) {
                        *val = COMMUNITY_ACCEPT_OWN;
@@ -728,14 +736,6 @@ community_gettoken(const char *buf, enum community_token *token, uint32_t *val)
                        p += strlen("no-llgr");
                        return p;
                }
-               if (strncmp(p, "accept-own-nexthop",
-                       strlen("accept-own-nexthop"))
-                   == 0) {
-                       *val = COMMUNITY_ACCEPT_OWN_NEXTHOP;
-                       *token = community_token_accept_own_nexthop;
-                       p += strlen("accept-own-nexthop");
-                       return p;
-               }
                if (strncmp(p, "blackhole", strlen("blackhole"))
                    == 0) {
                        *val = COMMUNITY_BLACKHOLE;