proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 07:21:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,597 Commits 4 Branches 191 Tags 125 MiB
f15dd9a4ee
Commit Graph

6597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Lamparter
1e78204400 Merge branch 'frr/pull/118' 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-26 03:15:33 +01:00
Donald Sharp
6dfe1c38d7 Merge pull request #101 from LabNConsulting/working/master/patch-set/3-vrf 
Master version of basic vrf commands & some other missed fixes
 2017-01-25 18:26:15 -05:00
David Lamparter
dcb817fd27 Merge branch 'frr/pull/92' (BGP Large Community support) 
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-25 23:04:29 +01:00
David Lamparter
ed165abf90 bgpd: lcommunity: fix minor issues 
- route_set_lcommunity would do nothing (and leak memory) if attr->extra
  wasn't up yet
- an if() arch in bgp_show_table() was duplicated (with no effect)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-25 22:35:03 +01:00
David Lamparter
2acb4ac250 bgpd: lcommunity: fix whitespace & copyright 
(to match surrounding code)
"git diff -w" should be almost empty.

Copyright edited to say FRR, this is not GNU Zebra :)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-25 22:35:03 +01:00
Martin Winter
3ab11ecc7b snapcraft: Add snapcraft build and definition files 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 04:23:43 +07:00
Russ White
dfa7df29a8 Merge pull request #120 from opensourcerouting/snapcraft-base-v3 
Snapcraft base changes
 2017-01-25 15:04:49 -05:00
Martin Winter
38657f2ebd lib: Don't change uid/gid if we are already the correct uid/gid 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:45:05 +07:00
Martin Winter
ce2e9ec3ad vtysh: Add --config_dir option to override compiled in location for vtysh.conf and Quagga.conf 
Only allow the override if vtysh is not run with setuid()

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:44:55 +07:00
Renato Westphal
372b8bd381 ldpd: add ctl_socket cli option to override the compiled-in location for the control socket 
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
 2017-01-26 00:44:42 +07:00
Martin Winter
f38e9e49f5 vtysh: Use HOME environment variable to get homedir and only fallback to passed entry if no HOME is defined 
Snap packages have a local HOME defined inside the SNAP container, but don't get access to passwd entry.

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:44:31 +07:00
Martin Winter
87d79a9f79 vtysh: Add vty_socket cli option to override the compiled-in location for the VTY daemon sockets 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:43:58 +07:00
Martin Winter
7fa382d1d0 ripngd: Add vty_socket cli option to override the compiled-in location for the VTY Socket 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:42:14 +07:00
Martin Winter
a5c83e7aca ripd: Add vty_socket cli option to override the compiled-in location for the VTY Socket 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:42:06 +07:00
Martin Winter
66f7d8303c ldpd: Add vty_socket cli option to override the compiled-in location for the VTY Socket 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:41:56 +07:00
Martin Winter
a8cdea56f4 pimd: Add vty_socket cli option to override the compiled-in location for the VTY Socket 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:41:46 +07:00
Martin Winter
9cbb96304c ospfd: Add vty_socket cli option to override the compiled-in location for the VTY Socket and add instance number for multi-instance ospf 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:41:40 +07:00
Martin Winter
a766b038f5 ospf6d: Add vty_socket cli option to override the compiled-in location for the VTY Socket 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:41:32 +07:00
Martin Winter
bcaefc1f4d isisd: Add vty_socket cli option to override the compiled-in location for the VTY Socket 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:41:25 +07:00
Martin Winter
98bd8260b6 bgpd: Add vty_socket cli option to override the compiled-in location for the VTY Socket 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:41:16 +07:00
Martin Winter
48f8480d4c zebra: Add vty_socket cli option to override the compiled-in location for the VTY Socket 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:41:09 +07:00
Martin Winter
950765ba10 lib: Add set_socket_path() to sockopt.c to override the path element of a (vty) socket (but keep filename) 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:40:55 +07:00
Martin Winter
780cff2f08 pimd: Add missing 'socket' getopt cmdline option 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-01-26 00:40:32 +07:00
Donald Sharp
c493f2d83a bgpd: Remove redundant warning message 
When bgp_vty_find_and_parse_afi_safi_vrf detects
a invalidly named vrf, it warns the user.  There
is no need for the calling function to warn
again.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-25 09:43:11 -05:00
Donald Sharp
7eeee51e02 bgpd: Add some documentation for bgp_vty_find_and_parse_afi_safi_vrf 
The use of this function was causing some confusion.  As
such let's add some documentation.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-25 09:37:13 -05:00
Donald Sharp
a957a05bb4 pimd: Cleanup some missing help strings. 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-25 09:13:46 -05:00
Donald Sharp
9aafae157a Merge pull request #116 from bingen/bugfix/zclient_missing_break 
lib: Fix missing break in zlcient switch
 2017-01-25 08:56:33 -05:00
ßingen
5cd459e86e lib: Fix missing break in zlcient switch 2017-01-25 14:33:01 +01:00
Donald Sharp
47350fd9f4 bgpd: Add ability to clean lcommunity hash 
Ensure that we don't leak any memory on shutdown.
Since the bgp_lcommunity.c file mirrors bgp_ecommunity.c
Add the same code for shutdown that ecommunity has.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-25 08:26:21 -05:00
Donald Sharp
c74e219474 pimd: Fix double add of command 
We were adding the 'ip msdp ...' command to
the parser 2x.  Some new code added to the
parser apparently catches this for us now.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-25 08:20:06 -05:00
Donald Sharp
d2ce19c9b5 Merge pull request #105 from opensourcerouting/cli_merge_step_prep 
Prepare for split-off cli parser "merge" step
 2017-01-25 07:49:21 -05:00
