proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-11 09:18:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5234 from donaldsharp/fix_sa_or_else

Browse Source 
Fix sa or else
This commit is contained in:
Donatas Abraitis 2019-10-29 08:58:51 +02:00 committed by GitHub
commit f7f051f230
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bfdd/bfd.c
View File

@ -159,6 +159,7 @@ int bfd_session_enable(struct bfd_session *bs)
bs->vrf = vrf;
if (bs->vrf == NULL)
bs->vrf = vrf_lookup_by_id(VRF_DEFAULT);
assert(bs->vrf);
if (bs->key.ifname[0]
&& BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH) == 0)

3
bfdd/bfd_packet.c
View File

@ -529,8 +529,7 @@ int bfd_recv_cb(struct thread *t)
uint8_t msgbuf[1516];
struct bfd_vrf_global *bvrf = THREAD_ARG(t);
if (bvrf)
vrfid = bvrf->vrf->vrf_id;
vrfid = bvrf->vrf->vrf_id;
/* Schedule next read. */
bfd_sd_reschedule(bvrf, sd);

2
bgpd/bgp_mpath.c
View File

@ -614,8 +614,6 @@ void bgp_path_info_mpath_update(struct bgp_node *rn,
if ((mpath_count < maxpaths) && (new_mpath != new_best)
&& bgp_path_info_nexthop_cmp(prev_mpath,
new_mpath)) {
if (new_mpath == next_mpath)
bgp_path_info_mpath_next(new_mpath);
bgp_path_info_mpath_dequeue(new_mpath);
bgp_path_info_mpath_enqueue(prev_mpath,

20
bgpd/bgp_route.c
View File

@ -7241,21 +7241,11 @@ void route_vty_out(struct vty *vty, struct prefix *p,
if (json_paths) {
json_nexthop_global = json_object_new_object();
if ((safi == SAFI_MPLS_VPN) || (safi == SAFI_EVPN))
json_object_string_add(
json_nexthop_global,
nexthop_fqdn ? "fqdn" : "ip",
nexthop_fqdn
? nexthop_fqdn
: inet_ntoa(
attr->mp_nexthop_global_in));
else
json_object_string_add(
json_nexthop_global,
nexthop_fqdn ? "fqdn" : "ip",
nexthop_fqdn
? nexthop_fqdn
: inet_ntoa(attr->nexthop));
json_object_string_add(json_nexthop_global,
nexthop_fqdn ? "fqdn" : "ip",
nexthop_fqdn
? nexthop_fqdn
: inet_ntoa(attr->nexthop));
json_object_string_add(json_nexthop_global, "afi",
"ipv4");

4
bgpd/bgpd.c
View File

@ -7530,7 +7530,6 @@ static void bgp_config_write_family(struct vty *vty, struct bgp *bgp, afi_t afi,
int bgp_config_write(struct vty *vty)
{
int write = 0;
struct bgp *bgp;
struct peer_group *group;
struct peer *peer;
@ -7541,9 +7540,6 @@ int bgp_config_write(struct vty *vty)
vty_out(vty, "bgp route-map delay-timer %u\n",
bm->rmap_update_timer);
if (write)
vty_out(vty, "!\n");
/* BGP configuration. */
for (ALL_LIST_ELEMENTS(bm->bgp, mnode, mnnode, bgp)) {

8
bgpd/rfapi/rfapi.c
View File

@ -3190,12 +3190,8 @@ DEFUN (debug_rfapi_register_vn_un_l2o,
return CMD_WARNING_CONFIG_FAILED;
}
optary[opt_next].type = RFAPI_VN_OPTION_TYPE_L2ADDR;
if (opt_next) {
optary[opt_next - 1].next = optary + opt_next;
} else {
opt = optary;
}
++opt_next;
opt = optary;
/* L2 option parsing END */
/* TBD fixme */

2
bgpd/rfapi/rfapi_vty.c
View File

@ -4708,8 +4708,6 @@ static int vnc_add_vrf_prefix(struct vty *vty, const char *arg_vrf,
rfapiQprefix2Rprefix(&pfx, &rpfx);
memset(optary, 0, sizeof(optary));
if (arg_rd) {
if (opt != NULL)
opt->next = &optary[cur_opt];
opt = &optary[cur_opt++];
opt->type = RFAPI_VN_OPTION_TYPE_INTERNAL_RD;
if (!str2prefix_rd(arg_rd, &opt->v.internal_rd)) {

2
bgpd/rfapi/vnc_import_bgp.c
View File

@ -479,8 +479,6 @@ static void vnc_import_bgp_add_route_mode_resolve_nve_one_bi(
encaptlvs = bpi->attr->vnc_subtlvs;
if (bpi->attr->encap_tunneltype != BGP_ENCAP_TYPE_RESERVED
&& bpi->attr->encap_tunneltype != BGP_ENCAP_TYPE_MPLS) {
if (opt != NULL)
opt->next = &optary[cur_opt];
opt = &optary[cur_opt++];
memset(opt, 0, sizeof(struct rfapi_un_option));
opt->type = RFAPI_UN_OPTION_TYPE_TUNNELTYPE;