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_api.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_api.c')
| -rw-r--r-- | ospfd/ospf_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ospfd/ospf_api.c b/ospfd/ospf_api.c index 77383191..fc3b51dd 100644 --- a/ospfd/ospf_api.c +++ b/ospfd/ospf_api.c @@ -219,7 +219,7 @@ msg_print (struct msg *msg) #else /* ORIGINAL_CODING */ /* API message common header part. */ zlog_debug - ("API-msg [%s]: type(%d),len(%d),seq(%lu),data(%p),size(%lu)", + ("API-msg [%s]: type(%d),len(%d),seq(%lu),data(%p),size(%zd)", ospf_api_typename (msg->hdr.msgtype), msg->hdr.msgtype, ntohs (msg->hdr.msglen), (unsigned long) ntohl (msg->hdr.msgseq), STREAM_DATA (msg->s), STREAM_SIZE (msg->s)); |