Acked-by: Donald Sharp <sha...@cumulusnetworks.com>
On Mon, Jun 6, 2016 at 3:49 PM, Christian Franke <
ch...@opensourcerouting.org> wrote:
> From: Christian Franke <nob...@nowhere.ws>
>
> ospf6_interface_if_del has not been in use since for quite some
> years and is broken. (Will crash ospf6d if oi->area == NULL)
>
> Since it is not used, just remove it.
>
> Signed-off-by: Christian Franke <ch...@opensourcerouting.org>
> ---
> ospf6d/ospf6_interface.c | 23 -----------------------
> ospf6d/ospf6_interface.h | 1 -
> ospf6d/ospf6_zebra.c | 7 -------
> 3 files changed, 31 deletions(-)
>
> diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
> index 26f68ac..c31f896 100644
> --- a/ospf6d/ospf6_interface.c
> +++ b/ospf6d/ospf6_interface.c
> @@ -340,29 +340,6 @@ ospf6_interface_if_add (struct interface *ifp)
> }
>
> void
> -ospf6_interface_if_del (struct interface *ifp)
> -{
> - struct ospf6_interface *oi;
> -
> - oi = (struct ospf6_interface *) ifp->info;
> - if (oi == NULL)
> - return;
> -
> - /* interface stop */
> - if (oi->area)
> - thread_execute (master, interface_down, oi, 0);
> -
> - listnode_delete (oi->area->if_list, oi);
> - oi->area = (struct ospf6_area *) NULL;
> -
> - /* cut link */
> - oi->interface = NULL;
> - ifp->info = NULL;
> -
> - ospf6_interface_delete (oi);
> -}
> -
> -void
> ospf6_interface_state_update (struct interface *ifp)
> {
> struct ospf6_interface *oi;
> diff --git a/ospf6d/ospf6_interface.h b/ospf6d/ospf6_interface.h
> index 95a377f..8dffa7c 100644
> --- a/ospf6d/ospf6_interface.h
> +++ b/ospf6d/ospf6_interface.h
> @@ -153,7 +153,6 @@ extern void ospf6_interface_enable (struct
> ospf6_interface *);
> extern void ospf6_interface_disable (struct ospf6_interface *);
>
> extern void ospf6_interface_if_add (struct interface *);
> -extern void ospf6_interface_if_del (struct interface *);
> extern void ospf6_interface_state_update (struct interface *);
> extern void ospf6_interface_connected_route_update (struct interface *);
>
> diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
> index c8f20d8..b8366af 100644
> --- a/ospf6d/ospf6_zebra.c
> +++ b/ospf6d/ospf6_zebra.c
> @@ -120,13 +120,6 @@ ospf6_zebra_if_del (int command, struct zclient
> *zclient, zebra_size_t length,
> zlog_debug ("Zebra Interface delete: %s index %d mtu %d",
> ifp->name, ifp->ifindex, ifp->mtu6);
>
> -#if 0
> - /* XXX: ospf6_interface_if_del is not the right way to handle this,
> - * because among other thinkable issues, it will also clear all
> - * settings as they are contained in the struct ospf6_interface. */
> - ospf6_interface_if_del (ifp);
> -#endif /*0*/
> -
> ifp->ifindex = IFINDEX_INTERNAL;
> return 0;
> }
> --
> 2.8.0
>
>
> _______________________________________________
> Quagga-dev mailing list
> Quagga-dev@lists.quagga.net
> https://lists.quagga.net/mailman/listinfo/quagga-dev
>
_______________________________________________
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev
