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

[packages] quagga: Update to v0.99.18

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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.