spdy: simple POST support implemented; API changes; fixed warnings in spdy tests

7 files changed, 131 insertions, 16 deletions

diff --git a/src/microspdy/applicationlayer.c b/src/microspdy/applicationlayer.c
index efcf2b3d..17a00289 100644
--- a/src/microspdy/applicationlayer.c
+++ b/src/microspdy/applicationlayer.c
@@ -157,7 +157,7 @@ spdy_handler_new_stream (void *cls,
         }
   
   //ignore everything but GET
-  if(strcasecmp("GET",method))
+  if(strcasecmp("GET",method) && strcasecmp("POST",method))
   {
     SPDYF_DEBUG("received method '%s'", method);
     static char * html = "Method not implemented. libmicrospdy supports now only GET.";
@@ -187,7 +187,10 @@ spdy_handler_new_stream (void *cls,
                         version,
                         host,
                         scheme,
-                                                headers);
+                                                headers,
+            !stream->is_in_closed);
+            
+  stream->cls = request;
 
         return SPDY_YES;
 
@@ -200,6 +203,21 @@ spdy_handler_new_stream (void *cls,
 
 
 /**
+ * TODO
+ */
+static int
+spdy_handler_new_data (void * cls,
+                                         struct SPDYF_Stream *stream,
+                                         const void * buf,
+                                         size_t size,
+                                         bool more)
+{
+  return stream->session->daemon->received_data_cb(cls, stream->cls, buf, size, more);
+}
+
+
+
+/**
  * Callback to be called when the response queue object was handled and 
  * the data was already sent or discarded. 
  *
@@ -332,7 +350,7 @@ SPDY_start_daemon (uint16_t port,
                      SPDY_NewSessionCallback nscb,
                      SPDY_SessionClosedCallback sccb,
                      SPDY_NewRequestCallback nrcb,
-                     SPDY_NewPOSTDataCallback npdcb,
+                     SPDY_NewDataCallback npdcb,
                      void * cls,
                      ...)
 {
@@ -367,6 +385,7 @@ SPDY_start_daemon (uint16_t port,
                       nrcb,
                       npdcb,
                       &spdy_handler_new_stream,
+                      &spdy_handler_new_data,
                       cls,
                       NULL,
                       valist
diff --git a/src/microspdy/daemon.c b/src/microspdy/daemon.c
index a8bea83b..77129894 100644
--- a/src/microspdy/daemon.c
+++ b/src/microspdy/daemon.c
@@ -173,8 +173,9 @@ SPDYF_start_daemon_va (uint16_t port,
                                         SPDY_NewSessionCallback nscb,
                                         SPDY_SessionClosedCallback sccb,
                                         SPDY_NewRequestCallback nrcb,
-                                        SPDY_NewPOSTDataCallback npdcb,
+                                        SPDY_NewDataCallback npdcb,
                                         SPDYF_NewStreamCallback fnscb,
+                                        SPDYF_NewDataCallback fndcb,
                                         void * cls,
                                         void * fcls,
                                         va_list valist)
@@ -237,10 +238,11 @@ SPDYF_start_daemon_va (uint16_t port,
         daemon->new_session_cb = nscb;
         daemon->session_closed_cb = sccb;
         daemon->new_request_cb = nrcb;
-        daemon->new_post_data_cb = npdcb;
+        daemon->received_data_cb = npdcb;
         daemon->cls = cls;
         daemon->fcls = fcls;
         daemon->fnew_stream_cb = fnscb;
+        daemon->freceived_data_cb = fndcb;
 
 #if HAVE_INET6
         //handling IPv6
diff --git a/src/microspdy/daemon.h b/src/microspdy/daemon.h
index 03e322b5..0dbc5ab1 100644
--- a/src/microspdy/daemon.h
+++ b/src/microspdy/daemon.h
@@ -62,8 +62,9 @@ SPDYF_start_daemon_va (uint16_t port,
                                         SPDY_NewSessionCallback nscb,
                                         SPDY_SessionClosedCallback sccb,
                                         SPDY_NewRequestCallback nrcb,
-                                        SPDY_NewPOSTDataCallback npdcb,
+                                        SPDY_NewDataCallback npdcb,
                                         SPDYF_NewStreamCallback fnscb,
+                                        SPDYF_NewDataCallback fndcb,
                                         void * cls,
                                         void * fcls,
                                         va_list valist);
diff --git a/src/microspdy/session.c b/src/microspdy/session.c
index 856bed85..7edebaba 100644
--- a/src/microspdy/session.c
+++ b/src/microspdy/session.c
@@ -325,14 +325,15 @@ spdyf_handler_read_rst_stream (struct SPDY_Session *session)
 static void
 spdyf_handler_read_data (struct SPDY_Session *session)
 {
-  //just ignore the whole frame for now
+  int ret;
   struct SPDYF_Data_Frame * frame;
+  struct SPDYF_Stream * stream;
   
         SPDYF_ASSERT(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status
                 || SPDY_SESSION_STATUS_WAIT_FOR_BODY == session->status,
                 "the function is called wrong");
     
-  SPDYF_DEBUG("DATA frame received (POST?). Ignoring");
+  //SPDYF_DEBUG("DATA frame received (POST?). Ignoring");
         
   //SPDYF_SIGINT("");
   
@@ -355,9 +356,41 @@ spdyf_handler_read_data (struct SPDY_Session *session)
         if(session->read_buffer_offset - session->read_buffer_beginning
                 >= frame->length)
         {
-                session->read_buffer_beginning += frame->length;
-                session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER;
-                free(frame);
+    stream = SPDYF_stream_find(frame->stream_id, session);
+    
+    if(NULL == stream || stream->is_in_closed || NULL == session->daemon->received_data_cb)
+    {
+      if(NULL == session->daemon->received_data_cb)
+      SPDYF_DEBUG("No callback for DATA frame set");
+      
+      SPDYF_DEBUG("Ignoring DATA frame!");
+      
+      //TODO send error?
+      
+      //TODO for now ignore frame
+      session->read_buffer_beginning += frame->length;
+      session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER;
+      free(frame);
+      return;
+    }
+    
+    ret = session->daemon->freceived_data_cb(session->daemon->cls,
+                                      stream,
+                                      session->read_buffer + session->read_buffer_beginning,
+                                      frame->length,
+                                      0 == (SPDY_DATA_FLAG_FIN & frame->flags));
+        
+    session->read_buffer_beginning += frame->length;   
+         
+    //TODO close in and send rst maybe
+    SPDYF_ASSERT(SPDY_YES == ret, "Cancel POST data is not yet implemented");
+    
+    if(SPDY_DATA_FLAG_FIN & frame->flags)
+    {
+      stream->is_in_closed = true;
+    }
+    session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER;
+    free(frame);
         }
 }
 
@@ -1020,7 +1053,7 @@ SPDYF_session_write (struct SPDY_Session *session, bool only_one_frame)
                         }
                         
                         //set stream to closed if the frame's fin flag is set
-                        SPDYF_stream_set_flags(queue_head);
+                        SPDYF_stream_set_flags_on_write(queue_head);
                         
                         if(NULL != queue_head->frqcb)
                         {
diff --git a/src/microspdy/stream.c b/src/microspdy/stream.c
index 97fdd6c8..336672ac 100644
--- a/src/microspdy/stream.c
+++ b/src/microspdy/stream.c
@@ -122,7 +122,7 @@ SPDYF_stream_destroy(struct SPDYF_Stream *stream)
 
 
 void
-SPDYF_stream_set_flags(struct SPDYF_Response_Queue *response_queue)
+SPDYF_stream_set_flags_on_write(struct SPDYF_Response_Queue *response_queue)
 {
         struct SPDYF_Stream * stream = response_queue->stream;
         
@@ -149,3 +149,20 @@ SPDYF_stream_set_flags(struct SPDYF_Response_Queue *response_queue)
                 }
         }
 }
+
+
+//TODO add function *on_read
+
+
+struct SPDYF_Stream * 
+SPDYF_stream_find(uint32_t stream_id, struct SPDY_Session * session)
+{
+  struct SPDYF_Stream * stream = session->streams_head;
+  
+  while(NULL != stream && stream_id != stream->stream_id)
+  {
+    stream = stream->next;
+  }
+  
+  return stream;
+}
diff --git a/src/microspdy/stream.h b/src/microspdy/stream.h
index a795ad28..de51077a 100644
--- a/src/microspdy/stream.h
+++ b/src/microspdy/stream.h
@@ -60,6 +60,17 @@ SPDYF_stream_destroy(struct SPDYF_Stream *stream);
  * @param response_queue sent for this stream
  */
 void
-SPDYF_stream_set_flags(struct SPDYF_Response_Queue *response_queue);
+SPDYF_stream_set_flags_on_write(struct SPDYF_Response_Queue *response_queue);
+
+
+/**
+ * Find and return a session's stream, based on stream's ID.
+ *
+ * @param stream_id to search for
+ * @param session whose streams are considered
+ * @return SPDY_Stream with the desired ID. Can be NULL.
+ */
+struct SPDYF_Stream * 
+SPDYF_stream_find(uint32_t stream_id, struct SPDY_Session * session);
 
 #endif
diff --git a/src/microspdy/structures.h b/src/microspdy/structures.h
index ff4c47ff..1c2a0aaf 100644
--- a/src/microspdy/structures.h
+++ b/src/microspdy/structures.h
@@ -317,6 +317,28 @@ struct SPDYF_Stream;
 
 struct SPDYF_Response_Queue;
 
+
+/**
+ * Callback for received new data chunk.
+ *
+ * @param cls client-defined closure
+ * @param stream handler
+ * @param buf data chunk from the data
+ * @param size the size of the data chunk 'buf' in bytes
+ * @param more false if this is the last frame received on this stream. Note:
+ *             true does not mean that more data will come, exceptional
+ *             situation is possible
+ * @return SPDY_YES to continue calling the function,
+ *         SPDY_NO to stop calling the function for this stream
+ */
+typedef int
+(*SPDYF_NewDataCallback) (void * cls,
+                                         struct SPDYF_Stream *stream,
+                                         const void * buf,
+                                         size_t size,
+                                         bool more);
+           
+           
 /**
  * Callback for new stream. To be used in the application layer of the
  * lib.
@@ -515,6 +537,11 @@ struct SPDYF_Stream
          * Name value pairs, sent within the frame which created the stream.
          */
         struct SPDY_NameValue *headers;
+        
+        /**
+         * Any object to be used by the application layer.
+         */
+        void *cls;
   
         /**
          * This stream's ID.
@@ -888,9 +915,14 @@ struct SPDY_Daemon
 
         /**
         * Callback called when HTTP POST params are received
-        * after request
+        * after request. To be used by the application layer
+        */
+        SPDY_NewDataCallback received_data_cb;
+
+        /**
+        * Callback called when DATA frame is received.
         */
-        SPDY_NewPOSTDataCallback new_post_data_cb;
+        SPDYF_NewDataCallback freceived_data_cb;
 
         /**
          * Closure argument for all the callbacks that can be used by the client.