summaryrefslogtreecommitdiffstats
path: root/ospf6d/ospf6_asbr.c
diff options
context:
space:
mode:
authorpaul <paul>2004-10-10 12:54:58 +0000
committerpaul <paul>2004-10-10 12:54:58 +0000
commit0c083ee9d870bf02a36563ae1807f3894ac24219 (patch)
tree04315c9103131381b9ca5e1d576e27a1f22d0da1 /ospf6d/ospf6_asbr.c
parent9035efaa924c69f4f4fcb1049c7dc4f43b9da980 (diff)
downloadquagga-0c083ee9d870bf02a36563ae1807f3894ac24219.tar.bz2
quagga-0c083ee9d870bf02a36563ae1807f3894ac24219.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_asbr.c')
-rw-r--r--ospf6d/ospf6_asbr.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index 31050816..41da5e7e 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -50,11 +50,11 @@
unsigned char conf_debug_ospf6_asbr = 0;
-char *zroute_name[] =
+const char *zroute_name[] =
{ "system", "kernel", "connected", "static",
"rip", "ripng", "ospf", "ospf6", "isis", "bgp", "unknown" };
-char *zroute_abname[] =
+const char *zroute_abname[] =
{ "X", "K", "C", "S", "R", "R", "O", "O", "I", "B", "?" };
#define ZROUTE_NAME(x) \
@@ -365,7 +365,7 @@ ospf6_asbr_lsentry_remove (struct ospf6_route *asbr_entry)
/* redistribute function */
void
-ospf6_asbr_routemap_set (int type, char *mapname)
+ospf6_asbr_routemap_set (int type, const char *mapname)
{
if (ospf6->rmap[type].name)
free (ospf6->rmap[type].name);
@@ -383,7 +383,7 @@ ospf6_asbr_routemap_unset (int type)
}
void
-ospf6_asbr_routemap_update (char *mapname)
+ospf6_asbr_routemap_update (const char *mapname)
{
int type;
@@ -828,7 +828,7 @@ ospf6_routemap_rule_match_address_prefixlist (void *rule,
}
void *
-ospf6_routemap_rule_match_address_prefixlist_compile (char *arg)
+ospf6_routemap_rule_match_address_prefixlist_compile (const char *arg)
{
return XSTRDUP (MTYPE_ROUTE_MAP_COMPILED, arg);
}
@@ -867,7 +867,7 @@ ospf6_routemap_rule_set_metric_type (void *rule, struct prefix *prefix,
}
void *
-ospf6_routemap_rule_set_metric_type_compile (char *arg)
+ospf6_routemap_rule_set_metric_type_compile (const char *arg)
{
if (strcmp (arg, "type-2") && strcmp (arg, "type-1"))
return NULL;
@@ -904,7 +904,7 @@ ospf6_routemap_rule_set_metric (void *rule, struct prefix *prefix,
}
void *
-ospf6_routemap_rule_set_metric_compile (char *arg)
+ospf6_routemap_rule_set_metric_compile (const char *arg)
{
u_int32_t metric;
char *endp;
@@ -950,7 +950,7 @@ ospf6_routemap_rule_set_forwarding (void *rule, struct prefix *prefix,
}
void *
-ospf6_routemap_rule_set_forwarding_compile (char *arg)
+ospf6_routemap_rule_set_forwarding_compile (const char *arg)
{
struct in6_addr a;
if (inet_pton (AF_INET6, arg, &a) != 1)