Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Test better lsa size.

Browse source
This commit is contained in:
Ondrej Filip 2000-05-10 23:42:37 +00:00
parent 31dca43534
commit 394920a09c
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
proto/ospf/dbdes.c
View file

@ -13,14 +13,12 @@ ospf_dbdes_tx(struct ospf_neighbor *n)
{ {
struct ospf_dbdes_packet *pkt; struct ospf_dbdes_packet *pkt;
struct ospf_packet *op; struct ospf_packet *op;
struct ospf_iface *ifa; struct ospf_iface *ifa=n->ifa;
u16 length; u16 length;
struct proto *p; struct proto *p;
u16 i,j; u16 i,j;
u8 *aa,*bb; u8 *aa,*bb;
ifa=n->ifa;
p=(struct proto *)(ifa->proto); p=(struct proto *)(ifa->proto);
switch(n->state) switch(n->state)
@ -38,7 +36,8 @@ ospf_dbdes_tx(struct ospf_neighbor *n)
op->length=htons(length); op->length=htons(length);
ospf_pkt_finalize(ifa, op); ospf_pkt_finalize(ifa, op);
sk_send_to(ifa->ip_sk,length, n->ip, OSPF_PROTO); sk_send_to(ifa->ip_sk,length, n->ip, OSPF_PROTO);
debug("%s: DB_DES (I) sent to %I.\n", p->name, n->rid); debug("%s: DB_DES (I) sent to %I via %s.\n", p->name, n->ip,
ifa->iface->name);
break; break;
case NEIGHBOR_EXCHANGE: case NEIGHBOR_EXCHANGE:
@ -102,7 +101,7 @@ ospf_dbdes_tx(struct ospf_neighbor *n)
op->length=htons(length); op->length=htons(length);
ospf_pkt_finalize(ifa, op); ospf_pkt_finalize(ifa, op);
DBG("%s: DB_DES (M) sent to %I.\n", p->name, n->rid); DBG("%s: DB_DES (M) sent to %I.\n", p->name, n->ip);
} }
case NEIGHBOR_LOADING: case NEIGHBOR_LOADING:
@ -117,9 +116,9 @@ ospf_dbdes_tx(struct ospf_neighbor *n)
*(aa+i)=*(bb+i); /* Copy last sent packet again */ *(aa+i)=*(bb+i); /* Copy last sent packet again */
} }
DBG("%s: DB_DES sending to %I.\n", p->name, n->rid);
sk_send_to(ifa->ip_sk,length, n->ip, OSPF_PROTO); sk_send_to(ifa->ip_sk,length, n->ip, OSPF_PROTO);
debug("%s: DB_DES (M) sent to %I.\n", p->name, n->rid); debug("%s: DB_DES (M) sent to %I via %s.\n", p->name, n->ip,
ifa->iface->name);
if(n->myimms.bit.ms) tm_start(n->rxmt_timer,ifa->rxmtint); if(n->myimms.bit.ms) tm_start(n->rxmt_timer,ifa->rxmtint);
else else
{ {
@ -209,7 +208,7 @@ ospf_dbdes_rx(struct ospf_dbdes_packet *ps, struct proto *p,
if((n=find_neigh(ifa, nrid))==NULL) if((n=find_neigh(ifa, nrid))==NULL)
{ {
debug("%s: Received dbdes from unknown neigbor! (%I)\n", p->name, debug("%s: Received dbdes from unknown neigbor! %I\n", p->name,
nrid); nrid);
return ; return ;
} }
@ -220,7 +219,8 @@ ospf_dbdes_rx(struct ospf_dbdes_packet *ps, struct proto *p,
return ; return ;
} }
debug("%s: Received dbdes from %I.\n", p->name, n->ip); debug("%s: Received dbdes from %I via %s.\n", p->name, n->ip,
ifa->iface->name);
switch(n->state) switch(n->state)
{ {
@ -269,6 +269,7 @@ ospf_dbdes_rx(struct ospf_dbdes_packet *ps, struct proto *p,
break; break;
} }
} }
if(ps->imms.bit.i) break;
case NEIGHBOR_EXCHANGE: case NEIGHBOR_EXCHANGE:
if((ps->imms.byte==n->imms.byte) && (ps->options=n->options) && if((ps->imms.byte==n->imms.byte) && (ps->options=n->options) &&
(ntohl(ps->ddseq)==n->ddr)) (ntohl(ps->ddseq)==n->ddr))
@ -286,14 +287,14 @@ ospf_dbdes_rx(struct ospf_dbdes_packet *ps, struct proto *p,
if(ps->imms.bit.ms!=n->imms.bit.ms) /* M/S bit differs */ if(ps->imms.bit.ms!=n->imms.bit.ms) /* M/S bit differs */
{ {
DBG("SEQMIS-BIT-MS\n"); debug("SEQMIS-BIT-MS\n");
ospf_neigh_sm(n, INM_SEQMIS); ospf_neigh_sm(n, INM_SEQMIS);
break; break;
} }
if(ps->imms.bit.i) /* I bit is set */ if(ps->imms.bit.i) /* I bit is set */
{ {
DBG("SEQMIS-BIT-I\n"); debug("SEQMIS-BIT-I\n");
ospf_neigh_sm(n, INM_SEQMIS); ospf_neigh_sm(n, INM_SEQMIS);
break; break;
} }
@ -302,7 +303,7 @@ ospf_dbdes_rx(struct ospf_dbdes_packet *ps, struct proto *p,
if(ps->options!=n->options) /* Options differs */ if(ps->options!=n->options) /* Options differs */
{ {
DBG("SEQMIS-OPT\n"); debug("SEQMIS-OPT\n");
ospf_neigh_sm(n, INM_SEQMIS); ospf_neigh_sm(n, INM_SEQMIS);
break; break;
} }
@ -311,7 +312,7 @@ ospf_dbdes_rx(struct ospf_dbdes_packet *ps, struct proto *p,
{ {
if(ntohl(ps->ddseq)!=n->dds) /* MASTER */ if(ntohl(ps->ddseq)!=n->dds) /* MASTER */
{ {
DBG("SEQMIS-MASTER\n"); debug("SEQMIS-MASTER\n");
ospf_neigh_sm(n, INM_SEQMIS); ospf_neigh_sm(n, INM_SEQMIS);
break; break;
} }
@ -332,7 +333,7 @@ ospf_dbdes_rx(struct ospf_dbdes_packet *ps, struct proto *p,
{ {
if(ntohl(ps->ddseq)!=(n->dds+1)) /* SLAVE */ if(ntohl(ps->ddseq)!=(n->dds+1)) /* SLAVE */
{ {
DBG("SEQMIS-SLAVE\n"); debug("SEQMIS-SLAVE\n");
ospf_neigh_sm(n, INM_SEQMIS); ospf_neigh_sm(n, INM_SEQMIS);
break; break;
} }
@ -353,6 +354,7 @@ ospf_dbdes_rx(struct ospf_dbdes_packet *ps, struct proto *p,
} }
else else
{ {
debug("SEQMIS-FULL\n");
ospf_neigh_sm(n, INM_SEQMIS); ospf_neigh_sm(n, INM_SEQMIS);
} }
break; break;