Use llu int as unique conn id, much simpler than uuid

Author: sonertari

GNUmakefile

@@ -117,11 +117,6 @@ endif
 
 ### Autodetected features
 
-# Autodetect OpenBSD, for uuid_to_string().
-ifeq ($(shell uname),OpenBSD)
-FEATURES+=	-DOPENBSD
-endif
-
 # Autodetect pf
 ifneq ($(wildcard /usr/include/net/pfvar.h),)
 FEATURES+=	-DHAVE_PF

proxy.h

@@ -33,7 +33,6 @@
 #include "pxythrmgr.h"
 
 #include <sys/syslog.h>
-#include <uuid.h>
 
 typedef struct proxy_ctx proxy_ctx_t;
 

pxyconn.c

@@ -126,24 +126,11 @@ pxy_conn_ctx_new(evutil_socket_t fd,
 	}
 	memset(ctx, 0, sizeof(pxy_conn_ctx_t));
 
-	ctx->uuid = malloc(sizeof(uuid_t));
-	if (!ctx->uuid) {
-		log_err_level_printf(LOG_CRIT, "Error allocating memory\n");
-		evutil_closesocket(fd);
-		free(ctx);
-		return NULL;
-	}
+	ctx->id = thrmgr->conn_count++;
 
-	uuid_create(ctx->uuid, NULL);
-
-#if defined (DEBUG_PROXY) && defined (OPENBSD)
-	char *uuid_str;
-	uuid_to_string(ctx->uuid, &uuid_str, NULL);
-	if (uuid_str) {
-		log_dbg_level_printf(LOG_DBG_MODE_FINEST, "pxy_conn_ctx_new: uuid=%s, fd=%d\n", uuid_str, fd);
-		free(uuid_str);
-	}
-#endif /* OPENBSD && DEBUG_PROXY */
+#if defined (DEBUG_PROXY)
+	log_dbg_level_printf(LOG_DBG_MODE_FINEST, "pxy_conn_ctx_new: id=%llu, fd=%d\n", ctx->id, fd);
+#endif /* DEBUG_PROXY */
 
 	ctx->fd = fd;
 	ctx->thrmgr = thrmgr;
@@ -427,9 +414,6 @@ pxy_conn_ctx_free(pxy_conn_ctx_t *ctx, int by_requestor)
 	if (ctx->ev) {
 		event_free(ctx->ev);
 	}
-	if (ctx->uuid) {
-		free(ctx->uuid);
-	}
 	if (ctx->sni) {
 		free(ctx->sni);
 	}

pxyconn.h

@@ -130,7 +130,7 @@ struct pxy_conn_ctx {
 	pxy_thr_ctx_t *thr;
 
 	// Unique id of the conn
-	uuid_t *uuid;
+	long long unsigned int id;
 
 	pxy_thrmgr_ctx_t *thrmgr;
 	proxyspec_t *spec;

pxythrmgr.c

@@ -503,19 +503,19 @@ pxy_thrmgr_remove_conn(pxy_conn_ctx_t *node, pxy_conn_ctx_t **head)
 	assert(*head != NULL);
 
 #ifdef DEBUG_PROXY
-	log_dbg_level_printf(LOG_DBG_MODE_FINEST, "pxy_thrmgr_remove_conn: Removing conn, fd=%d, child_fd=%d\n", node->fd, node->child_fd);
+	log_dbg_level_printf(LOG_DBG_MODE_FINEST, "pxy_thrmgr_remove_conn: Removing conn, id=%llu, fd=%d, child_fd=%d\n", node->id, node->fd, node->child_fd);
 #endif /* DEBUG_PROXY */
 
-	// @attention We may get multiple conns with the same fd combinations, so fds cannot uniquely define a conn; hence the need for uuids.
-    if (uuid_compare(node->uuid, (*head)->uuid, NULL) == 0) {
+	// @attention We may get multiple conns with the same fd combinations, so fds cannot uniquely define a conn; hence the need for unique ids.
+    if (node->id == (*head)->id) {
         *head = (*head)->next;
         return;
     }
 
     pxy_conn_ctx_t *current = (*head)->next;
     pxy_conn_ctx_t *previous = *head;
     while (current != NULL && previous != NULL) {
-        if (uuid_compare(node->uuid, current->uuid, NULL) == 0) {
+        if (node->id == current->id) {
             previous->next = current->next;
             return;
         }

pxythrmgr.h

@@ -72,6 +72,7 @@ struct pxy_thrmgr_ctx {
 	opts_t *opts;
 	pxy_thr_ctx_t **thr;
 	pthread_mutex_t mutex;
+	long long unsigned int conn_count;
 };
 
 pxy_thrmgr_ctx_t * pxy_thrmgr_new(opts_t *) MALLOC;