]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
5 years agoMerge pull request #4658 from chiragshah6/ospf_vrf_dev
Jafar Al-Gharaibeh [Fri, 12 Jul 2019 22:30:42 +0000 (17:30 -0500)]
Merge pull request #4658 from chiragshah6/ospf_vrf_dev

ospfd: fix various show ip ospf neighbor json commands

5 years agoMerge pull request #4660 from manuhalo/label_manager_fixes
Renato Westphal [Fri, 12 Jul 2019 20:09:33 +0000 (17:09 -0300)]
Merge pull request #4660 from manuhalo/label_manager_fixes

Label manager improvements + refactor

5 years agoMerge pull request #4664 from sworleys/Zvrf-Debug-Guard
Renato Westphal [Fri, 12 Jul 2019 19:40:50 +0000 (16:40 -0300)]
Merge pull request #4664 from sworleys/Zvrf-Debug-Guard

zebra: Add a conditional guard if zvrf lookup fail

5 years agoMerge pull request #4325 from sworleys/Order-Recv-Nexthops
Renato Westphal [Fri, 12 Jul 2019 18:25:37 +0000 (15:25 -0300)]
Merge pull request #4325 from sworleys/Order-Recv-Nexthops

zebra: Modify zebra to order nexthops received

5 years agoMerge pull request #4674 from mjstapp/fix_mono_ctime
Quentin Young [Thu, 11 Jul 2019 20:05:03 +0000 (16:05 -0400)]
Merge pull request #4674 from mjstapp/fix_mono_ctime

lib,zebra: avoid use of ctime in monotime api

5 years agoMerge pull request #4670 from chiragshah6/evpn_dev1
Sri Mohana Singamsetty [Wed, 10 Jul 2019 20:39:26 +0000 (13:39 -0700)]
Merge pull request #4670 from chiragshah6/evpn_dev1

bgpd: fix show bgp l2vpn evpn route json

5 years agoMerge pull request #4675 from mgsmith1000/bgp_restart_timer_inbound
Donald Sharp [Wed, 10 Jul 2019 20:27:24 +0000 (16:27 -0400)]
Merge pull request #4675 from mgsmith1000/bgp_restart_timer_inbound

bgpd: honor max prefix timer on inbound sessions

5 years agolib,zebra: avoid use of ctime in monotime api
Mark Stapp [Wed, 10 Jul 2019 14:16:59 +0000 (10:16 -0400)]
lib,zebra: avoid use of ctime in monotime api

Replace a call to ctime with ctime_r in the monotime module;
update the callers of the monotime api.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
5 years agotests: remove lm-proxy-topo1 topotest
Emanuele Di Pascale [Wed, 10 Jul 2019 13:50:22 +0000 (15:50 +0200)]
tests: remove lm-proxy-topo1 topotest

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
5 years agoldpd: set default instance to 1
Emanuele Di Pascale [Wed, 10 Jul 2019 13:20:14 +0000 (15:20 +0200)]
ldpd: set default instance to 1

LDP opens two sockets to zebra, one through ldpd (always using
instance 0) and another through lde (using whatever instance
was set through the -n command line parameter). If no instance
was set, both connections would use the same protocol and instance,
making it impossible to distinguish them through zserv_find_client.
This meant that a response to a lm connect would erroneously go to
the wrong process. Fix this by having a default instance value of 1,
in case the user does not specify a different one.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
5 years agozebra: label manager refactor
Emanuele Di Pascale [Thu, 27 Jun 2019 08:11:35 +0000 (10:11 +0200)]
zebra: label manager refactor

in order to both streamline the code and allow users to
define their own specialized versions of the LM api handlers,
define hooks for the 4 main primitives offered by the label
manager (i.e. connect, disconnect, get_chunk and release_chunk),
and have the existing code be run in response to a hook_call.
Additionally, have the responses to the requesting daemon be
callable from an external API.

Note that the proxy version of the label manager was a source of
issues and hardly used in practice. With the new hooks, users with
more complex requirements can simply plug in their own code to
handle label distribution remotely, so there is no longer a reason
to maintain this code.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
5 years agotests: remove test_lblmgr.c
Emanuele Di Pascale [Fri, 28 Jun 2019 08:01:56 +0000 (10:01 +0200)]
tests: remove test_lblmgr.c

This is not part of the make check tests and it has been broken
for a while, apparently. The way the label manager is coded makes
it very hard to code unit tests, and testing the relay of requests
to an external label manager is probably better done through
a topotest, so remove this.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
5 years agolib, zebra: handle failure in get chunk
Emanuele Di Pascale [Thu, 27 Jun 2019 08:59:22 +0000 (10:59 +0200)]
lib, zebra: handle failure in get chunk

