1 files changed, 91 insertions, 82 deletions

diff --git a/src/monkey/gnunet-monkey.c b/src/monkey/gnunet-monkey.c
index 61579817d..13bd71e84 100644
--- a/src/monkey/gnunet-monkey.c
+++ b/src/monkey/gnunet-monkey.c
@@ -17,6 +17,7 @@
 #include "gnunet_common.h"
 #include "gnunet_getopt_lib.h"
 #include "gnunet_program_lib.h"
+#include "gnunet_monkey_action.h"
 
 extern void sendMail (const char *messageContents);
 static const char* mode;
@@ -128,88 +129,96 @@ run (void *cls,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-        mi_aux_term *xterm_tty=NULL;
-        
-        /* This is like a file-handle for fopen.
-            Here we have all the state of gdb "connection". */
-         mi_h *h;
-
-         /* Connect to gdb child. */
-         h=mi_connect_local();
-         if (!h)
-           {
-            printf("Connect failed\n");
-            ret = 1;
-            return;
-           }
-         printf("Connected to gdb!\n");
-
-         /* Set all callbacks. */
-         mi_set_console_cb(h,cb_console,NULL);
-         mi_set_target_cb(h,cb_target,NULL);
-         mi_set_log_cb(h,cb_log,NULL);
-         mi_set_async_cb(h,cb_async,NULL);
-         mi_set_to_gdb_cb(h,cb_to,NULL);
-         mi_set_from_gdb_cb(h,cb_from,NULL);
-
-         /* Set the name of the child and the command line aguments. */
-         if (!gmi_set_exec(h, binaryName, NULL))
-           {
-            printf("Error setting exec y args\n");
-            mi_disconnect(h);
-            ret = 1;
-            return;
-           }
-
-         /* Tell gdb to attach the child to a terminal. */
-         if (!gmi_target_terminal(h, ttyname(STDIN_FILENO)))
-           {
-            printf("Error selecting target terminal\n");
-            mi_disconnect(h);
-            ret = 1;
-            return;
-           }
-
-         /* Run the program. */
-         if (!gmi_exec_run(h))
-           {
-            printf("Error in run!\n");
-            mi_disconnect(h);
-            ret = 1;
-            return;
-           }
-         /* Here we should be stopped when the program crashes */
-         if (!wait_for_stop(h))
-           {
-            mi_disconnect(h);
-            ret = 1;
-            return;
-           }
-
-         /* Continue execution. */
-         if (!gmi_exec_continue(h))
-           {
-            printf("Error in continue!\n");
-            mi_disconnect(h);
-            ret = 1;
-            return;
-           }
-         /* Here we should be terminated. */
-         if (!wait_for_stop(h))
-           {
-            mi_disconnect(h);
-            ret = 1;
-            return;
-           }
-
-         /* Exit from gdb. */
-         gmi_gdb_exit(h);
-         /* Close the connection. */
-         mi_disconnect(h);
-         /* Wait 5 seconds and close the auxiliar terminal. */
-         printf("Waiting 5 seconds\n");
-         sleep(5);
-         gmi_end_aux_term(xterm_tty);
+        struct GNUNET_MONKEY_ACTION_Context* cntxt =
+                        GNUNET_malloc(sizeof(struct GNUNET_MONKEY_ACTION_Context));
+        cntxt->binary_name = binaryName;
+        if (GNUNET_OK == GNUNET_MONKEY_ACTION_rerun_with_gdb(cntxt)) {
+                GNUNET_MONKEY_ACTION_format_report(cntxt);
+                GNUNET_MONKEY_ACTION_report_file(cntxt, dumpFileName);
+        }
+
+//      mi_aux_term *xterm_tty=NULL;
+//
+//      /* This is like a file-handle for fopen.
+//          Here we have all the state of gdb "connection". */
+//       mi_h *h;
+//
+//       /* Connect to gdb child. */
+//       h=mi_connect_local();
+//       if (!h)
+//         {
+//          printf("Connect failed\n");
+//          ret = 1;
+//          return;
+//         }
+//       printf("Connected to gdb!\n");
+//
+//       /* Set all callbacks. */
+//       mi_set_console_cb(h,cb_console,NULL);
+//       mi_set_target_cb(h,cb_target,NULL);
+//       mi_set_log_cb(h,cb_log,NULL);
+//       mi_set_async_cb(h,cb_async,NULL);
+//       mi_set_to_gdb_cb(h,cb_to,NULL);
+//       mi_set_from_gdb_cb(h,cb_from,NULL);
+//
+//       /* Set the name of the child and the command line aguments. */
+//       if (!gmi_set_exec(h, binaryName, NULL))
+//         {
+//          printf("Error setting exec y args\n");
+//          mi_disconnect(h);
+//          ret = 1;
+//          return;
+//         }
+//
+//       /* Tell gdb to attach the child to a terminal. */
+//       if (!gmi_target_terminal(h, ttyname(STDIN_FILENO)))
+//         {
+//          printf("Error selecting target terminal\n");
+//          mi_disconnect(h);
+//          ret = 1;
+//          return;
+//         }
+//
+//       /* Run the program. */
+//       if (!gmi_exec_run(h))
+//         {
+//          printf("Error in run!\n");
+//          mi_disconnect(h);
+//          ret = 1;
+//          return;
+//         }
+//       /* Here we should be stopped when the program crashes */
+//       if (!wait_for_stop(h))
+//         {
+//          mi_disconnect(h);
+//          ret = 1;
+//          return;
+//         }
+//
+//       /* Continue execution. */
+//       if (!gmi_exec_continue(h))
+//         {
+//          printf("Error in continue!\n");
+//          mi_disconnect(h);
+//          ret = 1;
+//          return;
+//         }
+//       /* Here we should be terminated. */
+//       if (!wait_for_stop(h))
+//         {
+//          mi_disconnect(h);
+//          ret = 1;
+//          return;
+//         }
+//
+//       /* Exit from gdb. */
+//       gmi_gdb_exit(h);
+//       /* Close the connection. */
+//       mi_disconnect(h);
+//       /* Wait 5 seconds and close the auxiliar terminal. */
+//       printf("Waiting 5 seconds\n");
+//       sleep(5);
+//       gmi_end_aux_term(xterm_tty);
 }