auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server: add server_preinit which is called before config file is parsed.

Browse Source 
This fixes the issue under native win32 of the socket interface not being
enabled (via WSAStartup) before init is called from a script.

Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
This commit is contained in:
Spencer Oliver
2009-12-10 14:31:28 +00:00
parent 6b9c14e908
commit 08589462ad
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/server.c
View File

@@ -487,8 +487,12 @@ void sig_handler(int sig) {
}
#endif
int server_init(struct command_context *cmd_ctx)
int server_preinit(void)
{
/* this currently only calls WSAStartup on native win32 systems
* before any socket operations are performed.
* This is an issue if you call init in your config script */
#ifdef _WIN32
WORD wVersionRequested;
WSADATA wsaData;
@@ -518,6 +522,11 @@ int server_init(struct command_context *cmd_ctx)
signal(SIGABRT, sig_handler);
#endif
return ERROR_OK;
}
int server_init(struct command_context *cmd_ctx)
{
int ret = tcl_init(cmd_ctx);
if (ERROR_OK != ret)
return ret;

1
src/server/server.h
View File

@@ -74,6 +74,7 @@ int add_service(char *name, enum connection_type type, unsigned short port,
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);