proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 00:06:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,958 Commits 4 Branches 191 Tags 125 MiB
4f280b15b1
Commit Graph

5958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Donald Sharp
ac9ddce37d Merge pull request #104 from opensourcerouting/time-cleanup 
Time cleanup
 2017-01-24 11:43:32 -05:00
David Lamparter
e5951aa21d Merge pull request #42 from donaldsharp/pim_lib_work2 
Pim-SM + MSDP
 2017-01-24 17:10:09 +01:00
David Lamparter
290c1eb150 Merge branch 'frr/pull/93' 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-24 03:16:01 +01:00
David Lamparter
44b8cd53c5 bgpd: fix whitespace 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-24 03:15:26 +01:00
David Lamparter
a9636cda9f Merge pull request #96 from qlyoung/guard-strict-dedup 
lib: guard strict cli completions
 2017-01-24 03:10:55 +01:00
David Lamparter
39cea8220a lib: time: add TIMEVAL_TO_TIMESPEC 
Should be in system headers, but not specified by any standard.
Not currently used anywhere yet.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-23 23:17:35 +01:00
David Lamparter
e0e2a99068 lib: cope with negative timeout in thread.c 
Since time is no longer cached, if we schedule something with zero
timeout, it will automatically be negative by the time we reach the
event loop.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-23 18:59:15 +01:00
David Lamparter
4b185cb399 lib: time: clean out thread.c 
Remove quagga_get_relative(), replace with monotime().

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-23 18:55:33 +01:00
David Lamparter
816c2194ca ospfd: simplify SPF time consumption calculations 
monotime_since() does exactly the same thing.
... and timeval_elapsed is now private to lib/thread.c

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-23 18:26:33 +01:00
David Lamparter
cf672a8654 *: use monotime() 
This is largely a bulk-replace made with coccinelle.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-23 18:26:32 +01:00
David Lamparter
afe4c21720 *: remove quagga_gettime() return value checks 
The next patch will bulk-replace these, and monotime() has time_t as
return value, not an error indicator.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-23 18:26:32 +01:00
David Lamparter
d9d5c3e8bf lib: time: remove local time helpers 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-23 18:26:32 +01:00
David Lamparter
3dad49ca94 lib: time: remove recent_time 
This isn't even used anywhere.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-23 18:26:32 +01:00
David Lamparter
6ced0e7f10 lib: time: remove recent_relative_time() 
Replace with monotime() [which is not cached].

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-23 18:26:32 +01:00
David Lamparter
95ac0ac5ff ospf6d: time: remove unused/duplicate helpers 
timersub() & timerclear() are in sys/time.h;
timerstring_local() is unused.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-23 18:26:32 +01:00
David Lamparter
cbf3e3eb3a ospfd: time: replace local helpers with monotime 
This ditches tv_add, tv_sub, tv_cmp, etc. in favour of
monotime{,_since,_until}() which actually makes the code much more
readable in some locations.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-23 18:26:28 +01:00
David Lamparter
7790a2d69e lib: time: add new monotime() helpers 
This adds monotime() to retrieve monotonic clock time, as well as
monotime_since() and monotime_until() for relative monotonic time.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-23 16:54:51 +01:00
Donald Sharp
e5fe6d5931 Merge pull request #90 from LabNConsulting/remotes/origin/working/master/patch-set/2a-no-vrf 
Master version of #83 Fix a number of VPN/Encap SAFI related issues (no VRF CLI changes)
 2017-01-20 11:27:15 -05:00
Donald Sharp
ec5e6fcc59 Merge pull request #88 from pguibert6WIND/mergedown_vpn_old_format 
Mergedown vpn old format
 2017-01-20 10:52:17 -05:00
Quentin Young
5320569435 lib: guard strict cli completions 
Completions are checked for token and docstring equality before
deduplicating. Put an ifdef guard around checking docstrings because
many of them are inconsistent and may confuse users in a release build.

