Changeset 26360


Ignore:
Timestamp:
2011-03-30T11:27:13+02:00 (7 years ago)
Author:
acinonyx
Message:

[packages] quagga: Update to v0.99.18

Location:
packages/net/quagga
Files:
3 added
6 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • packages/net/quagga/Makefile

    r26144 r26360  
    1515  PATCH_DIR:=./patches-old 
    1616else 
    17   PKG_VERSION:=0.99.17 
    18   PKG_RELEASE:=7 
    19   PKG_MD5SUM:=37b9022adca04b03863d2d79787e643f 
     17  PKG_VERSION:=0.99.18 
     18  PKG_RELEASE:=1 
     19  PKG_MD5SUM:=59e306e93a4a1ce16760f20e9075d473 
    2020endif 
    2121 
  • packages/net/quagga/patches/002-quagga_manet.patch

    r23464 r26360  
    408408--- a/lib/log.c 
    409409+++ b/lib/log.c 
    410 @@ -835,6 +835,8 @@ static const struct zebra_desc_table rou 
     410@@ -838,6 +838,8 @@ static const struct zebra_desc_table rou 
    411411   DESC_ENTRY   (ZEBRA_ROUTE_ISIS,      "isis",         'I' ), 
    412412   DESC_ENTRY   (ZEBRA_ROUTE_BGP,       "bgp",          'B' ), 
  • packages/net/quagga/patches/160-pgbgp.patch

    r24957 r26360  
    24472447+  return 0; 
    24482448+} 
    2449 + 
    2450 +/*! --------------- Edge Detection ------------------ !*/ 
    24512449--- /dev/null 
    24522450+++ b/bgpd/bgp_pgbgp.h 
     
    27682766   if (new->attr->extra) 
    27692767     new_weight = new->attr->extra->weight; 
    2770 @@ -1554,6 +1562,10 @@ bgp_process_main (struct work_queue *wq, 
     2768@@ -1508,6 +1516,10 @@ bgp_process_main (struct work_queue *wq, 
    27712769       bgp_info_unset_flag (rn, new_select, BGP_INFO_ATTR_CHANGED); 
    27722770     } 
     
    27792777   /* Check each BGP peer. */ 
    27802778   for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer)) 
    2781 @@ -1878,6 +1890,11 @@ bgp_update_rsclient (struct peer *rsclie 
     2779@@ -1831,6 +1843,11 @@ bgp_update_rsclient (struct peer *rsclie 
    27822780   /* If the update is implicit withdraw. */ 
    27832781   if (ri) 
     
    27912789  
    27922790       /* Same attribute comes in. */ 
    2793 @@ -2309,6 +2326,11 @@ bgp_update_main (struct peer *peer, stru 
     2791@@ -2262,6 +2279,11 @@ bgp_update_main (struct peer *peer, stru 
    27942792   /* Increment prefix */ 
    27952793   bgp_aggregate_increment (bgp, p, new, afi, safi); 
     
    28032801   bgp_info_add (rn, new); 
    28042802    
    2805 @@ -5648,6 +5670,20 @@ enum bgp_display_type 
     2803@@ -5474,6 +5496,20 @@ enum bgp_display_type 
    28062804 static void 
    28072805 route_vty_short_status_out (struct vty *vty, struct bgp_info *binfo) 
     
    28242822   if (CHECK_FLAG (binfo->flags, BGP_INFO_REMOVED)) 
    28252823     vty_out (vty, "R"); 
    2826 @@ -6152,6 +6188,7 @@ route_vty_out_detail (struct vty *vty, s 
     2824@@ -5974,6 +6010,7 @@ route_vty_out_detail (struct vty *vty, s 
    28272825 }   
    28282826  
     
    28332831 #define BGP_SHOW_HEADER "   Network          Next Hop            Metric LocPrf Weight Path%s" 
    28342832 #define BGP_SHOW_DAMP_HEADER "   Network          From             Reuse    Path%s" 
    2835 @@ -6183,7 +6220,8 @@ enum bgp_show_type 
     2833@@ -6005,7 +6042,8 @@ enum bgp_show_type 
    28362834   bgp_show_type_flap_route_map, 
    28372835   bgp_show_type_flap_neighbor, 
     
    28432841  
    28442842 static int 
    2845 @@ -6350,11 +6388,17 @@ bgp_show_table (struct vty *vty, struct  
     2843@@ -6172,11 +6210,17 @@ bgp_show_table (struct vty *vty, struct 
    28462844                    || CHECK_FLAG (ri->flags, BGP_INFO_HISTORY)) 
    28472845                  continue; 
     
    28612859                if (type == bgp_show_type_dampend_paths 
    28622860                    || type == bgp_show_type_damp_neighbor) 
    2863 @@ -6432,6 +6476,7 @@ bgp_show (struct vty *vty, struct bgp *b 
     2861@@ -6254,6 +6298,7 @@ bgp_show (struct vty *vty, struct bgp *b 
    28642862   return bgp_show_table (vty, table, &bgp->router_id, type, output_arg); 
    28652863 } 
     
    28692867 static void 
    28702868 route_vty_out_detail_header (struct vty *vty, struct bgp *bgp, 
    2871 @@ -11234,6 +11279,64 @@ DEFUN (bgp_damp_set, 
     2869@@ -11063,6 +11108,64 @@ DEFUN (bgp_damp_set, 
    28722870                          half, reuse, suppress, max); 
    28732871 } 
     
    29342932        bgp_damp_set2_cmd, 
    29352933        "bgp dampening <1-45>", 
    2936 @@ -11283,6 +11386,19 @@ DEFUN (show_ip_bgp_dampened_paths, 
     2934@@ -11112,6 +11215,19 @@ DEFUN (show_ip_bgp_dampened_paths, 
    29372935                    NULL); 
    29382936 } 
     
    29542952        show_ip_bgp_flap_statistics_cmd, 
    29552953        "show ip bgp flap-statistics", 
    2956 @@ -11828,6 +11944,7 @@ bgp_route_init (void) 
     2954@@ -11629,6 +11745,7 @@ bgp_route_init (void) 
    29572955   install_element (VIEW_NODE, &show_ip_bgp_neighbor_received_prefix_filter_cmd); 
    29582956   install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbor_received_prefix_filter_cmd); 
     
    29622960   install_element (VIEW_NODE, &show_ip_bgp_flap_address_cmd); 
    29632961   install_element (VIEW_NODE, &show_ip_bgp_flap_prefix_cmd); 
    2964 @@ -11935,6 +12052,7 @@ bgp_route_init (void) 
     2962@@ -11736,6 +11853,7 @@ bgp_route_init (void) 
    29652963   install_element (ENABLE_NODE, &show_ip_bgp_neighbor_received_prefix_filter_cmd); 
    29662964   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_received_prefix_filter_cmd); 
     
    29702968   install_element (ENABLE_NODE, &show_ip_bgp_flap_address_cmd); 
    29712969   install_element (ENABLE_NODE, &show_ip_bgp_flap_prefix_cmd); 
    2972 @@ -12293,6 +12411,10 @@ bgp_route_init (void) 
    2973    install_element (BGP_IPV4_NODE, &bgp_damp_set3_cmd); 
     2970@@ -12093,6 +12211,10 @@ bgp_route_init (void) 
    29742971   install_element (BGP_IPV4_NODE, &bgp_damp_unset_cmd); 
    29752972   install_element (BGP_IPV4_NODE, &bgp_damp_unset2_cmd); 
    2976 +   
     2973    
    29772974+  install_element (BGP_NODE, &bgp_pgbgp_cmd); 
    29782975+  install_element (BGP_NODE, &bgp_pgbgp_arg_cmd); 
    29792976+  install_element (BGP_NODE, &bgp_pgbgp_unset_cmd); 
    2980  } 
    2981   
    2982  void 
     2977+ 
     2978   /* Deprecated AS-Pathlimit commands */ 
     2979   install_element (BGP_NODE, &bgp_network_ttl_cmd); 
     2980   install_element (BGP_NODE, &bgp_network_mask_ttl_cmd); 
    29832981--- a/bgpd/bgp_route.h 
    29842982+++ b/bgpd/bgp_route.h 
     
    29992997   /* BGP route type.  This can be static, RIP, OSPF, BGP etc.  */ 
    30002998   u_char type; 
    3001 @@ -123,7 +128,7 @@ struct bgp_static 
     2999@@ -120,7 +125,7 @@ struct bgp_static 
    30023000  
    30033001 /* Flags which indicate a route is unuseable in some form */ 
     
    30103008--- a/bgpd/bgp_table.h 
    30113009+++ b/bgpd/bgp_table.h 
    3012 @@ -63,6 +63,8 @@ struct bgp_node 
     3010@@ -65,6 +65,8 @@ struct bgp_node 
    30133011  
    3014    unsigned int lock; 
     3012   int lock; 
    30153013  
    30163014+  struct bgp_pgbgp_hist *hist; 
     
    30213019--- a/bgpd/bgpd.h 
    30223020+++ b/bgpd/bgpd.h 
    3023 @@ -121,6 +121,7 @@ struct bgp 
     3021@@ -123,6 +123,7 @@ struct bgp 
    30243022   /* BGP Per AF flags */ 
    30253023   u_int16_t af_flags[AFI_MAX][SAFI_MAX]; 
     
    30313029--- a/lib/hash.c 
    30323030+++ b/lib/hash.c 
    3033 @@ -156,6 +156,35 @@ hash_iterate (struct hash *hash, 
     3031@@ -166,6 +166,35 @@ hash_iterate (struct hash *hash, 
    30343032       } 
    30353033 } 
     
    30693067--- a/lib/hash.h 
    30703068+++ b/lib/hash.h 
    3071 @@ -66,7 +66,8 @@ extern void *hash_release (struct hash *, void *); 
     3069@@ -66,7 +66,8 @@ extern void *hash_release (struct hash * 
    30723070  
    30733071 extern void hash_iterate (struct hash *,  
     
    30813079--- a/lib/memtypes.c 
    30823080+++ b/lib/memtypes.c 
    3083 @@ -147,6 +147,15 @@ struct memory_list memory_list_bgp[] = 
     3081@@ -149,6 +149,15 @@ struct memory_list memory_list_bgp[] = 
    30843082   { MTYPE_PEER_UPDATE_SOURCE,  "BGP peer update interface"     }, 
    30853083   { MTYPE_BGP_DAMP_INFO,       "Dampening info"                }, 
  • packages/net/quagga/patches/161-pgbgp-addon.patch

    r24957 r26360  
    2525--- a/bgpd/bgp_pgbgp.c 
    2626+++ b/bgpd/bgp_pgbgp.c 
    27 @@ -225,7 +225,7 @@ static void 
     27@@ -227,7 +227,7 @@ static void 
    2828 edge_neighbor_iterator (struct hash_backet *backet, struct nsearch *pns) 
    2929 { 
     
    3434     { 
    3535       struct vty *vty = pns->pvty; 
    36 @@ -252,13 +252,39 @@ bgp_pgbgp_stats_neighbors (struct vty *vty, afi_t afi, safi_t safi, as_t asn) 
     36@@ -254,13 +254,39 @@ bgp_pgbgp_stats_neighbors (struct vty *v 
    3737   return CMD_SUCCESS; 
    3838 } 
     
    7474   if (bgp == NULL) 
    7575     return CMD_WARNING; 
    76 @@ -267,28 +293,22 @@ bgp_pgbgp_stats_origins (struct vty *vty, afi_t afi, safi_t safi, 
     76@@ -269,28 +295,22 @@ bgp_pgbgp_stats_origins (struct vty *vty 
    7777   table = bgp->rib[afi][safi]; 
    7878   if (table == NULL) 
     
    115115 } 
    116116  
    117 @@ -375,7 +395,7 @@ bgp_pgbgp_stats (struct vty *vty, afi_t afi, safi_t safi) 
     117@@ -377,7 +397,7 @@ bgp_pgbgp_stats (struct vty *vty, afi_t 
    118118 DEFUN (show_ip_bgp_pgbgp, 
    119119        show_ip_bgp_pgbgp_cmd, 
     
    124124   return bgp_pgbgp_stats (vty, AFI_IP, SAFI_UNICAST); 
    125125 } 
    126 @@ -383,29 +403,46 @@ DEFUN (show_ip_bgp_pgbgp, 
     126@@ -385,29 +405,46 @@ DEFUN (show_ip_bgp_pgbgp, 
    127127 DEFUN (show_ip_bgp_pgbgp_neighbors, 
    128128        show_ip_bgp_pgbgp_neighbors_cmd, 
     
    181181  
    182182 /*! --------------- VTY (others exist in bgp_route.c)  ------------------ !*/ 
    183 @@ -747,12 +784,19 @@ bgp_pgbgp_enable (struct bgp *bgp, afi_t afi, safi_t safi, 
     183@@ -749,12 +786,19 @@ bgp_pgbgp_enable (struct bgp *bgp, afi_t 
    184184   pgbgp->lastgc = time (NULL); 
    185185   pgbgp->lastStore = time (NULL); 
     
    205205--- a/bgpd/bgp_route.c 
    206206+++ b/bgpd/bgp_route.c 
    207 @@ -5670,20 +5670,6 @@ enum bgp_display_type 
     207@@ -5496,20 +5496,6 @@ enum bgp_display_type 
    208208 static void 
    209209 route_vty_short_status_out (struct vty *vty, struct bgp_info *binfo) 
     
    226226   if (CHECK_FLAG (binfo->flags, BGP_INFO_REMOVED)) 
    227227     vty_out (vty, "R"); 
    228 @@ -5699,6 +5685,17 @@ route_vty_short_status_out (struct vty * 
     228@@ -5525,6 +5511,17 @@ route_vty_short_status_out (struct vty * 
    229229   /* Selected */ 
    230230   if (CHECK_FLAG (binfo->flags, BGP_INFO_HISTORY)) 
     
    244244     vty_out (vty, "d"); 
    245245   else if (CHECK_FLAG (binfo->flags, BGP_INFO_SELECTED)) 
    246 @@ -6180,15 +6177,31 @@ route_vty_out_detail (struct vty *vty, s 
     246@@ -5998,7 +5995,22 @@ route_vty_out_detail (struct vty *vty, s 
    247247       if (binfo->extra && binfo->extra->damp_info) 
    248248        bgp_damp_info_vty (vty, binfo); 
     
    265265+ 
    266266+      /* Line 9 display Uptime */       
    267        time_t tbuf = time(NULL) - (bgp_clock() - binfo->uptime); 
     267 #ifdef HAVE_CLOCK_MONOTONIC 
     268       tbuf = time(NULL) - (bgp_clock() - binfo->uptime); 
    268269       vty_out (vty, "      Last update: %s", ctime(&tbuf)); 
    269      } 
     270@@ -6009,8 +6021,9 @@ route_vty_out_detail (struct vty *vty, s 
    270271   vty_out (vty, "%s", VTY_NEWLINE); 
    271272 }   
     
    280281 #define BGP_SHOW_HEADER "   Network          Next Hop            Metric LocPrf Weight Path%s" 
    281282 #define BGP_SHOW_DAMP_HEADER "   Network          From             Reuse    Path%s" 
    282 @@ -6397,8 +6410,7 @@ bgp_show_table (struct vty *vty, struct  
     283@@ -6219,8 +6232,7 @@ bgp_show_table (struct vty *vty, struct 
    283284            if (header) 
    284285              { 
     
    290291                if (type == bgp_show_type_dampend_paths 
    291292                    || type == bgp_show_type_damp_neighbor) 
    292 @@ -9663,7 +9675,7 @@ show_adj_route (struct vty *vty, struct  
     293@@ -9492,7 +9504,7 @@ show_adj_route (struct vty *vty, struct 
    293294                          PEER_STATUS_DEFAULT_ORIGINATE)) 
    294295     { 
     
    299300  
    300301       vty_out (vty, "Originating default network 0.0.0.0%s%s", 
    301 @@ -9680,7 +9692,7 @@ show_adj_route (struct vty *vty, struct  
     302@@ -9509,7 +9521,7 @@ show_adj_route (struct vty *vty, struct 
    302303              if (header1) 
    303304                { 
     
    308309                  header1 = 0; 
    309310                } 
    310 @@ -9704,7 +9716,7 @@ show_adj_route (struct vty *vty, struct  
     311@@ -9533,7 +9545,7 @@ show_adj_route (struct vty *vty, struct 
    311312              if (header1) 
    312313                { 
Note: See TracChangeset for help on using the changeset viewer.