[BACK]Return to route_types.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / quagga / lib

Diff for /embedaddon/quagga/lib/route_types.h between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/10/09 09:22:28 version 1.1.1.3, 2016/11/02 10:09:11
Line 15 Line 15
 #define ZEBRA_ROUTE_OSPF6                7  #define ZEBRA_ROUTE_OSPF6                7
 #define ZEBRA_ROUTE_ISIS                 8  #define ZEBRA_ROUTE_ISIS                 8
 #define ZEBRA_ROUTE_BGP                  9  #define ZEBRA_ROUTE_BGP                  9
#define ZEBRA_ROUTE_HSLS                 10#define ZEBRA_ROUTE_PIM                  10
#define ZEBRA_ROUTE_OLSR                 11#define ZEBRA_ROUTE_HSLS                 11
#define ZEBRA_ROUTE_BABEL                12#define ZEBRA_ROUTE_OLSR                 12
#define ZEBRA_ROUTE_MAX                  13#define ZEBRA_ROUTE_BABEL                13
 #define ZEBRA_ROUTE_MAX                  14
   
 #define SHOW_ROUTE_V4_HEADER \  #define SHOW_ROUTE_V4_HEADER \
   "Codes: K - kernel route, C - connected, S - static, R - RIP,%s" \    "Codes: K - kernel route, C - connected, S - static, R - RIP,%s" \
  "       O - OSPF, I - IS-IS, B - BGP, A - Babel,%s" \  "       O - OSPF, I - IS-IS, B - BGP, P - PIM, A - Babel,%s" \
   "       > - selected route, * - FIB route%s%s", \    "       > - selected route, * - FIB route%s%s", \
   VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE    VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE
 #define SHOW_ROUTE_V6_HEADER \  #define SHOW_ROUTE_V6_HEADER \
Line 33 Line 34
   
 /* babeld */  /* babeld */
 #define QUAGGA_REDIST_STR_BABELD \  #define QUAGGA_REDIST_STR_BABELD \
  "(kernel|connected|static|rip|ripng|ospf|ospf6|isis|bgp)"  "(kernel|connected|static|rip|ripng|ospf|ospf6|isis|bgp|pim)"
 #define QUAGGA_REDIST_HELP_STR_BABELD \  #define QUAGGA_REDIST_HELP_STR_BABELD \
   "Kernel routes (not installed via the zebra RIB)\n" \    "Kernel routes (not installed via the zebra RIB)\n" \
   "Connected routes (directly attached subnet or host)\n" \    "Connected routes (directly attached subnet or host)\n" \
Line 43 Line 44
   "Open Shortest Path First (OSPFv2)\n" \    "Open Shortest Path First (OSPFv2)\n" \
   "Open Shortest Path First (IPv6) (OSPFv3)\n" \    "Open Shortest Path First (IPv6) (OSPFv3)\n" \
   "Intermediate System to Intermediate System (IS-IS)\n" \    "Intermediate System to Intermediate System (IS-IS)\n" \
  "Border Gateway Protocol (BGP)\n"  "Border Gateway Protocol (BGP)\n" \
   "Protocol Independent Multicast (PIM)\n"
 #define QUAGGA_IP_REDIST_STR_BABELD \  #define QUAGGA_IP_REDIST_STR_BABELD \
  "(kernel|connected|static|rip|ospf|isis|bgp)"  "(kernel|connected|static|rip|ospf|isis|bgp|pim)"
 #define QUAGGA_IP_REDIST_HELP_STR_BABELD \  #define QUAGGA_IP_REDIST_HELP_STR_BABELD \
   "Kernel routes (not installed via the zebra RIB)\n" \    "Kernel routes (not installed via the zebra RIB)\n" \
   "Connected routes (directly attached subnet or host)\n" \    "Connected routes (directly attached subnet or host)\n" \
Line 53 Line 55
   "Routing Information Protocol (RIP)\n" \    "Routing Information Protocol (RIP)\n" \
   "Open Shortest Path First (OSPFv2)\n" \    "Open Shortest Path First (OSPFv2)\n" \
   "Intermediate System to Intermediate System (IS-IS)\n" \    "Intermediate System to Intermediate System (IS-IS)\n" \
  "Border Gateway Protocol (BGP)\n"  "Border Gateway Protocol (BGP)\n" \
   "Protocol Independent Multicast (PIM)\n"
 #define QUAGGA_IP6_REDIST_STR_BABELD \  #define QUAGGA_IP6_REDIST_STR_BABELD \
   "(kernel|connected|static|ripng|ospf6|isis|bgp)"    "(kernel|connected|static|ripng|ospf6|isis|bgp)"
 #define QUAGGA_IP6_REDIST_HELP_STR_BABELD \  #define QUAGGA_IP6_REDIST_HELP_STR_BABELD \
