From: Chirag Shah <chirag@cumulusnetworks.com>
Date: Fri, 8 Sep 2017 21:59:12 +0000 (-0700)
Subject: ospfd: OSPFv2 VRF fixesI
X-Git-Tag: frr-4.0-dev~249^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=35955c14c2a553b567fc479277b8008028ae2a1e;p=mirror%2Ffrr.git

ospfd: OSPFv2 VRF fixesI

Fix ospf interface running config to display vrf
fix clang warnings

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
---

diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index f883c034ca..6ac7bdc2b4 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -1787,6 +1787,8 @@ static void ospf_ls_upd(struct ospf *ospf, struct ip *iph,
 	 */
 	lsas = ospf_ls_upd_list_lsa(nbr, s, oi, size);
 
+	if (lsas == NULL)
+		return;
 #define DISCARD_LSA(L, N)                                                              \
 	{                                                                              \
 		if (IS_DEBUG_OSPF_EVENT)                                               \
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index ebc684f3d3..a79a1ce9a4 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -6395,13 +6395,14 @@ DEFUN (ip_ospf_cost,
 {
 	VTY_DECLVAR_CONTEXT(interface, ifp);
 	int idx = 0;
-	u_int32_t cost;
+	u_int32_t cost = OSPF_OUTPUT_COST_DEFAULT;
 	struct in_addr addr;
 	struct ospf_if_params *params;
 	params = IF_DEF_PARAMS(ifp);
 
 	// get arguments
 	char *coststr = NULL, *ifaddr = NULL;
+
 	argv_find(argv, argc, "(1-65535)", &idx);
 	coststr = argv[idx]->arg;
 	cost = strtol(coststr, NULL, 10);
@@ -7259,7 +7260,7 @@ DEFUN (ip_ospf_area,
 	int format, ret;
 	struct in_addr area_id;
 	struct in_addr addr;
-	struct ospf_if_params *params;
+	struct ospf_if_params *params = NULL;
 	struct route_node *rn;
 	struct ospf *ospf = NULL;
 	u_short instance = 0;
@@ -7330,9 +7331,11 @@ DEFUN (ip_ospf_area,
 	}
 
 	/* enable ospf on this interface with area_id */
-	SET_IF_PARAM(params, if_area);
-	params->if_area = area_id;
-	params->if_area_id_fmt = format;
+	if (params) {
+		SET_IF_PARAM(params, if_area);
+		params->if_area = area_id;
+		params->if_area_id_fmt = format;
+	}
 	ospf_interface_area_set(ospf, ifp);
 	ospf->if_ospf_cli_count++;
 
@@ -8638,14 +8641,22 @@ static int config_write_interface_one(struct vty *vty, struct ospf *ospf)
 	int write = 0;
 
 	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(ospf->vrf_id), n1, ifp)) {
+		struct vrf *vrf = NULL;
+
 		if (memcmp(ifp->name, "VLINK", 5) == 0)
 			continue;
 
 		if (ifp->ifindex == IFINDEX_DELETED)
 			continue;
 
+		vrf = vrf_lookup_by_id(ifp->vrf_id);
+
 		vty_frame(vty, "!\n");
-		vty_frame(vty, "interface %s\n", ifp->name);
+		if (ifp->vrf_id == VRF_DEFAULT || vrf == NULL)
+			vty_frame(vty, "interface %s\n", ifp->name);
+		else
+			vty_frame(vty, "interface %s vrf %s\n",
+				  ifp->name, vrf->name);
 		if (ifp->desc)
 			vty_out(vty, " description %s\n", ifp->desc);
 
@@ -8716,14 +8727,17 @@ static int config_write_interface_one(struct vty *vty, struct ospf *ospf)
 			}
 
 			/* Cryptographic Authentication Key print. */
-			for (ALL_LIST_ELEMENTS_RO(params->auth_crypt, n2, ck)) {
-				vty_out(vty,
-					" ip ospf message-digest-key %d md5 %s",
-					ck->key_id, ck->auth_key);
-				if (params != IF_DEF_PARAMS(ifp))
-					vty_out(vty, " %s",
-						inet_ntoa(rn->p.u.prefix4));
-				vty_out(vty, "\n");
+			if (params && params->auth_crypt) {
+				for (ALL_LIST_ELEMENTS_RO(params->auth_crypt,
+							  n2, ck)) {
+					vty_out(vty,
+						" ip ospf message-digest-key %d md5 %s",
+						ck->key_id, ck->auth_key);
+					if (params != IF_DEF_PARAMS(ifp))
+						vty_out(vty, " %s",
+							inet_ntoa(rn->p.u.prefix4));
+					vty_out(vty, "\n");
+				}
 			}
 
 			/* Interface Output Cost print. */