fix: get correct agent registry

Author: achingbrain

src/conn.c

@@ -39,12 +39,6 @@ typedef struct conn_mode_entry {
 
 } conn_mode_entry_t;
 
-typedef struct conn_impl {
-	conn_registry_t *registry;
-	timestamp_t next_timestamp;
-	bool finished;
-} conn_impl_t;
-
 #define MODE_ENTRIES_SIZE 3
 
 static conn_mode_entry_t mode_entries[MODE_ENTRIES_SIZE] = {
@@ -77,6 +71,58 @@ static conn_registry_t *get_registry(conn_mode_entry_t *entry, uint16_t port) {
 	return NULL;
 }
 
+static conn_registry_t *get_agent_registry(conn_mode_entry_t *entry, juice_agent_t *agent) {
+	for (int i = 0; i < entry->registries_size; i++) {
+		if (!entry->registries[i]) {
+			continue;
+		}
+
+		conn_registry_t *registry = entry->registries[i];
+
+		for (int j = 0; j < registry->agents_size; j++) {
+			if (registry->agents[j] == agent) {
+				return registry;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+static int add_registry(conn_mode_entry_t *entry, conn_registry_t *registry) {
+	int i = 0;
+		while (i < entry->registries_size && entry->registries[i])
+			++i;
+
+	if (i == entry->registries_size) {
+		int new_size = entry->registries_size * 2;
+
+		if (new_size == 0) {
+			new_size = 1;
+		}
+
+		JLOG_DEBUG("Reallocating registries array, new_size=%d", new_size);
+		assert(new_size > 0);
+
+		conn_registry_t **new_registries =
+				realloc(entry->registries, new_size * sizeof(conn_registry_t *));
+		if (!new_registries) {
+			JLOG_FATAL("Memory reallocation failed for registries array");
+			return -1;
+		}
+
+		entry->registries = new_registries;
+		entry->registries_size = new_size;
+		memset(entry->registries + i, 0, (new_size - i) * sizeof(conn_registry_t *));
+	}
+
+	entry->registries[i] = registry;
+	registry->registry_index = i;
+	++entry->registries_count;
+
+	return 0;
+}
+
 static int acquire_registry(conn_mode_entry_t *entry, udp_socket_config_t *config) {
 	// entry must be locked
 	conn_registry_t *registry = get_registry(entry, config->port_begin);
@@ -104,11 +150,11 @@ static int acquire_registry(conn_mode_entry_t *entry, udp_socket_config_t *confi
 		registry->agents_count = 0;
 		memset(registry->agents, 0, INITIAL_REGISTRY_SIZE * sizeof(juice_agent_t *));
 
-		registry->port = config->port_begin;
-
 		mutex_init(&registry->mutex, MUTEX_RECURSIVE);
 		mutex_lock(&registry->mutex);
 
+		registry->port = config->port_begin;
+
 		if (entry->registry_init_func(registry, config)) {
 			JLOG_FATAL("Registry initialization failed");
 			mutex_unlock(&registry->mutex);
@@ -117,37 +163,13 @@ static int acquire_registry(conn_mode_entry_t *entry, udp_socket_config_t *confi
 			return -1;
 		}
 
-		int i = 0;
-			while (i < entry->registries_size && entry->registries[i])
-				++i;
-
-		if (i == entry->registries_size) {
-			int new_size = entry->registries_size * 2;
-
-			if (new_size == 0) {
-				new_size = 1;
-			}
-
-			JLOG_DEBUG("Reallocating cb_mux_incomings array, new_size=%d", new_size);
-			assert(new_size > 0);
-
-			conn_registry_t **new_registries =
-					realloc(entry->registries, new_size * sizeof(conn_registry_t *));
-			if (!new_registries) {
-				JLOG_FATAL("Memory reallocation failed for cb_mux_incomings array");
-				mutex_unlock(&registry->mutex);
-				mutex_unlock(&entry->mutex);
-				return -1;
-			}
-
-			entry->registries = new_registries;
-			entry->registries_size = new_size;
-			memset(entry->registries + i, 0, (new_size - i) * sizeof(conn_registry_t *));
+		if (add_registry(entry, registry)) {
+			JLOG_FATAL("Adding registry to entry failed");
+			mutex_unlock(&registry->mutex);
+			free(registry->agents);
+			free(registry);
+			return -1;
 		}
-
-		entry->registries[i] = registry;
-		registry->index = i;
-		++entry->registries_count;
 	} else {
 		mutex_lock(&registry->mutex);
 	}
@@ -170,11 +192,11 @@ static void release_registry(conn_mode_entry_t *entry, conn_registry_t *registry
 		if (entry->registry_cleanup_func)
 			entry->registry_cleanup_func(registry);
 
-		if (registry->index > -1) {
-			int i = registry->index;
+		if (registry->registry_index > -1) {
+			int i = registry->registry_index;
 			assert(entry->registries[i] == registry);
 			entry->registries[i] = NULL;
-			registry->index = -1;
+			registry->registry_index = -1;
 		}
 
 		assert(entry->registries_count > 0);
@@ -257,9 +279,7 @@ void conn_destroy(juice_agent_t *agent) {
 	mutex_lock(&entry->mutex);
 
 	JLOG_DEBUG("Destroying connection");
-	conn_impl_t *conn_impl = agent->conn_impl;
-
-	conn_registry_t *registry = conn_impl->registry;
+	conn_registry_t *registry = get_agent_registry(entry, agent);
 	if (registry) {
 		mutex_lock(&registry->mutex);
 

src/conn.h

@@ -25,7 +25,7 @@ typedef struct juice_agent juice_agent_t;
 // See include/juice/juice.h for implemented concurrency modes
 
 typedef struct conn_registry {
-	int index;
+	int registry_index;
 	uint16_t port;
 	void *impl;
 	mutex_t mutex;