]>
git.puffer.fish Git - mirror/frr.git/log
Vincent JARDIN [Sun, 8 Oct 2017 15:56:23 +0000 (17:56 +0200)]
rfapi: avoid calling NULL() function.
Keep the execution flow, bug log errors.
Signed-off-by: Vincent Jardin <vincent.jardin@6wind.com>
Donald Sharp [Fri, 6 Oct 2017 21:50:18 +0000 (17:50 -0400)]
Merge pull request #1303 from opensourcerouting/ldpd-scan-build
ldpd: sprinkle in some asserts to make scan-build happy
Renato Westphal [Fri, 6 Oct 2017 20:50:19 +0000 (17:50 -0300)]
ldpd: sprinkle in some asserts to make scan-build happy
While here, fix the other SA warnings.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Lou Berger [Fri, 6 Oct 2017 13:31:30 +0000 (09:31 -0400)]
Merge pull request #1295 from donaldsharp/more_1270
More 1270
Donald Sharp [Fri, 6 Oct 2017 13:12:09 +0000 (09:12 -0400)]
Merge pull request #1299 from opensourcerouting/small_fixes
Small fixes
Renato Westphal [Fri, 6 Oct 2017 01:38:19 +0000 (22:38 -0300)]
zebra: fix display of negative route metrics and tags
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Renato Westphal [Fri, 6 Oct 2017 01:31:54 +0000 (22:31 -0300)]
*: use argv[]->text instead of argv[]->arg when appropriate
Incomplete commands like "debug ospf6 route mem" were being ignored. The
changes in ripd and ripngd are intended to make the code easier to read,
no bugs were fixed in these two daemons.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Renato Westphal [Fri, 6 Oct 2017 00:47:11 +0000 (21:47 -0300)]
lib, ldpd: fix "argument cannot be negative" coverity warnings
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Lou Berger [Thu, 5 Oct 2017 18:57:05 +0000 (14:57 -0400)]
Merge pull request #1264 from donaldsharp/linklist
Linklist api cleanup
Renato Westphal [Thu, 5 Oct 2017 16:20:00 +0000 (13:20 -0300)]
Merge pull request #1293 from donaldsharp/pim_boundary_oil
Pim boundary oil
Donald Sharp [Thu, 28 Sep 2017 01:19:20 +0000 (21:19 -0400)]
*: Convert list_free usage to list_delete
list_free is occassionally being used to delete the
list and accidently not deleting all the nodes.
We keep running across this usage pattern. Let's
remove the temptation and only allow list_delete
to handle list deletion.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Thu, 5 Oct 2017 14:51:01 +0000 (10:51 -0400)]
*: Convert list_delete(struct list *) to ** to allow nulling
Convert the list_delete(struct list *) function to use
struct list **. This is to allow the list pointer to be nulled.
I keep running into uses of this list_delete function where we
forget to set the returned pointer to NULL and attempt to use
it and then experience a crash, usually after the developer
has long since left the building.
Let's make the api explicit in it setting the list pointer
to null.
Cynical Prediction: This code will expose a attempt
to use the NULL'ed list pointer in some obscure bit
of code.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Wed, 4 Oct 2017 21:46:29 +0000 (17:46 -0400)]
vtysh: Fix ordering of multicast boundary command
The multicast boundary command must be shown after
the `ip pim sm` command. So add a new config_add_line_end
and make it the last one.
Signed-off-by: Donald Sharp <sharp@cumulusnetworks.com>
Donald Sharp [Wed, 4 Oct 2017 21:32:48 +0000 (17:32 -0400)]
pimd: Fix multicast boundary command
1) Fix missing newlines
2) Write the correct cli out.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Thu, 5 Oct 2017 14:11:36 +0000 (10:11 -0400)]
bgpd: Fixup json with RouteDistinguishers
The json option for displaying a bgp table
with route Distinguishers in it was not properly
working. This code cleans this issue up.
Additionally attempt to make the code a bit
easier to read and handle.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Wed, 4 Oct 2017 14:26:43 +0000 (10:26 -0400)]
bgpd: Cleanup bgp_show_table to be easier on the eyes
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Lou Berger [Fri, 29 Sep 2017 15:54:31 +0000 (11:54 -0400)]
bgpd: fix 'show bgp ipvX vpn rd' command
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Fri, 29 Sep 2017 15:32:10 +0000 (11:32 -0400)]
bgpd: fix show bgp ipvX vpn all rd
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Fri, 29 Sep 2017 15:26:05 +0000 (11:26 -0400)]
bgpd: remove old/broken vpnv4 from of show bgp
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Thu, 28 Sep 2017 22:51:31 +0000 (18:51 -0400)]
bgpd: unify 'show bgp' with RD with normal unicast bgp show
Signed-off-by: Lou Berger <lberger@labn.net>
Renato Westphal [Thu, 5 Oct 2017 14:05:43 +0000 (11:05 -0300)]
Merge pull request #1244 from donaldsharp/flush_routes
tools: Fix route flush
Renato Westphal [Thu, 5 Oct 2017 14:03:54 +0000 (11:03 -0300)]
Merge pull request #1280 from donaldsharp/eigrp_interface
Eigrp interface cleanup
Renato Westphal [Thu, 5 Oct 2017 13:43:35 +0000 (10:43 -0300)]
Merge pull request #1292 from chiragshah6/mdev
ospf6d: add debug ospf6 route memory to config
Donald Sharp [Thu, 5 Oct 2017 12:54:03 +0000 (08:54 -0400)]
*: Add some documentation about how to handle new daemons
Add some breadcrumbs for when we add a new routing daemon
so things `just work`.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Thu, 5 Oct 2017 12:27:31 +0000 (08:27 -0400)]
tools: Add NHRP to route flushing
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Thu, 5 Oct 2017 12:23:27 +0000 (08:23 -0400)]
tools: Fix babel RT_PROT #
We had mistakenly created another RT_PROT # for babel.
This is incorrect.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Mon, 25 Sep 2017 23:10:40 +0000 (19:10 -0400)]
tools: Fix route flush
This commit does two things:
1) Flush by proto number not string
This is useful because not all systems might have the proto
values installed, or a version of iproute2 that they might
be installed with.
2) Flush missing routes that might have been installed( eigrp
and nhrp )
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Thu, 5 Oct 2017 12:06:57 +0000 (08:06 -0400)]
Merge pull request #1286 from opensourcerouting/isis-lsp-queue-improv
isisd: optimize per interface lsp send-queue creation
Donald Sharp [Wed, 4 Oct 2017 22:38:41 +0000 (18:38 -0400)]
Merge pull request #1291 from sebageek/debian-pkg-add-iproute2-alternative
Add iproute2 as dependency alternative in Debian package
Donald Sharp [Wed, 4 Oct 2017 22:37:11 +0000 (18:37 -0400)]
Merge pull request #1288 from donaldsharp/1287
doc: Added python-ipaddr dependancy
Chirag Shah [Wed, 4 Oct 2017 20:56:54 +0000 (13:56 -0700)]
ospf6d: add debug ospf6 route memory to config
vty config write to display 'debug ospf6 route memory'.
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Quentin Young [Wed, 4 Oct 2017 21:31:45 +0000 (17:31 -0400)]
Merge pull request #1289 from sebageek/fix-defualt-typo
Fix defualt-default typo in bgp evpn help text
Sebastian Lohff [Wed, 4 Oct 2017 19:55:51 +0000 (21:55 +0200)]
debian: Add iproute2 as dependency alternative in Debian package
iproute has been a transitional package that only depends on iproute2
since Debian Jessie or Ubuntu 14.04. To avoid installing this transitional
dummy package on newer installations we add iproute2 as a dependency
alternative to iproute. The iproute dependency can be dropped when
wheezy / 12.04 support is no longer needed.
Signed-off-by: Sebastian Lohff <seba@someserver.de>
Sebastian Lohff [Wed, 4 Oct 2017 19:25:12 +0000 (21:25 +0200)]
bgpd: Fix defualt-default typo in bgp evpn help text
Signed-off-by: Sebastian Lohff <seba@someserver.de>
Will McLendon [Wed, 4 Oct 2017 18:24:37 +0000 (14:24 -0400)]
doc: Added python-ipaddr dependancy
Added python-ipaddr apt requirement to documentation.
Added clarification to install systemd service section
as commands assume are in frr directory.
Signed-off-by: Will McLendon <wimclend@gmail.com>
Lou Berger [Wed, 4 Oct 2017 11:46:04 +0000 (07:46 -0400)]
Merge pull request #1283 from donaldsharp/ldp_bite_me
ldpd: Fix compiler warning about uninitialized rt
Donald Sharp [Wed, 4 Oct 2017 01:32:32 +0000 (21:32 -0400)]
ldpd: Fix compiler warning about uninitialized rt
Certain compilers cannot recognize that rt is
actually being init'ed, but let's set it to
NULL 'till we get them updated.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Wed, 4 Oct 2017 00:19:11 +0000 (20:19 -0400)]
Merge pull request #1282 from opensourcerouting/ldpd-minor-issues
ldpd minor issues
Donald Sharp [Tue, 3 Oct 2017 20:23:28 +0000 (16:23 -0400)]
Merge pull request #1267 from opensourcerouting/ldpd_cli_show
ldpd: add more filtering options in some "show" commands
Renato Westphal [Tue, 3 Oct 2017 19:11:07 +0000 (16:11 -0300)]
ldpd: detach stdin/stdout/stderr from the child processes
Doing a "ssh user@node 'ldpd -d'" was making the SSH session hang. In
the original OpenBSD's ldpd(8) daemon, the daemon function takes care
of connecting stdin/stdout/stderr to /dev/null. In the FRR port, this
only happens in the frr_run() function, after all children have been
forked. Ideally we could try to rearrange libfrr.c and ldpd.c in a way
that start_child() is called only after the parent connects the standard
I/O streams to /dev/null. But since this issue needs an immediate
fix, let's do this workaround for now. Note: even when running on the
foreground, all log messages from the child processes are sent to the
parent process, which then prints the messages to stdout/stderr and/or
to a log file.
Reported-by: Martin Winter <mwinter@opensourcerouting.org>
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Renato Westphal [Tue, 3 Oct 2017 13:30:44 +0000 (10:30 -0300)]
ldpd: fix issue when displaying the running configuration
More than a cosmetic fix, this should prevent issues with frr-reload.py.
Before:
mpls ldp
router-id 1.1.1.1
!
address-family ipv4
discovery transport-address 1.1.1.1
!
interface rt1-eth0
discovery hello holdtime 10
discovery hello interval 3
exit-address-family
!
!
After:
mpls ldp
router-id 1.1.1.1
!
address-family ipv4
discovery transport-address 1.1.1.1
!
interface rt1-eth0
discovery hello holdtime 10
discovery hello interval 3
!
exit-address-family
!
!
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Renato Westphal [Tue, 3 Oct 2017 13:27:05 +0000 (10:27 -0300)]
ldpd: remove the "discovery targeted-hello" commands from the interface node
These commands belong only in the global LDP node and in the LDP
address-family nodes.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Renato Westphal [Tue, 3 Oct 2017 13:24:45 +0000 (10:24 -0300)]
ldpd: fix wrong indentation in the help menu
The -n option was not aligned with the other ones:
% ldpd --help
[snip]
-A, --vty_addr Set vty's bind address
-P, --vty_port Set vty's port number
--ctl_socket Override ctl socket path
-n, --instance Instance id
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Jafar Al-Gharaibeh [Tue, 3 Oct 2017 18:09:59 +0000 (13:09 -0500)]
Merge pull request #1111 from chiragshah6/mdev
ospfd: OSPFv2 VRF Support
Jafar Al-Gharaibeh [Tue, 3 Oct 2017 16:59:19 +0000 (11:59 -0500)]
Merge pull request #1281 from donaldsharp/boo_memset
lib: Fix memset usage
Chirag Shah [Mon, 2 Oct 2017 18:47:02 +0000 (11:47 -0700)]
ospfd: OSPFv2 VRF remove iflist from master
Remove instances of ospf master's iflist and use vrf_list
with ospf vrf_id.
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Chirag Shah [Sun, 17 Sep 2017 01:08:33 +0000 (18:08 -0700)]
ospfd: fix vrf bind sock non-linux system
For non GNU_LINUX like open Bsd avoid sending packet
to non vrf aware device using in_pktinfo.
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Chirag Shah [Wed, 13 Sep 2017 00:27:26 +0000 (17:27 -0700)]
ospfd: Bind socket to vrf device
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Chirag Shah [Fri, 8 Sep 2017 21:59:12 +0000 (14:59 -0700)]
ospfd: OSPFv2 VRF fixesI
Fix ospf interface running config to display vrf
fix clang warnings
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Chirag Shah [Thu, 7 Sep 2017 15:08:09 +0000 (08:08 -0700)]
ospfd: OSPFv2 VRF Changes II
Accomodate review comments
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Chirag Shah [Wed, 6 Sep 2017 22:11:41 +0000 (15:11 -0700)]
ospfd: fix clang warning & ci-ospf test
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Chirag Shah [Wed, 6 Sep 2017 18:42:20 +0000 (11:42 -0700)]
ospfd: OSPFv2 VRF, fix CLAN SA warning
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Chirag Shah [Fri, 25 Aug 2017 20:51:12 +0000 (13:51 -0700)]
ospfd: OSPFv2 VRF Support
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Donald Sharp [Tue, 3 Oct 2017 16:03:56 +0000 (12:03 -0400)]
lib: Fix memset usage
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Jafar Al-Gharaibeh [Tue, 3 Oct 2017 15:41:00 +0000 (10:41 -0500)]
Merge pull request #1278 from chiragshah6/ospf_vrf_dev
ospfd: Fix maxage_lsa lookup key
Quentin Young [Tue, 3 Oct 2017 15:39:59 +0000 (11:39 -0400)]
Merge pull request #1263 from vjardin6WIND/cleanup
Cleanup - scan-build
Jafar Al-Gharaibeh [Tue, 3 Oct 2017 15:34:33 +0000 (10:34 -0500)]
Merge pull request #1262 from dwalton76/vtysh-conft-available2
tools: frr-reload.py should exit(1) if vtysh config mode is locked
Christian Franke [Mon, 2 Oct 2017 23:42:22 +0000 (01:42 +0200)]
isisd: optimize per interface lsp send-queue creation
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Donald Sharp [Tue, 3 Oct 2017 01:29:08 +0000 (21:29 -0400)]
eigrpd: Remove unnecessary macro definitions
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Mon, 2 Oct 2017 23:50:39 +0000 (19:50 -0400)]
eigrpd: Remove ei mapping to connected routes
We need one struct eigrp_interface per ifp structure
not a ifp->info structure with a ei per connected.
Some minor code cleanup as well with macros and
their weird usage.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Thu, 7 Sep 2017 00:12:46 +0000 (20:12 -0400)]
eigrpd: Start fixing eigrp_interface
The EIGRP interface handling code created 2 levels
of interface information, the ei( created per *connected*
address?????) and the ifp->info pointer.
Start the combination of pushing these together and
cleaning up the weirdness that is these two data
structures.
This commit probably breaks eigrp's handling of
interfaces.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Chirag Shah [Mon, 2 Oct 2017 21:07:13 +0000 (14:07 -0700)]
ospfd: Fix maxage_lsa lookup key
maxage_lsa using prefix structure to store in route_table.
The lsa pointer is 4-8 bytes depending on arch, but prefix member field
would be 1 byte. Use ptr field of prefix structure to store lsa pointer.
Also memset to initialize to avoid crash on ARM platform as same LSA is
referenced from multiple times during shutdown of ospf.
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Jafar Al-Gharaibeh [Mon, 2 Oct 2017 20:19:21 +0000 (15:19 -0500)]
Merge pull request #1259 from qlyoung/vtysh-warn-mi
vtysh: 'x not running' redux
Jafar Al-Gharaibeh [Mon, 2 Oct 2017 19:03:42 +0000 (14:03 -0500)]
Merge pull request #1250 from chiragshah6/ospf_vrf_dev
ospfd: fix virtual-link config command
Renato Westphal [Mon, 2 Oct 2017 17:05:54 +0000 (14:05 -0300)]
Merge pull request #1277 from donaldsharp/zebra_crash
Zebra crash and valgrind issues
Chirag Shah [Mon, 2 Oct 2017 16:17:33 +0000 (09:17 -0700)]
ospfd: ospf use macro for authentication
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Renato Westphal [Mon, 2 Oct 2017 15:41:24 +0000 (12:41 -0300)]
Merge pull request #1254 from donaldsharp/irdp_no_crash
zebra: Fix irdp so it doesn't crash when looked at
Donald Sharp [Mon, 2 Oct 2017 14:47:25 +0000 (10:47 -0400)]
zebra: Cleanup ptm memory *after* we tell the sockets to clean up
The zebra_ptm_finish() code was being called before the
client_list deletion. The client_list deletion is
attempting to call the ptm daemon and shut down the connection.
We should not be doing this *after* we shut down memory associated
with it as that we were writing into memory in random spots
in this case.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Mon, 2 Oct 2017 14:45:30 +0000 (10:45 -0400)]
zebra: Properly initialize memory for rtadv
The adata pointer was not properly being set to
0 before being used. In addition notice malloc
failure and hard exit. If we have no memory on
startup something terrible has gone wrong and
we were going to crash shortly here anyways.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Mon, 2 Oct 2017 14:51:07 +0000 (10:51 -0400)]
Merge pull request #1276 from opensourcerouting/isis-fix-vertex-queue
isisd: fix vertex queue comparator
Donald Sharp [Mon, 2 Oct 2017 14:42:53 +0000 (10:42 -0400)]
zebra: Fix valgrind report of unintialized data
When calling the kernel we are not properly initializing
iov and msg on function startup.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Christian Franke [Mon, 2 Oct 2017 14:01:58 +0000 (16:01 +0200)]
isisd: fix vertex queue comparator
While vertizes should be strictly ordered on insertion, deletion
will of course encouter equality.
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Vincent JARDIN [Wed, 27 Sep 2017 22:18:36 +0000 (00:18 +0200)]
scan-build: fix warning
Do not change the implementation, just fix scan-build/clang warning.
Vincent JARDIN [Wed, 27 Sep 2017 22:05:52 +0000 (00:05 +0200)]
ospf_packet: scan-build/clang clean up
get the code safer using snprintf().
Vincent JARDIN [Wed, 27 Sep 2017 21:38:19 +0000 (23:38 +0200)]
scan-build: cleanup some warnings
Current cleanup is for unset values or variables that are not used anymore.
Regarding ospfd/ospf_vty.c: argv_find()
we'll never get it NULL, so get coststr = argv[idx]->arg;
Vincent JARDIN [Wed, 27 Sep 2017 21:29:49 +0000 (23:29 +0200)]
sha256: fix clang warning
t0 and t1 are not used, but want do really want them to be reset to secure
the stack.
Suggested by Quentin: let's use memset() to be consistent.
Jafar Al-Gharaibeh [Sun, 1 Oct 2017 03:49:27 +0000 (22:49 -0500)]
Merge pull request #1260 from donaldsharp/logrotate
debian: Fix logrotate when FRR is not running
Jafar Al-Gharaibeh [Sun, 1 Oct 2017 03:48:37 +0000 (22:48 -0500)]
Merge pull request #1265 from donaldsharp/pim_fill
pimd: Add 'show ip mroute fill' command
Jafar Al-Gharaibeh [Sun, 1 Oct 2017 03:47:43 +0000 (22:47 -0500)]
Merge pull request #1271 from donaldsharp/multiplier
lib: Fix abbreviation
Chirag Shah [Sun, 1 Oct 2017 02:14:18 +0000 (19:14 -0700)]
ospfd: fix area virtual-link command
Adjust to review comments
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Chirag Shah [Fri, 29 Sep 2017 17:52:11 +0000 (10:52 -0700)]
ospfd: ospf virtual-link fix
Initialize idx to 0 and remove reassignment of idx
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Renato Westphal [Fri, 29 Sep 2017 17:47:48 +0000 (14:47 -0300)]
Merge pull request #1255 from qlyoung/vtysh-remove-double-slash
vtysh: remove extra / in config path
Donald Sharp [Fri, 29 Sep 2017 15:53:53 +0000 (11:53 -0400)]
lib: Fix abbreviation
The word Multiplier has been abbreviated to 'Mul' in
the output. This apparently is causing people
angst. Write word out.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Quentin Young [Fri, 29 Sep 2017 15:26:11 +0000 (11:26 -0400)]
lib: remove extra / in other paths
Non-integrated config paths need the treatment as well.
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Renato Westphal [Fri, 29 Sep 2017 01:04:02 +0000 (22:04 -0300)]
Merge pull request #1236 from donaldsharp/interface_startup
zebra: Do not allow same rib_dest_t be queued multiple times to meta …
Renato Westphal [Thu, 28 Sep 2017 22:42:46 +0000 (19:42 -0300)]
ldpd: add more filtering options in some "show" commands
Being able to filter the output of some "show" commands is super useful
when troubleshooting large MPLS networks.
Examples:
% show mpls ldp ipv4 binding 10.0.0.48/29 longer-prefixes neighbor 192.168.0.5
AF Destination Nexthop Local Label Remote Label In Use
ipv4 10.0.0.48/30 192.168.0.5 24 26 no
ipv4 10.0.0.52/30 192.168.0.5 25 27 no
% show mpls ldp ipv4 binding 10.0.0.48/29 longer-prefixes neighbor 192.168.0.5 detail json
{
"10.0.0.48\/30":{
"localLabel":"24",
"advertisedTo":[
{
"neighborId":"192.168.0.5"
}
],
"remoteLabels":[
{
"neighborId":"192.168.0.5",
"label":"26",
"inUse":0
}
]
},
"10.0.0.52\/30":{
"localLabel":"25",
"advertisedTo":[
{
"neighborId":"192.168.0.5"
}
],
"remoteLabels":[
{
"neighborId":"192.168.0.5",
"label":"27",
"inUse":0
}
]
}
}
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Renato Westphal [Sat, 23 Sep 2017 16:08:12 +0000 (13:08 -0300)]
ldpd: improve ordering of interfaces on user output
Before:
debian# show mpls ldp interface
AF Interface State Uptime Hello Timers ac
ipv4 rt0-eth0 ACTIVE 00:00:05 5/15 1
ipv4 rt0-eth1 ACTIVE 00:00:05 5/15 1
ipv4 rt0-eth10 ACTIVE 00:00:05 5/15 1
ipv4 rt0-eth11 ACTIVE 00:00:05 5/15 1
ipv4 rt0-eth2 ACTIVE 00:00:05 5/15 1
ipv4 rt0-eth3 ACTIVE 00:00:05 5/15 1
ipv4 rt0-eth4 ACTIVE 00:00:05 5/15 1
ipv4 rt0-eth5 ACTIVE 00:00:05 5/15 1
ipv4 rt0-eth6 ACTIVE 00:00:05 5/15 1
ipv4 rt0-eth7 ACTIVE 00:00:05 5/15 1
ipv4 rt0-eth8 ACTIVE 00:00:05 5/15 1
ipv4 rt0-eth9 ACTIVE 00:00:05 5/15 1
After:
debian# show mpls ldp interface
AF Interface State Uptime Hello Timers ac
ipv4 rt0-eth0 ACTIVE 00:00:14 5/15 1
ipv4 rt0-eth1 ACTIVE 00:00:14 5/15 1
ipv4 rt0-eth2 ACTIVE 00:00:14 5/15 1
ipv4 rt0-eth3 ACTIVE 00:00:14 5/15 1
ipv4 rt0-eth4 ACTIVE 00:00:14 5/15 1
ipv4 rt0-eth5 ACTIVE 00:00:14 5/15 1
ipv4 rt0-eth6 ACTIVE 00:00:14 5/15 1
ipv4 rt0-eth7 ACTIVE 00:00:14 5/15 1
ipv4 rt0-eth8 ACTIVE 00:00:14 5/15 1
ipv4 rt0-eth9 ACTIVE 00:00:14 5/15 1
ipv4 rt0-eth10 ACTIVE 00:00:14 5/15 1
ipv4 rt0-eth11 ACTIVE 00:00:14 5/15 1
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Lou Berger [Thu, 28 Sep 2017 21:50:19 +0000 (17:50 -0400)]
Merge pull request #1261 from dwalton76/bgpd-4byte-display
bgpd: fix 4-byte AS display in bestpath-from-AS
Quentin Young [Thu, 28 Sep 2017 18:01:05 +0000 (14:01 -0400)]
vtysh: more multi-instance fixing
Preexisting code to detect commands targeted at wrong instance didn't
work because a command applied to a disconnected vtysh_client counted as
a successful run overriding wrong instance error message
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Donald Sharp [Thu, 28 Sep 2017 12:05:20 +0000 (08:05 -0400)]
pimd: Add 'show ip mroute fill' command
When displaying the mroute table, add ability to fill
in all the missing data that for human eyes can be assumed.
This will allow people using grep over the command
can get more information.
sharpd@robot ~> sudo vtysh -c "show ip mroute fill"
Source Group Proto Input Output TTL Uptime
* 229.1.1.1 STATIC dum0 enp3s0 1 00:11:07 Default-IP-Routing-Table
* 229.1.1.1 STATIC dum0 virbr0 1 00:01:47 Default-IP-Routing-Table
sharpd@robot ~>
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Chirag Shah [Wed, 27 Sep 2017 20:51:16 +0000 (13:51 -0700)]
ospfd: fix ospf virtual-link command options
use argv_find to extract ospf area virtual-link command options.
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Daniel Walton [Wed, 27 Sep 2017 18:47:47 +0000 (18:47 +0000)]
tools: frr-reload.py should exit(1) if vtysh config mode is locked
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Renato Westphal [Wed, 27 Sep 2017 16:42:53 +0000 (13:42 -0300)]
Merge pull request #1180 from dwalton76/ipv6-static-route-null0
Ipv6 static route null0
Jafar Al-Gharaibeh [Wed, 27 Sep 2017 16:42:13 +0000 (11:42 -0500)]
Merge pull request #1247 from qlyoung/mcast-boundary-igmp
pimd: add support for boundaries
Daniel Walton [Wed, 27 Sep 2017 16:07:24 +0000 (16:07 +0000)]
bgpd: fix 4-byte AS display in bestpath-from-AS
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Before
======
cel-redxp-10# show ip bgp 20.1.3.0/24
BGP routing table entry for 20.1.3.0/24
Paths: (1 available, best #1, table Default-IP-Routing-Table)
Advertised to non peer-group peers:
top1(10.1.1.2) bottom0(20.1.2.2)
4294967292
20.1.2.2 from bottom0(20.1.2.2) (20.1.1.1)
Origin IGP, metric 0, localpref 100, valid, external,
bestpath-from-AS -4, best
Community: 99:1
AddPath ID: RX 0, TX 92
Last update: Wed Sep 27 16:02:34 2017
cel-redxp-10#
After
=====
cel-redxp-10# show ip bgp 20.1.3.0/24
BGP routing table entry for 20.1.3.0/24
Paths: (1 available, best #1, table Default-IP-Routing-Table)
Advertised to non peer-group peers:
bottom0(20.1.2.2)
4294967292
20.1.2.2 from bottom0(20.1.2.2) (20.1.1.1)
Origin IGP, metric 0, localpref 100, valid, external,
bestpath-from-AS
4294967292 , best
Community: 99:1
AddPath ID: RX 0, TX 2
Last update: Wed Sep 27 16:07:09 2017
cel-redxp-10#
Dave Olson [Wed, 27 Sep 2017 16:01:37 +0000 (12:01 -0400)]
debian: Fix logrotate when FRR is not running
Fix the logrotate script to complete successfully even
if FRR is not currently running.
Signed-off-by: Dave Olson <olson@cumulusnetworks.com>
Quentin Young [Wed, 27 Sep 2017 15:36:22 +0000 (11:36 -0400)]
vtysh: 'x not running' redux
when warning about daemons that are not running, make sure to handle the
multi instance case
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Daniel Walton [Wed, 27 Sep 2017 15:35:28 +0000 (15:35 +0000)]
zebra: split ip route DEFUNs for blackhole, reject, etc
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Renato Westphal [Wed, 27 Sep 2017 15:02:54 +0000 (12:02 -0300)]
Merge pull request #1201 from dwalton76/bgpd-debug-updates-prefix
Bgpd debug updates prefix
Daniel Walton [Wed, 27 Sep 2017 13:39:13 +0000 (13:39 +0000)]
Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-debug-updates-prefix