*/
#include "platform.h"
+#include "gnunet_common.h"
#include "gnunet_constants.h"
#include "gnunet_protocols.h"
#include "gnunet_connection_lib.h"
-#include "gnunet_server_lib.h"
#include "gnunet_service_lib.h"
#include "gnunet_statistics_service.h"
#include "gnunet_transport_service.h"
#include "microhttpd.h"
#include <curl/curl.h>
-
-#define DEBUG_CURL GNUNET_YES
#define DEBUG_HTTP GNUNET_NO
-#define HTTP_CONNECT_TIMEOUT_DBG 10
+#define DEBUG_CURL GNUNET_NO
+#define DEBUG_CONNECTIONS GNUNET_NO
+#define DEBUG_SESSION_SELECTION GNUNET_NO
+
+#define INBOUND GNUNET_NO
+#define OUTBOUND GNUNET_YES
/**
* Text of the response sent back after the last bytes of a PUT
*/
#define HTTP_CONNECT_TIMEOUT 30
+
/**
* Network format for IPv4 addresses.
*/
* buffer length
*/
size_t size;
-
+
/**
* Continuation function to call once the transmission buffer
* has again space available. NULL if there is no
};
-struct HTTP_Connection_out
+struct HTTP_PeerContext
{
- struct HTTP_Connection_out * next;
-
- struct HTTP_Connection_out * prev;
-
- void * addr;
- size_t addrlen;
-
- struct HTTP_Message * pending_msgs_head;
- struct HTTP_Message * pending_msgs_tail;
-
- char * url;
- unsigned int put_connected;
- unsigned int put_send_paused;
-
- unsigned int get_connected;
-
/**
- * curl handle for sending data using HTTP/PUT
- * outbound data
+ * peer's identity
*/
- CURL *put_curl_handle;
+ struct GNUNET_PeerIdentity identity;
/**
- * curl handle for recieving data using HTTP/GET transmission
- * inbound data
+ * Pointer to the global plugin struct.
*/
- CURL *get_curl_handle;
-
- struct Session * session;
-};
-
-struct HTTP_Connection_in
-{
- struct HTTP_Connection_in * next;
-
- struct HTTP_Connection_in * prev;
-
- void * addr;
- size_t addrlen;
-
- unsigned int connected;
- unsigned int send_paused;
+ struct Plugin *plugin;
- struct GNUNET_SERVER_MessageStreamTokenizer * msgtok;
+ /**
+ * Linked list of connections with this peer
+ * head
+ */
+ struct Session * head;
- struct Session * session;
+ /**
+ * Linked list of connections with this peer
+ * tail
+ */
+ struct Session * tail;
/**
- * Is there a HTTP/PUT in progress?
+ * id for next session
*/
- int is_put_in_progress;
+ size_t session_id_counter;
/**
- * Is the http request invalid?
+ * Last session used to send data
*/
- int is_bad_request;
+ struct Session * last_session;
};
-/**
- * Session handle for connections.
- */
struct Session
{
-
/**
* API requirement.
*/
struct SessionHeader header;
/**
- * Stored in a linked list.
+ * next session in linked list
*/
- struct Session *next;
+ struct Session * next;
/**
- * Pointer to the global plugin struct.
+ * previous session in linked list
*/
- struct Plugin *plugin;
+ struct Session * prev;
/**
- * To whom are we talking to (set to our identity
- * if we are still waiting for the welcome message)
+ * address of this session
*/
- struct GNUNET_PeerIdentity identity;
+ void * addr;
/**
- * Sender's ip address to distinguish between incoming connections
+ * address length
*/
- void * addr_in;
+ size_t addrlen;
- size_t addr_in_len;
+ /**
+ * target url
+ */
+ char * url;
- void * addr_out;
+ /**
+ * Message queue for outbound messages
+ * head of queue
+ */
+ struct HTTP_Message * pending_msgs_head;
- size_t addr_out_len;
+ /**
+ * Message queue for outbound messages
+ * tail of queue
+ */
+ struct HTTP_Message * pending_msgs_tail;
+
+ /**
+ * partner peer this connection belongs to
+ */
+ struct HTTP_PeerContext * peercontext;
/**
- * Did we initiate the connection (GNUNET_YES) or the other peer (GNUNET_NO)?
+ * message stream tokenizer for incoming data
*/
- int is_client;
+ struct GNUNET_SERVER_MessageStreamTokenizer *msgtok;
/**
- * At what time did we reset last_received last?
+ * session direction
+ * outbound: OUTBOUND (GNUNET_YES)
+ * inbound : INBOUND (GNUNET_NO)
*/
- struct GNUNET_TIME_Absolute last_quota_update;
+ unsigned int direction;
/**
- * How many bytes have we received since the "last_quota_update"
- * timestamp?
+ * is session connected to send data?
*/
- uint64_t last_received;
+ unsigned int send_connected;
/**
- * Number of bytes per ms that this peer is allowed
- * to send to us.
+ * is send connection active?
*/
- uint32_t quota;
+ unsigned int send_active;
/**
- * Encoded hash
+ * connection disconnect forced (e.g. from transport)
*/
- struct GNUNET_CRYPTO_HashAsciiEncoded hash;
+ unsigned int send_force_disconnect;
/**
- * curl handle for outbound transmissions
+ * is session connected to receive data?
*/
- CURL *curl_handle;
+ unsigned int recv_connected;
/**
- * Message tokenizer for incoming data
+ * is receive connection active?
*/
- //struct GNUNET_SERVER_MessageStreamTokenizer * msgtok;
+ unsigned int recv_active;
- struct HTTP_Connection_out *outbound_connections_head;
- struct HTTP_Connection_out *outbound_connections_tail;
+ /**
+ * connection disconnect forced (e.g. from transport)
+ */
+ unsigned int recv_force_disconnect;
- struct HTTP_Connection_in *inbound_connections_head;
- struct HTTP_Connection_in *inbound_connections_tail;
+ /**
+ * id for next session
+ * NOTE: 0 is not an ID, zero is not defined. A correct ID is always > 0
+ */
+ size_t session_id;
+
+ /**
+ * entity managing sending data
+ * outbound session: CURL *
+ * inbound session: mhd_connection *
+ */
+ void * send_endpoint;
+
+ /**
+ * entity managing recieving data
+ * outbound session: CURL *
+ * inbound session: mhd_connection *
+ */
+ void * recv_endpoint;
};
/**
*/
struct GNUNET_TRANSPORT_PluginEnvironment *env;
- unsigned int port_inbound;
-
/**
- * Hashmap for all existing sessions.
+ * Handle for reporting statistics.
*/
- struct GNUNET_CONTAINER_MultiHashMap *sessions;
+ struct GNUNET_STATISTICS_Handle *stats;
+
+ unsigned int port_inbound;
+
+ struct GNUNET_CONTAINER_MultiHashMap *peers;
/**
* Daemon for listening for new IPv4 connections.
/**
* The task sending data
*/
- GNUNET_SCHEDULER_TaskIdentifier http_server_task_send;
+ GNUNET_SCHEDULER_TaskIdentifier http_curl_task;
/**
* cURL Multihandle
* This string is used to distinguish between connections and is added to the urls
*/
struct GNUNET_CRYPTO_HashAsciiEncoded my_ascii_hash_ident;
+
+ struct sockaddr_in * bind4_address;
+ struct sockaddr_in6 * bind6_address;
+ char * bind_hostname;
+ int use_ipv6;
+ int use_ipv4;
};
const void *addr,
size_t addrlen);
+
/**
- * Create a new session
- * @param cls plugin as closure
- * @param addr_in address the peer is using inbound
- * @param addr_len_in address length
- * @param addr_out address the peer is using outbound
- * @param addr_len_out address length
- * @param peer identity
- * @return created session object
+ * Call MHD to process pending ipv4 requests and then go back
+ * and schedule the next run.
*/
-static struct Session *
-create_session (void * cls,
- char * addr_in,
- size_t addrlen_in,
- char * addr_out,
- size_t addrlen_out,
- const struct GNUNET_PeerIdentity *peer)
-{
- struct Plugin *plugin = cls;
- struct Session * cs = GNUNET_malloc ( sizeof( struct Session) );
-
- GNUNET_assert(cls !=NULL);
- if (addrlen_in != 0)
- {
- cs->addr_in = GNUNET_malloc (addrlen_in);
- cs->addr_in_len = addrlen_in;
- memcpy(cs->addr_in,addr_in,addrlen_in);
- }
+static void http_server_daemon_v4_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+/**
+ * Call MHD to process pending ipv6 requests and then go back
+ * and schedule the next run.
+ */
+static void http_server_daemon_v6_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
- if (addrlen_out != 0)
- {
- cs->addr_out = GNUNET_malloc (addrlen_out);
- cs->addr_out_len = addrlen_out;
- memcpy(cs->addr_out,addr_out,addrlen_out);
- }
- cs->plugin = plugin;
- memcpy(&cs->identity, peer, sizeof (struct GNUNET_PeerIdentity));
- GNUNET_CRYPTO_hash_to_enc(&cs->identity.hashPubKey,&(cs->hash));
- cs->outbound_connections_head = NULL;
- cs->outbound_connections_tail = NULL;
- return cs;
-}
+/**
+ * Function setting up curl handle and selecting message to send
+ * @param cls plugin
+ * @param ses session to send data to
+ * @param con connection
+ * @return bytes sent to peer
+ */
+static ssize_t send_check_connections (void *cls, struct Session *ps);
/**
- * Check if session for this peer is already existing, otherwise create it
- * @param cls the plugin used
- * @param p peer to get session for
- * @return session found or created
+ * Function setting up file descriptors and scheduling task to run
+ * @param cls closure
+ * @param ses session to send data to
+ * @param
*/
-static struct Session * session_get (void * cls, const struct GNUNET_PeerIdentity *p)
-{
- struct Plugin *plugin = cls;
- struct Session *cs;
- unsigned int res;
+static int curl_schedule(void *cls );
+
- cs = GNUNET_CONTAINER_multihashmap_get (plugin->sessions, &p->hashPubKey);
- if (cs == NULL)
- {
- cs = create_session(plugin, NULL, 0, NULL, 0, p);
- res = GNUNET_CONTAINER_multihashmap_put ( plugin->sessions,
- &cs->identity.hashPubKey,
- cs,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
- if (res == GNUNET_OK)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "New Session `%s' inserted\n", GNUNET_i2s(p));
- }
- return cs;
-}
-static char * create_url(void * cls, const void * addr, size_t addrlen)
+static char * create_url(void * cls, const void * addr, size_t addrlen, size_t id)
{
struct Plugin *plugin = cls;
char *url = NULL;
GNUNET_assert ((addr!=NULL) && (addrlen != 0));
GNUNET_asprintf(&url,
- "http://%s/%s",
+ "http://%s/%s;%u",
http_plugin_address_to_string(NULL, addr, addrlen),
- (char *) (&plugin->my_ascii_hash_ident));
+ (char *) (&plugin->my_ascii_hash_ident),id);
return url;
}
/**
- * Check if session already knows this address for a outbound connection to this peer
- * If address not in session, add it to the session
- * @param cls the plugin used
- * @param cs the session
- * @param addr address
- * @param addr_len address length
- * @return the found or created address
+ * Removes a message from the linked list of messages
+ * @param con connection to remove message from
+ * @param msg message to remove
+ * @return GNUNET_SYSERR if msg not found, GNUNET_OK on success
*/
-static struct HTTP_Connection_out * session_check_outbound_address (void * cls, struct Session *cs, const void * addr, size_t addr_len)
+static int remove_http_message (struct Session * ps, struct HTTP_Message * msg)
{
- struct Plugin *plugin = cls;
- struct HTTP_Connection_out * cc = cs->outbound_connections_head;
- struct HTTP_Connection_out * con = NULL;
+ GNUNET_CONTAINER_DLL_remove(ps->pending_msgs_head,ps->pending_msgs_tail,msg);
+ GNUNET_free(msg);
+ return GNUNET_OK;
+}
+
+/**
+ * Removes a session from the linked list of sessions
+ * @param pc peer context
+ * @param ps session
+ * @param call_msg_cont GNUNET_YES to call pending message continuations, otherwise no
+ * @param call_msg_cont_result, result to call message continuations with
+ * @return GNUNET_SYSERR if msg not found, GNUNET_OK on success
+ */
+static int remove_session (struct HTTP_PeerContext * pc, struct Session * ps, int call_msg_cont, int call_msg_cont_result)
+{
+ struct HTTP_Message * msg;
+ struct Plugin * plugin = ps->peercontext->plugin;
- GNUNET_assert((addr_len == sizeof (struct IPv4HttpAddress)) || (addr_len == sizeof (struct IPv6HttpAddress)));
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: removing %s session %X with id %u\n", ps, (ps->direction == INBOUND) ? "inbound" : "outbound", ps, ps->session_id);
+#endif
+ plugin->env->session_end(plugin, &pc->identity, ps);
- while (cc!=NULL)
+ GNUNET_free_non_null (ps->addr);
+ GNUNET_SERVER_mst_destroy (ps->msgtok);
+ GNUNET_free(ps->url);
+
+ msg = ps->pending_msgs_head;
+ while (msg!=NULL)
{
- if (addr_len == cc->addrlen)
+ if ((call_msg_cont == GNUNET_YES) && (msg->transmit_cont!=NULL))
{
- if (0 == memcmp(cc->addr, addr, addr_len))
- {
- con = cc;
- break;
- }
+ msg->transmit_cont (msg->transmit_cont_cls,&pc->identity,call_msg_cont_result);
}
- cc=cc->next;
+ GNUNET_free(msg);
+ GNUNET_CONTAINER_DLL_remove(ps->pending_msgs_head,ps->pending_msgs_head,msg);
+ msg = ps->pending_msgs_head;
}
- if (con==NULL)
+ GNUNET_CONTAINER_DLL_remove(pc->head,pc->tail,ps);
+ GNUNET_free(ps);
+ ps = NULL;
+ return GNUNET_OK;
+}
+
+int remove_peer_context_Iterator (void *cls, const GNUNET_HashCode *key, void *value)
+{
+ struct Plugin *plugin = cls;
+ struct HTTP_PeerContext * pc = value;
+ struct Session * ps = pc->head;
+ struct Session * tmp = NULL;
+ struct HTTP_Message * msg = NULL;
+ struct HTTP_Message * msg_tmp = NULL;
+#if DEBUG_HTTP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Freeing context for peer `%s'\n",GNUNET_i2s(&pc->identity));
+#endif
+ while (ps!=NULL)
{
- con = GNUNET_malloc(sizeof(struct HTTP_Connection_out) + addr_len);
- con->addrlen = addr_len;
- con->addr=&con[1];
- con->url=create_url(plugin, addr, addr_len);
- con->put_curl_handle = NULL;
- con->put_connected = GNUNET_NO;
- con->get_curl_handle = NULL;
- con->get_connected = GNUNET_NO;
- con->session = cs;
- memcpy(con->addr, addr, addr_len);
- GNUNET_CONTAINER_DLL_insert(cs->outbound_connections_head,cs->outbound_connections_tail,con);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Created new connection %X to peer `%s'\n",con,GNUNET_i2s(&cs->identity));
+ plugin->env->session_end(plugin, &pc->identity, ps);
+ tmp = ps->next;
+
+ GNUNET_free_non_null (ps->addr);
+ GNUNET_free(ps->url);
+ if (ps->msgtok != NULL)
+ GNUNET_SERVER_mst_destroy (ps->msgtok);
+
+ msg = ps->pending_msgs_head;
+ while (msg!=NULL)
+ {
+ msg_tmp = msg->next;
+ GNUNET_free(msg);
+ msg = msg_tmp;
+ }
+ if (ps->direction==OUTBOUND)
+ {
+ if (ps->send_endpoint!=NULL)
+ curl_easy_cleanup(ps->send_endpoint);
+ if (ps->recv_endpoint!=NULL)
+ curl_easy_cleanup(ps->recv_endpoint);
+ }
+
+ GNUNET_free(ps);
+ ps=tmp;
}
- return con;
+ GNUNET_free(pc);
+ return GNUNET_YES;
}
-
/**
- * Check if session already knows this address for a inbound connection to this peer
- * If address not in session, add it to the session
- * @param cls not needed, can be NULL
- * @param cs the session
- * @param addr address
- * @param addr_len address length
- * @return the found or created address
+ * Add the IP of our network interface to the list of
+ * our external IP addresses.
+ *
+ * @param cls the 'struct Plugin*'
+ * @param name name of the interface
+ * @param isDefault do we think this may be our default interface
+ * @param addr address of the interface
+ * @param addrlen number of bytes in addr
+ * @return GNUNET_OK to continue iterating
*/
-static struct HTTP_Connection_in * session_check_inbound_address (void * cls, struct Session *cs, const void * addr, size_t addr_len)
+static int
+process_interfaces (void *cls,
+ const char *name,
+ int isDefault,
+ const struct sockaddr *addr, socklen_t addrlen)
{
- struct HTTP_Connection_in * cc = cs->inbound_connections_head;
- struct HTTP_Connection_in * con = NULL;
+ struct Plugin *plugin = cls;
+ struct IPv4HttpAddress * t4;
+ struct IPv6HttpAddress * t6;
+ int af;
- GNUNET_assert((addr_len == sizeof (struct IPv4HttpAddress)) || (addr_len == sizeof (struct IPv6HttpAddress)));
- while (cc!=NULL)
- {
- if (addr_len == cc->addrlen)
+ GNUNET_assert(cls !=NULL);
+ af = addr->sa_family;
+ if ((af == AF_INET) && (plugin->use_ipv4 == GNUNET_YES) && (plugin->bind6_address == NULL))
{
- if (0 == memcmp(cc->addr, addr, addr_len))
+ struct in_addr bnd_cmp = ((struct sockaddr_in *) addr)->sin_addr;
+ t4 = GNUNET_malloc(sizeof(struct IPv4HttpAddress));
+ /* Not skipping loopback addresses
+ if (INADDR_LOOPBACK == ntohl(((struct sockaddr_in *) addr)->sin_addr.s_addr))
{
- con = cc;
- break;
+
+ return GNUNET_OK;
+ }
+ */
+ t4->ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr;
+ t4->u_port = htons (plugin->port_inbound);
+ if (plugin->bind4_address != NULL)
+ {
+ if (0 == memcmp(&plugin->bind4_address->sin_addr, &bnd_cmp, sizeof (struct in_addr)))
+ {
+ plugin->env->notify_address(plugin->env->cls,"http",t4, sizeof (struct IPv4HttpAddress), GNUNET_TIME_UNIT_FOREVER_REL);
+ }
+ }
+ else
+ {
+ plugin->env->notify_address(plugin->env->cls,"http",t4, sizeof (struct IPv4HttpAddress), GNUNET_TIME_UNIT_FOREVER_REL);
}
+ GNUNET_free (t4);
}
- cc=cc->next;
- }
-
-
- if (con==NULL)
- {
- con = GNUNET_malloc(sizeof(struct HTTP_Connection_in) + addr_len);
- con->addrlen = addr_len;
- con->addr=&con[1];
- con->connected = GNUNET_NO;
- con->session = cs;
- memcpy(con->addr, addr, addr_len);
- GNUNET_CONTAINER_DLL_insert(cs->inbound_connections_head,cs->inbound_connections_tail,con);
- }
+ 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;
+ }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X for inbound address %s (%s) was found\n",
- con,
- GNUNET_i2s(&cs->identity),
- http_plugin_address_to_string(NULL,con->addr,con->addrlen));
- return con;
+ if (plugin->bind6_address != NULL)
+ {
+ if (0 == memcmp(&plugin->bind6_address->sin6_addr, &bnd_cmp6, sizeof (struct in6_addr)))
+ {
+ memcpy (&t6->ipv6_addr,
+ &((struct sockaddr_in6 *) addr)->sin6_addr,
+ sizeof (struct in6_addr));
+ t6->u6_port = htons (plugin->port_inbound);
+ plugin->env->notify_address(plugin->env->cls,"http",t6,sizeof (struct IPv6HttpAddress) , GNUNET_TIME_UNIT_FOREVER_REL);
+ }
+ }
+ else
+ {
+ memcpy (&t6->ipv6_addr,
+ &((struct sockaddr_in6 *) addr)->sin6_addr,
+ sizeof (struct in6_addr));
+ t6->u6_port = htons (plugin->port_inbound);
+ plugin->env->notify_address(plugin->env->cls,"http",t6,sizeof (struct IPv6HttpAddress) , GNUNET_TIME_UNIT_FOREVER_REL);
+ }
+ GNUNET_free (t6);
+ }
+ return GNUNET_OK;
}
/**
* Callback called by MHD when a connection is terminated
*/
-static void requestCompletedCallback (void *cls, struct MHD_Connection * connection, void **httpSessionCache)
+static void mhd_termination_cb (void *cls, struct MHD_Connection * connection, void **httpSessionCache)
{
- struct HTTP_Connection_in * con;
-
- con = *httpSessionCache;
- if (con == NULL)
+ struct Session * ps = *httpSessionCache;
+ if (ps == NULL)
return;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection from peer `%s' was terminated\n",GNUNET_i2s(&con->session->identity));
- /* session set to inactive */
- con->is_put_in_progress = GNUNET_NO;
- con->is_bad_request = GNUNET_NO;
+ struct HTTP_PeerContext * pc = ps->peercontext;
+
+ if (connection==ps->recv_endpoint)
+ {
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound connection from peer `%s' was terminated\n", ps, GNUNET_i2s(&pc->identity));
+#endif
+ ps->recv_active = GNUNET_NO;
+ ps->recv_connected = GNUNET_NO;
+ ps->recv_endpoint = NULL;
+ }
+ if (connection==ps->send_endpoint)
+ {
+
+ ps->send_active = GNUNET_NO;
+ ps->send_connected = GNUNET_NO;
+ ps->send_endpoint = NULL;
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound connection from peer `%s' was terminated\n", ps, GNUNET_i2s(&pc->identity));
+#endif
+ }
+
+ /* if both connections disconnected, remove session */
+ if ((ps->send_connected == GNUNET_NO) && (ps->recv_connected == GNUNET_NO))
+ {
+ remove_session(pc,ps,GNUNET_YES,GNUNET_SYSERR);
+ }
}
-static void messageTokenizerCallback (void *cls,
- void *client,
- const struct GNUNET_MessageHeader *message)
+static void mhd_write_mst_cb (void *cls,
+ void *client,
+ const struct GNUNET_MessageHeader *message)
{
- struct HTTP_Connection_in * con = cls;
- GNUNET_assert(con != NULL);
+ struct Session *ps = cls;
+ struct HTTP_PeerContext *pc = ps->peercontext;
+ GNUNET_assert(ps != NULL);
+ GNUNET_assert(pc != NULL);
+#if DEBUG_HTTP
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Forwarding message to transport service, type %u and size %u from `%s' (`%s')\n",
+ "Connection %X: Forwarding message to transport service, type %u and size %u from `%s' (`%s')\n",
+ ps,
ntohs(message->type),
ntohs(message->size),
- GNUNET_i2s(&(con->session->identity)),http_plugin_address_to_string(NULL,con->addr,con->addrlen));
-
- con->session->plugin->env->receive (con->session->plugin->env->cls,
- &con->session->identity,
- message, 1, con->session,
+ GNUNET_i2s(&(ps->peercontext)->identity),http_plugin_address_to_string(NULL,ps->addr,ps->addrlen));
+#endif
+ pc->plugin->env->receive (ps->peercontext->plugin->env->cls,
+ &pc->identity,
+ message, 1, ps,
NULL,
0);
}
* Check if ip is allowed to connect.
*/
static int
-acceptPolicyCallback (void *cls,
+mhd_accept_cb (void *cls,
const struct sockaddr *addr, socklen_t addr_len)
{
#if 0
return MHD_YES;
}
-int server_read_callback (void *cls, uint64_t pos, char *buf, int max)
+int mhd_send_callback (void *cls, uint64_t pos, char *buf, int max)
{
- int bytes_read = -1;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "server_read_callback\n");
+ int bytes_read = 0;
+
+ struct Session * ps = cls;
+ struct HTTP_PeerContext * pc;
+ struct HTTP_Message * msg;
+
+ GNUNET_assert (ps!=NULL);
+ pc = ps->peercontext;
+ msg = ps->pending_msgs_tail;
+ if (ps->send_force_disconnect==GNUNET_YES)
+ {
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound forced to disconnect\n",ps);
+#endif
+ return -1;
+ }
+
+ if (msg!=NULL)
+ {
+ if ((msg->size-msg->pos) <= max)
+ {
+ memcpy(buf,&msg->buf[msg->pos],(msg->size-msg->pos));
+ bytes_read = msg->size-msg->pos;
+ msg->pos+=(msg->size-msg->pos);
+ }
+ else
+ {
+ memcpy(buf,&msg->buf[msg->pos],max);
+ msg->pos+=max;
+ bytes_read = max;
+ }
+
+ if (msg->pos==msg->size)
+ {
+ if (NULL!=msg->transmit_cont)
+ msg->transmit_cont (msg->transmit_cont_cls,&pc->identity,GNUNET_OK);
+ remove_http_message(ps,msg);
+ }
+ }
return bytes_read;
}
* already exists and create a new one if not.
*/
static int
-accessHandlerCallback (void *cls,
+mdh_access_cb (void *cls,
struct MHD_Connection *mhd_connection,
const char *url,
const char *method,
{
struct Plugin *plugin = cls;
struct MHD_Response *response;
- struct Session * cs;
- struct HTTP_Connection_in * con;
const union MHD_ConnectionInfo * conn_info;
+
struct sockaddr_in *addrin;
struct sockaddr_in6 *addrin6;
+
char address[INET6_ADDRSTRLEN+14];
struct GNUNET_PeerIdentity pi_in;
- int res = GNUNET_NO;
- int send_error_to_client;
+ size_t id_num = 0;
+
struct IPv4HttpAddress ipv4addr;
struct IPv6HttpAddress ipv6addr;
+ struct HTTP_PeerContext *pc;
+ struct Session *ps = NULL;
+ struct Session *ps_tmp = NULL;
+
+ int res = GNUNET_NO;
+ int send_error_to_client;
+ void * addr;
+ size_t addr_len;
+
GNUNET_assert(cls !=NULL);
send_error_to_client = GNUNET_NO;
+
if (NULL == *httpSessionCache)
{
/* check url for peer identity , if invalid send HTTP 404*/
- res = GNUNET_CRYPTO_hash_from_string ( &url[1], &(pi_in.hashPubKey));
+ size_t len = strlen(&url[1]);
+ char * peer = GNUNET_malloc(104+1);
+
+ if ((len>104) && (url[104]==';'))
+ {
+ char * id = GNUNET_malloc((len-104)+1);
+ strcpy(id,&url[105]);
+ memcpy(peer,&url[1],103);
+ peer[103] = '\0';
+ id_num = strtoul ( id, NULL , 10);
+ GNUNET_free(id);
+ }
+ res = GNUNET_CRYPTO_hash_from_string (peer, &(pi_in.hashPubKey));
+ GNUNET_free(peer);
if ( GNUNET_SYSERR == res )
{
response = MHD_create_response_from_data (strlen (HTTP_ERROR_RESPONSE),HTTP_ERROR_RESPONSE, MHD_NO, MHD_NO);
res = MHD_queue_response (mhd_connection, MHD_HTTP_NOT_FOUND, response);
MHD_destroy_response (response);
+#if DEBUG_CONNECTIONS
if (res == MHD_YES)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Peer has no valid ident, sent HTTP 1.1/404\n");
else
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Peer has no valid ident, could not send error\n");
+#endif
return res;
}
}
else
{
- con = *httpSessionCache;
- cs = con->session;
+ ps = *httpSessionCache;
+ pc = ps->peercontext;
}
if (NULL == *httpSessionCache)
{
- /* get session for peer identity */
- cs = session_get (plugin ,&pi_in);
+ /* get peer context */
+ pc = GNUNET_CONTAINER_multihashmap_get (plugin->peers, &pi_in.hashPubKey);
+ /* Peer unknown */
+ if (pc==NULL)
+ {
+ pc = GNUNET_malloc(sizeof (struct HTTP_PeerContext));
+ pc->plugin = plugin;
+ pc->session_id_counter=1;
+ pc->last_session = NULL;
+ memcpy(&pc->identity, &pi_in, sizeof(struct GNUNET_PeerIdentity));
+ GNUNET_CONTAINER_multihashmap_put(plugin->peers, &pc->identity.hashPubKey, pc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ }
conn_info = MHD_get_connection_info(mhd_connection, MHD_CONNECTION_INFO_CLIENT_ADDRESS );
/* Incoming IPv4 connection */
inet_ntop(addrin->sin_family, &(addrin->sin_addr),address,INET_ADDRSTRLEN);
memcpy(&ipv4addr.ipv4_addr,&(addrin->sin_addr),sizeof(struct in_addr));
ipv4addr.u_port = addrin->sin_port;
- con = session_check_inbound_address (plugin, cs, (const void *) &ipv4addr, sizeof (struct IPv4HttpAddress));
+ addr = &ipv4addr;
+ addr_len = sizeof(struct IPv4HttpAddress);
}
/* Incoming IPv6 connection */
if ( AF_INET6 == conn_info->client_addr->sin_family)
inet_ntop(addrin6->sin6_family, &(addrin6->sin6_addr),address,INET6_ADDRSTRLEN);
memcpy(&ipv6addr.ipv6_addr,&(addrin6->sin6_addr),sizeof(struct in6_addr));
ipv6addr.u6_port = addrin6->sin6_port;
- con = session_check_inbound_address (plugin, cs, &ipv6addr, sizeof (struct IPv6HttpAddress));
+ addr = &ipv6addr;
+ addr_len = sizeof(struct IPv6HttpAddress);
+ }
+
+ ps = NULL;
+ /* only inbound sessions here */
+
+ ps_tmp = pc->head;
+ while (ps_tmp!=NULL)
+ {
+ if ((ps_tmp->direction==INBOUND) && (ps_tmp->session_id == id_num) && (id_num!=0))
+ {
+ if ((ps_tmp->recv_force_disconnect!=GNUNET_YES) && (ps_tmp->send_force_disconnect!=GNUNET_YES))
+ ps=ps_tmp;
+ break;
+ }
+ ps_tmp=ps_tmp->next;
}
- /* Set closure and update current session*/
- *httpSessionCache = con;
- if (con->msgtok==NULL)
- con->msgtok = GNUNET_SERVER_mst_create (GNUNET_SERVER_MAX_MESSAGE_SIZE - 1, &messageTokenizerCallback, con);
+ if (ps==NULL)
+ {
+ ps = GNUNET_malloc(sizeof (struct Session));
+ ps->addr = GNUNET_malloc(addr_len);
+ memcpy(ps->addr,addr,addr_len);
+ ps->addrlen = addr_len;
+ ps->direction=INBOUND;
+ ps->pending_msgs_head = NULL;
+ ps->pending_msgs_tail = NULL;
+ ps->send_connected=GNUNET_NO;
+ ps->send_active=GNUNET_NO;
+ ps->recv_connected=GNUNET_NO;
+ ps->recv_active=GNUNET_NO;
+ ps->peercontext=pc;
+ ps->session_id =id_num;
+ ps->url = create_url (plugin, ps->addr, ps->addrlen, ps->session_id);
+ GNUNET_CONTAINER_DLL_insert(pc->head,pc->tail,ps);
+ }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"HTTP Daemon has new an incoming `%s' request from peer `%s' (`%s')\n",
+ *httpSessionCache = ps;
+ if (ps->msgtok==NULL)
+ ps->msgtok = GNUNET_SERVER_mst_create (&mhd_write_mst_cb, ps);
+#if DEBUG_HTTP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: HTTP Daemon has new an incoming `%s' request from peer `%s' (`%s')\n",
+ ps,
method,
- GNUNET_i2s(&cs->identity),
- http_plugin_address_to_string(NULL, con->addr, con->addrlen));
+ GNUNET_i2s(&pc->identity),
+ http_plugin_address_to_string(NULL, ps->addr, ps->addrlen));
+#endif
}
/* Is it a PUT or a GET request */
if (0 == strcmp (MHD_HTTP_METHOD_PUT, method))
{
-
-
- if ((*upload_data_size == 0) && (con->is_put_in_progress==GNUNET_NO))
+ if (ps->recv_force_disconnect == GNUNET_YES)
{
- con->is_put_in_progress = GNUNET_YES;
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound connection was forced to disconnect\n",ps);
+#endif
+ ps->recv_active = GNUNET_NO;
+ return MHD_NO;
+ }
+ if ((*upload_data_size == 0) && (ps->recv_active==GNUNET_NO))
+ {
+ ps->recv_endpoint = mhd_connection;
+ ps->recv_connected = GNUNET_YES;
+ ps->recv_active = GNUNET_YES;
+ ps->recv_force_disconnect = GNUNET_NO;
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound PUT connection connected\n",ps);
+#endif
return MHD_YES;
}
/* Transmission of all data complete */
- if ((*upload_data_size == 0) && (con->is_put_in_progress == GNUNET_YES))
+ if ((*upload_data_size == 0) && (ps->recv_active == GNUNET_YES))
{
- response = MHD_create_response_from_data (strlen (HTTP_PUT_RESPONSE),HTTP_PUT_RESPONSE, MHD_NO, MHD_NO);
- res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Sent HTTP/1.1: 200 OK as PUT Response\n",HTTP_PUT_RESPONSE, strlen (HTTP_PUT_RESPONSE), res );
- MHD_destroy_response (response);
- return MHD_YES;
-
- con->is_put_in_progress = GNUNET_NO;
- con->is_bad_request = GNUNET_NO;
- return res;
+ response = MHD_create_response_from_data (strlen (HTTP_PUT_RESPONSE),HTTP_PUT_RESPONSE, MHD_NO, MHD_NO);
+ res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Sent HTTP/1.1: 200 OK as PUT Response\n",ps);
+#endif
+ MHD_destroy_response (response);
+ ps->recv_active=GNUNET_NO;
+ return MHD_YES;
}
/* Recieving data */
- if ((*upload_data_size > 0) && (con->is_put_in_progress == GNUNET_YES))
+ if ((*upload_data_size > 0) && (ps->recv_active == GNUNET_YES))
{
- res = GNUNET_SERVER_mst_receive(con->msgtok, con, upload_data,*upload_data_size, GNUNET_NO, GNUNET_NO);
+ res = GNUNET_SERVER_mst_receive(ps->msgtok, ps, upload_data,*upload_data_size, GNUNET_NO, GNUNET_NO);
(*upload_data_size) = 0;
return MHD_YES;
}
}
if ( 0 == strcmp (MHD_HTTP_METHOD_GET, method) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Got GET Request\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"URL: `%s'\n",url);
-
- /* check url for peer identity , if invalid send HTTP 404*/
- res = GNUNET_CRYPTO_hash_from_string ( &url[1], &(pi_in.hashPubKey));
-
- if ( GNUNET_SYSERR == res )
+ if (ps->send_force_disconnect == GNUNET_YES)
{
- response = MHD_create_response_from_data (strlen (HTTP_ERROR_RESPONSE),HTTP_ERROR_RESPONSE, MHD_NO, MHD_NO);
- res = MHD_queue_response (mhd_connection, MHD_HTTP_NOT_FOUND, response);
- MHD_destroy_response (response);
- if (res == MHD_YES)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Peer has no valid ident, sent HTTP 1.1/404\n");
- else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Peer has no valid ident, could not send error\n");
- return res;
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound connection was forced to disconnect\n",ps);
+#endif
+ ps->send_active = GNUNET_NO;
+ return MHD_NO;
}
-
- response = MHD_create_response_from_callback(-1,32 * 1024, &server_read_callback, cs, NULL);
- res = MHD_queue_response (mhd_connection, MHD_HTTP_NOT_FOUND, response);
- MHD_destroy_response (response);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"HTTP Daemon has new an incoming `%s' request from peer `%s' (`%s')\n",
- method,
- GNUNET_i2s(&cs->identity),
- http_plugin_address_to_string(NULL, con->addr, con->addrlen));
-
- return res;
-
+ ps->send_connected = GNUNET_YES;
+ ps->send_active = GNUNET_YES;
+ ps->send_endpoint = mhd_connection;
+ ps->send_force_disconnect = GNUNET_NO;
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound GET connection connected\n",ps);
+#endif
+ response = MHD_create_response_from_callback(-1,32 * 1024, &mhd_send_callback, ps, NULL);
+ res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
+ MHD_destroy_response (response);
+ return MHD_YES;
}
return MHD_NO;
}
-
-/**
- * Call MHD to process pending ipv4 requests and then go back
- * and schedule the next run.
- */
-static void http_server_daemon_v4_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-/**
- * Call MHD to process pending ipv6 requests and then go back
- * and schedule the next run.
- */
-static void http_server_daemon_v6_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
/**
* Function that queries MHD's select sets and
* starts the task waiting for them.
GNUNET_NETWORK_fdset_copy_native (wes, &es, max);
if (daemon_handle == plugin->http_server_daemon_v4)
{
+ if (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_v4);
+ plugin->http_server_daemon_v4 = GNUNET_SCHEDULER_NO_TASK;
+ }
+
ret = GNUNET_SCHEDULER_add_select (plugin->env->sched,
GNUNET_SCHEDULER_PRIORITY_DEFAULT,
GNUNET_SCHEDULER_NO_TASK,
}
if (daemon_handle == plugin->http_server_daemon_v6)
{
+ if (plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_v6);
+ plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK;
+ }
+
ret = GNUNET_SCHEDULER_add_select (plugin->env->sched,
GNUNET_SCHEDULER_PRIORITY_DEFAULT,
GNUNET_SCHEDULER_NO_TASK,
struct Plugin *plugin = cls;
GNUNET_assert(cls !=NULL);
- if (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK)
- plugin->http_server_task_v4 = GNUNET_SCHEDULER_NO_TASK;
+ plugin->http_server_task_v4 = GNUNET_SCHEDULER_NO_TASK;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
struct Plugin *plugin = cls;
GNUNET_assert(cls !=NULL);
- if (plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK)
- plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK;
+ plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
return;
}
-/**
- * Removes a message from the linked list of messages
- * @param con connection to remove message from
- * @param msg message to remove
- * @return GNUNET_SYSERR if msg not found, GNUNET_OK on success
- */
-
-static int remove_http_message(struct HTTP_Connection_out * con, struct HTTP_Message * msg)
+static size_t curl_get_header_cb( void *ptr, size_t size, size_t nmemb, void *stream)
{
- GNUNET_CONTAINER_DLL_remove(con->pending_msgs_head,con->pending_msgs_tail,msg);
- GNUNET_free(msg);
- return GNUNET_OK;
-}
+ struct Session * ps = stream;
+ char * tmp;
+ size_t len = size * nmemb;
+ long http_result = 0;
+ int res;
+ /* Getting last http result code */
+ 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 (http_result == 200)
+ {
+ ps->recv_connected = GNUNET_YES;
+ ps->recv_active = GNUNET_YES;
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: connected to recieve data\n",ps);
+#endif
+ // Calling send_check_connections again since receive is established
+ send_check_connections (ps->peercontext->plugin, ps);
+ }
+ }
+ }
-static size_t header_function( void *ptr, size_t size, size_t nmemb, void *stream)
+ tmp = NULL;
+ if ((size * nmemb) < SIZE_MAX)
+ tmp = GNUNET_malloc (len+1);
+
+ if ((tmp != NULL) && (len > 0))
+ {
+ memcpy(tmp,ptr,len);
+ if (len>=2)
+ {
+ if (tmp[len-2] == 13)
+ tmp[len-2]= '\0';
+ }
+ }
+ if (NULL != tmp)
+ GNUNET_free (tmp);
+
+ return size * nmemb;
+}
+
+static size_t curl_put_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);
+ res = curl_easy_getinfo(ps->send_endpoint, CURLINFO_RESPONSE_CODE, &http_result);
+ if (CURLE_OK == res)
+ {
+ if ((http_result == 100) && (ps->send_connected==GNUNET_NO))
+ {
+ ps->send_connected = GNUNET_YES;
+ ps->send_active = GNUNET_YES;
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: connected to send data\n",ps);
+#endif
+ }
+ if ((http_result == 200) && (ps->send_connected==GNUNET_YES))
+ {
+ ps->send_connected = GNUNET_NO;
+ ps->send_active = GNUNET_NO;
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: sending disconnected\n",ps);
+#endif
+ }
+ }
tmp = NULL;
if ((size * nmemb) < SIZE_MAX)
if (tmp[len-2] == 13)
tmp[len-2]= '\0';
}
-#if DEBUG_HTTP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Header: `%s'\n",tmp);
-#endif
}
if (NULL != tmp)
GNUNET_free (tmp);
* @param ptr source pointer, passed to the libcurl handle
* @return bytes written to stream
*/
-static size_t send_read_callback(void *stream, size_t size, size_t nmemb, void *ptr)
+static size_t curl_send_cb(void *stream, size_t size, size_t nmemb, void *ptr)
{
- struct HTTP_Connection_out * con = ptr;
- struct HTTP_Message * msg = con->pending_msgs_tail;
+ struct Session * ps = ptr;
+ struct HTTP_Message * msg = ps->pending_msgs_tail;
size_t bytes_sent;
size_t len;
- if (con->pending_msgs_tail == NULL)
+ if (ps->send_active == GNUNET_NO)
+ return CURL_READFUNC_PAUSE;
+
+
+ if ((ps->pending_msgs_tail == NULL) && (ps->send_active == GNUNET_YES))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: No Message to send, pausing connection\n",con);
- con->put_send_paused = GNUNET_YES;
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: No Message to send, pausing connection\n",ps);
+#endif
+ ps->send_active = GNUNET_NO;
return CURL_READFUNC_PAUSE;
}
- msg = con->pending_msgs_tail;
+ msg = ps->pending_msgs_tail;
/* data to send */
if (msg->pos < msg->size)
{
if ( msg->pos == msg->size)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Message with %u bytes sent, removing message from queue \n",con, msg->pos);
+#if DEBUG_CONNECTIONS
+ 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 != con->pending_msgs_tail) && (NULL != con->pending_msgs_tail->transmit_cont))
- msg->transmit_cont (con->pending_msgs_tail->transmit_cont_cls,&(con->session)->identity,GNUNET_OK);
- remove_http_message(con, msg);
+ if (( NULL != ps->pending_msgs_tail) && (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);
}
return bytes_sent;
}
+static void curl_receive_mst_cb (void *cls,
+ void *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct Session *ps = cls;
+ struct HTTP_PeerContext *pc = ps->peercontext;
+ GNUNET_assert(ps != NULL);
+ GNUNET_assert(pc != NULL);
+#if DEBUG_HTTP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connection %X: Forwarding message to transport service, type %u and size %u from `%s' (`%s')\n",
+ ps,
+ ntohs(message->type),
+ ntohs(message->size),
+ GNUNET_i2s(&(pc->identity)),http_plugin_address_to_string(NULL,ps->addr,ps->addrlen));
+#endif
+ pc->plugin->env->receive (pc->plugin->env->cls,
+ &pc->identity,
+ message, 1, ps,
+ ps->addr,
+ ps->addrlen);
+}
+
+
/**
* Callback method used with libcurl
* Method is called when libcurl needs to write data during sending
* @param ptr destination pointer, passed to the libcurl handle
* @return bytes read from stream
*/
-static size_t send_write_callback( void *stream, size_t size, size_t nmemb, void *ptr)
-{
- char * data = NULL;
-
- if ((size * nmemb) < SIZE_MAX)
- data = GNUNET_malloc(size*nmemb +1);
- if (data != NULL)
- {
- memcpy( data, stream, size*nmemb);
- data[size*nmemb] = '\0';
- free (data);
- }
- return (size * nmemb);
-
-}
-
-/**
- * Function setting up file descriptors and scheduling task to run
- * @param cls closure
- * @param ses session to send data to
- * @return bytes sent to peer
- */
-static size_t send_schedule(void *cls, struct Session* ses );
-
-
-
-/**
- * Function setting up curl handle and selecting message to send
- * @param cls plugin
- * @param ses session to send data to
- * @param con connection
- * @return bytes sent to peer
- */
-static ssize_t send_initiate (void *cls, struct Session* ses , struct HTTP_Connection_out *con)
+static size_t curl_receive_cb( void *stream, size_t size, size_t nmemb, void *ptr)
{
- struct Plugin *plugin = cls;
- int bytes_sent = 0;
- CURLMcode mret;
- struct HTTP_Message * msg;
- struct GNUNET_TIME_Relative timeout = GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT;
-
- GNUNET_assert(cls !=NULL);
-
-#if 0
- if (con->get_connected == GNUNET_NO)
- {
- if (con->get_curl_handle == NULL)
- con->get_curl_handle = curl_easy_init();
-
-#if DEBUG_CURL
- curl_easy_setopt(con->get_curl_handle, CURLOPT_VERBOSE, 1L);
+ struct Session * ps = ptr;
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: %u bytes received\n",ps, size*nmemb);
#endif
- curl_easy_setopt(con->get_curl_handle, CURLOPT_URL, con->url);
- //curl_easy_setopt(con->put_curl_handle, CURLOPT_PUT, 1L);
- curl_easy_setopt(con->get_curl_handle, CURLOPT_HEADERFUNCTION, &header_function);
- curl_easy_setopt(con->get_curl_handle, CURLOPT_WRITEHEADER, con);
- curl_easy_setopt(con->get_curl_handle, CURLOPT_READFUNCTION, send_read_callback);
- curl_easy_setopt(con->get_curl_handle, CURLOPT_READDATA, con);
- curl_easy_setopt(con->get_curl_handle, CURLOPT_WRITEFUNCTION, send_write_callback);
- curl_easy_setopt(con->get_curl_handle, CURLOPT_READDATA, con);
- curl_easy_setopt(con->get_curl_handle, CURLOPT_TIMEOUT, (long) timeout.value);
- curl_easy_setopt(con->get_curl_handle, CURLOPT_PRIVATE, con);
- curl_easy_setopt(con->get_curl_handle, CURLOPT_CONNECTTIMEOUT, HTTP_CONNECT_TIMEOUT_DBG);
- curl_easy_setopt(con->get_curl_handle, CURLOPT_BUFFERSIZE, GNUNET_SERVER_MAX_MESSAGE_SIZE);
-
- mret = curl_multi_add_handle(plugin->multi_handle, con->get_curl_handle);
- if (mret != CURLM_OK)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_add_handle", __FILE__, __LINE__,
- curl_multi_strerror (mret));
- return -1;
- }
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound not connected, initiating connection\n",con);
- }
-#endif
-
- /* PUT already connected, no need to initiate connection */
- if ((con->put_connected == GNUNET_YES) && (con->put_curl_handle != NULL))
- {
- if (con->put_send_paused == GNUNET_NO)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound active, enqueueing message\n",con);
- return bytes_sent;
- }
- if (con->put_send_paused == GNUNET_YES)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound paused, unpausing existing connection and enqueueing message\n",con);
- curl_easy_pause(con->put_curl_handle,CURLPAUSE_CONT);
- con->put_send_paused=GNUNET_NO;
- return bytes_sent;
- }
- }
-
-
- /* not connected, initiate connection */
- if ( NULL == con->put_curl_handle)
- con->put_curl_handle = curl_easy_init();
- GNUNET_assert (con->put_curl_handle != NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound not connected, initiating connection\n",con);
-
- GNUNET_assert (NULL != con->pending_msgs_tail);
- msg = con->pending_msgs_tail;
+ GNUNET_SERVER_mst_receive(ps->msgtok, ps, stream, size*nmemb, GNUNET_NO, GNUNET_NO);
+ return (size * nmemb);
-#if DEBUG_CURL
- curl_easy_setopt(con->put_curl_handle, CURLOPT_VERBOSE, 1L);
-#endif
- curl_easy_setopt(con->put_curl_handle, CURLOPT_URL, con->url);
- curl_easy_setopt(con->put_curl_handle, CURLOPT_PUT, 1L);
- curl_easy_setopt(con->put_curl_handle, CURLOPT_HEADERFUNCTION, &header_function);
- curl_easy_setopt(con->put_curl_handle, CURLOPT_WRITEHEADER, con);
- curl_easy_setopt(con->put_curl_handle, CURLOPT_READFUNCTION, send_read_callback);
- curl_easy_setopt(con->put_curl_handle, CURLOPT_READDATA, con);
- curl_easy_setopt(con->put_curl_handle, CURLOPT_WRITEFUNCTION, send_write_callback);
- curl_easy_setopt(con->put_curl_handle, CURLOPT_READDATA, con);
- curl_easy_setopt(con->put_curl_handle, CURLOPT_TIMEOUT, (long) timeout.value);
- curl_easy_setopt(con->put_curl_handle, CURLOPT_PRIVATE, con);
- curl_easy_setopt(con->put_curl_handle, CURLOPT_CONNECTTIMEOUT, HTTP_CONNECT_TIMEOUT_DBG);
- curl_easy_setopt(con->put_curl_handle, CURLOPT_BUFFERSIZE, GNUNET_SERVER_MAX_MESSAGE_SIZE);
-
- mret = curl_multi_add_handle(plugin->multi_handle, con->put_curl_handle);
- if (mret != CURLM_OK)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_add_handle", __FILE__, __LINE__,
- curl_multi_strerror (mret));
- return -1;
- }
- con->put_connected = GNUNET_YES;
- bytes_sent = send_schedule (plugin, ses);
- return bytes_sent;
}
-static void send_execute (void *cls,
+static void curl_perform (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct Plugin *plugin = cls;
int running;
struct CURLMsg *msg;
CURLMcode mret;
- struct HTTP_Connection_out * con = NULL;
- struct Session * cs = NULL;
+ struct Session *ps = NULL;
+ struct HTTP_PeerContext *pc = NULL;
+ struct HTTP_Message * cur_msg = NULL;
long http_result;
GNUNET_assert(cls !=NULL);
- plugin->http_server_task_send = GNUNET_SCHEDULER_NO_TASK;
+
+ plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
{
running = 0;
mret = curl_multi_perform (plugin->multi_handle, &running);
- if (running < handles_last_run)
+ if ((running < handles_last_run) && (running>0))
{
do
{
msg = curl_multi_info_read (plugin->multi_handle, &running);
- if (msg == NULL)
- break;
+ if (running == 0)
+ break;
/* get session for affected curl handle */
GNUNET_assert ( msg->easy_handle != NULL );
- curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, (char *) &con);
- GNUNET_assert ( con != NULL );
- cs = con->session;
- GNUNET_assert ( cs != NULL );
+ curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, (char *) &ps);
+ GNUNET_assert ( ps != NULL );
+ pc = ps->peercontext;
+ GNUNET_assert ( pc != NULL );
switch (msg->msg)
{
if ( (msg->data.result != CURLE_OK) &&
(msg->data.result != CURLE_GOT_NOTHING) )
{
-
-
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- _("Connection %X to peer `%s' (`%s') failed: `%s' `%s'\n"),
- con,
- GNUNET_i2s(&cs->identity),
- http_plugin_address_to_string(NULL, con->addr, con->addrlen),
- "curl_multi_perform",
- curl_easy_strerror (msg->data.result));
/* sending msg failed*/
- con->put_connected = GNUNET_NO;
- curl_easy_cleanup(con->put_curl_handle);
- con->put_curl_handle=NULL;
- if (( NULL != con->pending_msgs_tail) && ( NULL != con->pending_msgs_tail->transmit_cont))
- con->pending_msgs_tail->transmit_cont (con->pending_msgs_tail->transmit_cont_cls,&con->session->identity,GNUNET_SYSERR);
-
+ if (msg->easy_handle == ps->send_endpoint)
+ {
+#if DEBUG_CONNECTIONS
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ _("Connection %X: HTTP PUT to peer `%s' (`%s') failed: `%s' `%s'\n"),
+ ps,
+ GNUNET_i2s(&pc->identity),
+ http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
+ "curl_multi_perform",
+ curl_easy_strerror (msg->data.result));
+#endif
+ ps->send_connected = GNUNET_NO;
+ ps->send_active = GNUNET_NO;
+ curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint);
+ curl_easy_cleanup(ps->send_endpoint);
+ ps->send_endpoint=NULL;
+ cur_msg = ps->pending_msgs_tail;
+ if (( NULL != cur_msg) && ( NULL != cur_msg->transmit_cont))
+ cur_msg->transmit_cont (cur_msg->transmit_cont_cls,&pc->identity,GNUNET_SYSERR);
+ }
+ /* GET connection failed */
+ if (msg->easy_handle == ps->recv_endpoint)
+ {
+#if DEBUG_CONNECTIONS
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ _("Connection %X: HTTP GET to peer `%s' (`%s') failed: `%s' `%s'\n"),
+ ps,
+ GNUNET_i2s(&pc->identity),
+ http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
+ "curl_multi_perform",
+ curl_easy_strerror (msg->data.result));
+#endif
+ ps->recv_connected = GNUNET_NO;
+ ps->recv_active = GNUNET_NO;
+ curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint);
+ curl_easy_cleanup(ps->recv_endpoint);
+ ps->recv_endpoint=NULL;
+ }
}
else
{
- GNUNET_assert (CURLE_OK == curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &http_result));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Send to peer `%s' completed with code %u\n", GNUNET_i2s(&cs->identity), http_result );
-
- curl_easy_cleanup(con->put_curl_handle);
- con->put_connected = GNUNET_NO;
- con->put_curl_handle=NULL;
-
- /* Calling transmit continuation */
- if (( NULL != con->pending_msgs_tail) && (NULL != con->pending_msgs_tail->transmit_cont))
+ if (msg->easy_handle == ps->send_endpoint)
{
- /* HTTP 1xx : Last message before here was informational */
- if ((http_result >=100) && (http_result < 200))
- con->pending_msgs_tail->transmit_cont (con->pending_msgs_tail->transmit_cont_cls,&cs->identity,GNUNET_OK);
- /* HTTP 2xx: successful operations */
- if ((http_result >=200) && (http_result < 300))
- con->pending_msgs_tail->transmit_cont (con->pending_msgs_tail->transmit_cont_cls,&cs->identity,GNUNET_OK);
- /* HTTP 3xx..5xx: error */
- if ((http_result >=300) && (http_result < 600))
- con->pending_msgs_tail->transmit_cont (con->pending_msgs_tail->transmit_cont_cls,&cs->identity,GNUNET_SYSERR);
+ GNUNET_assert (CURLE_OK == curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &http_result));
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connection %X: HTTP PUT connection to peer `%s' (`%s') was closed with HTTP code %u\n",
+ ps,
+ GNUNET_i2s(&pc->identity),
+ http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
+ http_result);
+#endif
+ /* Calling transmit continuation */
+ cur_msg = ps->pending_msgs_tail;
+ if (( NULL != cur_msg) && (NULL != cur_msg->transmit_cont))
+ {
+ /* HTTP 1xx : Last message before here was informational */
+ if ((http_result >=100) && (http_result < 200))
+ cur_msg->transmit_cont (cur_msg->transmit_cont_cls,&pc->identity,GNUNET_OK);
+ /* HTTP 2xx: successful operations */
+ if ((http_result >=200) && (http_result < 300))
+ cur_msg->transmit_cont (cur_msg->transmit_cont_cls,&pc->identity,GNUNET_OK);
+ /* HTTP 3xx..5xx: error */
+ if ((http_result >=300) && (http_result < 600))
+ cur_msg->transmit_cont (cur_msg->transmit_cont_cls,&pc->identity,GNUNET_SYSERR);
+ }
+ ps->send_connected = GNUNET_NO;
+ ps->send_active = GNUNET_NO;
+ curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint);
+ curl_easy_cleanup(ps->send_endpoint);
+ ps->send_endpoint =NULL;
+ }
+ if (msg->easy_handle == ps->recv_endpoint)
+ {
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connection %X: HTTP GET connection to peer `%s' (`%s') was closed with HTTP code %u\n",
+ ps,
+ GNUNET_i2s(&pc->identity),
+ http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
+ http_result);
+#endif
+ ps->recv_connected = GNUNET_NO;
+ ps->recv_active = GNUNET_NO;
+ curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint);
+ curl_easy_cleanup(ps->recv_endpoint);
+ ps->recv_endpoint=NULL;
}
}
- if (con->pending_msgs_tail != NULL)
- {
- if (con->pending_msgs_tail->pos>0)
- remove_http_message(con, con->pending_msgs_tail);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message could not be removed from session `%s'\n", GNUNET_i2s(&cs->identity));
- }
- return;
+ if ((ps->recv_connected == GNUNET_NO) && (ps->send_connected == GNUNET_NO))
+ remove_session (pc, ps, GNUNET_YES, GNUNET_SYSERR);
+ break;
default:
break;
}
handles_last_run = running;
}
while (mret == CURLM_CALL_MULTI_PERFORM);
- send_schedule(plugin, cls);
+ curl_schedule(plugin);
}
/**
* Function setting up file descriptors and scheduling task to run
* @param ses session to send data to
- * @return bytes sent to peer
+ * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok
*/
-static size_t send_schedule(void *cls, struct Session* ses )
+static int curl_schedule(void *cls )
{
struct Plugin *plugin = cls;
fd_set rs;
CURLMcode mret;
GNUNET_assert(cls !=NULL);
+
+ /* Cancel previous scheduled task */
+ if (plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_curl_task);
+ plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
max = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
_("%s failed at %s:%d: `%s'\n"),
"curl_multi_fdset", __FILE__, __LINE__,
curl_multi_strerror (mret));
- return -1;
+ return GNUNET_SYSERR;
}
mret = curl_multi_timeout (plugin->multi_handle, &to);
if (mret != CURLM_OK)
_("%s failed at %s:%d: `%s'\n"),
"curl_multi_timeout", __FILE__, __LINE__,
curl_multi_strerror (mret));
- return -1;
+ return GNUNET_SYSERR;
}
grs = GNUNET_NETWORK_fdset_create ();
gws = GNUNET_NETWORK_fdset_create ();
GNUNET_NETWORK_fdset_copy_native (grs, &rs, max + 1);
GNUNET_NETWORK_fdset_copy_native (gws, &ws, max + 1);
- plugin->http_server_task_send = GNUNET_SCHEDULER_add_select (plugin->env->sched,
+ plugin->http_curl_task = GNUNET_SCHEDULER_add_select (plugin->env->sched,
GNUNET_SCHEDULER_PRIORITY_DEFAULT,
GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 0),
grs,
gws,
- &send_execute,
+ &curl_perform,
plugin);
GNUNET_NETWORK_fdset_destroy (gws);
GNUNET_NETWORK_fdset_destroy (grs);
+ return GNUNET_OK;
+}
+
+/**
+ * Function setting up curl handle and selecting message to send
+ * @param cls plugin
+ * @param ses session to send data to
+ * @param con connection
+ * @return GNUNET_SYSERR on failure, GNUNET_NO if connecting, GNUNET_YES if ok
+ */
+static ssize_t send_check_connections (void *cls, struct Session *ps)
+{
+ struct Plugin *plugin = cls;
+ CURLMcode mret;
+ struct HTTP_Message * msg;
+
+ struct GNUNET_TIME_Relative timeout = GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT;
+
+ GNUNET_assert(cls !=NULL);
+
+ if (ps->direction == OUTBOUND)
+ {
+ /* RECV DIRECTION */
+ /* Check if session is connected to receive data, otherwise connect to peer */
+ if (ps->recv_connected == GNUNET_NO)
+ {
+ if (ps->recv_endpoint == NULL)
+ {
+ ps->recv_endpoint = curl_easy_init();
+#if DEBUG_CURL
+ curl_easy_setopt(ps->recv_endpoint, CURLOPT_VERBOSE, 1L);
+#endif
+ curl_easy_setopt(ps->recv_endpoint, CURLOPT_URL, ps->url);
+ curl_easy_setopt(ps->recv_endpoint, CURLOPT_HEADERFUNCTION, &curl_get_header_cb);
+ curl_easy_setopt(ps->recv_endpoint, CURLOPT_WRITEHEADER, ps);
+ curl_easy_setopt(ps->recv_endpoint, CURLOPT_READFUNCTION, curl_send_cb);
+ curl_easy_setopt(ps->recv_endpoint, CURLOPT_READDATA, ps);
+ curl_easy_setopt(ps->recv_endpoint, CURLOPT_WRITEFUNCTION, curl_receive_cb);
+ curl_easy_setopt(ps->recv_endpoint, CURLOPT_WRITEDATA, ps);
+ curl_easy_setopt(ps->recv_endpoint, CURLOPT_TIMEOUT, (long) timeout.value);
+ curl_easy_setopt(ps->recv_endpoint, CURLOPT_PRIVATE, ps);
+ curl_easy_setopt(ps->recv_endpoint, CURLOPT_CONNECTTIMEOUT, HTTP_CONNECT_TIMEOUT);
+ curl_easy_setopt(ps->recv_endpoint, CURLOPT_BUFFERSIZE, GNUNET_SERVER_MAX_MESSAGE_SIZE);
+
+ mret = curl_multi_add_handle(plugin->multi_handle, ps->recv_endpoint);
+ if (mret != CURLM_OK)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Connection: %X: %s failed at %s:%d: `%s'\n"),
+ ps,
+ "curl_multi_add_handle", __FILE__, __LINE__,
+ curl_multi_strerror (mret));
+ return GNUNET_SYSERR;
+ }
+ if (curl_schedule (plugin) == GNUNET_SYSERR)
+ return GNUNET_SYSERR;
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound not connected, initiating connection\n",ps);
+#endif
+ }
+ }
+
+ /* waiting for receive direction */
+ if (ps->recv_connected==GNUNET_NO)
+ return GNUNET_NO;
+
+ /* SEND DIRECTION */
+ /* Check if session is connected to send data, otherwise connect to peer */
+ if ((ps->send_connected == GNUNET_YES) && (ps->send_endpoint!= NULL))
+ {
+ if (ps->send_active == GNUNET_YES)
+ {
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound active, enqueueing message\n",ps);
+#endif
+ return GNUNET_YES;
+ }
+ if (ps->send_active == GNUNET_NO)
+ {
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound paused, unpausing existing connection and enqueueing message\n",ps);
+#endif
+ if (CURLE_OK == curl_easy_pause(ps->send_endpoint,CURLPAUSE_CONT))
+ {
+ ps->send_active=GNUNET_YES;
+ return GNUNET_YES;
+ }
+ else
+ return GNUNET_SYSERR;
+ }
+ }
+ /* not connected, initiate connection */
+ if ((ps->send_connected==GNUNET_NO) && (NULL == ps->send_endpoint))
+ {
+ ps->send_endpoint = curl_easy_init();
+ GNUNET_assert (ps->send_endpoint != NULL);
+ GNUNET_assert (NULL != ps->pending_msgs_tail);
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound not connected, initiating connection\n",ps);
+#endif
+ ps->send_active = GNUNET_NO;
+ msg = ps->pending_msgs_tail;
- /* FIXME: return bytes REALLY sent */
- return 0;
+#if DEBUG_CURL
+ curl_easy_setopt(ps->send_endpoint, CURLOPT_VERBOSE, 1L);
+#endif
+ curl_easy_setopt(ps->send_endpoint, CURLOPT_URL, ps->url);
+ curl_easy_setopt(ps->send_endpoint, CURLOPT_PUT, 1L);
+ curl_easy_setopt(ps->send_endpoint, CURLOPT_HEADERFUNCTION, &curl_put_header_cb);
+ curl_easy_setopt(ps->send_endpoint, CURLOPT_WRITEHEADER, ps);
+ curl_easy_setopt(ps->send_endpoint, CURLOPT_READFUNCTION, curl_send_cb);
+ curl_easy_setopt(ps->send_endpoint, CURLOPT_READDATA, ps);
+ curl_easy_setopt(ps->send_endpoint, CURLOPT_WRITEFUNCTION, curl_receive_cb);
+ curl_easy_setopt(ps->send_endpoint, CURLOPT_READDATA, ps);
+ curl_easy_setopt(ps->send_endpoint, CURLOPT_TIMEOUT, (long) timeout.value);
+ curl_easy_setopt(ps->send_endpoint, CURLOPT_PRIVATE, ps);
+ curl_easy_setopt(ps->send_endpoint, CURLOPT_CONNECTTIMEOUT, HTTP_CONNECT_TIMEOUT);
+ curl_easy_setopt(ps->send_endpoint, CURLOPT_BUFFERSIZE, GNUNET_SERVER_MAX_MESSAGE_SIZE);
+
+ mret = curl_multi_add_handle(plugin->multi_handle, ps->send_endpoint);
+ if (mret != CURLM_OK)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Connection: %X: %s failed at %s:%d: `%s'\n"),
+ ps,
+ "curl_multi_add_handle", __FILE__, __LINE__,
+ curl_multi_strerror (mret));
+ return GNUNET_SYSERR;
+ }
+ }
+ if (curl_schedule (plugin) == GNUNET_SYSERR)
+ return GNUNET_SYSERR;
+ return GNUNET_YES;
+ }
+ if (ps->direction == INBOUND)
+ {
+ GNUNET_assert (NULL != ps->pending_msgs_tail);
+ if ((ps->recv_connected==GNUNET_YES) && (ps->send_connected==GNUNET_YES) &&
+ (ps->recv_force_disconnect==GNUNET_NO) && (ps->recv_force_disconnect==GNUNET_NO))
+ return GNUNET_YES;
+ }
+ return GNUNET_SYSERR;
}
+static struct Session * send_select_session (void * cls, struct HTTP_PeerContext *pc, const void * addr, size_t addrlen, int force_address, struct Session * session)
+{
+ struct Session * tmp = NULL;
+ int addr_given = GNUNET_NO;
+
+ if ((addr!=NULL) && (addrlen>0))
+ addr_given = GNUNET_YES;
+
+ if (force_address == GNUNET_YES)
+ {
+ /* check session given as argument */
+ if ((session != NULL) && (addr_given == GNUNET_YES))
+ {
+ if (0 == memcmp(session->addr, addr, addrlen))
+ {
+ /* connection can not be used, since it is disconnected */
+ if ((session->recv_force_disconnect==GNUNET_NO) && (session->send_force_disconnect==GNUNET_NO))
+ {
+#if DEBUG_SESSION_SELECTION
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using session passed by transport to send to forced address \n", session);
+#endif
+ return session;
+ }
+ }
+ }
+ /* check last session used */
+ if ((pc->last_session != NULL)&& (addr_given == GNUNET_YES))
+ {
+ if (0 == memcmp(pc->last_session->addr, addr, addrlen))
+ {
+ /* connection can not be used, since it is disconnected */
+ if ((pc->last_session->recv_force_disconnect==GNUNET_NO) && (pc->last_session->send_force_disconnect==GNUNET_NO))
+ {
+#if DEBUG_SESSION_SELECTION
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using last session used to send to forced address \n", pc->last_session);
+#endif
+ return pc->last_session;
+ }
+ }
+ }
+ /* find session in existing sessions */
+ tmp = pc->head;
+ while ((tmp!=NULL) && (addr_given == GNUNET_YES))
+ {
+
+ if (0 == memcmp(tmp->addr, addr, addrlen))
+ {
+ /* connection can not be used, since it is disconnected */
+ if ((tmp->recv_force_disconnect==GNUNET_NO) && (tmp->send_force_disconnect==GNUNET_NO))
+ {
+#if DEBUG_SESSION_SELECTION
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using existing session to send to forced address \n", session);
+#endif
+ return session;
+ }
+
+ }
+ tmp=tmp->next;
+ }
+ /* no session to use */
+ return NULL;
+ }
+ if ((force_address == GNUNET_NO) || (force_address == GNUNET_SYSERR))
+ {
+ /* check session given as argument */
+ if (session != NULL)
+ {
+ /* connection can not be used, since it is disconnected */
+ if ((session->recv_force_disconnect==GNUNET_NO) && (session->send_force_disconnect==GNUNET_NO))
+ {
+#if DEBUG_SESSION_SELECTION
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using session passed by transport to send not-forced address \n", session);
+#endif
+ return session;
+ }
+
+ }
+ /* check last session used */
+ if (pc->last_session != NULL)
+ {
+ /* connection can not be used, since it is disconnected */
+ if ((pc->last_session->recv_force_disconnect==GNUNET_NO) && (pc->last_session->send_force_disconnect==GNUNET_NO))
+ {
+#if DEBUG_SESSION_SELECTION
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using last session to send to not-forced address \n", pc->last_session);
+#endif
+ return pc->last_session;
+ }
+ }
+ /* find session in existing sessions */
+ tmp = pc->head;
+ while (tmp!=NULL)
+ {
+ /* connection can not be used, since it is disconnected */
+ if ((tmp->recv_force_disconnect==GNUNET_NO) && (tmp->send_force_disconnect==GNUNET_NO))
+ {
+#if DEBUG_SESSION_SELECTION
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using existing session to send to not-forced address \n", tmp);
+#endif
+ return tmp;
+ }
+ tmp=tmp->next;
+ }
+ return NULL;
+ }
+ return NULL;
+}
/**
* Function that can be used by the transport service to transmit
void *cont_cls)
{
struct Plugin *plugin = cls;
- struct Session *cs;
struct HTTP_Message *msg;
- struct HTTP_Connection_out *con;
- //unsigned int ret;
+ struct HTTP_PeerContext * pc;
+ struct Session * ps = NULL;
GNUNET_assert(cls !=NULL);
- GNUNET_assert ((addr!=NULL) && (addrlen != 0));
-
- /* get session from hashmap */
- cs = session_get(plugin, target);
- con = session_check_outbound_address(plugin, cs, addr, addrlen);
-
- char * force = GNUNET_malloc(30);
+#if DEBUG_HTTP
+ char * force = GNUNET_malloc(40);
if (force_address == GNUNET_YES)
strcpy(force,"forced addr.");
if (force_address == GNUNET_NO)
strcpy(force,"any addr.");
if (force_address == GNUNET_SYSERR)
strcpy(force,"reliable bi-direc. address addr.");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Transport tells me to send %u bytes to `%s' %s (%s), session: %X\n",
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Transport tells me to send %u bytes to `%s' using %s (%s) and session: %X\n",
msgbuf_size,
- GNUNET_i2s(&cs->identity),
+ GNUNET_i2s(target),
force,
http_plugin_address_to_string(NULL, addr, addrlen),
session);
- //GNUNET_free(force);
+ GNUNET_free(force);
+#endif
+
+ pc = GNUNET_CONTAINER_multihashmap_get (plugin->peers, &target->hashPubKey);
+ /* Peer unknown */
+ if (pc==NULL)
+ {
+ pc = GNUNET_malloc(sizeof (struct HTTP_PeerContext));
+ pc->plugin = plugin;
+ pc->session_id_counter=1;
+ pc->last_session = NULL;
+ memcpy(&pc->identity, target, sizeof(struct GNUNET_PeerIdentity));
+ GNUNET_CONTAINER_multihashmap_put(plugin->peers, &pc->identity.hashPubKey, pc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ }
+
+ ps = send_select_session (plugin, pc, addr, addrlen, force_address, session);
+
+ /* session not existing, but address forced -> creating new session */
+ if (ps==NULL)
+ {
+ if ((addr!=NULL) && (addrlen!=0))
+ {
+ ps = GNUNET_malloc(sizeof (struct Session));
+#if DEBUG_SESSION_SELECTION
+ if (force_address == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection & forced address: creating new session %X to peer %s\n", ps, GNUNET_i2s(target));
+ if (force_address != GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection: creating new session %X to peer %s\n", ps, GNUNET_i2s(target));
+#endif
+ if ((addrlen!=0) && (addr!=NULL))
+ {
+ ps->addr = GNUNET_malloc(addrlen);
+ memcpy(ps->addr,addr,addrlen);
+ ps->addrlen = addrlen;
+ }
+ else
+ {
+ ps->addr = NULL;
+ ps->addrlen = 0;
+ }
+ ps->direction=OUTBOUND;
+ ps->recv_connected = GNUNET_NO;
+ ps->recv_force_disconnect = GNUNET_NO;
+ ps->send_connected = GNUNET_NO;
+ ps->send_force_disconnect = GNUNET_NO;
+ ps->pending_msgs_head = NULL;
+ ps->pending_msgs_tail = NULL;
+ ps->peercontext=pc;
+ ps->session_id = pc->session_id_counter;
+ pc->session_id_counter++;
+ ps->url = create_url (plugin, ps->addr, ps->addrlen, ps->session_id);
+ if (ps->msgtok == NULL)
+ ps->msgtok = GNUNET_SERVER_mst_create (&curl_receive_mst_cb, ps);
+ GNUNET_CONTAINER_DLL_insert(pc->head,pc->tail,ps);
+ }
+ else
+ {
+#if DEBUG_HTTP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing session found & and no address given: no way to send this message to peer `%s'!\n", GNUNET_i2s(target));
+#endif
+ return GNUNET_SYSERR;
+ }
+ }
+
/* create msg */
msg = GNUNET_malloc (sizeof (struct HTTP_Message) + msgbuf_size);
msg->next = NULL;
msg->transmit_cont = cont;
msg->transmit_cont_cls = cont_cls;
memcpy (msg->buf,msgbuf, msgbuf_size);
+ GNUNET_CONTAINER_DLL_insert(ps->pending_msgs_head,ps->pending_msgs_tail,msg);
- /* must use this address */
- if (force_address == GNUNET_YES)
+ if (send_check_connections (plugin, ps) != GNUNET_SYSERR)
{
- /* enqueue in connection message queue */
- GNUNET_CONTAINER_DLL_insert(con->pending_msgs_head,con->pending_msgs_tail,msg);
+ if (force_address != GNUNET_YES)
+ pc->last_session = ps;
+
+ if (pc->last_session==NULL)
+ pc->last_session = ps;
+ return msg->size;
}
- /* can use existing connection to send */
else
- {
- /* enqueue in connection message queue */
- GNUNET_CONTAINER_DLL_insert(con->pending_msgs_head,con->pending_msgs_tail,msg);
- }
- return send_initiate (plugin, cs, con);
+ return GNUNET_SYSERR;
}
http_plugin_disconnect (void *cls,
const struct GNUNET_PeerIdentity *target)
{
+
+
struct Plugin *plugin = cls;
- struct HTTP_Connection_out *con;
- struct Session *cs;
+ struct HTTP_PeerContext *pc = NULL;
+ struct Session *ps = NULL;
+ //struct Session *tmp = NULL;
- /* get session from hashmap */
- cs = session_get(plugin, target);
- con = cs->outbound_connections_head;
+ pc = GNUNET_CONTAINER_multihashmap_get (plugin->peers, &target->hashPubKey);
+ if (pc==NULL)
+ return;
+ ps = pc->head;
- while (con!=NULL)
+ while (ps!=NULL)
{
- if (con->put_curl_handle!=NULL)
- curl_easy_cleanup(con->put_curl_handle);
- con->put_curl_handle=NULL;
- con->put_connected = GNUNET_NO;
- while (con->pending_msgs_head!=NULL)
+ /* Telling transport that session is getting disconnected */
+ plugin->env->session_end(plugin, target, ps);
+ if (ps->direction==OUTBOUND)
+ {
+ if (ps->send_endpoint!=NULL)
+ {
+ //GNUNET_assert(CURLM_OK == curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint));
+ //curl_easy_cleanup(ps->send_endpoint);
+ //ps->send_endpoint=NULL;
+ ps->send_force_disconnect = GNUNET_YES;
+ }
+ if (ps->recv_endpoint!=NULL)
+ {
+ //GNUNET_assert(CURLM_OK == curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint));
+ //curl_easy_cleanup(ps->recv_endpoint);
+ //ps->recv_endpoint=NULL;
+ ps->recv_force_disconnect = GNUNET_YES;
+ }
+ }
+
+ if (ps->direction==INBOUND)
{
- remove_http_message(con, con->pending_msgs_head);
+ ps->recv_force_disconnect = GNUNET_YES;
+ ps->send_force_disconnect = GNUNET_YES;
}
- con=con->next;
+
+ while (ps->pending_msgs_head!=NULL)
+ {
+ remove_http_message(ps, ps->pending_msgs_head);
+ }
+ ps->recv_active = GNUNET_NO;
+ ps->send_active = GNUNET_NO;
+ ps=ps->next;
}
}
res = GNUNET_asprintf(&ret,"http://%s:%u/",address,port);
GNUNET_free (address);
GNUNET_assert(res != 0);
-
asc (asc_cls, ret);
+ GNUNET_free_non_null (ret);
}
if (addrlen == sizeof (struct IPv4HttpAddress))
{
v4 = (struct IPv4HttpAddress *) addr;
+ /* Not skipping loopback
if (INADDR_LOOPBACK == ntohl(v4->ipv4_addr))
{
return GNUNET_SYSERR;
- }
+ } */
port = ntohs (v4->u_port);
if (port != plugin->port_inbound)
{
return GNUNET_SYSERR;
}
}
- else
+ if (addrlen == sizeof (struct IPv6HttpAddress))
{
v6 = (struct IPv6HttpAddress *) addr;
if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr))
return GNUNET_SYSERR;
}
}
+
return GNUNET_OK;
}
return ret;
}
-/**
- * Add the IP of our network interface to the list of
- * our external IP addresses.
- *
- * @param cls the 'struct Plugin*'
- * @param name name of the interface
- * @param isDefault do we think this may be our default interface
- * @param addr address of the interface
- * @param addrlen number of bytes in addr
- * @return GNUNET_OK to continue iterating
- */
-static int
-process_interfaces (void *cls,
- const char *name,
- int isDefault,
- const struct sockaddr *addr, socklen_t addrlen)
-{
- struct Plugin *plugin = cls;
- struct IPv4HttpAddress * t4;
- struct IPv6HttpAddress * t6;
- int af;
-
- GNUNET_assert(cls !=NULL);
- af = addr->sa_family;
- if (af == AF_INET)
- {
- t4 = GNUNET_malloc(sizeof(struct IPv4HttpAddress));
- if (INADDR_LOOPBACK == ntohl(((struct sockaddr_in *) addr)->sin_addr.s_addr))
- {
- /* skip loopback addresses */
- return GNUNET_OK;
- }
- t4->ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr;
- t4->u_port = htons (plugin->port_inbound);
- plugin->env->notify_address(plugin->env->cls,"http",t4, sizeof (struct IPv4HttpAddress), GNUNET_TIME_UNIT_FOREVER_REL);
-
- }
- else if (af == AF_INET6)
- {
- t6 = GNUNET_malloc(sizeof(struct IPv6HttpAddress));
- if (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr))
- {
- /* skip link local addresses */
- return GNUNET_OK;
- }
- if (IN6_IS_ADDR_LOOPBACK (&((struct sockaddr_in6 *) addr)->sin6_addr))
- {
- /* skip loopback addresses */
- return GNUNET_OK;
- }
- memcpy (&t6->ipv6_addr,
- &((struct sockaddr_in6 *) addr)->sin6_addr,
- sizeof (struct in6_addr));
- t6->u6_port = htons (plugin->port_inbound);
- plugin->env->notify_address(plugin->env->cls,"http",t6,sizeof (struct IPv6HttpAddress) , GNUNET_TIME_UNIT_FOREVER_REL);
- }
- return GNUNET_OK;
-}
-int hashMapFreeIterator (void *cls, const GNUNET_HashCode *key, void *value)
-{
- struct Session * cs = value;
- struct HTTP_Connection_out * con = cs->outbound_connections_head;
- struct HTTP_Connection_out * tmp_con = cs->outbound_connections_head;
- struct HTTP_Message * msg = NULL;
- struct HTTP_Message * tmp_msg = NULL;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Freeing session for peer `%s'\n",GNUNET_i2s(&cs->identity));
-
- /* freeing connections */
- while (con!=NULL)
- {
- GNUNET_free(con->url);
- if (con->put_curl_handle!=NULL)
- curl_easy_cleanup(con->put_curl_handle);
- con->put_curl_handle = NULL;
- msg = con->pending_msgs_head;
- while (msg!=NULL)
- {
- tmp_msg=msg->next;
- GNUNET_free(msg);
- msg = tmp_msg;
- }
- tmp_con=con->next;
- GNUNET_free(con);
- con=tmp_con;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"All sessions freed \n");
-
- GNUNET_free (cs);
- return GNUNET_YES;
-}
/**
* Exit point from the plugin.
struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
CURLMcode mret;
-
GNUNET_assert(cls !=NULL);
+ if (plugin->http_server_daemon_v4 != NULL)
+ {
+ MHD_stop_daemon (plugin->http_server_daemon_v4);
+ plugin->http_server_daemon_v4 = NULL;
+ }
+ if (plugin->http_server_daemon_v6 != NULL)
+ {
+ MHD_stop_daemon (plugin->http_server_daemon_v6);
+ plugin->http_server_daemon_v6 = NULL;
+ }
if ( plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK)
{
plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK;
}
- if ( plugin->http_server_task_send != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_send);
- plugin->http_server_task_send = GNUNET_SCHEDULER_NO_TASK;
- }
- if (plugin->http_server_daemon_v4 != NULL)
+ /* free all peer information */
+ if (plugin->peers!=NULL)
{
- MHD_stop_daemon (plugin->http_server_daemon_v4);
- plugin->http_server_daemon_v4 = NULL;
+ GNUNET_CONTAINER_multihashmap_iterate (plugin->peers,
+ &remove_peer_context_Iterator,
+ plugin);
+ GNUNET_CONTAINER_multihashmap_destroy (plugin->peers);
}
- if (plugin->http_server_daemon_v6 != NULL)
+ if (plugin->multi_handle!=NULL)
{
- MHD_stop_daemon (plugin->http_server_daemon_v6);
- plugin->http_server_daemon_v6 = NULL;
+ mret = curl_multi_cleanup(plugin->multi_handle);
+#if DEBUG_HTTP
+ if ( CURLM_OK != mret)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"curl multihandle clean up failed\n");
+#endif
+ plugin->multi_handle = NULL;
}
+ curl_global_cleanup();
- /* free all sessions */
- GNUNET_CONTAINER_multihashmap_iterate (plugin->sessions,
- &hashMapFreeIterator,
- NULL);
-
- GNUNET_CONTAINER_multihashmap_destroy (plugin->sessions);
-
- mret = curl_multi_cleanup(plugin->multi_handle);
- if ( CURLM_OK != mret)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"curl multihandle clean up failed");
+ if ( plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_curl_task);
+ plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_free_non_null (plugin->bind4_address);
+ GNUNET_free_non_null (plugin->bind6_address);
+ GNUNET_free_non_null(plugin->bind_hostname);
GNUNET_free (plugin);
GNUNET_free (api);
+#if DEBUG_HTTP
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Unload http plugin complete...\n");
+#endif
return NULL;
}
long long unsigned int port;
GNUNET_assert(cls !=NULL);
+#if DEBUG_HTTP
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting http plugin...\n");
+#endif
plugin = GNUNET_malloc (sizeof (struct Plugin));
+ plugin->stats = env->stats;
plugin->env = env;
- plugin->sessions = NULL;
+ plugin->peers = NULL;
+ plugin->bind4_address = NULL;
+ plugin->use_ipv6 = GNUNET_YES;
+ plugin->use_ipv4 = GNUNET_YES;
api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
api->cls = plugin;
/* Hashing our identity to use it in URLs */
GNUNET_CRYPTO_hash_to_enc ( &(plugin->env->my_identity->hashPubKey), &plugin->my_ascii_hash_ident);
+ /* Reading port number from config file */
+ if (GNUNET_CONFIGURATION_have_value (env->cfg,
+ "transport-http", "USE_IPv6"))
+ {
+ plugin->use_ipv6 = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
+ "transport-http",
+ "USE_IPv6");
+ }
+ /* Reading port number from config file */
+ if (GNUNET_CONFIGURATION_have_value (env->cfg,
+ "transport-http", "USE_IPv4"))
+ {
+ plugin->use_ipv4 = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
+ "transport-http",
+ "USE_IPv4");
+ }
/* Reading port number from config file */
if ((GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (env->cfg,
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
"http",
- _
- ("Require valid port number for transport plugin `%s' in configuration!\n"),
+ _("Require valid port number for transport plugin `%s' in configuration!\n"),
"transport-http");
libgnunet_plugin_transport_http_done (api);
return NULL;
}
+
+ /* Reading ipv4 addresse to bind to from config file */
+ if ((plugin->use_ipv4==GNUNET_YES) && (GNUNET_CONFIGURATION_have_value (env->cfg,
+ "transport-http", "BINDTO4")))
+ {
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (env->cfg,
+ "transport-http",
+ "BINDTO4",
+ &plugin->bind_hostname));
+ plugin->bind4_address = GNUNET_malloc(sizeof(struct sockaddr_in));
+ plugin->bind4_address->sin_family = AF_INET;
+ plugin->bind4_address->sin_port = htons (port);
+
+ if (inet_pton(AF_INET,plugin->bind_hostname, &plugin->bind4_address->sin_addr)<=0)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+ "http",
+ _("Misconfigured address to bind to in configuration!\n"),
+ "transport-http");
+ GNUNET_free(plugin->bind4_address);
+ GNUNET_free(plugin->bind_hostname);
+ plugin->bind_hostname = NULL;
+ plugin->bind4_address = NULL;
+ }
+ }
+
+ /* Reading ipv4 addresse to bind to from config file */
+ 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,
+ "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)
+ {
+ 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;
+ }
+ }
+
GNUNET_assert ((port > 0) && (port <= 65535));
plugin->port_inbound = port;
gn_timeout = GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT;
- if ((plugin->http_server_daemon_v4 == NULL) && (plugin->http_server_daemon_v6 == NULL) && (port != 0))
- {
- plugin->http_server_daemon_v6 = MHD_start_daemon (MHD_USE_IPv6,
+ unsigned int timeout = (gn_timeout.value) / 1000;
+ if ((plugin->http_server_daemon_v6 == NULL) && (plugin->use_ipv6 == GNUNET_YES) && (port != 0))
+ {
+ struct sockaddr * tmp = (struct sockaddr *) plugin->bind6_address;
+ plugin->http_server_daemon_v6 = MHD_start_daemon (
+#if DEBUG_CONNECTIONS
+ MHD_USE_DEBUG |
+#endif
+ MHD_USE_IPv6,
port,
- &acceptPolicyCallback,
- plugin , &accessHandlerCallback, plugin,
- MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 16,
- MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 1,
- MHD_OPTION_CONNECTION_TIMEOUT, (gn_timeout.value / 1000),
+ &mhd_accept_cb,
+ plugin , &mdh_access_cb, plugin,
+ MHD_OPTION_SOCK_ADDR, tmp,
+ MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 32,
+ MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 6,
+ MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) timeout,
MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (16 * 1024),
- MHD_OPTION_NOTIFY_COMPLETED, &requestCompletedCallback, NULL,
+ MHD_OPTION_NOTIFY_COMPLETED, &mhd_termination_cb, NULL,
MHD_OPTION_END);
- plugin->http_server_daemon_v4 = MHD_start_daemon (MHD_NO_FLAG,
+ }
+ 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
+ MHD_USE_DEBUG |
+#endif
+ MHD_NO_FLAG,
port,
- &acceptPolicyCallback,
- plugin , &accessHandlerCallback, plugin,
- MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 16,
- MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 1,
- MHD_OPTION_CONNECTION_TIMEOUT, (gn_timeout.value / 1000),
+ &mhd_accept_cb,
+ plugin , &mdh_access_cb, plugin,
+ MHD_OPTION_SOCK_ADDR, (struct sockaddr_in *)plugin->bind4_address,
+ MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 32,
+ MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 6,
+ MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) timeout,
MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (16 * 1024),
- MHD_OPTION_NOTIFY_COMPLETED, &requestCompletedCallback, NULL,
+ MHD_OPTION_NOTIFY_COMPLETED, &mhd_termination_cb, NULL,
MHD_OPTION_END);
- }
+ }
if (plugin->http_server_daemon_v4 != NULL)
plugin->http_server_task_v4 = http_server_daemon_prepare (plugin, plugin->http_server_daemon_v4);
if (plugin->http_server_daemon_v6 != NULL)
plugin->http_server_task_v6 = http_server_daemon_prepare (plugin, plugin->http_server_daemon_v6);
+
if (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv4 on port %u\n",port);
- else if (plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv4 and IPv6 on port %u\n",port);
+ {
+#if DEBUG_HTTP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv4 bound to %s with port %u\n",(plugin->bind_hostname!=NULL) ? plugin->bind_hostname : "every address",port);
+#endif
+ }
+ else if ((plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) && (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK))
+ {
+#if DEBUG_HTTP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv6 bound to %s with port %u\n",(plugin->bind_hostname!=NULL) ? plugin->bind_hostname : "every address", port);
+#endif
+ }
+ else if ((plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) && (plugin->http_server_task_v4 == GNUNET_SCHEDULER_NO_TASK))
+ {
+#if DEBUG_HTTP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv4 and IPv6 bound to %s with port %u\n",(plugin->bind_hostname!=NULL) ? plugin->bind_hostname : "every address", port);
+#endif
+ }
else
{
+#if DEBUG_HTTP
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No MHD was started, transport plugin not functional!\n");
+#endif
libgnunet_plugin_transport_http_done (api);
return NULL;
}
if ( NULL == plugin->multi_handle )
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "http",
- _("Could not initialize curl multi handle, failed to start http plugin!\n"),
- "transport-http");
+ "http",
+ _("Could not initialize curl multi handle, failed to start http plugin!\n"),
+ "transport-http");
libgnunet_plugin_transport_http_done (api);
return NULL;
}
- plugin->sessions = GNUNET_CONTAINER_multihashmap_create (10);
+ plugin->peers = GNUNET_CONTAINER_multihashmap_create (10);
GNUNET_OS_network_interfaces_list (&process_interfaces, plugin);
return api;
projects / oweals / gnunet.git / blobdiff