[svn-commits] rmudgett: branch group/v14_colp r160889 - in /team/group/v14_colp: ./ apps/ c...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Dec 3 20:00:28 CST 2008
Author: rmudgett
Date: Wed Dec 3 20:00:27 2008
New Revision: 160889
URL: http://svn.digium.com/view/asterisk?view=rev&rev=160889
Log:
Resolved conflict and restarted automerge.
Merged revisions 160703,160764,160770 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r160703 | murf | 2008-12-03 14:41:42 -0600 (Wed, 03 Dec 2008) | 11 lines
(closes issue #13597)
Reported by: john8675309
Patches:
patch.13597 uploaded by murf (license 17)
Tested by: murf, john8675309
This patch causes the setcid func to update the CDR
clid after setting the channel field.
........
r160764 | qwell | 2008-12-03 15:38:07 -0600 (Wed, 03 Dec 2008) | 7 lines
Only show this warning when we want to show it.
(closes issue #13982)
Reported by: coolmig
Patches:
chan_agent.c.patch uploaded by coolmig (license 621)
........
r160770 | tilghman | 2008-12-03 15:54:07 -0600 (Wed, 03 Dec 2008) | 2 lines
Some compilers warn on null format strings; some don't (caught by buildbot)
........
Modified:
team/group/v14_colp/ (props changed)
team/group/v14_colp/apps/app_voicemail.c
team/group/v14_colp/channels/chan_agent.c
team/group/v14_colp/funcs/func_callerid.c
Propchange: team/group/v14_colp/
------------------------------------------------------------------------------
automerge = *
Propchange: team/group/v14_colp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 3 20:00:27 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-160571
+/branches/1.4:1-160852
Modified: team/group/v14_colp/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/apps/app_voicemail.c?view=diff&rev=160889&r1=160888&r2=160889
==============================================================================
--- team/group/v14_colp/apps/app_voicemail.c (original)
+++ team/group/v14_colp/apps/app_voicemail.c Wed Dec 3 20:00:27 2008
@@ -3099,7 +3099,7 @@
if (*fromstring) {
struct ast_channel *ast;
- if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) {
+ if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "Substitution/voicemail"))) {
char *ptr;
memset(passdata2, 0, len_passdata2);
prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, enc_cidnum, enc_cidname, dur, date, passdata2, len_passdata2, category);
@@ -3141,7 +3141,7 @@
}
if (emailsubject) {
struct ast_channel *ast;
- if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) {
+ if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "Substitution/voicemail"))) {
int vmlen = strlen(emailsubject) * 3 + 200;
/* Only allocate more space if the previous was not large enough */
if (vmlen > len_passdata) {
@@ -3215,7 +3215,7 @@
fprintf(p, "Content-Type: text/plain; charset=%s" ENDL "Content-Transfer-Encoding: 8bit" ENDL ENDL, charset);
if (emailbody) {
struct ast_channel *ast;
- if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) {
+ if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "Substitution/voicemail"))) {
char *passdata;
int vmlen = strlen(emailbody)*3 + 200;
if ((passdata = alloca(vmlen))) {
@@ -3336,7 +3336,7 @@
if (*pagerfromstring) {
struct ast_channel *ast;
- if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) {
+ if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "Substitution/voicemail"))) {
char *passdata;
int vmlen = strlen(fromstring)*3 + 200;
if ((passdata = alloca(vmlen))) {
@@ -3353,7 +3353,7 @@
fprintf(p, "To: %s\n", pager);
if (pagersubject) {
struct ast_channel *ast;
- if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) {
+ if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "Substitution/voicemail"))) {
char *passdata;
int vmlen = strlen(pagersubject) * 3 + 200;
if ((passdata = alloca(vmlen))) {
@@ -3369,7 +3369,7 @@
strftime(date, sizeof(date), "%A, %B %d, %Y at %r", &tm);
if (pagerbody) {
struct ast_channel *ast;
- if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0))) {
+ if ((ast = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "Substitution/voicemail"))) {
char *passdata;
int vmlen = strlen(pagerbody)*3 + 200;
if ((passdata = alloca(vmlen))) {
Modified: team/group/v14_colp/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/channels/chan_agent.c?view=diff&rev=160889&r1=160888&r2=160889
==============================================================================
--- team/group/v14_colp/channels/chan_agent.c (original)
+++ team/group/v14_colp/channels/chan_agent.c Wed Dec 3 20:00:27 2008
@@ -734,7 +734,8 @@
ast_mutex_unlock(&p->lock);
return res;
}
- ast_verbose( VERBOSE_PREFIX_3 "agent_call, call to agent '%s' call on '%s'\n", p->agent, p->chan->name);
+ if (option_verbose > 2)
+ ast_verbose(VERBOSE_PREFIX_3 "agent_call, call to agent '%s' call on '%s'\n", p->agent, p->chan->name);
if (option_debug > 2)
ast_log(LOG_DEBUG, "Playing beep, lang '%s'\n", p->chan->language);
res = ast_streamfile(p->chan, beep, p->chan->language);
Modified: team/group/v14_colp/funcs/func_callerid.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/funcs/func_callerid.c?view=diff&rev=160889&r1=160888&r2=160889
==============================================================================
--- team/group/v14_colp/funcs/func_callerid.c (original)
+++ team/group/v14_colp/funcs/func_callerid.c Wed Dec 3 20:00:27 2008
@@ -70,6 +70,7 @@
} else if (!strncasecmp("name", data, 4)) {
ast_copy_string(buf, name, len);
} else if (!strncasecmp("num", data, 3)) {
+ /* also matches "number" */
ast_copy_string(buf, num, len);
} else {
ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data);
@@ -86,6 +87,7 @@
ast_copy_string(buf, chan->cid.cid_name, len);
}
} else if (!strncasecmp("num", data, 3)) {
+ /* also matches "number" */
if (chan->cid.cid_num) {
ast_copy_string(buf, chan->cid.cid_num, len);
}
@@ -131,15 +133,28 @@
ast_callerid_split(value, name, sizeof(name), num, sizeof(num));
ast_set_callerid(chan, num, name, num);
+ if (chan->cdr) {
+ ast_cdr_setcid(chan->cdr, chan);
+ }
} else if (!strncasecmp("name", data, 4)) {
ast_set_callerid(chan, NULL, value, NULL);
- } else if (!strncasecmp("num", data, 3)) {
+ if (chan->cdr) {
+ ast_cdr_setcid(chan->cdr, chan);
+ }
+ } else if (!strncasecmp("num", data, 3)) {
+ /* also matches "number" */
ast_set_callerid(chan, value, NULL, NULL);
+ if (chan->cdr) {
+ ast_cdr_setcid(chan->cdr, chan);
+ }
} else if (!strncasecmp("ani", data, 3)) {
if (!strncasecmp(data + 3, "2", 1)) {
chan->cid.cid_ani2 = atoi(value);
} else {
ast_set_callerid(chan, NULL, NULL, value);
+ }
+ if (chan->cdr) {
+ ast_cdr_setcid(chan->cdr, chan);
}
} else if (!strncasecmp("dnid", data, 4)) {
ast_channel_lock(chan);
@@ -147,6 +162,9 @@
ast_free(chan->cid.cid_dnid);
}
chan->cid.cid_dnid = ast_strdup(value);
+ if (chan->cdr) {
+ ast_cdr_setcid(chan->cdr, chan);
+ }
ast_channel_unlock(chan);
} else if (!strncasecmp("rdnis", data, 5)) {
ast_channel_lock(chan);
@@ -154,6 +172,9 @@
ast_free(chan->cid.cid_rdnis);
}
chan->cid.cid_rdnis = ast_strdup(value);
+ if (chan->cdr) {
+ ast_cdr_setcid(chan->cdr, chan);
+ }
ast_channel_unlock(chan);
} else if (!strncasecmp("pres", data, 4)) {
int i;
More information about the svn-commits
mailing list