Make #include guard naming consistent

[fw/openocd] / src / server / server.h

diff --git a/src/server/server.h b/src/server/server.h
index a25920ed0d6495f6a759b0ed7820aa52c618a5c8..68ad16d55d067dba7d0038b5e398b36fe6cc0a25 100644 (file)
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -19,12 +19,11 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef SERVER_H
-#define SERVER_H
+
+#ifndef OPENOCD_SERVER_SERVER_H
+#define OPENOCD_SERVER_SERVER_H
 
 #include <helper/log.h>
 
@@ -32,15 +31,17 @@
 #include <netinet/in.h>
 #endif
 
-enum connection_type
-{
+enum connection_type {
        CONNECTION_TCP,
-       CONNECTION_PIPE
+       CONNECTION_PIPE,
+       CONNECTION_STDINOUT
 };
 
-struct connection
-{
+#define CONNECTION_LIMIT_UNLIMITED             (-1)
+
+struct connection {
        int fd;
+       int fd_out;     /* When using pipes we're writing to a different fd */
        struct sockaddr_in sin;
        struct command_context *cmd_ctx;
        struct service *service;
@@ -53,11 +54,11 @@ typedef int (*new_connection_handler_t)(struct connection *connection);
 typedef int (*input_handler_t)(struct connection *connection);
 typedef int (*connection_closed_handler_t)(struct connection *connection);
 
-struct service
-{
+struct service {
        char *name;
        enum connection_type type;
-       unsigned short port;
+       char *port;
+       unsigned short portnumber;
        int fd;
        struct sockaddr_in sin;
        int max_connections;
@@ -69,7 +70,7 @@ struct service
        struct service *next;
 };
 
-int add_service(char *name, enum connection_type type, unsigned short port,
+int add_service(char *name, const char *port,
                int max_connections, new_connection_handler_t new_connection_handler,
                input_handler_t in_handler, connection_closed_handler_t close_handler,
                void *priv);
@@ -77,17 +78,21 @@ int add_service(char *name, enum connection_type type, unsigned short port,
 int server_preinit(void);
 int server_init(struct command_context *cmd_ctx);
 int server_quit(void);
+void exit_on_signal(int);
 
 int server_loop(struct command_context *command_context);
 
 int server_register_commands(struct command_context *context);
 
+int connection_write(struct connection *connection, const void *data, int len);
+int connection_read(struct connection *connection, void *data, int len);
+
 /**
- * Used by server_loop(), defined in server_stubs.c, httpd.c, or ecosboard.c
+ * Used by server_loop(), defined in server_stubs.c
  */
 void openocd_sleep_prelude(void);
 /**
- * Used by server_loop(), defined in server_stubs.c, httpd.c, or ecosboard.c
+ * Used by server_loop(), defined in server_stubs.c
  */
 void openocd_sleep_postlude(void);
 
@@ -97,14 +102,11 @@ void openocd_sleep_postlude(void);
  * Call server_port like a normal COMMAND_HANDLER with an extra @a out parameter
  * to receive the specified port number.
  */
-#define SERVER_PORT_COMMAND() \
-               COMMAND_HELPER(server_port_command, unsigned short *out)
-
-SERVER_PORT_COMMAND();
+COMMAND_HELPER(server_pipe_command, char **out);
 
-extern int server_use_pipes;
+COMMAND_HELPER(server_port_command, unsigned short *out);
 
-#define ERROR_SERVER_REMOTE_CLOSED     (-400)
-#define ERROR_CONNECTION_REJECTED      (-401)
+#define ERROR_SERVER_REMOTE_CLOSED             (-400)
+#define ERROR_CONNECTION_REJECTED              (-401)
 
-#endif /* SERVER_H */
+#endif /* OPENOCD_SERVER_SERVER_H */