build: cleanup src/server directory

Change-Id: I6410df28c5999f5cbee2d3bcaa02469a29ea4c15
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/412
Tested-by: jenkins
This commit is contained in:
Spencer Oliver
2012-01-30 12:05:19 +00:00
parent 91e054a9ea
commit b48d1f6637
9 changed files with 702 additions and 975 deletions

View File

@@ -23,6 +23,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifndef SERVER_H
#define SERVER_H
@@ -32,17 +33,15 @@
#include <netinet/in.h>
#endif
enum connection_type
{
enum connection_type {
CONNECTION_TCP,
CONNECTION_PIPE,
CONNECTION_STDINOUT
};
struct connection
{
struct connection {
int fd;
int fd_out; /* When using pipes we're writing to a different 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;
@@ -55,8 +54,7 @@ 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 {
const char *name;
enum connection_type type;
const char *port;
@@ -104,15 +102,15 @@ void openocd_sleep_postlude(void);
* to receive the specified port number.
*/
#define SERVER_PIPE_COMMAND() \
COMMAND_HELPER(server_pipe_command, const char **out)
COMMAND_HELPER(server_pipe_command, const char **out)
SERVER_PIPE_COMMAND();
#define SERVER_PORT_COMMAND() \
COMMAND_HELPER(server_port_command, unsigned short *out)
COMMAND_HELPER(server_port_command, unsigned short *out)
SERVER_PORT_COMMAND();
#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 */