diff options
| author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2017-06-08 10:41:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-08 10:41:57 -0500 |
| commit | ce7fce36bdf3a2a32ca17602b51eb05f8d9ece82 (patch) | |
| tree | 124fdaa76bc53d85f5e910a39642dd8949dd2780 | |
| parent | 50b7b58488699fb3cad8a0fcef13cde974ae8ba9 (diff) | |
| parent | 1152f4866964f693b59ba4a73fb6c6ac654884f7 (diff) | |
Merge pull request #692 from donaldsharp/meta_queue_fix
zebra: Fix the metaq to be aware of all routing protocols we could see
| -rw-r--r-- | lib/route_types.txt | 5 | ||||
| -rw-r--r-- | zebra/rib.h | 2 | ||||
| -rw-r--r-- | zebra/zebra_rib.c | 36 |
3 files changed, 28 insertions, 15 deletions
diff --git a/lib/route_types.txt b/lib/route_types.txt index 7625d1f690..d26211e1ac 100644 --- a/lib/route_types.txt +++ b/lib/route_types.txt @@ -39,7 +39,10 @@ # # Long description: Full description, but should try fit on a line. #### - +# +# If you add a new routing protocol here, make sure you go update +# meta_queue_map in zebra_rib.c +# ## type cname daemon C 4 6 short help ZEBRA_ROUTE_SYSTEM, system, NULL, 'X', 0, 0, "Reserved" ZEBRA_ROUTE_KERNEL, kernel, zebra, 'K', 1, 1, "kernel route" diff --git a/zebra/rib.h b/zebra/rib.h index 3f4fb81f6d..88f2bf39ab 100644 --- a/zebra/rib.h +++ b/zebra/rib.h @@ -99,7 +99,7 @@ struct route_entry /* meta-queue structure: * sub-queue 0: connected, kernel * sub-queue 1: static - * sub-queue 2: RIP, RIPng, OSPF, OSPF6, IS-IS + * sub-queue 2: RIP, RIPng, OSPF, OSPF6, IS-IS, EIGRP, NHRP * sub-queue 3: iBGP, eBGP * sub-queue 4: any other origin (if any) */ diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index ca15d7eadc..ae514ad94a 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -1845,19 +1845,29 @@ meta_queue_process (struct work_queue *dummy, void *data) * Map from rib types to queue type (priority) in meta queue */ static const u_char meta_queue_map[ZEBRA_ROUTE_MAX] = { - [ZEBRA_ROUTE_SYSTEM] = 4, - [ZEBRA_ROUTE_KERNEL] = 0, - [ZEBRA_ROUTE_CONNECT] = 0, - [ZEBRA_ROUTE_STATIC] = 1, - [ZEBRA_ROUTE_RIP] = 2, - [ZEBRA_ROUTE_RIPNG] = 2, - [ZEBRA_ROUTE_OSPF] = 2, - [ZEBRA_ROUTE_OSPF6] = 2, - [ZEBRA_ROUTE_ISIS] = 2, - [ZEBRA_ROUTE_NHRP] = 2, - [ZEBRA_ROUTE_BGP] = 3, - [ZEBRA_ROUTE_HSLS] = 4, - [ZEBRA_ROUTE_TABLE] = 1, + [ZEBRA_ROUTE_SYSTEM] = 4, + [ZEBRA_ROUTE_KERNEL] = 0, + [ZEBRA_ROUTE_CONNECT] = 0, + [ZEBRA_ROUTE_STATIC] = 1, + [ZEBRA_ROUTE_RIP] = 2, + [ZEBRA_ROUTE_RIPNG] = 2, + [ZEBRA_ROUTE_OSPF] = 2, + [ZEBRA_ROUTE_OSPF6] = 2, + [ZEBRA_ROUTE_ISIS] = 2, + [ZEBRA_ROUTE_BGP] = 3, + [ZEBRA_ROUTE_PIM] = 4, // Shouldn't happen but for safety + [ZEBRA_ROUTE_EIGRP] = 2, + [ZEBRA_ROUTE_NHRP] = 2, + [ZEBRA_ROUTE_HSLS] = 4, + [ZEBRA_ROUTE_OLSR] = 4, + [ZEBRA_ROUTE_TABLE] = 1, + [ZEBRA_ROUTE_LDP] = 4, + [ZEBRA_ROUTE_VNC] = 3, + [ZEBRA_ROUTE_VNC_DIRECT] = 3, + [ZEBRA_ROUTE_VNC_DIRECT_RH] = 3, + [ZEBRA_ROUTE_BGP_DIRECT] = 3, + [ZEBRA_ROUTE_BGP_DIRECT_EXT] = 3, + [ZEBRA_ROUTE_ALL] = 4, // Shouldn't happen but for safety }; /* Look into the RN and queue it into one or more priority queues, |