diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-08-12 11:44:09 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-08-12 11:44:09 +0100 |
| commit | 7bd8653ef788a6395b07583d6766be8950598342 (patch) | |
| tree | f4b7209b76ddb24c6ab8144608a2a46adc610528 /ospfd/ospf_te.c | |
| parent | 6bd3ef2441f6b45d96c69ee8183d2bec8173ddb5 (diff) | |
| parent | 538cb284864c17de66152a5236db4cd80e3e7639 (diff) | |
| download | quagga-7bd8653ef788a6395b07583d6766be8950598342.tar.bz2 quagga-7bd8653ef788a6395b07583d6766be8950598342.tar.xz | |
Merge with main Quagga source as of 29-Jul-2011.ex17
Create euro_ix branch.
Update version to: 0.99.18ex17
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 'ospfd/ospf_te.c')
| -rw-r--r-- | ospfd/ospf_te.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index 3467ad71..5970a51f 100644 --- a/ospfd/ospf_te.c +++ b/ospfd/ospf_te.c @@ -133,13 +133,7 @@ static void ospf_mpls_te_config_write_router (struct vty *vty); static void ospf_mpls_te_config_write_if (struct vty *vty, struct interface *ifp); static void ospf_mpls_te_show_info (struct vty *vty, struct ospf_lsa *lsa); static int ospf_mpls_te_lsa_originate (void *arg); - -#if 0 -static void ospf_mpls_te_lsa_refresh (struct ospf_lsa *lsa); -#else -static struct ospf_lsa * ospf_mpls_te_lsa_refresh (struct ospf_lsa *lsa); -#endif - +static struct ospf_lsa *ospf_mpls_te_lsa_refresh (struct ospf_lsa *lsa); static void ospf_mpls_te_lsa_schedule (struct mpls_te_link *lp, enum sched_opcode); static void del_mpls_te_link (void *val); @@ -1014,11 +1008,8 @@ ospf_mpls_te_lsa_originate (void *arg) out: return rc; } -#if 0 -static void -#else + static struct ospf_lsa * -#endif ospf_mpls_te_lsa_refresh (struct ospf_lsa *lsa) { struct mpls_te_link *lp; @@ -1079,7 +1070,7 @@ ospf_mpls_te_lsa_refresh (struct ospf_lsa *lsa) } out: - return NULL; + return new; } static void |