summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2007-03-17 22:28:43 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2007-03-17 22:28:43 +0000
commitdd7da3ede1c18738ec54138e10314851585ee5be (patch)
tree1c13b4e05436d03fd77ca386787be9d43adc27c3 /usr.sbin
parent1ae4663b487e31103aac72ff06c02a104d40e907 (diff)
move some elements in the relay imsg ctl structures (just for the style)
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/hoststated/hoststated.h8
-rw-r--r--usr.sbin/relayd/relayd.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/hoststated/hoststated.h b/usr.sbin/hoststated/hoststated.h
index ca4e0e0647e..f97f315af39 100644
--- a/usr.sbin/hoststated/hoststated.h
+++ b/usr.sbin/hoststated/hoststated.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hoststated.h,v 1.37 2007/03/13 12:04:52 reyk Exp $ */
+/* $OpenBSD: hoststated.h,v 1.38 2007/03/17 22:28:42 reyk Exp $ */
/*
* Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -218,6 +218,8 @@ struct ctl_relay_event {
struct ctl_natlook {
objid_t id;
+ int proc;
+
struct sockaddr_storage src;
struct sockaddr_storage dst;
struct sockaddr_storage rsrc;
@@ -225,19 +227,17 @@ struct ctl_natlook {
in_port_t rsport;
in_port_t rdport;
int in;
- int proc;
};
struct ctl_stats {
objid_t id;
int proc;
+
u_int interval;
u_long cnt;
u_long tick;
-
u_long avg;
u_long last;
-
u_long avg_hour;
u_long last_hour;
u_long avg_day;
diff --git a/usr.sbin/relayd/relayd.h b/usr.sbin/relayd/relayd.h
index 486afd42d5c..b18426d604b 100644
--- a/usr.sbin/relayd/relayd.h
+++ b/usr.sbin/relayd/relayd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: relayd.h,v 1.37 2007/03/13 12:04:52 reyk Exp $ */
+/* $OpenBSD: relayd.h,v 1.38 2007/03/17 22:28:42 reyk Exp $ */
/*
* Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -218,6 +218,8 @@ struct ctl_relay_event {
struct ctl_natlook {
objid_t id;
+ int proc;
+
struct sockaddr_storage src;
struct sockaddr_storage dst;
struct sockaddr_storage rsrc;
@@ -225,19 +227,17 @@ struct ctl_natlook {
in_port_t rsport;
in_port_t rdport;
int in;
- int proc;
};
struct ctl_stats {
objid_t id;
int proc;
+
u_int interval;
u_long cnt;
u_long tick;
-
u_long avg;
u_long last;
-
u_long avg_hour;
u_long last_hour;
u_long avg_day;