bgpd: null check (Coverity 1399270)

Signed-off-by: F. Aragon <paco@voltanet.io>

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 5d858ae14fa1a3385160d230ebb65c5c43010fed..48c27c1d61aa7d3bdafa2e58ce766e4cc3d9559c 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -102,6 +102,7 @@ struct community_list_handler *bgp_clist;
 unsigned int multipath_num = MULTIPATH_NUM;
 
 static void bgp_if_finish(struct bgp *bgp);
+static void peer_drop_dynamic_neighbor(struct peer *peer);
 
 extern struct zclient *zclient;
 
@@ -3718,10 +3719,10 @@ struct peer *peer_lookup_dynamic_neighbor(struct bgp *bgp, union sockunion *su)
        return peer;
 }
 
-void peer_drop_dynamic_neighbor(struct peer *peer)
+static void peer_drop_dynamic_neighbor(struct peer *peer)
 {
        int dncount = -1;
-       if (peer->group && peer->group->bgp) {
+       if (peer->group->bgp) {
                dncount = peer->group->bgp->dynamic_neighbors_count;
                if (dncount)
                        peer->group->bgp->dynamic_neighbors_count = --dncount;
@@ -3731,7 +3732,6 @@ void peer_drop_dynamic_neighbor(struct peer *peer)
                           peer->group->name, dncount);
 }
 
-
 /* If peer is configured at least one address family return 1. */
 int peer_active(struct peer *peer)
 {

diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 24d05c2e80e7eff198ae2772d61b9d24475e6f61..33d65bcb0f8d5b3d36ed7b8d686a67f2c085cdde 100644 (file)
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -1462,7 +1462,6 @@ extern struct peer_group *peer_group_lookup_dynamic_neighbor(struct bgp *,
                                                             struct prefix **);
 extern struct peer *peer_lookup_dynamic_neighbor(struct bgp *,
                                                 union sockunion *);
-extern void peer_drop_dynamic_neighbor(struct peer *);
 
 /*
  * Peers are incredibly easy to memory leak