#include <getopt.h>
#include <string.h>
#include <sys/time.h>
+#ifdef __MINGW32__
+#include "../win32port/win32helpers/websock-w32.h"
+#else
+#ifdef __MINGW64__
+#include "../win32port/win32helpers/websock-w32.h"
+#else
#include <poll.h>
+#endif
+#endif
#include "../lib/libwebsockets.h"
};
-#define LOCAL_RESOURCE_PATH DATADIR"/libwebsockets-test-server"
+#define LOCAL_RESOURCE_PATH INSTALL_DATADIR"/libwebsockets-test-server"
/* this protocol server (always the first one) just knows how to do HTTP */
if (libwebsockets_serve_http_file(wsi,
LOCAL_RESOURCE_PATH"/test.html", "text/html"))
fprintf(stderr, "Failed to send HTTP file\n");
- break;
+ /* we are done with this connnection */
+ return 1;
/*
* callback for confirming to continue with client IP appear in
break;
case LWS_CALLBACK_DEL_POLL_FD:
- for (n = 0; n < count_pollfds; n++)
- if (pollfds[n].fd == (int)(long)user)
- while (n < count_pollfds) {
- pollfds[n] = pollfds[n + 1];
- n++;
- }
- count_pollfds--;
+ for (n = 0; n < count_pollfds; n++) {
+ if (pollfds[n].fd != (int)(long)user)
+ continue;
+ /*
+ * swap the end guy into our vacant slot...
+ * works ok if n is the end guy
+ */
+ pollfds[n] = pollfds[count_pollfds - 1];
+ pollfds[count_pollfds - 1].fd = -1;
+ count_pollfds--;
+ break;
+ }
break;
case LWS_CALLBACK_SET_MODE_POLL_FD:
[WSI_TOKEN_ACCEPT] = "Accept",
[WSI_TOKEN_NONCE] = "Nonce",
[WSI_TOKEN_HTTP] = "Http",
+ [WSI_TOKEN_MUXURL] = "MuxURL",
};
for (n = 0; n < WSI_TOKEN_COUNT; n++) {
n = sprintf((char *)p, "%d", pss->number++);
n = libwebsocket_write(wsi, p, n, LWS_WRITE_TEXT);
if (n < 0) {
- fprintf(stderr, "ERROR writing to socket");
+ fprintf(stderr, "ERROR %d writing to socket\n", n);
return 1;
}
break;
libwebsocket_callback_on_writable(this, wsi);
break;
- case LWS_CALLBACK_CLIENT_WRITEABLE:
+ case LWS_CALLBACK_SERVER_WRITEABLE:
if (pss->ringbuffer_tail != ringbuffer_head) {
LWS_WRITE_TEXT);
if (n < 0) {
- fprintf(stderr, "ERROR writing to socket");
+ fprintf(stderr, "ERROR %d writing to socket\n", n);
exit(1);
}
static struct option options[] = {
{ "help", no_argument, NULL, 'h' },
+ { "debug", required_argument, NULL, 'd' },
{ "port", required_argument, NULL, 'p' },
{ "ssl", no_argument, NULL, 's' },
{ "killmask", no_argument, NULL, 'k' },
{
int n = 0;
const char *cert_path =
- LOCAL_RESOURCE_PATH"/libwebsockets-test-server.pem";
+ LOCAL_RESOURCE_PATH"/libwebsockets-test-server.pem";
const char *key_path =
- LOCAL_RESOURCE_PATH"/libwebsockets-test-server.key.pem";
+ LOCAL_RESOURCE_PATH"/libwebsockets-test-server.key.pem";
unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 1024 +
LWS_SEND_BUFFER_POST_PADDING];
int port = 7681;
int opts = 0;
unsigned int oldus = 0;
char interface_name[128] = "";
- const char * interface = NULL;
+ const char *interface_ptr = NULL;
fprintf(stderr, "libwebsockets test server with external poll()\n"
"(C) Copyright 2010-2011 Andy Green <andy@warmcat.com> "
"licensed under LGPL2.1\n");
while (n >= 0) {
- n = getopt_long(argc, argv, "i:khsp:", options, NULL);
+ n = getopt_long(argc, argv, "i:khsp:d:", options, NULL);
if (n < 0)
continue;
switch (n) {
+ case 'd':
+ lws_set_log_level(atoi(optarg), NULL);
+ break;
case 's':
use_ssl = 1;
break;
case 'i':
strncpy(interface_name, optarg, sizeof interface_name);
interface_name[(sizeof interface_name) - 1] = '\0';
- interface = interface_name;
+ interface_ptr = interface_name;
break;
case 'h':
fprintf(stderr, "Usage: test-server "
- "[--port=<p>] [--ssl]\n");
+ "[--port=<p>] [--ssl] "
+ "[-d <log bitfield>]\n");
exit(1);
}
}
if (!use_ssl)
cert_path = key_path = NULL;
- context = libwebsocket_create_context(port, interface, protocols,
- NULL,
- cert_path, key_path, -1, -1, opts);
+ context = libwebsocket_create_context(port, interface_ptr, protocols,
+ libwebsocket_internal_extensions,
+ cert_path, key_path, NULL, -1, -1,
+ opts, NULL);
if (context == NULL) {
fprintf(stderr, "libwebsocket init failed\n");
return -1;
* match anything under libwebsockets
* control
*/
- libwebsocket_service_fd(context,
- &pollfds[n]);
+ if (libwebsocket_service_fd(context,
+ &pollfds[n]))
+ goto done;
/* do our broadcast periodically */