summaryrefslogtreecommitdiff
path: root/channels/chan_h323.c
diff options
context:
space:
mode:
authorGregory Nietsky <gregory@distrotech.co.za>2011-09-19 13:41:52 +0000
committerGregory Nietsky <gregory@distrotech.co.za>2011-09-19 13:41:52 +0000
commitd9306c4087472a27432c4531df2cdaf53cd9aed8 (patch)
treedd1c277951ce4bd0c14babad1fabf48a375f99c3 /channels/chan_h323.c
parentcab155e437ed7563d55262f6440c5a18cf80d9c6 (diff)
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) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336503 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_h323.c')
-rw-r--r--channels/chan_h323.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 76fbf80e6..2e76ce77b 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);