diff options
| author | paul <paul> | 2004-10-10 12:54:58 +0000 |
|---|---|---|
| committer | paul <paul> | 2004-10-10 12:54:58 +0000 |
| commit | c7f3ef9f7cdbc2b59ea5ac3ff534fd5ca574ffb6 (patch) | |
| tree | ceb8370d9926a6c43f50fffe95891bdaa04af951 /ospf6d/ospf6_intra.c | |
| parent | c1e8ebd6035534ada903319afe425d629bf010b3 (diff) | |
| download | quagga-c7f3ef9f7cdbc2b59ea5ac3ff534fd5ca574ffb6.tar.bz2 quagga-c7f3ef9f7cdbc2b59ea5ac3ff534fd5ca574ffb6.tar.xz | |
2004-10-10 Paul Jakma <paul@dishone.st>
* ospf6_route.c: Add const qualifier to various char arrays of
constants. signed/unsigned fixes.
(ospf6_linkstate_table_show) argv is const
* ospf6_snmp.c: listnode typedef is dead.
(ospf6_snmp_init) Take struct thread_master arg, needed for
smux_init.
* ospf6_snmp.h: update ospf6_snmp_init declaration.
* ospf6d.c: (ospf6_init) add const qualifier to sargv, pass master
to ospf_snmp6_init.
* ospf6_asbr.c: const char update.
* ospf6_interface.c: ditto, plus signed/unsigned fixes.
(ipv6_ospf6_cost) Check whether cost fits in u_int32_t and use
strtoul.
* ospf6_intra.c: const char update. Parenthesise expression.
* ospf6_lsa.c: signed/unsigned and const char updates.
* ospf6_proto.c: ditto.
* ospf6_message.c: ditto.
* ospf6_lsdb.c: signed/unsigned update.
* ospf6_main.c: const char update.
* ospf6_neighbor.c: ditto.
* ospf6_spf.c: ditto.
* ospf6_top.c: ditto.
Diffstat (limited to 'ospf6d/ospf6_intra.c')
| -rw-r--r-- | ospf6d/ospf6_intra.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c index fd208fd0..365b98d1 100644 --- a/ospf6d/ospf6_intra.c +++ b/ospf6d/ospf6_intra.c @@ -172,9 +172,9 @@ ospf6_router_lsa_originate (struct thread *thread) continue; /* Multiple Router-LSA instance according to size limit setting */ - if (oa->router_lsa_size_limit != 0 && - (caddr_t) lsdesc + sizeof (struct ospf6_router_lsdesc) - - (caddr_t) buffer > oa->router_lsa_size_limit) + if ( (oa->router_lsa_size_limit != 0) + && ((caddr_t) lsdesc + sizeof (struct ospf6_router_lsdesc) - + (caddr_t) buffer > oa->router_lsa_size_limit)) { if ((caddr_t) lsdesc == (caddr_t) router_lsa + sizeof (struct ospf6_router_lsa)) @@ -471,7 +471,7 @@ ospf6_link_lsa_show (struct vty *vty, struct ospf6_lsa *lsa) int prefixnum; char buf[128], options[32]; struct ospf6_prefix *prefix; - char *p, *mc, *la, *nu; + const char *p, *mc, *la, *nu; struct in6_addr in6; link_lsa = (struct ospf6_link_lsa *) @@ -625,7 +625,7 @@ ospf6_intra_prefix_lsa_show (struct vty *vty, struct ospf6_lsa *lsa) char buf[128]; struct ospf6_prefix *prefix; char id[16], adv_router[16]; - char *p, *mc, *la, *nu; + const char *p, *mc, *la, *nu; struct in6_addr in6; intra_prefix_lsa = (struct ospf6_intra_prefix_lsa *) |