Quentin Young
9ffaae7a4f Merge pull request #114 from opensourcerouting/parser-mtypes 
lib: parser: fix memory management
 2017-01-24 21:16:23 -05:00
Donald Sharp
1ef15f4685 Merge pull request #112 from LabNConsulting/working/2.0/patch-set/rr1 
2.0, Issue #91 FIx VPN/ENCAP safi handoff to rfapi
 2017-01-24 20:54:31 -05:00
David Lamparter
83364d20d5 lib: parser: fix memory management 
command.c had:
DEFINE_MTYPE_STATIC(LIB, CMD_TOKENS, "Command desc")
while command_match.c had:
DEFINE_MTYPE_STATIC(LIB, CMD_TOKENS, "Command Tokens")

... which means that there are 2 distinct MTYPE_CMD_TOKENS.
(The description text being different does not matter, even with the
same text it'd be 2 distinct types.)

command_match.c allocates token->arg in command_match_r() while
command.c frees it in del_cmd_token().  Therefore with each command
being executed, the allocation count goes up on one, down on the other.

=> clean up parser allocation counting.  Also, use separate MTYPEs for
the different fields in struct cmd_token.

Fixes: #108 / ee9216cf ("lib, ripngd: clean up merge leftovers")
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Cc: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-01-25 02:27:29 +01:00
Lou Berger
4f280b15b1 bgpd: more VPN&ENCAP show afi safi related cleanup 
Issued ID'ed by regression

Signed-off-by: Lou Berger <lberger@labn.net>
 2017-01-24 17:07:02 -05:00
Lou Berger
bbd1d850f7 bgpd: restore show bgp neighbors command 2017-01-24 13:44:48 -05:00
Lou Berger
b99615f95f bgpd: disambiguate differet forms of 
show bgp ipv4 vpn
      address-family ipv4&6 vpn

Signed-off-by: Lou Berger <lberger@labn.net>
 2017-01-24 13:44:30 -05:00
G. Paul Ziemba
28070ee3c4 bgpd rfapi: Shift rfapi receive hooks for vpn and encap safis into 
bgp_update/bgp_withdraw (Issue #91)

Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2017-01-24 13:42:43 -05:00
Lou Berger
8074b6fda3 bgpd rfapi: fix issue where advertised prefixes were not being disambiguated 
by RD

Signed-off-by: Lou Berger <lberger@labn.net>
 2017-01-24 13:40:12 -05:00
G. Paul Ziemba
eb78bc468e bgpd rfapi: Shift rfapi receive hooks for vpn and encap safis into 
bgp_update/bgp_withdraw (Issue #91)

Signed-off-by: G. Paul Ziemba <paulz@labn.net>
 2017-01-24 13:15:06 -05:00
Donald Sharp
ac9ddce37d Merge pull request #104 from opensourcerouting/time-cleanup 
Time cleanup
 2017-01-24 11:43:32 -05:00
David Lamparter
881f3be07b Merge pull request #106 from donaldsharp/sbuild 
debian: Fix changelog so sbuild will work
 2017-01-24 17:24:07 +01:00
David Lamparter
e5951aa21d Merge pull request #42 from donaldsharp/pim_lib_work2 
Pim-SM + MSDP
 2017-01-24 17:10:09 +01:00
Philippe Guibert
75688c44d9 bgpd: fix show ip bgp ipv4|ipv6 vpn command 
The fix consists in setting the correct safi value.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2017-01-24 16:18:55 +01:00
Philippe Guibert
b2f0fa552b bgpd: move bgp_show_type enumerate to bgp_route.h 
This bgp_show_type enumerate was duplicated and modified in several
places. The commit takes the enumerate with the biggest enumerate, so
that it can be used by all the functions using this enumerate.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2017-01-24 16:18:55 +01:00
Philippe Guibert
4e01997895 bgpd: fix ambiguity between show ip bgp ipv4|ipv6 encap|vpn commands 
The commit is removed duplicated command show ip bgp ipv4|ipv6 enca|vpn
command that is conflicting between bgp_route.c and
bgp_mplsvpn.c/bgp_encap.c files. The fix is integrating the call to
specific mpls or encap settings from inside bgp_show_route() function.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2017-01-24 16:18:55 +01:00
Philippe Guibert
1496eba797 bgpd: remove duplicated vty command to enter in vpn address family node 
Because the vpn configuration command was duplicate, there was an
ambiguity to raise. This is a fix that permits configuring vpnv4 or
vpnv6 address-families on bgp.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2017-01-24 16:18:55 +01:00
Donald Sharp
08435c2b24 bgpd: Fix crash with parsing the community 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-24 09:47:59 -05:00
Donald Sharp
30a6a167a1 bgpd: Clean up 'show bgp neighbor ...' commands 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-23 22:34:50 -05:00
Donald Sharp
e01ca200c6 bgpd: Cleanup 'show .... statistics' command 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-23 22:34:50 -05:00