X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.h;h=b444939729d9c7107a721879296736e222cc5411;hp=2dba3dabe9e0c3ee82bf505c82b884612a62fc1d;hb=517ba0690dcc9e859a05df2113ce32401a5ab254;hpb=8b994145b849c40b0a195c3fb332b9770b2f9097 diff --git a/src/server/server.h b/src/server/server.h index 2dba3dabe9..b444939729 100644 --- a/src/server/server.h +++ b/src/server/server.h @@ -21,63 +21,91 @@ * 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. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ + #ifndef SERVER_H #define SERVER_H -#include "log.h" +#include #ifdef HAVE_NETINET_IN_H #include #endif -enum connection_type -{ +enum connection_type { CONNECTION_TCP, - CONNECTION_PIPE + CONNECTION_PIPE, + CONNECTION_STDINOUT }; -typedef struct connection_s -{ +struct connection { int fd; + int fd_out; /* When using pipes we're writing to a different fd */ struct sockaddr_in sin; - command_context_t *cmd_ctx; - struct service_s *service; + struct command_context *cmd_ctx; + struct service *service; int input_pending; void *priv; - struct connection_s *next; -} connection_t; + struct connection *next; +}; -typedef int (*new_connection_handler_t)(connection_t *connection); -typedef int (*input_handler_t)(connection_t *connection); -typedef int (*connection_closed_handler_t)(connection_t *connection); +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); -typedef struct service_s -{ +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; - connection_t *connections; + struct connection *connections; new_connection_handler_t new_connection; input_handler_t input; connection_closed_handler_t connection_closed; void *priv; - struct service_s *next; -} service_t; + struct service *next; +}; + +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); + +int server_preinit(void); +int server_init(struct command_context *cmd_ctx); +int server_quit(void); + +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 + */ +void openocd_sleep_prelude(void); +/** + * Used by server_loop(), defined in server_stubs.c + */ +void openocd_sleep_postlude(void); -extern int add_service(char *name, enum connection_type type, unsigned short port, int max_connections, new_connection_handler_t new_connection_handler, input_handler_t input_handler, connection_closed_handler_t connection_closed_handler, void *priv); -extern int server_init(void); -extern int server_quit(void); -extern int server_loop(command_context_t *command_context); -extern int server_register_commands(command_context_t *context); +/** + * Defines an extended command handler function declaration to enable + * access to (and manipulation of) the server port number. + * Call server_port like a normal COMMAND_HANDLER with an extra @a out parameter + * to receive the specified port number. + */ +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 /* SERVER_H */