diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2010-12-22 17:43:11 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2010-12-22 17:43:11 +0000 |
| commit | af5cc54da27a9bfaf0facfe8695378904a6f1dda (patch) | |
| tree | 0b0cf1005286831dff0224182c256b636ac64c23 /sbin/iked/iked.h | |
| parent | 33da8686a7ef42188e04f85531a4ef0b4c5e4494 (diff) | |
split util.c into two files: imsg_util.c for ibuf/imsg stuff and util for
everything else. we might need to include util.c in ikectl later.
sure mikeb@
Diffstat (limited to 'sbin/iked/iked.h')
| -rw-r--r-- | sbin/iked/iked.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/sbin/iked/iked.h b/sbin/iked/iked.h index bab95ea5cd0..c555ccb1823 100644 --- a/sbin/iked/iked.h +++ b/sbin/iked/iked.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iked.h,v 1.23 2010/12/22 16:22:27 mikeb Exp $ */ +/* $OpenBSD: iked.h,v 1.24 2010/12/22 17:43:10 reyk Exp $ */ /* $vantronix: iked.h,v 1.61 2010/06/03 07:57:33 reyk Exp $ */ /* @@ -721,18 +721,6 @@ pid_t run_proc(struct iked *, struct iked_proc *, struct iked_proc *, /* util.c */ void socket_set_blockmode(int, enum blockmodes); -void imsg_event_add(struct imsgev *); -int imsg_compose_event(struct imsgev *, u_int16_t, u_int32_t, - pid_t, int, void *, u_int16_t); -int imsg_composev_event(struct imsgev *, u_int16_t, u_int32_t, - pid_t, int, const struct iovec *, int); -int imsg_compose_proc(struct iked *, enum iked_procid, - u_int16_t, int, void *, u_int16_t); -int imsg_composev_proc(struct iked *, enum iked_procid, - u_int16_t, int, const struct iovec *, int); -int imsg_forward_proc(struct iked *, struct imsg *, - enum iked_procid); -void imsg_flush_proc(struct iked *, enum iked_procid); int socket_af(struct sockaddr *, in_port_t); in_port_t socket_getport(struct sockaddr_storage *); @@ -763,6 +751,19 @@ const char * int expand_string(char *, size_t, const char *, const char *); u_int8_t *string2unicode(const char *, size_t *); +/* imsg_util.c */ +void imsg_event_add(struct imsgev *); +int imsg_compose_event(struct imsgev *, u_int16_t, u_int32_t, + pid_t, int, void *, u_int16_t); +int imsg_composev_event(struct imsgev *, u_int16_t, u_int32_t, + pid_t, int, const struct iovec *, int); +int imsg_compose_proc(struct iked *, enum iked_procid, + u_int16_t, int, void *, u_int16_t); +int imsg_composev_proc(struct iked *, enum iked_procid, + u_int16_t, int, const struct iovec *, int); +int imsg_forward_proc(struct iked *, struct imsg *, + enum iked_procid); +void imsg_flush_proc(struct iked *, enum iked_procid); struct ibuf * ibuf_new(void *, size_t); struct ibuf * |