diff options
author | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-10-05 17:32:14 +0000 |
---|---|---|
committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-10-05 17:32:14 +0000 |
commit | 83fd168e1f2ce28e3379505ae423b76218ab9d52 (patch) | |
tree | 5239612158057766869c706c0bc9b6b7cbd3f07d /usr.sbin/relayd/relayd.h | |
parent | c485ecd1482c169b6cc97940557e16e2086f7fe2 (diff) |
stylistic changes in the relay/relay_config structure.
Diffstat (limited to 'usr.sbin/relayd/relayd.h')
-rw-r--r-- | usr.sbin/relayd/relayd.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/usr.sbin/relayd/relayd.h b/usr.sbin/relayd/relayd.h index 10d12fb907e..da7551a4041 100644 --- a/usr.sbin/relayd/relayd.h +++ b/usr.sbin/relayd/relayd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: relayd.h,v 1.66 2007/10/05 15:50:12 reyk Exp $ */ +/* $OpenBSD: relayd.h,v 1.67 2007/10/05 17:32:13 reyk Exp $ */ /* * Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -524,12 +524,8 @@ struct relay_config { struct relay { TAILQ_ENTRY(relay) entry; - char *ssl_cert; - off_t ssl_cert_len; - char *ssl_key; - off_t ssl_key_len; - struct relay_config conf; + int up; struct protocol *proto; int s; @@ -544,7 +540,12 @@ struct relay { int dstnhosts; struct event ev; - SSL_CTX *ctx; + + SSL_CTX *ssl_ctx; + char *ssl_cert; + off_t ssl_cert_len; + char *ssl_key; + off_t ssl_key_len; struct ctl_stats stats[RELAY_MAXPROC + 1]; |