when requesting a specific label chunk (e.g. for the SRGB),
it might happen that we cannot get what we want. In this
event, we must be prepared to receive a response with no
label chunk. Without this fix, if the remote label manager
was not able to alloate the chunk we requested, we would
hang indefinitely trying to read data from the stream which
was not there.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
5 years agolib, zebra: support label chunk requests for SRGB
Emanuele Di Pascale [Wed, 12 Jun 2019 14:33:12 +0000 (16:33 +0200)]
lib, zebra: support label chunk requests for SRGB

For SRGB, we need to support chunk requests starting at a
specific point in the label space, rather than just asking
for any sufficiently large chunk. To this purpose, we extend
the label manager api to request a chunk with a base value;
if the base is set to 0, the label manager will behave as it
currently does, i.e. fetching the first free chunk big enough
to satisfy the request.

update all the existing calls to get chunks from the label
manager so that they use MPLS_LABEL_BASE_ANY as the base
for the requested chunk

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
5 years agobgpd: honor max prefix timer on inbound sessions
Matthew Smith [Tue, 9 Jul 2019 17:59:44 +0000 (12:59 -0500)]
bgpd: honor max prefix timer on inbound sessions

When using the maximum-prefix restart option with a BGP peer,
if the peer exceeds the limit of prefixes, bgpd causes the
connection to be closed and sets a timer. It will not attempt
to connect to that peer until the timer expires. But if the
peer attempts to connect to it before the timer expires, it
accepts the connection and starts exchanging routes again.

When accepting a connection from a peer, reject the connection
if the max prefix restart timer is set.

Signed-off-by: Matthew Smith <mgsmith@netgate.com>
5 years agoospfd: fix show ip ospf neigh json
Chirag Shah [Fri, 5 Jul 2019 22:45:56 +0000 (15:45 -0700)]
ospfd: fix show ip ospf neigh json

Same ospf neigbor can be learnt via multiple
interfaces, ospf detail json only displayed
last instance only.

Fix json output format to contain "neighbors"
keyword, under which to display all neighbors
for a given vrf.

Fix
show ip ospf neighbor detail json
show ip ospf neighbor detail all json
show ip ospf neighbor <intf name> detail json

Ticket:CM-25528
Reviewed By:
Testing Done:

Run the output with JSON formatter and the output
has passed.

switch1# show ip ospf vrf all neighbor detail json
{
  "default":{
    "vrfName":"default",
    "vrfId":0,
    "neighbors":{
      "0.0.0.2":[
        {
          "ifaceAddress":"14.0.0.22",
          "areaId":"0.0.0.0",
          "ifaceName":"Bridge1.510",
          "nbrPriority":1,
          "nbrState":"Full",
          "stateChangeCounter":6,
          "lastPrgrsvChangeMsec":82668,
          "routerDesignatedId":"14.0.0.22",
          "routerDesignatedBackupId":"14.0.0.21",
          "optionsCounter":2,
          "optionsList":"*|-|-|-|-|-|E|-",
          "routerDeadIntervalTimerDueMsec":36195,
          "databaseSummaryListCounter":0,
          "linkStateRequestListCounter":0,
          "linkStateRetransmissionListCounter":0,
          "threadInactivityTimer":"on",
          "threadLinkStateRequestRetransmission":"on",
          "threadLinkStateUpdateRetransmission":"on",
          "peerBfdInfo":{
            "type":"single hop",
            "detectMultiplier":4,
            "rxMinInterval":600,
            "txMinInterval":800,
            "status":"Down",
            "lastUpdate":"0:00:00:29"
          }
        },
        {
          "ifaceAddress":"14.0.0.26",
          "areaId":"0.0.0.0",
          "ifaceName":"Bridge1.511",
          "nbrPriority":1,
          "nbrState":"Full",
          "stateChangeCounter":6,
          "lastPrgrsvChangeMsec":82658,
          "routerDesignatedId":"14.0.0.26",
          "routerDesignatedBackupId":"14.0.0.25",
          "optionsCounter":2,
          "optionsList":"*|-|-|-|-|-|E|-",
          "routerDeadIntervalTimerDueMsec":36196,
          "databaseSummaryListCounter":0,
          "linkStateRequestListCounter":0,
          "linkStateRetransmissionListCounter":0,
          "threadInactivityTimer":"on",
          "threadLinkStateRequestRetransmission":"on",
          "threadLinkStateUpdateRetransmission":"on"
        },
     ]
    }
  }
}

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
5 years agobgpd: fix show bgp l2vpn evpn route json
Chirag Shah [Tue, 9 Jul 2019 18:51:46 +0000 (11:51 -0700)]
bgpd: fix show bgp l2vpn evpn route json

PR-4544 has introduced a new filed extended community
in show bgp l2vpn evpn route command.
The header has missed checking json is enabled.

