[asterisk-commits] kpfleming: branch 1.6.1 r146698 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Mon Oct  6 11:39:25 2008
New Revision: 146698

URL: http://svn.digium.com/view/asterisk?view=rev&rev=146698
Log:
Merged revisions 146644 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r146644 | kpfleming | 2008-10-06 11:03:37 -0500 (Mon, 06 Oct 2008) | 15 lines
  
  Merged revisions 146643 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r146643 | kpfleming | 2008-10-06 10:57:49 -0500 (Mon, 06 Oct 2008) | 8 lines
    
    ensure that the private structure for pseudo channels is created without 'leaking' configuration data from other configured channels
    
    (closes issue #13555)
    Reported by: jeffg
    Patches:
          issue_13555.patch uploaded by kpfleming (license 421)
    Tested by: jeffg
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_dahdi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=146698&r1=146697&r2=146698
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Mon Oct  6 11:39:25 2008
@@ -14545,14 +14545,13 @@
 	/*< \todo why check for the pseudo in the per-channel section.
 	 * Any actual use for manual setup of the pseudo channel? */
 	if (!found_pseudo && reload == 0) {
-		/* Make sure pseudo isn't a member of any groups if
-		   we're automatically making it. */	
-		
-		confp->chan.group = 0;
-		confp->chan.callgroup = 0;
-		confp->chan.pickupgroup = 0;
-
-		tmp = mkintf(CHAN_PSEUDO, confp, NULL, reload);
+		/* use the default configuration for a channel, so
+		   that any settings from real configured channels
+		   don't "leak" into the pseudo channel config
+		*/
+		struct dahdi_chan_conf conf = dahdi_chan_conf_default();
+
+		tmp = mkintf(CHAN_PSEUDO, &conf, NULL, reload);
 
 		if (tmp) {
 			ast_verb(3, "Automatically generated pseudo channel\n");