1 files changed, 18 insertions, 160 deletions

diff --git a/src/examples/mhd2spdy_http.c b/src/examples/mhd2spdy_http.c
index 4761c086..7881d57a 100644
--- a/src/examples/mhd2spdy_http.c
+++ b/src/examples/mhd2spdy_http.c
@@ -26,7 +26,9 @@
 #include "mhd2spdy_spdy.h"
 
 
-void * http_log_cb(void * cls, const char * uri)
+void *
+http_log_cb(void * cls,
+const char * uri)
 {
   (void)cls;
   
@@ -34,29 +36,18 @@ void * http_log_cb(void * cls, const char * uri)
   
   PRINT_INFO2("log uri '%s'\n", uri);
   
-  //TODO free
   if(NULL == (http_uri = au_malloc(sizeof(struct HTTP_URI ))))
     DIE("no memory");
-  //memset(http_uri, 0 , sizeof(struct HTTP_URI));
   http_uri->uri = strdup(uri);
   return http_uri;
 }
 
 
-/*
-static int
-http_query_iterate_cb(void *cls,
-                           enum MHD_ValueKind kind,
-                           const char *name, const char *value)
-{
-
-}*/
-
-
 static int
 http_iterate_cb(void *cls,
-                           enum MHD_ValueKind kind,
-                           const char *name, const char *value)
+                 enum MHD_ValueKind kind,
+                 const char *name,
+                 const char *value)
 {
   (void)kind;
   
@@ -85,9 +76,9 @@ http_iterate_cb(void *cls,
 
 static ssize_t
 http_response_callback (void *cls,
-                                uint64_t pos,
-                                char *buffer,
-                                size_t max)
+                        uint64_t pos,
+                        char *buffer,
+                        size_t max)
 {
   (void)pos;
   
@@ -96,15 +87,6 @@ http_response_callback (void *cls,
         void *newbody;
   const union MHD_ConnectionInfo *info;
   int val = 1;
-        
-  //max=16;
-        
-        //PRINT_INFO2("response_callback, pos: %i, max is %i, len is %i",pos,max,proxy->length);
-        
-        //assert(0 != proxy->length);
-        
-        //if(MHD_CONTENT_READER_END_OF_STREAM == proxy->length)
-        //      return MHD_CONTENT_READER_END_OF_STREAM;
   
   PRINT_INFO2("http_response_callback for %s", proxy->url);
   
@@ -116,7 +98,6 @@ http_response_callback (void *cls,
     return MHD_CONTENT_READER_END_OF_STREAM;
   }
         
-        //*more = true;
         if(!proxy->http_body_size)//nothing to write now
   {
     //flush data
@@ -154,13 +135,6 @@ http_response_callback (void *cls,
         if(proxy->length >= 0)
         {
                 proxy->length -= ret;
-                //printf("pr len %i", proxy->length);
-                /*if(proxy->length <= 0)
-                {
-                //      *more = false;
-                        //last frame
-                        proxy->length = MHD_CONTENT_READER_END_OF_STREAM;
-                }*/
         }
         
         PRINT_INFO2("response_callback, size: %i",ret);
@@ -175,27 +149,7 @@ http_response_done_callback(void *cls)
         struct Proxy *proxy = (struct Proxy *)cls;
   
   PRINT_INFO2("http_response_done_callback for %s", proxy->url);
-        //int ret;
-        
-        //printf("response_done_callback\n");
-        
-        //printf("answer for %s was sent\n", (char *)cls);
-        
-        /*if(SPDY_RESPONSE_RESULT_SUCCESS != status)
-        {
-                printf("answer was NOT sent, %i\n",status);
-        }*/
-        /*if(CURLM_OK != (ret = curl_multi_remove_handle(multi_handle, proxy->curl_handle)))
-        {
-                PRINT_INFO2("curl_multi_remove_handle failed (%i)", ret);
-        }
-        curl_slist_free_all(proxy->curl_headers);
-        curl_easy_cleanup(proxy->curl_handle);
-        */
-        //SPDY_destroy_request(request);
-        //SPDY_destroy_response(response);
-        //if(!strcmp("/close",proxy->path)) run = 0;
-        //free(proxy->path);
+  
   if(proxy->spdy_active)
     proxy->http_active = false;
   else
@@ -219,12 +173,8 @@ http_cb_request (void *cls,
   (void)upload_data;
   (void)upload_data_size;
   
-  //struct MHD_Response *response;
   int ret;
   struct Proxy *proxy;
-  //struct URI *spdy_uri;
-  //char **nv;
-  //int num_headers;
   struct SPDY_Headers spdy_headers;
   
   //PRINT_INFO2("request cb %i; %s", *ptr,url);
@@ -240,7 +190,7 @@ http_cb_request (void *cls,
       free(http_uri->uri);
       free(http_uri);
       PRINT_INFO2("unexpected method %s", method);
-      return MHD_NO;              /* unexpected method */
+      return MHD_NO;
     }
   
     if(NULL == (proxy = au_malloc(sizeof(struct Proxy))))
@@ -250,17 +200,14 @@ http_cb_request (void *cls,
     }
     
     ++glob_opt.responses_pending;
-    //memset(proxy, 0, sizeof(struct Proxy));
     proxy->id = rand();
     proxy->http_active = true;
-    //PRINT_INFO2("proxy obj with id %i created (%i)", proxy->id, proxy);
     proxy->http_connection = connection;
     http_uri->proxy = proxy;
     return MHD_YES;
   }
   
   proxy = http_uri->proxy;
-  //*ptr = NULL;                  /* reset when done */
 
   if(proxy->spdy_active)
   {
@@ -270,45 +217,15 @@ http_cb_request (void *cls,
   }
 
   PRINT_INFO2("received request for '%s %s %s'\n", method, http_uri->uri, version);
-  /*
-  proxy->http_response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN,
-                         8096,
-                         &http_response_callback,
-                         proxy,
-                         &http_response_done_callback);
-  
-  if (proxy->http_response == NULL)
-    DIE("no response");
-    */ 
 
   proxy->url = http_uri->uri;
-  //if(NULL == (proxy->url = strdup(http_uri->uri)))
-  //  DIE("no memory");
-
-//TODO HTTP headers
-  /*MHD_get_connection_values (connection,
-                       MHD_HEADER_KIND,
-                       &http_iterate_cb,
-                       proxy);
-  */                     
-  //proxy->url = strdup(url);
-  //if(NULL ==  (spdy_uri = au_malloc(sizeof(struct URI))))
-  //  DIE("no memory");
     
   ret = parse_uri(&glob_opt.uri_preg, proxy->url, &proxy->uri);
   if(ret != 0)
     DIE("parse_uri failed");
-  //proxy->uri = spdy_uri;
   proxy->http_uri = http_uri;
   proxy->spdy_active = true;
 
-  //proxy->spdy_request = au_malloc(sizeof(struct SPDY_Request));
-  //if(NULL == proxy->spdy_request)
-  //  DIE("no memory");
-  //memset(proxy->spdy_request,0,sizeof(struct SPDY_Request));
-  //spdy_request_init(proxy->spdy_request, &spdy_uri);
-  //spdy_submit_request(spdy_connection, proxy);
-
   spdy_headers.num = MHD_get_connection_values (connection,
                        MHD_HEADER_KIND,
                        NULL,
@@ -331,16 +248,10 @@ http_cb_request (void *cls,
   if(NULL == spdy_headers.nv[9])
     spdy_headers.nv[9] = proxy->uri->host_and_port;
 
-  /*int i;
-  for(i=0; i<spdy_headers.cnt; i+=2)
-    printf("%s: %s\n", spdy_headers.nv[i], spdy_headers.nv[i+1]);
-  */
   if(0 != spdy_request(spdy_headers.nv, proxy))
   {
-    //--glob_opt.responses_pending;
     free(spdy_headers.nv);
-    //MHD_destroy_response (proxy->http_response);
-    free_proxy(proxy);//TODO call it here or in done_callback
+    free_proxy(proxy);
     
     return MHD_NO;
   }
@@ -364,60 +275,20 @@ http_cb_request (void *cls,
   if(MHD_NO == MHD_add_response_header (proxy->http_response,
                  "Keep-Alive", "timeout=5, max=100"))
     PRINT_INFO("SPDY_name_value_add failed: ");
-    /*
-  const  union MHD_ConnectionInfo *info;
-  info = MHD_get_connection_info (connection,
-                         MHD_CONNECTION_INFO_CONNECTION_FD);
-  int val = 1;
-  int rv;
-  rv = setsockopt(info->connect_fd, IPPROTO_TCP, TCP_NODELAY, &val, (socklen_t)sizeof(val));
-  if(rv == -1) {
-    DIE("setsockopt");
-  }*/
+    
   return MHD_YES;
 }
 
+
 void
-http_create_response(struct Proxy* proxy, char **nv)
+http_create_response(struct Proxy* proxy,
+                     char **nv)
 {
   size_t i;
-  //uint64_t response_size=MHD_SIZE_UNKNOWN;
-
-  /*for(i = 0; nv[i]; i += 2) {
-    if(0 == strcmp("content-length", nv[i]))
-    {
-      response_size = atoi(nv[i+1]);
-      break;
-    }
-  }*/
-    /*
-  proxy->http_response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN,
-                         4096,
-                         &http_response_callback,
-                         proxy,
-                         &http_response_done_callback);
-
-  if (proxy->http_response == NULL)
-    DIE("no response");
   
-  if(MHD_NO == MHD_add_response_header (proxy->http_response,
-                 "Proxy-Connection", "keep-alive"))
-    PRINT_INFO("SPDY_name_value_add failed: ");
-  if(MHD_NO == MHD_add_response_header (proxy->http_response,
-                 "Connection", "Keep-Alive"))
-    PRINT_INFO("SPDY_name_value_add failed: ");
-  if(MHD_NO == MHD_add_response_header (proxy->http_response,
-                 "Keep-Alive", "timeout=5, max=100"))
-    PRINT_INFO("SPDY_name_value_add failed: ");
-    */
   for(i = 0; nv[i]; i += 2) {
-    //printf("       %s: %s\n", nv[i], nv[i+1]);
-    //int j;
-
     if(0 == strcmp(":status", nv[i]))
     {
-      //raise(SIGINT);
-      //proxy->status_msg = nv[i+1];
       char tmp[4];
       memcpy(&tmp,nv[i+1],3);
       tmp[3]=0;
@@ -431,35 +302,22 @@ http_create_response(struct Proxy* proxy, char **nv)
     }
     else if(0 == strcmp("content-length", nv[i]))
     {
-      //proxy->length = atoi(nv[i+1]);
-      //response_size = atoi(nv[i+1]);
       continue;
     }
 
-    //for(j=0; j<strlen(nv[i]) && ':'==nv[i][j]; ++j);
-
     char *header = *(nv+i);
-    //header[0] = toupper(header[0]);
     if(MHD_NO == MHD_add_response_header (proxy->http_response,
                    header, nv[i+1]))
     {
       PRINT_INFO2("SPDY_name_value_add failed: '%s' '%s'", header, nv[i+1]);
-      //abort();
     }
     PRINT_INFO2("adding '%s: %s'",header, nv[i+1]);
   }
   
-  //PRINT_INFO2("%i", MHD_get_response_headers(proxy->http_response, NULL, NULL));
-  //PRINT_INFO2("state before %i", proxy->http_connection->state);
-  //PRINT_INFO2("loop before %i", proxy->http_connection->event_loop_info);
   if(MHD_NO == MHD_queue_response (proxy->http_connection, proxy->status, proxy->http_response)){
     PRINT_INFO("No queue");
     abort();
   }
-  //PRINT_INFO2("state after %i", proxy->http_connection->state);
-  //PRINT_INFO2("loop after %i", proxy->http_connection->event_loop_info);
-  //MHD_destroy_response (proxy->http_response);
-  //PRINT_INFO2("state after %i", proxy->http_connection->state);
-  //PRINT_INFO2("loop after %i", proxy->http_connection->event_loop_info);
-      MHD_destroy_response (proxy->http_response);
+  
+  MHD_destroy_response (proxy->http_response);
 }