proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-11 03:35:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,210 Commits 4 Branches 191 Tags 125 MiB
3cda750598
Commit Graph

9210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jafar Al-Gharaibeh
00d89a0e57 Merge pull request #1250 from chiragshah6/ospf_vrf_dev 
ospfd: fix virtual-link config command
 2017-10-02 14:03:42 -05:00
Renato Westphal
47cf17fd59 Merge pull request #1277 from donaldsharp/zebra_crash 
Zebra crash and valgrind issues
 2017-10-02 14:05:54 -03:00
Chirag Shah
baf9eaad50 ospfd: ospf use macro for authentication 
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
 2017-10-02 09:52:43 -07:00
Renato Westphal
36a58930ff Merge pull request #1254 from donaldsharp/irdp_no_crash 
zebra: Fix irdp so it doesn't crash when looked at
 2017-10-02 12:41:24 -03:00
Donald Sharp
f88bd20c39 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>
 2017-10-02 11:06:09 -04:00
Donald Sharp
b8aa376766 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>
 2017-10-02 11:06:06 -04:00
Donald Sharp
75d07b8b83 Merge pull request #1276 from opensourcerouting/isis-fix-vertex-queue 
isisd: fix vertex queue comparator
 2017-10-02 10:51:07 -04:00
Donald Sharp
cbaca6a144 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>
 2017-10-02 10:42:53 -04:00
Christian Franke
60d3914270 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>
 2017-10-02 16:03:11 +02:00
Vincent JARDIN
04d14c8be1 scan-build: fix warning 
Do not change the implementation, just fix scan-build/clang warning.
 2017-10-02 09:14:03 +02:00
Vincent JARDIN
89a48046dd ospf_packet: scan-build/clang clean up 
get the code safer using snprintf().
 2017-10-02 09:14:03 +02:00
Vincent JARDIN
c31a793b48 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;
 2017-10-02 09:14:03 +02:00
Vincent JARDIN
80a5a11bb1 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.
 2017-10-02 09:14:03 +02:00
Jafar Al-Gharaibeh
51dcd4c376 Merge pull request #1260 from donaldsharp/logrotate 
debian: Fix logrotate when FRR is not running
 2017-09-30 22:49:27 -05:00
Jafar Al-Gharaibeh
14dc41be15 Merge pull request #1265 from donaldsharp/pim_fill 
pimd: Add 'show ip mroute fill' command
 2017-09-30 22:48:37 -05:00
Jafar Al-Gharaibeh
bc5dcce7da Merge pull request #1271 from donaldsharp/multiplier 
lib: Fix abbreviation
 2017-09-30 22:47:43 -05:00
Chirag Shah
cbb9b53d32 ospfd: fix area virtual-link command 
Adjust to review comments

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
 2017-09-30 19:50:44 -07:00
Chirag Shah
55d1da2490 ospfd: ospf virtual-link fix 
Initialize idx to 0 and remove reassignment of idx

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
 2017-09-29 10:52:11 -07:00
Renato Westphal
867be27151 Merge pull request #1255 from qlyoung/vtysh-remove-double-slash 
vtysh: remove extra / in config path
 2017-09-29 14:47:48 -03:00
Donald Sharp
b077b2e658 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>
 2017-09-29 11:53:53 -04:00
Quentin Young
3607783335
lib: remove extra / in other paths 
Non-integrated config paths need the treatment as well.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-09-29 11:26:11 -04:00
Renato Westphal
c00ad29fc4 Merge pull request #1236 from donaldsharp/interface_startup 
zebra: Do not allow same rib_dest_t be queued multiple times to meta …
 2017-09-28 22:04:02 -03:00
Renato Westphal
f0722791a0 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>
 2017-09-28 21:51:05 -03:00
Renato Westphal
9e452e5dd1 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>
 2017-09-28 21:50:46 -03:00
Lou Berger
2d9c2ae397 Merge pull request #1261 from dwalton76/bgpd-4byte-display 
bgpd: fix 4-byte AS display in bestpath-from-AS
 2017-09-28 17:50:19 -04:00
Quentin Young
91fd1b8d9c
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>
 2017-09-28 14:01:05 -04:00
Donald Sharp
45b7b09283 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>
 2017-09-28 08:05:20 -04:00
Chirag Shah
3d1c6dc2c6 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>
 2017-09-27 17:33:12 -07:00