Ticket:CM-25581
Reviewed By:
Testing Done:

TORS1# show bgp l2vpn evpn route json
{
  "27.0.0.15:8":{
    "rd":"27.0.0.15:8",
    "[2]:[0]:[48]:[00:02:00:00:00:0a]":{
      "prefix":"[2]:[0]:[48]:[00:02:00:00:00:0a]",
      "prefixLen":288,
      "paths":[
        [
          {
            "valid":true,
            "bestpath":true,
            "pathFrom":"external",
            "routeType":2,
            "ethTag":0,
            "macLen":48,
            "mac":"00:02:00:00:00:0a",
            "weight":32768,
            "peerId":"(unspec)",
            "aspath":"",
            "path":"",
            "origin":"IGP",
            "extendedCommunity":{
              "string":"ET:8 RT:5550:1002"
            },
            "nexthops":[
              {
                "ip":"27.0.0.15",
                "afi":"ipv4",
                "used":true
              }
            ]
          }
        ]
      ]
    },
   ...
  },
  "numPrefix":187,
  "numPaths":343
}

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
5 years agozebra: Add a conditional guard if zvrf lookup fail
Stephen Worley [Tue, 9 Jul 2019 15:10:49 +0000 (11:10 -0400)]
zebra: Add a conditional guard if zvrf lookup fail

Add a conditional to guard against segfaulting on the debug
statement when zvrf lookup fails.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
5 years agoMerge pull request #4619 from opensourcerouting/eigrpd-yang
Russ White [Tue, 9 Jul 2019 15:27:02 +0000 (11:27 -0400)]
Merge pull request #4619 from opensourcerouting/eigrpd-yang

yang: import EIGRP YANG model

5 years agoMerge pull request #4609 from ton31337/fix/show_set_comm-list_delete
Quentin Young [Tue, 9 Jul 2019 15:25:10 +0000 (11:25 -0400)]
Merge pull request #4609 from ton31337/fix/show_set_comm-list_delete

bgpd: Show `delete` sub-option for `set [l]comm-list <list> delete`

5 years agoMerge pull request #4437 from opensourcerouting/bfdd-northbound
Russ White [Tue, 9 Jul 2019 15:15:51 +0000 (11:15 -0400)]
Merge pull request #4437 from opensourcerouting/bfdd-northbound

bfdd: migrate to northbound

5 years agoMerge pull request #4088 from opensourcerouting/bump-libyang-requirement-vers
Jafar Al-Gharaibeh [Tue, 9 Jul 2019 14:59:17 +0000 (17:59 +0300)]
Merge pull request #4088 from opensourcerouting/bump-libyang-requirement-vers

build, lib: bump libyang requirement version to >= 0.16.105 (-r3)

5 years agozebra: Modify zebra to order nexthops received
Donald Sharp [Thu, 24 Jan 2019 15:13:22 +0000 (10:13 -0500)]
zebra: Modify zebra to order nexthops received

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agoMerge pull request #4655 from qlyoung/fix-vrrp-iface-del-infiniteloop
Renato Westphal [Tue, 9 Jul 2019 14:21:44 +0000 (11:21 -0300)]
Merge pull request #4655 from qlyoung/fix-vrrp-iface-del-infiniteloop

vrrpd: set interface ifindex to internal upon deletion

5 years agoMerge pull request #4511 from pguibert6WIND/flowspec_some_fixes
Russ White [Tue, 9 Jul 2019 14:12:21 +0000 (10:12 -0400)]
Merge pull request #4511 from pguibert6WIND/flowspec_some_fixes

Flowspec some fixes

5 years agoyang/eigrp: change active-time timer to seconds
Rafael Zalamena [Tue, 2 Jul 2019 15:20:20 +0000 (12:20 -0300)]
yang/eigrp: change active-time timer to seconds

Based on feedback.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
5 years agobfdd: keep source information for single hop
Rafael Zalamena [Mon, 8 Jul 2019 18:56:56 +0000 (15:56 -0300)]
bfdd: keep source information for single hop

Add source address to northbound when creating sessions with this
information. It is not possible to change source address after the
session was created, but we should be able to set it to make IPv6 work.

Spotted by Philippe Guibert.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
5 years agoyang: change single hop `leaf` order
Rafael Zalamena [Mon, 8 Jul 2019 20:38:28 +0000 (17:38 -0300)]
yang: change single hop `leaf` order

Move `source-address` to after the list keys, otherwise the CLI would
get into an invalid state and be unable to set any other configuration
inside that node.

Spotted by Philippe Guibert.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
5 years agoMerge pull request #4643 from pguibert6WIND/pytest_compat
Martin Winter [Tue, 9 Jul 2019 12:42:55 +0000 (14:42 +0200)]
Merge pull request #4643 from pguibert6WIND/pytest_compat

