net/frr/patches/050-ospf_nbr_nbma_lookup_next.patch

   1 From 153bdb3d03542530ed1deccbefc716cb4b699a67 Mon Sep 17 00:00:00 2001
   2 From: Donald Sharp <sharpd@nvidia.com>
   3 Date: Thu, 28 Jan 2021 14:56:11 -0500
   4 Subject: [PATCH] ospfd: ospf_nbr_nbma_lookup_next always returns NULL
   5
   6 The calling function of ospf_nbr_nbma_lookup_next calls
   7 this function and then immediately returns when it
   8 gets the NULL.  Just cleanup a bit more code.
   9
  10 Signed-off-by: Donald Sharp <sharpd@nvidia.com>
  11 ---
  12  ospfd/ospf_snmp.c | 23 +----------------------
  13  ospfd/ospfd.c     |  9 ---------
  14  ospfd/ospfd.h     |  2 --
  15  3 files changed, 1 insertion(+), 33 deletions(-)
  16
  17 --- a/ospfd/ospf_snmp.c
  18 +++ b/ospfd/ospf_snmp.c
  19 @@ -1236,7 +1236,6 @@ static struct ospf_nbr_nbma *ospfHostLoo
  20                                             size_t *length,
  21                                             struct in_addr *addr, int exact)
  22  {
  23 -       int len;
  24         struct ospf_nbr_nbma *nbr_nbma;
  25         struct ospf *ospf;
  26
  27 @@ -1258,28 +1257,8 @@ static struct ospf_nbr_nbma *ospfHostLoo
  28                 nbr_nbma = ospf_nbr_nbma_lookup(ospf, *addr);
  29
  30                 return nbr_nbma;
  31 -       } else {
  32 -               len = *length - v->namelen;
  33 -               if (len > 4)
  34 -                       len = 4;
  35 -
  36 -               oid2in_addr(name + v->namelen, len, addr);
  37 -
  38 -               nbr_nbma =
  39 -                       ospf_nbr_nbma_lookup_next(ospf, addr, len == 0 ? 1 : 0);
  40 -
  41 -               if (nbr_nbma == NULL)
  42 -                       return NULL;
  43 -
  44 -               oid_copy_addr(name + v->namelen, addr, IN_ADDR_SIZE);
  45 -
  46 -               /* Set TOS 0. */
  47 -               name[v->namelen + IN_ADDR_SIZE] = 0;
  48 -
  49 -               *length = v->namelen + IN_ADDR_SIZE + 1;
  50 -
  51 -               return nbr_nbma;
  52         }
  53 +
  54         return NULL;
  55  }
  56
  57 --- a/ospfd/ospfd.c
  58 +++ b/ospfd/ospfd.c
  59 @@ -1932,35 +1932,6 @@ struct ospf_nbr_nbma *ospf_nbr_nbma_look
  60         return NULL;
  61  }
  62
  63 -struct ospf_nbr_nbma *ospf_nbr_nbma_lookup_next(struct ospf *ospf,
  64 -                                               struct in_addr *addr, int first)
  65 -{
  66 -#if 0
  67 -  struct ospf_nbr_nbma *nbr_nbma;
  68 -  struct listnode *node;
  69 -#endif
  70 -
  71 -       if (ospf == NULL)
  72 -               return NULL;
  73 -
  74 -#if 0
  75 -  for (ALL_LIST_ELEMENTS_RO (ospf->nbr_nbma, node, nbr_nbma))
  76 -    {
  77 -      if (first)
  78 -       {
  79 -         *addr = nbr_nbma->addr;
  80 -         return nbr_nbma;
  81 -       }
  82 -      else if (ntohl (nbr_nbma->addr.s_addr) > ntohl (addr->s_addr))
  83 -       {
  84 -         *addr = nbr_nbma->addr;
  85 -         return nbr_nbma;
  86 -       }
  87 -    }
  88 -#endif
  89 -       return NULL;
  90 -}
  91 -
  92  int ospf_nbr_nbma_set(struct ospf *ospf, struct in_addr nbr_addr)
  93  {
  94         struct ospf_nbr_nbma *nbr_nbma;
  95 --- a/ospfd/ospfd.h
  96 +++ b/ospfd/ospfd.h
  97 @@ -567,8 +567,6 @@ extern void ospf_terminate(void);
  98  extern void ospf_nbr_nbma_if_update(struct ospf *, struct ospf_interface *);
  99  extern struct ospf_nbr_nbma *ospf_nbr_nbma_lookup(struct ospf *,
 100                                                   struct in_addr);
 101 -extern struct ospf_nbr_nbma *ospf_nbr_nbma_lookup_next(struct ospf *,
 102 -                                                      struct in_addr *, int);
 103  extern int ospf_oi_count(struct interface *);
 104
 105  extern struct ospf_area *ospf_area_get(struct ospf *, struct in_addr);