Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

assorted OSPF fixes #4151

Merged
merged 2 commits into from
Apr 17, 2019
Merged

assorted OSPF fixes #4151

merged 2 commits into from
Apr 17, 2019

Conversation

eqvinox
Copy link
Contributor

@eqvinox eqvinox commented Apr 17, 2019

These caused issues while working on #3045 (datastructure rework.) Since they really don't belong in there, pulled out into separate PR.

eqvinox added 2 commits April 17, 2019 13:28
@eqvinox
ospfd: fix clang-SA warning
da07f52 
Need to clear refresh_list before dropping the reference.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
@eqvinox
ospfd: make ECMP nexthop order deterministic
33546ba 
The order of ECMP nexthops currently depends on whatever order the
pqueue code returns the vertices in, which is essentially random since
they compare as equal.  While this shouldn't cause issues normally, it
is nondeterministic and causes the ldp-topo1 test to fail when the
ordering comes up different.  Also, nondeterministic behaviour is not a
nice thing to have here in general.

Just sort by nexthop address;  realistic numbers of ECMP nexthops should
hopefully not make this a performance issue.  (Also, nexthops should be
hot in the caches here.)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
@donaldsharp
Copy link
Member

I'll push in once CI finishes

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-7264/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Checkout code: Successful with additional warnings 
Report for ospf_spf.c | 2 issues
===============================================
< WARNING: Missing a blank line after declarations
< #172: FILE: /tmp/f1-9061/ospf_spf.c:172:

CLANG Static Analyzer Summary

  • Github Pull Request 4151, comparing to Git base SHA 336b988

Fixed warnings:

  • Logic error: Dereference of null pointer in ospfd/ospf_lsa.c, function ospf_refresher_unregister_lsa, line 3650

Static Analysis warning summary compared to base:

  • Fixed warnings: 1
  • New warnings: 0

12 Static Analyzer issues remaining.

See details at
https://ci1.netdef.org/browse/FRR-FRRPULLREQ-7264/artifact/shared/static_analysis/index.html

@donaldsharp donaldsharp merged commit e158a90 into FRRouting:master Apr 17, 2019
@eqvinox eqvinox deleted the ospf-assorted-20190417 branch April 17, 2019 12:54
@LabN-CI
Copy link
Collaborator

LabN-CI commented Apr 17, 2019

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table
_ _
Result SUCCESS git merge/4151 33546ba
Date 04/17/2019
Start 08:49:46
Finish 09:13:27
Run-Time 23:41
Total 1813
Pass 1813
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2019-04-17-08:49:46.txt
Log autoscript-2019-04-17-08:50:31.log.bz2
Memory 448 447 374

For details, please contact louberger

qlyoung pushed a commit that referenced this pull request Apr 17, 2019
@donaldsharp
Merge pull request #4151 from opensourcerouting/ospf-assorted-20190417
87faa29 
assorted OSPF fixes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bugfix ospf
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@eqvinox @donaldsharp @NetDEF-CI @LabN-CI @qlyoung