test servers: convert to static inclusion of plugins

[platform/upstream/libwebsockets.git] / test-server / test-server.h

diff --git a/test-server/test-server.h b/test-server/test-server.h
index 1118a02..29e6717 100644 (file)
--- a/test-server/test-server.h
+++ b/test-server/test-server.h
@@ -69,8 +69,7 @@ extern void test_server_unlock(int care);
 #endif
 
 struct per_session_data__http {
-       lws_filefd_type fd;
-       char post_string[256];
+       lws_fop_fd_t fop_fd;
 #ifdef LWS_WITH_CGI
        struct lws_cgi_args args;
 #endif
@@ -78,6 +77,15 @@ struct per_session_data__http {
        int reason_bf;
 #endif
        unsigned int client_finished:1;
+
+
+       struct lws_spa *spa;
+       char result[500 + LWS_PRE];
+       int result_len;
+
+       char filename[256];
+       long file_length;
+       lws_filefd_type post_fd;
 };
 
 /*
@@ -88,48 +96,22 @@ struct per_session_data__http {
  * connection.
  */
 
+#if !defined(DI_HANDLED_BY_PLUGIN)
 struct per_session_data__dumb_increment {
        int number;
 };
+#endif
 
-struct per_session_data__lws_mirror {
-       struct lws *wsi;
-       int ringbuffer_tail;
-};
-
-struct per_session_data__echogen {
-       size_t total;
-       size_t total_rx;
-       int fd;
-       int fragsize;
-       int wr;
-};
-
-struct per_session_data__lws_status {
-       struct per_session_data__lws_status *list;
-       struct timeval tv_established;
-       int last;
-       char ip[270];
-       char user_agent[512];
-       const char *pos;
-       int len;
-};
 
 extern int
 callback_http(struct lws *wsi, enum lws_callback_reasons reason, void *user,
              void *in, size_t len);
-extern int
-callback_lws_mirror(struct lws *wsi, enum lws_callback_reasons reason,
-                   void *user, void *in, size_t len);
+
+#if !defined(DI_HANDLED_BY_PLUGIN)
 extern int
 callback_dumb_increment(struct lws *wsi, enum lws_callback_reasons reason,
                        void *user, void *in, size_t len);
-extern int
-callback_lws_echogen(struct lws *wsi, enum lws_callback_reasons reason,
-                       void *user, void *in, size_t len);
-extern int
-callback_lws_status(struct lws *wsi, enum lws_callback_reasons reason,
-                   void *user, void *in, size_t len);
+#endif
 
 
 extern void