projects / oweals / gnunet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
more code cleanup
[oweals/gnunet.git] / src / transport / plugin_transport_https.c
diff --git a/src/transport/plugin_transport_https.c b/src/transport/plugin_transport_https.c
index 6cc9f9c7eadec955d239ffa7f9802466c09aeafe..1d90c77f1846fb8f09cf1c467f0fef4cac2c91cd 100644 (file)
--- a/src/transport/plugin_transport_https.c
+++ b/src/transport/plugin_transport_https.c
@@ -370,6 +370,8 @@ struct Plugin
 
   /* The private key MHD uses as an \0 terminated string */
   char * key;
+  
+  char * crypto_init;
 };
 
 
@@ -492,8 +494,8 @@ static int remove_session (struct HTTP_PeerContext * pc, struct Session * ps,  i
     {
       msg->transmit_cont (msg->transmit_cont_cls,&pc->identity,call_msg_cont_result);
     }
-    GNUNET_free(msg);
     GNUNET_CONTAINER_DLL_remove(ps->pending_msgs_head,ps->pending_msgs_head,msg);
+    GNUNET_free(msg);
     msg = ps->pending_msgs_head;
   }
 
@@ -615,12 +617,12 @@ process_interfaces (void *cls,
   else if ((af == AF_INET6) && (plugin->use_ipv6 == GNUNET_YES)  && (plugin->bind4_address == NULL))
     {
          struct in6_addr bnd_cmp6 = ((struct sockaddr_in6 *) addr)->sin6_addr;
-      t6 = GNUNET_malloc(sizeof(struct IPv6HttpAddress));
       if (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr))
-        {
-          return GNUNET_OK;
-        }
-
+         {
+                 return GNUNET_OK;
+         }
+      t6 = GNUNET_malloc(sizeof(struct IPv6HttpAddress));
+      GNUNET_assert(t6 != NULL);
       if (plugin->bind6_address != NULL)
       {
          if (0 == memcmp(&plugin->bind6_address->sin6_addr, &bnd_cmp6, sizeof (struct in6_addr)))
@@ -693,8 +695,9 @@ static void mhd_write_mst_cb (void *cls,
 {
 
   struct Session *ps  = cls;
-  struct HTTP_PeerContext *pc = ps->peercontext;
   GNUNET_assert(ps != NULL);
+
+  struct HTTP_PeerContext *pc = ps->peercontext;
   GNUNET_assert(pc != NULL);
 #if DEBUG_HTTPS
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -806,7 +809,7 @@ mdh_access_cb (void *cls,
   int res = GNUNET_NO;
   int send_error_to_client;
   void * addr;
-  size_t addr_len;
+  size_t addr_len = 0;
 
   GNUNET_assert(cls !=NULL);
   send_error_to_client = GNUNET_NO;
@@ -889,6 +892,9 @@ mdh_access_cb (void *cls,
       addr_len = sizeof(struct IPv6HttpAddress);
     }
 
+    GNUNET_assert (addr != NULL);
+    GNUNET_assert (addr_len != 0);
+
     ps = NULL;
     /* only inbound sessions here */
 
@@ -1141,9 +1147,9 @@ static size_t curl_get_header_cb( void *ptr, size_t size, size_t nmemb, void *st
   long http_result = 0;
   int res;
   /* Getting last http result code */
+  GNUNET_assert(NULL!=ps);
   if (ps->recv_connected==GNUNET_NO)
   {
-    GNUNET_assert(NULL!=ps);
     res = curl_easy_getinfo(ps->recv_endpoint, CURLINFO_RESPONSE_CODE, &http_result);
     if (CURLE_OK == res)
     {
@@ -1257,7 +1263,6 @@ static size_t curl_send_cb(void *stream, size_t size, size_t nmemb, void *ptr)
   if (ps->send_active == GNUNET_NO)
        return CURL_READFUNC_PAUSE;
 
-
   if ((ps->pending_msgs_tail == NULL) && (ps->send_active == GNUNET_YES))
   {
 #if DEBUG_CONNECTIONS
@@ -1267,7 +1272,8 @@ static size_t curl_send_cb(void *stream, size_t size, size_t nmemb, void *ptr)
     return CURL_READFUNC_PAUSE;
   }
 
-  msg = ps->pending_msgs_tail;
+  GNUNET_assert (msg!=NULL);
+
   /* data to send */
   if (msg->pos < msg->size)
   {
@@ -1299,7 +1305,7 @@ static size_t curl_send_cb(void *stream, size_t size, size_t nmemb, void *ptr)
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Message with %u bytes sent, removing message from queue \n",ps, msg->pos);
 #endif
     /* Calling transmit continuation  */
-    if (( NULL != ps->pending_msgs_tail) && (NULL != ps->pending_msgs_tail->transmit_cont))
+    if (NULL != ps->pending_msgs_tail->transmit_cont)
       msg->transmit_cont (ps->pending_msgs_tail->transmit_cont_cls,&(ps->peercontext)->identity,GNUNET_OK);
     remove_http_message(ps, msg);
   }
@@ -1311,9 +1317,11 @@ static void curl_receive_mst_cb  (void *cls,
                                 const struct GNUNET_MessageHeader *message)
 {
   struct Session *ps  = cls;
-  struct HTTP_PeerContext *pc = ps->peercontext;
   GNUNET_assert(ps != NULL);
+
+  struct HTTP_PeerContext *pc = ps->peercontext;
   GNUNET_assert(pc != NULL);
+
 #if DEBUG_HTTPS
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Connection %X: Forwarding message to transport service, type %u and size %u from `%s' (`%s')\n",
@@ -2266,7 +2274,7 @@ load_certificate( const char * file )
 
   if (0!=STAT(file, &fstat))
          return NULL;
-  text = GNUNET_malloc (fstat.st_size);
+  text = GNUNET_malloc (fstat.st_size+1);
   gn_file = GNUNET_DISK_file_open(file,GNUNET_DISK_OPEN_READ, GNUNET_DISK_PERM_USER_READ);
   if (gn_file==NULL)
   {
@@ -2347,7 +2355,8 @@ libgnunet_plugin_transport_https_done (void *cls)
 
   GNUNET_free_non_null (plugin->bind4_address);
   GNUNET_free_non_null (plugin->bind6_address);
-  GNUNET_free_non_null(plugin->bind_hostname);
+  GNUNET_free_non_null (plugin->bind_hostname);
+  GNUNET_free_non_null (plugin->crypto_init);
   GNUNET_free (plugin);
   GNUNET_free (api);
 #if DEBUG_HTTPS
@@ -2453,6 +2462,34 @@ libgnunet_plugin_transport_https_init (void *cls)
                  plugin->bind4_address = NULL;
          }
   }
+  
+    /* Get crypto init string from config */
+  if (GNUNET_CONFIGURATION_have_value (env->cfg,
+                                                                          "transport-https", "CRYPTO_INIT"))
+  {
+               GNUNET_CONFIGURATION_get_value_string (env->cfg,
+                                                                                          "transport-https",
+                                                                                          "CRYPTO_INIT",
+                                                                                          &plugin->crypto_init);
+  }
+  else
+  {
+         GNUNET_asprintf(&plugin->crypto_init,"NORMAL");
+  }
+
+  /* Get private key file from config */
+  if (GNUNET_CONFIGURATION_have_value (env->cfg,
+                                                                          "transport-https", "CERT_FILE"))
+  {
+         GNUNET_CONFIGURATION_get_value_string (env->cfg,
+                                                                                        "transport-https",
+                                                                                    "CERT_FILE",
+                                                                                    &cert_file);
+  }
+  else
+  {
+         GNUNET_asprintf(&cert_file,"https.cert");
+  }
 
   /* Get private key file from config */
   if (GNUNET_CONFIGURATION_have_value (env->cfg,
@@ -2482,30 +2519,30 @@ libgnunet_plugin_transport_https_init (void *cls)
          GNUNET_asprintf(&cert_file,"https.cert");
   }
 
-  /* Reading ipv4 addresse to bind to from config file */
+  /* Should plugin use ipv6? */
   if ((plugin->use_ipv6==GNUNET_YES) && (GNUNET_CONFIGURATION_have_value (env->cfg,
                                                                   "transport-https", "BINDTO6")))
   {
-         GNUNET_break (GNUNET_OK ==
-                                       GNUNET_CONFIGURATION_get_value_string (env->cfg,
+         if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg,
                                                                                                                   "transport-https",
                                                                                                                   "BINDTO6",
-                                                                                                                  &plugin->bind_hostname));
-
-         plugin->bind6_address = GNUNET_malloc(sizeof(struct sockaddr_in6));
-         plugin->bind6_address->sin6_family = AF_INET6;
-         plugin->bind6_address->sin6_port = htons (port);
-
-      if (inet_pton(AF_INET6,plugin->bind_hostname, &plugin->bind6_address->sin6_addr)<=0)
+                                                                                                                  &plugin->bind_hostname))
          {
-                 GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-                                                  "http",
-                                                  _("Misconfigured address to bind to in configuration!\n"),
-                                                  "transport-https");
-                 GNUNET_free(plugin->bind6_address);
-                 GNUNET_free(plugin->bind_hostname);
-                 plugin->bind_hostname = NULL;
-                 plugin->bind6_address = NULL;
+                 plugin->bind6_address = GNUNET_malloc(sizeof(struct sockaddr_in6));
+                 plugin->bind6_address->sin6_family = AF_INET6;
+                 plugin->bind6_address->sin6_port = htons (port);
+
+                 if (inet_pton(AF_INET6,plugin->bind_hostname, &plugin->bind6_address->sin6_addr)<=0)
+                 {
+                         GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+                                                          "http",
+                                                          _("Misconfigured address to bind to in configuration!\n"),
+                                                          "transport-https");
+                         GNUNET_free(plugin->bind6_address);
+                         GNUNET_free(plugin->bind_hostname);
+                         plugin->bind_hostname = NULL;
+                         plugin->bind6_address = NULL;
+                 }
          }
   }
 
@@ -2576,6 +2613,11 @@ libgnunet_plugin_transport_https_init (void *cls)
                                        port,
                                        &mhd_accept_cb,
                                        plugin , &mdh_access_cb, plugin,
+                                       /*MHD_OPTION_HTTPS_PRIORITIES,  "NORMAL:",*/
+                                       /*MHD_OPTION_HTTPS_PRIORITIES,  "PERFORMANCE:",*/
+                                       /* MHD_OPTION_HTTPS_PRIORITIES, "NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL", */
+                                       /*MHD_OPTION_HTTPS_PRIORITIES,  "NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL",*/
+                                      MHD_OPTION_HTTPS_PRIORITIES,  plugin->crypto_init,
                                        MHD_OPTION_HTTPS_MEM_KEY, plugin->key,
                                        MHD_OPTION_HTTPS_MEM_CERT, plugin->cert,
                                        MHD_OPTION_SOCK_ADDR, tmp,
@@ -2596,6 +2638,11 @@ libgnunet_plugin_transport_https_init (void *cls)
                                        port,
                                        &mhd_accept_cb,
                                        plugin , &mdh_access_cb, plugin,
+                                       /*MHD_OPTION_HTTPS_PRIORITIES,  "NORMAL:",*/
+                                       /*MHD_OPTION_HTTPS_PRIORITIES,  "PERFORMANCE:",*/
+                                       /* MHD_OPTION_HTTPS_PRIORITIES, "NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL", */
+                                       /*MHD_OPTION_HTTPS_PRIORITIES,  "NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL",*/
+                                      MHD_OPTION_HTTPS_PRIORITIES,  plugin->crypto_init,
                                        MHD_OPTION_HTTPS_MEM_KEY, plugin->key,
                                        MHD_OPTION_HTTPS_MEM_CERT, plugin->cert,
                                        MHD_OPTION_SOCK_ADDR, (struct sockaddr_in *)plugin->bind4_address,
@@ -2632,7 +2679,7 @@ libgnunet_plugin_transport_https_init (void *cls)
   }
   else
   {
-       char * tmp;
+       char * tmp = NULL;
        if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_YES))
                GNUNET_asprintf(&tmp,"with IPv4 and IPv6 enabled");
        if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_YES))
Unnamed repository; edit this file 'description' to name the repository.