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

Merge pull request #1336 from donaldsharp/peer_name

Browse Source 
Peer name
This commit is contained in:
Lou Berger 2017-10-31 11:40:44 -04:00 committed by GitHub
commit 4053d45064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 54 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
bgpd/bgp_routemap.c
View File

@ -222,7 +222,12 @@ static void route_aspath_free(void *rule)
aspath_free(aspath);
}
/* 'match peer (A.B.C.D|X:X::X:X)' */
struct bgp_match_peer_compiled {
char *interface;
union sockunion su;
};
/* 'match peer (A.B.C.D|X:X::X:X|WORD)' */
/* Compares the peer specified in the 'match peer' clause with the peer
received in bgp_info->peer. If it is the same, or if the peer structure
@ -231,6 +236,7 @@ static route_map_result_t route_match_peer(void *rule, struct prefix *prefix,
route_map_object_t type,
void *object)
{
struct bgp_match_peer_compiled *pc;
union sockunion *su;
union sockunion su_def = {
.sin = {.sin_family = AF_INET, .sin_addr.s_addr = INADDR_ANY}};
@ -239,12 +245,19 @@ static route_map_result_t route_match_peer(void *rule, struct prefix *prefix,
struct listnode *node, *nnode;
if (type == RMAP_BGP) {
su = rule;
pc = rule;
su = &pc->su;
peer = ((struct bgp_info *)object)->peer;
if (!CHECK_FLAG(peer->rmap_type, PEER_RMAP_TYPE_IMPORT)
&& !CHECK_FLAG(peer->rmap_type, PEER_RMAP_TYPE_EXPORT))
if (pc->interface) {
if (!peer->conf_if)
return RMAP_NOMATCH;
if (strcmp(peer->conf_if, pc->interface) == 0)
return RMAP_MATCH;
return RMAP_NOMATCH;
}
/* If su='0.0.0.0' (command 'match peer local'), and it's a
NETWORK,
@ -283,23 +296,29 @@ static route_map_result_t route_match_peer(void *rule, struct prefix *prefix,
static void *route_match_peer_compile(const char *arg)
{
union sockunion *su;
struct bgp_match_peer_compiled *pc;
int ret;
su = XMALLOC(MTYPE_ROUTE_MAP_COMPILED, sizeof(union sockunion));
pc = XMALLOC(MTYPE_ROUTE_MAP_COMPILED,
sizeof(struct bgp_match_peer_compiled));
ret = str2sockunion(strcmp(arg, "local") ? arg : "0.0.0.0", su);
ret = str2sockunion(strcmp(arg, "local") ? arg : "0.0.0.0", &pc->su);
if (ret < 0) {
XFREE(MTYPE_ROUTE_MAP_COMPILED, su);
return NULL;
pc->interface = XSTRDUP(MTYPE_ROUTE_MAP_COMPILED, arg);
return pc;
}
return su;
return pc;
}
/* Free route map's compiled `ip address' value. */
static void route_match_peer_free(void *rule)
{
struct bgp_match_peer_compiled *pc = rule;
if (pc->interface)
XFREE(MTYPE_ROUTE_MAP_COMPILED, pc->interface);
XFREE(MTYPE_ROUTE_MAP_COMPILED, rule);
}
@ -3148,11 +3167,12 @@ DEFUN (no_match_evpn_vni,
DEFUN (match_peer,
match_peer_cmd,
"match peer <A.B.C.D|X:X::X:X>",
"match peer <A.B.C.D|X:X::X:X|WORD>",
MATCH_STR
"Match peer address\n"
"IP address of peer\n"
"IPv6 address of peer\n")
"IPv6 address of peer\n"
"Interface name of peer\n")
{
int idx_ip = 2;
return bgp_route_match_add(vty, "peer", argv[idx_ip]->arg,
@ -3172,13 +3192,14 @@ DEFUN (match_peer_local,
DEFUN (no_match_peer,
no_match_peer_cmd,
"no match peer [<local|A.B.C.D|X:X::X:X>]",
"no match peer [<local|A.B.C.D|X:X::X:X|WORD>]",
NO_STR
MATCH_STR
"Match peer address\n"
"Static or Redistributed routes\n"
"IP address of peer\n"
"IPv6 address of peer\n")
"IPv6 address of peer\n"
"Interface name of peer\n")
{
int idx_peer = 3;

1
bgpd/bgp_vty.c
View File

@ -11334,6 +11334,7 @@ static void bgp_ac_neighbor(vector comps, struct cmd_token *token)
static const struct cmd_variable_handler bgp_var_neighbor[] = {
{.varname = "neighbor", .completions = bgp_ac_neighbor},
{.varname = "neighbors", .completions = bgp_ac_neighbor},
{.varname = "peer", .completions = bgp_ac_neighbor},
{.completions = NULL}};
void bgp_vty_init(void)

20
doc/routemap.texi
View File

@ -5,8 +5,8 @@ Route maps provide a means to both filter and/or apply actions to
route, hence allowing policy to be applied to routes.
@menu
* Route Map Command::
* Route Map Match Command::
* Route Map Command::
* Route Map Match Command::
* Route Map Set Command::
* Route Map Call Command::
* Route Map Exit Action Command::
@ -159,6 +159,22 @@ Matches the specified @var{local-preference}.
Matches the specified @var{community_list}
@end deffn
@deffn {Route-map Command} {match peer @var{ipv4_addr}} {}
This is a BGP specific match command. Matches the peer ip address
if the neighbor was specified in this manner.
@end deffn
@deffn {Route-map Command} {match peer @var{ipv6_addr}} {}
This is a BGP specific match command. Matches the peer ipv6
address if the neighbor was specified in this manner.
@end deffn
@deffn {Route-map Command} {match peer @var{interface_name}} {}
This is a BGP specific match command. Matches the peer
interface name specified if the neighbor was specified
in this manner.
@end deffn
@node Route Map Set Command
@section Route Map Set Command