diff options
| author | Anton Degtyarev <adeg47@gmail.com> | 2018-11-14 06:14:04 +0300 | 
|---|---|---|
| committer | Anton Degtyarev <adeg47@gmail.com> | 2018-12-20 15:28:52 +0300 | 
| commit | 57592a53b5c02094f915a8444d40d2361d31e972 (patch) | |
| tree | 4948c69d7951e9dc0008e110f9d7d489a8c3f742 /zebra/zebra_errors.c | |
| parent | f944fe9b004be9c6076f2fed3004a85fc284cad1 (diff) | |
bgpd, zebra: auto assign labels from label pool to regular prefixes in BGP labeled unicast
This commit is the last missing piece to complete BGP LU support in bgpd. To this moment, bgpd (and zebra) supported auto label assignment only for prefixes leaked from VRFs to vpn and for MPLS SR prefixes. This adds auto label assignment to other routes types in bgpd. The following enhancements have been made:
* bgp_route.c:bgp_process_main_one() now sets implicit-null local_label to all local, aggregate and redistributed routes.
* bgp_route.c:bgp_process_main_one() now will request a label from the label pool for any prefix that loses the label for some reason (for example, when the static label assignment config is removed)
* bgp_label.c:bgp_reg_dereg_for_label() now requests labels from label pool for routes which have no associated label index
* zebra_mpls.c:zebra_mpls_fec_register() now expects both label and label_index from the calling function, one of which must be set to MPLS_INVALID_LABEL or MPLS_INVALID_LABEL_INDEX, based on this it will decide how to register the provided FEC.
Signed-off-by: Anton Degtyarev <anton@cumulusnetworks.com>
Diffstat (limited to 'zebra/zebra_errors.c')
| -rw-r--r-- | zebra/zebra_errors.c | 6 | 
1 files changed, 6 insertions, 0 deletions
diff --git a/zebra/zebra_errors.c b/zebra/zebra_errors.c index 32f6653832..d7c17829cd 100644 --- a/zebra/zebra_errors.c +++ b/zebra/zebra_errors.c @@ -86,6 +86,12 @@ static struct log_ref ferr_zebra_err[] = {  		.suggestion = "Notify a developer.",  	},  	{ +		.code = EC_ZEBRA_FEC_LABEL_INDEX_LABEL_CONFLICT, +		.title = "Refused to add FEC for MPLS client with both label index and label specified", +		.description = "A client requested a label binding for a new FEC specifying a label index and a label at the same time.", +		.suggestion = "Notify a developer.", +	}, +	{  		.code = EC_ZEBRA_FEC_RM_FAILED,  		.title = "Failed to remove FEC for MPLS client",  		.description = "Zebra was unable to find and remove a FEC in its internal table.",  | 
