diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2010-03-11 18:55:59 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2010-03-11 18:55:59 +0100 |
| commit | 54305181f6ee3af57dd3d15d53ea2e851b36ed23 (patch) | |
| tree | a5aed631b68df033cba372f841d47a0cba5d7021 /proto/ospf/hello.c | |
| parent | e7b76b976084006e430543f4b872f624326dbfe6 (diff) | |
| parent | afa9f66c27e2f96b92059131def53cc7b2497705 (diff) | |
| download | bird-54305181f6ee3af57dd3d15d53ea2e851b36ed23.tar bird-54305181f6ee3af57dd3d15d53ea2e851b36ed23.zip | |
Merge branch 'new' into socket2
Diffstat (limited to 'proto/ospf/hello.c')
| -rw-r--r-- | proto/ospf/hello.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/proto/ospf/hello.c b/proto/ospf/hello.c index 9f174df..7fe8280 100644 --- a/proto/ospf/hello.c +++ b/proto/ospf/hello.c @@ -48,8 +48,8 @@ ospf_hello_receive(struct ospf_packet *ps_i, struct ospf_iface *ifa, struct proto_ospf *po = ifa->oa->po; struct proto *p = &po->proto; char *beg = "OSPF: Bad HELLO packet from "; - unsigned int size, i, twoway, oldpriority, eligible, peers; - u32 olddr, oldbdr, oldiface_id, tmp; + unsigned int size, i, twoway, eligible, peers; + u32 tmp; u32 *pnrid; size = ntohs(ps_i->length); @@ -169,11 +169,11 @@ ospf_hello_receive(struct ospf_packet *ps_i, struct ospf_iface *ifa, if (!twoway) ospf_neigh_sm(n, INM_1WAYREC); - olddr = n->dr; - oldbdr = n->bdr; - oldpriority = n->priority; + u32 olddr = n->dr; + u32 oldbdr = n->bdr; + u32 oldpriority = n->priority; #ifdef OSPFv3 - oldiface_id = n->iface_id; + u32 oldiface_id = n->iface_id; #endif n->dr = ntohl(ps->dr); |