From: Gregory Nietsky <gregory@distrotech.co.za>
Date: Mon, 19 Sep 2011 13:31:50 +0000 (+0000)
Subject: Merged revisions 336499 via svnmerge from
X-Git-Tag: 10.0.0-beta2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d88b2a8f960c30691e2b40c3c86db66c24590e84;p=thirdparty%2Fasterisk.git

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)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@336500 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 76fbf80e6b..2e76ce77be 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -988,6 +988,7 @@ static int __oh323_rtp_create(struct oh323_pvt *pvt)
 			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);