[1.5][JPIP] enabled the opj_server to reply the first query consisting with len reque...

[openjpeg.git] / applications / jpip / util / opj_server.c

diff --git a/applications/jpip/util/opj_server.c b/applications/jpip/util/opj_server.c
index 5b435cfb938842993d35c84971de59b4a42e0cb7..bed1be3528ed75f2bb7d11f7c760143070bf1fb2 100644 (file)
--- a/applications/jpip/util/opj_server.c
+++ b/applications/jpip/util/opj_server.c
@@ -54,11 +54,23 @@
 #define QUIT_SIGNAL "quitJPIP"
 #endif
 
+#ifdef _WIN32
+WSADATA initialisation_win32;
+#endif //_WIN32
+
 int main(void)
 { 
   server_record_t *server_record;
 
-  server_record = init_JPIPserver();
+#ifdef _WIN32
+  int erreur = WSAStartup(MAKEWORD(2,2),&initialisation_win32);
+  if( erreur!=0)
+    fprintf( stderr, "Erreur initialisation Winsock error : %d %d\n",erreur,WSAGetLastError());
+  else
+    fprintf( stderr, "Initialisation Winsock\n");
+#endif //_WIN32
+
+  server_record = init_JPIPserver( 60000, 0);
 
 #ifdef SERVER
 
@@ -89,12 +101,12 @@ int main(void)
       local_log( true, true, parse_status, false, qr, server_record);
 #endif
             
-      fprintf( FCGI_stdout, "\r\n");
-
       if( parse_status)
-       send_responsedata( qr);
-      else
+       send_responsedata( server_record, qr);
+      else{
        fprintf( FCGI_stderr, "Error: JPIP request failed\n");
+       fprintf( FCGI_stdout, "\r\n");
+      }
       
       end_QRprocess( server_record, &qr);
     }
@@ -103,5 +115,13 @@ int main(void)
 
   terminate_JPIPserver( &server_record);
 
+#ifdef _WIN32
+  if( WSACleanup() != 0){
+    fprintf( stderr, "\nError in WSACleanup : %d %d",erreur,WSAGetLastError());
+  }else{
+    fprintf( stderr, "\nWSACleanup OK\n");
+  }
+#endif
+
   return 0;
 }