diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2011-05-20 09:43:54 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2011-05-20 09:43:54 +0000 |
| commit | 413fb357e426598e7e464c11ac55f6b2766e1887 (patch) | |
| tree | e1149433bcb1df87a22b1378c58bd472534588ff /usr.sbin/relayd/relayd.h | |
| parent | 47ece035cd482465a9240a18489714a67aeea88b (diff) | |
Concurrent calls of "relayctl show sessions" could crash relayd. Fix
the show sessions handler by implementing it in an asynchronous way.
Closes PR 6509
ok pyr@
Diffstat (limited to 'usr.sbin/relayd/relayd.h')
| -rw-r--r-- | usr.sbin/relayd/relayd.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/relayd/relayd.h b/usr.sbin/relayd/relayd.h index 8da1a96285d..5a649b83ae1 100644 --- a/usr.sbin/relayd/relayd.h +++ b/usr.sbin/relayd/relayd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: relayd.h,v 1.147 2011/05/19 08:56:49 reyk Exp $ */ +/* $OpenBSD: relayd.h,v 1.148 2011/05/20 09:43:53 reyk Exp $ */ /* * Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -428,6 +428,8 @@ struct rsession { struct ctl_natlook *se_cnl; int se_bnds; + int se_cid; + pid_t se_pid; SPLAY_ENTRY(rsession) se_nodes; }; SPLAY_HEAD(session_tree, rsession); @@ -705,6 +707,7 @@ struct imsgev { struct ctl_conn { TAILQ_ENTRY(ctl_conn) entry; u_int8_t flags; + u_int waiting; #define CTL_CONN_NOTIFY 0x01 struct imsgev iev; |