doc: inform user to use pytest < version 5.0

5 years agoMerge pull request #4446 from Kuldeepkas/topojson
Martin Winter [Tue, 9 Jul 2019 12:41:11 +0000 (14:41 +0200)]
Merge pull request #4446 from Kuldeepkas/topojson

topotests: Topojson framework

5 years agoMerge pull request #4657 from qlyoung/cleanup-protonum-vrrrrrrrrrrrrrrrrrrrrrrrrrrrrr...
Philippe Guibert [Tue, 9 Jul 2019 10:27:11 +0000 (11:27 +0100)]
Merge pull request #4657 from qlyoung/cleanup-protonum-vrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrp

vrrpd: use protocol number constant

5 years agotests: Fix info messages print in std_error
Ashish Pant [Tue, 9 Jul 2019 04:49:56 +0000 (10:19 +0530)]
tests: Fix info messages print in std_error

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
frr-reolad.py invocation sends info message to stderror channel
Redirected stderror from frr-reload.py to stdout

Fixed verify_convergence when more than one link is present

5 years agotests: Fix logdir creation
Ashish Pant [Tue, 25 Jun 2019 05:56:46 +0000 (11:26 +0530)]
tests: Fix logdir creation

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Creates logdir everytime in start_topology, removed stop_topoloy.
Using tgen.stop_topology in test case now.

5 years agodoc: Document for topojson changes
Ashish Pant [Tue, 25 Jun 2019 05:02:49 +0000 (10:32 +0530)]
doc: Document for topojson changes

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Describes topojson framework and guidelines to use it.

5 years agotests: Adding example cases for topojson
Ashish Pant [Tue, 25 Jun 2019 04:25:24 +0000 (09:55 +0530)]
tests: Adding example cases for topojson

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Example JSON and test cases for 3 types being added:
1. Single link between routers
2. Multiple linke between routers.
3. BGP session over loopback interface

5 years agotests: Adding bgp path attribute tests
Ashish Pant [Tue, 25 Jun 2019 02:12:44 +0000 (07:42 +0530)]
tests: Adding bgp path attribute tests

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Adding multiple test cases for bgp attributes.
Adding verfication APIs for them.

5 years agotests: Fixing ipv6 address generation
Ashish Pant [Tue, 25 Jun 2019 02:00:08 +0000 (07:30 +0530)]
tests: Fixing ipv6 address generation

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
5 years agotests: Adding bgp tests for prefix-lists
Ashish Pant [Tue, 25 Jun 2019 01:56:20 +0000 (07:26 +0530)]
tests: Adding bgp tests for prefix-lists

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Adds mulitple test scenarios for prefix-lists in bgp. Verfication
API for prefix-lits

Also adds description for bgp-basic test suite

5 years agotests: Adding 5 test cases to bgp-basic suite
Ashish Pant [Tue, 25 Jun 2019 01:03:09 +0000 (06:33 +0530)]
tests: Adding 5 test cases to bgp-basic suite

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Adding test cases and verfication API for new test cases

5 years agotests: Adding timers and bgp 4 bytes ASN test
Ashish Pant [Tue, 25 Jun 2019 00:34:17 +0000 (06:04 +0530)]
tests: Adding timers and bgp 4 bytes ASN test

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Adding verify and config apis for bgp timer testcase
Adding verify and config apis for changing ASN to 4 bytes

5 years agotests: Adding API for route-map
Ashish Pant [Mon, 24 Jun 2019 23:51:22 +0000 (05:21 +0530)]
tests: Adding API for route-map

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Adding API for reading JSON data and configuring route-map on the
router

5 years agotests: Adding API for prefix-list configuration
Ashish Pant [Mon, 24 Jun 2019 23:46:32 +0000 (05:16 +0530)]
tests: Adding API for prefix-list configuration

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Adding API for prefix-list that reads data from JSON and configures
on the router.

5 years agotests: Adding API for static route
Ashish Pant [Mon, 24 Jun 2019 23:35:15 +0000 (05:05 +0530)]
tests: Adding API for static route

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Adding API for reading data from JSON and configuring static
routes on the router

5 years agotests: First test case and JSON
Ashish Pant [Mon, 24 Jun 2019 20:43:13 +0000 (02:13 +0530)]
tests: First test case and JSON

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Adds verification API for bgp, first test case alongwith JSON file

5 years agotests: Adding api for BGP configuration
Ashish Pant [Mon, 24 Jun 2019 11:54:07 +0000 (17:24 +0530)]
tests: Adding api for BGP configuration

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Adding mulitple methods to form BGP configuration and other
helper methods.
If "bgp" is given in JSON the configuration will be created

