<h1>Project "FreeSWITCH Source" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
discards 28242f871ac338876ffafa79dd677485d2ce0f5e (commit)
discards b36a7c0ba6381699cc9dbbc096aef90bea1ad4d3 (commit)
discards 4b62ff799e00a30fb898ddea2633d928d0d24eeb (commit)
via: 0f8fb4b1fdb7f9256f21f55ab8c28afa280e7884 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (28242f871ac338876ffafa79dd677485d2ce0f5e)
\
N -- N -- N (0f8fb4b1fdb7f9256f21f55ab8c28afa280e7884)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Raymond Chandler
comments:
add ability to jump to a specific message
<span style="color: #000080; font-weight: bold">diff --git a/src/mod/applications/mod_voicemail/mod_voicemail.c b/src/mod/applications/mod_voicemail/mod_voicemail.c</span>
<span style="color: #000080; font-weight: bold">index 894e49a..ef843f6 100644</span>
<span style="color: #A00000">--- a/src/mod/applications/mod_voicemail/mod_voicemail.c</span>
<span style="color: #00A000">+++ b/src/mod/applications/mod_voicemail/mod_voicemail.c</span>
<span style="color: #800080; font-weight: bold">@@ -1725,8 +1725,7 @@ static void update_mwi(vm_profile_t *profile, const char *id, const char *domain</span>
#define FREE_DOMAIN_ROOT() if (x_user) switch_xml_free(x_user); x_user = NULL
<span style="color: #A00000">-</span>
<span style="color: #A00000">-static void voicemail_check_main(switch_core_session_t *session, vm_profile_t *profile, const char *domain_name, const char *id, int auth)</span>
<span style="color: #00A000">+static void voicemail_check_main(switch_core_session_t *session, vm_profile_t *profile, const char *domain_name, const char *id, int auth, const char *uuid_in)</span>
{
vm_check_state_t vm_check_state = VM_CHECK_START;
switch_channel_t *channel = switch_core_session_get_channel(session);
<span style="color: #800080; font-weight: bold">@@ -1900,6 +1899,9 @@ static void voicemail_check_main(switch_core_session_t *session, vm_profile_t *p</span>
cbt.type = play_msg_type;
cbt.move = VM_MOVE_NEXT;
vm_execute_sql_callback(profile, profile->mutex, sql, listen_callback, &cbt);
<span style="color: #00A000">+ if (strcmp(cbt.uuid, uuid_in)) {</span>
<span style="color: #00A000">+ continue;</span>
<span style="color: #00A000">+ }</span>
status = listen_file(session, profile, &cbt);
if (cbt.move == VM_MOVE_PREV) {
if (cur_message <= 0) {
<span style="color: #800080; font-weight: bold">@@ -3154,12 +3156,12 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p</span>
if (*buf != '\0') {
greet_key_press:
if (switch_stristr(buf, profile->login_keys)) {
<span style="color: #A00000">- voicemail_check_main(session, profile, domain_name, id, 0);</span>
<span style="color: #00A000">+ voicemail_check_main(session, profile, domain_name, id, 0, NULL);</span>
} else if ((!zstr(profile->operator_ext) || !zstr(operator_ext)) && !zstr(profile->operator_key) && !strcasecmp(buf, profile->operator_key) ) {
int argc;
char *argv[4];
char *mycmd;
<span style="color: #A00000">-</span>
<span style="color: #00A000">+ </span>
if ((!zstr(operator_ext) && (mycmd = switch_core_session_strdup(session, operator_ext))) ||
(!zstr(profile->operator_ext) && (mycmd = switch_core_session_strdup(session, profile->operator_ext)))) {
argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
<span style="color: #800080; font-weight: bold">@@ -3292,7 +3294,7 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p</span>
#define VM_DESC "voicemail"
<span style="color: #A00000">-#define VM_USAGE "[check] [auth] <profile_name> <domain_name> [<id>]"</span>
<span style="color: #00A000">+#define VM_USAGE "[check] [auth] <profile_name> <domain_name> [<id>] [uuid]"</span>
SWITCH_STANDARD_APP(voicemail_function)
{
<span style="color: #800080; font-weight: bold">@@ -3304,6 +3306,7 @@ SWITCH_STANDARD_APP(voicemail_function)</span>
const char *domain_name = NULL;
const char *id = NULL;
const char *auth_var = NULL;
<span style="color: #00A000">+ const char *uuid = NULL;</span>
int x = 0, check = 0, auth = 0;
switch_channel_t *channel = switch_core_session_get_channel(session);
<span style="color: #800080; font-weight: bold">@@ -3363,7 +3366,10 @@ SWITCH_STANDARD_APP(voicemail_function)</span>
}
if (check) {
<span style="color: #A00000">- voicemail_check_main(session, profile, domain_name, id, auth);</span>
<span style="color: #00A000">+ if (argv[x]) {</span>
<span style="color: #00A000">+ uuid = argv[x++];</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ voicemail_check_main(session, profile, domain_name, id, auth, uuid);</span>
} else {
voicemail_leave_main(session, profile, domain_name, id);
}
</pre></div>
========================================================================<pre>
Summary of changes:
conf/autoload_configs/switch.conf.xml | 4 +---
src/include/private/switch_core_pvt.h | 1 -
src/mod/applications/mod_voicemail/mod_voicemail.c | 18 ++++++++++++------
src/mod/endpoints/mod_sofia/sofia.c | 7 +------
src/switch_core.c | 2 --
src/switch_core_sqldb.c | 9 +--------
6 files changed, 15 insertions(+), 26 deletions(-)
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH Source</p>