source: packages/net/quagga/patches/120-quagga_manet.patch @ 26362

Last change on this file since 26362 was 26362, checked in by acinonyx, 6 years ago

[packages] quagga: Renumber patches

File size: 32.0 KB
  • bgpd/bgp_vty.c

    a b bgp_str2route_type (int afi, const char 
    82288228        return ZEBRA_ROUTE_STATIC; 
    82298229      else if (strncmp (str, "r", 1) == 0) 
    82308230        return ZEBRA_ROUTE_RIP; 
    8231       else if (strncmp (str, "o", 1) == 0) 
     8231      else if (strncmp (str, "os", 2) == 0) 
    82328232        return ZEBRA_ROUTE_OSPF; 
     8233      else if (strncmp (str, "h", 1) == 0) 
     8234        return ZEBRA_ROUTE_HSLS; 
     8235      else if (strncmp (str, "ol", 2) == 0) 
     8236        return ZEBRA_ROUTE_OLSR; 
     8237      else if (strncmp (str, "b", 1) == 0) 
     8238        return ZEBRA_ROUTE_BATMAN; 
    82338239    } 
    82348240  if (afi == AFI_IP6) 
    82358241    { 
    bgp_str2route_type (int afi, const char 
    82418247        return ZEBRA_ROUTE_STATIC; 
    82428248      else if (strncmp (str, "r", 1) == 0) 
    82438249        return ZEBRA_ROUTE_RIPNG; 
    8244       else if (strncmp (str, "o", 1) == 0) 
     8250      else if (strncmp (str, "os", 2) == 0) 
    82458251        return ZEBRA_ROUTE_OSPF6; 
     8252      else if (strncmp (str, "h", 1) == 0) 
     8253        return ZEBRA_ROUTE_HSLS; 
     8254      else if (strncmp (str, "ol", 2) == 0) 
     8255        return ZEBRA_ROUTE_OLSR; 
     8256      else if (strncmp (str, "b", 1) == 0) 
     8257        return ZEBRA_ROUTE_BATMAN; 
    82468258    } 
    82478259  return 0; 
    82488260} 
    82498261 
    82508262DEFUN (bgp_redistribute_ipv4, 
    82518263       bgp_redistribute_ipv4_cmd, 
    8252        "redistribute (connected|kernel|ospf|rip|static)", 
     8264       "redistribute (connected|kernel|ospf|rip|static|hsls|olsr|batman)", 
    82538265       "Redistribute information from another routing protocol\n" 
    82548266       "Connected\n" 
    82558267       "Kernel routes\n" 
    82568268       "Open Shurtest Path First (OSPF)\n" 
    82578269       "Routing Information Protocol (RIP)\n" 
    8258        "Static routes\n") 
     8270       "Static routes\n" 
     8271       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8272       "Optimized Link State Routing (OLSR)\n" 
     8273       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n") 
    82598274{ 
    82608275  int type; 
    82618276 
    DEFUN (bgp_redistribute_ipv4, 
    82708285 
    82718286DEFUN (bgp_redistribute_ipv4_rmap, 
    82728287       bgp_redistribute_ipv4_rmap_cmd, 
    8273        "redistribute (connected|kernel|ospf|rip|static) route-map WORD", 
     8288       "redistribute (connected|kernel|ospf|rip|static|hsls|olsr|batman) route-map WORD", 
    82748289       "Redistribute information from another routing protocol\n" 
    82758290       "Connected\n" 
    82768291       "Kernel routes\n" 
    82778292       "Open Shurtest Path First (OSPF)\n" 
    82788293       "Routing Information Protocol (RIP)\n" 
    82798294       "Static routes\n" 
     8295       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8296       "Optimized Link State Routing (OLSR)\n" 
     8297       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    82808298       "Route map reference\n" 
    82818299       "Pointer to route-map entries\n") 
    82828300{ 
    DEFUN (bgp_redistribute_ipv4_rmap, 
    82958313 
    82968314DEFUN (bgp_redistribute_ipv4_metric, 
    82978315       bgp_redistribute_ipv4_metric_cmd, 
    8298        "redistribute (connected|kernel|ospf|rip|static) metric <0-4294967295>", 
     8316       "redistribute (connected|kernel|ospf|rip|static|hsls|olsr|batman) metric <0-4294967295>", 
    82998317       "Redistribute information from another routing protocol\n" 
    83008318       "Connected\n" 
    83018319       "Kernel routes\n" 
    83028320       "Open Shurtest Path First (OSPF)\n" 
    83038321       "Routing Information Protocol (RIP)\n" 
    83048322       "Static routes\n" 
     8323       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8324       "Optimized Link State Routing (OLSR)\n" 
     8325       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    83058326       "Metric for redistributed routes\n" 
    83068327       "Default metric\n") 
    83078328{ 
    DEFUN (bgp_redistribute_ipv4_metric, 
    83228343 
    83238344DEFUN (bgp_redistribute_ipv4_rmap_metric, 
    83248345       bgp_redistribute_ipv4_rmap_metric_cmd, 
    8325        "redistribute (connected|kernel|ospf|rip|static) route-map WORD metric <0-4294967295>", 
     8346       "redistribute (connected|kernel|ospf|rip|static|hsls|olsr|batman) route-map WORD metric <0-4294967295>", 
    83268347       "Redistribute information from another routing protocol\n" 
    83278348       "Connected\n" 
    83288349       "Kernel routes\n" 
    83298350       "Open Shurtest Path First (OSPF)\n" 
    83308351       "Routing Information Protocol (RIP)\n" 
    83318352       "Static routes\n" 
     8353       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8354       "Optimized Link State Routing (OLSR)\n" 
     8355       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    83328356       "Route map reference\n" 
    83338357       "Pointer to route-map entries\n" 
    83348358       "Metric for redistributed routes\n" 
    DEFUN (bgp_redistribute_ipv4_rmap_metric 
    83528376 
    83538377DEFUN (bgp_redistribute_ipv4_metric_rmap, 
    83548378       bgp_redistribute_ipv4_metric_rmap_cmd, 
    8355        "redistribute (connected|kernel|ospf|rip|static) metric <0-4294967295> route-map WORD", 
     8379       "redistribute (connected|kernel|ospf|rip|static|hsls|olsr|batman) metric <0-4294967295> route-map WORD", 
    83568380       "Redistribute information from another routing protocol\n" 
    83578381       "Connected\n" 
    83588382       "Kernel routes\n" 
    83598383       "Open Shurtest Path First (OSPF)\n" 
    83608384       "Routing Information Protocol (RIP)\n" 
    83618385       "Static routes\n" 
     8386       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8387       "Optimized Link State Routing (OLSR)\n" 
     8388       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    83628389       "Metric for redistributed routes\n" 
    83638390       "Default metric\n" 
    83648391       "Route map reference\n" 
    DEFUN (bgp_redistribute_ipv4_metric_rmap 
    83828409 
    83838410DEFUN (no_bgp_redistribute_ipv4, 
    83848411       no_bgp_redistribute_ipv4_cmd, 
    8385        "no redistribute (connected|kernel|ospf|rip|static)", 
     8412       "no redistribute (connected|kernel|ospf|rip|static|hsls|olsr|batman)", 
    83868413       NO_STR 
    83878414       "Redistribute information from another routing protocol\n" 
    83888415       "Connected\n" 
    83898416       "Kernel routes\n" 
    83908417       "Open Shurtest Path First (OSPF)\n" 
    83918418       "Routing Information Protocol (RIP)\n" 
    8392        "Static routes\n") 
     8419       "Static routes\n" 
     8420       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8421       "Optimized Link State Routing (OLSR)\n" 
     8422       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n") 
    83938423{ 
    83948424  int type; 
    83958425 
    DEFUN (no_bgp_redistribute_ipv4, 
    84058435 
    84068436DEFUN (no_bgp_redistribute_ipv4_rmap, 
    84078437       no_bgp_redistribute_ipv4_rmap_cmd, 
    8408        "no redistribute (connected|kernel|ospf|rip|static) route-map WORD", 
     8438       "no redistribute (connected|kernel|ospf|rip|static|hsls|olsr|batman) route-map WORD", 
    84098439       NO_STR 
    84108440       "Redistribute information from another routing protocol\n" 
    84118441       "Connected\n" 
    DEFUN (no_bgp_redistribute_ipv4_rmap, 
    84138443       "Open Shurtest Path First (OSPF)\n" 
    84148444       "Routing Information Protocol (RIP)\n" 
    84158445       "Static routes\n" 
     8446       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8447       "Optimized Link State Routing (OLSR)\n" 
     8448       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    84168449       "Route map reference\n" 
    84178450       "Pointer to route-map entries\n") 
    84188451{ 
    DEFUN (no_bgp_redistribute_ipv4_rmap, 
    84318464 
    84328465DEFUN (no_bgp_redistribute_ipv4_metric, 
    84338466       no_bgp_redistribute_ipv4_metric_cmd, 
    8434        "no redistribute (connected|kernel|ospf|rip|static) metric <0-4294967295>", 
     8467       "no redistribute (connected|kernel|ospf|rip|static|hsls|olsr|batman) metric <0-4294967295>", 
    84358468       NO_STR 
    84368469       "Redistribute information from another routing protocol\n" 
    84378470       "Connected\n" 
    DEFUN (no_bgp_redistribute_ipv4_metric, 
    84398472       "Open Shurtest Path First (OSPF)\n" 
    84408473       "Routing Information Protocol (RIP)\n" 
    84418474       "Static routes\n" 
     8475       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8476       "Optimized Link State Routing (OLSR)\n" 
     8477       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    84428478       "Metric for redistributed routes\n" 
    84438479       "Default metric\n") 
    84448480{ 
    DEFUN (no_bgp_redistribute_ipv4_metric, 
    84578493 
    84588494DEFUN (no_bgp_redistribute_ipv4_rmap_metric, 
    84598495       no_bgp_redistribute_ipv4_rmap_metric_cmd, 
    8460        "no redistribute (connected|kernel|ospf|rip|static) route-map WORD metric <0-4294967295>", 
     8496       "no redistribute (connected|kernel|ospf|rip|static|hsls|olsr|batman) route-map WORD metric <0-4294967295>", 
    84618497       NO_STR 
    84628498       "Redistribute information from another routing protocol\n" 
    84638499       "Connected\n" 
    DEFUN (no_bgp_redistribute_ipv4_rmap_met 
    84658501       "Open Shurtest Path First (OSPF)\n" 
    84668502       "Routing Information Protocol (RIP)\n" 
    84678503       "Static routes\n" 
     8504       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8505       "Optimized Link State Routing (OLSR)\n" 
     8506       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    84688507       "Route map reference\n" 
    84698508       "Pointer to route-map entries\n" 
    84708509       "Metric for redistributed routes\n" 
    DEFUN (no_bgp_redistribute_ipv4_rmap_met 
    84868525 
    84878526ALIAS (no_bgp_redistribute_ipv4_rmap_metric, 
    84888527       no_bgp_redistribute_ipv4_metric_rmap_cmd, 
    8489        "no redistribute (connected|kernel|ospf|rip|static) metric <0-4294967295> route-map WORD", 
     8528       "no redistribute (connected|kernel|ospf|rip|static|hsls|olsr|batman) metric <0-4294967295> route-map WORD", 
    84908529       NO_STR 
    84918530       "Redistribute information from another routing protocol\n" 
    84928531       "Connected\n" 
    ALIAS (no_bgp_redistribute_ipv4_rmap_met 
    84948533       "Open Shurtest Path First (OSPF)\n" 
    84958534       "Routing Information Protocol (RIP)\n" 
    84968535       "Static routes\n" 
     8536       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8537       "Optimized Link State Routing (OLSR)\n" 
     8538       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    84978539       "Metric for redistributed routes\n" 
    84988540       "Default metric\n" 
    84998541       "Route map reference\n" 
    ALIAS (no_bgp_redistribute_ipv4_rmap_met 
    85028544#ifdef HAVE_IPV6 
    85038545DEFUN (bgp_redistribute_ipv6, 
    85048546       bgp_redistribute_ipv6_cmd, 
    8505        "redistribute (connected|kernel|ospf6|ripng|static)", 
     8547       "redistribute (connected|kernel|ospf6|ripng|static|hsls|olsr|batman)", 
    85068548       "Redistribute information from another routing protocol\n" 
    85078549       "Connected\n" 
    85088550       "Kernel routes\n" 
    85098551       "Open Shurtest Path First (OSPFv3)\n" 
    85108552       "Routing Information Protocol (RIPng)\n" 
    8511        "Static routes\n") 
     8553       "Static routes\n" 
     8554       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8555       "Optimized Link State Routing (OLSR)\n" 
     8556       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n") 
    85128557{ 
    85138558  int type; 
    85148559 
    DEFUN (bgp_redistribute_ipv6, 
    85248569 
    85258570DEFUN (bgp_redistribute_ipv6_rmap, 
    85268571       bgp_redistribute_ipv6_rmap_cmd, 
    8527        "redistribute (connected|kernel|ospf6|ripng|static) route-map WORD", 
     8572       "redistribute (connected|kernel|ospf6|ripng|static|hsls|olsr|batman) route-map WORD", 
    85288573       "Redistribute information from another routing protocol\n" 
    85298574       "Connected\n" 
    85308575       "Kernel routes\n" 
    85318576       "Open Shurtest Path First (OSPFv3)\n" 
    85328577       "Routing Information Protocol (RIPng)\n" 
    85338578       "Static routes\n" 
     8579       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8580       "Optimized Link State Routing (OLSR)\n" 
     8581       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    85348582       "Route map reference\n" 
    85358583       "Pointer to route-map entries\n") 
    85368584{ 
    DEFUN (bgp_redistribute_ipv6_rmap, 
    85498597 
    85508598DEFUN (bgp_redistribute_ipv6_metric, 
    85518599       bgp_redistribute_ipv6_metric_cmd, 
    8552        "redistribute (connected|kernel|ospf6|ripng|static) metric <0-4294967295>", 
     8600       "redistribute (connected|kernel|ospf6|ripng|static|hsls|olsr|batman) metric <0-4294967295>", 
    85538601       "Redistribute information from another routing protocol\n" 
    85548602       "Connected\n" 
    85558603       "Kernel routes\n" 
    85568604       "Open Shurtest Path First (OSPFv3)\n" 
    85578605       "Routing Information Protocol (RIPng)\n" 
    85588606       "Static routes\n" 
     8607       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8608       "Optimized Link State Routing (OLSR)\n" 
     8609       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    85598610       "Metric for redistributed routes\n" 
    85608611       "Default metric\n") 
    85618612{ 
    DEFUN (bgp_redistribute_ipv6_metric, 
    85768627 
    85778628DEFUN (bgp_redistribute_ipv6_rmap_metric, 
    85788629       bgp_redistribute_ipv6_rmap_metric_cmd, 
    8579        "redistribute (connected|kernel|ospf6|ripng|static) route-map WORD metric <0-4294967295>", 
     8630       "redistribute (connected|kernel|ospf6|ripng|static|hsls|olsr|batman) route-map WORD metric <0-4294967295>", 
    85808631       "Redistribute information from another routing protocol\n" 
    85818632       "Connected\n" 
    85828633       "Kernel routes\n" 
    85838634       "Open Shurtest Path First (OSPFv3)\n" 
    85848635       "Routing Information Protocol (RIPng)\n" 
    85858636       "Static routes\n" 
     8637       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8638       "Optimized Link State Routing (OLSR)\n" 
     8639       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    85868640       "Route map reference\n" 
    85878641       "Pointer to route-map entries\n" 
    85888642       "Metric for redistributed routes\n" 
    DEFUN (bgp_redistribute_ipv6_rmap_metric 
    86068660 
    86078661DEFUN (bgp_redistribute_ipv6_metric_rmap, 
    86088662       bgp_redistribute_ipv6_metric_rmap_cmd, 
    8609        "redistribute (connected|kernel|ospf6|ripng|static) metric <0-4294967295> route-map WORD", 
     8663       "redistribute (connected|kernel|ospf6|ripng|static|hsls|olsr|batman) metric <0-4294967295> route-map WORD", 
    86108664       "Redistribute information from another routing protocol\n" 
    86118665       "Connected\n" 
    86128666       "Kernel routes\n" 
    86138667       "Open Shurtest Path First (OSPFv3)\n" 
    86148668       "Routing Information Protocol (RIPng)\n" 
    86158669       "Static routes\n" 
     8670       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8671       "Optimized Link State Routing (OLSR)\n" 
     8672       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    86168673       "Metric for redistributed routes\n" 
    86178674       "Default metric\n" 
    86188675       "Route map reference\n" 
    DEFUN (bgp_redistribute_ipv6_metric_rmap 
    86368693 
    86378694DEFUN (no_bgp_redistribute_ipv6, 
    86388695       no_bgp_redistribute_ipv6_cmd, 
    8639        "no redistribute (connected|kernel|ospf6|ripng|static)", 
     8696       "no redistribute (connected|kernel|ospf6|ripng|static|hsls|olsr|batman)", 
    86408697       NO_STR 
    86418698       "Redistribute information from another routing protocol\n" 
    86428699       "Connected\n" 
    86438700       "Kernel routes\n" 
    86448701       "Open Shurtest Path First (OSPFv3)\n" 
    86458702       "Routing Information Protocol (RIPng)\n" 
    8646        "Static routes\n") 
     8703       "Static routes\n" 
     8704       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8705       "Optimized Link State Routing (OLSR)\n" 
     8706       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n") 
    86478707{ 
    86488708  int type; 
    86498709 
    DEFUN (no_bgp_redistribute_ipv6, 
    86598719 
    86608720DEFUN (no_bgp_redistribute_ipv6_rmap, 
    86618721       no_bgp_redistribute_ipv6_rmap_cmd, 
    8662        "no redistribute (connected|kernel|ospf6|ripng|static) route-map WORD", 
     8722       "no redistribute (connected|kernel|ospf6|ripng|static|hsls|olsr|batman) route-map WORD", 
    86638723       NO_STR 
    86648724       "Redistribute information from another routing protocol\n" 
    86658725       "Connected\n" 
    DEFUN (no_bgp_redistribute_ipv6_rmap, 
    86678727       "Open Shurtest Path First (OSPFv3)\n" 
    86688728       "Routing Information Protocol (RIPng)\n" 
    86698729       "Static routes\n" 
     8730       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8731       "Optimized Link State Routing (OLSR)\n" 
     8732       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    86708733       "Route map reference\n" 
    86718734       "Pointer to route-map entries\n") 
    86728735{ 
    DEFUN (no_bgp_redistribute_ipv6_rmap, 
    86858748 
    86868749DEFUN (no_bgp_redistribute_ipv6_metric, 
    86878750       no_bgp_redistribute_ipv6_metric_cmd, 
    8688        "no redistribute (connected|kernel|ospf6|ripng|static) metric <0-4294967295>", 
     8751       "no redistribute (connected|kernel|ospf6|ripng|static|hsls|olsr|batman) metric <0-4294967295>", 
    86898752       NO_STR 
    86908753       "Redistribute information from another routing protocol\n" 
    86918754       "Connected\n" 
    DEFUN (no_bgp_redistribute_ipv6_metric, 
    86938756       "Open Shurtest Path First (OSPFv3)\n" 
    86948757       "Routing Information Protocol (RIPng)\n" 
    86958758       "Static routes\n" 
     8759       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8760       "Optimized Link State Routing (OLSR)\n" 
     8761       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    86968762       "Metric for redistributed routes\n" 
    86978763       "Default metric\n") 
    86988764{ 
    DEFUN (no_bgp_redistribute_ipv6_metric, 
    87118777 
    87128778DEFUN (no_bgp_redistribute_ipv6_rmap_metric, 
    87138779       no_bgp_redistribute_ipv6_rmap_metric_cmd, 
    8714        "no redistribute (connected|kernel|ospf6|ripng|static) route-map WORD metric <0-4294967295>", 
     8780       "no redistribute (connected|kernel|ospf6|ripng|static|hsls|olsr|batman) route-map WORD metric <0-4294967295>", 
    87158781       NO_STR 
    87168782       "Redistribute information from another routing protocol\n" 
    87178783       "Connected\n" 
    DEFUN (no_bgp_redistribute_ipv6_rmap_met 
    87198785       "Open Shurtest Path First (OSPFv3)\n" 
    87208786       "Routing Information Protocol (RIPng)\n" 
    87218787       "Static routes\n" 
     8788       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8789       "Optimized Link State Routing (OLSR)\n" 
     8790       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    87228791       "Route map reference\n" 
    87238792       "Pointer to route-map entries\n" 
    87248793       "Metric for redistributed routes\n" 
    DEFUN (no_bgp_redistribute_ipv6_rmap_met 
    87408809 
    87418810ALIAS (no_bgp_redistribute_ipv6_rmap_metric, 
    87428811       no_bgp_redistribute_ipv6_metric_rmap_cmd, 
    8743        "no redistribute (connected|kernel|ospf6|ripng|static) metric <0-4294967295> route-map WORD", 
     8812       "no redistribute (connected|kernel|ospf6|ripng|static|hsls|olsr|batman) metric <0-4294967295> route-map WORD", 
    87448813       NO_STR 
    87458814       "Redistribute information from another routing protocol\n" 
    87468815       "Connected\n" 
    ALIAS (no_bgp_redistribute_ipv6_rmap_met 
    87488817       "Open Shurtest Path First (OSPFv3)\n" 
    87498818       "Routing Information Protocol (RIPng)\n" 
    87508819       "Static routes\n" 
     8820       "Hazy-Sighted Link State Protocol (HSLS)\n" 
     8821       "Optimized Link State Routing (OLSR)\n" 
     8822       "Better Approach to Mobile Ad-Hoc Networking (BATMAN)\n" 
    87518823       "Metric for redistributed routes\n" 
    87528824       "Default metric\n" 
    87538825       "Route map reference\n" 
  • lib/log.c

    a b static const struct zebra_desc_table rou 
    838838  DESC_ENTRY    (ZEBRA_ROUTE_ISIS,      "isis",         'I' ), 
    839839  DESC_ENTRY    (ZEBRA_ROUTE_BGP,       "bgp",          'B' ), 
    840840  DESC_ENTRY    (ZEBRA_ROUTE_HSLS,      "hsls",         'H' ), 
     841  DESC_ENTRY    (ZEBRA_ROUTE_OLSR,      "olsr",         'o' ), 
     842  DESC_ENTRY    (ZEBRA_ROUTE_BATMAN,    "batman",       'b' ), 
    841843}; 
    842844#undef DESC_ENTRY 
    843845 
  • lib/route_types.txt

    a b ZEBRA_ROUTE_OSPF, ospf, ospfd 
    5151ZEBRA_ROUTE_OSPF6,      ospf6,     ospf6d, 'O', 0, 1, "OSPF" 
    5252ZEBRA_ROUTE_ISIS,       isis,      isisd,  'I', 1, 1, "IS-IS" 
    5353ZEBRA_ROUTE_BGP,        bgp,       bgpd,   'B', 1, 1, "BGP" 
    54 # HSLS and OLSR both are AFI independent (so: 1, 1), however 
    55 # we want to disable for them for general Quagga distribution. 
    56 # This at least makes it trivial for users of these protocols 
    57 # to 'switch on' redist support (direct numeric entry remaining 
    58 # possible). 
    59 ZEBRA_ROUTE_HSLS,       hsls,      hslsd,  'H', 0, 0, "HSLS" 
    60 ZEBRA_ROUTE_OLSR,       olsr,      oslrd,  'o', 0, 0, "OLSR" 
     54ZEBRA_ROUTE_HSLS,       hsls,      hslsd,  'H', 1, 1, "HSLS" 
     55ZEBRA_ROUTE_OLSR,       olsr,      olsrd,  'o', 1, 1, "OLSR" 
     56ZEBRA_ROUTE_BATMAN,     batman,    batmand,'b', 1, 1, "BATMAN" 
    6157 
    6258## help strings 
    6359ZEBRA_ROUTE_SYSTEM, "Reserved route type, for internal use only" 
    ZEBRA_ROUTE_OSPF6, "Open Shortest Path 
    7167ZEBRA_ROUTE_ISIS,   "Intermediate System to Intermediate System (IS-IS)" 
    7268ZEBRA_ROUTE_BGP,    "Border Gateway Protocol (BGP)" 
    7369ZEBRA_ROUTE_HSLS,   "Hazy-Sighted Link State Protocol (HSLS)" 
    74 ZEBRA_ROUTE_OLSR,   "Optimised Link State Routing (OLSR)" 
     70ZEBRA_ROUTE_OLSR,   "Optimized Link State Routing (OLSR)" 
     71ZEBRA_ROUTE_BATMAN, "Better Approach to Mobile Ad-Hoc Networking (BATMAN)" 
  • lib/zebra.h

    a b struct in_pktinfo 
    441441#define ZEBRA_ROUTE_ISIS                 8 
    442442#define ZEBRA_ROUTE_BGP                  9 
    443443#define ZEBRA_ROUTE_HSLS                 10 
    444 #define ZEBRA_ROUTE_MAX                  11 
     444#define ZEBRA_ROUTE_OLSR                 11 
     445#define ZEBRA_ROUTE_BATMAN               12 
     446#define ZEBRA_ROUTE_MAX                  13 
    445447 
    446448/* Note: whenever a new route-type or zserv-command is added the 
    447449 * corresponding {command,route}_types[] table in lib/log.c MUST be 
  • ospf6d/ospf6_asbr.c

    a b ospf6_asbr_redistribute_remove (int type 
    616616 
    617617DEFUN (ospf6_redistribute, 
    618618       ospf6_redistribute_cmd, 
    619        "redistribute (static|kernel|connected|ripng|bgp)", 
     619       "redistribute (static|kernel|connected|ripng|bgp|hsls|olsr|batman)", 
    620620       "Redistribute\n" 
    621621       "Static route\n" 
    622622       "Kernel route\n" 
    623623       "Connected route\n" 
    624624       "RIPng route\n" 
    625625       "BGP route\n" 
     626       "HSLS route\n" 
     627       "OLSR route\n" 
     628       "BATMAN route\n" 
    626629      ) 
    627630{ 
    628631  int type = 0; 
    DEFUN (ospf6_redistribute, 
    637640    type = ZEBRA_ROUTE_RIPNG; 
    638641  else if (strncmp (argv[0], "bgp", 3) == 0) 
    639642    type = ZEBRA_ROUTE_BGP; 
     643  else if (strncmp (argv[0], "h", 1) == 0) 
     644    type = ZEBRA_ROUTE_HSLS; 
     645  else if (strncmp (argv[0], "o", 1) == 0) 
     646    type = ZEBRA_ROUTE_OLSR; 
     647  else if (strncmp (argv[0], "ba", 2) == 0) 
     648    type = ZEBRA_ROUTE_BATMAN; 
    640649 
    641650  ospf6_asbr_redistribute_unset (type); 
    642651  ospf6_asbr_routemap_unset (type); 
    DEFUN (ospf6_redistribute, 
    646655 
    647656DEFUN (ospf6_redistribute_routemap, 
    648657       ospf6_redistribute_routemap_cmd, 
    649        "redistribute (static|kernel|connected|ripng|bgp) route-map WORD", 
     658       "redistribute (static|kernel|connected|ripng|bgp|hsls|olsr|batman) route-map WORD", 
    650659       "Redistribute\n" 
    651660       "Static routes\n" 
    652661       "Kernel route\n" 
    653662       "Connected route\n" 
    654663       "RIPng route\n" 
    655664       "BGP route\n" 
     665       "HSLS route\n" 
     666       "OLSR route\n" 
     667       "BATMAN route\n" 
    656668       "Route map reference\n" 
    657669       "Route map name\n" 
    658670      ) 
    DEFUN (ospf6_redistribute_routemap, 
    669681    type = ZEBRA_ROUTE_RIPNG; 
    670682  else if (strncmp (argv[0], "bgp", 3) == 0) 
    671683    type = ZEBRA_ROUTE_BGP; 
     684  else if (strncmp (argv[0], "h", 1) == 0) 
     685    type = ZEBRA_ROUTE_HSLS; 
     686  else if (strncmp (argv[0], "o", 1) == 0) 
     687    type = ZEBRA_ROUTE_OLSR; 
     688  else if (strncmp (argv[0], "ba", 2) == 0) 
     689    type = ZEBRA_ROUTE_BATMAN; 
    672690 
    673691  ospf6_asbr_redistribute_unset (type); 
    674692  ospf6_asbr_routemap_set (type, argv[1]); 
    DEFUN (ospf6_redistribute_routemap, 
    678696 
    679697DEFUN (no_ospf6_redistribute, 
    680698       no_ospf6_redistribute_cmd, 
    681        "no redistribute (static|kernel|connected|ripng|bgp)", 
     699       "no redistribute (static|kernel|connected|ripng|bgp|hsls|olsr|batman)", 
    682700       NO_STR 
    683701       "Redistribute\n" 
    684702       "Static route\n" 
    DEFUN (no_ospf6_redistribute, 
    686704       "Connected route\n" 
    687705       "RIPng route\n" 
    688706       "BGP route\n" 
     707       "HSLS route\n" 
     708       "OLSR route\n" 
     709       "BATMAN route\n" 
    689710      ) 
    690711{ 
    691712  int type = 0; 
    DEFUN (no_ospf6_redistribute, 
    700721    type = ZEBRA_ROUTE_RIPNG; 
    701722  else if (strncmp (argv[0], "bgp", 3) == 0) 
    702723    type = ZEBRA_ROUTE_BGP; 
     724  else if (strncmp (argv[0], "h", 1) == 0) 
     725    type = ZEBRA_ROUTE_HSLS; 
     726  else if (strncmp (argv[0], "o", 1) == 0) 
     727    type = ZEBRA_ROUTE_OLSR; 
     728  else if (strncmp (argv[0], "ba", 2) == 0) 
     729    type = ZEBRA_ROUTE_BATMAN; 
    703730 
    704731  ospf6_asbr_redistribute_unset (type); 
    705732  ospf6_asbr_routemap_unset (type); 
  • ospfd/ospf_vty.c

    a b str2distribute_source (const char *str, 
    107107    *source = ZEBRA_ROUTE_STATIC; 
    108108  else if (strncmp (str, "r", 1) == 0) 
    109109    *source = ZEBRA_ROUTE_RIP; 
    110   else if (strncmp (str, "b", 1) == 0) 
     110  else if (strncmp (str, "bg", 2) == 0) 
    111111    *source = ZEBRA_ROUTE_BGP; 
     112  else if (strncmp (str, "h", 1) == 0) 
     113    *source = ZEBRA_ROUTE_HSLS; 
     114  else if (strncmp (str, "o", 1) == 0) 
     115    *source = ZEBRA_ROUTE_OLSR; 
     116  else if (strncmp (str, "ba", 2) == 0) 
     117    *source = ZEBRA_ROUTE_BATMAN; 
    112118  else 
    113119    return 0; 
    114120 
  • ripd/rip_zebra.c

    a b static struct { 
    204204  {ZEBRA_ROUTE_KERNEL,  1, "kernel"}, 
    205205  {ZEBRA_ROUTE_CONNECT, 1, "connected"}, 
    206206  {ZEBRA_ROUTE_STATIC,  1, "static"}, 
    207   {ZEBRA_ROUTE_OSPF,    1, "ospf"}, 
    208   {ZEBRA_ROUTE_BGP,     1, "bgp"}, 
     207  {ZEBRA_ROUTE_OSPF,    2, "ospf"}, 
     208  {ZEBRA_ROUTE_BGP,     2, "bgp"}, 
     209  {ZEBRA_ROUTE_HSLS,    1, "hsls"}, 
     210  {ZEBRA_ROUTE_OLSR,    2, "olsr"}, 
     211  {ZEBRA_ROUTE_BATMAN,  2, "batman"}, 
    209212  {0, 0, NULL} 
    210213}; 
    211214 
  • ripngd/ripng_zebra.c

    a b static struct { 
    214214  {ZEBRA_ROUTE_KERNEL,  1, "kernel"}, 
    215215  {ZEBRA_ROUTE_CONNECT, 1, "connected"}, 
    216216  {ZEBRA_ROUTE_STATIC,  1, "static"}, 
    217   {ZEBRA_ROUTE_OSPF6,   1, "ospf6"}, 
    218   {ZEBRA_ROUTE_BGP,     1, "bgp"}, 
     217  {ZEBRA_ROUTE_OSPF6,   2, "ospf6"}, 
     218  {ZEBRA_ROUTE_BGP,     2, "bgp"}, 
     219  {ZEBRA_ROUTE_HSLS,    1, "hsls"}, 
     220  {ZEBRA_ROUTE_OLSR,    2, "olsr"}, 
     221  {ZEBRA_ROUTE_BATMAN,  2, "batman"}, 
    219222  {0, 0, NULL} 
    220223}; 
    221224 
  • zebra/redistribute.c

    a b zebra_redistribute_add (int command, str 
    255255    case ZEBRA_ROUTE_OSPF: 
    256256    case ZEBRA_ROUTE_OSPF6: 
    257257    case ZEBRA_ROUTE_BGP: 
     258    case ZEBRA_ROUTE_HSLS: 
     259    case ZEBRA_ROUTE_OLSR: 
     260    case ZEBRA_ROUTE_BATMAN: 
    258261      if (! client->redist[type]) 
    259262        { 
    260263          client->redist[type] = 1; 
    zebra_redistribute_delete (int command, 
    283286    case ZEBRA_ROUTE_OSPF: 
    284287    case ZEBRA_ROUTE_OSPF6: 
    285288    case ZEBRA_ROUTE_BGP: 
     289    case ZEBRA_ROUTE_HSLS: 
     290    case ZEBRA_ROUTE_OLSR: 
     291    case ZEBRA_ROUTE_BATMAN: 
    286292      client->redist[type] = 0; 
    287293      break; 
    288294    default: 
  • zebra/zebra_rib.c

    a b static const struct 
    6666  {ZEBRA_ROUTE_OSPF,    110}, 
    6767  {ZEBRA_ROUTE_OSPF6,   110}, 
    6868  {ZEBRA_ROUTE_ISIS,    115}, 
    69   {ZEBRA_ROUTE_BGP,      20  /* IBGP is 200. */} 
     69  {ZEBRA_ROUTE_BGP,      20  /* IBGP is 200. */}, 
     70  {ZEBRA_ROUTE_HSLS,      0},  
     71  {ZEBRA_ROUTE_OLSR,      0},  
     72  {ZEBRA_ROUTE_BATMAN,    0} 
    7073}; 
    7174 
    7275 
  • zebra/zebra_snmp.c

     /* Vector for routing table.  */
    @@ -1229,6 +1232,8 @@ static const u_char meta_queue_map[ZEBRA
       [ZEBRA_ROUTE_ISIS]    = 2,
       [ZEBRA_ROUTE_BGP]     = 3,
       [ZEBRA_ROUTE_HSLS]    = 4,
    +  [ZEBRA_ROUTE_OLSR]    = 4,
    +  [ZEBRA_ROUTE_BATMAN]  = 4,
     };
     
     /* Look into the RN and queue it into one or more priority queues,
    a b proto_trans(int type) 
    251251      return 1; /* shouldn't happen */ 
    252252    case ZEBRA_ROUTE_BGP: 
    253253      return 14; /* bgp */ 
     254    case ZEBRA_ROUTE_HSLS: 
     255      return 1; /* other */ 
     256    case ZEBRA_ROUTE_OLSR: 
     257      return 1; /* other */ 
     258    case ZEBRA_ROUTE_BATMAN: 
     259      return 1; /* other */ 
    254260    default: 
    255261      return 1; /* other */ 
    256262    } 
  • zebra/zebra_vty.c

    a b vty_show_ip_route_detail (struct vty *vt 
    557557      if (rib->type == ZEBRA_ROUTE_RIP 
    558558          || rib->type == ZEBRA_ROUTE_OSPF 
    559559          || rib->type == ZEBRA_ROUTE_ISIS 
    560           || rib->type == ZEBRA_ROUTE_BGP) 
     560          || rib->type == ZEBRA_ROUTE_BGP 
     561          || rib->type == ZEBRA_ROUTE_HSLS 
     562          || rib->type == ZEBRA_ROUTE_OLSR 
     563          || rib->type == ZEBRA_ROUTE_BATMAN) 
    561564        { 
    562565          time_t uptime; 
    563566          struct tm *tm; 
    vty_show_ip_route (struct vty *vty, stru 
    775778      if (rib->type == ZEBRA_ROUTE_RIP 
    776779          || rib->type == ZEBRA_ROUTE_OSPF 
    777780          || rib->type == ZEBRA_ROUTE_ISIS 
    778           || rib->type == ZEBRA_ROUTE_BGP) 
     781          || rib->type == ZEBRA_ROUTE_BGP 
     782          || rib->type == ZEBRA_ROUTE_HSLS 
     783          || rib->type == ZEBRA_ROUTE_OLSR 
     784          || rib->type == ZEBRA_ROUTE_BATMAN) 
    779785        { 
    780786          time_t uptime; 
    781787          struct tm *tm; 
    vty_show_ip_route (struct vty *vty, stru 
    803809} 
    804810 
    805811#define SHOW_ROUTE_V4_HEADER "Codes: K - kernel route, C - connected, " \ 
    806   "S - static, R - RIP, O - OSPF,%s       I - ISIS, B - BGP, " \ 
    807   "> - selected route, * - FIB route%s%s" 
     812  "S - static, R - RIP, O - OSPF,%s       I - ISIS, B - BGP, H - HSLS, " \ 
     813  "o - OLSR, b - BATMAN,%s       > - selected route, * - FIB route%s%s" 
    808814 
    809815DEFUN (show_ip_route, 
    810816       show_ip_route_cmd, 
    DEFUN (show_ip_route, 
    829835        if (first) 
    830836          { 
    831837            vty_out (vty, SHOW_ROUTE_V4_HEADER, VTY_NEWLINE, VTY_NEWLINE, 
    832                      VTY_NEWLINE); 
     838                     VTY_NEWLINE, VTY_NEWLINE); 
    833839            first = 0; 
    834840          } 
    835841        vty_show_ip_route (vty, rn, rib); 
    DEFUN (show_ip_route_prefix_longer, 
    872878          if (first) 
    873879            { 
    874880              vty_out (vty, SHOW_ROUTE_V4_HEADER, VTY_NEWLINE, 
    875                        VTY_NEWLINE, VTY_NEWLINE); 
     881                       VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE); 
    876882              first = 0; 
    877883            } 
    878884          vty_show_ip_route (vty, rn, rib); 
    DEFUN (show_ip_route_supernets, 
    911917            if (first) 
    912918              { 
    913919                vty_out (vty, SHOW_ROUTE_V4_HEADER, VTY_NEWLINE, 
    914                          VTY_NEWLINE, VTY_NEWLINE); 
     920                         VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE); 
    915921                first = 0; 
    916922              } 
    917923            vty_show_ip_route (vty, rn, rib); 
    DEFUN (show_ip_route_supernets, 
    922928 
    923929DEFUN (show_ip_route_protocol, 
    924930       show_ip_route_protocol_cmd, 
    925        "show ip route (bgp|connected|isis|kernel|ospf|rip|static)", 
     931       "show ip route (bgp|connected|isis|kernel|ospf|rip|static|hsls|olsr|batman)", 
    926932       SHOW_STR 
    927933       IP_STR 
    928934       "IP routing table\n" 
    DEFUN (show_ip_route_protocol, 
    940946  struct rib *rib; 
    941947  int first = 1; 
    942948 
    943   if (strncmp (argv[0], "b", 1) == 0) 
     949  if (strncmp (argv[0], "bg", 2) == 0) 
    944950    type = ZEBRA_ROUTE_BGP; 
    945951  else if (strncmp (argv[0], "c", 1) == 0) 
    946952    type = ZEBRA_ROUTE_CONNECT; 
    947953  else if (strncmp (argv[0], "k", 1) ==0) 
    948954    type = ZEBRA_ROUTE_KERNEL; 
    949   else if (strncmp (argv[0], "o", 1) == 0) 
     955  else if (strncmp (argv[0], "os", 2) == 0) 
    950956    type = ZEBRA_ROUTE_OSPF; 
    951957  else if (strncmp (argv[0], "i", 1) == 0) 
    952958    type = ZEBRA_ROUTE_ISIS; 
    DEFUN (show_ip_route_protocol, 
    954960    type = ZEBRA_ROUTE_RIP; 
    955961  else if (strncmp (argv[0], "s", 1) == 0) 
    956962    type = ZEBRA_ROUTE_STATIC; 
     963  else if (strncmp (argv[0], "h", 1) == 0) 
     964    type = ZEBRA_ROUTE_HSLS; 
     965  else if (strncmp (argv[0], "ol", 2) == 0) 
     966    type = ZEBRA_ROUTE_OLSR; 
     967  else if (strncmp (argv[0], "ba", 2) == 0) 
     968    type = ZEBRA_ROUTE_BATMAN; 
    957969  else  
    958970    { 
    959971      vty_out (vty, "Unknown route type%s", VTY_NEWLINE); 
    DEFUN (show_ip_route_protocol, 
    971983        { 
    972984          if (first) 
    973985            { 
    974               vty_out (vty, SHOW_ROUTE_V4_HEADER, 
     986              vty_out (vty, SHOW_ROUTE_V4_HEADER, VTY_NEWLINE, 
    975987                       VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE); 
    976988              first = 0; 
    977989            } 
    vty_show_ipv6_route_detail (struct vty * 
    15601572      if (rib->type == ZEBRA_ROUTE_RIPNG 
    15611573          || rib->type == ZEBRA_ROUTE_OSPF6 
    15621574          || rib->type == ZEBRA_ROUTE_ISIS 
    1563           || rib->type == ZEBRA_ROUTE_BGP) 
     1575          || rib->type == ZEBRA_ROUTE_BGP 
     1576          || rib->type == ZEBRA_ROUTE_HSLS 
     1577          || rib->type == ZEBRA_ROUTE_OLSR 
     1578          || rib->type == ZEBRA_ROUTE_BATMAN) 
    15641579        { 
    15651580          time_t uptime; 
    15661581          struct tm *tm; 
    vty_show_ipv6_route (struct vty *vty, st 
    17391754      if (rib->type == ZEBRA_ROUTE_RIPNG 
    17401755          || rib->type == ZEBRA_ROUTE_OSPF6 
    17411756          || rib->type == ZEBRA_ROUTE_ISIS 
    1742           || rib->type == ZEBRA_ROUTE_BGP) 
     1757          || rib->type == ZEBRA_ROUTE_BGP 
     1758          || rib->type == ZEBRA_ROUTE_HSLS 
     1759          || rib->type == ZEBRA_ROUTE_OLSR 
     1760          || rib->type == ZEBRA_ROUTE_BATMAN) 
    17431761        { 
    17441762          time_t uptime; 
    17451763          struct tm *tm; 
    vty_show_ipv6_route (struct vty *vty, st 
    17661784    } 
    17671785} 
    17681786 
    1769 #define SHOW_ROUTE_V6_HEADER "Codes: K - kernel route, C - connected, S - static, R - RIPng, O - OSPFv3,%s       I - ISIS, B - BGP, * - FIB route.%s%s" 
     1787#define SHOW_ROUTE_V6_HEADER "Codes: K - kernel route, C - connected, S - static, R - RIPng, O - OSPFv3,%s       I - ISIS, B - BGP, H - HSLS, o - OLSR, b - BATMAN, * - FIB route.%s%s" 
    17701788 
    17711789DEFUN (show_ipv6_route, 
    17721790       show_ipv6_route_cmd, 
    DEFUN (show_ipv6_route_prefix_longer, 
    18421860 
    18431861DEFUN (show_ipv6_route_protocol, 
    18441862       show_ipv6_route_protocol_cmd, 
    1845        "show ipv6 route (bgp|connected|isis|kernel|ospf6|ripng|static)", 
     1863       "show ipv6 route (bgp|connected|isis|kernel|ospf6|ripng|static|hsls|olsr|batman)", 
    18461864       SHOW_STR 
    18471865       IP_STR 
    18481866       "IP routing table\n" 
    DEFUN (show_ipv6_route_protocol, 
    18601878  struct rib *rib; 
    18611879  int first = 1; 
    18621880 
    1863   if (strncmp (argv[0], "b", 1) == 0) 
     1881  if (strncmp (argv[0], "bg", 2) == 0) 
    18641882    type = ZEBRA_ROUTE_BGP; 
    18651883  else if (strncmp (argv[0], "c", 1) == 0) 
    18661884    type = ZEBRA_ROUTE_CONNECT; 
    18671885  else if (strncmp (argv[0], "k", 1) ==0) 
    18681886    type = ZEBRA_ROUTE_KERNEL; 
    1869   else if (strncmp (argv[0], "o", 1) == 0) 
     1887  else if (strncmp (argv[0], "os", 2) == 0) 
    18701888    type = ZEBRA_ROUTE_OSPF6; 
    18711889  else if (strncmp (argv[0], "i", 1) == 0) 
    18721890    type = ZEBRA_ROUTE_ISIS; 
    DEFUN (show_ipv6_route_protocol, 
    18741892    type = ZEBRA_ROUTE_RIPNG; 
    18751893  else if (strncmp (argv[0], "s", 1) == 0) 
    18761894    type = ZEBRA_ROUTE_STATIC; 
     1895  else if (strncmp (argv[0], "h", 1) == 0) 
     1896    type = ZEBRA_ROUTE_HSLS; 
     1897  else if (strncmp (argv[0], "ol", 2) == 0) 
     1898    type = ZEBRA_ROUTE_OLSR; 
     1899  else if (strncmp (argv[0], "ba", 2) == 0) 
     1900    type = ZEBRA_ROUTE_BATMAN; 
    18771901  else  
    18781902    { 
    18791903      vty_out (vty, "Unknown route type%s", VTY_NEWLINE); 
Note: See TracBrowser for help on using the repository browser.