- dtucker@cvs.openbsd.org 2009/06/21 09:04:03
[roaming.h roaming_common.c roaming_dummy.c]
Add tags for the benefit of the sync scripts
Also: pull in the changes for 1.1->1.2 missed in the previous sync.
diff --git a/roaming_common.c b/roaming_common.c
index 5a871b2..0655425 100644
--- a/roaming_common.c
+++ b/roaming_common.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: roaming_common.c,v 1.4 2009/06/21 09:04:03 dtucker Exp $ */
/*
* Copyright (c) 2004-2009 AppGate Network Security AB
*
@@ -55,9 +56,9 @@
}
void
-roam_set_bytes(u_int64_t sent, u_int64_t recv)
+roam_set_bytes(u_int64_t sent, u_int64_t recvd)
{
- read_bytes = recv;
+ read_bytes = recvd;
write_bytes = sent;
}
@@ -70,7 +71,8 @@
if (ret > 0 && !resume_in_progress) {
write_bytes += ret;
}
- debug("Wrote %d bytes for a total of %lld", ret, write_bytes);
+ debug3("Wrote %ld bytes for a total of %llu", (long)ret,
+ (unsigned long long)write_bytes);
return ret;
}
@@ -86,12 +88,13 @@
return ret;
}
-ssize_t
-roaming_atomicio(ssize_t(*f)(), int fd, void *buf, size_t count)
+size_t
+roaming_atomicio(ssize_t(*f)(int, void*, size_t), int fd, void *buf,
+ size_t count)
{
- ssize_t ret = atomicio(f, fd, buf, count);
+ size_t ret = atomicio(f, fd, buf, count);
- if ((f == write || f == vwrite) && ret > 0 && !resume_in_progress) {
+ if (f == vwrite && ret > 0 && !resume_in_progress) {
write_bytes += ret;
} else if (f == read && ret > 0 && !resume_in_progress) {
read_bytes += ret;