lsreq.c indented and small 'struct proto' changes.

proto/ospf/lsreq.c

@@ -1,7 +1,7 @@
 /*
  *	BIRD -- OSPF
  *
- *	(c) 2000 Ondrej Filip <feela@network.cz>
+ *	(c) 2000--2004 Ondrej Filip <feela@network.cz>
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -9,7 +9,7 @@
 #include "ospf.h"
 
 void
-ospf_lsreq_tx(struct ospf_neighbor *n)
+ospf_lsreq_send(struct ospf_neighbor *n)
 {
   snode *sn;
   struct top_hash_entry *en;
@@ -28,7 +28,8 @@ ospf_lsreq_tx(struct ospf_neighbor *n)
   sn = SHEAD(n->lsrql);
   if (EMPTY_SLIST(n->lsrql))
   {
-    if(n->state==NEIGHBOR_LOADING) ospf_neigh_sm(n, INM_LOADDONE);
+    if (n->state == NEIGHBOR_LOADING)
+      ospf_neigh_sm(n, INM_LOADDONE);
     return;
   }
 
@@ -39,19 +40,24 @@ ospf_lsreq_tx(struct ospf_neighbor *n)
   for (; i > 0; i--)
   {
     en = (struct top_hash_entry *) sn;
-    lsh->padd1=0; lsh->padd2=0;
+    lsh->padd1 = 0;
+    lsh->padd2 = 0;
     lsh->type = en->lsa.type;
     lsh->rt = htonl(en->lsa.rt);
     lsh->id = htonl(en->lsa.id);
     DBG("Requesting %uth LSA: Type: %u, Id: %I, RT: %I\n", i, en->lsa.type,
 	en->lsa.id, en->lsa.rt);
     lsh++;
-    if(sn==STAIL(n->lsrql)) break;
+    if (sn == STAIL(n->lsrql))
+      break;
     sn = sn->next;
   }
-  if(i!=0) i--;
+  if (i != 0)
+    i--;
 
-  length=sizeof(struct ospf_lsreq_packet)+(j-i)*sizeof(struct ospf_lsreq_header);
+  length =
+    sizeof(struct ospf_lsreq_packet) + (j -
+					i) * sizeof(struct ospf_lsreq_header);
   op->length = htons(length);
   ospf_pkt_finalize(n->ifa, op);
   sk_send_to(n->ifa->ip_sk, length, n->ip, OSPF_PROTO);
@@ -59,29 +65,27 @@ ospf_lsreq_tx(struct ospf_neighbor *n)
 }
 
 void
-ospf_lsreq_rx(struct ospf_lsreq_packet *ps, struct proto *p,
+ospf_lsreq_receive(struct ospf_lsreq_packet *ps,
 		   struct ospf_iface *ifa, u16 size)
 {
-  u32 nrid, myrid;
+  u32 nrid;
   struct ospf_neighbor *n;
   struct ospf_lsreq_header *lsh;
   struct l_lsr_head *llsh;
   list uplist;
   slab *upslab;
-  int length;
-  int i,lsano;
+  int length, i, lsano;
+  struct proto *p = (struct proto *) ifa->proto;
 
   nrid = ntohl(ps->ospf_packet.routerid);
 
-  myrid=p->cf->global->router_id;
-
   if ((n = find_neigh(ifa, nrid)) == NULL)
   {
-    OSPF_TRACE(D_PACKETS, "Received lsreq from unknown neighbor! (%I)",
-      nrid);
+    OSPF_TRACE(D_PACKETS, "Received lsreq from unknown neighbor! (%I)", nrid);
     return;
   }
-  if(n->state<NEIGHBOR_EXCHANGE) return;
+  if (n->state < NEIGHBOR_EXCHANGE)
+    return;
 
   OSPF_TRACE(D_EVENTS, "Received LS req from neighbor: %I", n->ip);
   ospf_neigh_sm(n, INM_HELLOREC);
@@ -115,4 +119,3 @@ ospf_lsreq_rx(struct ospf_lsreq_packet *ps, struct proto *p,
   ospf_lsupd_tx_list(n, &uplist);
   rfree(upslab);
 }
-

proto/ospf/lsreq.h

@@ -1,7 +1,7 @@
 /*
  *      BIRD -- OSPF
  *
- *      (c) 2000 Ondrej Filip <feela@network.cz>
+ *      (c) 2000--2004 Ondrej Filip <feela@network.cz>
  *
  *      Can be freely distributed and used under the terms of the GNU GPL.
  *
@@ -10,8 +10,8 @@
 #ifndef _BIRD_OSPF_LSREQ_H_
 #define _BIRD_OSPF_LSREQ_H_
 
-void ospf_lsreq_tx(struct ospf_neighbor *n);
-void ospf_lsreq_rx(struct ospf_lsreq_packet *ps, struct proto *p,
+void ospf_lsreq_send(struct ospf_neighbor *n);
+void ospf_lsreq_receive(struct ospf_lsreq_packet *ps,
 			struct ospf_iface *ifa, u16 size);
 
 #endif /* _BIRD_OSPF_LSREQ_H_ */

proto/ospf/lsupd.c

@@ -522,7 +522,7 @@ ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p,
 
   if(n->state==NEIGHBOR_LOADING)
   {
-    ospf_lsreq_tx(n);	/* Send me another part of database */
+    ospf_lsreq_send(n);	/* Send me another part of database */
   }
 }
 

proto/ospf/neighbor.c

@@ -579,7 +579,7 @@ rxmt_timer_hook(timer *timer)
     p->name, ifa->iface->name, n->ip);
   if (n->state < NEIGHBOR_LOADING) ospf_dbdes_tx(n);
 
-  if(n->state < NEIGHBOR_FULL) ospf_lsreq_tx(n);
+  if(n->state < NEIGHBOR_FULL) ospf_lsreq_send(n);
   else
   {
     if(!EMPTY_SLIST(n->lsrtl))

proto/ospf/packet.c

@@ -184,7 +184,7 @@ ospf_rx_hook (sock * sk, int size)
       break;
     case LSREQ_P:
       DBG ("%s: Link state request received.\n", p->name);
-      ospf_lsreq_rx ((struct ospf_lsreq_packet *) ps, p, ifa, size);
+      ospf_lsreq_receive((struct ospf_lsreq_packet *) ps, ifa, size);
       break;
     case LSUPD_P:
       DBG ("%s: Link state update received.\n", p->name);