HTTP_PROXY: make usable

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

diff --git a/test-server/test-server.c b/test-server/test-server.c
index 466bf98..7c1f9ea 100644 (file)
--- a/test-server/test-server.c
+++ b/test-server/test-server.c
@@ -36,15 +36,9 @@ struct lws_plat_file_ops fops_plat;
 /* http server gets files from this path */
 #define LOCAL_RESOURCE_PATH INSTALL_DATADIR"/libwebsockets-test-server"
 char *resource_path = LOCAL_RESOURCE_PATH;
-#if defined(LWS_USE_POLARSSL)
-#else
-#if defined(LWS_USE_MBEDTLS)
-#else
 #if defined(LWS_OPENSSL_SUPPORT) && defined(LWS_HAVE_SSL_CTX_set1_param)
 char crl_path[1024] = "";
 #endif
-#endif
-#endif
 
 /* singlethreaded version --> no locks */
 
@@ -126,19 +120,24 @@ static struct lws_protocols protocols[] = {
  * to do any of this unless you have a reason (eg, want to serve
  * compressed files without decompressing the whole archive)
  */
-static lws_filefd_type
-test_server_fops_open(struct lws *wsi, const char *filename,
-                     unsigned long *filelen, int flags)
+static lws_fop_fd_t
+test_server_fops_open(const struct lws_plat_file_ops *fops,
+                    const char *vfs_path, const char *vpath,
+                    lws_fop_flags_t *flags)
 {
-       lws_filefd_type n;
+       lws_fop_fd_t fop_fd;
 
        /* call through to original platform implementation */
-       n = fops_plat.open(wsi, filename, filelen, flags);
+       fop_fd = fops_plat.open(fops, vfs_path, vpath, flags);
 
-       lwsl_info("%s: opening %s, ret %ld, len %lu\n", __func__, filename,
-                       (long)n, *filelen);
+       if (fop_fd)
+               lwsl_info("%s: opening %s, ret %p, len %lu\n", __func__,
+                               vfs_path, fop_fd,
+                               (long)lws_vfs_get_length(fop_fd));
+       else
+               lwsl_info("%s: open %s failed\n", __func__, vfs_path);
 
-       return n;
+       return fop_fd;
 }
 
 void sighandler(int sig)
@@ -185,12 +184,14 @@ static struct option options[] = {
        { "daemonize",  no_argument,            NULL, 'D' },
 #endif
        { "resource_path", required_argument,   NULL, 'r' },
+       { "pingpong-secs", required_argument,   NULL, 'P' },
        { NULL, 0, 0, 0 }
 };
 
 int main(int argc, char **argv)
 {
        struct lws_context_creation_info info;
+       struct lws_vhost *vhost;
        char interface_name[128] = "";
        unsigned int ms, oldms = 0;
        const char *iface = NULL;
@@ -199,6 +200,7 @@ int main(int argc, char **argv)
        char ca_path[1024] = "";
        int uid = -1, gid = -1;
        int use_ssl = 0;
+       int pp_secs = 0;
        int opts = 0;
        int n = 0;
 #ifndef _WIN32
@@ -221,7 +223,7 @@ int main(int argc, char **argv)
        info.port = 7681;
 
        while (n >= 0) {
-               n = getopt_long(argc, argv, "eci:hsap:d:Dr:C:K:A:R:vu:g:", options, NULL);
+               n = getopt_long(argc, argv, "eci:hsap:d:Dr:C:K:A:R:vu:g:P:k", options, NULL);
                if (n < 0)
                        continue;
                switch (n) {
@@ -259,6 +261,13 @@ int main(int argc, char **argv)
                        interface_name[(sizeof interface_name) - 1] = '\0';
                        iface = interface_name;
                        break;
+               case 'k':
+                       info.bind_iface = 1;
+#if defined(LWS_HAVE_SYS_CAPABILITY_H) && defined(LWS_HAVE_LIBCAP)
+                       info.caps[0] = CAP_NET_RAW;
+                       info.count_caps = 1;
+#endif
+                       break;
                case 'c':
                        close_testing = 1;
                        fprintf(stderr, " Close testing mode -- closes on "
@@ -281,15 +290,16 @@ int main(int argc, char **argv)
                        strncpy(ca_path, optarg, sizeof(ca_path) - 1);
                        ca_path[sizeof(ca_path) - 1] = '\0';
                        break;
+               case 'P':
+                       pp_secs = atoi(optarg);
+                       lwsl_notice("Setting pingpong interval to %d\n", pp_secs);
+                       break;
 #if defined(LWS_OPENSSL_SUPPORT)
                case 'v':
                        use_ssl = 1;
                        opts |= LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT;
                        break;
-#if defined(LWS_USE_POLARSSL)
-#else
-#if defined(LWS_USE_MBEDTLS)
-#else
+
 #if defined(LWS_HAVE_SSL_CTX_set1_param)
                case 'R':
                        strncpy(crl_path, optarg, sizeof(crl_path) - 1);
@@ -297,8 +307,6 @@ int main(int argc, char **argv)
                        break;
 #endif
 #endif
-#endif
-#endif
                case 'h':
                        fprintf(stderr, "Usage: test-server "
                                        "[--port=<p>] [--ssl] "
@@ -349,6 +357,7 @@ int main(int argc, char **argv)
        info.protocols = protocols;
        info.ssl_cert_filepath = NULL;
        info.ssl_private_key_filepath = NULL;
+       info.ws_ping_pong_interval = pp_secs;
 
        if (use_ssl) {
                if (strlen(resource_path) > sizeof(cert_path) - 32) {
@@ -374,7 +383,7 @@ int main(int argc, char **argv)
        info.gid = gid;
        info.uid = uid;
        info.max_http_header_pool = 16;
-       info.options = opts | LWS_SERVER_OPTION_VALIDATE_UTF8;
+       info.options = opts | LWS_SERVER_OPTION_VALIDATE_UTF8 | LWS_SERVER_OPTION_EXPLICIT_VHOSTS | LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT;
        info.extensions = exts;
        info.timeout_secs = 5;
        info.ssl_cipher_list = "ECDHE-ECDSA-AES256-GCM-SHA384:"
@@ -401,6 +410,16 @@ int main(int argc, char **argv)
                return -1;
        }
 
+       vhost = lws_create_vhost(context, &info);
+       if (!vhost) {
+               lwsl_err("vhost creation failed\n");
+               return -1;
+       }
+
+#if !defined(LWS_NO_CLIENT) && defined(LWS_OPENSSL_SUPPORT)
+       lws_init_vhost_client_ssl(&info, vhost);
+#endif
+
        /* this shows how to override the lws file operations.  You don't need
         * to do any of this unless you have a reason (eg, want to serve
         * compressed files without decompressing the whole archive)
@@ -411,6 +430,9 @@ int main(int argc, char **argv)
        lws_get_fops(context)->open = test_server_fops_open;
 
        n = 0;
+#ifdef EXTERNAL_POLL
+       int ms_1sec = 0;
+#endif
        while (n >= 0 && !force_exit) {
                struct timeval tv;
 
@@ -439,7 +461,7 @@ int main(int argc, char **argv)
                if (n < 0)
                        continue;
 
-               if (n)
+               if (n) {
                        for (n = 0; n < count_pollfds; n++)
                                if (pollfds[n].revents)
                                        /*
@@ -450,6 +472,20 @@ int main(int argc, char **argv)
                                        if (lws_service_fd(context,
                                                                  &pollfds[n]) < 0)
                                                goto done;
+
+                       /* if needed, force-service wsis that may not have read all input */
+                       while (!lws_service_adjust_timeout(context, 1, 0)) {
+                               lwsl_notice("extpoll doing forced service!\n");
+                               lws_service_tsi(context, -1, 0);
+                       }
+               } else {
+                       /* no revents, but before polling again, make lws check for any timeouts */
+                       if (ms - ms_1sec > 1000) {
+                               lwsl_notice("1 per sec\n");
+                               lws_service_fd(context, NULL);
+                               ms_1sec = ms;
+                       }
+               }
 #else
                /*
                 * If libwebsockets sockets are all we care about,