[ 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 8190e1061127bdc13c360d6bf8a9d34a2960e5da..ad7ce6570465237efc84873e03dd6da473af6dc5 100644 (file)
--- a/gdbserver/gdb-server.c
+++ b/gdbserver/gdb-server.c
@@ -36,6 +36,8 @@
 //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;
@@ -54,6 +56,16 @@ typedef struct _st_state_t {
 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[] = {
@@ -172,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;
@@ -648,7 +663,7 @@ int serve(stlink_t *sl, st_state_t *st) {
        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_addr.s_addr = INADDR_ANY;
        serv_addr.sin_port = htons(st->listen_port);
 
        if(bind(sock, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {