| 1 |
flameeyes 10/09/06 11:58:52 |
| 2 |
|
| 3 |
Added: quagga-0.99.17-gentoo.patch |
| 4 |
Removed: quagga-0.99.17-libcap.patch |
| 5 |
quagga-0.99.14-fix-ipremove.patch |
| 6 |
Log: |
| 7 |
Reduce overhead by merging the two patches in a single gentoo patch. |
| 8 |
|
| 9 |
(Portage version: 2.2_rc75/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 net-misc/quagga/files/quagga-0.99.17-gentoo.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/files/quagga-0.99.17-gentoo.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/files/quagga-0.99.17-gentoo.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: quagga-0.99.17-gentoo.patch |
| 18 |
=================================================================== |
| 19 |
diff --git a/lib/Makefile.am b/lib/Makefile.am |
| 20 |
index 315e919..6e69993 100644 |
| 21 |
--- a/lib/Makefile.am |
| 22 |
+++ b/lib/Makefile.am |
| 23 |
@@ -18,7 +18,7 @@ BUILT_SOURCES = memtypes.h route_types.h |
| 24 |
|
| 25 |
libzebra_la_DEPENDENCIES = @LIB_REGEX@ |
| 26 |
|
| 27 |
-libzebra_la_LIBADD = @LIB_REGEX@ |
| 28 |
+libzebra_la_LIBADD = @LIB_REGEX@ $(LIBCAP) |
| 29 |
|
| 30 |
pkginclude_HEADERS = \ |
| 31 |
buffer.h checksum.h command.h filter.h getopt.h hash.h \ |
| 32 |
diff --git a/zebra/Makefile.am b/zebra/Makefile.am |
| 33 |
index 542f36f..d09a209 100644 |
| 34 |
--- a/zebra/Makefile.am |
| 35 |
+++ b/zebra/Makefile.am |
| 36 |
@@ -5,7 +5,6 @@ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@ |
| 37 |
INSTALL_SDATA=@INSTALL@ -m 600 |
| 38 |
|
| 39 |
LIB_IPV6 = @LIB_IPV6@ |
| 40 |
-LIBCAP = @LIBCAP@ |
| 41 |
|
| 42 |
ipforward = @IPFORWARD@ |
| 43 |
if_method = @IF_METHOD@ |
| 44 |
@@ -39,9 +38,9 @@ noinst_HEADERS = \ |
| 45 |
connected.h ioctl.h rib.h rt.h zserv.h redistribute.h debug.h rtadv.h \ |
| 46 |
interface.h ipforward.h irdp.h router-id.h kernel_socket.h |
| 47 |
|
| 48 |
-zebra_LDADD = $(otherobj) $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.la |
| 49 |
+zebra_LDADD = $(otherobj) ../lib/libzebra.la $(LIB_IPV6) |
| 50 |
|
| 51 |
-testzebra_LDADD = $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.la |
| 52 |
+testzebra_LDADD = ../lib/libzebra.la $(LIB_IPV6) |
| 53 |
|
| 54 |
zebra_DEPENDENCIES = $(otherobj) |
| 55 |
|
| 56 |
diff --git a/zebra/interface.c b/zebra/interface.c |
| 57 |
index 03e7ff7..182caa5 100644 |
| 58 |
--- a/zebra/interface.c |
| 59 |
+++ b/zebra/interface.c |
| 60 |
@@ -1284,17 +1284,17 @@ ip_address_uninstall (struct vty *vty, struct interface *ifp, |
| 61 |
return CMD_WARNING; |
| 62 |
} |
| 63 |
|
| 64 |
-#if 0 |
| 65 |
/* Redistribute this information. */ |
| 66 |
zebra_interface_address_delete_update (ifp, ifc); |
| 67 |
|
| 68 |
/* Remove connected route. */ |
| 69 |
connected_down_ipv4 (ifp, ifc); |
| 70 |
|
| 71 |
+ if_subnet_delete(ifp, ifc); |
| 72 |
+ |
| 73 |
/* Free address information. */ |
| 74 |
listnode_delete (ifp->connected, ifc); |
| 75 |
connected_free (ifc); |
| 76 |
-#endif |
| 77 |
|
| 78 |
return CMD_SUCCESS; |
| 79 |
} |
Archives