summaryrefslogtreecommitdiffstats
path: root/ospf6d
diff options
context:
space:
mode:
Diffstat (limited to 'ospf6d')
-rw-r--r--ospf6d/ospf6_interface.c2
-rw-r--r--ospf6d/ospf6_intra.c52
-rw-r--r--ospf6d/ospf6_route.h8
-rw-r--r--ospf6d/ospf6_top.c9
-rw-r--r--ospf6d/ospf6_zebra.c7
-rw-r--r--ospf6d/ospf6d.c2
6 files changed, 8 insertions, 72 deletions
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index 8d9a7f01..d266f78e 100644
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -1511,7 +1511,7 @@ config_write_ospf6_interface (struct vty *vty)
return 0;
}
-struct cmd_node interface_node =
+static struct cmd_node interface_node =
{
INTERFACE_NODE,
"%s(config-if)# ",
diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c
index bba63f47..103e8fc2 100644
--- a/ospf6d/ospf6_intra.c
+++ b/ospf6d/ospf6_intra.c
@@ -1291,58 +1291,6 @@ ospf6_brouter_debug_print (struct ospf6_route *brouter)
}
void
-ospf6_brouter_debug_print (struct ospf6_route *brouter)
-{
- u_int32_t brouter_id;
- char brouter_name[16];
- char area_name[16];
- char destination[64];
- char installed[16], changed[16];
- struct timeval now, res;
- char id[16], adv_router[16];
- char capa[16], options[16];
-
- brouter_id = ADV_ROUTER_IN_PREFIX (&brouter->prefix);
- inet_ntop (AF_INET, &brouter_id, brouter_name, sizeof (brouter_name));
- inet_ntop (AF_INET, &brouter->path.area_id, area_name, sizeof (area_name));
- ospf6_linkstate_prefix2str (&brouter->prefix, destination,
- sizeof (destination));
-
- gettimeofday (&now, (struct timezone *) NULL);
- timersub (&now, &brouter->installed, &res);
- timerstring (&res, installed, sizeof (installed));
-
- gettimeofday (&now, (struct timezone *) NULL);
- timersub (&now, &brouter->changed, &res);
- timerstring (&res, changed, sizeof (changed));
-
- inet_ntop (AF_INET, &brouter->path.origin.id, id, sizeof (id));
- inet_ntop (AF_INET, &brouter->path.origin.adv_router, adv_router,
- sizeof (adv_router));
-
- ospf6_options_printbuf (brouter->path.options, options, sizeof (options));
- ospf6_capability_printbuf (brouter->path.router_bits, capa, sizeof (capa));
-
- zlog_info ("Brouter: %s via area %s", brouter_name, area_name);
- zlog_info (" memory: prev: %p this: %p next: %p parent rnode: %p",
- brouter->prev, brouter, brouter->next, brouter->rnode);
- zlog_info (" type: %d prefix: %s installed: %s changed: %s",
- brouter->type, destination, installed, changed);
- zlog_info (" lock: %d flags: %s%s%s%s", brouter->lock,
- (CHECK_FLAG (brouter->flag, OSPF6_ROUTE_BEST) ? "B" : "-"),
- (CHECK_FLAG (brouter->flag, OSPF6_ROUTE_ADD) ? "A" : "-"),
- (CHECK_FLAG (brouter->flag, OSPF6_ROUTE_REMOVE) ? "R" : "-"),
- (CHECK_FLAG (brouter->flag, OSPF6_ROUTE_CHANGE) ? "C" : "-"));
- zlog_info (" path type: %s ls-origin %s id: %s adv-router %s",
- OSPF6_PATH_TYPE_NAME (brouter->path.type),
- ospf6_lstype_name (brouter->path.origin.type),
- id, adv_router);
- zlog_info (" options: %s router-bits: %s metric-type: %d metric: %d/%d",
- options, capa, brouter->path.metric_type,
- brouter->path.cost, brouter->path.cost_e2);
-}
-
-void
ospf6_intra_brouter_calculation (struct ospf6_area *oa)
{
struct ospf6_route *brouter, *copy;
diff --git a/ospf6d/ospf6_route.h b/ospf6d/ospf6_route.h
index d12e0ce0..3ee52b5f 100644
--- a/ospf6d/ospf6_route.h
+++ b/ospf6d/ospf6_route.h
@@ -279,18 +279,10 @@ extern struct ospf6_route *ospf6_route_match_head (struct prefix *prefix,
extern struct ospf6_route *ospf6_route_match_next (struct prefix *prefix,
struct ospf6_route *route);
-<<<<<<< HEAD:ospf6d/ospf6_route.h
-void ospf6_route_remove_all (struct ospf6_route_table *);
-struct ospf6_route_table *ospf6_route_table_create (int s, int t);
-void ospf6_route_table_delete (struct ospf6_route_table *);
-void ospf6_route_dump (struct ospf6_route_table *table);
-=======
extern void ospf6_route_remove_all (struct ospf6_route_table *);
extern struct ospf6_route_table *ospf6_route_table_create (int s, int t);
extern void ospf6_route_table_delete (struct ospf6_route_table *);
extern void ospf6_route_dump (struct ospf6_route_table *table);
->>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:ospf6d/ospf6_route.h
-
extern void ospf6_route_show (struct vty *vty, struct ospf6_route *route);
extern void ospf6_route_show_detail (struct vty *vty, struct ospf6_route *route);
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 569994c0..9592d555 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -114,8 +114,7 @@ ospf6_create (void)
{
struct ospf6 *o;
- o = XMALLOC (MTYPE_OSPF6_TOP, sizeof (struct ospf6));
- memset (o, 0, sizeof (struct ospf6));
+ o = XCALLOC (MTYPE_OSPF6_TOP, sizeof (struct ospf6));
/* initialize */
gettimeofday (&o->starttime, (struct timezone *) NULL);
@@ -562,11 +561,7 @@ ALIAS (show_ipv6_ospf6_route_match,
ROUTE_STR
"Specify IPv6 prefix\n"
"Display routes longer than the specified route\n"
-<<<<<<< HEAD:ospf6d/ospf6_top.c
);
-=======
- )
->>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:ospf6d/ospf6_top.c
DEFUN (show_ipv6_ospf6_route_match_detail,
show_ipv6_ospf6_route_longer_detail_cmd,
@@ -655,7 +650,7 @@ config_write_ospf6 (struct vty *vty)
}
/* OSPF6 node structure. */
-struct cmd_node ospf6_node =
+static struct cmd_node ospf6_node =
{
OSPF6_NODE,
"%s(config-ospf6)# ",
diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index b5ffc0aa..a2a97d29 100644
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -134,8 +134,9 @@ ospf6_zebra_if_state_update (int command, struct zclient *zclient,
ifp = zebra_interface_state_read (zclient->ibuf);
if (IS_OSPF6_DEBUG_ZEBRA (RECV))
zlog_debug ("Zebra Interface state change: "
- "%s index %d flags %ld metric %d mtu %d",
- ifp->name, ifp->ifindex, ifp->flags, ifp->metric, ifp->mtu6);
+ "%s index %d flags %#llx metric %d mtu %d",
+ ifp->name, ifp->ifindex, (unsigned long long)ifp->flags,
+ ifp->metric, ifp->mtu6);
ospf6_interface_state_update (ifp);
return 0;
@@ -335,7 +336,7 @@ config_write_ospf6_zebra (struct vty *vty)
}
/* Zebra node structure. */
-struct cmd_node zebra_node =
+static struct cmd_node zebra_node =
{
ZEBRA_NODE,
"%s(config-zebra)# ",
diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index 1a615ffa..7a766c8d 100644
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -92,7 +92,7 @@ DEFUN (show_version_ospf6,
return CMD_SUCCESS;
}
-struct cmd_node debug_node =
+static struct cmd_node debug_node =
{
DEBUG_NODE,
"",
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-21 08:01:04 +0000