Ignore:
Timestamp:
2011-09-30T01:44:31+02:00 (5 years ago)
Author:
acinonyx
Message:

[packages] quagga: Update to v0.99.20

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/net/quagga/patches/120-quagga_manet.patch

    r27913 r28319  
    11--- a/bgpd/bgp_vty.c 
    22+++ b/bgpd/bgp_vty.c 
    3 @@ -8228,8 +8228,14 @@ bgp_str2route_type (int afi, const char 
     3@@ -8399,8 +8399,14 @@ bgp_str2route_type (int afi, const char 
    44        return ZEBRA_ROUTE_STATIC; 
    55       else if (strncmp (str, "r", 1) == 0) 
     
    1717   if (afi == AFI_IP6) 
    1818     { 
    19 @@ -8241,21 +8247,30 @@ bgp_str2route_type (int afi, const char 
     19@@ -8412,21 +8418,30 @@ bgp_str2route_type (int afi, const char 
    2020        return ZEBRA_ROUTE_STATIC; 
    2121       else if (strncmp (str, "r", 1) == 0) 
     
    5151   int type; 
    5252  
    53 @@ -8270,13 +8285,16 @@ DEFUN (bgp_redistribute_ipv4, 
     53@@ -8441,13 +8456,16 @@ DEFUN (bgp_redistribute_ipv4, 
    5454  
    5555 DEFUN (bgp_redistribute_ipv4_rmap, 
     
    6969        "Pointer to route-map entries\n") 
    7070 { 
    71 @@ -8295,13 +8313,16 @@ DEFUN (bgp_redistribute_ipv4_rmap, 
     71@@ -8466,13 +8484,16 @@ DEFUN (bgp_redistribute_ipv4_rmap, 
    7272  
    7373 DEFUN (bgp_redistribute_ipv4_metric, 
     
    8787        "Default metric\n") 
    8888 { 
    89 @@ -8322,13 +8343,16 @@ DEFUN (bgp_redistribute_ipv4_metric, 
     89@@ -8493,13 +8514,16 @@ DEFUN (bgp_redistribute_ipv4_metric, 
    9090  
    9191 DEFUN (bgp_redistribute_ipv4_rmap_metric, 
     
    105105        "Pointer to route-map entries\n" 
    106106        "Metric for redistributed routes\n" 
    107 @@ -8352,13 +8376,16 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric 
     107@@ -8523,13 +8547,16 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric 
    108108  
    109109 DEFUN (bgp_redistribute_ipv4_metric_rmap, 
     
    123123        "Default metric\n" 
    124124        "Route map reference\n" 
    125 @@ -8382,14 +8409,17 @@ DEFUN (bgp_redistribute_ipv4_metric_rmap 
     125@@ -8553,14 +8580,17 @@ DEFUN (bgp_redistribute_ipv4_metric_rmap 
    126126  
    127127 DEFUN (no_bgp_redistribute_ipv4, 
     
    143143   int type; 
    144144  
    145 @@ -8405,7 +8435,7 @@ DEFUN (no_bgp_redistribute_ipv4, 
     145@@ -8576,7 +8606,7 @@ DEFUN (no_bgp_redistribute_ipv4, 
    146146  
    147147 DEFUN (no_bgp_redistribute_ipv4_rmap, 
     
    152152        "Redistribute information from another routing protocol\n" 
    153153        "Connected\n" 
    154 @@ -8413,6 +8443,9 @@ DEFUN (no_bgp_redistribute_ipv4_rmap, 
     154@@ -8584,6 +8614,9 @@ DEFUN (no_bgp_redistribute_ipv4_rmap, 
    155155        "Open Shurtest Path First (OSPF)\n" 
    156156        "Routing Information Protocol (RIP)\n" 
     
    162162        "Pointer to route-map entries\n") 
    163163 { 
    164 @@ -8431,7 +8464,7 @@ DEFUN (no_bgp_redistribute_ipv4_rmap, 
     164@@ -8602,7 +8635,7 @@ DEFUN (no_bgp_redistribute_ipv4_rmap, 
    165165  
    166166 DEFUN (no_bgp_redistribute_ipv4_metric, 
     
    171171        "Redistribute information from another routing protocol\n" 
    172172        "Connected\n" 
    173 @@ -8439,6 +8472,9 @@ DEFUN (no_bgp_redistribute_ipv4_metric, 
     173@@ -8610,6 +8643,9 @@ DEFUN (no_bgp_redistribute_ipv4_metric, 
    174174        "Open Shurtest Path First (OSPF)\n" 
    175175        "Routing Information Protocol (RIP)\n" 
     
    181181        "Default metric\n") 
    182182 { 
    183 @@ -8457,7 +8493,7 @@ DEFUN (no_bgp_redistribute_ipv4_metric, 
     183@@ -8628,7 +8664,7 @@ DEFUN (no_bgp_redistribute_ipv4_metric, 
    184184  
    185185 DEFUN (no_bgp_redistribute_ipv4_rmap_metric, 
     
    190190        "Redistribute information from another routing protocol\n" 
    191191        "Connected\n" 
    192 @@ -8465,6 +8501,9 @@ DEFUN (no_bgp_redistribute_ipv4_rmap_met 
     192@@ -8636,6 +8672,9 @@ DEFUN (no_bgp_redistribute_ipv4_rmap_met 
    193193        "Open Shurtest Path First (OSPF)\n" 
    194194        "Routing Information Protocol (RIP)\n" 
     
    200200        "Pointer to route-map entries\n" 
    201201        "Metric for redistributed routes\n" 
    202 @@ -8486,7 +8525,7 @@ DEFUN (no_bgp_redistribute_ipv4_rmap_met 
     202@@ -8657,7 +8696,7 @@ DEFUN (no_bgp_redistribute_ipv4_rmap_met 
    203203  
    204204 ALIAS (no_bgp_redistribute_ipv4_rmap_metric, 
     
    209209        "Redistribute information from another routing protocol\n" 
    210210        "Connected\n" 
    211 @@ -8494,6 +8533,9 @@ ALIAS (no_bgp_redistribute_ipv4_rmap_met 
     211@@ -8665,6 +8704,9 @@ ALIAS (no_bgp_redistribute_ipv4_rmap_met 
    212212        "Open Shurtest Path First (OSPF)\n" 
    213213        "Routing Information Protocol (RIP)\n" 
     
    219219        "Default metric\n" 
    220220        "Route map reference\n" 
    221 @@ -8502,13 +8544,16 @@ ALIAS (no_bgp_redistribute_ipv4_rmap_met 
     221@@ -8673,13 +8715,16 @@ ALIAS (no_bgp_redistribute_ipv4_rmap_met 
    222222 #ifdef HAVE_IPV6 
    223223 DEFUN (bgp_redistribute_ipv6, 
     
    238238   int type; 
    239239  
    240 @@ -8524,13 +8569,16 @@ DEFUN (bgp_redistribute_ipv6, 
     240@@ -8695,13 +8740,16 @@ DEFUN (bgp_redistribute_ipv6, 
    241241  
    242242 DEFUN (bgp_redistribute_ipv6_rmap, 
     
    256256        "Pointer to route-map entries\n") 
    257257 { 
    258 @@ -8549,13 +8597,16 @@ DEFUN (bgp_redistribute_ipv6_rmap, 
     258@@ -8720,13 +8768,16 @@ DEFUN (bgp_redistribute_ipv6_rmap, 
    259259  
    260260 DEFUN (bgp_redistribute_ipv6_metric, 
     
    274274        "Default metric\n") 
    275275 { 
    276 @@ -8576,13 +8627,16 @@ DEFUN (bgp_redistribute_ipv6_metric, 
     276@@ -8747,13 +8798,16 @@ DEFUN (bgp_redistribute_ipv6_metric, 
    277277  
    278278 DEFUN (bgp_redistribute_ipv6_rmap_metric, 
     
    292292        "Pointer to route-map entries\n" 
    293293        "Metric for redistributed routes\n" 
    294 @@ -8606,13 +8660,16 @@ DEFUN (bgp_redistribute_ipv6_rmap_metric 
     294@@ -8777,13 +8831,16 @@ DEFUN (bgp_redistribute_ipv6_rmap_metric 
    295295  
    296296 DEFUN (bgp_redistribute_ipv6_metric_rmap, 
     
    310310        "Default metric\n" 
    311311        "Route map reference\n" 
    312 @@ -8636,14 +8693,17 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap 
     312@@ -8807,14 +8864,17 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap 
    313313  
    314314 DEFUN (no_bgp_redistribute_ipv6, 
     
    330330   int type; 
    331331  
    332 @@ -8659,7 +8719,7 @@ DEFUN (no_bgp_redistribute_ipv6, 
     332@@ -8830,7 +8890,7 @@ DEFUN (no_bgp_redistribute_ipv6, 
    333333  
    334334 DEFUN (no_bgp_redistribute_ipv6_rmap, 
     
    339339        "Redistribute information from another routing protocol\n" 
    340340        "Connected\n" 
    341 @@ -8667,6 +8727,9 @@ DEFUN (no_bgp_redistribute_ipv6_rmap, 
     341@@ -8838,6 +8898,9 @@ DEFUN (no_bgp_redistribute_ipv6_rmap, 
    342342        "Open Shurtest Path First (OSPFv3)\n" 
    343343        "Routing Information Protocol (RIPng)\n" 
     
    349349        "Pointer to route-map entries\n") 
    350350 { 
    351 @@ -8685,7 +8748,7 @@ DEFUN (no_bgp_redistribute_ipv6_rmap, 
     351@@ -8856,7 +8919,7 @@ DEFUN (no_bgp_redistribute_ipv6_rmap, 
    352352  
    353353 DEFUN (no_bgp_redistribute_ipv6_metric, 
     
    358358        "Redistribute information from another routing protocol\n" 
    359359        "Connected\n" 
    360 @@ -8693,6 +8756,9 @@ DEFUN (no_bgp_redistribute_ipv6_metric, 
     360@@ -8864,6 +8927,9 @@ DEFUN (no_bgp_redistribute_ipv6_metric, 
    361361        "Open Shurtest Path First (OSPFv3)\n" 
    362362        "Routing Information Protocol (RIPng)\n" 
     
    368368        "Default metric\n") 
    369369 { 
    370 @@ -8711,7 +8777,7 @@ DEFUN (no_bgp_redistribute_ipv6_metric, 
     370@@ -8882,7 +8948,7 @@ DEFUN (no_bgp_redistribute_ipv6_metric, 
    371371  
    372372 DEFUN (no_bgp_redistribute_ipv6_rmap_metric, 
     
    377377        "Redistribute information from another routing protocol\n" 
    378378        "Connected\n" 
    379 @@ -8719,6 +8785,9 @@ DEFUN (no_bgp_redistribute_ipv6_rmap_met 
     379@@ -8890,6 +8956,9 @@ DEFUN (no_bgp_redistribute_ipv6_rmap_met 
    380380        "Open Shurtest Path First (OSPFv3)\n" 
    381381        "Routing Information Protocol (RIPng)\n" 
     
    387387        "Pointer to route-map entries\n" 
    388388        "Metric for redistributed routes\n" 
    389 @@ -8740,7 +8809,7 @@ DEFUN (no_bgp_redistribute_ipv6_rmap_met 
     389@@ -8911,7 +8980,7 @@ DEFUN (no_bgp_redistribute_ipv6_rmap_met 
    390390  
    391391 ALIAS (no_bgp_redistribute_ipv6_rmap_metric, 
     
    396396        "Redistribute information from another routing protocol\n" 
    397397        "Connected\n" 
    398 @@ -8748,6 +8817,9 @@ ALIAS (no_bgp_redistribute_ipv6_rmap_met 
     398@@ -8919,6 +8988,9 @@ ALIAS (no_bgp_redistribute_ipv6_rmap_met 
    399399        "Open Shurtest Path First (OSPFv3)\n" 
    400400        "Routing Information Protocol (RIPng)\n" 
     
    408408--- a/lib/log.c 
    409409+++ b/lib/log.c 
    410 @@ -838,6 +838,8 @@ static const struct zebra_desc_table rou 
     410@@ -837,6 +837,8 @@ static const struct zebra_desc_table rou 
    411411   DESC_ENTRY   (ZEBRA_ROUTE_ISIS,      "isis",         'I' ), 
    412412   DESC_ENTRY   (ZEBRA_ROUTE_BGP,       "bgp",          'B' ), 
     
    445445--- a/lib/zebra.h 
    446446+++ b/lib/zebra.h 
    447 @@ -441,7 +441,9 @@ struct in_pktinfo 
     447@@ -437,7 +437,9 @@ struct in_pktinfo 
    448448 #define ZEBRA_ROUTE_ISIS                 8 
    449449 #define ZEBRA_ROUTE_BGP                  9 
     
    885885--- a/zebra/rt_netlink.c 
    886886+++ b/zebra/rt_netlink.c 
    887 @@ -1488,6 +1488,9 @@ netlink_route_multipath (int cmd, struct 
     887@@ -1494,6 +1494,9 @@ netlink_route_multipath (int cmd, struct 
    888888                         addattr_l (&req.n, sizeof req, RTA_PREFSRC, 
    889889                                 &nexthop->src.ipv4, bytelen); 
Note: See TracChangeset for help on using the changeset viewer.