[asterisk-commits] irroot: trunk r336503 - in /trunk: ./ channels/chan_h323.c

[SVN commits to the Asterisk project]

Author: irroot
Date: Mon Sep 19 08:41:52 2011
New Revision: 336503

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=336503
Log:
Merged revisions 336500 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336500 | irroot | 2011-09-19 15:31:50 +0200 (Mon, 19 Sep 2011) | 19 lines
  
  Merged revisions 336499 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r336499 | irroot | 2011-09-19 15:27:52 +0200 (Mon, 19 Sep 2011) | 13 lines
    
    A long time ago in a galaxy far far away a IPv6 update was made,
    chan_h323 was not updated causeing all to flee to chan_ooh323.
    
    the brave Jedi [asterisk developers] pondered this miscarrige of justice
    and restored order to the force for the sake of closing out 2 old issues.
    
    (closes issue ASTERISK-17278)
    (closes issue ASTERISK-17500)
    Reported by: dread, sybasesql
    Tested by: irroot
    Reviewed by: IRC (russellb, kpfleming)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_h323.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_h323.c?view=diff&rev=336503&r1=336502&r2=336503
==============================================================================
--- trunk/channels/chan_h323.c (original)
+++ trunk/channels/chan_h323.c Mon Sep 19 08:41:52 2011
@@ -988,6 +988,7 @@
 			return -1;
 		}
 	}
+	our_addr.ss.ss_family = AF_INET;
 	pvt->rtp = ast_rtp_instance_new("asterisk", sched, &our_addr, NULL);
 	if (!pvt->rtp) {
 		ast_mutex_unlock(&pvt->lock);