kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'smgmaster' of git.sangoma.com:/smg_freeswitch into smgmaster

This commit is contained in:
Konrad Hammel 2011-03-15 10:53:59 -04:00
parent c58a3db915 a60086cd22
commit 0bb7fd42be
4 changed files with 98 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/esl/fs_cli.c
View File

@ -1049,7 +1049,7 @@ int main(int argc, char *argv[])
strncpy(internal_profile.host, "127.0.0.1", sizeof(internal_profile.host));
strncpy(internal_profile.pass, "ClueCon", sizeof(internal_profile.pass));
strncpy(internal_profile.name, "internal", sizeof(internal_profile.name));
internal_profile.port = 8021;
internal_profile.port = 8821;
set_fn_keys(&internal_profile);
@ -1151,7 +1151,7 @@ int main(int argc, char *argv[])
esl_set_string(profiles[pcount].name, cur_cat);
esl_set_string(profiles[pcount].host, "localhost");
esl_set_string(profiles[pcount].pass, "ClueCon");
profiles[pcount].port = 8021;
profiles[pcount].port = 8821;
set_fn_keys(&profiles[pcount]);
esl_log(ESL_LOG_DEBUG, "Found Profile [%s]\n", profiles[pcount].name);
pcount++;
@ -1230,7 +1230,7 @@ int main(int argc, char *argv[])
esl_log(ESL_LOG_DEBUG, "Using profile %s [%s]\n", profile->name, profile->host);
if (argv_host) {
if (argv_port && profile->port != 8021) {
if (argv_port && profile->port != 8821) {
snprintf(prompt_str, sizeof(prompt_str), PROMPT_PREFIX "@%s:%u@%s> ", profile->host, profile->port, profile->name);
} else {
snprintf(prompt_str, sizeof(prompt_str), PROMPT_PREFIX "@%s@%s> ", profile->host, profile->name);

2
libs/esl/fs_cli.conf
View File

@ -4,7 +4,7 @@
host => 127.0.0.1
password => ClueCon
port => 8021
port => 8821
debug => 2
key_f1 => help

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

@ -3562,6 +3562,13 @@ SWITCH_STANDARD_API(sofia_contact_function)
}
}
}
switch_mutex_unlock(mod_sofia_globals.hash_mutex);
}
reply = (char *) mystream.data;
if (user_replacement) {
int urlcount = 0;
int copyerr = 0;
@ -3574,6 +3581,9 @@ SWITCH_STANDARD_API(sofia_contact_function)
switch_size_t replacesize = strlen(user_replacement);
switch_size_t allocsize = 0;
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "sofia_contact(): trying to replace %s in %s\n",
user_replacement, str);
/* first pass to count how many URLs we have */
while ((urlstart = strcasestr(str, "sip:")) || (urlstart = strcasestr(str, "sips:"))) {
urlcount++;
@ -3643,21 +3653,13 @@ copydone:
} else {
strcpy(newptr, str);
reply = newreply;
goto end;
}
} else {
reply = "error/replacement error";
/* on error, we do nothing and just default to the original stream returned (mystream.data) */
}
}
stream->write_function(stream, "%s", reply);
reply = NULL;
switch_safe_free(mystream.data);
}
switch_mutex_unlock(mod_sofia_globals.hash_mutex);
}
reply = (char *) mystream.data;
end:

2
src/switch_loadable_module.c
View File

@ -1300,7 +1300,7 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_init(switch_bool_t autolo
if (switch_loadable_module_load_module_ex((char *) path, (char *) val, SWITCH_FALSE, global, &err) == SWITCH_STATUS_GENERR) {
if (critical && switch_true(critical)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to load critical module '%s', abort()\n", val);
abort();
return SWITCH_STATUS_FALSE;
}
}
count++;