5 years agotests: Adds basic config load and interface API
Ashish Pant [Mon, 24 Jun 2019 11:37:00 +0000 (17:07 +0530)]
tests: Adds basic config load and interface API

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Adds method to load configuration on the router. Save configuration
for resetting.
Adds method for configuring interfaces ip address on router.
Adds logdir and other pytest.ini option

5 years agotests: Adding start and stop topology
Ashish Pant [Mon, 24 Jun 2019 11:26:08 +0000 (16:56 +0530)]
tests: Adding start and stop topology

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Adding methods for staring and stopping routers in topology

5 years agotests: Intial commit for topojson
Ashish Pant [Mon, 24 Jun 2019 11:04:36 +0000 (16:34 +0530)]
tests: Intial commit for topojson

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>
Adding JSON parser for creating router and assinging ip addresses to
each interface

5 years agovrrpd: use protocol number constant
Quentin Young [Mon, 8 Jul 2019 21:28:01 +0000 (21:28 +0000)]
vrrpd: use protocol number constant

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
5 years agoMerge pull request #4654 from manuhalo/fix_bgp_lbp_warn
Donald Sharp [Mon, 8 Jul 2019 19:27:35 +0000 (15:27 -0400)]
Merge pull request #4654 from manuhalo/fix_bgp_lbp_warn

bgpd: fix implicit declaration warning

5 years agoMerge pull request #4631 from chiragshah6/evpn_dev1
Sri Mohana Singamsetty [Mon, 8 Jul 2019 18:56:44 +0000 (11:56 -0700)]
Merge pull request #4631 from chiragshah6/evpn_dev1

zebra: evpn entries are not cleaned upon frr stop

5 years agovrrpd: set interface ifindex to internal upon deletion
Quentin Young [Mon, 8 Jul 2019 18:35:14 +0000 (18:35 +0000)]
vrrpd: set interface ifindex to internal upon deletion

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
5 years agoMerge pull request #4653 from qlyoung/fix-pim-helpstringms
Mark Stapp [Mon, 8 Jul 2019 17:44:06 +0000 (13:44 -0400)]
Merge pull request #4653 from qlyoung/fix-pim-helpstringms

pimd: fix some help strings

5 years agobgpd: fix implicit declaration warning
Emanuele Di Pascale [Mon, 8 Jul 2019 16:45:14 +0000 (18:45 +0200)]
bgpd: fix implicit declaration warning

Add header with prototype for bgp_path_info_unlock

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
5 years agoMerge pull request #4652 from LabNConsulting/working/master/hook_unregister
Quentin Young [Mon, 8 Jul 2019 15:33:07 +0000 (11:33 -0400)]
Merge pull request #4652 from LabNConsulting/working/master/hook_unregister

bgp: add hook_unregister to bgp_dump_finish

5 years agobgp: add hook_unregister to bgp_dump_finish
Lou Berger [Mon, 8 Jul 2019 13:24:57 +0000 (09:24 -0400)]
bgp: add hook_unregister to bgp_dump_finish

Signed-off-by: Lou Berger <lberger@labn.net>
5 years agobgpd: extend bgp routemap prefix-list to flowspec entries
Donald Sharp [Fri, 14 Jun 2019 10:05:18 +0000 (06:05 -0400)]
bgpd: extend bgp routemap prefix-list to flowspec entries

Some code to cleanup bgp routemap.c a bit.
Addint to this, if a bgp flowspec entry contains a destination IP address,
then the ip address is compared against the prefix-list referenced into
the route-map used.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
Signed-off-by: Donald Sharp <sharpd@cumulunetworks.com>
5 years agobgpd: discard traffic when at least traffic-rate 0 is observed
Philippe Guibert [Thu, 6 Jun 2019 15:14:36 +0000 (17:14 +0200)]
bgpd: discard traffic when at least traffic-rate 0 is observed

when multiple action rules are analysed in the BGP flowspec entry, if at
least the traffic-rate set to 0 is seen, then immediately create a rule
with drop rule. Previously this was not the case in case a forwarding
rule was seen.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
5 years agobgp, zebra, lib: add protocol support for iptables
Philippe Guibert [Thu, 6 Jun 2019 15:31:46 +0000 (17:31 +0200)]
bgp, zebra, lib: add protocol support for iptables

in addition to support for tcpflags, it is possible to filter on any
protocol. the filtering can then be based with iptables.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
5 years agopimd: fix some help strings
Quentin Young [Sat, 6 Jul 2019 00:15:27 +0000 (00:15 +0000)]
pimd: fix some help strings

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
5 years agodoc: inform user to use pytest < version 5.0
Philippe Guibert [Thu, 4 Jul 2019 17:50:49 +0000 (19:50 +0200)]
doc: inform user to use pytest < version 5.0

