diff options
author | Tim Rice <tim@multitalents.net> | 2010-01-16 16:48:39 -0800 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2010-01-16 16:48:39 -0800 |
commit | f37756759fef9ad9a65080424f50cbcfdbc6e512 (patch) | |
tree | ad23d33c239253d3e55cee20fbd1a493b4b42953 | |
parent | 4a7db1ca2fbd794ffa41bad2bb8e0aec0f1595f0 (diff) |
- (tim) [roaming_client.c] Use of <sys/queue.h> is not really portable so
we use "openbsd-compat/sys-queue.h"
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | roaming_client.c | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -15,6 +15,8 @@ | |||
15 | - (tim) [regress/portnum.sh] Shell portability fix. | 15 | - (tim) [regress/portnum.sh] Shell portability fix. |
16 | - (tim) [configure.ac] Define BROKEN_GETADDRINFO on SVR5 systems. The native | 16 | - (tim) [configure.ac] Define BROKEN_GETADDRINFO on SVR5 systems. The native |
17 | getaddrinfo() is too old and limited for addr_pton() in addrmatch.c. | 17 | getaddrinfo() is too old and limited for addr_pton() in addrmatch.c. |
18 | - (tim) [roaming_client.c] Use of <sys/queue.h> is not really portable so | ||
19 | we use "openbsd-compat/sys-queue.h" | ||
18 | 20 | ||
19 | 20100115 | 21 | 20100115 |
20 | - (dtucker) OpenBSD CVS Sync | 22 | - (dtucker) OpenBSD CVS Sync |
diff --git a/roaming_client.c b/roaming_client.c index cc387a544..c0dd9ea9c 100644 --- a/roaming_client.c +++ b/roaming_client.c | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #include "includes.h" | 18 | #include "includes.h" |
19 | 19 | ||
20 | #include <sys/queue.h> | 20 | #include "openbsd-compat/sys-queue.h" |
21 | #include <sys/types.h> | 21 | #include <sys/types.h> |
22 | #include <sys/socket.h> | 22 | #include <sys/socket.h> |
23 | 23 | ||
@@ -122,7 +122,7 @@ roaming_auth_required(void) | |||
122 | calculate_new_key(&key1, cookie, chall); | 122 | calculate_new_key(&key1, cookie, chall); |
123 | calculate_new_key(&key2, cookie, chall); | 123 | calculate_new_key(&key2, cookie, chall); |
124 | 124 | ||
125 | debug("Received %llu bytes", (long long unsigned)get_recv_bytes()); | 125 | debug("Received %llu bytes", (unsigned long long)get_recv_bytes()); |
126 | debug("Sent roaming_auth packet"); | 126 | debug("Sent roaming_auth packet"); |
127 | } | 127 | } |
128 | 128 | ||
@@ -216,7 +216,7 @@ roaming_resume(void) | |||
216 | goto fail; | 216 | goto fail; |
217 | } | 217 | } |
218 | recv_bytes = packet_get_int64() ^ oldkey2; | 218 | recv_bytes = packet_get_int64() ^ oldkey2; |
219 | debug("Peer received %llu bytes", (long long unsigned)recv_bytes); | 219 | debug("Peer received %llu bytes", (unsigned long long)recv_bytes); |
220 | resend_bytes(packet_get_connection_out(), &recv_bytes); | 220 | resend_bytes(packet_get_connection_out(), &recv_bytes); |
221 | 221 | ||
222 | resume_in_progress = 0; | 222 | resume_in_progress = 0; |