opensourcerouting · mwinter-osr · Jan 14, 2026 · Jan 14, 2026
diff --git a/ldpd/lde_lib.c b/ldpd/lde_lib.c
@@ -391,8 +391,7 @@ lde_kernel_update(struct fec *fec)
 			if (CHECK_FLAG(ldeconf->flags, F_LDPD_ENABLED)) {
 				iface = if_lookup(ldeconf,fnh->ifindex);
 				if (CHECK_FLAG(fnh->flags, F_FEC_NH_CONNECTED) ||
-				    iface ||
-				    fnh->route_type == ZEBRA_ROUTE_STATIC)
+				    iface)
 					UNSET_FLAG(fnh->flags, F_FEC_NH_NO_LDP);
 				else
 					SET_FLAG(fnh->flags, F_FEC_NH_NO_LDP);

diff --git a/tests/topotests/ldp_static_redistribute/ce1/frr.conf b/tests/topotests/ldp_static_redistribute/ce1/frr.conf
@@ -0,0 +1,12 @@
+! log file zebra.log
+!
+hostname ce1
+!
+interface ce1-eth0
+ ip address 172.16.1.1/24
+ no link-detect
+!
+ip forwarding
+!
+line vty
+!
diff --git a/tests/topotests/ldp_static_redistribute/ce2/frr.conf b/tests/topotests/ldp_static_redistribute/ce2/frr.conf
@@ -0,0 +1,18 @@
+! log file zebra.log
+!
+hostname ce2
+!
+interface lo
+ ip address 12.12.12.12/32
+!
+!
+interface ce2-eth0
+ ip address 172.16.1.2/24
+ no link-detect
+!
+ip forwarding
+!
+router ospf
+ network 0.0.0.0/0 area 0
+!
+line vty
diff --git a/tests/topotests/ldp_static_redistribute/ce2/show_ospf_route.ref b/tests/topotests/ldp_static_redistribute/ce2/show_ospf_route.ref
@@ -0,0 +1 @@
+{"12.12.12.12/32":{"routeType":"N","transit":false,"cost":0,"area":"0.0.0.0","nexthops":[{"ip":" ","directlyAttachedTo":"lo"}]},"172.16.1.0/24":{"routeType":"N","transit":true,"cost":10,"area":"0.0.0.0","nexthops":[{"ip":" ","directlyAttachedTo":"ce2-eth0"}]}}
diff --git a/tests/topotests/ldp_static_redistribute/ce3/frr.conf b/tests/topotests/ldp_static_redistribute/ce3/frr.conf
@@ -0,0 +1,12 @@
+log file zebra.log
+!
+hostname ce3
+!
+interface ce3-eth0
+ ip address 172.16.1.3/24
+ no link-detect
+!
+ip forwarding
+!
+line vty
+!
diff --git a/tests/topotests/ldp_static_redistribute/r1/frr.conf b/tests/topotests/ldp_static_redistribute/r1/frr.conf
@@ -0,0 +1,73 @@
+! log file zebra.log
+! log file isisd.log
+! log file ldpd.log
+!
+hostname r1
+!
+! debug zebra kernel
+! debug zebra rib detailed
+! debug zebra dplane detailed
+! debug zebra nht
+! debug zebra pseudowires
+! debug zebra mpls
+!
+! debug isis adj-packets
+! debug isis events
+! debug isis update-packets
+! debug isis ldp-sync
+!
+! debug mpls ldp zebra
+! debug mpls ldp event
+! debug mpls ldp errors
+! debug mpls ldp sync
+!
+!
+interface lo
+ ip address 1.1.1.1/32
+!
+interface r1-eth0
+ description to s1
+!
+interface r1-eth1
+ description to s4
+ ip address 10.0.1.1/24
+!
+ ip router isis 1
+ ipv6 router isis 1
+ isis network point-to-point
+ isis circuit-type level-1
+
+interface r1-eth2
+ description to s5
+ ip address 10.0.2.1/24
+!
+ ip router isis 1
+ ipv6 router isis 1
+ isis network point-to-point
+ isis circuit-type level-1
+
+ip forwarding
+!
+!
+mpls ldp
+ router-id 1.1.1.1
+ !
+ address-family ipv4
+  discovery transport-address 1.1.1.1
+  label local allocate host-routes
+  !
+  ttl-security disable
+  !
+  interface r1-eth1
+  !
+  interface r1-eth2
+  !
+ !
+!
+router isis 1
+ lsp-gen-interval 2
+ net 10.0000.0000.0000.0000.0000.0000.0000.0000.0001.00
+ metric-style wide
+ redistribute ipv4 connected level-1
+!
+!
diff --git a/tests/topotests/ldp_static_redistribute/r1/show_ip_route_ce2_1.ref b/tests/topotests/ldp_static_redistribute/r1/show_ip_route_ce2_1.ref
@@ -0,0 +1,34 @@
+{
+  "12.12.12.12/32":[
+    {
+      "prefix":"12.12.12.12/32",
+      "protocol":"isis",
+      "vrfId":0,
+      "vrfName":"default",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":10,
+      "installed":true,
+      "table":254,
+      "internalStatus":20,
+      "internalFlags":8,
+      "internalNextHopNum":1,
+      "internalNextHopActiveNum":1,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "ip":"10.0.1.2",
+          "afi":"ipv4",
+          "interfaceName":"r1-eth1",
+          "active":true,
+          "labels":[
+            3
+          ],
+          "weight":1
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/ldp_static_redistribute/r1/show_ip_route_ce2_2.ref b/tests/topotests/ldp_static_redistribute/r1/show_ip_route_ce2_2.ref
@@ -0,0 +1,34 @@
+{
+  "12.12.12.12/32":[
+    {
+      "prefix":"12.12.12.12/32",
+      "protocol":"isis",
+      "vrfId":0,
+      "vrfName":"default",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":20,
+      "installed":true,
+      "table":254,
+      "internalStatus":20,
+      "internalFlags":8,
+      "internalNextHopNum":1,
+      "internalNextHopActiveNum":1,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "ip":"10.0.2.3",
+          "afi":"ipv4",
+          "interfaceName":"r1-eth2",
+          "active":true,
+          "labels":[
+            18
+          ],
+          "weight":1
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/ldp_static_redistribute/r1/show_ip_route_ce2_3.ref b/tests/topotests/ldp_static_redistribute/r1/show_ip_route_ce2_3.ref
@@ -0,0 +1,34 @@
+{
+  "12.12.12.12/32":[
+    {
+      "prefix":"12.12.12.12/32",
+      "protocol":"isis",
+      "vrfId":0,
+      "vrfName":"default",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":20,
+      "installed":true,
+      "table":254,
+      "internalStatus":20,
+      "internalFlags":8,
+      "internalNextHopNum":1,
+      "internalNextHopActiveNum":1,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "ip":"10.0.2.3",
+          "afi":"ipv4",
+          "interfaceName":"r1-eth2",
+          "active":true,
+          "labels":[
+            18
+          ],
+          "weight":1
+        }
+      ]
+    }
+  ]
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"12.12.12.12/32":{"routeType":"N","transit":false,"cost":0,"area":"0.0.0.0","nexthops":[{"ip":" ","directlyAttachedTo":"lo"}]},"172.16.1.0/24":{"routeType":"N","transit":true,"cost":10,"area":"0.0.0.0","nexthops":[{"ip":" ","directlyAttachedTo":"ce2-eth0"}]}}