pytest intends to deprecate users not having python 2 on the system.
in order to make topotest work, just use an older pytest version.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
5 years agoMerge pull request #4639 from opensourcerouting/c-ares-lib
Quentin Young [Wed, 3 Jul 2019 20:49:19 +0000 (16:49 -0400)]
Merge pull request #4639 from opensourcerouting/c-ares-lib

make c-ares DNS resolver available as lib

5 years agoMerge pull request #4640 from opensourcerouting/bmp-prep
Quentin Young [Wed, 3 Jul 2019 20:42:41 +0000 (16:42 -0400)]
Merge pull request #4640 from opensourcerouting/bmp-prep

bgpd: BMP preparations

5 years agoMerge pull request #4632 from manuhalo/fix_bgp_lu_update
Quentin Young [Wed, 3 Jul 2019 18:25:18 +0000 (14:25 -0400)]
Merge pull request #4632 from manuhalo/fix_bgp_lu_update

bgpd: fix bgp-lu update bug

5 years agoMerge pull request #4637 from opensourcerouting/fixes-20190703
Quentin Young [Wed, 3 Jul 2019 17:28:23 +0000 (13:28 -0400)]
Merge pull request #4637 from opensourcerouting/fixes-20190703

isisd printfrr & clippy fixes

5 years agoMerge pull request #4641 from qlyoung/remove-zebra-bs-irdp
Mark Stapp [Wed, 3 Jul 2019 17:05:04 +0000 (13:05 -0400)]
Merge pull request #4641 from qlyoung/remove-zebra-bs-irdp

zebra: remove bs irdp error code

5 years agoMerge pull request #4629 from ton31337/fix/large_community_list_uint16_overflow
Quentin Young [Wed, 3 Jul 2019 16:30:21 +0000 (12:30 -0400)]
Merge pull request #4629 from ton31337/fix/large_community_list_uint16_overflow

bgpd: Validate large-community-list against UINT_MAX

5 years agoMerge pull request #4638 from donaldsharp/ospf_external_delete_crash
David Lamparter [Wed, 3 Jul 2019 16:02:29 +0000 (18:02 +0200)]
Merge pull request #4638 from donaldsharp/ospf_external_delete_crash

ospfd: Do not modify list when using _RO loop

5 years agolib/resolver: NULL out callback before call
David Lamparter [Thu, 23 May 2019 12:25:58 +0000 (14:25 +0200)]
lib/resolver: NULL out callback before call

The callback itself might want to reschedule the resolver, so it is
useful to clear out the callback field before making the call instead of
after.

Signed-off-by: David Lamparter <equinox@diac24.net>
5 years agolib: split off c-ares code from nhrpd
David Lamparter [Thu, 23 May 2019 10:23:02 +0000 (12:23 +0200)]
lib: split off c-ares code from nhrpd

This is useful in other places too, e.g. for BMP outbound connections.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
5 years agobgpd: add packet send hook
David Lamparter [Fri, 10 May 2019 17:29:01 +0000 (19:29 +0200)]
bgpd: add packet send hook

Unlike MRT dumps, BMP also provides packets sent by the router.  Add
another hook for that.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
5 years agobgpd: add & use bgp packet dump hook
David Lamparter [Wed, 24 Apr 2019 15:19:09 +0000 (17:19 +0200)]
bgpd: add & use bgp packet dump hook

The MRT dump code is already hooked in at the right places to write out
packets;  the BMP code needs exactly the same access so let's make this
a hook.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
5 years agobgpd: add instance delete & config write hooks
David Lamparter [Fri, 10 May 2019 13:31:04 +0000 (15:31 +0200)]
bgpd: add instance delete & config write hooks

Both of these hooks are necessary for proper operation of extensions
that need to latch on to a particular instance.

- without the delete hook, it's impossible to get rid of stale
  references, leading to crashes with invalid instance pointers.
- the config-write hook is necessary because per-instance config needs
  to be written inside the "router bgp" block to have the appropriate
  context; adding a separate config node can't do that.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
5 years agobgpd: autocomplete "router bgp" ASN
David Lamparter [Fri, 10 May 2019 13:30:49 +0000 (15:30 +0200)]
bgpd: autocomplete "router bgp" ASN

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
5 years agobgpd: add a hook before bgp_process()
David Lamparter [Thu, 9 May 2019 09:12:14 +0000 (11:12 +0200)]
bgpd: add a hook before bgp_process()

BMP uses this to get notified about any changes to prefixes, at which
point it schedules its own processing to happen later.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
5 years agobgpd: count some per-peer stats (for BMP)
David Lamparter [Wed, 24 Apr 2019 19:40:50 +0000 (21:40 +0200)]
bgpd: count some per-peer stats (for BMP)

