mirror of https://github.com/FRRouting/frr.git
ripngd: Remove #if 0 code
Remove some more dead code. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
parent
94457bc6a8
commit
56b7d6bfe9
140
ripngd/ripngd.c
140
ripngd/ripngd.c
|
@ -2217,136 +2217,6 @@ DEFUN (show_ipv6_ripng_status,
|
|||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
#if 0
|
||||
/* RIPng update timer setup. */
|
||||
DEFUN (ripng_update_timer,
|
||||
ripng_update_timer_cmd,
|
||||
"update-timer SECOND",
|
||||
"Set RIPng update timer in seconds\n"
|
||||
"Seconds\n")
|
||||
{
|
||||
unsigned long update;
|
||||
char *endptr = NULL;
|
||||
|
||||
update = strtoul (argv[0], &endptr, 10);
|
||||
if (update == ULONG_MAX || *endptr != '\0')
|
||||
{
|
||||
vty_out (vty, "update timer value error\n");
|
||||
return CMD_WARNING_CONFIG_FAILED;
|
||||
}
|
||||
|
||||
ripng->update_time = update;
|
||||
|
||||
ripng_event (RIPNG_UPDATE_EVENT, 0);
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
DEFUN (no_ripng_update_timer,
|
||||
no_ripng_update_timer_cmd,
|
||||
"no update-timer SECOND",
|
||||
NO_STR
|
||||
"Unset RIPng update timer in seconds\n"
|
||||
"Seconds\n")
|
||||
{
|
||||
ripng->update_time = RIPNG_UPDATE_TIMER_DEFAULT;
|
||||
ripng_event (RIPNG_UPDATE_EVENT, 0);
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
/* RIPng timeout timer setup. */
|
||||
DEFUN (ripng_timeout_timer,
|
||||
ripng_timeout_timer_cmd,
|
||||
"timeout-timer SECOND",
|
||||
"Set RIPng timeout timer in seconds\n"
|
||||
"Seconds\n")
|
||||
{
|
||||
unsigned long timeout;
|
||||
char *endptr = NULL;
|
||||
|
||||
timeout = strtoul (argv[0], &endptr, 10);
|
||||
if (timeout == ULONG_MAX || *endptr != '\0')
|
||||
{
|
||||
vty_out (vty, "timeout timer value error\n");
|
||||
return CMD_WARNING_CONFIG_FAILED;
|
||||
}
|
||||
|
||||
ripng->timeout_time = timeout;
|
||||
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
DEFUN (no_ripng_timeout_timer,
|
||||
no_ripng_timeout_timer_cmd,
|
||||
"no timeout-timer SECOND",
|
||||
NO_STR
|
||||
"Unset RIPng timeout timer in seconds\n"
|
||||
"Seconds\n")
|
||||
{
|
||||
ripng->timeout_time = RIPNG_TIMEOUT_TIMER_DEFAULT;
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
/* RIPng garbage timer setup. */
|
||||
DEFUN (ripng_garbage_timer,
|
||||
ripng_garbage_timer_cmd,
|
||||
"garbage-timer SECOND",
|
||||
"Set RIPng garbage timer in seconds\n"
|
||||
"Seconds\n")
|
||||
{
|
||||
unsigned long garbage;
|
||||
char *endptr = NULL;
|
||||
|
||||
garbage = strtoul (argv[0], &endptr, 10);
|
||||
if (garbage == ULONG_MAX || *endptr != '\0')
|
||||
{
|
||||
vty_out (vty, "garbage timer value error\n");
|
||||
return CMD_WARNING_CONFIG_FAILED;
|
||||
}
|
||||
|
||||
ripng->garbage_time = garbage;
|
||||
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
DEFUN (no_ripng_garbage_timer,
|
||||
no_ripng_garbage_timer_cmd,
|
||||
"no garbage-timer SECOND",
|
||||
NO_STR
|
||||
"Unset RIPng garbage timer in seconds\n"
|
||||
"Seconds\n")
|
||||
{
|
||||
ripng->garbage_time = RIPNG_GARBAGE_TIMER_DEFAULT;
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
#endif /* 0 */
|
||||
|
||||
#if 0
|
||||
DEFUN (show_ipv6_protocols,
|
||||
show_ipv6_protocols_cmd,
|
||||
"show ipv6 protocols",
|
||||
SHOW_STR
|
||||
IPV6_STR
|
||||
"Routing protocol information\n")
|
||||
{
|
||||
if (! ripng)
|
||||
return CMD_SUCCESS;
|
||||
|
||||
vty_out (vty, "Routing Protocol is \"ripng\"\n");
|
||||
|
||||
vty_out (vty, "Sending updates every %ld seconds, next due in %d seconds\n",
|
||||
ripng->update_time, 0);
|
||||
|
||||
vty_out (vty, "Timerout after %ld seconds, garbage correct %ld\n",
|
||||
ripng->timeout_time,
|
||||
ripng->garbage_time);
|
||||
|
||||
vty_out (vty, "Outgoing update filter list for all interfaces is not set");
|
||||
vty_out (vty, "Incoming update filter list for all interfaces is not set");
|
||||
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Update ECMP routes to zebra when ECMP is disabled. */
|
||||
void ripng_ecmp_disable(struct ripng *ripng)
|
||||
{
|
||||
|
@ -2847,16 +2717,6 @@ void ripng_init(void)
|
|||
|
||||
install_default(RIPNG_NODE);
|
||||
|
||||
#if 0
|
||||
install_element (VIEW_NODE, &show_ipv6_protocols_cmd);
|
||||
install_element (RIPNG_NODE, &ripng_update_timer_cmd);
|
||||
install_element (RIPNG_NODE, &no_ripng_update_timer_cmd);
|
||||
install_element (RIPNG_NODE, &ripng_timeout_timer_cmd);
|
||||
install_element (RIPNG_NODE, &no_ripng_timeout_timer_cmd);
|
||||
install_element (RIPNG_NODE, &ripng_garbage_timer_cmd);
|
||||
install_element (RIPNG_NODE, &no_ripng_garbage_timer_cmd);
|
||||
#endif /* 0 */
|
||||
|
||||
ripng_if_init();
|
||||
ripng_debug_init();
|
||||
|
||||
|
|
|
@ -230,35 +230,6 @@ struct ripng_info {
|
|||
struct agg_node *rp;
|
||||
};
|
||||
|
||||
#ifdef notyet
|
||||
#if 0
|
||||
/* RIPng tag structure. */
|
||||
struct ripng_tag
|
||||
{
|
||||
/* Tag value. */
|
||||
uint16_t tag;
|
||||
|
||||
/* Port. */
|
||||
uint16_t port;
|
||||
|
||||
/* Multicast group. */
|
||||
struct in6_addr maddr;
|
||||
|
||||
/* Table number. */
|
||||
int table;
|
||||
|
||||
/* Distance. */
|
||||
int distance;
|
||||
|
||||
/* Split horizon. */
|
||||
uint8_t split_horizon;
|
||||
|
||||
/* Poison reverse. */
|
||||
uint8_t poison_reverse;
|
||||
};
|
||||
#endif /* 0 */
|
||||
#endif /* not yet */
|
||||
|
||||
typedef enum {
|
||||
RIPNG_NO_SPLIT_HORIZON = 0,
|
||||
RIPNG_SPLIT_HORIZON,
|
||||
|
@ -294,13 +265,6 @@ struct ripng_interface {
|
|||
/* Route-map. */
|
||||
struct route_map *routemap[RIPNG_FILTER_MAX];
|
||||
|
||||
#ifdef notyet
|
||||
#if 0
|
||||
/* RIPng tag configuration. */
|
||||
struct ripng_tag *rtag;
|
||||
#endif /* 0 */
|
||||
#endif /* notyet */
|
||||
|
||||
/* Default information originate. */
|
||||
uint8_t default_originate;
|
||||
|
||||
|
|
Loading…
Reference in New Issue