It is a good idea to enable VTYSH_DEBUG when adding new CLI in the
future to help check docstrings.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-01-19 17:15:45 +00:00
Donald Sharp
83190a40e2 pimd: Cleanup the headers. 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-19 10:01:02 -05:00
Donald Sharp
77b7d90beb pimd: PIM_MRT is a linux specific piece of code. 
The PIM_MRT and registration for WRVIFWHOLECACHE
is a bit of linux specific code.  Until such
time that this gets implemented we will have
issues being able to work within the context
of PIM-SM.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-19 09:58:53 -05:00
Donald Sharp
3629c61d11 pimd: Fix README file for FRR 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-19 08:57:17 -05:00
Donald Sharp
7a6e656788 pimd: Cleanup compile warnings 
Cleanup some compile warnings in pim on *bsd.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-19 08:49:47 -05:00
Donald Sharp
fcd6282c55 pimd: Missing include causes compile failure on some bsd's 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-19 08:49:12 -05:00
Donald Sharp
b8b35c63a5 Merge remote-tracking branch 'origin/master' into pim_lib_work2 
Conflicts:
	lib/zebra.h
	zebra/rt_netlink.c
 2017-01-19 04:32:49 -05:00
Donald Sharp
f94d4e70f6 isisd: Fix unused variable in some situations. 
Fix an unused variable for certain compile
options.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-18 19:32:25 -05:00
Donald Sharp
bc3d640088 zebra: Fix signed/unsigned comparison 
Fix a signed/unsigned comparison.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-18 19:31:52 -05:00
Donald Sharp
389e3fe0da bgpd: Cleanup some compiler warnings 
Cleanup some compiler warnings discovered by
omnios.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-18 19:30:47 -05:00
Donald Sharp
e2064401d3 lib: Add some documentation to wheel.h 
Add some hopefully useful documentation to the
timer wheel.h code.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-18 19:08:04 -05:00
Lou Berger
794a2e0ba0 bgpd: use address-family <afi> <safi> in show running for vpn&encap (Issue #80) 
Signed-off-by: Lou Berger <lberger@labn.net>
 2017-01-18 18:27:04 -05:00
Lou Berger
3eebadeb62 bgpd rfapi: use VN as nexthop for MPLS tunnels too 
Also minor show format cleanup

Signed-off-by: Lou Berger <lberger@labn.net>
 2017-01-18 18:26:52 -05:00
Lou Berger
fe3ca08faf bgpd: allow VPN next hop to be different AFI than NLRI next hop (Issue #71) 
Signed-off-by: Lou Berger <lberger@labn.net>
 2017-01-18 18:26:45 -05:00
Lou Berger
e8d62659d2 bgpd: fix RD stomping by update group code (Issue #71) 
Signed-off-by: Lou Berger <lberger@labn.net>
 2017-01-18 18:26:38 -05:00
Donald Sharp
45680e7568 Merge pull request #73 from opensourcerouting/ldpd-json 
ldpd: json support for show commands
 2017-01-18 14:37:06 -05:00
Donald Sharp
1000a033c0 Merge pull request #89 from opensourcerouting/queue/build-pkgconfig 
build: include copy of pkg.m4, fix invocation
 2017-01-18 12:07:58 -05:00
David Lamparter
00c03bc94b build: include copy of pkg.m4, fix invocation 
pkg.m4 will be missing on systems that don't have pkg-config installed;
this renders the point of the configure check moot which is to find
pkg-config...

Also, PKG_PROG_PKG_CONFIG should be invoked unconditionally as described
in https://autotools.io/pkgconfig/pkg_check_modules.html

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-18 18:01:53 +01:00
David Lamparter
cd27ec47ef Merge pull request 'frr/pull/87' 
Fixes a couple off-by-ones introduced in previous commit.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-18 17:13:27 +01:00
David Lamparter
11c1607038 Merge pull request 'frr/pull/85' 
Library changes and some zebra (Linux) kernel interface foo from the
PIM-SM/MSDP changeset.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-01-18 17:02:30 +01:00
Donald Sharp
9bf7536273 zebra: Fix compile warnings under freebsd 
Compiling under clang we see compiler warnings
Fix them.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-18 10:17:20 -05:00
Donald Sharp
7936827a85 cumulus: Fixup function only needed for linux 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-18 10:14:26 -05:00
Donald Sharp
5fe80c1a8f pimd: Fix compilation error 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com.
 2017-01-18 07:50:19 -05:00
Donald Sharp
de6d2fa72e pimd: Remove bad merges 
Two functions were accidentally left around
as part of the merge operation.  Remove them.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-18 07:47:58 -05:00
Donald Sharp
c2403b2598 pimd: 'struct ip_mreqn' is not available on all platforms 
Signed-off-by: Donald Sharp <sharpd@cumulusnetowrks.com>
 2017-01-18 07:24:24 -05:00
Donald Sharp
6f1d88a730 zebra: Fix kernel_get_ipmr_sg_stats to return an value 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-01-18 06:49:40 -05:00