ext: curl: possibility to pass abort/kill signal

Added a possibility to pass a kill signal pointer,
and if that signal is raised; curl will be exiting.
Jira: MOSH-143

Signed-off-by: Jani Hirsimäki <[email protected]>

Author: jhirsi

ext/curl/include/curl/easy.h

@@ -38,6 +38,12 @@ struct curl_blob {
 
 CURL_EXTERN CURL *curl_easy_init(void);
 CURL_EXTERN CURLcode curl_easy_setopt(CURL *curl, CURLoption option, ...);
+
+#if defined(CONFIG_NRF_CURL_INTEGRATION)
+CURL_EXTERN void curl_easy_nrf_set_kill_signal(
+  CURL *curl, struct k_poll_signal *kill_signal);
+#endif
+
 CURL_EXTERN CURLcode curl_easy_perform(CURL *curl);
 CURL_EXTERN void curl_easy_cleanup(CURL *curl);
 

ext/curl/include/curl/nrf_curl.h

@@ -6,5 +6,5 @@
 
 #ifndef NRF_CURL_H
 #define NRF_CURL_H
-int curl_tool_main(int argc, char *argv[]);
+int curl_tool_main(int argc, char *argv[], struct k_poll_signal *kill_signal);
 #endif

ext/curl/lib/easy.c

@@ -586,6 +586,20 @@ static CURLcode easy_transfer(struct Curl_multi *multi)
   while(!done && !mcode) {
     int still_running = 0;
 
+#if defined(CONFIG_NRF_IPERF3_INTEGRATION)
+    if (multi->kill_signal != NULL) {
+	    int set, res;
+
+	    k_poll_signal_check(multi->kill_signal, &set, &res);
+	    if (set) {
+		    k_poll_signal_reset(multi->kill_signal);
+		    printk("\nKill signal received - exiting\n");
+		    result = CURLE_ABORTED_BY_CALLBACK;
+		    break;
+	    }
+    }
+#endif
+
     mcode = curl_multi_poll(multi, NULL, 0, 1000, NULL);
 
     if(!mcode)
@@ -678,6 +692,10 @@ static CURLcode easy_perform(struct Curl_easy *data, bool events)
 
   sigpipe_ignore(data, &pipe_st);
 
+#if defined(CONFIG_NRF_CURL_INTEGRATION)
+  multi->kill_signal = data->kill_signal;
+#endif
+
   /* run the transfer */
   result = events ? easy_events(multi) : easy_transfer(multi);
 
@@ -729,6 +747,17 @@ void curl_easy_cleanup(struct Curl_easy *data)
   sigpipe_restore(&pipe_st);
 }
 
+#if defined(CONFIG_NRF_CURL_INTEGRATION)
+void curl_easy_nrf_set_kill_signal(struct Curl_easy *data,
+			      struct k_poll_signal *kill_signal)
+{
+	if (!data)
+		return;
+
+	data->kill_signal = kill_signal;
+}
+#endif
+
 /*
  * curl_easy_getinfo() is an external interface that allows an app to retrieve
  * information from a performed transfer and similar.

ext/curl/lib/multihandle.h

@@ -151,6 +151,10 @@ struct Curl_multi {
   bool recheckstate; /* see Curl_multi_connchanged */
   bool in_callback;            /* true while executing a callback */
   bool ipv6_works;
+
+#if defined(CONFIG_NRF_CURL_INTEGRATION)
+struct k_poll_signal *kill_signal; 
+#endif
 };
 
 #endif /* HEADER_CURL_MULTIHANDLE_H */

ext/curl/lib/urldata.h

@@ -1920,6 +1920,9 @@ struct Curl_easy {
   iconv_t utf8_cd;             /* for translating to UTF8 */
 #endif /* CURL_DOES_CONVERSIONS && HAVE_ICONV */
   unsigned int magic;          /* set to a CURLEASY_MAGIC_NUMBER */
+#if defined(CONFIG_NRF_CURL_INTEGRATION)
+struct k_poll_signal *kill_signal; 
+#endif
 };
 
 #define LIBCURL_NAME "libcurl"

ext/curl/tool/tool_cfgable.h

@@ -319,6 +319,7 @@ struct GlobalConfig {
   char *help_category;            /* The help category, if set */
 #if defined(CONFIG_NRF_CURL_INTEGRATION)
   bool curr_mdm_traces;
+  struct k_poll_signal *kill_signal; 
 #endif
   struct OperationConfig *first;
   struct OperationConfig *current;

ext/curl/tool/tool_main.c

@@ -301,7 +301,7 @@ static void restore_terminal(void)
 int wmain(int argc, wchar_t *argv[])
 #else
 #if defined(CONFIG_NRF_CURL_INTEGRATION)
-int curl_tool_main(int argc, char *argv[])
+int curl_tool_main(int argc, char *argv[], struct k_poll_signal *kill_signal)
 #endif
 #endif
 {
@@ -345,6 +345,10 @@ int curl_tool_main(int argc, char *argv[])
      this point */
   result = main_init(&global);
   if(!result) {
+#if defined(CONFIG_NRF_CURL_INTEGRATION)
+    global.kill_signal = kill_signal;
+#endif
+      
     /* Start our curl operation */
     result = operate(&global, argc, argv);
 

ext/curl/tool/tool_operate.c

@@ -343,6 +343,11 @@ static CURLcode pre_transfer(struct GlobalConfig *global,
     }
     per->input.fd = per->infd;
   }
+
+#if defined(CONFIG_NRF_CURL_INTEGRATION)
+  curl_easy_nrf_set_kill_signal(per->curl, global->kill_signal);
+#endif
+  
   return result;
 }