Line 67 Line 70
   
 /* bgpd */  /* bgpd */
 #define QUAGGA_REDIST_STR_BGPD \  #define QUAGGA_REDIST_STR_BGPD \
  "(kernel|connected|static|rip|ripng|ospf|ospf6|isis|babel)"  "(kernel|connected|static|rip|ripng|ospf|ospf6|isis|pim|babel)"
 #define QUAGGA_REDIST_HELP_STR_BGPD \  #define QUAGGA_REDIST_HELP_STR_BGPD \
   "Kernel routes (not installed via the zebra RIB)\n" \    "Kernel routes (not installed via the zebra RIB)\n" \
   "Connected routes (directly attached subnet or host)\n" \    "Connected routes (directly attached subnet or host)\n" \
Line 77 Line 80
   "Open Shortest Path First (OSPFv2)\n" \    "Open Shortest Path First (OSPFv2)\n" \
   "Open Shortest Path First (IPv6) (OSPFv3)\n" \    "Open Shortest Path First (IPv6) (OSPFv3)\n" \
   "Intermediate System to Intermediate System (IS-IS)\n" \    "Intermediate System to Intermediate System (IS-IS)\n" \
     "Protocol Independent Multicast (PIM)\n" \
   "Babel routing protocol (Babel)\n"    "Babel routing protocol (Babel)\n"
 #define QUAGGA_IP_REDIST_STR_BGPD \  #define QUAGGA_IP_REDIST_STR_BGPD \
  "(kernel|connected|static|rip|ospf|isis|babel)"  "(kernel|connected|static|rip|ospf|isis|pim|babel)"
 #define QUAGGA_IP_REDIST_HELP_STR_BGPD \  #define QUAGGA_IP_REDIST_HELP_STR_BGPD \
   "Kernel routes (not installed via the zebra RIB)\n" \    "Kernel routes (not installed via the zebra RIB)\n" \
   "Connected routes (directly attached subnet or host)\n" \    "Connected routes (directly attached subnet or host)\n" \
Line 87 Line 91
   "Routing Information Protocol (RIP)\n" \    "Routing Information Protocol (RIP)\n" \
   "Open Shortest Path First (OSPFv2)\n" \    "Open Shortest Path First (OSPFv2)\n" \
   "Intermediate System to Intermediate System (IS-IS)\n" \    "Intermediate System to Intermediate System (IS-IS)\n" \
     "Protocol Independent Multicast (PIM)\n" \
   "Babel routing protocol (Babel)\n"    "Babel routing protocol (Babel)\n"
 #define QUAGGA_IP6_REDIST_STR_BGPD \  #define QUAGGA_IP6_REDIST_STR_BGPD \
   "(kernel|connected|static|ripng|ospf6|isis|babel)"    "(kernel|connected|static|ripng|ospf6|isis|babel)"
Line 101 Line 106
   
 /* isisd */  /* isisd */
 #define QUAGGA_REDIST_STR_ISISD \  #define QUAGGA_REDIST_STR_ISISD \
  "(kernel|connected|static|rip|ripng|ospf|ospf6|bgp|babel)"  "(kernel|connected|static|rip|ripng|ospf|ospf6|bgp|pim|babel)"
 #define QUAGGA_REDIST_HELP_STR_ISISD \  #define QUAGGA_REDIST_HELP_STR_ISISD \
   "Kernel routes (not installed via the zebra RIB)\n" \    "Kernel routes (not installed via the zebra RIB)\n" \
   "Connected routes (directly attached subnet or host)\n" \    "Connected routes (directly attached subnet or host)\n" \
Line 111 Line 116
   "Open Shortest Path First (OSPFv2)\n" \    "Open Shortest Path First (OSPFv2)\n" \
   "Open Shortest Path First (IPv6) (OSPFv3)\n" \    "Open Shortest Path First (IPv6) (OSPFv3)\n" \
   "Border Gateway Protocol (BGP)\n" \    "Border Gateway Protocol (BGP)\n" \
     "Protocol Independent Multicast (PIM)\n" \
   "Babel routing protocol (Babel)\n"    "Babel routing protocol (Babel)\n"
 #define QUAGGA_IP_REDIST_STR_ISISD \  #define QUAGGA_IP_REDIST_STR_ISISD \
  "(kernel|connected|static|rip|ospf|bgp|babel)"  "(kernel|connected|static|rip|ospf|bgp|pim|babel)"
 #define QUAGGA_IP_REDIST_HELP_STR_ISISD \  #define QUAGGA_IP_REDIST_HELP_STR_ISISD \
   "Kernel routes (not installed via the zebra RIB)\n" \    "Kernel routes (not installed via the zebra RIB)\n" \
   "Connected routes (directly attached subnet or host)\n" \    "Connected routes (directly attached subnet or host)\n" \
