Merge branch 'socket2' into new

1 files changed, 27 insertions, 32 deletions

diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c
index 54701192..885c39ba 100644
--- a/proto/ospf/topology.c
+++ b/proto/ospf/topology.c
@@ -205,7 +205,7 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length)
 
   WALK_LIST(ifa, po->iface_list)
   {
-    int master = 0;
+    int net_lsa = 0;
 
     if ((ifa->type == OSPF_IT_VLINK) && (ifa->voa == oa) &&
 	(!EMPTY_LIST(ifa->neigh_list)))
@@ -230,12 +230,11 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length)
 	  ln = lsab_alloc(po, sizeof(struct ospf_lsa_rt_link));
 	  ln->type = LSART_PTP;
 	  ln->id = neigh->rid;
-	  ln->data = (ifa->iface->addr->flags & IA_UNNUMBERED) ?
-	    ifa->iface->index : ipa_to_u32(ifa->iface->addr->ip);
+	  ln->data = (ifa->addr->flags & IA_UNNUMBERED) ?
+	    ifa->iface->index : ipa_to_u32(ifa->addr->ip);
 	  ln->metric = ifa->cost;
 	  ln->padding = 0;
 	  i++;
-	  master = 1;
 	}
 	break;
 
@@ -246,11 +245,11 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length)
 	    ln = lsab_alloc(po, sizeof(struct ospf_lsa_rt_link));
 	    ln->type = LSART_NET;
 	    ln->id = ipa_to_u32(ifa->drip);
-	    ln->data = ipa_to_u32(ifa->iface->addr->ip);
+	    ln->data = ipa_to_u32(ifa->addr->ip);
 	    ln->metric = ifa->cost;
 	    ln->padding = 0;
 	    i++;
-	    master = 1;
+	    net_lsa = 1;
 	  }
 	break;
 
@@ -261,11 +260,10 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length)
 	  ln = lsab_alloc(po, sizeof(struct ospf_lsa_rt_link));
 	  ln->type = LSART_VLNK;
 	  ln->id = neigh->rid;
-	  ln->data = ipa_to_u32(ifa->iface->addr->ip);
+	  ln->data = ipa_to_u32(ifa->addr->ip);
 	  ln->metric = ifa->cost;
 	  ln->padding = 0;
 	  i++;
-	  master = 1;
         }
         break;
 
@@ -274,25 +272,20 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length)
         break;
       }
 
-    /* Now we will originate stub areas for interfaces addresses */
-    struct ifa *a;
-    WALK_LIST(a, ifa->iface->addrs)
-      {
-	if (((a == ifa->iface->addr) && master) ||
-	    (a->flags & IA_SECONDARY) ||
-	    (a->flags & IA_UNNUMBERED) ||
-	    configured_stubnet(oa, a))
-	  continue;
-
+    /* Now we will originate stub area if there is no primary */
+    if (net_lsa ||
+	(ifa->type == OSPF_IT_VLINK) ||
+	(ifa->addr->flags & IA_UNNUMBERED) ||
+	configured_stubnet(oa, ifa->addr))
+      continue;
 
-	ln = lsab_alloc(po, sizeof(struct ospf_lsa_rt_link));
-	ln->type = LSART_STUB;
-	ln->id = ipa_to_u32(a->prefix);
-	ln->data = ipa_to_u32(ipa_mkmask(a->pxlen));
-	ln->metric = ifa->cost;
-	ln->padding = 0;
-	i++;
-      }
+    ln = lsab_alloc(po, sizeof(struct ospf_lsa_rt_link));
+    ln->type = LSART_STUB;
+    ln->id = ipa_to_u32(ifa->addr->prefix);
+    ln->data = ipa_to_u32(ipa_mkmask(ifa->addr->pxlen));
+    ln->metric = ifa->cost;
+    ln->padding = 0;
+    i++;
   }
 
   struct ospf_stubnet_config *sn;
@@ -483,7 +476,7 @@ originate_net_lsa_body(struct ospf_iface *ifa, u16 *length,
 		 + nodes * sizeof(u32));
 
 #ifdef OSPFv2
-  net->netmask = ipa_mkmask(ifa->iface->addr->pxlen);
+  net->netmask = ipa_mkmask(ifa->addr->pxlen);
 #endif
 
 #ifdef OSPFv3
@@ -547,7 +540,7 @@ originate_net_lsa(struct ospf_iface *ifa)
 
 #ifdef OSPFv2
   lsa.options = ifa->oa->options;
-  lsa.id = ipa_to_u32(ifa->iface->addr->ip);
+  lsa.id = ipa_to_u32(ifa->addr->ip);
 #else /* OSPFv3 */
   lsa.id = ifa->iface->index;
 #endif
@@ -749,12 +742,13 @@ originate_sum_rt_lsa(struct ospf_area *oa, struct fib_node *fn, int metric, u32
   struct proto_ospf *po = oa->po;
   struct proto *p = &po->proto;
   struct top_hash_entry *en;
-  u32 dom = oa->areaid;  
+  u32 dom = oa->areaid;
+  u32 rid = ipa_to_rid(fn->prefix);
   struct ospf_lsa_header lsa;
   void *body;
 
   OSPF_TRACE(D_EVENTS, "Originating rt-summary-LSA for %R (metric %d)",
-	     lsa.id, metric);
+	     rid, metric);
 
   lsa.age = 0;
 #ifdef OSPFv2
@@ -762,7 +756,7 @@ originate_sum_rt_lsa(struct ospf_area *oa, struct fib_node *fn, int metric, u32
 #endif
   lsa.type = LSA_T_SUM_RT;
   /* In OSPFv3, LSA ID is meaningless, but we still use Router ID of ASBR */
-  lsa.id = ipa_to_rid(fn->prefix);
+  lsa.id = rid;
   lsa.rt = po->router_id;
   lsa.sn = LSA_INITSEQNO;
 
@@ -900,6 +894,7 @@ originate_ext_lsa_body(net *n, rte *e, u16 *length, struct proto_ospf *po,
   int gw = 0;
   int size = sizeof(struct ospf_lsa_ext);
 
+  // FIXME check for gw should be per ifa, not per iface
   if ((e->attrs->dest == RTD_ROUTER) &&
       !ipa_equal(e->attrs->gw, IPA_NONE) &&
       !ipa_has_link_scope(e->attrs->gw) &&
@@ -1050,7 +1045,7 @@ originate_link_lsa_body(struct ospf_iface *ifa, u16 *length)
   ASSERT(po->lsab_used == 0);
   ll = lsab_allocz(po, sizeof(struct ospf_lsa_link));
   ll->options = ifa->oa->options | (ifa->priority << 24);
-  ll->lladdr = ifa->lladdr;
+  ll->lladdr = ifa->addr->ip;
   ll = NULL; /* buffer might be reallocated later */
 
   struct ifa *a;