diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-08-12 15:06:06 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-08-12 15:06:06 +0100 |
| commit | cec1fae79110dffa900c0c5f38c3d3b48f5b0db6 (patch) | |
| tree | 408055322e19098b98766168624f1b96865ac73b /bgpd/bgp_common.h | |
| parent | 228e06bad624a33090da4a09f32f8fed84a7e15c (diff) | |
| parent | 7bd8653ef788a6395b07583d6766be8950598342 (diff) | |
| download | quagga-ex18p.tar.bz2 quagga-ex18p.tar.xz | |
Merge branch 'euro_ix' of /git/quagga.euro-ix into pipeworkex18p
Merge with euro_ix branch v0.99.18ex17.
Update version to: 0.99.18ex18p
Of particular note:
* includes support for GTSM:
neighbor ... ttl-security hops X
no neighbor ... ttl-security hops X
where X is 1-254. For usual case of immediately connected
peer, X == 1.
Cannot set ttl-security while ebgp-multihop is set, and
vice-versa.
If underlying O/S does not support GTSM, then will set ttl
as per ebgp-multihop.
In passing, have fixed various bugs in the main Quagga branch.
* initial support for draft-ietf-idr-optional-transitive
Does not yet support "neighbor-complete" flag.
* main Quagga now uses TCP_CORK and permanent non-blocking
Do not beleive TCP_CORK to be necessary for euro_ix code...
which has a different buffering strategy.
The euro_ix code already runs sockets permanently non-blocking.
* various fixes to attribute intern/unintern
Trying to remove memory leaks. Nobody seems convinced that
this has been perfected, yet.
* fixes for ospfd and ospf6d issues.
Up to date with master branch up to:
commit 538cb284864c17de66152a5236db4cd80e3e7639
Merge: 036a6e6 8ced4e8
Author: Paul Jakma <paul@quagga.net>
Date: Fri Jul 29 18:21:50 2011 +0100
Diffstat (limited to 'bgpd/bgp_common.h')
| -rw-r--r-- | bgpd/bgp_common.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bgpd/bgp_common.h b/bgpd/bgp_common.h index fb695125..e115bfd5 100644 --- a/bgpd/bgp_common.h +++ b/bgpd/bgp_common.h @@ -329,14 +329,14 @@ get_iSAFI(qafx_num_t num) * NB: it is a mistake to try to map qafx_num_undef (FATAL unless NDEBUG). */ -extern const pAF_t pAF_map[] ; +extern const sa_family_t sa_family_map[] ; -Inline pAF_t -get_pAF(qafx_num_t num) +Inline sa_family_t +get_sa_family(qafx_num_t num) { dassert((num >= qafx_num_min) && (num <= qafx_num_max)) ; - return pAF_map[num] ; + return sa_family_map[num] ; } ; /*============================================================================== |