kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 20:50:41 +00:00
Code Issues Projects Releases Wiki Activity

FS-4467 try this patch that will sanity check for dups to catch this case when the ambigous method is used

Browse Source
This commit is contained in:
Anthony Minessale 2012-07-25 16:34:43 -05:00
parent 7a93ae2d95
commit c9e172789c
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -2779,6 +2779,7 @@ struct cb_helper {
uint32_t row_process; uint32_t row_process;
sofia_profile_t *profile; sofia_profile_t *profile;
switch_stream_handle_t *stream; switch_stream_handle_t *stream;
switch_bool_t dedup;
}; };
@ -3771,11 +3772,20 @@ static int contact_callback(void *pArg, int argc, char **argv, char **columnName
{ {
struct cb_helper *cb = (struct cb_helper *) pArg; struct cb_helper *cb = (struct cb_helper *) pArg;
char *contact; char *contact;
cb->row_process++; cb->row_process++;
if (!zstr(argv[0]) && (contact = sofia_glue_get_url_from_contact(argv[0], 1))) { if (!zstr(argv[0]) && (contact = sofia_glue_get_url_from_contact(argv[0], 1))) {
cb->stream->write_function(cb->stream, "%ssofia/%s/sip:%s,", argv[2], argv[1], sofia_glue_strip_proto(contact)); if (cb->dedup) {
char *tmp = switch_mprintf("%ssofia/%s/sip:%s", argv[2], argv[1], sofia_glue_strip_proto(contact));
if (!strstr((char *)cb->stream->data, tmp)) {
cb->stream->write_function(cb->stream, "%s,", tmp);
free(tmp);
}
} else {
cb->stream->write_function(cb->stream, "%ssofia/%s/sip:%s,", argv[2], argv[1], sofia_glue_strip_proto(contact));
}
free(contact); free(contact);
} }
@ -3978,7 +3988,8 @@ static void select_from_profile(sofia_profile_t *profile,
const char *domain, const char *domain,
const char *concat, const char *concat,
const char *exclude_contact, const char *exclude_contact,
switch_stream_handle_t *stream) switch_stream_handle_t *stream,
switch_bool_t dedup)
{ {
struct cb_helper cb; struct cb_helper cb;
char *sql; char *sql;
@ -3987,15 +3998,16 @@ static void select_from_profile(sofia_profile_t *profile,
cb.profile = profile; cb.profile = profile;
cb.stream = stream; cb.stream = stream;
cb.dedup = dedup;
if (exclude_contact) { if (exclude_contact) {
sql = switch_mprintf("select contact, profile_name, '%q' " sql = switch_mprintf("select contact, profile_name, '%q' "
"from sip_registrations where sip_user='%q' and (sip_host='%q' or presence_hosts like '%%%q%%') " "from sip_registrations where profile_name='%q' and sip_user='%q' and (sip_host='%q' or presence_hosts like '%%%q%%') "
"and contact not like '%%%s%%'", (concat != NULL) ? concat : "", user, domain, domain, exclude_contact); "and contact not like '%%%s%%'", (concat != NULL) ? concat : "", profile->name, user, domain, domain, exclude_contact);
} else { } else {
sql = switch_mprintf("select contact, profile_name, '%q' " sql = switch_mprintf("select contact, profile_name, '%q' "
"from sip_registrations where sip_user='%q' and (sip_host='%q' or presence_hosts like '%%%q%%')", "from sip_registrations where profile_name='%q' and sip_user='%q' and (sip_host='%q' or presence_hosts like '%%%q%%')",
(concat != NULL) ? concat : "", user, domain, domain); (concat != NULL) ? concat : "", profile->name, user, domain, domain);
} }
switch_assert(sql); switch_assert(sql);
@ -4080,7 +4092,7 @@ SWITCH_STANDARD_API(sofia_contact_function)
domain = profile->domain_name; domain = profile->domain_name;
} }
select_from_profile(profile, user, domain, concat, exclude_contact, &mystream); select_from_profile(profile, user, domain, concat, exclude_contact, &mystream, SWITCH_FALSE);
sofia_glue_release_profile(profile); sofia_glue_release_profile(profile);
} else if (!zstr(domain)) { } else if (!zstr(domain)) {
@ -4093,7 +4105,7 @@ SWITCH_STANDARD_API(sofia_contact_function)
for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) {
switch_hash_this(hi, &var, NULL, &val); switch_hash_this(hi, &var, NULL, &val);
if ((profile = (sofia_profile_t *) val) && !strcmp((char *)var, profile->name)) { if ((profile = (sofia_profile_t *) val) && !strcmp((char *)var, profile->name)) {
select_from_profile(profile, user, domain, concat, exclude_contact, &mystream); select_from_profile(profile, user, domain, concat, exclude_contact, &mystream, SWITCH_TRUE);
profile = NULL; profile = NULL;
} }
} }