Hi Joe,
After this fix, we can do nothing to other daemons.
Thanks,
Xufeng
On 11/19/2013 03:02 PM, Xufeng Zhang wrote:
commit 27ba970b9("quagga/ripd: Fix two bugs after received SIGHUP signal")
introduces an regression: ifp->connected list is cleaned up when ripd is
restarting, however, for interface addresses which are not specified in
ripd configuration file, they are never to be added into ifp->connected
again, this will lead to some abnormal behavior for route advertising.
Instead of cleaning up the ifp->connected list to avoid duplicated
connected address being added into this list, we can check this
condition during interface address adding process and return early
when an identical address has already been added.
Signed-off-by: Xufeng Zhang<[email protected]>
---
.../quagga-Avoid-duplicate-connected-address.patch | 53 ++++++++++++++++++++
.../recipes-protocols/quagga/quagga.inc | 3 +-
2 files changed, 55 insertions(+), 1 deletions(-)
create mode 100644
meta-networking/recipes-protocols/quagga/files/quagga-Avoid-duplicate-connected-address.patch
diff --git
a/meta-networking/recipes-protocols/quagga/files/quagga-Avoid-duplicate-connected-address.patch
b/meta-networking/recipes-protocols/quagga/files/quagga-Avoid-duplicate-connected-address.patch
new file mode 100644
index 0000000..585dc29
--- /dev/null
+++
b/meta-networking/recipes-protocols/quagga/files/quagga-Avoid-duplicate-connected-address.patch
@@ -0,0 +1,53 @@
+quagga: Avoid duplicate connected address adding to the list
+
+commit 27ba970b9("quagga/ripd: Fix two bugs after received SIGHUP signal")
+introduces an regression: ifp->connected list is cleaned up when ripd is
+restarting, however, for interface addresses which are not specified in
+ripd configuration file, they are never to be added into ifp->connected
+again, this will lead to some abnormal behavior for route advertising.
+
+Instead of cleaning up the ifp->connected list to avoid duplicated
+connected address being added into this list, we can check this
+condition during interface address adding process and return early
+when an identical address has already been added.
+
+Upstream-Status: Pending
+
+Signed-off-by: Hu Yadi<[email protected]>
+Signed-off-by: Xufeng Zhang<[email protected]>
+---
+--- a/lib/if.c
++++ b/lib/if.c
+@@ -738,6 +738,16 @@
+ struct prefix *destination)
+ {
+ struct connected *ifc;
++ struct listnode *cnode;
++ struct connected *c;
++ int ret = 0;
++
++ for (ALL_LIST_ELEMENTS_RO (ifp->connected, cnode, c))
++ {
++ ret = connected_same_prefix (p, (c->address));
++ if(ret == 1)
++ return NULL;
++ }
+
+ /* Allocate new connected address. */
+ ifc = connected_new ();
+--- a/ripd/rip_interface.c
++++ b/ripd/rip_interface.c
+@@ -516,13 +516,6 @@
+ thread_cancel (ri->t_wakeup);
+ ri->t_wakeup = NULL;
+ }
+-
+- for (conn_node = listhead (ifp->connected); conn_node; conn_node = next)
+- {
+- ifc = listgetdata (conn_node);
+- next = conn_node->next;
+- listnode_delete (ifp->connected, ifc);
+- }
+ }
+ }
+
diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc
b/meta-networking/recipes-protocols/quagga/quagga.inc
index 2106c9b..21c2028 100644
--- a/meta-networking/recipes-protocols/quagga/quagga.inc
+++ b/meta-networking/recipes-protocols/quagga/quagga.inc
@@ -32,7 +32,8 @@ SRC_URI =
"http://download.savannah.gnu.org/releases/quagga${QUAGGASUBDIR}/quagg
file://watchquagga.init \
file://watchquagga.default \
file://volatiles.03_quagga \
- file://ripd-fix-two-bugs-after-received-SIGHUP.patch"
+ file://ripd-fix-two-bugs-after-received-SIGHUP.patch \
+ file://quagga-Avoid-duplicate-connected-address.patch"
PACKAGECONFIG ??= ""
PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap"
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
