[svn-commits] rmudgett: branch group/v14_colp r166662 - in /team/group/v14_colp: ./ channel...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Dec 23 10:28:59 2008
New Revision: 166662

URL: http://svn.digium.com/view/asterisk?view=rev&rev=166662
Log:
Resolved conflict and restarted automerge.

Merged revisions 166509,166568,166592 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r166509 | tilghman | 2008-12-22 22:05:25 -0600 (Mon, 22 Dec 2008) | 4 lines
  
  Use the integer form of condition for integer comparisons.
  (closes issue #14127)
   Reported by: andrew
........
  r166568 | mmichelson | 2008-12-23 09:16:26 -0600 (Tue, 23 Dec 2008) | 12 lines
  
  Fix a crash resulting from a datastore with inheritance but no duplicate callback
  
  The fix for this is to simply set the newly created datastore's data pointer
  to NULL if it is inherited but has no duplicate callback.
  
  (closes issue #14113)
  Reported by: francesco_r
  Patches:
        14113.patch uploaded by putnopvut (license 60)
  Tested by: francesco_r
........
  r166592 | tilghman | 2008-12-23 09:35:38 -0600 (Tue, 23 Dec 2008) | 3 lines
  
  Compile, even if both DAHDI and Zaptel are not installed.
  (Closes issue #14120)
........

Modified:
    team/group/v14_colp/   (props changed)
    team/group/v14_colp/channels/chan_iax2.c
    team/group/v14_colp/main/asterisk.c
    team/group/v14_colp/main/channel.c

Propchange: team/group/v14_colp/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/v14_colp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec 23 10:28:59 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-166392
+/branches/1.4:1-166648

Modified: team/group/v14_colp/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/channels/chan_iax2.c?view=diff&rev=166662&r1=166661&r2=166662
==============================================================================
--- team/group/v14_colp/channels/chan_iax2.c (original)
+++ team/group/v14_colp/channels/chan_iax2.c Tue Dec 23 10:28:59 2008
@@ -11312,6 +11312,7 @@
 	iax_set_error(iax_error_output);
 	jb_setoutput(jb_error_output, jb_warning_output, NULL);
 	
+#ifdef HAVE_DAHDI
 #ifdef DAHDI_TIMERACK
 	timingfd = open(DAHDI_FILE_TIMER, O_RDWR);
 	if (timingfd < 0)
@@ -11319,6 +11320,7 @@
 		timingfd = open(DAHDI_FILE_PSEUDO, O_RDWR);
 	if (timingfd < 0) 
 		ast_log(LOG_WARNING, "Unable to open IAX timing interface: %s\n", strerror(errno));
+#endif
 
 	memset(iaxs, 0, sizeof(iaxs));
 

Modified: team/group/v14_colp/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/main/asterisk.c?view=diff&rev=166662&r1=166661&r2=166662
==============================================================================
--- team/group/v14_colp/main/asterisk.c (original)
+++ team/group/v14_colp/main/asterisk.c Tue Dec 23 10:28:59 2008
@@ -3034,6 +3034,7 @@
 	dahdi_chan_name_len = &_dahdi_chan_name_len;
 	dahdi_chan_mode = &_dahdi_chan_mode;
 
+#ifdef HAVE_DAHDI
 	{
 		int fd;
 		int x = 160;
@@ -3070,6 +3071,7 @@
 			close(fd);
 		}
 	}
+#endif
 	threadstorage_init();
 
 	astobj2_init();

Modified: team/group/v14_colp/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/main/channel.c?view=diff&rev=166662&r1=166661&r2=166662
==============================================================================
--- team/group/v14_colp/main/channel.c (original)
+++ team/group/v14_colp/main/channel.c Tue Dec 23 10:28:59 2008
@@ -1792,7 +1792,7 @@
 		if (datastore->inheritance > 0) {
 			datastore2 = ast_channel_datastore_alloc(datastore->info, datastore->uid);
 			if (datastore2) {
-				datastore2->data = datastore->info->duplicate(datastore->data);
+				datastore2->data = datastore->info->duplicate ? datastore->info->duplicate(datastore->data) : NULL;
 				datastore2->inheritance = datastore->inheritance == DATASTORE_INHERIT_FOREVER ? DATASTORE_INHERIT_FOREVER : datastore->inheritance - 1;
 				AST_LIST_INSERT_TAIL(&to->datastores, datastore2, entry);
 			}
@@ -2980,6 +2980,9 @@
 	/* The channel driver does not support this indication, let's fake
 	 * it by doing our own tone generation if applicable. */
 
+	/*!\note If we compare the enumeration type, which does not have any
+	 * negative constants, the compiler may optimize this code away.
+	 * Therefore, we must perform an integer comparison here. */
 	if (_condition < 0) {
 		/* Stop any tones that are playing */
 		ast_playtones_stop(chan);