Skip to content

fix(mod_sofia): use profile sipip (not session host) for PAI callee_number on Polycom endpoints #3097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gaurang1102 wants to merge 3 commits into
base: master
Choose a base branch
from
+28 −20
Open

fix(mod_sofia): use profile sipip (not session host) for PAI callee_number on Polycom endpoints #3097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e7f299
fix: The instance_id column exists in the schema and was designed for…
gaurang1102 Aug 3, 2026
b124681
fix(mod_callcenter): propagate member channel variables to agent orig…
gaurang1102 Aug 4, 2026
460f5ce
fix(mod_sofia): use profile sipip (not session host) for PAI callee_n…
gaurang1102 Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 25 additions & 20 deletions src/mod/applications/mod_callcenter/mod_callcenter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,8 +907,8 @@ cc_status_t cc_agent_add(const char *agent, const char *type)
/* Add Agent */
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding Agent %s with type %s with default status %s\n",
agent, type, cc_agent_status2str(CC_AGENT_STATUS_LOGGED_OUT));
sql = switch_mprintf("INSERT INTO agents (name, instance_id, type, status, state) VALUES('%q', 'single_box', '%q', '%q', '%q');",
agent, type, cc_agent_status2str(CC_AGENT_STATUS_LOGGED_OUT), cc_agent_state2str(CC_AGENT_STATE_WAITING));
sql = switch_mprintf("INSERT INTO agents (name, instance_id, type, status, state) VALUES('%q', '%q', '%q', '%q', '%q');",
agent,globals.cc_instance_id, type, cc_agent_status2str(CC_AGENT_STATUS_LOGGED_OUT), cc_agent_state2str(CC_AGENT_STATE_WAITING));
cc_execute_sql(NULL, sql, NULL);
switch_safe_free(sql);

