Rename struct mg_connection::label -> data. Make its size configurable

examples/device-dashboard/net.c

@@ -78,7 +78,7 @@ static struct user *getuser(struct mg_http_message *hm) {
 static void send_notification(struct mg_mgr *mgr, const char *fmt, ...) {
   struct mg_connection *c;
   for (c = mgr->conns; c != NULL; c = c->next) {
-    if (c->label[0] == 'W') {
+    if (c->data[0] == 'W') {
       va_list ap;
       va_start(ap, fmt);
       mg_ws_vprintf(c, WEBSOCKET_OP_TEXT, fmt, &ap);
@@ -202,7 +202,7 @@ void device_dashboard_fn(struct mg_connection *c, int ev, void *ev_data,
       }
       mg_http_reply(c, 200, "", "ok\n");
     } else if (mg_http_match_uri(hm, "/api/watch")) {
-      c->label[0] = 'W';  // Mark ourselves as a event listener
+      c->data[0] = 'W';  // Mark ourselves as a event listener
       mg_ws_upgrade(c, hm, NULL);
     } else if (mg_http_match_uri(hm, "/api/login")) {
       mg_http_reply(c, 200, NULL, "{%Q:%Q,%Q:%Q}\n", "user", u->name, "token",

examples/http-client/main.c

@@ -17,10 +17,10 @@ static const uint64_t s_timeout_ms = 1500;  // Connect timeout in milliseconds
 // Print HTTP response and signal that we're done
 static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
   if (ev == MG_EV_OPEN) {
-    // Connection created. Store connect expiration time in c->label
-    *(uint64_t *) c->label = mg_millis() + s_timeout_ms;
+    // Connection created. Store connect expiration time in c->data
+    *(uint64_t *) c->data = mg_millis() + s_timeout_ms;
   } else if (ev == MG_EV_POLL) {
-    if (mg_millis() > *(uint64_t *) c->label &&
+    if (mg_millis() > *(uint64_t *) c->data &&
         (c->is_connecting || c->is_resolving)) {
       mg_error(c, "Connect timeout");
     }

examples/json-rpc-over-websocket/main.c

@@ -30,7 +30,7 @@ static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
   if (ev == MG_EV_OPEN) {
     // c->is_hexdumping = 1;
   } else if (ev == MG_EV_WS_OPEN) {
-    c->label[0] = 'W';  // Mark this connection as an established WS client
+    c->data[0] = 'W';  // Mark this connection as an established WS client
   } else if (ev == MG_EV_HTTP_MSG) {
     struct mg_http_message *hm = (struct mg_http_message *) ev_data;
     if (mg_http_match_uri(hm, "/websocket")) {
@@ -58,7 +58,7 @@ static void timer_fn(void *arg) {
   struct mg_mgr *mgr = (struct mg_mgr *) arg;
   // Broadcast message to all connected websocket clients.
   for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) {
-    if (c->label[0] != 'W') continue;
+    if (c->data[0] != 'W') continue;
     mg_ws_printf(c, WEBSOCKET_OP_TEXT, "{%Q:%Q,%Q:[%d,%d,%d]}", "method",
                  "notification1", "params", 1, 2, 3);
   }

examples/live-log/main.c

@@ -14,7 +14,7 @@ static void cb(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
       struct mg_http_serve_opts opts = {.root_dir = NULL};
       mg_http_serve_file(c, hm, "log.txt", &opts);
     } else if (mg_http_match_uri(hm, "/api/log/live")) {
-      c->label[0] = 'L';  // Mark that connection as live log listener
+      c->data[0] = 'L';  // Mark that connection as live log listener
       mg_printf(c, "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n");
     } else {
       struct mg_http_serve_opts opts = {.root_dir = "web_root"};
@@ -34,7 +34,7 @@ static void log_message(const char *filename, const char *message) {
 static void broadcast_message(struct mg_mgr *mgr, const char *message) {
   struct mg_connection *c;
   for (c = mgr->conns; c != NULL; c = c->next) {
-    if (c->label[0] == 'L') mg_http_printf_chunk(c, "%s", message);
+    if (c->data[0] == 'L') mg_http_printf_chunk(c, "%s", message);
   }
 }
 

examples/mqtt-client-aws-iot/main.c

@@ -55,13 +55,13 @@ static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
     MG_INFO(("Connected to %s", s_url));
     MG_INFO(("Subscribing to %s", s_rx_topic));
     mg_mqtt_sub(c, topic, s_qos);
-    c->label[0] = 'X';  // Set a label that we're logged in
+    c->data[0] = 'X';  // Set a label that we're logged in
   } else if (ev == MG_EV_MQTT_MSG) {
     // When we receive MQTT message, print it
     struct mg_mqtt_message *mm = (struct mg_mqtt_message *) ev_data;
     MG_INFO(("Received on %.*s : %.*s", (int) mm->topic.len, mm->topic.ptr,
              (int) mm->data.len, mm->data.ptr));
-  } else if (ev == MG_EV_POLL && c->label[0] == 'X') {
+  } else if (ev == MG_EV_POLL && c->data[0] == 'X') {
     static unsigned long prev_second;
     unsigned long now_second = (*(unsigned long *) ev_data) / 1000;
     if (now_second != prev_second) {

examples/smtp-client/main.c

@@ -15,7 +15,7 @@ static bool s_quit;
 enum { EHLO, STARTTLS, STARTTLS_WAIT, AUTH, FROM, TO, DATA, BODY, QUIT, END };
 
 static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
-  uint8_t *state = (uint8_t *) c->label;
+  uint8_t *state = (uint8_t *) c->data;
   if (ev == MG_EV_OPEN) {
     // c->is_hexdumping = 1;
   } else if (ev == MG_EV_READ) {

examples/socks5-server/main.c

@@ -55,7 +55,7 @@ static void handshake(struct mg_connection *c) {
     }
     mg_iobuf_del(r, 0, 2 + r->buf[1]);
     mg_send(c, reply, sizeof(reply));
-    c->label[0] = STATE_REQUEST;
+    c->data[0] = STATE_REQUEST;
   }
 }
 
@@ -146,15 +146,15 @@ static void request(struct mg_connection *c) {
   }
   mg_send(c, r->buf + 3, addr_len + 1 + 2);
   mg_iobuf_del(r, 0, 6 + addr_len);  // Remove request from the input stream
-  c->label[0] = STATE_ESTABLISHED;   // Mark ourselves as connected
+  c->data[0] = STATE_ESTABLISHED;   // Mark ourselves as connected
 }
 
 static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
   if (ev == MG_EV_READ) {
     // We use the first label byte as a state
-    if (c->label[0] == STATE_HANDSHAKE) handshake(c);
-    if (c->label[0] == STATE_REQUEST) request(c);
-    if (c->label[0] == STATE_ESTABLISHED) exchange(c);
+    if (c->data[0] == STATE_HANDSHAKE) handshake(c);
+    if (c->data[0] == STATE_REQUEST) request(c);
+    if (c->data[0] == STATE_ESTABLISHED) exchange(c);
   } else if (ev == MG_EV_CLOSE) {
     disband(c);
   }

examples/timers/main.c

@@ -16,7 +16,7 @@ static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
     struct mg_http_message *hm = (struct mg_http_message *) ev_data;
     if (mg_http_match_uri(hm, "/websocket")) {
       mg_ws_upgrade(c, hm, NULL);  // Upgrade HTTP to Websocket
-      c->label[0] = 'W';           // Set some unique mark on a connection
+      c->data[0] = 'W';           // Set some unique mark on a connection
     } else {
       // Serve static files
       struct mg_http_serve_opts opts = {.root_dir = s_web_root};
@@ -37,7 +37,7 @@ static void timer_fn(void *arg) {
   // Traverse over all connections
   for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) {
     // Send only to marked connections
-    if (c->label[0] == 'W') mg_ws_send(c, "hi", 2, WEBSOCKET_OP_TEXT);
+    if (c->data[0] == 'W') mg_ws_send(c, "hi", 2, WEBSOCKET_OP_TEXT);
   }
 }
 

examples/uart-bridge/net.c

@@ -62,7 +62,7 @@ static void ws_fn(struct mg_connection *c, int ev, void *evd, void *fnd) {
     mg_ws_upgrade(c, evd, NULL);
   } else if (ev == MG_EV_WS_OPEN) {
     // c->is_hexdumping = 1;
-    c->label[0] = 'W';  // When WS handhake is done, mark us as WS client
+    c->data[0] = 'W';  // When WS handhake is done, mark us as WS client
   } else if (ev == MG_EV_WS_MSG) {
     struct mg_ws_message *wm = (struct mg_ws_message *) evd;
     uart_write(wm->data.ptr, wm->data.len);  // Send to UART
@@ -77,7 +77,7 @@ static void ws_fn(struct mg_connection *c, int ev, void *evd, void *fnd) {
 static void tcp_fn(struct mg_connection *c, int ev, void *evd, void *fnd) {
   if (ev == MG_EV_ACCEPT) {
     // c->is_hexdumping = 1;
-    c->label[0] = 'T';  // When client is connected, mark us as TCP client
+    c->data[0] = 'T';  // When client is connected, mark us as TCP client
   } else if (ev == MG_EV_READ) {
     uart_write(c->recv.buf, c->recv.len);  // Send to UART
     c->recv.len = 0;                       // Discard received data
@@ -99,7 +99,7 @@ static void mq_fn(struct mg_connection *c, int ev, void *evd, void *fnd) {
   if (ev == MG_EV_OPEN) {
     // c->is_hexdumping = 1;
   } else if (ev == MG_EV_MQTT_OPEN) {
-    c->label[0] = 'M';
+    c->data[0] = 'M';
     mg_mqtt_sub(c, mqtt_topic("rx", "b/rx"), 1);  // Subscribe to RX topic
   } else if (ev == MG_EV_MQTT_MSG) {
     struct mg_mqtt_message *mm = evd;        // MQTT message
@@ -131,9 +131,9 @@ static void timer_fn(void *param) {
   if (len > 0) {
     // Iterate over all connections. Send data to WS and TCP clients
     for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) {
-      if (c->label[0] == 'W') mg_ws_send(c, buf, len, WEBSOCKET_OP_TEXT);
-      if (c->label[0] == 'T') mg_send(c, buf, len);
-      if (c->label[0] == 'M')
+      if (c->data[0] == 'W') mg_ws_send(c, buf, len, WEBSOCKET_OP_TEXT);
+      if (c->data[0] == 'T') mg_send(c, buf, len);
+      if (c->data[0] == 'M')
         mg_mqtt_pub(c, mqtt_topic("tx", "b/tx"), mg_str_n(buf, len), 1, false);
     }
   }

examples/udp-ssdp-search/main.c

@@ -10,8 +10,8 @@ static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
   if (ev == MG_EV_OPEN) {
     //    c->is_hexdumping = 1;
   } else if (ev == MG_EV_RESOLVE) {
-    // c->rem gets populated with multicast address. Store it in c->label
-    memcpy(c->label, &c->rem, sizeof(c->rem));
+    // c->rem gets populated with multicast address. Store it in c->data
+    memcpy(c->data, &c->rem, sizeof(c->rem));
   } else if (ev == MG_EV_READ) {
     MG_INFO(("Got a response"));
     struct mg_http_message hm;
@@ -32,7 +32,7 @@ static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
     // We can now do mg_printf(c, "haha"); to respond back to the remote side.
     // But in our case, we should restore the multicast address in order
     // to have next search to go to the multicast address
-    memcpy(&c->rem, c->label, sizeof(c->rem));
+    memcpy(&c->rem, c->data, sizeof(c->rem));
     // Discard the content of this response as we expect each SSDP response
     // to generate at most one MG_EV_READ event.
     c->recv.len = 0UL;

examples/video-stream/main.c

@@ -10,7 +10,7 @@ static void cb(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
   if (ev == MG_EV_HTTP_MSG) {
     struct mg_http_message *hm = (struct mg_http_message *) ev_data;
     if (mg_http_match_uri(hm, "/api/video1")) {
-      c->label[0] = 'S';  // Mark that connection as live streamer
+      c->data[0] = 'S';  // Mark that connection as live streamer
       mg_printf(
           c, "%s",
           "HTTP/1.0 200 OK\r\n"
@@ -36,7 +36,7 @@ static void broadcast_mjpeg_frame(struct mg_mgr *mgr) {
   char *data = mg_file_read(&mg_fs_posix, path, &size);  // Read next file
   struct mg_connection *c;
   for (c = mgr->conns; c != NULL; c = c->next) {
-    if (c->label[0] != 'S') continue;         // Skip non-stream connections
+    if (c->data[0] != 'S') continue;         // Skip non-stream connections
     if (data == NULL || size == 0) continue;  // Skip on file read error
     mg_printf(c,
               "--foo\r\nContent-Type: image/jpeg\r\n"

examples/webui-push-ws/main.c

@@ -15,7 +15,7 @@ static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
     struct mg_http_message *hm = (struct mg_http_message *) ev_data;
     if (mg_http_match_uri(hm, "/api/watch")) {
       mg_ws_upgrade(c, hm, NULL);  // Upgrade HTTP to Websocket
-      c->label[0] = 'W';           // Set some unique mark on the connection
+      c->data[0] = 'W';           // Set some unique mark on the connection
     } else {
       struct mg_http_serve_opts opts = {.root_dir = s_web_root};
       mg_http_serve_dir(c, ev_data, &opts);
@@ -28,7 +28,7 @@ static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
 static void push(struct mg_mgr *mgr, const char *name, const void *data) {
   struct mg_connection *c;
   for (c = mgr->conns; c != NULL; c = c->next) {
-    if (c->label[0] != 'W') continue;
+    if (c->data[0] != 'W') continue;
     mg_ws_printf(c, WEBSOCKET_OP_TEXT, "{%Q:%Q,%Q:%Q}", "name", name, "data",
                  data);
   }

examples/zephyr/device-dashboard/src/net.c

@@ -78,7 +78,7 @@ static struct user *getuser(struct mg_http_message *hm) {
 static void send_notification(struct mg_mgr *mgr, const char *fmt, ...) {
   struct mg_connection *c;
   for (c = mgr->conns; c != NULL; c = c->next) {
-    if (c->label[0] == 'W') {
+    if (c->data[0] == 'W') {
       va_list ap;
       va_start(ap, fmt);
       mg_ws_vprintf(c, WEBSOCKET_OP_TEXT, fmt, &ap);
@@ -201,7 +201,7 @@ void device_dashboard_fn(struct mg_connection *c, int ev, void *ev_data,
       }
       mg_http_reply(c, 200, "", "ok\n");
     } else if (mg_http_match_uri(hm, "/api/watch")) {
-      c->label[0] = 'W';  // Mark ourselves as a event listener
+      c->data[0] = 'W';  // Mark ourselves as a event listener
       mg_ws_upgrade(c, hm, NULL);
     } else if (mg_http_match_uri(hm, "/api/login")) {
       mg_http_reply(c, 200, NULL, "{%Q:%Q,%Q:%Q}\n", "user", u->name, "token",

examples/zephyr/http-client/src/main.c

@@ -16,10 +16,10 @@ static bool done = false;
 // Print HTTP response and signal that we're done
 static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
   if (ev == MG_EV_OPEN) {
-    // Connection created. Store connect expiration time in c->label
-    *(int64_t *) c->label = mg_millis() + s_timeout_ms;
+    // Connection created. Store connect expiration time in c->data
+    *(int64_t *) c->data = mg_millis() + s_timeout_ms;
   } else if (ev == MG_EV_POLL) {
-    if (mg_millis() > *(int64_t *) c->label &&
+    if (mg_millis() > *(int64_t *) c->data &&
         (c->is_connecting || c->is_resolving)) {
       mg_error(c, "Connect timeout");
     }

examples/zephyr/mqtt-aws-client/src/main.c

@@ -32,13 +32,13 @@ static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
     MG_INFO(("Connected to %s", s_url));
     MG_INFO(("Subscribing to %s", s_rx_topic));
     mg_mqtt_sub(c, topic, s_qos);
-    c->label[0] = 'X';  // Set a label that we're logged in
+    c->data[0] = 'X';  // Set a label that we're logged in
   } else if (ev == MG_EV_MQTT_MSG) {
     // When we receive MQTT message, print it
     struct mg_mqtt_message *mm = (struct mg_mqtt_message *) ev_data;
     MG_INFO(("Received on %.*s : %.*s", (int) mm->topic.len, mm->topic.ptr,
              (int) mm->data.len, mm->data.ptr));
-  } else if (ev == MG_EV_POLL && c->label[0] == 'X') {
+  } else if (ev == MG_EV_POLL && c->data[0] == 'X') {
     static unsigned long prev_second;
     unsigned long now_second = (*(unsigned long *) ev_data) / 1000;
     if (now_second != prev_second) {