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

bgpd: Check if route-map really exists before applying to the peer

Browse Source 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
This commit is contained in:
Donatas Abraitis 2018-09-14 11:56:46 +03:00
parent 78230371e9
commit 1de2762153
7 changed files with 87 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
bgpd/bgp_vty.c
View File

@ -4767,14 +4767,17 @@ static int peer_default_originate_set_vty(struct vty *vty, const char *peer_str,
{ {
int ret; int ret;
struct peer *peer; struct peer *peer;
struct route_map *route_map;
peer = peer_and_group_lookup_vty(vty, peer_str); peer = peer_and_group_lookup_vty(vty, peer_str);
if (!peer) if (!peer)
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
if (set) if (set) {
ret = peer_default_originate_set(peer, afi, safi, rmap); route_map = route_map_lookup_warn_noexist(vty, rmap);
else ret = peer_default_originate_set(peer, afi, safi,
rmap, route_map);
} else
ret = peer_default_originate_unset(peer, afi, safi); ret = peer_default_originate_unset(peer, afi, safi);
return bgp_vty_return(vty, ret); return bgp_vty_return(vty, ret);
@ -5593,6 +5596,7 @@ static int peer_route_map_set_vty(struct vty *vty, const char *ip_str,
int ret; int ret;
struct peer *peer; struct peer *peer;
int direct = RMAP_IN; int direct = RMAP_IN;
struct route_map *route_map;
peer = peer_and_group_lookup_vty(vty, ip_str); peer = peer_and_group_lookup_vty(vty, ip_str);
if (!peer) if (!peer)
@ -5604,7 +5608,8 @@ static int peer_route_map_set_vty(struct vty *vty, const char *ip_str,
else if (strncmp(direct_str, "o", 1) == 0) else if (strncmp(direct_str, "o", 1) == 0)
direct = RMAP_OUT; direct = RMAP_OUT;
ret = peer_route_map_set(peer, afi, safi, direct, name_str); route_map = route_map_lookup_warn_noexist(vty, name_str);
ret = peer_route_map_set(peer, afi, safi, direct, name_str, route_map);
return bgp_vty_return(vty, ret); return bgp_vty_return(vty, ret);
} }
@ -5691,12 +5696,14 @@ static int peer_unsuppress_map_set_vty(struct vty *vty, const char *ip_str,
{ {
int ret; int ret;
struct peer *peer; struct peer *peer;
struct route_map *route_map;
peer = peer_and_group_lookup_vty(vty, ip_str); peer = peer_and_group_lookup_vty(vty, ip_str);
if (!peer) if (!peer)
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
ret = peer_unsuppress_map_set(peer, afi, safi, name_str); route_map = route_map_lookup_warn_noexist(vty, name_str);
ret = peer_unsuppress_map_set(peer, afi, safi, name_str, route_map);
return bgp_vty_return(vty, ret); return bgp_vty_return(vty, ret);
} }
@ -6646,7 +6653,7 @@ DEFPY (af_route_map_vpn_imexport,
bgp->vpn_policy[afi].rmap_name[dir] = XSTRDUP( bgp->vpn_policy[afi].rmap_name[dir] = XSTRDUP(
MTYPE_ROUTE_MAP_NAME, rmap_str); MTYPE_ROUTE_MAP_NAME, rmap_str);
bgp->vpn_policy[afi].rmap[dir] = bgp->vpn_policy[afi].rmap[dir] =
route_map_lookup_by_name(rmap_str); route_map_lookup_warn_noexist(vty, rmap_str);
if (!bgp->vpn_policy[afi].rmap[dir]) if (!bgp->vpn_policy[afi].rmap[dir])
return CMD_SUCCESS; return CMD_SUCCESS;
} else { } else {
@ -6719,7 +6726,7 @@ DEFPY(af_import_vrf_route_map, af_import_vrf_route_map_cmd,
bgp->vpn_policy[afi].rmap_name[dir] = bgp->vpn_policy[afi].rmap_name[dir] =
XSTRDUP(MTYPE_ROUTE_MAP_NAME, rmap_str); XSTRDUP(MTYPE_ROUTE_MAP_NAME, rmap_str);
bgp->vpn_policy[afi].rmap[dir] = bgp->vpn_policy[afi].rmap[dir] =
route_map_lookup_by_name(rmap_str); route_map_lookup_warn_noexist(vty, rmap_str);
if (!bgp->vpn_policy[afi].rmap[dir]) if (!bgp->vpn_policy[afi].rmap[dir])
return CMD_SUCCESS; return CMD_SUCCESS;
} else { } else {
@ -11641,6 +11648,8 @@ DEFUN (bgp_redistribute_ipv4_rmap,
int type; int type;
struct bgp_redist *red; struct bgp_redist *red;
bool changed; bool changed;
struct route_map *route_map = route_map_lookup_warn_noexist(
vty, argv[idx_word]->arg);
type = proto_redistnum(AFI_IP, argv[idx_protocol]->text); type = proto_redistnum(AFI_IP, argv[idx_protocol]->text);
if (type < 0) { if (type < 0) {
@ -11649,7 +11658,8 @@ DEFUN (bgp_redistribute_ipv4_rmap,
} }
red = bgp_redist_add(bgp, AFI_IP, type, 0); red = bgp_redist_add(bgp, AFI_IP, type, 0);
changed = bgp_redistribute_rmap_set(red, argv[idx_word]->arg); changed =
bgp_redistribute_rmap_set(red, argv[idx_word]->arg, route_map);
return bgp_redistribute_set(bgp, AFI_IP, type, 0, changed); return bgp_redistribute_set(bgp, AFI_IP, type, 0, changed);
} }
@ -11713,6 +11723,8 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric,
uint32_t metric; uint32_t metric;
struct bgp_redist *red; struct bgp_redist *red;
bool changed; bool changed;
struct route_map *route_map =
route_map_lookup_warn_noexist(vty, argv[idx_word]->arg);
type = proto_redistnum(AFI_IP, argv[idx_protocol]->text); type = proto_redistnum(AFI_IP, argv[idx_protocol]->text);
if (type < 0) { if (type < 0) {
@ -11722,7 +11734,8 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric,
metric = strtoul(argv[idx_number]->arg, NULL, 10); metric = strtoul(argv[idx_number]->arg, NULL, 10);
red = bgp_redist_add(bgp, AFI_IP, type, 0); red = bgp_redist_add(bgp, AFI_IP, type, 0);
changed = bgp_redistribute_rmap_set(red, argv[idx_word]->arg); changed =
bgp_redistribute_rmap_set(red, argv[idx_word]->arg, route_map);
changed |= bgp_redistribute_metric_set(bgp, red, AFI_IP, type, metric); changed |= bgp_redistribute_metric_set(bgp, red, AFI_IP, type, metric);
return bgp_redistribute_set(bgp, AFI_IP, type, 0, changed); return bgp_redistribute_set(bgp, AFI_IP, type, 0, changed);
} }
@ -11756,6 +11769,8 @@ DEFUN (bgp_redistribute_ipv4_metric_rmap,
uint32_t metric; uint32_t metric;
struct bgp_redist *red; struct bgp_redist *red;
bool changed; bool changed;
struct route_map *route_map =
route_map_lookup_warn_noexist(vty, argv[idx_word]->arg);
type = proto_redistnum(AFI_IP, argv[idx_protocol]->text); type = proto_redistnum(AFI_IP, argv[idx_protocol]->text);
if (type < 0) { if (type < 0) {
@ -11766,7 +11781,8 @@ DEFUN (bgp_redistribute_ipv4_metric_rmap,
red = bgp_redist_add(bgp, AFI_IP, type, 0); red = bgp_redist_add(bgp, AFI_IP, type, 0);
changed = bgp_redistribute_metric_set(bgp, red, AFI_IP, type, metric); changed = bgp_redistribute_metric_set(bgp, red, AFI_IP, type, metric);
changed |= bgp_redistribute_rmap_set(red, argv[idx_word]->arg); changed |=
bgp_redistribute_rmap_set(red, argv[idx_word]->arg, route_map);
return bgp_redistribute_set(bgp, AFI_IP, type, 0, changed); return bgp_redistribute_set(bgp, AFI_IP, type, 0, changed);
} }
@ -11831,6 +11847,8 @@ DEFUN (bgp_redistribute_ipv4_ospf_rmap,
unsigned short instance; unsigned short instance;
int protocol; int protocol;
bool changed; bool changed;
struct route_map *route_map =
route_map_lookup_warn_noexist(vty, argv[idx_word]->arg);
if (strncmp(argv[idx_ospf_table]->arg, "o", 1) == 0) if (strncmp(argv[idx_ospf_table]->arg, "o", 1) == 0)
protocol = ZEBRA_ROUTE_OSPF; protocol = ZEBRA_ROUTE_OSPF;
@ -11839,7 +11857,8 @@ DEFUN (bgp_redistribute_ipv4_ospf_rmap,
instance = strtoul(argv[idx_number]->arg, NULL, 10); instance = strtoul(argv[idx_number]->arg, NULL, 10);
red = bgp_redist_add(bgp, AFI_IP, protocol, instance); red = bgp_redist_add(bgp, AFI_IP, protocol, instance);
changed = bgp_redistribute_rmap_set(red, argv[idx_word]->arg); changed =
bgp_redistribute_rmap_set(red, argv[idx_word]->arg, route_map);
return bgp_redistribute_set(bgp, AFI_IP, protocol, instance, changed); return bgp_redistribute_set(bgp, AFI_IP, protocol, instance, changed);
} }
@ -11919,6 +11938,8 @@ DEFUN (bgp_redistribute_ipv4_ospf_rmap_metric,
unsigned short instance; unsigned short instance;
int protocol; int protocol;
bool changed; bool changed;
struct route_map *route_map =
route_map_lookup_warn_noexist(vty, argv[idx_word]->arg);
if (strncmp(argv[idx_ospf_table]->arg, "o", 1) == 0) if (strncmp(argv[idx_ospf_table]->arg, "o", 1) == 0)
protocol = ZEBRA_ROUTE_OSPF; protocol = ZEBRA_ROUTE_OSPF;
@ -11929,7 +11950,8 @@ DEFUN (bgp_redistribute_ipv4_ospf_rmap_metric,
metric = strtoul(argv[idx_number_2]->arg, NULL, 10); metric = strtoul(argv[idx_number_2]->arg, NULL, 10);
red = bgp_redist_add(bgp, AFI_IP, protocol, instance); red = bgp_redist_add(bgp, AFI_IP, protocol, instance);
changed = bgp_redistribute_rmap_set(red, argv[idx_word]->arg); changed =
bgp_redistribute_rmap_set(red, argv[idx_word]->arg, route_map);
changed |= bgp_redistribute_metric_set(bgp, red, AFI_IP, protocol, changed |= bgp_redistribute_metric_set(bgp, red, AFI_IP, protocol,
metric); metric);
return bgp_redistribute_set(bgp, AFI_IP, protocol, instance, changed); return bgp_redistribute_set(bgp, AFI_IP, protocol, instance, changed);
@ -11970,6 +11992,8 @@ DEFUN (bgp_redistribute_ipv4_ospf_metric_rmap,
unsigned short instance; unsigned short instance;
int protocol; int protocol;
bool changed; bool changed;
struct route_map *route_map =
route_map_lookup_warn_noexist(vty, argv[idx_word]->arg);
if (strncmp(argv[idx_ospf_table]->arg, "o", 1) == 0) if (strncmp(argv[idx_ospf_table]->arg, "o", 1) == 0)
protocol = ZEBRA_ROUTE_OSPF; protocol = ZEBRA_ROUTE_OSPF;
@ -11982,7 +12006,8 @@ DEFUN (bgp_redistribute_ipv4_ospf_metric_rmap,
red = bgp_redist_add(bgp, AFI_IP, protocol, instance); red = bgp_redist_add(bgp, AFI_IP, protocol, instance);
changed = bgp_redistribute_metric_set(bgp, red, AFI_IP, protocol, changed = bgp_redistribute_metric_set(bgp, red, AFI_IP, protocol,
metric); metric);
changed |= bgp_redistribute_rmap_set(red, argv[idx_word]->arg); changed |=
bgp_redistribute_rmap_set(red, argv[idx_word]->arg, route_map);
return bgp_redistribute_set(bgp, AFI_IP, protocol, instance, changed); return bgp_redistribute_set(bgp, AFI_IP, protocol, instance, changed);
} }
@ -12108,6 +12133,8 @@ DEFUN (bgp_redistribute_ipv6_rmap,
int type; int type;
struct bgp_redist *red; struct bgp_redist *red;
bool changed; bool changed;
struct route_map *route_map =
route_map_lookup_warn_noexist(vty, argv[idx_word]->arg);
type = proto_redistnum(AFI_IP6, argv[idx_protocol]->text); type = proto_redistnum(AFI_IP6, argv[idx_protocol]->text);
if (type < 0) { if (type < 0) {
@ -12116,7 +12143,8 @@ DEFUN (bgp_redistribute_ipv6_rmap,
} }
red = bgp_redist_add(bgp, AFI_IP6, type, 0); red = bgp_redist_add(bgp, AFI_IP6, type, 0);
changed = bgp_redistribute_rmap_set(red, argv[idx_word]->arg); changed =
bgp_redistribute_rmap_set(red, argv[idx_word]->arg, route_map);
return bgp_redistribute_set(bgp, AFI_IP6, type, 0, changed); return bgp_redistribute_set(bgp, AFI_IP6, type, 0, changed);
} }
@ -12166,6 +12194,8 @@ DEFUN (bgp_redistribute_ipv6_rmap_metric,
uint32_t metric; uint32_t metric;
struct bgp_redist *red; struct bgp_redist *red;
bool changed; bool changed;
struct route_map *route_map =
route_map_lookup_warn_noexist(vty, argv[idx_word]->arg);
type = proto_redistnum(AFI_IP6, argv[idx_protocol]->text); type = proto_redistnum(AFI_IP6, argv[idx_protocol]->text);
if (type < 0) { if (type < 0) {
@ -12175,7 +12205,8 @@ DEFUN (bgp_redistribute_ipv6_rmap_metric,
metric = strtoul(argv[idx_number]->arg, NULL, 10); metric = strtoul(argv[idx_number]->arg, NULL, 10);
red = bgp_redist_add(bgp, AFI_IP6, type, 0); red = bgp_redist_add(bgp, AFI_IP6, type, 0);
changed = bgp_redistribute_rmap_set(red, argv[idx_word]->arg); changed =
bgp_redistribute_rmap_set(red, argv[idx_word]->arg, route_map);
changed |= bgp_redistribute_metric_set(bgp, red, AFI_IP6, type, changed |= bgp_redistribute_metric_set(bgp, red, AFI_IP6, type,
metric); metric);
return bgp_redistribute_set(bgp, AFI_IP6, type, 0, changed); return bgp_redistribute_set(bgp, AFI_IP6, type, 0, changed);
@ -12199,6 +12230,8 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap,
uint32_t metric; uint32_t metric;
struct bgp_redist *red; struct bgp_redist *red;
bool changed; bool changed;
struct route_map *route_map =
route_map_lookup_warn_noexist(vty, argv[idx_word]->arg);
type = proto_redistnum(AFI_IP6, argv[idx_protocol]->text); type = proto_redistnum(AFI_IP6, argv[idx_protocol]->text);
if (type < 0) { if (type < 0) {
@ -12210,7 +12243,8 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap,
red = bgp_redist_add(bgp, AFI_IP6, type, 0); red = bgp_redist_add(bgp, AFI_IP6, type, 0);
changed = bgp_redistribute_metric_set(bgp, red, AFI_IP6, SAFI_UNICAST, changed = bgp_redistribute_metric_set(bgp, red, AFI_IP6, SAFI_UNICAST,
metric); metric);
changed |= bgp_redistribute_rmap_set(red, argv[idx_word]->arg); changed |=
bgp_redistribute_rmap_set(red, argv[idx_word]->arg, route_map);
return bgp_redistribute_set(bgp, AFI_IP6, type, 0, changed); return bgp_redistribute_set(bgp, AFI_IP6, type, 0, changed);
} }

5
bgpd/bgp_zebra.c
View File

@ -1662,7 +1662,8 @@ int bgp_redistribute_resend(struct bgp *bgp, afi_t afi, int type,
} }
/* Redistribute with route-map specification. */ /* Redistribute with route-map specification. */
int bgp_redistribute_rmap_set(struct bgp_redist *red, const char *name) int bgp_redistribute_rmap_set(struct bgp_redist *red, const char *name,
struct route_map *route_map)
{ {
if (red->rmap.name && (strcmp(red->rmap.name, name) == 0)) if (red->rmap.name && (strcmp(red->rmap.name, name) == 0))
return 0; return 0;
@ -1670,7 +1671,7 @@ int bgp_redistribute_rmap_set(struct bgp_redist *red, const char *name)
if (red->rmap.name) if (red->rmap.name)
XFREE(MTYPE_ROUTE_MAP_NAME, red->rmap.name); XFREE(MTYPE_ROUTE_MAP_NAME, red->rmap.name);
red->rmap.name = XSTRDUP(MTYPE_ROUTE_MAP_NAME, name); red->rmap.name = XSTRDUP(MTYPE_ROUTE_MAP_NAME, name);
red->rmap.map = route_map_lookup_by_name(name); red->rmap.map = route_map;
return 1; return 1;
} }

3
bgpd/bgp_zebra.h
View File

@ -55,7 +55,8 @@ extern struct bgp_redist *bgp_redist_add(struct bgp *, afi_t, uint8_t,
extern int bgp_redistribute_set(struct bgp *, afi_t, int, unsigned short, extern int bgp_redistribute_set(struct bgp *, afi_t, int, unsigned short,
bool changed); bool changed);
extern int bgp_redistribute_resend(struct bgp *, afi_t, int, unsigned short); extern int bgp_redistribute_resend(struct bgp *, afi_t, int, unsigned short);
extern int bgp_redistribute_rmap_set(struct bgp_redist *, const char *); extern int bgp_redistribute_rmap_set(struct bgp_redist *red, const char *name,
struct route_map *route_map);
extern int bgp_redistribute_metric_set(struct bgp *, struct bgp_redist *, afi_t, extern int bgp_redistribute_metric_set(struct bgp *, struct bgp_redist *, afi_t,
int, uint32_t); int, uint32_t);
extern int bgp_redistribute_unset(struct bgp *, afi_t, int, unsigned short); extern int bgp_redistribute_unset(struct bgp *, afi_t, int, unsigned short);

20
bgpd/bgpd.c
View File

@ -4485,7 +4485,7 @@ int peer_update_source_unset(struct peer *peer)
} }
int peer_default_originate_set(struct peer *peer, afi_t afi, safi_t safi, int peer_default_originate_set(struct peer *peer, afi_t afi, safi_t safi,
const char *rmap) const char *rmap, struct route_map *route_map)
{ {
struct peer *member; struct peer *member;
struct listnode *node, *nnode; struct listnode *node, *nnode;
@ -4501,8 +4501,7 @@ int peer_default_originate_set(struct peer *peer, afi_t afi, safi_t safi,
peer->default_rmap[afi][safi].name = peer->default_rmap[afi][safi].name =
XSTRDUP(MTYPE_ROUTE_MAP_NAME, rmap); XSTRDUP(MTYPE_ROUTE_MAP_NAME, rmap);
peer->default_rmap[afi][safi].map = peer->default_rmap[afi][safi].map = route_map;
route_map_lookup_by_name(rmap);
} }
} else if (!rmap) { } else if (!rmap) {
if (peer->default_rmap[afi][safi].name) if (peer->default_rmap[afi][safi].name)
@ -4546,8 +4545,7 @@ int peer_default_originate_set(struct peer *peer, afi_t afi, safi_t safi,
member->default_rmap[afi][safi].name = member->default_rmap[afi][safi].name =
XSTRDUP(MTYPE_ROUTE_MAP_NAME, rmap); XSTRDUP(MTYPE_ROUTE_MAP_NAME, rmap);
member->default_rmap[afi][safi].map = member->default_rmap[afi][safi].map = route_map;
route_map_lookup_by_name(rmap);
} }
/* Update peer route announcements. */ /* Update peer route announcements. */
@ -6012,7 +6010,7 @@ static void peer_aslist_del(const char *aslist_name)
int peer_route_map_set(struct peer *peer, afi_t afi, safi_t safi, int direct, int peer_route_map_set(struct peer *peer, afi_t afi, safi_t safi, int direct,
const char *name) const char *name, struct route_map *route_map)
{ {
struct peer *member; struct peer *member;
struct bgp_filter *filter; struct bgp_filter *filter;
@ -6026,7 +6024,7 @@ int peer_route_map_set(struct peer *peer, afi_t afi, safi_t safi, int direct,
if (filter->map[direct].name) if (filter->map[direct].name)
XFREE(MTYPE_BGP_FILTER_NAME, filter->map[direct].name); XFREE(MTYPE_BGP_FILTER_NAME, filter->map[direct].name);
filter->map[direct].name = XSTRDUP(MTYPE_BGP_FILTER_NAME, name); filter->map[direct].name = XSTRDUP(MTYPE_BGP_FILTER_NAME, name);
filter->map[direct].map = route_map_lookup_by_name(name); filter->map[direct].map = route_map;
/* Check if handling a regular peer. */ /* Check if handling a regular peer. */
if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) { if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) {
@ -6055,7 +6053,7 @@ int peer_route_map_set(struct peer *peer, afi_t afi, safi_t safi, int direct,
if (filter->map[direct].name) if (filter->map[direct].name)
XFREE(MTYPE_BGP_FILTER_NAME, filter->map[direct].name); XFREE(MTYPE_BGP_FILTER_NAME, filter->map[direct].name);
filter->map[direct].name = XSTRDUP(MTYPE_BGP_FILTER_NAME, name); filter->map[direct].name = XSTRDUP(MTYPE_BGP_FILTER_NAME, name);
filter->map[direct].map = route_map_lookup_by_name(name); filter->map[direct].map = route_map;
/* Process peer route updates. */ /* Process peer route updates. */
peer_on_policy_change(member, afi, safi, peer_on_policy_change(member, afi, safi,
@ -6130,7 +6128,7 @@ int peer_route_map_unset(struct peer *peer, afi_t afi, safi_t safi, int direct)
/* Set unsuppress-map to the peer. */ /* Set unsuppress-map to the peer. */
int peer_unsuppress_map_set(struct peer *peer, afi_t afi, safi_t safi, int peer_unsuppress_map_set(struct peer *peer, afi_t afi, safi_t safi,
const char *name) const char *name, struct route_map *route_map)
{ {
struct peer *member; struct peer *member;
struct bgp_filter *filter; struct bgp_filter *filter;
@ -6141,7 +6139,7 @@ int peer_unsuppress_map_set(struct peer *peer, afi_t afi, safi_t safi,
if (filter->usmap.name) if (filter->usmap.name)
XFREE(MTYPE_BGP_FILTER_NAME, filter->usmap.name); XFREE(MTYPE_BGP_FILTER_NAME, filter->usmap.name);
filter->usmap.name = XSTRDUP(MTYPE_BGP_FILTER_NAME, name); filter->usmap.name = XSTRDUP(MTYPE_BGP_FILTER_NAME, name);
filter->usmap.map = route_map_lookup_by_name(name); filter->usmap.map = route_map;
/* Check if handling a regular peer. */ /* Check if handling a regular peer. */
if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) { if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) {
@ -6169,7 +6167,7 @@ int peer_unsuppress_map_set(struct peer *peer, afi_t afi, safi_t safi,
if (filter->usmap.name) if (filter->usmap.name)
XFREE(MTYPE_BGP_FILTER_NAME, filter->usmap.name); XFREE(MTYPE_BGP_FILTER_NAME, filter->usmap.name);
filter->usmap.name = XSTRDUP(MTYPE_BGP_FILTER_NAME, name); filter->usmap.name = XSTRDUP(MTYPE_BGP_FILTER_NAME, name);
filter->usmap.map = route_map_lookup_by_name(name); filter->usmap.map = route_map;
/* Process peer route updates. */ /* Process peer route updates. */
peer_on_policy_change(member, afi, safi, 1); peer_on_policy_change(member, afi, safi, 1);

12
bgpd/bgpd.h
View File

@ -1605,8 +1605,9 @@ extern int peer_update_source_if_set(struct peer *, const char *);
extern int peer_update_source_addr_set(struct peer *, const union sockunion *); extern int peer_update_source_addr_set(struct peer *, const union sockunion *);
extern int peer_update_source_unset(struct peer *); extern int peer_update_source_unset(struct peer *);
extern int peer_default_originate_set(struct peer *, afi_t, safi_t, extern int peer_default_originate_set(struct peer *peer, afi_t afi, safi_t safi,
const char *); const char *rmap,
struct route_map *route_map);
extern int peer_default_originate_unset(struct peer *, afi_t, safi_t); extern int peer_default_originate_unset(struct peer *, afi_t, safi_t);
extern int peer_port_set(struct peer *, uint16_t); extern int peer_port_set(struct peer *, uint16_t);
@ -1644,10 +1645,13 @@ extern int peer_prefix_list_unset(struct peer *, afi_t, safi_t, int);
extern int peer_aslist_set(struct peer *, afi_t, safi_t, int, const char *); extern int peer_aslist_set(struct peer *, afi_t, safi_t, int, const char *);
extern int peer_aslist_unset(struct peer *, afi_t, safi_t, int); extern int peer_aslist_unset(struct peer *, afi_t, safi_t, int);
extern int peer_route_map_set(struct peer *, afi_t, safi_t, int, const char *); extern int peer_route_map_set(struct peer *peer, afi_t afi, safi_t safi, int,
const char *name, struct route_map *route_map);
extern int peer_route_map_unset(struct peer *, afi_t, safi_t, int); extern int peer_route_map_unset(struct peer *, afi_t, safi_t, int);
extern int peer_unsuppress_map_set(struct peer *, afi_t, safi_t, const char *); extern int peer_unsuppress_map_set(struct peer *peer, afi_t afi, safi_t safi,
const char *name,
struct route_map *route_map);
extern int peer_password_set(struct peer *, const char *); extern int peer_password_set(struct peer *, const char *);
extern int peer_password_unset(struct peer *); extern int peer_password_unset(struct peer *);

12
lib/routemap.c
View File

@ -811,6 +811,18 @@ struct route_map *route_map_lookup_by_name(const char *name)
return map; return map;
} }
/* Simple helper to warn if route-map does not exist. */
struct route_map *route_map_lookup_warn_noexist(struct vty *vty, const char *name)
{
struct route_map *route_map = route_map_lookup_by_name(name);
if (!route_map)
if (vty_shell_serv(vty))
vty_out(vty, "The route-map '%s' does not exist.\n", name);
return route_map;
}
int route_map_mark_updated(const char *name) int route_map_mark_updated(const char *name)
{ {
struct route_map *map; struct route_map *map;

3
lib/routemap.h
View File

@ -220,6 +220,9 @@ extern void route_map_install_set(struct route_map_rule_cmd *cmd);
/* Lookup route map by name. */ /* Lookup route map by name. */
extern struct route_map *route_map_lookup_by_name(const char *name); extern struct route_map *route_map_lookup_by_name(const char *name);
/* Simple helper to warn if route-map does not exist. */
struct route_map *route_map_lookup_warn_noexist(struct vty *vty, const char *name);
/* Apply route map to the object. */ /* Apply route map to the object. */
extern route_map_result_t route_map_apply(struct route_map *map, extern route_map_result_t route_map_apply(struct route_map *map,
const struct prefix *prefix, const struct prefix *prefix,