These counters are accessible through BMP and may be useful to monitor
bgpd.  A CLI to show them could also be added if people are interested.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
5 years agobgpd: fix last_reset_cause setup
David Lamparter [Wed, 24 Apr 2019 18:14:19 +0000 (20:14 +0200)]
bgpd: fix last_reset_cause setup

last_reset_cause_size is the length *used* in last_reset_cause[].  It's
straight up used wrong here; we're saving off a reset cause and need to
check against the *available* size in last_reset_cause[].

This could actually have led to (hopefully rare) crashes in the assert
there, since the assert condition might fail incorrectly.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
5 years agoMerge pull request #4550 from manuhalo/fix_bgp_label_cb
Donald Sharp [Wed, 3 Jul 2019 13:15:37 +0000 (09:15 -0400)]
Merge pull request #4550 from manuhalo/fix_bgp_label_cb

Fix bgp-lu label callback crash

5 years agoisisd: fix printfrr derp
David Lamparter [Wed, 3 Jul 2019 13:13:41 +0000 (15:13 +0200)]
isisd: fix printfrr derp

Yeah, gotta use v... if the arg is a va_list...

Fixes: #4600
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
5 years agoclippy: find headers relative to source tree
David Lamparter [Wed, 3 Jul 2019 12:53:32 +0000 (14:53 +0200)]
clippy: find headers relative to source tree

