mirror of
				https://gitlab.labs.nic.cz/labs/bird.git
				synced 2024-05-11 16:54:54 +00:00 
			
		
		
		
	Merge commit 'fcf22586' into mq-aggregator-for-v3
This commit is contained in:
		
							
								
								
									
										10
									
								
								nest/mpls.c
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								nest/mpls.c
									
									
									
									
									
								
							@@ -77,8 +77,7 @@
 | 
			
		||||
 *
 | 
			
		||||
 * TODO:
 | 
			
		||||
 *  - label range non-intersection check
 | 
			
		||||
 *  - better range reconfigurations (allow reduce ranges over unused labels)
 | 
			
		||||
 *  - protocols should do route refresh instead of resetart when reconfiguration
 | 
			
		||||
 *  - protocols should do route refresh instead of restart when reconfiguration
 | 
			
		||||
 *    requires changing labels (e.g. different label range)
 | 
			
		||||
 *  - registering static allocations
 | 
			
		||||
 *  - checking range in static allocations
 | 
			
		||||
@@ -349,9 +348,12 @@ mpls_find_range_(list *l, const char *name)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int
 | 
			
		||||
mpls_reconfigure_range(struct mpls_domain *m UNUSED, struct mpls_range *r, struct mpls_range_config *cf)
 | 
			
		||||
mpls_reconfigure_range(struct mpls_domain *m, struct mpls_range *r, struct mpls_range_config *cf)
 | 
			
		||||
{
 | 
			
		||||
  if ((cf->start > r->lo) || (cf->start + cf->length < r->hi))
 | 
			
		||||
  uint last = lmap_last_one_in_range(&m->labels, r->lo, r->hi);
 | 
			
		||||
  if (last == r->hi) last = 0;
 | 
			
		||||
 | 
			
		||||
  if ((cf->start > r->lo) || (cf->start + cf->length <= last))
 | 
			
		||||
    return 0;
 | 
			
		||||
 | 
			
		||||
  cf->range = r;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user