aboutsummaryrefslogtreecommitdiff
path: root/src/examples/mhd2spdy.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/examples/mhd2spdy.c')
-rw-r--r--src/examples/mhd2spdy.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/examples/mhd2spdy.c b/src/examples/mhd2spdy.c
index 507641c2..10d0afd4 100644
--- a/src/examples/mhd2spdy.c
+++ b/src/examples/mhd2spdy.c
@@ -41,6 +41,7 @@ static int run = 1;
41 41
42static void catch_signal(int signal) 42static void catch_signal(int signal)
43{ 43{
44 (void)signal;
44 //spdy_close = 1; 45 //spdy_close = 1;
45 run = 0; 46 run = 0;
46} 47}
@@ -122,7 +123,7 @@ run_everything ()
122 if(NULL == glob_opt.spdy_connection && glob_opt.only_proxy) 123 if(NULL == glob_opt.spdy_connection && glob_opt.only_proxy)
123 PRINT_INFO("cannot connect to the proxy"); 124 PRINT_INFO("cannot connect to the proxy");
124 } 125 }
125 126
126 //PRINT_INFO("while1"); 127 //PRINT_INFO("while1");
127 FD_ZERO(&rs); 128 FD_ZERO(&rs);
128 FD_ZERO(&ws); 129 FD_ZERO(&ws);
@@ -166,7 +167,7 @@ else{*/
166 connections, MAX_SPDY_CONNECTIONS, &spdy_npollfds); 167 connections, MAX_SPDY_CONNECTIONS, &spdy_npollfds);
167 if(maxfd_s > maxfd) maxfd = maxfd_s; 168 if(maxfd_s > maxfd) maxfd = maxfd_s;
168 169
169 PRINT_INFO2("MHD timeout %i %i", timeout.tv_sec, timeout.tv_usec); 170 PRINT_INFO2("MHD timeout %lld %lld", (unsigned long long)timeout.tv_sec, (unsigned long long)timeout.tv_usec);
170 //TODO 171 //TODO
171 //timeout.tv_sec = 0; 172 //timeout.tv_sec = 0;
172 //timeout.tv_usec = 0; 173 //timeout.tv_usec = 0;
@@ -174,9 +175,10 @@ else{*/
174 glob_opt.spdy_data_received = false; 175 glob_opt.spdy_data_received = false;
175 176
176 ret = select(maxfd+1, &rs, &ws, &es, &timeout); 177 ret = select(maxfd+1, &rs, &ws, &es, &timeout);
177 PRINT_INFO2("timeout now %i %i", timeout.tv_sec, timeout.tv_usec); 178 PRINT_INFO2("timeout now %lld %lld", (unsigned long long)timeout.tv_sec, (unsigned long long)timeout.tv_usec);
178 179
179 switch(ret) { 180 switch(ret)
181 {
180 case -1: 182 case -1:
181 PRINT_INFO2("select error: %i", errno); 183 PRINT_INFO2("select error: %i", errno);
182 break; 184 break;
@@ -184,12 +186,14 @@ else{*/
184 break; 186 break;
185 default: 187 default:
186 PRINT_INFO("run"); 188 PRINT_INFO("run");
187 MHD_run_from_select(daemon,&rs, &ws, &es); 189 //MHD_run_from_select(daemon,&rs, &ws, &es); //not closing FDs
190 MHD_run(daemon);
188 spdy_run_select(&rs, &ws, &es, connections, spdy_npollfds); 191 spdy_run_select(&rs, &ws, &es, connections, spdy_npollfds);
189 if(glob_opt.spdy_data_received) 192 if(glob_opt.spdy_data_received)
190 { 193 {
191 PRINT_INFO("MHD run again"); 194 PRINT_INFO("MHD run again");
192 MHD_run_from_select(daemon,&rs, &ws, &es); 195 //MHD_run_from_select(daemon,&rs, &ws, &es); //not closing FDs
196 MHD_run(daemon);
193 } 197 }
194 break; 198 break;
195 } 199 }
@@ -215,7 +219,7 @@ else{*/
215 }*/ 219 }*/
216 } 220 }
217 while(run); 221 while(run);
218 222
219 //TODO exit from loop and clean 223 //TODO exit from loop and clean
220 224
221 MHD_stop_daemon (daemon); 225 MHD_stop_daemon (daemon);