[ update ] bind gdb server on INADDR_ANY, as requested by thomas@popp.ws

[fw/stlink] / gdbserver / gdb-server.c

diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c
index 414ad8a7b477016ddf46a845042ab96c1d1b1a97..ad7ce6570465237efc84873e03dd6da473af6dc5 100644 (file)
--- a/gdbserver/gdb-server.c
+++ b/gdbserver/gdb-server.c
@@ -36,15 +36,12 @@
 //Allways update the FLASH_PAGE before each use, by calling stlink_calculate_pagesize
 #define FLASH_PAGE (sl->flash_pgsz)
 
+stlink_t *connected_stlink = NULL;
+
 static const char hex[] = "0123456789abcdef";
 
 static const char* current_memory_map = NULL;
 
-/* Persistent mode flag.
- * In persistent mode, server starts listening again
- * on GDB disconnect. */
-int persistent = 0;
-
 typedef struct _st_state_t {
     // things from command line, bleh
     int stlink_version;
@@ -52,12 +49,23 @@ typedef struct _st_state_t {
     char devicename[100];
     int logging_level;
        int listen_port;
+    int persistent;
 } st_state_t;
 
 
-int serve(stlink_t *sl, int port);
+int serve(stlink_t *sl, st_state_t *st);
 char* make_memory_map(stlink_t *sl);
 
+static void cleanup(int signal __attribute__((unused))) {
+    if (connected_stlink) {
+        /* Switch back to mass storage mode before closing. */
+        stlink_run(connected_stlink);
+        stlink_exit_debug_mode(connected_stlink);
+        stlink_close(connected_stlink);
+    }
+
+    exit(1);
+}
 
 int parse_options(int argc, char** argv, st_state_t *st) {
     static struct option long_options[] = {
@@ -139,7 +147,7 @@ int parse_options(int argc, char** argv, st_state_t *st) {
                        st->listen_port = q;
                        break;
                case 'm':
-                       persistent = 1;
+                       st->persistent = 1;
                        break;
         }
     }
@@ -176,6 +184,9 @@ int main(int argc, char** argv) {
                break;
     }
 
+    connected_stlink = sl;
+    signal(SIGINT, &cleanup);
+
        printf("Chip ID is %08x, Core ID is  %08x.\n", sl->chip_id, sl->core_id);
 
        sl->verbose=0;
@@ -190,8 +201,8 @@ int main(int argc, char** argv) {
 #endif
 
        do {
-               serve(sl, state.listen_port);
-       } while (persistent);
+               serve(sl, &state);
+       } while (state.persistent);
 
 #ifdef __MINGW32__
 winsock_error:
@@ -639,7 +650,7 @@ error:
        return error;
 }
 
-int serve(stlink_t *sl, int port) {
+int serve(stlink_t *sl, st_state_t *st) {
        int sock = socket(AF_INET, SOCK_STREAM, 0);
        if(sock < 0) {
                perror("socket");
@@ -652,8 +663,8 @@ int serve(stlink_t *sl, int port) {
        struct sockaddr_in serv_addr;
        memset(&serv_addr,0,sizeof(struct sockaddr_in));
        serv_addr.sin_family = AF_INET;
-       serv_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
-       serv_addr.sin_port = htons(port);
+       serv_addr.sin_addr.s_addr = INADDR_ANY;
+       serv_addr.sin_port = htons(st->listen_port);
 
        if(bind(sock, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
                perror("bind");
@@ -670,7 +681,7 @@ int serve(stlink_t *sl, int port) {
        init_code_breakpoints(sl);
        init_data_watchpoints(sl);
 
-       printf("Listening at *:%d...\n", port);
+       printf("Listening at *:%d...\n", st->listen_port);
 
        int client = accept(sock, NULL, NULL);
        //signal (SIGINT, SIG_DFL);
@@ -1207,7 +1218,7 @@ int serve(stlink_t *sl, int port) {
                         * Also, set to persistent mode
                         * to allow GDB disconnect.
                         */
-                       persistent = 1;
+                       st->persistent = 1;
 
                        reply = strdup("OK");