* amount of data to sent
*/
size_t len;
+
+ char * dest_url;
};
/**
* Sender's ip address to distinguish between incoming connections
*/
- struct sockaddr_in * addr;
+ struct sockaddr_in * addr_inbound;
+
+ /**
+ * Sender's ip address recieved by transport
+ */
+ struct sockaddr_in * addr_outbound;
/**
* Did we initiate the connection (GNUNET_YES) or the other peer (GNUNET_NO)?
/**
* Create a new session
*
- * @param address address the peer is using
+ * @param address address the peer is using inbound
+ * @param address address the peer is using outbound
* @param peer identity
* @return created session object
*/
-static struct Session * create_session (struct sockaddr_in *address, const struct GNUNET_PeerIdentity *peer)
+static struct Session * create_session (struct sockaddr_in *addr_in, struct sockaddr_in *addr_out, const struct GNUNET_PeerIdentity *peer)
{
struct sockaddr_in *addrin;
struct sockaddr_in6 *addrin6;
-
struct Session * ses = GNUNET_malloc ( sizeof( struct Session) );
- ses->addr = GNUNET_malloc ( sizeof (struct sockaddr_in) );
+
+ ses->addr_outbound = GNUNET_malloc ( sizeof (struct sockaddr_in) );
+
ses->next = NULL;
ses->plugin = plugin;
-
- memcpy(ses->addr, address, sizeof (struct sockaddr_in));
- if ( AF_INET == address->sin_family)
+ if (NULL != addr_in)
{
- ses->ip = GNUNET_malloc (INET_ADDRSTRLEN);
- addrin = address;
- inet_ntop(addrin->sin_family,&(addrin->sin_addr),ses->ip,INET_ADDRSTRLEN);
+ ses->addr_inbound = GNUNET_malloc ( sizeof (struct sockaddr_in) );
+ memcpy(ses->addr_inbound, addr_in, sizeof (struct sockaddr_in));
+ if ( AF_INET == addr_in->sin_family)
+ {
+ ses->ip = GNUNET_malloc (INET_ADDRSTRLEN);
+ addrin = addr_in;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Port %u \n", addrin->sin_port);
+ inet_ntop(addrin->sin_family,&(addrin->sin_addr),ses->ip,INET_ADDRSTRLEN);
+ }
+ if ( AF_INET6 == addr_in->sin_family)
+ {
+ ses->ip = GNUNET_malloc (INET6_ADDRSTRLEN);
+ addrin6 = (struct sockaddr_in6 *) addr_in;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Port %u \n", addrin6->sin6_port);
+ inet_ntop(addrin6->sin6_family, &(addrin6->sin6_addr) ,ses->ip,INET6_ADDRSTRLEN);
+ }
}
- if ( AF_INET6 == address->sin_family)
+ else
+ ses->addr_inbound = NULL;
+
+ if (NULL != addr_out)
{
- ses->ip = GNUNET_malloc (INET6_ADDRSTRLEN);
- addrin6 = (struct sockaddr_in6 *) address;
- inet_ntop(addrin6->sin6_family, &(addrin6->sin6_addr) ,ses->ip,INET6_ADDRSTRLEN);
+ ses->addr_outbound = GNUNET_malloc ( sizeof (struct sockaddr_in) );
+ memcpy(ses->addr_outbound, addr_out, sizeof (struct sockaddr_in));
}
+ else
+ ses->addr_outbound = NULL;
+
memcpy(&ses->sender, peer, sizeof (struct GNUNET_PeerIdentity));
GNUNET_CRYPTO_hash_to_enc(&ses->sender.hashPubKey,&(ses->hash));
ses->is_active = GNUNET_NO;
if (cs == NULL )
{
/* create new session object */
- cs = create_session(conn_info->client_addr, &pi_in);
+ cs = create_session(conn_info->client_addr, NULL, &pi_in);
/* Insert session into linked list */
if ( plugin->sessions == NULL)
{
*httpSessionCache = cs;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"HTTP Daemon has new an incoming `%s' request from peer `%s' (`[%s]:%u')\n",method, GNUNET_i2s(&cs->sender),cs->ip,cs->addr->sin_port);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"HTTP Daemon has new an incoming `%s' request from peer `%s' (`[%s]:%u')\n",method, GNUNET_i2s(&cs->sender),cs->ip,cs->addr_inbound->sin_port);
}
else
{
}
+static size_t header_function( void *ptr, size_t size, size_t nmemb, void *stream)
+{
+ char * tmp;
+ unsigned int len = size * nmemb;
+
+ tmp = GNUNET_malloc ( len+1 );
+ memcpy(tmp,ptr,len);
+ if (tmp[len-2] == 13)
+ tmp[len-2]= '\0';
+#if DEBUG_CURL
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Header: `%s'\n",tmp);
+#endif
+ /*
+ if (0==strcmp (tmp,"HTTP/1.1 100 Continue"))
+ {
+ res->http_result_code=100;
+ }
+ if (0==strcmp (tmp,"HTTP/1.1 200 OK"))
+ {
+ res->http_result_code=200;
+ }
+ if (0==strcmp (tmp,"HTTP/1.1 400 Bad Request"))
+ {
+ res->http_result_code=400;
+ }
+ if (0==strcmp (tmp,"HTTP/1.1 404 Not Found"))
+ {
+ res->http_result_code=404;
+ }
+ if (0==strcmp (tmp,"HTTP/1.1 413 Request entity too large"))
+ {
+ res->http_result_code=413;
+ }
+ */
+ GNUNET_free (tmp);
+ return size * nmemb;
+}
+
/**
* Callback method used with libcurl
* Method is called when libcurl needs to read data during sending
* @param ses session to send data to
* @return bytes sent to peer
*/
-static ssize_t send_select_init (struct Session* ses )
+static ssize_t send_select_init (struct Session* ses )
{
char * url;
int bytes_sent = 0;
CURLMcode mret;
struct HTTP_Message * msg;
- /* FIFO selection, send oldest msg first, perhaps priority here? */
+ if ( NULL == ses->curl_handle)
+ ses->curl_handle = curl_easy_init();
+ if( NULL == ses->curl_handle)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Getting cURL handle failed\n");
+ return -1;
+ }
msg = ses->pending_outbound_msg;
url = GNUNET_malloc( 7 + strlen(ses->ip) + 7 + strlen ((char *) &(ses->hash)) + 1);
/* FIXME: use correct port number */
GNUNET_asprintf(&url,"http://%s:%u/%s",ses->ip,12389, (char *) &(ses->hash));
+
+
#if DEBUG_CURL
curl_easy_setopt(ses->curl_handle, CURLOPT_VERBOSE, 1L);
#endif
curl_easy_setopt(ses->curl_handle, CURLOPT_URL, url);
curl_easy_setopt(ses->curl_handle, CURLOPT_PUT, 1L);
+ curl_easy_setopt(ses->curl_handle, CURLOPT_HEADERFUNCTION, &header_function);
curl_easy_setopt(ses->curl_handle, CURLOPT_READFUNCTION, send_read_callback);
curl_easy_setopt(ses->curl_handle, CURLOPT_READDATA, ses);
curl_easy_setopt(ses->curl_handle, CURLOPT_WRITEFUNCTION, send_write_callback);
if (msg == NULL)
break;
/* get session for affected curl handle */
+ GNUNET_assert ( msg->easy_handle != NULL );
cs = find_session_by_curlhandle (msg->easy_handle);
GNUNET_assert ( cs != NULL );
switch (msg->msg)
curl_easy_strerror (msg->data.result));
/* sending msg failed*/
if ( NULL != cs->transmit_cont)
- cs->transmit_cont (NULL,&cs->sender,GNUNET_SYSERR);
+ cs->transmit_cont (cs->transmit_cont_cls,&cs->sender,GNUNET_SYSERR);
}
else
- {
+ {
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Send to %s completed.\n", cs->ip);
if (GNUNET_OK != remove_http_message(cs, cs->pending_outbound_msg))
curl_easy_cleanup(cs->curl_handle);
cs->curl_handle=NULL;
- /* send pending messages */
- if (cs->pending_outbound_msg != NULL)
- send_select_init (cs);
-
/* Calling transmit continuation */
if ( NULL != cs->transmit_cont)
cs->transmit_cont (NULL,&cs->sender,GNUNET_OK);
+
+
+ /* send pending messages */
+ if (cs->pending_outbound_msg != NULL)
+ {
+ send_select_init (cs);
}
+ }
return;
default:
break;
GNUNET_TRANSPORT_TransmitContinuation cont,
void *cont_cls)
{
+ char address[INET6_ADDRSTRLEN];
struct Session* ses;
struct Session* ses_temp;
struct HTTP_Message * msg;
struct HTTP_Message * tmp;
int bytes_sent = 0;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Transport told plugin to send to peer `%s'\n",GNUNET_i2s(target));
-
/* find session for peer */
ses = find_session_by_pi (target);
if (NULL != ses )
/* create new session object */
/*FIXME: what is const void * really? Assuming struct sockaddr_in * ! */
- ses = create_session((struct sockaddr_in *) addr, target);
+ ses = create_session(NULL, (struct sockaddr_in *) addr, target);
ses->is_active = GNUNET_YES;
ses->transmit_cont = cont;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"New Session `%s' inserted, count %u \n", GNUNET_i2s(target), plugin->session_count);
}
- ses->curl_handle = curl_easy_init();
- if( NULL == ses->curl_handle)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Getting cURL handle failed\n");
- return -1;
- }
+ GNUNET_assert (addr!=NULL);
+ unsigned int port;
+ if (addrlen == (sizeof (struct IPv4HttpAddress)))
+ {
+ inet_ntop(AF_INET, (struct in_addr *) addr,address,INET_ADDRSTRLEN);
+ port = ((struct IPv4HttpAddress *) addr)->u_port;
+ //port = ntohs(((struct in_addr *) addr)->);
+ }
+ else if (addrlen == (sizeof (struct IPv6HttpAddress)))
+ {
+ inet_ntop(AF_INET6, (struct in6_addr *) addr,address,INET6_ADDRSTRLEN);
+ port = ntohs(((struct IPv6HttpAddress *) addr)->u6_port);
+ }
+ else
+ {
+ GNUNET_break (0);
+ return -1;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"ADDR `%s':%u \n",address,port);
- if ( NULL != cont)
- ses->transmit_cont = cont;
+ ses->transmit_cont = cont;
+ ses->transmit_cont_cls = cont_cls;
timeout = to;
/* setting up message */
msg = GNUNET_malloc (sizeof (struct HTTP_Message));
memcpy (msg->buf,msgbuf, msgbuf_size);
/* insert created message in list of pending messages */
-
if (ses->pending_outbound_msg == NULL)
{
ses->pending_outbound_msg = msg;
tmp = tmp->next;
}
if ( tmp != msg)
+ {
tmp->next = msg;
+ }
- bytes_sent = send_select_init (ses);
- return bytes_sent;
-
+ if (msg == ses->pending_outbound_msg)
+ {
+ bytes_sent = send_select_init (ses);
+ return bytes_sent;
+ }
+ return msgbuf_size;
}
GNUNET_free (cs->pending_inbound_msg->buf);
GNUNET_free (cs->pending_inbound_msg);
GNUNET_free (cs->ip);
- GNUNET_free (cs->addr);
+ GNUNET_free (cs->addr_inbound);
+ GNUNET_free_non_null (cs->addr_outbound);
GNUNET_free (cs);
plugin->session_count--;
cs = cs_next;
static void
shutdown_clean ()
{
+ struct Plugin_Address * cur;
+ struct Plugin_Address * tmp;
/* Evaluate results */
if ((fail_notify_address == GNUNET_NO) && (fail_pretty_printer == GNUNET_NO) && (fail_addr_to_str == GNUNET_NO) &&
if (NULL != curl_handle)
curl_easy_cleanup (curl_handle);
+ /* cleaning addresses */
+ while (addr_head != NULL)
+ {
+ cur = addr_head;
+ tmp = addr_head->next;
+ GNUNET_free (addr_head->addr);
+ GNUNET_free (addr_head);
+ addr_head=tmp;
+ }
if (ti_send != GNUNET_SCHEDULER_NO_TASK)
{
* @target target
* @result GNUNET_OK or GNUNET_SYSERR
*/
+
static void task_send_cont (void *cls,
const struct GNUNET_PeerIdentity * target,
int result)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message was sent!\n");
fail = GNUNET_NO;
- shutdown_clean();
+ //shutdown_clean();
}
#if 0
return;
}
+ /* Using one of the addresses the plugin proposed */
+ GNUNET_assert (addr_head->addr != NULL);
-
+ struct Plugin_Address * tmp_addr;
struct GNUNET_MessageHeader msg;
char * tmp = GNUNET_malloc(sizeof(struct GNUNET_MessageHeader));
msg.size=htons(sizeof(struct GNUNET_MessageHeader));
msg.type=htons(13);
memcpy(tmp,&msg,sizeof(struct GNUNET_MessageHeader));
- api->send(api->cls, &my_identity, tmp, sizeof(struct GNUNET_MessageHeader), 0, TIMEOUT, NULL,NULL, 0, GNUNET_NO, &task_send_cont, NULL);
+ tmp_addr = addr_head;
+ /* send a message to all addresses advertised by plugin */
+ int count = 0;
- /*
- msg.size=htons(2);
- msg.type=htons(13);
- memcpy(tmp,&msg,sizeof(struct GNUNET_MessageHeader));
+ while (tmp_addr != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Sending message to addres no. %u\n", count);
+ api->send(api->cls, &my_identity, tmp, sizeof(struct GNUNET_MessageHeader), 0, TIMEOUT, NULL,tmp_addr->addr, tmp_addr->addrlen, GNUNET_YES, &task_send_cont, NULL);
+ tmp_addr = tmp_addr->next;
+ count ++;
+ }
- api->send(api->cls, &my_identity, tmp, sizeof(struct GNUNET_MessageHeader), 0, TIMEOUT, NULL,NULL, 0, GNUNET_NO, &task_send_cont, NULL);
- */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No more tests to run\n");
}
char *keyfile;
unsigned long long tneigh;
struct Plugin_Address * cur;
- struct Plugin_Address * tmp;
const char * addr_str;
unsigned int count_str_addr;
GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Transport plugin returned %u addresses to connect to\n"), fail_notify_address_count);
/* testing pretty printer with all addresses obtained from the plugin*/
- while (addr_head != NULL)
+ cur = addr_head;
+ while (cur != NULL)
{
- cur = addr_head;
api->address_pretty_printer (NULL,"http",cur->addr,cur->addrlen,GNUNET_NO,TEST_TIMEOUT,&pretty_printer_cb,NULL);
addr_str = api->address_to_string (NULL,cur->addr,cur->addrlen);
GNUNET_assert (NULL != addr_str);
count_str_addr++;
- tmp = addr_head->next;
- GNUNET_free (addr_head->addr);
- GNUNET_free (addr_head);
- GNUNET_free ((char *) addr_str);
- addr_head=tmp;
+ cur = cur->next;
}
projects / oweals / gnunet.git / commitdiff