Fix: wrong session id used on relayd lookup
authorDavid Goulet <dgoulet@efficios.com>
Wed, 9 Jan 2013 15:03:38 +0000 (10:03 -0500)
committerDavid Goulet <dgoulet@efficios.com>
Wed, 9 Jan 2013 15:39:55 +0000 (10:39 -0500)
The relayd session id might not be unique with multiple relayd so the
lookup could choose the wrong relayd for the given sessiond session id.

Fixes #419

Signed-off-by: David Goulet <dgoulet@efficios.com>
src/common/consumer.c

index 1045bfb46101d8a6bb63a8c91157f3ffbf5199a2..9df0c484c9bfe4c0a29371ed473b07e846f93e77 100644 (file)
@@ -2941,30 +2941,24 @@ end:
 static struct consumer_relayd_sock_pair *find_relayd_by_session_id(uint64_t id)
 {
        struct lttng_ht_iter iter;
-       struct lttng_ht_node_ulong *node;
        struct consumer_relayd_sock_pair *relayd = NULL;
-       struct consumer_relayd_session_id *session_id_map;
-
-       /* Get the session id map. */
-       lttng_ht_lookup(relayd_session_id_ht, (void *)((unsigned long) id), &iter);
-       node = lttng_ht_iter_get_node_ulong(&iter);
-       if (node == NULL) {
-               goto end;
-       }
-
-       session_id_map = caa_container_of(node, struct consumer_relayd_session_id,
-                       node);
 
        /* Iterate over all relayd since they are indexed by net_seq_idx. */
        cds_lfht_for_each_entry(consumer_data.relayd_ht->ht, &iter.iter, relayd,
                        node.node) {
-               if (relayd->relayd_session_id == session_id_map->relayd_id) {
+               /*
+                * Check by sessiond id which is unique here where the relayd session
+                * id might not be when having multiple relayd.
+                */
+               if (relayd->sessiond_session_id == id) {
                        /* Found the relayd. There can be only one per id. */
-                       break;
+                       goto found;
                }
        }
 
-end:
+       return NULL;
+
+found:
        return relayd;
 }
 
This page took 0.036313 seconds and 4 git commands to generate.