[core] allow external ID to be same as the session UUID

diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index 23c787fb23f3f46ba4448aa1220e3c59ae79ecf7..acda5eaf7b00ae9d3e7c5d89f51db918c0e67e1d 100644 (file)
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -2080,7 +2080,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_external_id(switch_core_
 
 
        switch_mutex_lock(runtime.session_hash_mutex);
-       if (switch_core_hash_find(session_manager.session_table, use_external_id)) {
+       if (strcmp(use_external_id, session->uuid_str) && switch_core_hash_find(session_manager.session_table, use_external_id)) {
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Duplicate External ID!\n");
                switch_mutex_unlock(runtime.session_hash_mutex);
                return SWITCH_STATUS_FALSE;
@@ -2088,11 +2088,15 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_external_id(switch_core_
 
        switch_channel_set_variable(session->channel, "session_external_id", use_external_id);
 
-       if (session->external_id) {
+       if (session->external_id && strcmp(session->external_id, session->uuid_str)) {
                switch_core_hash_delete(session_manager.session_table, session->external_id);
        }
+
        session->external_id = switch_core_session_strdup(session, use_external_id);
-       switch_core_hash_insert(session_manager.session_table, session->external_id, session);
+
+       if (strcmp(session->external_id, session->uuid_str)) {
+               switch_core_hash_insert(session_manager.session_table, session->external_id, session);
+       }
        switch_mutex_unlock(runtime.session_hash_mutex);
 
        return SWITCH_STATUS_SUCCESS;

diff --git a/tests/unit/switch_core_session.c b/tests/unit/switch_core_session.c
index 0319683000184657d03ce316678752612f9b61a7..57beea3beeedd0a54d005a6b8a9badb009f6bb3a 100644 (file)
--- a/tests/unit/switch_core_session.c
+++ b/tests/unit/switch_core_session.c
@@ -48,7 +48,8 @@ FST_CORE_BEGIN("./conf")
 
                FST_SESSION_BEGIN(session_external_id)
                {
-                       fst_check(switch_core_session_set_external_id(fst_session, switch_core_session_get_uuid(fst_session)) != SWITCH_STATUS_SUCCESS);
+                       fst_check(switch_core_session_set_external_id(fst_session, switch_core_session_get_uuid(fst_session)) == SWITCH_STATUS_SUCCESS);
+                       fst_check_string_equals(switch_core_session_get_external_id(fst_session), switch_core_session_get_uuid(fst_session));
                        fst_check(switch_core_session_set_external_id(fst_session, "foo") == SWITCH_STATUS_SUCCESS);
                        switch_core_session_t *session = switch_core_session_locate("foo");
                        fst_requires(session);