[svn-commits] murf: branch murf/bug8221-1.4 r48085 - in /team/murf/bug8221-1.4: main/ res/

Tue Nov 28 08:23:10 MST 2006

Author: murf
Date: Tue Nov 28 09:23:09 2006
New Revision: 48085

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48085
Log:
Merged revisions 47989,47992,48002,48015,48017,48031,48038,48046,48049,48054 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r47989 | crichter | 2006-11-24 08:46:13 -0700 (Fri, 24 Nov 2006) | 9 lines

Merged revisions 47968 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r47968 | crichter | 2006-11-23 17:10:23 +0100 (Do, 23 Nov 2006) | 1 line

fixed a litle bug regarding HOLD/RETRIEVE. beatufied some logs, changed some loglevels. changed the default value of block_on_alarm
........

................
r47992 | murf | 2006-11-24 10:17:07 -0700 (Fri, 24 Nov 2006) | 1 line

bug 8189 posted this fix for main/translate.c for PLC
................
r48002 | oej | 2006-11-25 02:28:28 -0700 (Sat, 25 Nov 2006) | 4 lines

Not having a HINT is not an ERROR. In 1.4 and future releases, you can disable
subscription support totally or per peer in sip.conf with allowsubscribe = yes | no


................
r48015 | murf | 2006-11-25 17:01:34 -0700 (Sat, 25 Nov 2006) | 1 line

A little bit of func_cdr documentation upgrade-- no bug# involved, although 8221 may have inspired it.
................
r48017 | murf | 2006-11-25 17:26:16 -0700 (Sat, 25 Nov 2006) | 1 line

might as well also document the raw values of the flag vars
................
r48031 | oej | 2006-11-26 23:41:33 -0700 (Sun, 26 Nov 2006) | 2 lines

Change logging message

................
r48038 | file | 2006-11-27 08:32:19 -0700 (Mon, 27 Nov 2006) | 10 lines

Merged revisions 48037 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r48037 | file | 2006-11-27 10:30:37 -0500 (Mon, 27 Nov 2006) | 2 lines

Do not reference the freed outgoing structure in the debug message. (issue #8425 reported by arkadia)

........

................
r48046 | russell | 2006-11-27 10:17:40 -0700 (Mon, 27 Nov 2006) | 2 lines

Remove a couple of unused variables (issue #8380, casper)

................
r48049 | tilghman | 2006-11-27 10:20:37 -0700 (Mon, 27 Nov 2006) | 10 lines

Merged revisions 48045 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r48045 | tilghman | 2006-11-27 11:15:54 -0600 (Mon, 27 Nov 2006) | 2 lines

Random MOH wasn't really random (bug 8381)

........

................
r48054 | file | 2006-11-27 11:06:50 -0700 (Mon, 27 Nov 2006) | 10 lines

Merged revisions 48053 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r48053 | file | 2006-11-27 13:03:57 -0500 (Mon, 27 Nov 2006) | 2 lines

Use the proper function to get the new message count instead of always using the filesystem. (issue #8421 reported by slimey)

........

................

Modified:
    team/murf/bug8221-1.4/main/cdr.c
    team/murf/bug8221-1.4/main/channel.c
    team/murf/bug8221-1.4/res/res_features.c

Modified: team/murf/bug8221-1.4/main/cdr.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221-1.4/main/cdr.c?view=diff&rev=48085&r1=48084&r2=48085
==============================================================================

--- team/murf/bug8221-1.4/main/cdr.c (original)
+++ team/murf/bug8221-1.4/main/cdr.c Tue Nov 28 09:23:09 2006
@@ -518,6 +518,14 @@
 		strcpy(to->dstchannel, from->dstchannel);
 		from->dstchannel[0] = 0; /* theft */
 	}
+	if (!to->src[0] && from->src[0]) {
+		strcpy(to->src, from->src);
+		from->src[0] = 0; /* theft */
+	}
+	if (!to->dst[0] && from->dst[0]) {
+		strcpy(to->dst, from->dst);
+		from->dst[0] = 0; /* theft */
+	}
 	if (!to->amaflags && from->amaflags) {
 		to->amaflags = from->amaflags;
 		from->amaflags = 0; /* theft */

Modified: team/murf/bug8221-1.4/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221-1.4/main/channel.c?view=diff&rev=48085&r1=48084&r2=48085
==============================================================================
--- team/murf/bug8221-1.4/main/channel.c (original)
+++ team/murf/bug8221-1.4/main/channel.c Tue Nov 28 09:23:09 2006
@@ -2122,7 +2122,7 @@
 				} else {
 					/* Answer the CDR */
 					ast_setstate(chan, AST_STATE_UP);
-					ast_log(LOG_NOTICE,"posting Answer time to (__ast_read.answer) channel %s:%x\n", chan->name, (int)chan->cdr);
+					ast_log(LOG_NOTICE,"posting Answer time to (__ast_read.answer) channel %s:%x!!!!\n", chan->name, (int)chan->cdr);
 					if (!chan->cdr) { /* up till now, this insertion hasn't been done. Therefore,
 										 to keep from throwing off the basic order of the universe,
 										 we will try to keep this cdr from getting posted. */
@@ -2792,6 +2792,16 @@
 	}
 	ast_set_callerid(chan, cid_num, cid_name, cid_num);
 
+	
+
+	if (!chan->cdr) { /* up till now, this insertion hasn't been done. Therefore,
+				to keep from throwing off the basic order of the universe,
+				we will try to keep this cdr from getting posted. */
+		ast_log(LOG_NOTICE,"Adding CDR to request_and_dial for channel %s\n", chan->name);
+		chan->cdr = ast_cdr_alloc();
+		ast_cdr_init(chan->cdr, chan);
+		ast_cdr_start(chan->cdr);
+	}
 	if (ast_call(chan, data, 0)) {	/* ast_call failed... */
 		ast_log(LOG_NOTICE, "Unable to call channel %s/%s\n", type, (char *)data);
 	} else {

Modified: team/murf/bug8221-1.4/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221-1.4/res/res_features.c?view=diff&rev=48085&r1=48084&r2=48085
==============================================================================
--- team/murf/bug8221-1.4/res/res_features.c (original)
+++ team/murf/bug8221-1.4/res/res_features.c Tue Nov 28 09:23:09 2006
@@ -1137,6 +1137,14 @@
 		ast_set_callerid(chan, cid_num, cid_name, cid_num);
 		ast_channel_inherit_variables(caller, chan);	
 		pbx_builtin_setvar_helper(chan, "TRANSFERERNAME", caller->name);
+		ast_log(LOG_NOTICE,"In ast_feature_request_and_dial ====  %s:%x\n", chan->name, (int)chan->cdr);
+		if (!chan->cdr) {
+			chan->cdr=ast_cdr_alloc();
+			ast_cdr_init(chan->cdr, chan); /* initilize our channel's cdr */
+			ast_cdr_start(chan->cdr);
+			ast_log(LOG_NOTICE,"Creating cdr in channel %s:%x\n", chan->name, (int)chan->cdr);
+		}
+			
 		if (!ast_call(chan, data, timeout)) {
 			struct timeval started;
 			int x, len = 0;

