Merge pull request #1579 from bingen/ldpd-fixes-3.0

ldpd: small improvements

Author: donaldsharp

ldpd/l2vpn.c

@@ -294,17 +294,26 @@ int
 l2vpn_pw_ok(struct l2vpn_pw *pw, struct fec_nh *fnh)
 {
 	/* check for a remote label */
-	if (fnh->remote_label == NO_LABEL)
+	if (fnh->remote_label == NO_LABEL) {
+		log_warnx("%s: pseudowire %s: no remote label", __func__,
+			  pw->ifname);
 		return (0);
+	}
 
 	/* MTUs must match */
-	if (pw->l2vpn->mtu != pw->remote_mtu)
+	if (pw->l2vpn->mtu != pw->remote_mtu) {
+		log_warnx("%s: pseudowire %s: MTU mismatch detected", __func__,
+			  pw->ifname);
 		return (0);
+	}
 
 	/* check pw status if applicable */
 	if ((pw->flags & F_PW_STATUSTLV) &&
-	    pw->remote_status != PW_FORWARDING)
+	    pw->remote_status != PW_FORWARDING) {
+		log_warnx("%s: pseudowire %s: remote end is down", __func__,
+			  pw->ifname);
 		return (0);
+	}
 
 	return (1);
 }
@@ -549,7 +558,8 @@ l2vpn_pw_ctl(pid_t pid)
 			    sizeof(pwctl.ifname));
 			pwctl.pwid = pw->pwid;
 			pwctl.lsr_id = pw->lsr_id;
-			if (pw->local_status == PW_FORWARDING &&
+			if (pw->enabled &&
+			    pw->local_status == PW_FORWARDING &&
 			    pw->remote_status == PW_FORWARDING)
 				pwctl.status = 1;
 

ldpd/lde.c

@@ -773,11 +773,12 @@ lde_send_change_klabel(struct fec_node *fn, struct fec_nh *fnh)
 		    sizeof(kr));
 		break;
 	case FEC_TYPE_PWID:
-		if (fn->local_label == NO_LABEL ||
+		pw = (struct l2vpn_pw *) fn->data;
+		if (!pw || fn->local_label == NO_LABEL ||
 		    fnh->remote_label == NO_LABEL)
 			return;
 
-		pw = (struct l2vpn_pw *) fn->data;
+		pw->enabled = true;
 		pw2zpw(pw, &zpw);
 		zpw.local_label = fn->local_label;
 		zpw.remote_label = fnh->remote_label;
@@ -824,6 +825,10 @@ lde_send_delete_klabel(struct fec_node *fn, struct fec_nh *fnh)
 		break;
 	case FEC_TYPE_PWID:
 		pw = (struct l2vpn_pw *) fn->data;
+		if (!pw)
+			return;
+
+		pw->enabled = false;
 		pw2zpw(pw, &zpw);
 		zpw.local_label = fn->local_label;
 		zpw.remote_label = fnh->remote_label;

ldpd/ldpd.h

@@ -410,6 +410,7 @@ struct l2vpn_pw {
 	uint32_t		 pwid;
 	char			 ifname[IF_NAMESIZE];
 	unsigned int		 ifindex;
+	bool			 enabled;
 	uint32_t		 remote_group;
 	uint16_t		 remote_mtu;
 	uint32_t		 local_status;

zebra/zebra_pw.c

@@ -71,7 +71,7 @@ struct zebra_pw *zebra_pw_add(struct zebra_vrf *zvrf, const char *ifname,
 	pw->protocol = protocol;
 	pw->vrf_id = zvrf_id(zvrf);
 	pw->client = client;
-	pw->status = PW_STATUS_UP;
+	pw->status = PW_STATUS_DOWN;
 	pw->local_label = MPLS_NO_LABEL;
 	pw->remote_label = MPLS_NO_LABEL;
 	pw->flags = F_PSEUDOWIRE_CWORD;