Daniel Walton
2f52ad9627 tools: frr-reload.py should exit(1) if vtysh config mode is locked 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
 2017-09-27 18:47:47 +00:00
Renato Westphal
67c0a9206c Merge pull request #1180 from dwalton76/ipv6-static-route-null0 
Ipv6 static route null0
 2017-09-27 13:42:53 -03:00
Jafar Al-Gharaibeh
78ab711529 Merge pull request #1247 from qlyoung/mcast-boundary-igmp 
pimd: add support for boundaries
 2017-09-27 11:42:13 -05:00
Daniel Walton
fb2b09347d 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#
 2017-09-27 16:07:24 +00:00
Dave Olson
83aadaa68d 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>
 2017-09-27 12:02:58 -04:00
Quentin Young
2a19199407
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>
 2017-09-27 11:36:22 -04:00
Daniel Walton
1e058f38c2 zebra: split ip route DEFUNs for blackhole, reject, etc 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
 2017-09-27 15:35:28 +00:00
Renato Westphal
e74339e235 Merge pull request #1201 from dwalton76/bgpd-debug-updates-prefix 
Bgpd debug updates prefix
 2017-09-27 12:02:54 -03:00
Daniel Walton
b8d6c2c11e Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-debug-updates-prefix 2017-09-27 13:39:13 +00:00
Renato Westphal
40acdd93b2 Merge pull request #1257 from donaldsharp/pim_bp 
pimd: Some compilers are complaining about my bp
 2017-09-27 10:36:13 -03:00
Daniel Walton
66b8ce1a17 Merge branch 'master' into bgpd-debug-updates-prefix 2017-09-27 09:21:26 -04:00
Daniel Walton
2a67b9150a bgpd: remove clippy references in bgp_debug.c 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
 2017-09-27 13:18:43 +00:00
Renato Westphal
f5129394ec Merge pull request #1242 from donaldsharp/eigrp_tm 
Eigrp tm
 2017-09-27 09:20:51 -03:00
Renato Westphal
310f64be93 Merge pull request #1240 from donaldsharp/allow_self_delete 
zebra: Do not allow delete of route from kernel in non-startup case
 2017-09-27 09:11:11 -03:00
Donald Sharp
4646b86ab1 pimd: Some compilers are complaining about my bp 
Fix the bp variable possibly ( yeah not really ) be
initialized upon use.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-09-27 07:55:53 -04:00
Quentin Young
e82314b1bf
vtysh: remove extra / in config path 
before:

frrdev# do wr
Note: this version of vtysh never writes vtysh.conf
Building Configuration...
Integrated configuration saved to /etc/frr//frr.conf
[OK]
frrdev#

after:

frrdev# do wr
Note: this version of vtysh never writes vtysh.conf
Building Configuration...
Integrated configuration saved to /etc/frr/frr.conf
[OK]
frrdev#

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-09-26 22:41:47 -04:00
Renato Westphal
5f3d15f2c3 Merge pull request #1249 from donaldsharp/debugodebug 
Debugodebug
 2017-09-26 22:21:41 -03:00
Renato Westphal
3ca34bd8ee Merge pull request #1208 from donaldsharp/multiaccess 
bgpd: Reduce multiaccess_check_v4 overhead for subgroups
 2017-09-26 22:14:40 -03:00
Renato Westphal
63e4c24f2c Merge pull request #1243 from qlyoung/tm-destroy-cond 
lib: destroy threadmaster condition variable
 2017-09-26 21:58:39 -03:00
Donald Sharp
65d4e0c69b bgpd: Reduce multiaccess_check_v4 overhead for subgroups 
Perf results at scale( >1k peers) showed a non-trivial
amount of time spent in bgp_multiaccess_check_v4.  Upon
function examination we are looking up the nexthops
connected node in each call as well as having to unlock
it after each iteration.  Rewrite to lookup the nexthop
node once.

This should reduce the node lookup by aproximately 1/2
which should yield some performance results.  There are
probably better things to do here but would require
deeper thought.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-09-26 20:06:13 -04:00
Donald Sharp
6988ea42d2 Merge pull request #1248 from vjardin6WIND/cleanup 
zebra: static ns
 2017-09-26 19:59:33 -04:00
Donald Sharp
e92044cd96 zebra: Fix irdp so it doesn't crash when looked at 
irdp is crashing because it assumes that people have
configured it in a certain way.  Ensure that this
'way' is honored at least enough so that we don't
crash.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-09-26 19:57:27 -04:00