Mercurial > hg > webserver / file diff

--- a/src/server/daemon/websocket.c	Wed Nov 02 19:19:01 2022 +0100
+++ b/src/server/daemon/websocket.c	Sun Nov 06 15:53:32 2022 +0100
@@ -35,7 +35,7 @@
 #include "../util/pblock.h"
 #include "../util/util.h"
 #include "../util/strbuf.h"
-#include <ucx/string.h>
+#include <cx/string.h>
 
 #define WS_BUFFER_LEN 2048
 
@@ -51,25 +51,25 @@
         return REQ_NOACTION;
     }
     
-    if(sstrcasecmp(sstr(connection), S("upgrade"))) {
+    if(cx_strcasecmp(cx_str(connection), (cxstring)CX_STR("upgrade"))) {
         return REQ_NOACTION;
     }
-    if(sstrcasecmp(sstr(upgrade), S("websocket"))) {
+    if(cx_strcasecmp(cx_str(upgrade), (cxstring)CX_STR("websocket"))) {
         return REQ_NOACTION;
     }
     
-    sstr_t wsaccept = sstrcat(2, sstr(wskey), S("258EAFA5-E914-47DA-95CA-C5AB0DC85B11"));
+    cxmutstr wsaccept = cx_strcat(2, cx_str(wskey), (cxstring)CX_STR("258EAFA5-E914-47DA-95CA-C5AB0DC85B11"));
     unsigned char hash[20];
     SHA1((const unsigned char*)wsaccept.ptr, wsaccept.length, hash);
     char *websocket_accept = util_base64encode((char*)hash, 20);
     
     sbuf_t *response = sbuf_new(512);
-    sbuf_append(response, S("HTTP/1.1 101 Switching Protocols\r\n"));
-    sbuf_append(response, S("Upgrade: websocket\r\n"));
-    sbuf_append(response, S("Connection: Upgrade\r\n"));
-    sbuf_append(response, S("Sec-WebSocket-Accept: "));
+    sbuf_append(response, (cxstring)CX_STR("HTTP/1.1 101 Switching Protocols\r\n"));
+    sbuf_append(response, (cxstring)CX_STR("Upgrade: websocket\r\n"));
+    sbuf_append(response, (cxstring)CX_STR("Connection: Upgrade\r\n"));
+    sbuf_append(response, (cxstring)CX_STR("Sec-WebSocket-Accept: "));
     sbuf_puts(response, websocket_accept);
-    sbuf_append(response, S("\r\n\r\n"));
+    sbuf_append(response, (cxstring)CX_STR("\r\n\r\n"));
     
     net_write(sn->csd, response->ptr, response->length);
     sbuf_free(response);