Commit Graph

6470 Commits

Author SHA1 Message Date
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
Lou Berger
ce8080dbd8 bgpd: disambiguate differet forms of
show bgp ipv4 vpn
      address-family ipv4&6 vpn

Signed-off-by: Lou Berger <lberger@labn.net>
2017-01-22 21:08:05 -05:00
Lou Berger
ffc50094a6 bgpd rfapi: add NVE/VRF name to show vnc registrations
Signed-off-by: Lou Berger <lberger@labn.net>
2017-01-22 20:55:08 -05:00
Lou Berger
5ff06872e9 bgpd: add vrf-policy config using existing vnc code
add add/clear vrf prefix
      + Modified for FRR master parser

Signed-off-by: Lou Berger <lberger@labn.net>
2017-01-22 20:54:57 -05:00
Lou Berger
cedb5a7124 bgpd rfapi: fix issue where advertised prefixes were not being disambiguated
by RD

Signed-off-by: Lou Berger <lberger@labn.net>
2017-01-22 20:54:39 -05:00
Donald Sharp
8a2a37324c debian: Fix changelog so sbuild will work
Fix the changelog so a sbuild issued for the
creation of a .deb works.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-01-21 07:51:22 -05: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
eaa09cba3c Merge pull request #99 from opensourcerouting/rename-fixes
Rename Quagga->FRR Fixes
2017-01-20 11:22:33 -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
Donald Sharp
52951b630a bgpd: Fix cli for large-communities
The original commit for large communities broke
'show ip bgp' and 'show bgp ipv4 unicast' and
their ilk.  This commit fixes this as well
as some vtysh parse errors identified.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-01-20 10:43:08 -05:00
Martin Winter
fc5300bdbc Protobuf: Update library name to reflect name change to FRR
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-01-20 02:59:10 +07:00
Martin Winter
63a79ae1c2 Debian/Doc: Fix correct reference about FRR fork from Quagga
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-01-20 02:53:21 +07:00
Martin Winter
555d1e3a4e buildtest.sh: Change name from quagga to frr
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-01-20 00:36:29 +07:00
Martin Winter
89ebfbb49d Doc: Update URL to freerangerouting.org
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-01-20 00:34:03 +07:00
Martin Winter
b189cfb3c9 Doc: Update Bug Reporting instructions to FreeRangeRouting and Github Issue Tracker
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-01-20 00:31:01 +07: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
Martin Winter
f89f4f108e redhat: Fix spec file changelog to use automatic version for last entry
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-01-20 00:10:48 +07:00
Martin Winter
7f8512d9af Solaris Package files: Rename Quagga to FRR
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-01-20 00:07:02 +07:00
David Lamparter
16e32678b1 release: FRR 2.0-rc1 2017-01-19 17:45:51 +01:00
David Lamparter
190a5df69f Merge pull request #83 from LabNConsulting/working/2.0/patch-set/2-no-vrf
Fix a number of VPN/Encap SAFI related issues (no VRF CLI changes)
2017-01-19 17:35:05 +01: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
Job Snijders
57d187bc77 Support for BGP Large Communities
BGP Large Communities are a novel way to signal information between
networks. An example of a Large Community is: "2914:65400:38016". Large
BGP Communities are composed of three 4-byte integers, separated by a
colon. This is easy to remember and accommodates advanced routing
policies in relation to 4-Byte ASNs.

This feature was developed by:
Keyur Patel <keyur@arrcus.com> (Arrcus, Inc.),
Job Snijders <job@ntt.net> (NTT Communications),
David Lamparter <equinox@opensourcerouting.org>
and Donald Sharp <sharpd@cumulusnetworks.com>

Signed-off-by: Job Snijders <job@ntt.net>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-01-18 18:38:53 -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
Lou Berger
7a4732c12b bgpd: fix typo in VPN next hop V6 test (Issue #71)
On top of:
      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 11:36:32 -05:00
Quentin Young
88e5a8cbe1 lib: additional patch for 496e83a
Fixes a couple off-by-ones introduced in previous commit.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
[cherry-picked from master d1e4a518e6]
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-01-18 17:15:12 +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