The current directory is in the build tree while running clippy; find
ourselves so we can access headers from the source tree.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
5 years agolib: Add a couple functions to nexthop_group.c (#4323)
David Lamparter [Wed, 3 Jul 2019 12:42:35 +0000 (14:42 +0200)]
lib: Add a couple functions to nexthop_group.c (#4323)

lib: Add a couple functions to nexthop_group.c

Co-authored-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agoRun-time log filtering via vtysh commands (#4524)
David Lamparter [Wed, 3 Jul 2019 12:39:59 +0000 (14:39 +0200)]
Run-time log filtering via vtysh commands (#4524)

Run-time log filtering via vtysh commands

5 years agozebra: remove bs irdp error code
Quentin Young [Wed, 3 Jul 2019 00:27:14 +0000 (00:27 +0000)]
zebra: remove bs irdp error code

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
5 years agobgpd: Validate large-community-list against UINT_MAX
Donatas Abraitis [Tue, 2 Jul 2019 12:35:26 +0000 (15:35 +0300)]
bgpd: Validate large-community-list against UINT_MAX

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
5 years agoMerge pull request #4634 from mjstapp/vty_report_pids
Quentin Young [Tue, 2 Jul 2019 20:39:28 +0000 (16:39 -0400)]
Merge pull request #4634 from mjstapp/vty_report_pids

lib: add process pids to 'show modules'

5 years agoospfd: Do not modify list when using _RO loop
Donald Sharp [Tue, 2 Jul 2019 23:06:22 +0000 (19:06 -0400)]
ospfd: Do not modify list when using _RO loop

The shutdown of ospf was causing crashes because the shutdown
was calling a ALL_LIST_ELEMENTS_RO macro and modifying the
underlying data structures.  Switch to using ALL_LIST_ELEMENTS.

This is caused by this change:

commit f9e1501aea5d429be2ecda1a3e2bde17e6ad5e4b
Author: Donald Sharp <sharpd@cumulusnetworks.com>
Date:   Wed Feb 27 15:08:29 2019 -0500

    ospfd: Cleanup ospf->redist and ospf->external on shutdown

Effectively my original testing for this only had one external
route and as such we would not have a crash here.  It only
showed up after multiple externals have been introduced.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agolib: add process pids to 'show modules'
Mark Stapp [Tue, 2 Jul 2019 18:05:18 +0000 (14:05 -0400)]
lib: add process pids to 'show modules'

Add the process pids to the output produced by 'show modules'.
At least in a development setting, where there may be multiple
instances of frr running, it can be handy to be able to id
the exact pids, for debugging e.g.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
5 years agoMerge pull request #4622 from donaldsharp/import_table_fix
Sri Mohana Singamsetty [Tue, 2 Jul 2019 18:20:02 +0000 (11:20 -0700)]
Merge pull request #4622 from donaldsharp/import_table_fix

Import table fix

5 years agoMerge pull request #4598 from bisdhdh/master
Quentin Young [Tue, 2 Jul 2019 17:52:54 +0000 (13:52 -0400)]
Merge pull request #4598 from bisdhdh/master

bgpd: 'show bgp ipv6 neighbors <X::Y> prefix-counts' prefix-count is not getting displayed

5 years agobgpd: fix bgp-lu update bug
Emanuele Di Pascale [Tue, 2 Jul 2019 16:59:00 +0000 (18:59 +0200)]
bgpd: fix bgp-lu update bug

bgp update messages were not correctly calculating the size
for a labeled-unicast prefix, as they were not accounting
for the label. If the update message was large enough to
overflow the maximum packet size (4096 bytes) this could
cause bgpd to send a malformed update packet.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
5 years agobfdd: fix some CI warnings
Rafael Zalamena [Tue, 2 Jul 2019 16:05:27 +0000 (13:05 -0300)]
bfdd: fix some CI warnings

Use `static` functions for file local functions to please `check_patch.pl`.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
5 years agoMerge pull request #4624 from qlyoung/use-standard-bools
David Lamparter [Tue, 2 Jul 2019 15:51:09 +0000 (17:51 +0200)]
Merge pull request #4624 from qlyoung/use-standard-bools

*: s/TRUE/true/, s/FALSE/false/

5 years agoMerge pull request #4086 from opensourcerouting/fix-yang-validation
Quentin Young [Tue, 2 Jul 2019 15:39:13 +0000 (11:39 -0400)]
Merge pull request #4086 from opensourcerouting/fix-yang-validation

Fix a couple of YANG validation issues

5 years agoMerge pull request #3888 from donaldsharp/ospf_cleanup
Olivier Dugeon [Tue, 2 Jul 2019 15:37:23 +0000 (17:37 +0200)]
Merge pull request #3888 from donaldsharp/ospf_cleanup

ospfd: Cleanup ospf->redist and ospf->external on shutdown

5 years agoMerge pull request #4496 from chiragshah6/evpn_dev2
Russ White [Tue, 2 Jul 2019 14:55:25 +0000 (10:55 -0400)]
Merge pull request #4496 from chiragshah6/evpn_dev2

bgpd: vrf route leak handle bgp instance delete recreate

5 years agozebra: evpn entries are not cleaned upon frr stop
Chirag Shah [Fri, 28 Jun 2019 17:42:08 +0000 (10:42 -0700)]
zebra: evpn entries are not cleaned upon frr stop

As part of PR 4458, when a client (bgpd) goes down,
zebra cleans up any evpn state including remotely learned
neighs, macs and vteps are suppose to be cleaned up,
uninstall from kernel tables.

Neighs (arps), macs and vteps (HREP entries) were not
removed from kernel tables as the uninstall flag as not set.

Clean up l3vni associated remote neighs, macs and vteps.

Ticket:CM-25468
Reviewed By:CCR-8889
Testing Done:

Validated in evpn symmetric routing topology where
remotely learned l2/l3 vnis neigh, macs and remote
vtep (hrep) entries are installed in kernel table,
perform systemctl stop frr.service and validated
all remotely learned entries cleaned up from kernel
tables.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
5 years agolib: use flag from new libyang version to simplify the code
Renato Westphal [Sat, 13 Apr 2019 00:38:57 +0000 (21:38 -0300)]
lib: use flag from new libyang version to simplify the code

When using the LYD_PATH_OPT_NOPARENTRET flag, lyd_new_path() returns
the path-referenced node instead of the first created node. This
flag wasn't available in libyang 0.16-r1 so we couldn't use it
before. Use it now to simplify the code where possible.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agobgpd: 'show bgp ipv6 neighbors <X::Y> prefix-counts' prefix-count is
Biswajit Sadhu [Mon, 24 Jun 2019 07:50:33 +0000 (00:50 -0700)]
bgpd: 'show bgp ipv6 neighbors <X::Y> prefix-counts' prefix-count is
not getting displayed.

Neighbour prefix-count is not getting displayed with IPV6 neighbours
and displays the o/p “ % No such neighbor or address family ”.
However, I observed it is working fine for IPV4 neighbour.

Signed-off-by: Biswajit Sadhu <sadhub@vmware.com>
5 years agobuild, lib: bump libyang requirement version to >= 0.16.105
Renato Westphal [Fri, 5 Apr 2019 01:53:27 +0000 (22:53 -0300)]
build, lib: bump libyang requirement version to >= 0.16.105

After ~4 months of deprecation period [1], drop support for older
libyang versions that don't support embedded extensions.

In addition to support for embedded extensions, libyang 0.16-r3
contains several bug fixes and performance improvements compared
to libyang-0.16-r1. It was about time to update.

Fixes:
* Issue #3273
* Issue #3971

[1] See commit 68626e08.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: fix problems with the "ip rip authentication" command
Renato Westphal [Fri, 5 Apr 2019 01:28:00 +0000 (22:28 -0300)]
ripd: fix problems with the "ip rip authentication" command

libyang-0.16-r3 doesn't allow the creation of data nodes if their
corresponding "when" statement (if any) resolves to false. This
change broke the "ip rip authentication" command.

This commit adapts this command so that it's not affected by the
new libyang stricter validation checks.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>