From 88f23d9f98658358391add99a78db534bec4bb8b Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Mon, 9 Dec 2013 09:33:44 +0100 Subject: [PATCH] frontend: Split connection status constants into a separate header. This will allow the client to use it as well. --- src/Makefile.am | 1 + src/include/frontend/connection.h | 18 +--------- src/include/frontend/proto.h | 59 +++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 17 deletions(-) create mode 100644 src/include/frontend/proto.h diff --git a/src/Makefile.am b/src/Makefile.am index 724bfaa..e59ea1f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,6 +20,7 @@ pkgcoreinclude_HEADERS = \ pkgfeincludedir = $(pkgincludedir)/frontend pkgfeinclude_HEADERS = \ include/frontend/connection.h \ + include/frontend/proto.h \ include/frontend/sock.h pkgutilsincludedir = $(pkgincludedir)/utils pkgutilsinclude_HEADERS = \ diff --git a/src/include/frontend/connection.h b/src/include/frontend/connection.h index 955180f..a2163bc 100644 --- a/src/include/frontend/connection.h +++ b/src/include/frontend/connection.h @@ -28,6 +28,7 @@ #ifndef SDB_FRONTEND_CONNECTION_H #define SDB_FRONTEND_CONNECTION_H 1 +#include "frontend/proto.h" #include "utils/strbuf.h" #include @@ -36,23 +37,6 @@ extern "C" { #endif -/* status codes returned to a client */ -typedef enum { - CONNECTION_OK = 0, - CONNECTION_ERROR -} sdb_conn_status_t; - -/* accepted commands / state of the connection */ -typedef enum { - /* connection handling */ - CONNECTION_IDLE = 0, - CONNECTION_PING, - CONNECTION_STARTUP, - - /* querying */ - CONNECTION_LIST, -} sdb_conn_state_t; - typedef struct sdb_conn sdb_conn_t; /* diff --git a/src/include/frontend/proto.h b/src/include/frontend/proto.h new file mode 100644 index 0000000..1d02151 --- /dev/null +++ b/src/include/frontend/proto.h @@ -0,0 +1,59 @@ +/* + * SysDB - src/include/frontend/proto.h + * Copyright (C) 2013 Sebastian 'tokkee' Harl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef SDB_FRONTEND_PROTO_H +#define SDB_FRONTEND_PROTO_H 1 + +#ifdef __cplusplus +extern "C" { +#endif + +/* status codes returned to a client */ +typedef enum { + CONNECTION_OK = 0, + CONNECTION_ERROR +} sdb_conn_status_t; + +/* accepted commands / state of the connection */ +typedef enum { + /* connection handling */ + CONNECTION_IDLE = 0, + CONNECTION_PING, + CONNECTION_STARTUP, + + /* querying */ + CONNECTION_LIST, +} sdb_conn_state_t; + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* ! SDB_FRONTEND_PROTO_H */ + +/* vim: set tw=78 sw=4 ts=4 noexpandtab : */ + -- 2.30.2