Attach to the process with the process PID

Author: Ex-Origin

src/arg.c

@@ -7,13 +7,15 @@
 
 int arg_opt_e = 0;
 int arg_opt_p = 0;
+int arg_opt_o = 0;
 int arg_opt_m = 0;
 int arg_opt_s = 0;
 int arg_opt_v = 0;
 int arg_opt_n = 0;
 
 char **arg_execve_argv = NULL;
 char *arg_popen = NULL;
+int arg_pid = -1;
 
 char **parsing_execve_str(char *cmd)
 {
@@ -48,12 +50,13 @@ char **parsing_execve_str(char *cmd)
 
 int help()
 {
-    fprintf(stderr, "Usage: debug-server [-hmsvn] [-e CMD] [-p CMD]\n"
+    fprintf(stderr, "Usage: debug-server [-hmsvn] [-e CMD] [-p PID] [-o CMD]\n"
                     "\n"
                     "debug-server " VERSION "\n"
                     "General:\n"
                     "  -e CMD   service argv\n"
-                    "  -p CMD   get pid by popen\n"
+                    "  -p PID   attach to PID\n"
+                    "  -o CMD   get pid by popen\n"
                     "  -h       print help message\n"
                     "  -m       enable multi-service\n"
                     "  -s       halt at entry point\n"
@@ -66,14 +69,17 @@ int help()
 int parsing_argv(int argc, char *argv[])
 {
     int opt;
-    while ((opt = getopt(argc, argv, "e:p:hmsvn")) != -1) {
+    while ((opt = getopt(argc, argv, "e:p:o:hmsvn")) != -1) {
         switch (opt) {
         case 'e':
             arg_opt_e = 1;
             arg_execve_argv = parsing_execve_str(optarg);
             break;
         case 'p':
             arg_opt_p = 1;
+            arg_pid = atoi(optarg);
+        case 'o':
+            arg_opt_o = 1;
             arg_popen = optarg;
             break;
         case 'h':
@@ -96,9 +102,9 @@ int parsing_argv(int argc, char *argv[])
             break;
         }
     }
-    if(!(arg_opt_e || arg_opt_p))
+    if(!(arg_opt_e || arg_opt_p || arg_opt_o))
     {
-        fprintf(stderr, "debug-server: must have -e CMD or -p CMD\n");
+        fprintf(stderr, "debug-server: must have -e CMD or -p PID or -o CMD\n");
         help();
     }
     return 0;

src/command.c

@@ -124,6 +124,18 @@ int command_handler()
         if(gdb_client_address.sin6_family)
         {
             if(arg_opt_p)
+            {
+                pid = arg_pid;
+                if(pid)
+                {
+                    gdb_attached = gdbserver_attach_pid(pid);
+                }
+                else
+                {
+                    warning_printf("There is an issue with the PID \"%s\".\n", arg_popen);
+                }
+            }
+            else if(arg_opt_o)
             {
                 pid = popen_to_int(arg_popen);
                 if(pid)
@@ -159,6 +171,18 @@ int command_handler()
         break;
     case COMMAND_STRACE_ATTACH:
         if(arg_opt_p)
+        {
+            pid = arg_pid;
+            if(pid)
+            {
+                strace_attach_pid(pid);
+            }
+            else
+            {
+                warning_printf("There is an issue with the PID \"%s\".\n", arg_popen);
+            }
+        }
+        if(arg_opt_o)
         {
             pid = popen_to_int(arg_popen);
             if(pid)

src/debug-server.h

@@ -5,7 +5,7 @@
 #define COMMAND_PORT    9545
 #define GDBSERVER_PORT  9549
 
-#define VERSION         "1.2.2"
+#define VERSION         "1.3.0"
 
 #define COMMAND_GDB_REGISTER        0x01
 #define COMMAND_GDBSERVER_ATTACH    0x02
@@ -48,13 +48,15 @@ int strace_output(char *msg);
 
 extern int arg_opt_e;
 extern int arg_opt_p;
+extern int arg_opt_o;
 extern int arg_opt_m;
 // halt at entry point
 extern int arg_opt_s;
 extern int arg_opt_v;
 extern int arg_opt_n;
 extern char **arg_execve_argv;
 extern char *arg_popen;
+extern int arg_pid;
 
 int parsing_argv(int argc, char *argv[]);
 

src/service.c

@@ -133,7 +133,10 @@ int start_service(int client_sock)
 
         CHECK(prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0) != -1);
 
-        CHECK(prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY) != -1);
+        if(prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY) == -1)
+        {
+            warning_printf("prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY) failed\n");
+        }
 
         if(client_sock > 0)
         {