New + better websocket example

VS2012/ex_websocket/ex_websocket.vcxproj

@@ -27,7 +27,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -39,7 +38,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -150,6 +148,7 @@
     <ClInclude Include="..\..\include\civetweb.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\examples\websocket\WebSockCallbacks.c" />
     <ClCompile Include="..\..\src\civetweb.c" />
     <ClCompile Include="..\..\examples\websocket\websocket.c" />
   </ItemGroup>

examples/websocket/WebSockCallbacks.c

@@ -43,6 +43,18 @@ static pthread_mutex_t sMutex;
 static tWebSockInfo *socketList[MAX_NUM_OF_WEBSOCKS];
 
 
+static void send_to_all_websockets(const char * data, int data_len) {
+
+    int i;
+
+    for (i=0;i<MAX_NUM_OF_WEBSOCKS;i++) {
+        if (socketList[i] && (socketList[i]->webSockState==2)) {
+            mg_websocket_write(socketList[i]->conn, WEBSOCKET_OPCODE_TEXT, data, data_len);
+        }
+    }
+}
+
+
 void websocket_ready_handler(struct mg_connection *conn) {
 
     int i;
@@ -84,7 +96,6 @@ int websocket_data_handler(struct mg_connection *conn, int flags, char *data, si
     struct mg_request_info * rq = mg_get_request_info(conn);
     tWebSockInfo * wsock = (tWebSockInfo*)rq->conn_data;
     char msg[128];
-  int i;
 
     pthread_mutex_lock(&sMutex);
     if (flags==136) {
@@ -113,11 +124,7 @@ int websocket_data_handler(struct mg_connection *conn, int flags, char *data, si
 
         // chat message
         if ((wsock->webSockState==2) && (!memcmp(data,"msg ",4))) {
-      for (i=0;i<MAX_NUM_OF_WEBSOCKS;i++) {
+            send_to_all_websockets(data, data_len);
-        if (socketList[i] && (socketList[i]->webSockState==2)) {
-          mg_websocket_write(socketList[i]->conn, WEBSOCKET_OPCODE_TEXT, data, data_len);
-        }
-      }
             pthread_mutex_unlock(&sMutex);
             return 1;
         }
@@ -145,10 +152,14 @@ void connection_close_handler(struct mg_connection *conn) {
 }
 
 
+static int runLoop = 0;
+
 static void * eventMain(void * _ignored) {
     int i;
     char msg[256];
-  for (;;) {
+
+    runLoop = 1;
+    while (runLoop) {
         time_t t = time(0);
         struct tm * timestr = localtime(&t);
         sprintf(msg,"title %s",asctime(timestr));
@@ -167,8 +178,22 @@ static void * eventMain(void * _ignored) {
     return _ignored;
 }
 
+void websock_send_broadcast(const char * data, int data_len) {
+
+    char buffer[260];
+
+    if (data_len<=256) {
+        strcpy(buffer, "msg ");
+        memcpy(buffer+4, data, data_len);
+        
+        pthread_mutex_lock(&sMutex);        
+        send_to_all_websockets(buffer, data_len+4);
+        pthread_mutex_unlock(&sMutex);
+    }
+}
 
 void websock_init_lib(void) {
+
     int ret;
     ret = pthread_mutex_init(&sMutex, 0);
     assert(ret==0);
@@ -178,3 +203,7 @@ void websock_init_lib(void) {
     mg_start_thread(eventMain, 0);
 }
 
+void websock_exit_lib(void) {
+
+    runLoop = 0;
+}

examples/websocket/WebSockCallbacks.h

@@ -9,6 +9,10 @@ extern "C" {
 #endif
 
 void websock_init_lib(void);
+void websock_exit_lib(void);
+
+void websock_send_broadcast(const char * data, int data_len);
+
 void websocket_ready_handler(struct mg_connection *conn);
 int websocket_data_handler(struct mg_connection *conn, int flags, char *data, size_t data_len);
 void connection_close_handler(struct mg_connection *conn);

examples/websocket/websocket.c

@@ -0,0 +1,47 @@
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+
+#include "civetweb.h"
+#include "WebSockCallbacks.h"
+
+int main(void)
+{
+    struct mg_context *ctx = 0;
+    struct mg_callbacks callback_funcs = {0};
+    char inbuf[4];
+
+    const char *server_options[] = {
+        /* document_root: The path to the test function websock.htm */
+        "document_root",     "../../examples/websocket",
+
+        /* port: use http standard to match websocket url in websock.htm: ws://127.0.0.1/MyWebSock  */
+        /*       if the port is changed here, it needs to be changed in websock.htm as wenn         */
+        "listening_ports",   "80",
+
+        NULL
+    };
+
+    websock_init_lib();
+
+    callback_funcs.websocket_ready = websocket_ready_handler;
+    callback_funcs.websocket_data = websocket_data_handler;
+    callback_funcs.connection_close = connection_close_handler;
+    ctx = mg_start(&callback_funcs, NULL, server_options);
+
+    puts("Enter an (ASCII) character or * to exit:");
+    for (;;) {
+        fgets(inbuf, sizeof(inbuf), stdin);
+
+        if (inbuf[0]=='*') {
+           break;
+        }
+        inbuf[0] = toupper(inbuf[0]);
+        websock_send_broadcast(inbuf, 1);
+    }
+
+    mg_stop(ctx);
+    websock_exit_lib();
+
+    return 0;
+}