Patchwork [meta-networking] quagga: Avoid duplicate connected address adding to the list

login
register
mail settings
Submitter Xufeng Zhang
Date Nov. 19, 2013, 7:02 a.m.
Message ID <1384844550-18276-1-git-send-email-xufeng.zhang@windriver.com>
Download mbox | patch
Permalink /patch/61943/
State Accepted, archived
Headers show

Comments

Xufeng Zhang - Nov. 19, 2013, 7:02 a.m.
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 <xufeng.zhang@windriver.com>
---
 .../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
Xufeng Zhang - Nov. 19, 2013, 7:04 a.m.
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<xufeng.zhang@windriver.com>
> ---
>   .../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<Yadi.hu@windriver.com>
> +Signed-off-by: Xufeng Zhang<xufeng.zhang@windriver.com>
> +---
> +--- 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"
>
Joe MacDonald - Nov. 26, 2013, 2:51 p.m.
[Re: [oe] [OE][PATCH meta-networking] quagga: Avoid duplicate connected address adding to the list] On 13.11.19 (Tue 15:04) Xufeng Zhang wrote:

> Hi Joe,
> 
> After this fix, we can do nothing to other daemons.

Nice.  Thanks for following up on this, Xufeng.  Do you think it is
reasonable to remove ripd-fix-two-bugs-after-received-SIGHUP.patch, or
is it still required for ripd?

-J.

> 
> 
> 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<xufeng.zhang@windriver.com>
> >---
> >  .../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<Yadi.hu@windriver.com>
> >+Signed-off-by: Xufeng Zhang<xufeng.zhang@windriver.com>
> >+---
> >+--- 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"
>
Joe MacDonald - Nov. 26, 2013, 4:24 p.m.
Merged, thanks.
-J.

[[oe] [OE][PATCH meta-networking] quagga: Avoid duplicate connected address adding to the list] On 13.11.19 (Tue 15:02) 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 <xufeng.zhang@windriver.com>
> ---
>  .../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 <Yadi.hu@windriver.com>
> +Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com>
> +---
> +--- 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"
Xufeng Zhang - Nov. 27, 2013, 2:14 a.m.
On 11/26/2013 10:51 PM, Joe MacDonald wrote:
> [Re: [oe] [OE][PATCH meta-networking] quagga: Avoid duplicate connected address adding to the list] On 13.11.19 (Tue 15:04) Xufeng Zhang wrote:
>
>    
>> Hi Joe,
>>
>> After this fix, we can do nothing to other daemons.
>>      
> Nice.  Thanks for following up on this, Xufeng.  Do you think it is
> reasonable to remove ripd-fix-two-bugs-after-received-SIGHUP.patch, or
> is it still required for ripd?
>    

We should still keep it since 
ripd-fix-two-bugs-after-received-SIGHUP.patch also
fix another bug(RIP_NO_SPLIT_HORIZON flag problem).


Thanks,
Xufeng

> -J.
>
>    
>>
>> 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<xufeng.zhang@windriver.com>
>>> ---
>>>   .../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<Yadi.hu@windriver.com>
>>> +Signed-off-by: Xufeng Zhang<xufeng.zhang@windriver.com>
>>> +---
>>> +--- 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"
>>>        
>>      
>
Joe MacDonald - Nov. 27, 2013, 8:19 p.m.
[Re: [oe] [OE][PATCH meta-networking] quagga: Avoid duplicate connected address adding to the list] On 13.11.27 (Wed 10:14) Xufeng Zhang wrote:

> On 11/26/2013 10:51 PM, Joe MacDonald wrote:
> >[Re: [oe] [OE][PATCH meta-networking] quagga: Avoid duplicate connected address adding to the list] On 13.11.19 (Tue 15:04) Xufeng Zhang wrote:
> >
> >>Hi Joe,
> >>
> >>After this fix, we can do nothing to other daemons.
> >Nice.  Thanks for following up on this, Xufeng.  Do you think it is
> >reasonable to remove ripd-fix-two-bugs-after-received-SIGHUP.patch, or
> >is it still required for ripd?
> 
> We should still keep it since
> ripd-fix-two-bugs-after-received-SIGHUP.patch also
> fix another bug(RIP_NO_SPLIT_HORIZON flag problem).

That's what I was thinking after I looked at the patch again, but thanks
for the confirmation.

-J.

> 
> 
> Thanks,
> Xufeng
> 
> >-J.
> >
> >>
> >>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<xufeng.zhang@windriver.com>
> >>>---
> >>>  .../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<Yadi.hu@windriver.com>
> >>>+Signed-off-by: Xufeng Zhang<xufeng.zhang@windriver.com>
> >>>+---
> >>>+--- 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"
>

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 <Yadi.hu@windriver.com>
+Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com>
+---
+--- 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"