aboutsummaryrefslogtreecommitdiff
path: root/src/transport/plugin_transport_http_client.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2012-09-17 15:21:07 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2012-09-17 15:21:07 +0000
commitc74a75ecca434556774637cc72286bc4affa07b9 (patch)
treee8c4707f4f7be6740fd04a9b99c71a8e268abca4 /src/transport/plugin_transport_http_client.c
parent0023bacc0565ad444e8facefd1db9b622a8e07d4 (diff)
downloadgnunet-c74a75ecca434556774637cc72286bc4affa07b9.tar.gz
gnunet-c74a75ecca434556774637cc72286bc4affa07b9.zip
- work in progress
Diffstat (limited to 'src/transport/plugin_transport_http_client.c')
-rw-r--r--src/transport/plugin_transport_http_client.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index db1250236..7d3c8f9ea 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -34,7 +34,7 @@
34 34
35#define VERBOSE_CURL GNUNET_YES 35#define VERBOSE_CURL GNUNET_YES
36 36
37#define PUT_DISCONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) 37#define PUT_DISCONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2)
38 38
39#define ENABLE_PUT GNUNET_YES 39#define ENABLE_PUT GNUNET_YES
40#define ENABLE_GET GNUNET_YES 40#define ENABLE_GET GNUNET_YES
@@ -785,7 +785,7 @@ client_wake_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
785 785
786 786
787/** 787/**
788 * Callback for message stream tokenixer 788 * Callback for message stream tokenizer
789 * 789 *
790 * @param cls the session 790 * @param cls the session
791 * @param client not used 791 * @param client not used
@@ -800,15 +800,14 @@ client_receive_mst_cb (void *cls, void *client,
800 struct HTTP_Client_Plugin *plugin; 800 struct HTTP_Client_Plugin *plugin;
801 struct GNUNET_TIME_Relative delay; 801 struct GNUNET_TIME_Relative delay;
802 struct GNUNET_ATS_Information atsi[2]; 802 struct GNUNET_ATS_Information atsi[2];
803 803 //GNUNET_break (0);
804 if (GNUNET_YES != client_exist_session(p, s)) 804 if (GNUNET_YES != client_exist_session(p, s))
805 { 805 {
806 GNUNET_break (0); 806 GNUNET_break (0);
807 return GNUNET_OK; 807 return GNUNET_OK;
808 } 808 }
809 plugin = s->plugin; 809 plugin = s->plugin;
810 810 //GNUNET_break (0);
811
812 atsi[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE); 811 atsi[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
813 atsi[0].value = htonl (1); 812 atsi[0].value = htonl (1);
814 atsi[1].type = htonl (GNUNET_ATS_NETWORK_TYPE); 813 atsi[1].type = htonl (GNUNET_ATS_NETWORK_TYPE);
@@ -876,7 +875,10 @@ client_receive (void *stream, size_t size, size_t nmemb, void *cls)
876 } 875 }
877 if (NULL == s->msg_tk) 876 if (NULL == s->msg_tk)
878 s->msg_tk = GNUNET_SERVER_mst_create (&client_receive_mst_cb, s); 877 s->msg_tk = GNUNET_SERVER_mst_create (&client_receive_mst_cb, s);
879 GNUNET_SERVER_mst_receive (s->msg_tk, s, stream, len, GNUNET_NO, GNUNET_NO); 878 //GNUNET_break (0);
879 int res = GNUNET_SERVER_mst_receive (s->msg_tk, s, stream, len, GNUNET_NO, GNUNET_NO);
880 //GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MST RESULT : %u \n" , res);
881 //GNUNET_break (0);
880 return len; 882 return len;
881 883
882} 884}
@@ -1027,7 +1029,7 @@ client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
1027 if (s->client_get == NULL) 1029 if (s->client_get == NULL)
1028 { 1030 {
1029 /* Disconnect other transmission direction and tell transport */ 1031 /* Disconnect other transmission direction and tell transport */
1030 client_disconnect (s); 1032 //client_disconnect (s);
1031 } 1033 }
1032 } 1034 }
1033 if (easy_h == s->client_get) 1035 if (easy_h == s->client_get)