From 8b770d2a0d00298474aa2a28a4d8b64e28f083ab Mon Sep 17 00:00:00 2001
From: Sergey Lyubka <valenok@gmail.com>
Date: Wed, 11 Aug 2021 04:52:39 +0100
Subject: [PATCH] Fix #1334 - typo in mg_call(..MG_EV_WS_OPEN) call

---
 mongoose.c       | 10 +++++-----
 src/ws.c         | 10 +++++-----
 test/unit_test.c |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/mongoose.c b/mongoose.c
index 8103e51b..937618c6 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -4514,7 +4514,7 @@ static size_t ws_process(uint8_t *buf, size_t len, struct ws_msg *msg) {
     } else if (len >= 10 + mask_len) {
       msg->header_len = 10 + mask_len;
       msg->data_len =
-          (size_t)(((uint64_t) mg_ntohl(*(uint32_t *) &buf[2])) << 32) +
+          (size_t) (((uint64_t) mg_ntohl(*(uint32_t *) &buf[2])) << 32) +
           mg_ntohl(*(uint32_t *) &buf[6]);
     }
   }
@@ -4528,7 +4528,7 @@ static size_t ws_process(uint8_t *buf, size_t len, struct ws_msg *msg) {
 
 static size_t mkhdr(size_t len, int op, bool is_client, uint8_t *buf) {
   size_t n = 0;
-  buf[0] = (uint8_t)(op | WEBSOCKET_FLAGS_MASK_FIN);
+  buf[0] = (uint8_t) (op | WEBSOCKET_FLAGS_MASK_FIN);
   if (len < 126) {
     buf[1] = (unsigned char) len;
     n = 2;
@@ -4540,9 +4540,9 @@ static size_t mkhdr(size_t len, int op, bool is_client, uint8_t *buf) {
   } else {
     uint32_t tmp;
     buf[1] = 127;
-    tmp = mg_htonl((uint32_t)((uint64_t) len >> 32));
+    tmp = mg_htonl((uint32_t) ((uint64_t) len >> 32));
     memcpy(&buf[2], &tmp, sizeof(tmp));
-    tmp = mg_htonl((uint32_t)(len & 0xffffffff));
+    tmp = mg_htonl((uint32_t) (len & 0xffffffff));
     memcpy(&buf[6], &tmp, sizeof(tmp));
     n = 10;
   }
@@ -4687,7 +4687,7 @@ void mg_ws_upgrade(struct mg_connection *c, struct mg_http_message *hm,
     ws_handshake(c, wskey, wsproto, fmt, ap);
     va_end(ap);
     c->is_websocket = 1;
-    mg_call(c, MG_EV_WS_OPEN, &hm);
+    mg_call(c, MG_EV_WS_OPEN, hm);
   }
 }
 
diff --git a/src/ws.c b/src/ws.c
index 1e189f5a..dd811179 100644
--- a/src/ws.c
+++ b/src/ws.c
@@ -60,7 +60,7 @@ static size_t ws_process(uint8_t *buf, size_t len, struct ws_msg *msg) {
     } else if (len >= 10 + mask_len) {
       msg->header_len = 10 + mask_len;
       msg->data_len =
-          (size_t)(((uint64_t) mg_ntohl(*(uint32_t *) &buf[2])) << 32) +
+          (size_t) (((uint64_t) mg_ntohl(*(uint32_t *) &buf[2])) << 32) +
           mg_ntohl(*(uint32_t *) &buf[6]);
     }
   }
@@ -74,7 +74,7 @@ static size_t ws_process(uint8_t *buf, size_t len, struct ws_msg *msg) {
 
 static size_t mkhdr(size_t len, int op, bool is_client, uint8_t *buf) {
   size_t n = 0;
-  buf[0] = (uint8_t)(op | WEBSOCKET_FLAGS_MASK_FIN);
+  buf[0] = (uint8_t) (op | WEBSOCKET_FLAGS_MASK_FIN);
   if (len < 126) {
     buf[1] = (unsigned char) len;
     n = 2;
@@ -86,9 +86,9 @@ static size_t mkhdr(size_t len, int op, bool is_client, uint8_t *buf) {
   } else {
     uint32_t tmp;
     buf[1] = 127;
-    tmp = mg_htonl((uint32_t)((uint64_t) len >> 32));
+    tmp = mg_htonl((uint32_t) ((uint64_t) len >> 32));
     memcpy(&buf[2], &tmp, sizeof(tmp));
-    tmp = mg_htonl((uint32_t)(len & 0xffffffff));
+    tmp = mg_htonl((uint32_t) (len & 0xffffffff));
     memcpy(&buf[6], &tmp, sizeof(tmp));
     n = 10;
   }
@@ -233,7 +233,7 @@ void mg_ws_upgrade(struct mg_connection *c, struct mg_http_message *hm,
     ws_handshake(c, wskey, wsproto, fmt, ap);
     va_end(ap);
     c->is_websocket = 1;
-    mg_call(c, MG_EV_WS_OPEN, &hm);
+    mg_call(c, MG_EV_WS_OPEN, hm);
   }
 }
 
diff --git a/test/unit_test.c b/test/unit_test.c
index 8262a05c..5dc18571 100644
--- a/test/unit_test.c
+++ b/test/unit_test.c
@@ -378,6 +378,8 @@ static void eh1(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
       mg_http_serve_dir(c, hm, &sopts);
     }
   } else if (ev == MG_EV_WS_OPEN) {
+    struct mg_http_message *hm = (struct mg_http_message *) ev_data;
+    ASSERT(mg_strcmp(hm->uri, mg_str("/ws")) == 0);
     mg_ws_send(c, "opened", 6, WEBSOCKET_OP_BINARY);
   } else if (ev == MG_EV_WS_MSG) {
     struct mg_ws_message *wm = (struct mg_ws_message *) ev_data;