summaryrefslogtreecommitdiff
path: root/zebra
diff options
context:
space:
mode:
authorhasso <hasso>2004-03-18 15:40:33 +0000
committerhasso <hasso>2004-03-18 15:40:33 +0000
commitf1d92e17ab5f1475018e353ce72e94ebe7a81a44 (patch)
tree1e5f7e1f785fc6f3277c765d42e605921ed31b77 /zebra
parentda9c9a24d09071c77843ce39f0470ba487c300bf (diff)
Temorary secondary-label fix. Real fix from Gilad will follow after release.
Diffstat (limited to 'zebra')
-rw-r--r--zebra/ChangeLog6
-rw-r--r--zebra/interface.c23
2 files changed, 29 insertions, 0 deletions
diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index b6df396f..d337a3e5 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,4 +1,10 @@
+2004-04-18 Hasso Tepper <hasso@estpak.ee>
+
+ * interface.c: Temporary fix for handling secondary addresses
+ with label.
+
2004-02-12 Hasso Tepper <hasso@estpak.ee>
+
* zserv.c: Added "ipv6 forwarding" command.
2004-01-08 Greg Troxel <gdt@fnord.ir.bbn.com>
diff --git a/zebra/interface.c b/zebra/interface.c
index 3520371b..84bac4a0 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1109,6 +1109,16 @@ DEFUN (ip_address_label,
return ip_address_install (vty, vty->index, argv[0], NULL, argv[1], 1);
}
+ALIAS (ip_address_label,
+ ip_address_secondary_label_cmd,
+ "ip address A.B.C.D/M secondary label LINE",
+ "Interface Internet Protocol config commands\n"
+ "Set the IP address of an interface\n"
+ "IP address (e.g. 10.0.0.1/8)\n"
+ "Secondary IP address\n"
+ "Label of this address\n"
+ "Label\n")
+
DEFUN (no_ip_address_secondary,
no_ip_address_secondary_cmd,
"no ip address A.B.C.D/M secondary",
@@ -1133,6 +1143,17 @@ DEFUN (no_ip_address_label,
{
return ip_address_uninstall (vty, vty->index, argv[0], NULL, argv[1], 1);
}
+
+ALIAS (no_ip_address_label,
+ no_ip_address_secondary_label_cmd,
+ "no ip address A.B.C.D/M secondary label LINE",
+ NO_STR
+ "Interface Internet Protocol config commands\n"
+ "Set the IP address of an interface\n"
+ "IP address (e.g. 10.0.0.1/8)\n"
+ "Secondary IP address\n"
+ "Label of this address\n"
+ "Label\n")
#endif /* HAVE_NETLINK */
#ifdef HAVE_IPV6
@@ -1427,7 +1448,9 @@ zebra_if_init ()
#ifdef HAVE_NETLINK
install_element (INTERFACE_NODE, &ip_address_secondary_cmd);
install_element (INTERFACE_NODE, &ip_address_label_cmd);
+ install_element (INTERFACE_NODE, &ip_address_secondary_label_cmd);
install_element (INTERFACE_NODE, &no_ip_address_secondary_cmd);
install_element (INTERFACE_NODE, &no_ip_address_label_cmd);
+ install_element (INTERFACE_NODE, &no_ip_address_secondary_label_cmd);
#endif /* HAVE_NETLINK */
}