[GNUnet-SVN] r30005 - libmicrohttpd/src/examples

[gnunet]

Author: andreyu
Date: 2013-10-08 20:05:13 +0200 (Tue, 08 Oct 2013)
New Revision: 30005

Modified:
   libmicrohttpd/src/examples/mhd2spdy_http.c
   libmicrohttpd/src/examples/mhd2spdy_spdy.c
   libmicrohttpd/src/examples/mhd2spdy_structures.h
Log:
mhd2spdy: dont send duplicate RST_STREAMs

Modified: libmicrohttpd/src/examples/mhd2spdy_http.c
===================================================================
--- libmicrohttpd/src/examples/mhd2spdy_http.c  2013-10-08 18:03:11 UTC (rev 
30004)
+++ libmicrohttpd/src/examples/mhd2spdy_http.c  2013-10-08 18:05:13 UTC (rev 
30005)
@@ -148,7 +148,8 @@
 static void
 http_cb_response_done(void *cls)
 {
-
+  (void)cls;
+  //TODO remove
 }
 
 int
@@ -370,6 +371,8 @@
                                    void **con_cls,
                                    enum MHD_RequestTerminationCode toe)
 {
+  (void)cls;
+  (void)connection;
   struct HTTP_URI *http_uri;
   struct Proxy *proxy;
   
@@ -396,7 +399,7 @@
       if(proxy->stream_id > 0 /*&& NULL != proxy->spdy_connection->session*/)
       {
         //send RST_STREAM_STATUS_CANCEL
-        PRINT_INFO2("send rst_stream %i",proxy->spdy_active );
+        PRINT_INFO2("send rst_stream %i %i",proxy->spdy_active, 
proxy->stream_id );
         spdylay_submit_rst_stream(proxy->spdy_connection->session, 
proxy->stream_id, 5);
       }
       /*else

Modified: libmicrohttpd/src/examples/mhd2spdy_spdy.c
===================================================================
--- libmicrohttpd/src/examples/mhd2spdy_spdy.c  2013-10-08 18:03:11 UTC (rev 
30004)
+++ libmicrohttpd/src/examples/mhd2spdy_spdy.c  2013-10-08 18:05:13 UTC (rev 
30005)
@@ -147,6 +147,20 @@
   ssize_t rv;
   connection = (struct SPDY_Connection*)user_data;
   connection->want_io = IO_NONE;
+  
+  if(glob_opt.ignore_rst_stream
+    && 16 == length
+    && 0x80 == data[0]
+    && 0x00 == data[2]
+    && 0x03 == data[3]
+    )
+  {
+    PRINT_INFO2("ignoring RST_STREAM for stream_id %i %i %i %i", data[8], 
data[9], data[10], data[11]);
+    glob_opt.ignore_rst_stream = false;
+    return 16;
+  }
+  glob_opt.ignore_rst_stream = false;
+  
   if(connection->is_tls)
   {
     ERR_clear_error();
@@ -269,7 +283,7 @@
 
 
 static void
-spdy_cb_on_ctrl_send(spdylay_session *session,
+spdy_cb_before_ctrl_send(spdylay_session *session,
                     spdylay_frame_type type,
                     spdylay_frame *frame,
                     void *user_data)
@@ -288,6 +302,15 @@
       ++proxy->spdy_connection->streams_opened;
       PRINT_INFO2("opening stream: str open %i; %s", glob_opt.streams_opened, 
proxy->url);
       break;
+    case SPDYLAY_RST_STREAM:
+      //try to ignore duplicate RST_STREAMs
+      //TODO this will ignore RST_STREAMs also for bogus data
+      glob_opt.ignore_rst_stream = 
NULL==spdylay_session_get_stream_user_data(session, 
frame->rst_stream.stream_id);
+      PRINT_INFO2("sending RST_STREAM for %i; ignore %i; status %i",
+        frame->rst_stream.stream_id,
+        glob_opt.ignore_rst_stream,
+        frame->rst_stream.status_code);
+    break;
     default:
       break;
   }
@@ -465,7 +488,7 @@
   memset(callbacks, 0, sizeof(spdylay_session_callbacks));
   callbacks->send_callback = spdy_cb_send;
   callbacks->recv_callback = spdy_cb_recv;
-  callbacks->on_ctrl_send_callback = spdy_cb_on_ctrl_send;
+  callbacks->before_ctrl_send_callback = spdy_cb_before_ctrl_send;
   callbacks->on_ctrl_recv_callback = spdy_cb_on_ctrl_recv;
   callbacks->on_stream_close_callback = spdy_cb_on_stream_close;
   callbacks->on_data_chunk_recv_callback = spdy_cb_on_data_chunk_recv;

Modified: libmicrohttpd/src/examples/mhd2spdy_structures.h
===================================================================
--- libmicrohttpd/src/examples/mhd2spdy_structures.h    2013-10-08 18:03:11 UTC 
(rev 30004)
+++ libmicrohttpd/src/examples/mhd2spdy_structures.h    2013-10-08 18:05:13 UTC 
(rev 30005)
@@ -161,6 +161,7 @@
   bool only_proxy;
   bool spdy_data_received;
   bool statistics;
+  bool ignore_rst_stream;
 }
 glob_opt;