Line 121 Line 127
   "Routing Information Protocol (RIP)\n" \    "Routing Information Protocol (RIP)\n" \
   "Open Shortest Path First (OSPFv2)\n" \    "Open Shortest Path First (OSPFv2)\n" \
   "Border Gateway Protocol (BGP)\n" \    "Border Gateway Protocol (BGP)\n" \
     "Protocol Independent Multicast (PIM)\n" \
   "Babel routing protocol (Babel)\n"    "Babel routing protocol (Babel)\n"
 #define QUAGGA_IP6_REDIST_STR_ISISD \  #define QUAGGA_IP6_REDIST_STR_ISISD \
   "(kernel|connected|static|ripng|ospf6|bgp|babel)"    "(kernel|connected|static|ripng|ospf6|bgp|babel)"
Line 147 Line 154
   
 /* ospfd */  /* ospfd */
 #define QUAGGA_REDIST_STR_OSPFD \  #define QUAGGA_REDIST_STR_OSPFD \
  "(kernel|connected|static|rip|isis|bgp|babel)"  "(kernel|connected|static|rip|isis|bgp|pim|babel)"
 #define QUAGGA_REDIST_HELP_STR_OSPFD \  #define QUAGGA_REDIST_HELP_STR_OSPFD \
   "Kernel routes (not installed via the zebra RIB)\n" \    "Kernel routes (not installed via the zebra RIB)\n" \
   "Connected routes (directly attached subnet or host)\n" \    "Connected routes (directly attached subnet or host)\n" \
Line 155 Line 162
   "Routing Information Protocol (RIP)\n" \    "Routing Information Protocol (RIP)\n" \
   "Intermediate System to Intermediate System (IS-IS)\n" \    "Intermediate System to Intermediate System (IS-IS)\n" \
   "Border Gateway Protocol (BGP)\n" \    "Border Gateway Protocol (BGP)\n" \
     "Protocol Independent Multicast (PIM)\n" \
   "Babel routing protocol (Babel)\n"    "Babel routing protocol (Babel)\n"
   
   /* pimd */
   #define QUAGGA_REDIST_STR_PIMD \
     "(kernel|connected|static|rip|ospf|isis|bgp|babel)"
   #define QUAGGA_REDIST_HELP_STR_PIMD \
     "Kernel routes (not installed via the zebra RIB)\n" \
     "Connected routes (directly attached subnet or host)\n" \
     "Statically configured routes\n" \
     "Routing Information Protocol (RIP)\n" \
     "Open Shortest Path First (OSPFv2)\n" \
     "Intermediate System to Intermediate System (IS-IS)\n" \
     "Border Gateway Protocol (BGP)\n" \
     "Babel routing protocol (Babel)\n"
   
 /* ripd */  /* ripd */
 #define QUAGGA_REDIST_STR_RIPD \  #define QUAGGA_REDIST_STR_RIPD \
  "(kernel|connected|static|ospf|isis|bgp|babel)"  "(kernel|connected|static|ospf|isis|bgp|pim|babel)"
 #define QUAGGA_REDIST_HELP_STR_RIPD \  #define QUAGGA_REDIST_HELP_STR_RIPD \
   "Kernel routes (not installed via the zebra RIB)\n" \    "Kernel routes (not installed via the zebra RIB)\n" \
   "Connected routes (directly attached subnet or host)\n" \    "Connected routes (directly attached subnet or host)\n" \
Line 167 Line 188
   "Open Shortest Path First (OSPFv2)\n" \    "Open Shortest Path First (OSPFv2)\n" \
   "Intermediate System to Intermediate System (IS-IS)\n" \    "Intermediate System to Intermediate System (IS-IS)\n" \
   "Border Gateway Protocol (BGP)\n" \    "Border Gateway Protocol (BGP)\n" \
     "Protocol Independent Multicast (PIM)\n" \
   "Babel routing protocol (Babel)\n"    "Babel routing protocol (Babel)\n"
   
 /* ripngd */  /* ripngd */
