From f2ff8145820243a05803367d31c8b34e03048706 Mon Sep 17 00:00:00 2001 From: Yawning Angel Date: Thu, 4 Jun 2015 13:53:35 +0000 Subject: Set session_group after the port's data structure has been populated. Fixes #16247, patch by "jojelino". --- src/or/connection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/or/connection.c') diff --git a/src/or/connection.c b/src/or/connection.c index 7db0238b3d..721ee20d27 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1284,6 +1284,8 @@ connection_listener_new(const struct sockaddr *listensockaddr, conn->port = gotPort; tor_addr_copy(&conn->addr, &addr); + memcpy(&lis_conn->entry_cfg, &port_cfg->entry_cfg, sizeof(entry_port_cfg_t)); + if (port_cfg->entry_cfg.isolation_flags) { lis_conn->entry_cfg.isolation_flags = port_cfg->entry_cfg.isolation_flags; if (port_cfg->entry_cfg.session_group >= 0) { @@ -1299,8 +1301,6 @@ connection_listener_new(const struct sockaddr *listensockaddr, } } - memcpy(&lis_conn->entry_cfg, &port_cfg->entry_cfg, sizeof(entry_port_cfg_t)); - if (type != CONN_TYPE_AP_LISTENER) { lis_conn->entry_cfg.ipv4_traffic = 1; lis_conn->entry_cfg.ipv6_traffic = 1; -- cgit v1.2.3-54-g00ecf