new struct to be used with curl multiperform which allows the custom …

…header list cleanup

openvasd/openvasd.c

@@ -529,30 +529,47 @@ openvasd_get_version (openvasd_connector_t *conn)
   g_free (resp.ptr);
   return response;
 }
+
 /**
- * @brief Wrapps a CURLM * handler
+ * @brief Wrapps a CURLM * handler and the custom header.
+ */
+struct openvasd_curlm
+{
+  CURLM *h;
+  struct curl_slist *customheader;
+};
+
+/**
+ * @brief Allocate openvasd curl handler
+ *
+ * @return Openvasd curl handler.
  */
-openvasd_curlm_t
+openvasd_curlm_t *
 openvasd_curlm_handler_new (void)
 {
-  CURLM *h = NULL;
-  return h;
+  return (openvasd_curlm_t *) g_malloc0 (sizeof (struct openvasd_curlm));
 }
 
+/**
+ * @brief Cleanup an openvasd curl handler
+ *
+ * @param h Openvasd curl handler to clean
+ */
 void
-openvasd_curl_handler_close (openvasd_curlm_t *h)
+openvasd_curlm_handler_close (openvasd_curlm_t *h)
 {
   int queued = 0;
 
   /* when an easy handle has completed, remove it */
-  CURLMsg *msg = curl_multi_info_read (h, &queued);
+  CURLMsg *msg = curl_multi_info_read (h->h, &queued);
   if (msg)
     {
       if (msg->msg == CURLMSG_DONE)
         {
-          curl_multi_remove_handle (h, msg->easy_handle);
+          curl_multi_remove_handle (h->h, msg->easy_handle);
           curl_easy_cleanup (msg->easy_handle);
-          curl_multi_cleanup (h);
+          curl_slist_free_all (h->customheader);
+          curl_multi_cleanup (h->h);
           return;
         }
       g_warning ("%s: Not possible to clean up the curl handler", __func__);
@@ -598,7 +615,12 @@ openvasd_get_vts_stream_init (openvasd_connector_t *conn,
 
   h = curl_multi_init ();
   curl_multi_add_handle (h, hnd);
-  *mhnd = h;
+
+  if (mhnd == NULL)
+    mhnd = openvasd_curlm_handler_new ();
+
+  mhnd->h = h;
+  mhnd->customheader = customheader;
 
   response->code = RESP_CODE_OK;
   return response;
@@ -616,10 +638,10 @@ openvasd_get_vts_stream_init (openvasd_connector_t *conn,
  * transmision finished. -1 on error
  */
 int
-openvasd_get_vts_stream (openvasd_curlm_t mhnd)
+openvasd_get_vts_stream (openvasd_curlm_t *mhnd)
 {
   static int running = 0;
-  CURLM *h = mhnd;
+  CURLM *h = mhnd->h;
   if (!(h))
     {
       return -1;

openvasd/openvasd.h

@@ -274,8 +274,7 @@ char *
 openvasd_build_scan_config_json (openvasd_target_t *, GHashTable *, GSList *);
 
 /* Curl multiperform wrapper */
-
-typedef void *openvasd_curlm_t;
+typedef struct openvasd_curlm openvasd_curlm_t;
 
 /** @brief Define a string struct for storing the response.
  */
@@ -288,17 +287,18 @@ typedef struct openvasd_string
 void
 init_openvasd_stringstream (openvasd_stringstream *s);
 
-openvasd_curlm_t
+openvasd_curlm_t *
 openvasd_curlm_handler_new (void);
 
 void
-openvasd_curl_handler_close (openvasd_curlm_t *);
+openvasd_curlm_handler_close (openvasd_curlm_t *);
 
 openvasd_resp_t
 openvasd_get_vts_stream_init (openvasd_connector_t *, openvasd_curlm_t *,
                               openvasd_stringstream *);
 
-int openvasd_get_vts_stream (openvasd_curlm_t);
+int
+openvasd_get_vts_stream (openvasd_curlm_t *);
 
 nvti_t *
 openvasd_parse_vt (gvm_json_pull_parser_t *, gvm_json_pull_event_t *);