projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cpld: altera-epm240: Add additional IDCODEs
[fw/openocd]
/
src
/
server
/
server.h
diff --git
a/src/server/server.h
b/src/server/server.h
index 5e862815bb1eadd465b4647e50b1df355f557747..bacd1116a15354364bae92acfc48552ac6d2c2da 100644
(file)
--- a/
src/server/server.h
+++ b/
src/server/server.h
@@
-19,32
+19,38
@@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* 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
-#include "log.h"
+#ifndef OPENOCD_SERVER_SERVER_H
+#define OPENOCD_SERVER_SERVER_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <helper/log.h>
+#include <helper/replacements.h>
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
-enum connection_type
-{
+enum connection_type {
CONNECTION_TCP,
CONNECTION_TCP,
- CONNECTION_PIPE
+ CONNECTION_PIPE,
+ CONNECTION_STDINOUT
};
};
-struct connection
-{
+#define CONNECTION_LIMIT_UNLIMITED (-1)
+
+struct connection {
int fd;
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;
struct sockaddr_in sin;
struct command_context *cmd_ctx;
struct service *service;
-
int
input_pending;
+
bool
input_pending;
void *priv;
struct connection *next;
};
void *priv;
struct connection *next;
};
@@
-53,11
+59,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);
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;
char *name;
enum connection_type type;
- unsigned short port;
+ char *port;
+ unsigned short portnumber;
int fd;
struct sockaddr_in sin;
int max_connections;
int fd;
struct sockaddr_in sin;
int max_connections;
@@
-69,32
+75,39
@@
struct service
struct service *next;
};
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);
int max_connections, new_connection_handler_t new_connection_handler,
input_handler_t in_handler, connection_closed_handler_t close_handler,
void *priv);
+int remove_service(const char *name, const char *port);
-int server_init(void);
+int server_host_os_entry(void);
+int server_host_os_close(void);
+
+int server_preinit(void);
+int server_init(struct command_context *cmd_ctx);
int server_quit(void);
int server_quit(void);
+void server_free(void);
+void exit_on_signal(int sig);
int server_loop(struct command_context *command_context);
int server_register_commands(struct command_context *context);
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);
+
/**
* 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.
*/
/**
* 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.
*/
-#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 */