proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-03 07:30:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5408 from donaldsharp/scan7

Browse Source 
Scan7
This commit is contained in:
Russ White 2019-11-26 09:48:20 -05:00 committed by GitHub
commit 2f7b0479e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/bgp_route.c
View File

@ -12183,6 +12183,12 @@ DEFUN (bgp_damp_set,
max = 4 * half;
}
/*
* These can't be 0 but our SA doesn't understand the
* way our cli is constructed
*/
assert(reuse);
assert(half);
if (suppress < reuse) {
vty_out(vty,
"Suppress value cannot be less than reuse value \n");

4
ospfd/ospf_apiserver.c
View File

@ -2330,9 +2330,7 @@ void ospf_apiserver_clients_notify_nsm_change(struct ospf_neighbor *nbr)
assert(nbr);
if (nbr->oi) {
ifaddr = nbr->oi->address->u.prefix4;
}
ifaddr = nbr->oi->address->u.prefix4;
nbraddr = nbr->address.u.prefix4;

5
ospfd/ospf_flood.c
View File

@ -328,8 +328,7 @@ int ospf_flood(struct ospf *ospf, struct ospf_neighbor *nbr,
ospf_ls_retransmit_delete_nbr_as(ospf, current);
break;
default:
ospf_ls_retransmit_delete_nbr_area(nbr->oi->area,
current);
ospf_ls_retransmit_delete_nbr_area(oi->area, current);
break;
}
}
@ -345,7 +344,7 @@ int ospf_flood(struct ospf *ospf, struct ospf_neighbor *nbr,
procedure cannot overwrite the newly installed LSA until
MinLSArrival seconds have elapsed. */
if (!(new = ospf_lsa_install(ospf, nbr->oi, new)))
if (!(new = ospf_lsa_install(ospf, oi, new)))
return -1; /* unknown LSA type or any other error condition */
/* Acknowledge the receipt of the LSA by sending a Link State

4
ospfd/ospf_neighbor.c
View File

@ -141,6 +141,8 @@ void ospf_nbr_free(struct ospf_neighbor *nbr)
thread_cancel_event(master, nbr);
ospf_bfd_info_free(&nbr->bfd_info);
nbr->oi = NULL;
XFREE(MTYPE_OSPF_NEIGHBOR, nbr);
}
@ -446,7 +448,7 @@ static struct ospf_neighbor *ospf_nbr_add(struct ospf_interface *oi,
nbr->crypt_seqnum = ospfh->u.crypt.crypt_seqnum;
if (IS_DEBUG_OSPF_EVENT)
zlog_debug("NSM[%s:%s]: start", IF_NAME(nbr->oi),
zlog_debug("NSM[%s:%s]: start", IF_NAME(oi),
inet_ntoa(nbr->router_id));
return nbr;

2
ospfd/ospf_nsm.c
View File

@ -224,7 +224,7 @@ static int ospf_db_summary_add(struct ospf_neighbor *nbr, struct ospf_lsa *lsa)
case OSPF_OPAQUE_LINK_LSA:
/* Exclude type-9 LSAs that does not have the same "oi" with
* "nbr". */
if (nbr->oi && ospf_if_exists(lsa->oi) != nbr->oi)
if (ospf_if_exists(lsa->oi) != nbr->oi)
return 0;
break;
case OSPF_OPAQUE_AREA_LSA:

4
ospfd/ospf_packet.c
View File

@ -3746,8 +3746,6 @@ int ospf_hello_reply_timer(struct thread *thread)
nbr = THREAD_ARG(thread);
nbr->t_hello_reply = NULL;
assert(nbr->oi);
if (IS_DEBUG_OSPF(nsm, NSM_TIMERS))
zlog_debug("NSM[%s:%s]: Timer (hello-reply timer expire)",
IF_NAME(nbr->oi), inet_ntoa(nbr->router_id));
@ -4335,7 +4333,7 @@ void ospf_proactively_arp(struct ospf_neighbor *nbr)
char ping_nbr[OSPF_PING_NBR_STR_MAX];
int ret;
if (!nbr || !nbr->oi || !nbr->oi->ifp)
if (!nbr)
return;
snprintf(ping_nbr, sizeof(ping_nbr),

2
ospfd/ospf_snmp.c
View File

@ -2257,8 +2257,6 @@ static uint8_t *ospfNbrEntry(struct variable *v, oid *name, size_t *length,
if (!nbr)
return NULL;
oi = nbr->oi;
if (!oi)
return NULL;
/* Return the current value of the variable */
switch (v->magic) {