Line 183 Line 205
   
 /* zebra */  /* zebra */
 #define QUAGGA_REDIST_STR_ZEBRA \  #define QUAGGA_REDIST_STR_ZEBRA \
  "(kernel|connected|static|rip|ripng|ospf|ospf6|isis|bgp|babel)"  "(kernel|connected|static|rip|ripng|ospf|ospf6|isis|bgp|pim|babel)"
 #define QUAGGA_REDIST_HELP_STR_ZEBRA \  #define QUAGGA_REDIST_HELP_STR_ZEBRA \
   "Kernel routes (not installed via the zebra RIB)\n" \    "Kernel routes (not installed via the zebra RIB)\n" \
   "Connected routes (directly attached subnet or host)\n" \    "Connected routes (directly attached subnet or host)\n" \
Line 194 Line 216
   "Open Shortest Path First (IPv6) (OSPFv3)\n" \    "Open Shortest Path First (IPv6) (OSPFv3)\n" \
   "Intermediate System to Intermediate System (IS-IS)\n" \    "Intermediate System to Intermediate System (IS-IS)\n" \
   "Border Gateway Protocol (BGP)\n" \    "Border Gateway Protocol (BGP)\n" \
     "Protocol Independent Multicast (PIM)\n" \
   "Babel routing protocol (Babel)\n"    "Babel routing protocol (Babel)\n"
 #define QUAGGA_IP_REDIST_STR_ZEBRA \  #define QUAGGA_IP_REDIST_STR_ZEBRA \
  "(kernel|connected|static|rip|ospf|isis|bgp|babel)"  "(kernel|connected|static|rip|ospf|isis|bgp|pim|babel)"
 #define QUAGGA_IP_REDIST_HELP_STR_ZEBRA \  #define QUAGGA_IP_REDIST_HELP_STR_ZEBRA \
   "Kernel routes (not installed via the zebra RIB)\n" \    "Kernel routes (not installed via the zebra RIB)\n" \
   "Connected routes (directly attached subnet or host)\n" \    "Connected routes (directly attached subnet or host)\n" \
Line 205 Line 228
   "Open Shortest Path First (OSPFv2)\n" \    "Open Shortest Path First (OSPFv2)\n" \
   "Intermediate System to Intermediate System (IS-IS)\n" \    "Intermediate System to Intermediate System (IS-IS)\n" \
   "Border Gateway Protocol (BGP)\n" \    "Border Gateway Protocol (BGP)\n" \
     "Protocol Independent Multicast (PIM)\n" \
   "Babel routing protocol (Babel)\n"    "Babel routing protocol (Babel)\n"
 #define QUAGGA_IP6_REDIST_STR_ZEBRA \  #define QUAGGA_IP6_REDIST_STR_ZEBRA \
   "(kernel|connected|static|ripng|ospf6|isis|bgp|babel)"    "(kernel|connected|static|ripng|ospf6|isis|bgp|babel)"
Line 240  static const struct zebra_desc_table route_types[] = { Line 264  static const struct zebra_desc_table route_types[] = {
   DESC_ENTRY    (ZEBRA_ROUTE_OSPF6,      "ospf6",       'O' ),    DESC_ENTRY    (ZEBRA_ROUTE_OSPF6,      "ospf6",       'O' ),
   DESC_ENTRY    (ZEBRA_ROUTE_ISIS,       "isis",        'I' ),    DESC_ENTRY    (ZEBRA_ROUTE_ISIS,       "isis",        'I' ),
   DESC_ENTRY    (ZEBRA_ROUTE_BGP,        "bgp", 'B' ),    DESC_ENTRY    (ZEBRA_ROUTE_BGP,        "bgp", 'B' ),
     DESC_ENTRY    (ZEBRA_ROUTE_PIM,        "pim", 'P' ),
   DESC_ENTRY    (ZEBRA_ROUTE_HSLS,       "hsls",        'H' ),    DESC_ENTRY    (ZEBRA_ROUTE_HSLS,       "hsls",        'H' ),
   DESC_ENTRY    (ZEBRA_ROUTE_OLSR,       "olsr",        'o' ),    DESC_ENTRY    (ZEBRA_ROUTE_OLSR,       "olsr",        'o' ),
   DESC_ENTRY    (ZEBRA_ROUTE_BABEL,      "babel",       'A' ),    DESC_ENTRY    (ZEBRA_ROUTE_BABEL,      "babel",       'A' ),
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>