#define DEBUG_HTTP GNUNET_NO
#define DEBUG_CURL GNUNET_NO
+#define DEBUG_MHD GNUNET_YES
#define DEBUG_CONNECTIONS GNUNET_NO
#define DEBUG_SESSION_SELECTION GNUNET_NO
#define INBOUND GNUNET_NO
#define OUTBOUND GNUNET_YES
+#define PROTOCOL_PREFIX "http"
+
/**
* Text of the response sent back after the last bytes of a PUT
* request have been received (just to formally obey the HTTP
char * bind_hostname;
int use_ipv6;
int use_ipv4;
+ void * mhd_log;
};
{
struct Plugin *plugin = cls;
char *url = NULL;
+ char *addr_str = (char *) http_plugin_address_to_string(NULL, addr, addrlen);
GNUNET_assert ((addr!=NULL) && (addrlen != 0));
GNUNET_asprintf(&url,
- "http://%s/%s;%u",
- http_plugin_address_to_string(NULL, addr, addrlen),
+ "%s://%s/%s;%u", PROTOCOL_PREFIX, addr_str,
(char *) (&plugin->my_ascii_hash_ident),id);
-
+ GNUNET_free_non_null(addr_str);
return url;
}
{
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;
}
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;
}
-
+ 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)))
return GNUNET_OK;
}
+void mhd_logger (void * arg, const char * fmt, va_list ap)
+{
+ char text[1024];
+ vsnprintf(text, 1024, fmt, ap);
+ va_end(ap);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"MHD: %s \n", text);
+}
/**
* Callback called by MHD when a connection is terminated
{
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_HTTP
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
int res = GNUNET_NO;
int send_error_to_client;
- void * addr;
- size_t addr_len;
+ void * addr = NULL;
+ size_t addr_len = 0 ;
GNUNET_assert(cls !=NULL);
send_error_to_client = GNUNET_NO;
addr_len = sizeof(struct IPv6HttpAddress);
}
+ GNUNET_assert (addr != NULL);
+ GNUNET_assert (addr_len != 0);
+
ps = NULL;
/* only inbound sessions here */
static size_t curl_get_header_cb( void *ptr, size_t size, size_t nmemb, void *stream)
{
struct Session * ps = stream;
- char * tmp;
- size_t len = size * nmemb;
+
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)
{
}
}
+#if DEBUG_CURL
+ char * tmp;
+ size_t len = size * nmemb;
tmp = NULL;
if ((size * nmemb) < SIZE_MAX)
tmp = GNUNET_malloc (len+1);
}
if (NULL != tmp)
GNUNET_free (tmp);
+#endif
return size * nmemb;
}
return CURL_READFUNC_PAUSE;
}
- msg = ps->pending_msgs_tail;
+ GNUNET_assert (msg!=NULL);
+
/* data to send */
if (msg->pos < msg->size)
{
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);
}
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_HTTP
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
asc (asc_cls, NULL);
return;
}
- res = GNUNET_asprintf(&ret,"http://%s:%u/",address,port);
+ res = GNUNET_asprintf(&ret,"%s://%s:%u/", PROTOCOL_PREFIX, address, port);
GNUNET_free (address);
GNUNET_assert(res != 0);
asc (asc_cls, ret);
if ((plugin->use_ipv6==GNUNET_YES) && (GNUNET_CONFIGURATION_have_value (env->cfg,
"transport-http", "BINDTO6")))
{
- GNUNET_break (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (env->cfg,
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg,
"transport-http",
"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-http");
- 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-http");
+ GNUNET_free(plugin->bind6_address);
+ GNUNET_free(plugin->bind_hostname);
+ plugin->bind_hostname = NULL;
+ plugin->bind6_address = NULL;
+ }
}
}
{
struct sockaddr * tmp = (struct sockaddr *) plugin->bind6_address;
plugin->http_server_daemon_v6 = MHD_start_daemon (
-#if DEBUG_CONNECTIONS
+#if DEBUG_MHD
MHD_USE_DEBUG |
#endif
MHD_USE_IPv6,
MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) timeout,
MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (16 * 1024),
MHD_OPTION_NOTIFY_COMPLETED, &mhd_termination_cb, NULL,
+ MHD_OPTION_EXTERNAL_LOGGER, mhd_logger, plugin->mhd_log,
MHD_OPTION_END);
}
if ((plugin->http_server_daemon_v4 == NULL) && (plugin->use_ipv4 == GNUNET_YES) && (port != 0))
{
plugin->http_server_daemon_v4 = MHD_start_daemon (
-#if DEBUG_CONNECTIONS
+#if DEBUG_MHD
MHD_USE_DEBUG |
#endif
MHD_NO_FLAG,
MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) timeout,
MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (16 * 1024),
MHD_OPTION_NOTIFY_COMPLETED, &mhd_termination_cb, NULL,
+ MHD_OPTION_EXTERNAL_LOGGER, mhd_logger, plugin->mhd_log,
MHD_OPTION_END);
}
if (plugin->http_server_daemon_v4 != NULL)
}
else
{
-#if DEBUG_HTTP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No MHD was started, transport plugin not functional!\n");
-#endif
+ 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))
+ GNUNET_asprintf(&tmp,"with IPv4 enabled");
+ if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_NO))
+ GNUNET_asprintf(&tmp,"with IPv6 enabled");
+ if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_NO))
+ GNUNET_asprintf(&tmp,"with NO IP PROTOCOL enabled");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"HTTP Server with %s could not be started on port %u! https plugin failed!\n",tmp, port);
+ GNUNET_free(tmp);
libgnunet_plugin_transport_http_done (api);
return NULL;
}
if ( NULL == plugin->multi_handle )
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "http",
+ "https",
_("Could not initialize curl multi handle, failed to start http plugin!\n"),
- "transport-http");
+ "transport-https");
libgnunet_plugin_transport_http_done (api);
return NULL;
}
projects / oweals / gnunet.git / blobdiff