res_pjsip: Fix infinite recursion when loading transports from realtime

Attempting to load a transport from realtime was forcing asterisk into an
infinite recursion loop.  The first thing transport_apply did was to do a
sorcery retrieve by id for an existing transport of the same name. For files,
this just returns the previous object from res_sorcery_config's internal
container, if any.  For realtime, the res_sourcery_realtime driver looks in the
database and finds the existing row but now it has to rehydrate it into a
sorcery object which means calling... transport_apply.  And so it goes.

The main issue with loading from realtime (apart from the loop) was that
transport stores structures and pointers directly in the ast_sip_transport
structure instead of the separate ast_transport_state structure.  This patch
separates those items into the ast_sip_transport_state structure.  The pattern
is roughly the same as res_pjsip_outbound_registration.

Although all current usages of ast_sip_transport and ast_sip_transport_state
were modified to use the new ast_sip_get_transport_state API, the original
items are left in ast_sip_transport and kept updated to maintain ABI
compatability for third-party modules.  They are marked as deprecated and
noted that they're now in ast_sip_transport_state.

ASTERISK-25606 #close
Reported-by: Martin Moučka

Change-Id: Ic7a836ea8e786e8def51fe3f8cce855ea54f5f19

include/asterisk/res_pjsip.h

@@ -54,34 +54,59 @@ struct pjsip_tpfactory;
 struct pjsip_tls_setting;
 struct pjsip_tpselector;
 
+/*! \brief Maximum number of ciphers supported for a TLS transport */
+#define SIP_TLS_MAX_CIPHERS 64
+
 /*!
  * \brief Structure for SIP transport information
  */
 struct ast_sip_transport_state {
 	/*! \brief Transport itself */
 	struct pjsip_transport *transport;
-
 	/*! \brief Transport factory */
 	struct pjsip_tpfactory *factory;
+	/*!
+	 * Transport id
+	 * \since 13.8.0
+	 */
+	char *id;
+	/*!
+	 * Transport type
+	 * \since 13.8.0
+	 */
+	enum ast_transport type;
+	/*!
+	 * Address and port to bind to
+	 * \since 13.8.0
+	 */
+	pj_sockaddr host;
+	/*!
+	 * TLS settings
+	 * \since 13.8.0
+	 */
+	pjsip_tls_setting tls;
+	/*!
+	 * Configured TLS ciphers
+	 * \since 13.8.0
+	 */
+	pj_ssl_cipher ciphers[SIP_TLS_MAX_CIPHERS];
+	/*!
+	 * Optional local network information, used for NAT purposes
+	 * \since 13.8.0
+	 */
+	struct ast_ha *localnet;
+	/*!
+	 * DNS manager for refreshing the external address
+	 * \since 13.8.0
+	 */
+	struct ast_dnsmgr_entry *external_address_refresher;
+	/*!
+	 * Optional external address information
+	 * \since 13.8.0
+	 */
+	struct ast_sockaddr external_address;
 };
 
-#define SIP_SORCERY_DOMAIN_ALIAS_TYPE "domain_alias"
-
-/*!
- * Details about a SIP domain alias
- */
-struct ast_sip_domain_alias {
-	/*! Sorcery object details */
-	SORCERY_OBJECT(details);
-	AST_DECLARE_STRING_FIELDS(
-		/*! Domain to be aliased to */
-		AST_STRING_FIELD(domain);
-	);
-};
-
-/*! \brief Maximum number of ciphers supported for a TLS transport */
-#define SIP_TLS_MAX_CIPHERS 64
-
 /*
  * \brief Transport to bind to
  */
@@ -108,23 +133,51 @@ struct ast_sip_transport {
 		);
 	/*! Type of transport */
 	enum ast_transport type;
-	/*! Address and port to bind to */
+	/*!
+	 * \deprecated Moved to ast_sip_transport_state
+	 * \version 13.8.0 deprecated
+	 * Address and port to bind to
+	 */
 	pj_sockaddr host;
 	/*! Number of simultaneous asynchronous operations */
 	unsigned int async_operations;
 	/*! Optional external port for signaling */
 	unsigned int external_signaling_port;
-	/*! TLS settings */
+	/*!
+	 * \deprecated Moved to ast_sip_transport_state
+	 * \version 13.7.1 deprecated
+	 * TLS settings
+	 */
 	pjsip_tls_setting tls;
-	/*! Configured TLS ciphers */
+	/*!
+	 * \deprecated Moved to ast_sip_transport_state
+	 * \version 13.7.1 deprecated
+	 * Configured TLS ciphers
+	 */
 	pj_ssl_cipher ciphers[SIP_TLS_MAX_CIPHERS];
-	/*! Optional local network information, used for NAT purposes */
+	/*!
+	 * \deprecated Moved to ast_sip_transport_state
+	 * \version 13.7.1 deprecated
+	 * Optional local network information, used for NAT purposes
+	 */
 	struct ast_ha *localnet;
-	/*! DNS manager for refreshing the external address */
+	/*!
+	 * \deprecated Moved to ast_sip_transport_state
+	 * \version 13.7.1 deprecated
+	 * DNS manager for refreshing the external address
+	 */
 	struct ast_dnsmgr_entry *external_address_refresher;
-	/*! Optional external address information */
+	/*!
+	 * \deprecated Moved to ast_sip_transport_state
+	 * \version 13.7.1 deprecated
+	 * Optional external address information
+	 */
 	struct ast_sockaddr external_address;
-	/*! Transport state information */
+	/*!
+	 * \deprecated
+	 * \version 13.7.1 deprecated
+	 * Transport state information
+	 */
 	struct ast_sip_transport_state *state;
 	/*! QOS DSCP TOS bits */
 	unsigned int tos;
@@ -134,6 +187,20 @@ struct ast_sip_transport {
 	int write_timeout;
 };
 
+#define SIP_SORCERY_DOMAIN_ALIAS_TYPE "domain_alias"
+
+/*!
+ * Details about a SIP domain alias
+ */
+struct ast_sip_domain_alias {
+	/*! Sorcery object details */
+	SORCERY_OBJECT(details);
+	AST_DECLARE_STRING_FIELDS(
+		/*! Domain to be aliased to */
+		AST_STRING_FIELD(domain);
+	);
+};
+
 /*!
  * \brief Structure for SIP nat hook information
  */
@@ -2135,4 +2202,25 @@ const char *ast_sip_get_host_ip_string(int af);
  */
 long ast_sip_threadpool_queue_size(void);
 
+/*!
+ * \brief Retrieve transport state
+ * \since 13.7.1
+ *
+ * @param transport_id
+ * @returns transport_state
+ *
+ * \note ao2_cleanup(...) or ao2_ref(...,  -1) must be called on the returned object
+ */
+struct ast_sip_transport_state *ast_sip_get_transport_state(const char *transport_id);
+
+/*!
+ * \brief Retrieves all transport states
+ * \since 13.7.1
+ *
+ * @returns ao2_container
+ *
+ * \note ao2_cleanup(...) or ao2_ref(...,  -1) must be called on the returned object
+ */
+struct ao2_container *ast_sip_get_transport_states(void);
+
 #endif /* _RES_PJSIP_H */

res/res_pjsip.c

