[zebra 14631] Generic PtP and RFC3021 interface addressing supportpatch.z14631.ptp.rfc3021

2 files changed, 4 insertions, 4 deletions

diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index 6187977e..4ed0ecd3 100644
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -1413,7 +1413,7 @@ ospf_snmp_if_update (struct interface *ifp)
   /* Lookup first IPv4 address entry. */
   LIST_LOOP (ifp->connected, ifc, nn)
     {
-      if (if_is_pointopoint (ifp))
+      if (ifc_pointopoint (ifc))
 	p = ifc->destination;
       else
 	p = ifc->address;
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index e8bd360b..19bc1e53 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -699,17 +699,17 @@ ospf_network_run (struct ospf *ospf, struct prefix *p, struct ospf_area *area)
 	  struct connected *co = getdata (cn);
 	  struct prefix *addr;
 
-	  if (if_is_pointopoint (ifp))
+	  if (ifc_pointopoint (co))
 	    addr = co->destination;
 	  else 
 	    addr = co->address;
 
 	  if (p->family == co->address->family &&
 	      ! ospf_if_is_configured (&(addr->u.prefix4)))
-	    if ((if_is_pointopoint (ifp) &&
+	    if ((ifc_pointopoint (co) &&
 		 IPV4_ADDR_SAME (&(addr->u.prefix4), &(p->u.prefix4))) ||
 		prefix_match (p, addr)) 
-	    {
+	      {
 	        struct ospf_interface *oi;
 		
 		oi = ospf_if_new (ifp, co->address);