Commit Graph

5253 Commits

Author SHA1 Message Date
Christian Franke
29d63778fc *: Add missing files to gitignore 2017-02-13 22:23:34 +01:00
Christian Franke
f75352362c isisd: address coverity findings 2017-02-13 19:27:54 +01:00
David Lamparter
43dac2baae tests: fix out-of-tree build
Fix pytest with $(top_srcdir) != "."

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-02-13 17:44:03 +01:00
Christian Franke
cbbf41cbb3 tests: add pytest testrunners
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
2017-02-13 17:43:47 +01:00
Christian Franke
30c4877560 tests: reorganize tests hierarchically
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
2017-02-13 16:54:48 +01:00
Christian Franke
5a1218aa53 tests: remove dejagnu
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
2017-02-13 16:53:00 +01:00
Martin Winter
9cbad1d7c4 ospfd: CID 1399387 (#1 of 2): Destination buffer too small (STRING_OVERFLOW)
Coverity: string_overflow: You might overrun the 100-character destination string vty_path by writing 4096 characters from vty_sock_path.
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-02-10 16:53:18 +07:00
Martin Winter
b3411578b0 lib: CID 1399296: Assign instead of compare (PW.ASSIGN_WHERE_COMPARE_MEANT)
Needs to be a comparison, not assignment

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-02-10 16:52:54 +07:00
Martin Winter
4fdeb6b0af zebra: Fix CID 1399335 (#1 of 1): Wrong sizeof argument (SIZEOF_MISMATCH)
Needs to be size of correct structure (prefix instead of prefix_ipv4)

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-02-10 16:52:34 +07:00
Martin Winter
fa389c272f vtysh: Fix Coverity Warning CID 1399479 (#1 of 1): Destination buffer too small (BUFFER_SIZE)
Coverity: buffer_size: You might overrun the 108 byte destination string addr.sun_path by writing the maximum 4095 bytes from path.
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-02-10 16:51:57 +07:00
Martin Winter
67e5d67651 ospfd: Fix Coverity Warning CID 1399480 (#1 of 1): Buffer not null terminated (BUFFER_SIZE_WARNING)
Coverity: buffer_size_warning: Calling strncpy with a maximum size argument of 100 bytes on destination array pid_file of size 100 bytes might leave the destination string unterminated.
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-02-10 16:50:23 +07:00
Donald Sharp
3cf5e24624 Merge pull request #191 from opensourcerouting/ospfclient-incl
[stable] ospfclient: #include sources
2017-02-09 12:12:17 -05:00
David Lamparter
bd9db8f46e ospfclient: #include sources
Pulling in source files from another directory breaks automake's
distclean target, and there seems to be no good fix for this...
(particularly since we need -fPIC build for a DSO here, while ospfd
compiles for an executable...)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-02-09 17:08:09 +01:00
Donald Sharp
b7671f356a Merge pull request #190 from opensourcerouting/config-write-sync-stable
[stable] lib: use fsync() for config writes, plug fd leak
2017-02-09 09:26:58 -05:00
David Lamparter
1520d0aca9 lib: use fsync() for config writes, plug fd leak
sync() has a HUGE impact on systems that perform actual I/O, i.e. real
servers...

Also, we were leaking a fd on each config write ever since
c5e69a0 "lib/vty: add separate output fd support to VTYs"
(by myself :( ...)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-02-09 14:25:55 +01:00
Lou Berger
cf80f28161 Merge pull request #179 from donaldsharp/more_quagga_fixups
*: Found some instances of Quagga.conf
2017-02-07 20:46:44 -05:00
Donald Sharp
0dca233ec0 *: Found some instances of Quagga.conf
Cleanup Quagga.conf -> Frr.conf

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-02-07 13:44:09 -05:00
Donald Sharp
2cfe3d285f Merge pull request #176 from opensourcerouting/mtype-underflow-backtrace
lib: print backtrace on MTYPE count underflow
2017-02-07 13:04:27 -05:00
Donald Sharp
dbcceee45a Merge pull request #178 from opensourcerouting/ospf_lib_private
make libfrrospf private
2017-02-07 13:04:13 -05:00
David Lamparter
03a5ba2b54 Merge pull request #173 from LabNConsulting/working/2.0/patch-set/issue-172
2.0: Fix encap attribute on wire, protect against broken object.
2017-02-07 17:27:44 +01:00
David Lamparter
3d04dc3854 ospfd: make libfrrospf a private non-dynamic lib
There's no point in installing libospf anymore, now that
libfrrospfclient doesn't link it.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-02-07 17:19:15 +01:00
David Lamparter
0a3fc2a5df ospfd: isolate ospfapiclient lib from ospf lib
The OSPF API-client library doesn't really use anything from libospf
except some small dumping tools.  Isolate these into a separate file
and detangle the ospfapiclient library.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-02-07 17:19:11 +01:00
David Lamparter
9da3dd3bc5 Merge pull request #161 from donaldsharp/stableMcLibrary
Stable mc library
2017-02-07 17:17:12 +01:00
Donald Sharp
3f3971a911 bgpd: Allow views to 'pretend' resolve nexthops
Views are supposed to be independent tables that have no connection to
routing tables.  Since View's are 'independent' there is no way to do
'real' nexthop resolution since connected routes and interfaces are
associated with a particular table (or really vrf).  So when we have a
bgp instance assume that nexthops specified are actually valid, since we
are propagating what our neighbors are telling us.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
[cherry-picked from master 6fa1ab2eecb39b35256739f7083196d6f556f639]
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-02-07 16:56:16 +01:00
David Lamparter
ace5a8a17e Merge branch 'frr/pull/157' ("Fixinator")
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-02-07 16:38:03 +01:00
David Lamparter
f65e2d40cc lib: print backtrace on MTYPE count underflow
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-02-07 16:23:38 +01:00
Renato Westphal
62fb7b19e8 Merge pull request #171 from donaldsharp/double_free
lib: Don't use malloc!
2017-02-07 11:48:15 -02:00
Lou Berger
c65742c791 bgpd rfapi: advertise encap attribute when TT is valid and not MPLS.
Ensure tunnel type set based on rx'ed
     Ignore bad/mpls encap types.

Signed-off-by: Lou Berger <lberger@labn.net>
2017-02-07 07:42:50 -05:00
Donald Sharp
f0d975f752 lib: Fixup CR comment
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-02-07 04:54:40 -05:00
Donald Sharp
f96872f001 lib: Don't use malloc!
thread.c was using malloc.  This was found by the
assert added to memory.c.

Fixes issues #170

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-02-06 12:52:28 -05:00
Martin Winter
1b4ae82d37 Merge pull request #167 from qlyoung/vtysh-subs-stable
vtysh: Quagga.conf -> Frr.conf
2017-02-03 12:11:18 -08:00
Quentin Young
a0b4b67e80 vtysh: Quagga.conf -> Frr.conf
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2017-02-03 18:48:04 +00:00
Donald Sharp
0b6f595a69 Merge pull request #158 from LabNConsulting/working/2.0/patch-set/rfapi+vty
2.0: Fix a couple of merge related and rfapi/show vpn issues
2017-02-03 11:54:52 -05:00
Donald Sharp
848ac646bd Revert "bgpd: Put back original behavior for some show bgp commands"
This reverts commit 713de0685f.

During Discussions with Lou, it was decided that his code
changes would handle this part, and my code changes would
fix up vtysh and bgp to be in sync again.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-02-03 10:33:14 -05:00
Donald Sharp
fd420a3275 bgpd, vtysh: Fix vtysh able to handle some safi modes for bgp
This adds the ability for vtysh to handle v4 and v6
safi modes besides unicast and multicast.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com.
2017-02-03 10:29:53 -05:00
Lou Berger
efe9a9a62a bgp: remove HAVE_IPV6 from file (again!)
Signed-off-by: Lou Berger <lberger@labn.net>
2017-02-03 10:16:01 -05:00
Lou Berger
0114461b5e bgpd: add missing json strings
Signed-off-by: Lou Berger <lberger@labn.net>
2017-02-03 10:04:19 -05:00
Donald Sharp
50b05f3c3d *: Convert libospf -> libfrrospf
Convert the libospfapiclient -> libfrrospfapiclient
and libospf -> libfrrospf to prevent namespace
collision with Quagga.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-02-03 08:43:55 -05:00
Donald Sharp
dfe1deea02 *: Convert libfpm -> libfrrfpm
Convert the libfpm to libfrrfpm to prevent namespace
collision with Quagga.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-02-03 08:43:09 -05:00
Donald Sharp
285a775ac7 ospf6d: Fix compile warnings
These compile issues were found by running ./buildtest.sh
on a fedora 25 box.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-02-03 08:29:56 -05:00
Donald Sharp
a707247eff ospfd: Fix compile warnings
These compile issues were found w/ gcc and running
./buildtest.sh on a fedora 25 box.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-02-03 08:29:54 -05:00
Donald Sharp
d904a9fc09 ripd: Fix compile warning
This issue was found compiling with ./buildtest.sh
on fedora 25

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-02-03 08:29:21 -05:00
Donald Sharp
55c7280315 *: Convert libzebra -> libfrr
The library libzebra that is installed with FRR will
conflict with Quagga.  So let's rename it to libfrr.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-02-03 08:29:13 -05:00
Lou Berger
d08aa468d7 bgpd: get rid of 'unknown' in show safi (broken in earlier merge)
Signed-off-by: Lou Berger <lberger@labn.net>
2017-02-02 21:54:10 -05:00
Lou Berger
f799a22aa7 bgpd: cleanup/restore show ip|ipv6 bgp and show bgp ipv4 summary related commands
Signed-off-by: Lou Berger <lberger@labn.net>
2017-02-02 21:53:57 -05:00
Lou Berger
8f7f12f9d1 bgpd rfapi: fix TT handling broken on Sat Jan 28 18:57:28 2017 -0500
Signed-off-by: Lou Berger <lberger@labn.net>
2017-02-02 21:53:48 -05:00
Donald Sharp
713de0685f bgpd: Put back original behavior for some show bgp commands
The behavior of some show commands was switched from
showing the unicast data to all safi data.  This
is a change in behavior and needs to be put
back for 2.0

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-02-02 13:56:56 -05:00
Donald Sharp
fdad6d5661 bgpd: Allow vtysh to work for address-family
extract.pl.in requires the lines that are ignored
to be consisten with what is in the *.c file
that we are ignoring from, else we get ambiguous
commands.

This allows vtysh to enter address-family sub mode
in bgp again.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-02-02 13:54:47 -05:00
Donald Sharp
56041a7706 Merge pull request #153 from LabNConsulting/working/2.0/patch-set/rr-part2
2.0: complete Issue#91 fix (regression now clean)
2017-02-02 07:48:45 -05:00
Donald Sharp
5b346c7408 Merge pull request #143 from LabNConsulting/working/2.0/patch/mpls-tt
2.0: bgp rfapi: fix resolution / lookup failure when using MPLS TT
2017-02-02 07:47:43 -05:00