@@ -2482,6 +2482,7 @@ static int sip_dialog_create_from(pj_pool_t *pool, pj_str_t *from, const char *u
 static int sip_get_tpselector_from_endpoint(const struct ast_sip_endpoint *endpoint, pjsip_tpselector *selector)
 {
 	RAII_VAR(struct ast_sip_transport *, transport, NULL, ao2_cleanup);
+	RAII_VAR(struct ast_sip_transport_state *, transport_state, NULL, ao2_cleanup);
 	const char *transport_name = endpoint->transport;
 
 	if (ast_strlen_zero(transport_name)) {
@@ -2489,19 +2490,20 @@ static int sip_get_tpselector_from_endpoint(const struct ast_sip_endpoint *endpo
 	}
 
 	transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", transport_name);
+	transport_state = ast_sip_get_transport_state(transport_name);
 
-	if (!transport || !transport->state) {
+	if (!transport || !transport_state) {
 		ast_log(LOG_ERROR, "Unable to retrieve PJSIP transport '%s' for endpoint '%s'\n",
 			transport_name, ast_sorcery_object_get_id(endpoint));
 		return -1;
 	}
 
-	if (transport->state->transport) {
+	if (transport_state->transport) {
 		selector->type = PJSIP_TPSELECTOR_TRANSPORT;
-		selector->u.transport = transport->state->transport;
-	} else if (transport->state->factory) {
+		selector->u.transport = transport_state->transport;
+	} else if (transport_state->factory) {
 		selector->type = PJSIP_TPSELECTOR_LISTENER;
-		selector->u.listener = transport->state->factory;
+		selector->u.listener = transport_state->factory;
 	} else if (transport->type == AST_TRANSPORT_WS || transport->type == AST_TRANSPORT_WSS) {
 		/* The WebSocket transport has no factory as it can not create outgoing connections, so
 		 * even if an endpoint is locked to a WebSocket transport we let the PJSIP logic

res/res_pjsip/config_transport.c

@@ -31,6 +31,82 @@
 #include "include/res_pjsip_private.h"
 #include "asterisk/http_websocket.h"
 
+#define MAX_POINTER_STRING 33
+
+/*! \brief Default number of state container buckets */
+#define DEFAULT_STATE_BUCKETS 53
+static struct ao2_container *transport_states;
+
+struct internal_state {
+	char *id;
+	/*! Set if there was a change detected */
+	int change_detected;
+	/*! \brief Transport configuration object */
+	struct ast_sip_transport *transport;
+	/*! \brief Transport state information */
+	struct ast_sip_transport_state *state;
+};
+
+static void temp_state_store_cleanup(void *data)
+{
+	struct ast_sip_transport_state **temp_state = data;
+
+	ao2_cleanup(*temp_state);
+	ast_free(data);
+}
+
+AST_THREADSTORAGE_CUSTOM(temp_state_store, NULL, temp_state_store_cleanup);
+
+/*! \brief hashing function for state objects */
+static int internal_state_hash(const void *obj, const int flags)
+{
+	const struct internal_state *object;
+	const char *key;
+
+	switch (flags & OBJ_SEARCH_MASK) {
+	case OBJ_SEARCH_KEY:
+		key = obj;
+		break;
+	case OBJ_SEARCH_OBJECT:
+		object = obj;
+		key = object->id;
+		break;
+	default:
+		ast_assert(0);
+		return 0;
+	}
+	return ast_str_hash(key);
+}
+
+/*! \brief comparator function for state objects */
+static int internal_state_cmp(void *obj, void *arg, int flags)
+{
+	const struct internal_state *object_left = obj;
+	const struct internal_state *object_right = arg;
+	const char *right_key = arg;
+	int cmp;
+
+	switch (flags & OBJ_SEARCH_MASK) {
+	case OBJ_SEARCH_OBJECT:
+		right_key = object_right->id;
+		/* Fall through */
+	case OBJ_SEARCH_KEY:
+		cmp = strcmp(object_left->id, right_key);
+		break;
+	case OBJ_SEARCH_PARTIAL_KEY:
+		/* Not supported by container. */
+		ast_assert(0);
+		return 0;
+	default:
+		cmp = 0;
+		break;
+	}
+	if (cmp) {
+		return 0;
+	}
+	return CMP_MATCH;
+}
+
 static int sip_transport_to_ami(const struct ast_sip_transport *transport,
 				struct ast_str **buf)
 {
@@ -75,69 +151,206 @@ struct ast_sip_endpoint_formatter endpoint_transport_formatter = {
 	.format_ami = format_ami_endpoint_transport
 };
 
-static int destroy_transport_state(void *data)
+static void set_qos(struct ast_sip_transport *transport, pj_qos_params *qos)
+{
+	int tos_as_dscp = transport->tos >> 2;
+
+	if (transport->tos) {
+		qos->flags |= PJ_QOS_PARAM_HAS_DSCP;
+		qos->dscp_val = tos_as_dscp;
+	}
+	if (transport->cos) {
+		qos->flags |= PJ_QOS_PARAM_HAS_SO_PRIO;
+		qos->so_prio = transport->cos;
+	}
+}
+
+/*! \brief Destructor for transport */
+static void sip_transport_destroy(void *obj)
+{
+	struct ast_sip_transport *transport = obj;
+
+	ast_string_field_free_memory(transport);
+}
+
+/*! \brief Allocator for transport */
+static void *sip_transport_alloc(const char *name)
+{
+	struct ast_sip_transport *transport = ast_sorcery_generic_alloc(sizeof(*transport), sip_transport_destroy);
+
+	if (!transport) {
+		return NULL;
+	}
+
+	if (ast_string_field_init(transport, 256)) {
+		ao2_cleanup(transport);
+		return NULL;
+	}
+
+	return transport;
+}
+
+static int destroy_sip_transport_state(void *data)
 {
-	pjsip_transport *transport = data;
-	pjsip_transport_shutdown(transport);
+	struct ast_sip_transport_state *transport_state = data;
+
+	ast_free(transport_state->id);
+	ast_free_ha(transport_state->localnet);
+
+	if (transport_state->external_address_refresher) {
+		ast_dnsmgr_release(transport_state->external_address_refresher);
+	}
+	if (transport_state->transport) {
+		pjsip_transport_shutdown(transport_state->transport);
+	}
+
 	return 0;
 }
 
-/*! \brief Destructor for transport state information */
-static void transport_state_destroy(void *obj)
+/*! \brief Destructor for ast_sip_transport state information */
+static void sip_transport_state_destroy(void *obj)
 {
 	struct ast_sip_transport_state *state = obj;
 
-	if (state->transport) {
-		ast_sip_push_task_synchronous(NULL, destroy_transport_state, state->transport);
+	ast_sip_push_task_synchronous(NULL, destroy_sip_transport_state, state);
+}
+
+/*! \brief Destructor for ast_sip_transport state information */
+static void internal_state_destroy(void *obj)
+{
+	struct internal_state *state = obj;
+
+	ast_free(state->id);
+	ao2_cleanup(state->transport);
+	ao2_cleanup(state->state);
+}
+
+static struct internal_state *find_internal_state_by_transport(const struct ast_sip_transport *transport)
+{
+	const char *key = ast_sorcery_object_get_id(transport);
+
+	return ao2_find(transport_states, key, OBJ_SEARCH_KEY | OBJ_NOLOCK);
+}
+
+static struct ast_sip_transport_state *find_state_by_transport(const struct ast_sip_transport *transport)
+{
+	struct internal_state *state;
+
+	state = find_internal_state_by_transport(transport);
+	if (!state) {
+		return NULL;
 	}
+	ao2_bump(state->state);
+	ao2_cleanup(state);
+
+	return state->state;
 }
 
-/*! \brief Destructor for transport */
-static void transport_destroy(void *obj)
+static int remove_temporary_state(void)
 {
-	struct ast_sip_transport *transport = obj;
+	struct ast_sip_transport_state **state;
 
-	ast_string_field_free_memory(transport);
-	ast_free_ha(transport->localnet);
+	state = ast_threadstorage_get(&temp_state_store, sizeof(state));
+	if (!state) {
+		return -1;
+	}
+
+	ao2_cleanup(*state);
+	*state = NULL;
+	return 0;
+}
 
-	if (transport->external_address_refresher) {
-		ast_dnsmgr_release(transport->external_address_refresher);
+static struct ast_sip_transport_state *find_temporary_state(struct ast_sip_transport *transport)
+{
+	struct ast_sip_transport_state **state;
+
+	state = ast_threadstorage_get(&temp_state_store, sizeof(state));
+	if (state && *state) {
+		ao2_ref(*state, +1);
+		return *state;
 	}
 
-	ao2_cleanup(transport->state);
+	return NULL;
 }
 
-/*! \brief Allocator for transport */
-static void *transport_alloc(const char *name)
+static struct internal_state *internal_state_alloc(struct ast_sip_transport *transport)
 {
-	struct ast_sip_transport *transport = ast_sorcery_generic_alloc(sizeof(*transport), transport_destroy);
+	struct internal_state *internal_state;
 
-	if (!transport) {
+	internal_state = ao2_alloc(sizeof(*internal_state), internal_state_destroy);
+	if (!internal_state) {
 		return NULL;
 	}
 
-	if (ast_string_field_init(transport, 256)) {
-		ao2_cleanup(transport);
+	internal_state->id = ast_strdup(ast_sorcery_object_get_id(transport));
+	if (!internal_state->id) {
+		ao2_cleanup(internal_state);
 		return NULL;
 	}
 
-	pjsip_tls_setting_default(&transport->tls);
-	transport->tls.ciphers = transport->ciphers;
+	/* We're transferring the reference from find_temporary_state */
+	internal_state->state = find_temporary_state(transport);
+	if (!internal_state->state) {
+		ao2_cleanup(internal_state);
+		return NULL;
+	}
+	internal_state->transport = ao2_bump(transport);
+	internal_state->transport->state = internal_state->state;
+	remove_temporary_state();
 
-	return transport;
+	return internal_state;
 }
 
-static void set_qos(struct ast_sip_transport *transport, pj_qos_params *qos)
+/*!
+ * \internal
+ * \brief Should only be called by the individual field handlers
+ */
+static struct ast_sip_transport_state *find_or_create_temporary_state(struct ast_sip_transport *transport)
 {
-	int tos_as_dscp = transport->tos >> 2;
+	struct ast_sip_transport_state **state;
+	struct ast_sip_transport_state *new_state;
 
-	if (transport->tos) {
-		qos->flags |= PJ_QOS_PARAM_HAS_DSCP;
-		qos->dscp_val = tos_as_dscp;
+	if ((new_state = find_temporary_state(transport))) {
+		return new_state;
 	}
-	if (transport->cos) {
-		qos->flags |= PJ_QOS_PARAM_HAS_SO_PRIO;
-		qos->so_prio = transport->cos;
+
+	state = ast_threadstorage_get(&temp_state_store, sizeof(state));
+	if (!state || *state) {
+		return NULL;
+	}
+
+	new_state = ao2_alloc(sizeof(**state), sip_transport_state_destroy);
+	if (!new_state) {
+		return NULL;
+	}
+	new_state->id = ast_strdup(ast_sorcery_object_get_id(transport));
+	new_state->type = transport->type;
+
+	pjsip_tls_setting_default(&new_state->tls);
+	new_state->tls.ciphers = new_state->ciphers;
+
+	ao2_ref(new_state, +1);
+	*state = new_state;
+
+	return new_state;
+}
+
+static void copy_state_to_transport(struct ast_sip_transport *transport)
+{
+	ast_assert(transport && transport->state);
+
+	memcpy(&transport->host, &transport->state->host, sizeof(transport->host));
+	memcpy(&transport->tls, &transport->state->tls, sizeof(transport->tls));
+	memcpy(&transport->ciphers, &transport->state->ciphers, sizeof(transport->ciphers));
+	transport->localnet = transport->state->localnet;
+	transport->external_address_refresher = transport->state->external_address_refresher;
+	memcpy(&transport->external_address, &transport->state->external_address, sizeof(transport->external_address));
+}
+
+static void states_cleanup(void *states)
+{
+	if (states) {
+		ao2_unlock(states);
 	}
 }
 
@@ -145,64 +358,87 @@ static void set_qos(struct ast_sip_transport *transport, pj_qos_params *qos)
 static int transport_apply(const struct ast_sorcery *sorcery, void *obj)
 {
 	struct ast_sip_transport *transport = obj;
-	RAII_VAR(struct ast_sip_transport *, existing, ast_sorcery_retrieve_by_id(sorcery, "transport", ast_sorcery_object_get_id(obj)), ao2_cleanup);
+	const char *transport_id = ast_sorcery_object_get_id(obj);
+	RAII_VAR(struct ao2_container *, states, transport_states, states_cleanup);
+	RAII_VAR(struct internal_state *, temp_state, NULL, ao2_cleanup);
+	RAII_VAR(struct internal_state *, perm_state, NULL, ao2_cleanup);
+	RAII_VAR(struct ast_variable *, changes, NULL, ast_variables_destroy);
 	pj_status_t res = -1;
 
-	if (!existing || !existing->state) {
-		if (!(transport->state = ao2_alloc(sizeof(*transport->state), transport_state_destroy))) {
-			ast_log(LOG_ERROR, "Transport state for '%s' could not be allocated\n", ast_sorcery_object_get_id(obj));
-			return -1;
+	if (!states) {
+		return -1;
+	}
+
+	/*
+	 * transport_apply gets called for EVERY retrieval of a transport when using realtime.
+	 * We need to prevent multiple threads from trying to mess with underlying transports
+	 * at the same time.  The container is the only thing we have to lock on.
+	 */
+	ao2_wrlock(states);
+
+	perm_state = find_internal_state_by_transport(transport);
+	if (perm_state) {
+		ast_sorcery_diff(sorcery, perm_state->transport, transport, &changes);
+		if (changes) {
+			if (!perm_state->change_detected) {
+				perm_state->change_detected = 1;
+				ast_log(LOG_WARNING, "Transport '%s' is not reloadable, maintaining previous values\n", transport_id);
+			}
 		}
-	} else {
-		transport->state = existing->state;
-		ao2_ref(transport->state, +1);
+
+		/* In case someone is using the deprecated fields, reset them */
+		transport->state = perm_state->state;
+		copy_state_to_transport(transport);
+		ao2_replace(perm_state->transport, transport);
+		return 0;
 	}
 
-	/* Once active a transport can not be reconfigured */
-	if (transport->state->transport || transport->state->factory) {
-		return -1;
+	temp_state = internal_state_alloc(transport);
+	if (!temp_state) {
+		ast_log(LOG_ERROR, "Transport '%s' failed to allocate memory\n", transport_id);
+		goto error;
 	}
 
-	if (transport->host.addr.sa_family != PJ_AF_INET && transport->host.addr.sa_family != PJ_AF_INET6) {
-		ast_log(LOG_ERROR, "Transport '%s' could not be started as binding not specified\n", ast_sorcery_object_get_id(obj));
-		return -1;
+	if (temp_state->state->host.addr.sa_family != PJ_AF_INET && temp_state->state->host.addr.sa_family != PJ_AF_INET6) {
+		ast_log(LOG_ERROR, "Transport '%s' could not be started as binding not specified\n", transport_id);
+		goto error;
 	}
 
 	/* Set default port if not present */
-	if (!pj_sockaddr_get_port(&transport->host)) {
-		pj_sockaddr_set_port(&transport->host, (transport->type == AST_TRANSPORT_TLS) ? 5061 : 5060);
+	if (!pj_sockaddr_get_port(&temp_state->state->host)) {
+		pj_sockaddr_set_port(&temp_state->state->host, (transport->type == AST_TRANSPORT_TLS) ? 5061 : 5060);
 	}
 
 	/* Now that we know what address family we can set up a dnsmgr refresh for the external media address if present */
 	if (!ast_strlen_zero(transport->external_signaling_address)) {
-		if (transport->host.addr.sa_family == pj_AF_INET()) {
-			transport->external_address.ss.ss_family = AF_INET;
-		} else if (transport->host.addr.sa_family == pj_AF_INET6()) {
-			transport->external_address.ss.ss_family = AF_INET6;
+		if (temp_state->state->host.addr.sa_family == pj_AF_INET()) {
+			temp_state->state->external_address.ss.ss_family = AF_INET;
+		} else if (temp_state->state->host.addr.sa_family == pj_AF_INET6()) {
+			temp_state->state->external_address.ss.ss_family = AF_INET6;
 		} else {
 			ast_log(LOG_ERROR, "Unknown address family for transport '%s', could not get external signaling address\n",
-					ast_sorcery_object_get_id(obj));
-			return -1;
+					transport_id);
+			goto error;
 		}
 
-		if (ast_dnsmgr_lookup(transport->external_signaling_address, &transport->external_address, &transport->external_address_refresher, NULL) < 0) {
-			ast_log(LOG_ERROR, "Could not create dnsmgr for external signaling address on '%s'\n", ast_sorcery_object_get_id(obj));
-			return -1;
+		if (ast_dnsmgr_lookup(transport->external_signaling_address, &temp_state->state->external_address, &temp_state->state->external_address_refresher, NULL) < 0) {
+			ast_log(LOG_ERROR, "Could not create dnsmgr for external signaling address on '%s'\n", transport_id);
+			goto error;
 		}
 	}
 
 	if (transport->type == AST_TRANSPORT_UDP) {
-		if (transport->host.addr.sa_family == pj_AF_INET()) {
-			res = pjsip_udp_transport_start(ast_sip_get_pjsip_endpoint(), &transport->host.ipv4, NULL, transport->async_operations, &transport->state->transport);
-		} else if (transport->host.addr.sa_family == pj_AF_INET6()) {
-			res = pjsip_udp_transport_start6(ast_sip_get_pjsip_endpoint(), &transport->host.ipv6, NULL, transport->async_operations, &transport->state->transport);
+		if (temp_state->state->host.addr.sa_family == pj_AF_INET()) {
+			res = pjsip_udp_transport_start(ast_sip_get_pjsip_endpoint(), &temp_state->state->host.ipv4, NULL, transport->async_operations, &temp_state->state->transport);
+		} else if (temp_state->state->host.addr.sa_family == pj_AF_INET6()) {
+			res = pjsip_udp_transport_start6(ast_sip_get_pjsip_endpoint(), &temp_state->state->host.ipv6, NULL, transport->async_operations, &temp_state->state->transport);
 		}
 
 		if (res == PJ_SUCCESS && (transport->tos || transport->cos)) {
 			pj_sock_t sock;
 			pj_qos_params qos_params;
 
-			sock = pjsip_udp_transport_get_socket(transport->state->transport);
+			sock = pjsip_udp_transport_get_socket(temp_state->state->transport);
 			pj_sock_get_qos_params(sock, &qos_params);
 			set_qos(transport, &qos_params);
 			pj_sock_set_qos_params(sock, &qos_params);
@@ -210,61 +446,23 @@ static int transport_apply(const struct ast_sorcery *sorcery, void *obj)
 	} else if (transport->type == AST_TRANSPORT_TCP) {
 		pjsip_tcp_transport_cfg cfg;
 
-		pjsip_tcp_transport_cfg_default(&cfg, transport->host.addr.sa_family);
-		cfg.bind_addr = transport->host;
+		pjsip_tcp_transport_cfg_default(&cfg, temp_state->state->host.addr.sa_family);
+		cfg.bind_addr = temp_state->state->host;
 		cfg.async_cnt = transport->async_operations;
 		set_qos(transport, &cfg.qos_params);
 
-		res = pjsip_tcp_transport_start3(ast_sip_get_pjsip_endpoint(), &cfg, &transport->state->factory);
+		res = pjsip_tcp_transport_start3(ast_sip_get_pjsip_endpoint(), &cfg, &temp_state->state->factory);
 	} else if (transport->type == AST_TRANSPORT_TLS) {
 		if (transport->async_operations > 1 && ast_compare_versions(pj_get_version(), "2.5.0") < 0) {
 			ast_log(LOG_ERROR, "Transport: %s: When protocol=tls and pjproject version < 2.5.0, async_operations can't be > 1\n",
 					ast_sorcery_object_get_id(obj));
-			return -1;
-		}
-		if (!ast_strlen_zero(transport->ca_list_file)) {
-			if (!ast_file_is_readable(transport->ca_list_file)) {
-				ast_log(LOG_ERROR, "Transport: %s: ca_list_file %s is either missing or not readable\n",
-						ast_sorcery_object_get_id(obj), transport->ca_list_file);
-				return -1;
-			}
-		}
-		transport->tls.ca_list_file = pj_str((char*)transport->ca_list_file);
-#ifdef HAVE_PJ_SSL_CERT_LOAD_FROM_FILES2
-		if (!ast_strlen_zero(transport->ca_list_path)) {
-			if (!ast_file_is_readable(transport->ca_list_path)) {
-				ast_log(LOG_ERROR, "Transport: %s: ca_list_path %s is either missing or not readable\n",
-						ast_sorcery_object_get_id(obj), transport->ca_list_path);
-				return -1;
-			}
-		}
-		transport->tls.ca_list_path = pj_str((char*)transport->ca_list_path);
-#else
-		if (!ast_strlen_zero(transport->ca_list_path)) {
-			ast_log(LOG_WARNING, "Asterisk has been built against a version of pjproject that does not "
-					"support the 'ca_list_path' option. Please upgrade to version 2.4 or later.\n");
+			goto error;
 		}
-#endif
-		if (!ast_strlen_zero(transport->cert_file)) {
-			if (!ast_file_is_readable(transport->cert_file)) {
-				ast_log(LOG_ERROR, "Transport: %s: cert_file %s is either missing or not readable\n",
-						ast_sorcery_object_get_id(obj), transport->cert_file);
-				return -1;
-			}
-		}
-		transport->tls.cert_file = pj_str((char*)transport->cert_file);
-		if (!ast_strlen_zero(transport->privkey_file)) {
-			if (!ast_file_is_readable(transport->privkey_file)) {
-				ast_log(LOG_ERROR, "Transport: %s: privkey_file %s is either missing or not readable\n",
-						ast_sorcery_object_get_id(obj), transport->privkey_file);
-				return -1;
-			}
-		}
-		transport->tls.privkey_file = pj_str((char*)transport->privkey_file);
-		transport->tls.password = pj_str((char*)transport->password);
-		set_qos(transport, &transport->tls.qos_params);
 
-		res = pjsip_tls_transport_start2(ast_sip_get_pjsip_endpoint(), &transport->tls, &transport->host, NULL, transport->async_operations, &transport->state->factory);
+		temp_state->state->tls.password = pj_str((char*)transport->password);
+		set_qos(transport, &temp_state->state->tls.qos_params);
+
+		res = pjsip_tls_transport_start2(ast_sip_get_pjsip_endpoint(), &temp_state->state->tls, &temp_state->state->host, NULL, transport->async_operations, &temp_state->state->factory);
 	} else if ((transport->type == AST_TRANSPORT_WS) || (transport->type == AST_TRANSPORT_WSS)) {
 		if (transport->cos || transport->tos) {
 			ast_log(LOG_WARNING, "TOS and COS values ignored for websocket transport\n");
@@ -277,8 +475,101 @@ static int transport_apply(const struct ast_sorcery *sorcery, void *obj)
 
 		pj_strerror(res, msg, sizeof(msg));
 		ast_log(LOG_ERROR, "Transport '%s' could not be started: %s\n", ast_sorcery_object_get_id(obj), msg);
+		goto error;
+	}
+
+	copy_state_to_transport(transport);
+	ao2_link(states, temp_state);
+
+	return 0;
+
+error:
+	ao2_unlink(states, temp_state);
+	return -1;
+}
+
+/*! \brief Custom handler for type just makes sure the state is created */
+static int transport_state_init(const struct aco_option *opt, struct ast_variable *var, void *obj)
+{
+	struct ast_sip_transport *transport = obj;
+	struct ast_sip_transport_state *state = find_or_create_temporary_state(transport);
+
+	ao2_cleanup(state);
+
+	return 0;
+}
+
+/*! \brief Custom handler for TLS method setting */
+static int transport_tls_file_handler(const struct aco_option *opt, struct ast_variable *var, void *obj)
+{
+	struct ast_sip_transport *transport = obj;
+	RAII_VAR(struct ast_sip_transport_state *, state, find_or_create_temporary_state(transport), ao2_cleanup);
+
+	if (!state) {
+		return -1;
+	}
+
+	if (!ast_file_is_readable(var->value)) {
+		ast_log(LOG_ERROR, "Transport: %s: %s %s is either missing or not readable\n",
+			ast_sorcery_object_get_id(obj), var->name, var->value);
 		return -1;
 	}
+
+	if (!strcasecmp(var->name, "ca_list_file")) {
+		state->tls.ca_list_file = pj_str((char*)var->value);
+		ast_string_field_set(transport, ca_list_file, var->value);
+	} else if (!strcasecmp(var->name, "ca_list_path")) {
+#ifdef HAVE_PJ_SSL_CERT_LOAD_FROM_FILES2
+		state->tls.ca_list_path = pj_str((char*)var->value);
+		ast_string_field_set(transport, ca_list_path, var->value);
+#else
+		ast_log(LOG_WARNING, "Asterisk has been built against a version of pjproject that does not "
+				"support the 'ca_list_path' option. Please upgrade to version 2.4 or later.\n");
+#endif
+	} else if (!strcasecmp(var->name, "cert_file")) {
+		state->tls.cert_file = pj_str((char*)var->value);
+		ast_string_field_set(transport, cert_file, var->value);
+	} else if (!strcasecmp(var->name, "priv_key_file")) {
+		state->tls.privkey_file = pj_str((char*)var->value);
+		ast_string_field_set(transport, privkey_file, var->value);
+	}
+
+	return 0;
+}
+
+static int ca_list_file_to_str(const void *obj, const intptr_t *args, char **buf)
+{
+	const struct ast_sip_transport *transport = obj;
+
+	*buf = ast_strdup(transport->ca_list_file);
+
+	return 0;
+}
+
+static int ca_list_path_to_str(const void *obj, const intptr_t *args, char **buf)
+{
+	const struct ast_sip_transport *transport = obj;
+
+	*buf = ast_strdup(transport->ca_list_path);
+
+	return 0;
+}
+
+static int cert_file_to_str(const void *obj, const intptr_t *args, char **buf)
+{
+	const struct ast_sip_transport *transport = obj;
+
+	*buf = ast_strdup(transport->cert_file);
+
+	return 0;
+}
+
+static int privkey_file_to_str(const void *obj, const intptr_t *args, char **buf)
+{
+	const struct ast_sip_transport *transport = obj;
+
+	*buf = ast_strdup(transport->privkey_file);
+
 	return 0;
 }
 
@@ -328,7 +619,14 @@ static int transport_bind_handler(const struct aco_option *opt, struct ast_varia
 {
 	struct ast_sip_transport *transport = obj;
 	pj_str_t buf;
-	int rc = pj_sockaddr_parse(pj_AF_UNSPEC(), 0, pj_cstr(&buf, var->value), &transport->host);
+	int rc;
+	RAII_VAR(struct ast_sip_transport_state *, state, find_or_create_temporary_state(transport), ao2_cleanup);
+
+	if (!state) {
+		return -1;
+	}
+
+	rc = pj_sockaddr_parse(pj_AF_UNSPEC(), 0, pj_cstr(&buf, var->value), &state->host);
 
 	return rc != PJ_SUCCESS ? -1 : 0;
 }
@@ -336,13 +634,18 @@ static int transport_bind_handler(const struct aco_option *opt, struct ast_varia
 static int transport_bind_to_str(const void *obj, const intptr_t *args, char **buf)
 {
 	const struct ast_sip_transport *transport = obj;
+	RAII_VAR(struct ast_sip_transport_state *, state, find_state_by_transport(transport), ao2_cleanup);
+
+	if (!state) {
+		return -1;
+	}
 
 	if (!(*buf = ast_calloc(MAX_OBJECT_FIELD, sizeof(char)))) {
 		return -1;
 	}
 
 	/* include port as well as brackets if IPv6 */
-	pj_sockaddr_print(&transport->host, *buf, MAX_OBJECT_FIELD, 1 | 2);
+	pj_sockaddr_print(&state->host, *buf, MAX_OBJECT_FIELD, 1 | 2);
 
 	return 0;
 }
@@ -351,13 +654,18 @@ static int transport_bind_to_str(const void *obj, const intptr_t *args, char **b
 static int transport_tls_bool_handler(const struct aco_option *opt, struct ast_variable *var, void *obj)
 {
 	struct ast_sip_transport *transport = obj;
+	RAII_VAR(struct ast_sip_transport_state *, state, find_or_create_temporary_state(transport), ao2_cleanup);
+
+	if (!state) {
+		return -1;
+	}
 
 	if (!strcasecmp(var->name, "verify_server")) {
-		transport->tls.verify_server = ast_true(var->value) ? PJ_TRUE : PJ_FALSE;
+		state->tls.verify_server = ast_true(var->value) ? PJ_TRUE : PJ_FALSE;
 	} else if (!strcasecmp(var->name, "verify_client")) {
-		transport->tls.verify_client = ast_true(var->value) ? PJ_TRUE : PJ_FALSE;
+		state->tls.verify_client = ast_true(var->value) ? PJ_TRUE : PJ_FALSE;
 	} else if (!strcasecmp(var->name, "require_client_cert")) {
-		transport->tls.require_client_cert = ast_true(var->value) ? PJ_TRUE : PJ_FALSE;
+		state->tls.require_client_cert = ast_true(var->value) ? PJ_TRUE : PJ_FALSE;
 	} else {
 		return -1;
 	}
@@ -368,21 +676,42 @@ static int transport_tls_bool_handler(const struct aco_option *opt, struct ast_v
 static int verify_server_to_str(const void *obj, const intptr_t *args, char **buf)
 {
 	const struct ast_sip_transport *transport = obj;
-	*buf = ast_strdup(AST_YESNO(transport->tls.verify_server));
+	RAII_VAR(struct ast_sip_transport_state *, state, find_state_by_transport(transport), ao2_cleanup);
+
+	if (!state) {
+		return -1;
+	}
+
+	*buf = ast_strdup(AST_YESNO(state->tls.verify_server));
+
 	return 0;
 }
 
 static int verify_client_to_str(const void *obj, const intptr_t *args, char **buf)
 {
 	const struct ast_sip_transport *transport = obj;
-	*buf = ast_strdup(AST_YESNO(transport->tls.verify_client));
+	RAII_VAR(struct ast_sip_transport_state *, state, find_state_by_transport(transport), ao2_cleanup);
+
+	if (!state) {
+		return -1;
+	}
+
+	*buf = ast_strdup(AST_YESNO(state->tls.verify_client));
+
 	return 0;
 }
 
 static int require_client_cert_to_str(const void *obj, const intptr_t *args, char **buf)
 {
 	const struct ast_sip_transport *transport = obj;
-	*buf = ast_strdup(AST_YESNO(transport->tls.require_client_cert));
+	RAII_VAR(struct ast_sip_transport_state *, state, find_state_by_transport(transport), ao2_cleanup);
+
+	if (!state) {
+		return -1;
+	}
+
+	*buf = ast_strdup(AST_YESNO(state->tls.require_client_cert));
+
 	return 0;
 }
 
@@ -390,19 +719,24 @@ static int require_client_cert_to_str(const void *obj, const intptr_t *args, cha
 static int transport_tls_method_handler(const struct aco_option *opt, struct ast_variable *var, void *obj)
 {
 	struct ast_sip_transport *transport = obj;
+	RAII_VAR(struct ast_sip_transport_state *, state, find_or_create_temporary_state(transport), ao2_cleanup);
+
+	if (!state) {
+		return -1;
+	}
 
 	if (ast_strlen_zero(var->value) || !strcasecmp(var->value, "default")) {
-		transport->tls.method = PJSIP_SSL_DEFAULT_METHOD;
+		state->tls.method = PJSIP_SSL_DEFAULT_METHOD;
 	} else if (!strcasecmp(var->value, "unspecified")) {
-		transport->tls.method = PJSIP_SSL_UNSPECIFIED_METHOD;
+		state->tls.method = PJSIP_SSL_UNSPECIFIED_METHOD;
 	} else if (!strcasecmp(var->value, "tlsv1")) {
-		transport->tls.method = PJSIP_TLSV1_METHOD;
+		state->tls.method = PJSIP_TLSV1_METHOD;
 	} else if (!strcasecmp(var->value, "sslv2")) {
-		transport->tls.method = PJSIP_SSLV2_METHOD;
+		state->tls.method = PJSIP_SSLV2_METHOD;
 	} else if (!strcasecmp(var->value, "sslv3")) {
-		transport->tls.method = PJSIP_SSLV3_METHOD;
+		state->tls.method = PJSIP_SSLV3_METHOD;
 	} else if (!strcasecmp(var->value, "sslv23")) {
-		transport->tls.method = PJSIP_SSLV23_METHOD;
+		state->tls.method = PJSIP_SSLV23_METHOD;
 	} else {
 		return -1;
 	}
@@ -421,9 +755,16 @@ static const char *tls_method_map[] = {
 static int tls_method_to_str(const void *obj, const intptr_t *args, char **buf)
 {
 	const struct ast_sip_transport *transport = obj;
-	if (ARRAY_IN_BOUNDS(transport->tls.method, tls_method_map)) {
-		*buf = ast_strdup(tls_method_map[transport->tls.method]);
+	RAII_VAR(struct ast_sip_transport_state *, state, find_state_by_transport(transport), ao2_cleanup);
+
+	if (!state) {
+		return -1;
 	}
+
+	if (ARRAY_IN_BOUNDS(state->tls.method, tls_method_map)) {
+		*buf = ast_strdup(tls_method_map[state->tls.method]);
+	}
+
 	return 0;
 }
 
@@ -463,7 +804,7 @@ static pj_ssl_cipher cipher_name_to_id(const char *name)
  * \retval 0 on success.
  * \retval -1 on error.
  */
-static int transport_cipher_add(struct ast_sip_transport *transport, const char *name)
+static int transport_cipher_add(struct ast_sip_transport_state *state, const char *name)
 {
 	pj_ssl_cipher cipher;
 	int idx;
@@ -480,13 +821,13 @@ static int transport_cipher_add(struct ast_sip_transport *transport, const char
 	}
 
 	if (pj_ssl_cipher_is_supported(cipher)) {
-		for (idx = transport->tls.ciphers_num; idx--;) {
-			if (transport->ciphers[idx] == cipher) {
+		for (idx = state->tls.ciphers_num; idx--;) {
+			if (state->ciphers[idx] == cipher) {
 				/* The cipher is already in the list. */
 				return 0;
 			}
 		}
-		transport->ciphers[transport->tls.ciphers_num++] = cipher;
+		state->ciphers[state->tls.ciphers_num++] = cipher;
 		return 0;
 	} else {
 		ast_log(LOG_ERROR, "Cipher '%s' is unsupported\n", name);
@@ -501,6 +842,11 @@ static int transport_tls_cipher_handler(const struct aco_option *opt, struct ast
 	char *parse;
 	char *name;
 	int res = 0;
+	RAII_VAR(struct ast_sip_transport_state *, state, find_or_create_temporary_state(transport), ao2_cleanup);
+
+	if (!state) {
+		return -1;
+	}
 
 	parse = ast_strdupa(S_OR(var->value, ""));
 	while ((name = strsep(&parse, ","))) {
@@ -508,12 +854,12 @@ static int transport_tls_cipher_handler(const struct aco_option *opt, struct ast
 		if (ast_strlen_zero(name)) {
 			continue;
 		}
-		if (ARRAY_LEN(transport->ciphers) <= transport->tls.ciphers_num) {
+		if (ARRAY_LEN(state->ciphers) <= state->tls.ciphers_num) {
 			ast_log(LOG_ERROR, "Too many ciphers specified\n");
 			res = -1;
 			break;
 		}
-		res |= transport_cipher_add(transport, name);
+		res |= transport_cipher_add(state, name);
 	}
 	return res ? -1 : 0;
 }
@@ -543,8 +889,13 @@ static void cipher_to_str(char **buf, const pj_ssl_cipher *ciphers, unsigned int
 static int transport_tls_cipher_to_str(const void *obj, const intptr_t *args, char **buf)
 {
 	const struct ast_sip_transport *transport = obj;
+	RAII_VAR(struct ast_sip_transport_state *, state, find_state_by_transport(transport), ao2_cleanup);
+
+	if (!state) {
+		return -1;
+	}
 
-	cipher_to_str(buf, transport->ciphers, transport->tls.ciphers_num);
+	cipher_to_str(buf, state->ciphers, state->tls.ciphers_num);
 	return *buf ? 0 : -1;
 }
 
@@ -584,14 +935,19 @@ static int transport_localnet_handler(const struct aco_option *opt, struct ast_v
 {
 	struct ast_sip_transport *transport = obj;
 	int error = 0;
+	RAII_VAR(struct ast_sip_transport_state *, state, find_or_create_temporary_state(transport), ao2_cleanup);
+
+	if (!state) {
+		return -1;
+	}
 
 	if (ast_strlen_zero(var->value)) {
-		ast_free_ha(transport->localnet);
-		transport->localnet = NULL;
+		ast_free_ha(state->localnet);
+		state->localnet = NULL;
 		return 0;
 	}
 
-	if (!(transport->localnet = ast_append_ha("d", var->value, transport->localnet, &error))) {
+	if (!(state->localnet = ast_append_ha("d", var->value, state->localnet, &error))) {
 		return -1;
 	}
 
@@ -601,12 +957,16 @@ static int transport_localnet_handler(const struct aco_option *opt, struct ast_v
 static int localnet_to_vl(const void *obj, struct ast_variable **fields)
 {
 	const struct ast_sip_transport *transport = obj;
-
 	char str[MAX_OBJECT_FIELD];
 	struct ast_variable *head = NULL;
-	struct ast_ha *ha = transport->localnet;
+	struct ast_ha *ha;
+	RAII_VAR(struct ast_sip_transport_state *, state, find_state_by_transport(transport), ao2_cleanup);
 
-	for (; ha; ha = ha->next) {
+	if (!state) {
+		return -1;
+	}
+
+	for (ha = state->localnet; ha; ha = ha->next) {
 		const char *addr = ast_strdupa(ast_sockaddr_stringify_addr(&ha->addr));
 		snprintf(str, MAX_OBJECT_FIELD, "%s%s/%s", ha->sense == AST_SENSE_ALLOW ? "!" : "",
 			addr, ast_sockaddr_stringify_addr(&ha->netmask));
@@ -625,8 +985,13 @@ static int localnet_to_str(const void *obj, const intptr_t *args, char **buf)
 {
 	RAII_VAR(struct ast_str *, str, ast_str_create(MAX_OBJECT_FIELD), ast_free);
 	const struct ast_sip_transport *transport = obj;
+	RAII_VAR(struct ast_sip_transport_state *, state, find_state_by_transport(transport), ao2_cleanup);
 
-	ast_ha_join(transport->localnet, &str);
+	if (!state) {
+		return -1;
+	}
+
+	ast_ha_join(state->localnet, &str);
 	*buf = ast_strdup(ast_str_buffer(str));
 	return 0;
 }
@@ -730,10 +1095,15 @@ static int cli_print_body(void *obj, void *arg, int flags)
 	struct ast_sip_transport *transport = obj;
 	struct ast_sip_cli_context *context = arg;
 	char hoststr[PJ_INET6_ADDRSTRLEN];
+	RAII_VAR(struct ast_sip_transport_state *, state, find_state_by_transport(transport), ao2_cleanup);
+
+	if (!state) {
+		return -1;
+	}
 
 	ast_assert(context->output_buffer != NULL);
 
-	pj_sockaddr_print(&transport->host, hoststr, sizeof(hoststr), 3);
+	pj_sockaddr_print(&state->host, hoststr, sizeof(hoststr), 3);
 
 	ast_str_append(&context->output_buffer, 0, "%*s:  %-21s  %6s  %5u  %5u  %s\n",
 		CLI_INDENT_TO_SPACES(context->indent_level), "Transport",
@@ -770,25 +1140,61 @@ static struct ast_cli_entry cli_commands[] = {
 
 static struct ast_sip_cli_formatter_entry *cli_formatter;
 
+struct ast_sip_transport_state *ast_sip_get_transport_state(const char *transport_id)
+{
+	struct internal_state * state = NULL;
+
+	if (!transport_states) {
+		return NULL;
+	}
+
+	state = ao2_find(transport_states, transport_id, OBJ_SEARCH_KEY);
+	if (!state || !state->state) {
+		ao2_cleanup(state);
+		return NULL;
+	}
+
+	ao2_ref(state->state, +1);
+	ao2_ref(state, -1);
+
+	return state->state;
+}
+
+struct ao2_container *ast_sip_get_transport_states(void)
+{
+	return ao2_container_clone(transport_states, 0);
+}
+
 /*! \brief Initialize sorcery with transport support */
 int ast_sip_initialize_sorcery_transport(void)
 {
 	struct ast_sorcery *sorcery = ast_sip_get_sorcery();
+	struct ao2_container *transports = NULL;
+
+	/* Create outbound registration states container. */
+	transport_states = ao2_container_alloc(DEFAULT_STATE_BUCKETS, internal_state_hash, internal_state_cmp);
+	if (!transport_states) {
+		ast_log(LOG_ERROR, "Unable to allocate transport states container\n");
+		return AST_MODULE_LOAD_FAILURE;
+	}
 
 	ast_sorcery_apply_default(sorcery, "transport", "config", "pjsip.conf,criteria=type=transport");
 
-	if (ast_sorcery_object_register_no_reload(sorcery, "transport", transport_alloc, NULL, transport_apply)) {
+	if (ast_sorcery_object_register(sorcery, "transport", sip_transport_alloc, NULL, transport_apply)) {
 		return -1;
 	}
 
-	ast_sorcery_object_field_register(sorcery, "transport", "type", "", OPT_NOOP_T, 0, 0);
+	/* Normally type is a OPT_NOOP_T but we're using it to make sure that state is created */
+	ast_sorcery_object_field_register_custom(sorcery, "transport", "type", "", transport_state_init, NULL, NULL, 0, 0);
 	ast_sorcery_object_field_register_custom(sorcery, "transport", "protocol", "udp", transport_protocol_handler, transport_protocol_to_str, NULL, 0, 0);
 	ast_sorcery_object_field_register_custom(sorcery, "transport", "bind", "", transport_bind_handler, transport_bind_to_str, NULL, 0, 0);
 	ast_sorcery_object_field_register(sorcery, "transport", "async_operations", "1", OPT_UINT_T, 0, FLDSET(struct ast_sip_transport, async_operations));
-	ast_sorcery_object_field_register(sorcery, "transport", "ca_list_file", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_transport, ca_list_file));
-	ast_sorcery_object_field_register(sorcery, "transport", "ca_list_path", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_transport, ca_list_path));
-	ast_sorcery_object_field_register(sorcery, "transport", "cert_file", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_transport, cert_file));
-	ast_sorcery_object_field_register(sorcery, "transport", "priv_key_file", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_transport, privkey_file));
+
+	ast_sorcery_object_field_register_custom(sorcery, "transport", "ca_list_file", "", transport_tls_file_handler, ca_list_file_to_str, NULL, 0, 0);
+	ast_sorcery_object_field_register_custom(sorcery, "transport", "ca_list_path", "", transport_tls_file_handler, ca_list_path_to_str, NULL, 0, 0);
+	ast_sorcery_object_field_register_custom(sorcery, "transport", "cert_file", "", transport_tls_file_handler, cert_file_to_str, NULL, 0, 0);
+	ast_sorcery_object_field_register_custom(sorcery, "transport", "priv_key_file", "", transport_tls_file_handler, privkey_file_to_str, NULL, 0, 0);
+
 	ast_sorcery_object_field_register(sorcery, "transport", "password", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_transport, password));
 	ast_sorcery_object_field_register(sorcery, "transport", "external_signaling_address", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_transport, external_signaling_address));
 	ast_sorcery_object_field_register(sorcery, "transport", "external_signaling_port", "0", OPT_UINT_T, PARSE_IN_RANGE, FLDSET(struct ast_sip_transport, external_signaling_port), 0, 65535);
@@ -822,6 +1228,10 @@ int ast_sip_initialize_sorcery_transport(void)
 	ast_sip_register_cli_formatter(cli_formatter);
 	ast_cli_register_multiple(cli_commands, ARRAY_LEN(cli_commands));
 
+	/* trigger load of transports from realtime by trying to revrieve them all */
+	transports = ast_sorcery_retrieve_by_fields(sorcery, "transport", AST_RETRIEVE_FLAG_ALL | AST_RETRIEVE_FLAG_MULTIPLE, NULL);
+	ao2_cleanup(transports);
+
 	return 0;
 }
 
@@ -832,5 +1242,8 @@ int ast_sip_destroy_sorcery_transport(void)
 
 	internal_sip_unregister_endpoint_formatter(&endpoint_transport_formatter);
 
+	ao2_ref(transport_states, -1);
+	transport_states = NULL;
+
 	return 0;
 }

res/res_pjsip_endpoint_identifier_anonymous.c

@@ -42,14 +42,14 @@ static int get_endpoint_details(pjsip_rx_data *rdata, char *domain, size_t domai
 	return 0;
 }
 
-static int find_transport_in_use(void *obj, void *arg, int flags)
+static int find_transport_state_in_use(void *obj, void *arg, int flags)
 {
-	struct ast_sip_transport *transport = obj;
+	struct ast_sip_transport_state *transport_state = obj;
 	pjsip_rx_data *rdata = arg;
 
-	if ((transport->state->transport == rdata->tp_info.transport) ||
-		(transport->state->factory && !pj_strcmp(&transport->state->factory->addr_name.host, &rdata->tp_info.transport->local_name.host) &&
-			transport->state->factory->addr_name.port == rdata->tp_info.transport->local_name.port)) {
+	if (transport_state && ((transport_state->transport == rdata->tp_info.transport) ||
+		(transport_state->factory && !pj_strcmp(&transport_state->factory->addr_name.host, &rdata->tp_info.transport->local_name.host) &&
+			transport_state->factory->addr_name.port == rdata->tp_info.transport->local_name.port))) {
 		return CMP_MATCH | CMP_STOP;
 	}
 
@@ -61,7 +61,8 @@ static struct ast_sip_endpoint *anonymous_identify(pjsip_rx_data *rdata)
 	char domain_name[64], id[AST_UUID_STR_LEN];
 	struct ast_sip_endpoint *endpoint;
 	RAII_VAR(struct ast_sip_domain_alias *, alias, NULL, ao2_cleanup);
-	RAII_VAR(struct ao2_container *, transports, NULL, ao2_cleanup);
+	RAII_VAR(struct ao2_container *, transport_states, NULL, ao2_cleanup);
+	RAII_VAR(struct ast_sip_transport_state *, transport_state, NULL, ao2_cleanup);
 	RAII_VAR(struct ast_sip_transport *, transport, NULL, ao2_cleanup);
 
 	if (get_endpoint_details(rdata, domain_name, sizeof(domain_name))) {
@@ -83,9 +84,10 @@ static struct ast_sip_endpoint *anonymous_identify(pjsip_rx_data *rdata)
 	}
 
 	/* See if the transport this came in on has a provided domain */
-	if ((transports = ast_sorcery_retrieve_by_fields(ast_sip_get_sorcery(), "transport", AST_RETRIEVE_FLAG_MULTIPLE | AST_RETRIEVE_FLAG_ALL, NULL)) &&
-		(transport = ao2_callback(transports, 0, find_transport_in_use, rdata)) &&
-		!ast_strlen_zero(transport->domain)) {
+	if ((transport_states = ast_sip_get_transport_states())
+		&& (transport_state = ao2_callback(transport_states, 0, find_transport_state_in_use, rdata))
+		&& (transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", transport_state->id))
+		&& !ast_strlen_zero(transport->domain)) {
 		snprintf(id, sizeof(id), "anonymous@%s", transport->domain);
 		if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) {
 			goto done;

res/res_pjsip_endpoint_identifier_user.c

@@ -42,14 +42,14 @@ static int get_endpoint_details(pjsip_rx_data *rdata, char *endpoint, size_t end
 	return 0;
 }
 
-static int find_transport_in_use(void *obj, void *arg, int flags)
+static int find_transport_state_in_use(void *obj, void *arg, int flags)
 {
-	struct ast_sip_transport *transport = obj;
+	struct ast_sip_transport_state *transport_state = obj;
 	pjsip_rx_data *rdata = arg;
 
-	if ((transport->state->transport == rdata->tp_info.transport) ||
-		(transport->state->factory && !pj_strcmp(&transport->state->factory->addr_name.host, &rdata->tp_info.transport->local_name.host) &&
-			transport->state->factory->addr_name.port == rdata->tp_info.transport->local_name.port)) {
+	if (transport_state && ((transport_state->transport == rdata->tp_info.transport) ||
+		(transport_state->factory && !pj_strcmp(&transport_state->factory->addr_name.host, &rdata->tp_info.transport->local_name.host) &&
+			transport_state->factory->addr_name.port == rdata->tp_info.transport->local_name.port))) {
 		return CMP_MATCH | CMP_STOP;
 	}
 
@@ -61,7 +61,8 @@ static struct ast_sip_endpoint *username_identify(pjsip_rx_data *rdata)
 	char endpoint_name[64], domain_name[64], id[AST_UUID_STR_LEN];
 	struct ast_sip_endpoint *endpoint;
 	RAII_VAR(struct ast_sip_domain_alias *, alias, NULL, ao2_cleanup);
-	RAII_VAR(struct ao2_container *, transports, NULL, ao2_cleanup);
+	RAII_VAR(struct ao2_container *, transport_states, NULL, ao2_cleanup);
+	RAII_VAR(struct ast_sip_transport_state *, transport_state, NULL, ao2_cleanup);
 	RAII_VAR(struct ast_sip_transport *, transport, NULL, ao2_cleanup);
 
 	if (get_endpoint_details(rdata, endpoint_name, sizeof(endpoint_name), domain_name, sizeof(domain_name))) {
@@ -83,10 +84,11 @@ static struct ast_sip_endpoint *username_identify(pjsip_rx_data *rdata)
 	}
 
 	/* See if the transport this came in on has a provided domain */
-	if ((transports = ast_sorcery_retrieve_by_fields(ast_sip_get_sorcery(), "transport", AST_RETRIEVE_FLAG_MULTIPLE | AST_RETRIEVE_FLAG_ALL, NULL)) &&
-		(transport = ao2_callback(transports, 0, find_transport_in_use, rdata)) &&
-		!ast_strlen_zero(transport->domain)) {
-		snprintf(id, sizeof(id), "%s@%s", endpoint_name, transport->domain);
+	if ((transport_states = ast_sip_get_transport_states())
+		&& (transport_state = ao2_callback(transport_states, 0, find_transport_state_in_use, rdata))
+		&& (transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", transport_state->id))
+		&& !ast_strlen_zero(transport->domain)) {
+		snprintf(id, sizeof(id), "anonymous@%s", transport->domain);
 		if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) {
 			goto done;
 		}

res/res_pjsip_multihomed.c

@@ -33,30 +33,28 @@
 /*! \brief Helper function which returns a UDP transport bound to the given address and port */
 static pjsip_transport *multihomed_get_udp_transport(pj_str_t *address, int port)
 {
-	struct ao2_container *transports = ast_sorcery_retrieve_by_fields(ast_sip_get_sorcery(), "transport",
-		AST_RETRIEVE_FLAG_MULTIPLE | AST_RETRIEVE_FLAG_ALL, NULL);
-	struct ast_sip_transport *transport;
+	struct ao2_container *transport_states = ast_sip_get_transport_states();
+	struct ast_sip_transport_state *transport_state;
 	struct ao2_iterator iter;
 	pjsip_transport *sip_transport = NULL;
 
-	if (!transports) {
+	if (!transport_states) {
 		return NULL;
 	}
 
-	for (iter = ao2_iterator_init(transports, 0); (transport = ao2_iterator_next(&iter)); ao2_ref(transport, -1)) {
-		if ((transport->type != AST_TRANSPORT_UDP) ||
-			(pj_strcmp(&transport->state->transport->local_name.host, address)) ||
-			(transport->state->transport->local_name.port != port)) {
+	for (iter = ao2_iterator_init(transport_states, 0); (transport_state = ao2_iterator_next(&iter)); ao2_ref(transport_state, -1)) {
+		if (transport_state && ((transport_state->type != AST_TRANSPORT_UDP) ||
+			(pj_strcmp(&transport_state->transport->local_name.host, address)) ||
+			(transport_state->transport->local_name.port != port))) {
 			continue;
 		}
 
-		sip_transport = transport->state->transport;
-		ao2_ref(transport, -1);
+		sip_transport = transport_state->transport;
 		break;
 	}
 	ao2_iterator_destroy(&iter);
 
-	ao2_ref(transports, -1);
+	ao2_ref(transport_states, -1);
 
 	return sip_transport;
 }

res/res_pjsip_nat.c

@@ -150,19 +150,19 @@ struct request_transport_details {
 };
 
 /*! \brief Callback function for finding the transport the request is going out on */
-static int find_transport_in_use(void *obj, void *arg, int flags)
+static int find_transport_state_in_use(void *obj, void *arg, int flags)
 {
-	struct ast_sip_transport *transport = obj;
+	struct ast_sip_transport_state *transport_state = obj;
 	struct request_transport_details *details = arg;
 
 	/* If an explicit transport or factory matches then this is what is in use, if we are unavailable
 	 * to compare based on that we make sure that the type is the same and the source IP address/port are the same
 	 */
-	if ((details->transport && details->transport == transport->state->transport) ||
-		(details->factory && details->factory == transport->state->factory) ||
-		((details->type == transport->type) && (transport->state->factory) &&
-			!pj_strcmp(&transport->state->factory->addr_name.host, &details->local_address) &&
-			transport->state->factory->addr_name.port == details->local_port)) {
+	if (transport_state && ((details->transport && details->transport == transport_state->transport) ||
+		(details->factory && details->factory == transport_state->factory) ||
+		((details->type == transport_state->type) && (transport_state->factory) &&
+			!pj_strcmp(&transport_state->factory->addr_name.host, &details->local_address) &&
+			transport_state->factory->addr_name.port == details->local_port))) {
 		return CMP_MATCH | CMP_STOP;
 	}
 
@@ -204,8 +204,9 @@ static int nat_invoke_hook(void *obj, void *arg, int flags)
 
 static pj_status_t nat_on_tx_message(pjsip_tx_data *tdata)
 {
-	RAII_VAR(struct ao2_container *, transports, NULL, ao2_cleanup);
+	RAII_VAR(struct ao2_container *, transport_states, NULL, ao2_cleanup);
 	RAII_VAR(struct ast_sip_transport *, transport, NULL, ao2_cleanup);
+	RAII_VAR(struct ast_sip_transport_state *, transport_state, NULL, ao2_cleanup);
 	struct request_transport_details details = { 0, };
 	pjsip_via_hdr *via = NULL;
 	struct ast_sockaddr addr = { { 0, } };
@@ -247,9 +248,19 @@ static pj_status_t nat_on_tx_message(pjsip_tx_data *tdata)
 		}
 	}
 
-	if (!(transports = ast_sorcery_retrieve_by_fields(ast_sip_get_sorcery(), "transport", AST_RETRIEVE_FLAG_MULTIPLE | AST_RETRIEVE_FLAG_ALL, NULL)) ||
-		!(transport = ao2_callback(transports, 0, find_transport_in_use, &details)) || !transport->localnet ||
-		ast_sockaddr_isnull(&transport->external_address)) {
+	if (!(transport_states = ast_sip_get_transport_states())) {
+		return PJ_SUCCESS;
+	}
+
+	if (!(transport_state = ao2_callback(transport_states, 0, find_transport_state_in_use, &details))) {
+		return PJ_SUCCESS;
+	}
+
+	if (!(transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", transport_state->id))) {
+		return PJ_SUCCESS;
+	}
+
+	if ( !transport_state->localnet || 	ast_sockaddr_isnull(&transport_state->external_address)) {
 		return PJ_SUCCESS;
 	}
 
@@ -257,13 +268,13 @@ static pj_status_t nat_on_tx_message(pjsip_tx_data *tdata)
 	ast_sockaddr_set_port(&addr, tdata->tp_info.dst_port);
 
 	/* See if where we are sending this request is local or not, and if not that we can get a Contact URI to modify */
-	if (ast_apply_ha(transport->localnet, &addr) != AST_SENSE_ALLOW) {
+	if (ast_apply_ha(transport_state->localnet, &addr) != AST_SENSE_ALLOW) {
 		return PJ_SUCCESS;
 	}
 
 	/* Update the contact header with the external address */
 	if (uri || (uri = nat_get_contact_sip_uri(tdata))) {
-		pj_strdup2(tdata->pool, &uri->host, ast_sockaddr_stringify_host(&transport->external_address));
+		pj_strdup2(tdata->pool, &uri->host, ast_sockaddr_stringify_host(&transport_state->external_address));
 		if (transport->external_signaling_port) {
 			uri->port = transport->external_signaling_port;
 			ast_debug(4, "Re-wrote Contact URI port to %d\n", uri->port);
@@ -272,7 +283,7 @@ static pj_status_t nat_on_tx_message(pjsip_tx_data *tdata)
 
 	/* Update the via header if relevant */
 	if ((tdata->msg->type == PJSIP_REQUEST_MSG) && (via || (via = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL)))) {
-		pj_strdup2(tdata->pool, &via->sent_by.host, ast_sockaddr_stringify_host(&transport->external_address));
+		pj_strdup2(tdata->pool, &via->sent_by.host, ast_sockaddr_stringify_host(&transport_state->external_address));
 		if (transport->external_signaling_port) {
 			via->sent_by.port = transport->external_signaling_port;
 		}

res/res_pjsip_outbound_registration.c

@@ -1172,20 +1172,20 @@ static int sip_outbound_registration_regc_alloc(void *data)
 	pjsip_endpt_release_pool(ast_sip_get_pjsip_endpoint(), pool);
 
 	if (!ast_strlen_zero(registration->transport)) {
-		RAII_VAR(struct ast_sip_transport *, transport, ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", registration->transport), ao2_cleanup);
+		RAII_VAR(struct ast_sip_transport_state *, transport_state, ast_sip_get_transport_state(registration->transport), ao2_cleanup);
 
-		if (!transport || !transport->state) {
+		if (!transport_state) {
 			ast_log(LOG_ERROR, "Unable to retrieve PJSIP transport '%s' "
 				" for outbound registration", registration->transport);
 			return -1;
 		}
 
-		if (transport->state->transport) {
+		if (transport_state->transport) {
 			selector.type = PJSIP_TPSELECTOR_TRANSPORT;
-			selector.u.transport = transport->state->transport;
-		} else if (transport->state->factory) {
+			selector.u.transport = transport_state->transport;
+		} else if (transport_state->factory) {
 			selector.type = PJSIP_TPSELECTOR_LISTENER;
-			selector.u.listener = transport->state->factory;
+			selector.u.listener = transport_state->factory;
 		} else {
 			return -1;
 		}

res/res_pjsip_sdp_rtp.c

@@ -1360,11 +1360,12 @@ static int apply_negotiated_sdp_stream(struct ast_sip_session *session, struct a
 /*! \brief Function which updates the media stream with external media address, if applicable */
 static void change_outgoing_sdp_stream_media_address(pjsip_tx_data *tdata, struct pjmedia_sdp_media *stream, struct ast_sip_transport *transport)
 {
+	RAII_VAR(struct ast_sip_transport_state *, transport_state, ast_sip_get_transport_state(ast_sorcery_object_get_id(transport)), ao2_cleanup);
 	char host[NI_MAXHOST];
 	struct ast_sockaddr addr = { { 0, } };
 
 	/* If the stream has been rejected there will be no connection line */
-	if (!stream->conn) {
+	if (!stream->conn || !transport_state) {
 		return;
 	}
 
@@ -1372,7 +1373,7 @@ static void change_outgoing_sdp_stream_media_address(pjsip_tx_data *tdata, struc
 	ast_sockaddr_parse(&addr, host, PARSE_PORT_FORBID);
 
 	/* Is the address within the SDP inside the same network? */
-	if (ast_apply_ha(transport->localnet, &addr) == AST_SENSE_ALLOW) {
+	if (ast_apply_ha(transport_state->localnet, &addr) == AST_SENSE_ALLOW) {
 		return;
 	}
 

res/res_pjsip_session.c

@@ -2805,13 +2805,14 @@ static pjsip_inv_callback inv_callback = {
 /*! \brief Hook for modifying outgoing messages with SDP to contain the proper address information */
 static void session_outgoing_nat_hook(pjsip_tx_data *tdata, struct ast_sip_transport *transport)
 {
+	RAII_VAR(struct ast_sip_transport_state *, transport_state, ast_sip_get_transport_state(ast_sorcery_object_get_id(transport)), ao2_cleanup);
 	struct ast_sip_nat_hook *hook = ast_sip_mod_data_get(
 		tdata->mod_data, session_module.id, MOD_DATA_NAT_HOOK);
 	struct pjmedia_sdp_session *sdp;
 	int stream;
 
 	/* SDP produced by us directly will never be multipart */
-	if (hook || !tdata->msg->body || pj_stricmp2(&tdata->msg->body->content_type.type, "application") ||
+	if (!transport_state || hook || !tdata->msg->body || pj_stricmp2(&tdata->msg->body->content_type.type, "application") ||
 		pj_stricmp2(&tdata->msg->body->content_type.subtype, "sdp") || ast_strlen_zero(transport->external_media_address)) {
 		return;
 	}
@@ -2825,7 +2826,7 @@ static void session_outgoing_nat_hook(pjsip_tx_data *tdata, struct ast_sip_trans
 		ast_copy_pj_str(host, &sdp->conn->addr, sizeof(host));
 		ast_sockaddr_parse(&addr, host, PARSE_PORT_FORBID);
 
-		if (ast_apply_ha(transport->localnet, &addr) != AST_SENSE_ALLOW) {
+		if (ast_apply_ha(transport_state->localnet, &addr) != AST_SENSE_ALLOW) {
 			pj_strdup2(tdata->pool, &sdp->conn->addr, transport->external_media_address);
 		}
 	}

res/res_pjsip_t38.c

@@ -890,11 +890,12 @@ static int apply_negotiated_sdp_stream(struct ast_sip_session *session, struct a
 /*! \brief Function which updates the media stream with external media address, if applicable */
 static void change_outgoing_sdp_stream_media_address(pjsip_tx_data *tdata, struct pjmedia_sdp_media *stream, struct ast_sip_transport *transport)
 {
+	RAII_VAR(struct ast_sip_transport_state *, transport_state, ast_sip_get_transport_state(ast_sorcery_object_get_id(transport)), ao2_cleanup);
 	char host[NI_MAXHOST];
 	struct ast_sockaddr addr = { { 0, } };
 
 	/* If the stream has been rejected there will be no connection line */
-	if (!stream->conn) {
+	if (!stream->conn || !transport_state) {
 		return;
 	}
 
@@ -902,7 +903,7 @@ static void change_outgoing_sdp_stream_media_address(pjsip_tx_data *tdata, struc
 	ast_sockaddr_parse(&addr, host, PARSE_PORT_FORBID);
 
 	/* Is the address within the SDP inside the same network? */
-	if (ast_apply_ha(transport->localnet, &addr) == AST_SENSE_ALLOW) {
+	if (ast_apply_ha(transport_state->localnet, &addr) == AST_SENSE_ALLOW) {
 		return;
 	}
 

res/res_pjsip_transport_websocket.c

@@ -275,24 +275,27 @@ static int transport_read(void *data)
 static int get_write_timeout(void)
 {
 	int write_timeout = -1;
-	struct ao2_container *transports;
+	struct ao2_container *transport_states;
 
-	transports = ast_sorcery_retrieve_by_fields(ast_sip_get_sorcery(), "transport", AST_RETRIEVE_FLAG_ALL, NULL);
+	transport_states = ast_sip_get_transport_states();
 
-	if (transports) {
-		struct ao2_iterator it_transports = ao2_iterator_init(transports, 0);
-		struct ast_sip_transport *transport;
+	if (transport_states) {
+		struct ao2_iterator it_transport_states = ao2_iterator_init(transport_states, 0);
+		struct ast_sip_transport_state *transport_state;
 
-		for (; (transport = ao2_iterator_next(&it_transports)); ao2_cleanup(transport)) {
-			if (transport->type != AST_TRANSPORT_WS && transport->type != AST_TRANSPORT_WSS) {
+		for (; (transport_state = ao2_iterator_next(&it_transport_states)); ao2_cleanup(transport_state)) {
+			struct ast_sip_transport *transport;
+			if (transport_state->type != AST_TRANSPORT_WS && transport_state->type != AST_TRANSPORT_WSS) {
 				continue;
 			}
+			transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", transport_state->id);
 			ast_debug(5, "Found %s transport with write timeout: %d\n",
 				transport->type == AST_TRANSPORT_WS ? "WS" : "WSS",
 				transport->write_timeout);
 			write_timeout = MAX(write_timeout, transport->write_timeout);
 		}
-		ao2_cleanup(transports);
+		ao2_iterator_destroy(&it_transport_states);
+		ao2_cleanup(transport_states);
 	}
 
 	if (write_timeout < 0) {