ospfd: Remove ORIGINAL_CODING check

We have a bunch of places that look for ORIGINAL_CODING.  There is
nothing in our configure system to define this value and a quick
git blame shows this code as being original to the import a very
very long time ago.  This is dead code, removing.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

1 files changed, 9 insertions, 45 deletions

diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c
index 1d85a04984..a72caa8415 100644
--- a/ospfd/ospf_flood.c
+++ b/ospfd/ospf_flood.c
@@ -454,13 +454,8 @@ static int ospf_flood_through_interface(struct ospf_interface *oi,
 			}
 		}
 
-/* If the new LSA was received from this neighbor,
-   examine the next neighbor. */
-#ifdef ORIGINAL_CODING
-		if (inbr)
-			if (IPV4_ADDR_SAME(&inbr->router_id, &onbr->router_id))
-				continue;
-#else  /* ORIGINAL_CODING */
+ /* If the new LSA was received from this neighbor,
+    examine the next neighbor. */
 		if (inbr) {
 			/*
 			 * Triggered by LSUpd message parser "ospf_ls_upd ()".
@@ -486,7 +481,6 @@ static int ospf_flood_through_interface(struct ospf_interface *oi,
 				continue;
 			}
 		}
-#endif /* ORIGINAL_CODING */
 
 		/* Add the new LSA to the Link state retransmission list
 		   for the adjacency. The LSA will be retransmitted
@@ -691,43 +685,14 @@ int ospf_flood_through(struct ospf *ospf, struct ospf_neighbor *inbr,
 {
 	int lsa_ack_flag = 0;
 
-/* Type-7 LSA's for NSSA are flooded throughout the AS here, and
-   upon return are updated in the LSDB for Type-7's.  Later,
-   re-fresh will re-send them (and also, if ABR, packet code will
-   translate to Type-5's)
+	/* Type-7 LSA's for NSSA are flooded throughout the AS here, and
+	   upon return are updated in the LSDB for Type-7's.  Later,
+	   re-fresh will re-send them (and also, if ABR, packet code will
+	   translate to Type-5's)
 
-   As usual, Type-5 LSA's (if not DISCARDED because we are STUB or
-   NSSA) are flooded throughout the AS, and are updated in the
-   global table.  */
-#ifdef ORIGINAL_CODING
-	switch (lsa->data->type) {
-	case OSPF_ROUTER_LSA:
-	case OSPF_NETWORK_LSA:
-	case OSPF_SUMMARY_LSA:
-	case OSPF_ASBR_SUMMARY_LSA:
-	case OSPF_OPAQUE_LINK_LSA: /* ospf_flood_through_interface ? */
-	case OSPF_OPAQUE_AREA_LSA:
-		lsa_ack_flag =
-			ospf_flood_through_area(inbr->oi->area, inbr, lsa);
-		break;
-	case OSPF_AS_EXTERNAL_LSA: /* Type-5 */
-	case OSPF_OPAQUE_AS_LSA:
-		lsa_ack_flag = ospf_flood_through_as(ospf, inbr, lsa);
-		break;
-	/* Type-7 Only received within NSSA, then flooded */
-	case OSPF_AS_NSSA_LSA:
-		/* Any P-bit was installed with the Type-7. */
-		lsa_ack_flag =
-			ospf_flood_through_area(inbr->oi->area, inbr, lsa);
-
-		if (IS_DEBUG_OSPF_NSSA)
-			zlog_debug(
-				"ospf_flood_through: LOCAL NSSA FLOOD of Type-7.");
-		break;
-	default:
-		break;
-	}
-#else  /* ORIGINAL_CODING */
+	   As usual, Type-5 LSA's (if not DISCARDED because we are STUB or
+	   NSSA) are flooded throughout the AS, and are updated in the
+	   global table.  */
 	/*
 	 * At the common sub-sub-function "ospf_flood_through_interface()",
 	 * a parameter "inbr" will be used to distinguish the called context
@@ -757,7 +722,6 @@ int ospf_flood_through(struct ospf *ospf, struct ospf_neighbor *inbr,
 		lsa_ack_flag = ospf_flood_through_area(lsa->area, inbr, lsa);
 		break;
 	}
-#endif /* ORIGINAL_CODING */
 
 	return (lsa_ack_flag);
 }