diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | roaming.h | 3 | ||||
-rw-r--r-- | roaming_common.c | 17 | ||||
-rw-r--r-- | roaming_dummy.c | 8 |
4 files changed, 22 insertions, 10 deletions
@@ -101,6 +101,10 @@ | |||
101 | [kexdhs.c kexgexs.c] | 101 | [kexdhs.c kexgexs.c] |
102 | abort if key_sign fails, preventing possible null deref. Based on report | 102 | abort if key_sign fails, preventing possible null deref. Based on report |
103 | from Paolo Ganci, ok markus@ djm@ | 103 | from Paolo Ganci, ok markus@ djm@ |
104 | - dtucker@cvs.openbsd.org 2009/06/21 09:04:03 | ||
105 | [roaming.h roaming_common.c roaming_dummy.c] | ||
106 | Add tags for the benefit of the sync scripts | ||
107 | Also: pull in the changes for 1.1->1.2 missed in the previous sync. | ||
104 | 108 | ||
105 | 20090616 | 109 | 20090616 |
106 | - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t | 110 | - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t |
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: roaming.h,v 1.3 2009/06/21 09:04:03 dtucker Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2004-2009 AppGate Network Security AB | 3 | * Copyright (c) 2004-2009 AppGate Network Security AB |
3 | * | 4 | * |
@@ -22,7 +23,7 @@ extern int resume_in_progress; | |||
22 | void add_recv_bytes(u_int64_t); | 23 | void add_recv_bytes(u_int64_t); |
23 | ssize_t roaming_write(int, const void *, size_t, int *); | 24 | ssize_t roaming_write(int, const void *, size_t, int *); |
24 | ssize_t roaming_read(int, void *, size_t, int *); | 25 | ssize_t roaming_read(int, void *, size_t, int *); |
25 | ssize_t roaming_atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t); | 26 | size_t roaming_atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t); |
26 | u_int64_t get_recv_bytes(void); | 27 | u_int64_t get_recv_bytes(void); |
27 | u_int64_t get_sent_bytes(void); | 28 | u_int64_t get_sent_bytes(void); |
28 | void roam_set_bytes(u_int64_t, u_int64_t); | 29 | void roam_set_bytes(u_int64_t, u_int64_t); |
diff --git a/roaming_common.c b/roaming_common.c index 5a871b23e..065542520 100644 --- a/roaming_common.c +++ b/roaming_common.c | |||
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: roaming_common.c,v 1.4 2009/06/21 09:04:03 dtucker Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2004-2009 AppGate Network Security AB | 3 | * Copyright (c) 2004-2009 AppGate Network Security AB |
3 | * | 4 | * |
@@ -55,9 +56,9 @@ get_sent_bytes(void) | |||
55 | } | 56 | } |
56 | 57 | ||
57 | void | 58 | void |
58 | roam_set_bytes(u_int64_t sent, u_int64_t recv) | 59 | roam_set_bytes(u_int64_t sent, u_int64_t recvd) |
59 | { | 60 | { |
60 | read_bytes = recv; | 61 | read_bytes = recvd; |
61 | write_bytes = sent; | 62 | write_bytes = sent; |
62 | } | 63 | } |
63 | 64 | ||
@@ -70,7 +71,8 @@ roaming_write(int fd, const void *buf, size_t count, int *cont) | |||
70 | if (ret > 0 && !resume_in_progress) { | 71 | if (ret > 0 && !resume_in_progress) { |
71 | write_bytes += ret; | 72 | write_bytes += ret; |
72 | } | 73 | } |
73 | debug("Wrote %d bytes for a total of %lld", ret, write_bytes); | 74 | debug3("Wrote %ld bytes for a total of %llu", (long)ret, |
75 | (unsigned long long)write_bytes); | ||
74 | return ret; | 76 | return ret; |
75 | } | 77 | } |
76 | 78 | ||
@@ -86,12 +88,13 @@ roaming_read(int fd, void *buf, size_t count, int *cont) | |||
86 | return ret; | 88 | return ret; |
87 | } | 89 | } |
88 | 90 | ||
89 | ssize_t | 91 | size_t |
90 | roaming_atomicio(ssize_t(*f)(), int fd, void *buf, size_t count) | 92 | roaming_atomicio(ssize_t(*f)(int, void*, size_t), int fd, void *buf, |
93 | size_t count) | ||
91 | { | 94 | { |
92 | ssize_t ret = atomicio(f, fd, buf, count); | 95 | size_t ret = atomicio(f, fd, buf, count); |
93 | 96 | ||
94 | if ((f == write || f == vwrite) && ret > 0 && !resume_in_progress) { | 97 | if (f == vwrite && ret > 0 && !resume_in_progress) { |
95 | write_bytes += ret; | 98 | write_bytes += ret; |
96 | } else if (f == read && ret > 0 && !resume_in_progress) { | 99 | } else if (f == read && ret > 0 && !resume_in_progress) { |
97 | read_bytes += ret; | 100 | read_bytes += ret; |
diff --git a/roaming_dummy.c b/roaming_dummy.c index cd1d20257..f081bffe9 100644 --- a/roaming_dummy.c +++ b/roaming_dummy.c | |||
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: roaming_dummy.c,v 1.3 2009/06/21 09:04:03 dtucker Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2004-2009 AppGate Network Security AB | 3 | * Copyright (c) 2004-2009 AppGate Network Security AB |
3 | * | 4 | * |
@@ -22,9 +23,12 @@ | |||
22 | #include <sys/types.h> | 23 | #include <sys/types.h> |
23 | #include <unistd.h> | 24 | #include <unistd.h> |
24 | 25 | ||
26 | #include "roaming.h" | ||
27 | |||
25 | int resume_in_progress = 0; | 28 | int resume_in_progress = 0; |
26 | 29 | ||
27 | u_int64_t get_recv_bytes() | 30 | u_int64_t |
31 | get_recv_bytes(void) | ||
28 | { | 32 | { |
29 | return 0; | 33 | return 0; |
30 | } | 34 | } |
@@ -49,7 +53,7 @@ add_recv_bytes(u_int64_t num) | |||
49 | } | 53 | } |
50 | 54 | ||
51 | int | 55 | int |
52 | resume_kex() | 56 | resume_kex(void) |
53 | { | 57 | { |
54 | return 1; | 58 | return 1; |
55 | } | 59 | } |