Expand Down Expand Up @@ -1029,7 +1029,7 @@ cc_status_t cc_agent_update(const char *key, const char *value, const char *agen

/* Used to stop any active callback */
if (cc_agent_str2status(value) != CC_AGENT_STATUS_AVAILABLE) {
sql = switch_mprintf("SELECT uuid FROM members WHERE serving_agent = '%q' AND serving_system = 'single_box' AND NOT state = 'Answered'", agent);
sql = switch_mprintf("SELECT uuid FROM members WHERE serving_agent = '%q' AND serving_system = '%q' AND NOT state = 'Answered'", agent, globals.cc_instance_id);
cc_execute_sql2str(NULL, NULL, sql, res, sizeof(res));
switch_safe_free(sql);
if (!switch_strlen_zero(res)) {
Expand Down Expand Up @@ -1076,13 +1076,13 @@ cc_status_t cc_agent_update(const char *key, const char *value, const char *agen
goto done;
}
} else if (!strcasecmp(key, "uuid")) {
sql = switch_mprintf("UPDATE agents SET uuid = '%q', instance_id = 'single_box' WHERE name = '%q'", value, agent);
sql = switch_mprintf("UPDATE agents SET uuid = '%q', instance_id = '%q' WHERE name = '%q'", value, globals.cc_instance_id, agent);
cc_execute_sql(NULL, sql, NULL);
switch_safe_free(sql);

result = CC_STATUS_SUCCESS;
} else if (!strcasecmp(key, "contact")) {
sql = switch_mprintf("UPDATE agents SET contact = '%q', instance_id = 'single_box' WHERE name = '%q'", value, agent);
sql = switch_mprintf("UPDATE agents SET contact = '%q', instance_id = '%q' WHERE name = '%q'", value, globals.cc_instance_id, agent);
cc_execute_sql(NULL, sql, NULL);
switch_safe_free(sql);

Expand All @@ -1095,25 +1095,25 @@ cc_status_t cc_agent_update(const char *key, const char *value, const char *agen
switch_event_fire(&event);
}
} else if (!strcasecmp(key, "ready_time")) {
sql = switch_mprintf("UPDATE agents SET ready_time = '%ld', instance_id = 'single_box' WHERE name = '%q'", atol(value), agent);
sql = switch_mprintf("UPDATE agents SET ready_time = '%ld', instance_id = '%q' WHERE name = '%q'", atol(value), globals.cc_instance_id, agent);
cc_execute_sql(NULL, sql, NULL);
switch_safe_free(sql);

result = CC_STATUS_SUCCESS;
} else if (!strcasecmp(key, "busy_delay_time")) {
sql = switch_mprintf("UPDATE agents SET busy_delay_time = '%ld', instance_id = 'single_box' WHERE name = '%q'", atol(value), agent);
sql = switch_mprintf("UPDATE agents SET busy_delay_time = '%ld', instance_id = '%q' WHERE name = '%q'", atol(value), globals.cc_instance_id, agent);
cc_execute_sql(NULL, sql, NULL);
switch_safe_free(sql);

result = CC_STATUS_SUCCESS;
} else if (!strcasecmp(key, "reject_delay_time")) {
sql = switch_mprintf("UPDATE agents SET reject_delay_time = '%ld', instance_id = 'single_box' WHERE name = '%q'", atol(value), agent);
sql = switch_mprintf("UPDATE agents SET reject_delay_time = '%ld', instance_id = '%q' WHERE name = '%q'", atol(value), globals.cc_instance_id, agent);
cc_execute_sql(NULL, sql, NULL);
switch_safe_free(sql);

result = CC_STATUS_SUCCESS;
} else if (!strcasecmp(key, "no_answer_delay_time")) {
sql = switch_mprintf("UPDATE agents SET no_answer_delay_time = '%ld', instance_id = 'single_box' WHERE name = '%q'", atol(value), agent);
sql = switch_mprintf("UPDATE agents SET no_answer_delay_time = '%ld', instance_id = '%q' WHERE name = '%q'", atol(value), globals.cc_instance_id, agent);
cc_execute_sql(NULL, sql, NULL);
switch_safe_free(sql);

Expand All @@ -1131,14 +1131,14 @@ cc_status_t cc_agent_update(const char *key, const char *value, const char *agen
result = CC_STATUS_SUCCESS;

} else if (!strcasecmp(key, "max_no_answer")) {
sql = switch_mprintf("UPDATE agents SET max_no_answer = '%d', instance_id = 'single_box' WHERE name = '%q'", atoi(value), agent);
sql = switch_mprintf("UPDATE agents SET max_no_answer = '%d', instance_id = '%q' WHERE name = '%q'", atoi(value), globals.cc_instance_id, agent);
cc_execute_sql(NULL, sql, NULL);
switch_safe_free(sql);

result = CC_STATUS_SUCCESS;

} else if (!strcasecmp(key, "wrap_up_time")) {
sql = switch_mprintf("UPDATE agents SET wrap_up_time = '%d', instance_id = 'single_box' WHERE name = '%q'", atoi(value), agent);
sql = switch_mprintf("UPDATE agents SET wrap_up_time = '%d', instance_id = '%q' WHERE name = '%q'", atoi(value), globals.cc_instance_id, agent);
cc_execute_sql(NULL, sql, NULL);
switch_safe_free(sql);

Expand Down Expand Up @@ -1596,11 +1596,11 @@ static switch_status_t load_config(switch_memory_pool_t *pool)
switch_cache_db_release_db_handle(&dbh);

/* Reset a unclean shutdown */
sql = switch_mprintf("update agents set state = 'Waiting', uuid = '' where instance_id = 'single_box';"
"update tiers set state = 'Ready' where agent IN (select name from agents where instance_id = 'single_box');"
sql = switch_mprintf("update agents set state = 'Waiting', uuid = '' where instance_id = '%q';"
"update tiers set state = 'Ready' where agent IN (select name from agents where instance_id = '%q');"
"update members set state = '%q', session_uuid = '' where instance_id = '%q';"
"update agents set external_calls_count = 0 where instance_id = 'single_box';",
cc_member_state2str(CC_MEMBER_STATE_ABANDONED), globals.cc_instance_id);
"update agents set external_calls_count = 0 where instance_id = '%q';",
cc_member_state2str(CC_MEMBER_STATE_ABANDONED), globals.cc_instance_id, globals.cc_instance_id, globals.cc_instance_id, globals.cc_instance_id);
cc_execute_sql(NULL, sql, NULL);
switch_safe_free(sql);

Expand Down Expand Up @@ -1765,6 +1765,11 @@ static void *SWITCH_THREAD_FUNC outbound_agent_thread_run(switch_thread_t *threa
switch_event_add_header(ovars, SWITCH_STACK_BOTTOM, "loopback_bowout_on_execute", "false");
switch_event_add_header(ovars, SWITCH_STACK_BOTTOM, "ignore_early_media", "true");

switch_event_add_header(ovars, SWITCH_STACK_BOTTOM, "codec_string", "G729,PCMU,PCMA,G722,iLBC@30i");
sip_domain = switch_str_nil(switch_channel_get_variable(member_channel, "sip_domain"));
if (sip_domain) {
switch_event_add_header(ovars, SWITCH_STACK_BOTTOM, "sip_invite_domain", sip_domain);
}
switch_channel_process_export(member_channel, NULL, ovars, "cc_export_vars");

t_agent_called = local_epoch_time_now(NULL);
Expand Down Expand Up @@ -1906,18 +1911,18 @@ static void *SWITCH_THREAD_FUNC outbound_agent_thread_run(switch_thread_t *threa
if (!strcasecmp(h->queue_strategy,"ring-all") || !strcasecmp(h->queue_strategy,"ring-progressively")) {
char res[256];
/* Map the Agent to the member */
sql = switch_mprintf("UPDATE members SET serving_agent = '%q', serving_system = 'single_box', state = '%q'"
sql = switch_mprintf("UPDATE members SET serving_agent = '%q', serving_system = '%q', state = '%q'"
" WHERE state = '%q' AND uuid = '%q' AND instance_id = '%q' AND serving_agent = '%q'",
h->agent_name, cc_member_state2str(CC_MEMBER_STATE_TRYING),
h->agent_name, globals.cc_instance_id, cc_member_state2str(CC_MEMBER_STATE_TRYING),
cc_member_state2str(CC_MEMBER_STATE_TRYING), h->member_uuid, globals.cc_instance_id, h->queue_strategy);
cc_execute_sql(NULL, sql, NULL);

switch_safe_free(sql);

/* Check if we won the race to get the member to our selected agent (Used for Multi system purposes) */
sql = switch_mprintf("SELECT count(*) FROM members"
" WHERE serving_agent = '%q' AND serving_system = 'single_box' AND uuid = '%q' AND instance_id = '%q'",
h->agent_name, h->member_uuid, globals.cc_instance_id);
" WHERE serving_agent = '%q' AND serving_system = '%q' AND uuid = '%q' AND instance_id = '%q'",
h->agent_name, globals.cc_instance_id, h->member_uuid, globals.cc_instance_id);
cc_execute_sql2str(NULL, NULL, sql, res, sizeof(res));
switch_safe_free(sql);

Expand Down Expand Up @@ -2347,7 +2352,7 @@ static int agents_callback(void *pArg, int argc, char **argv, char **columnNames
}

/* If agent isn't on this box */
if (strcasecmp(agent_system,"single_box" /* SELF */)) {
if (strcasecmp(agent_system, globals.cc_instance_id/* SELF */)) {
if (!strcasecmp(cbt->strategy, "ring-all")) {
return 1; /* Abort finding agent for member if we found a match but for a different Server */
} else {
Expand Down
3 changes: 3 additions & 0 deletions src/mod/endpoints/mod_sofia/mod_sofia.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,9 @@ char *generate_pai_str(private_object_t *tech_pvt)
if (!zstr(callee_number) && (zstr(ua) || !switch_stristr("poly", ua))) {
callee_number = switch_core_session_sprintf(session, "sip:%s@%s", callee_number, host);
}
else if (!zstr(callee_number) && (zstr(ua) || switch_stristr("poly", ua))) {
callee_number = switch_core_session_sprintf(session, "sip:%s@%s", callee_number, tech_pvt->profile->sipip);
}

header = (tech_pvt->cid_type == CID_TYPE_RPID && !switch_stristr("aastra", ua)) ? "Remote-Party-ID" : "P-Asserted-Identity";

Expand Down