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 /lib/thread.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 'lib/thread.c')
| -rw-r--r-- | lib/thread.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/thread.c b/lib/thread.c index 078a09d6..a15df557 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -438,8 +438,7 @@ DEFUN_CALL(show_thread_cpu, } static void -cpu_record_hash_clear (struct hash_backet *bucket, - void *args) +cpu_record_hash_clear (struct hash_backet *bucket, void *args) { thread_type *filter = args; struct cpu_thread_history *a = bucket->data; @@ -1217,7 +1216,6 @@ thread_timer_process (struct thread_list *list, struct timeval *timenow) /*------------------------------------------------------------------------------ * Move the given list of threads to the back of the THREAD_READY queue. */ -/* process a list en masse, e.g. for event thread lists */ static unsigned int thread_process (struct thread_list *list) { @@ -1246,9 +1244,9 @@ thread_fetch (struct thread_master *m, struct thread *fetch) fd_set readfd; fd_set writefd; fd_set exceptfd; - struct timeval timer_val; + struct timeval timer_val ; struct timeval timer_val_bg; - struct timeval *timer_wait; + struct timeval *timer_wait ; struct timeval *timer_wait_bg; while (1) |