kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multiple revisions 350788-350789

Browse Source 
........
  r350788 | kpfleming | 2012-01-14 09:22:33 -0600 (Sat, 14 Jan 2012) | 8 lines
  
  Ensure that two prerequisites are properly installed on Debian-style distributions.
  
  * Don't specify a specific version of libgmime; newer versions are available
    now and acceptable.
  
  * Install libsrtp so that res_srtp can be built.
........
  r350789 | kpfleming | 2012-01-14 09:23:32 -0600 (Sat, 14 Jan 2012) | 3 lines
  
  Correct some 'set-but-not-used' variable warnings.
........

Merged revisions 350788-350789 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 350790 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@350791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2012-01-14 15:51:43 +00:00
parent d05a7d45cd
commit 0f83634984
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
channels/chan_h323.c
View File

@@ -3234,6 +3234,7 @@ static enum ast_rtp_glue_result oh323_get_rtp_peer(struct ast_channel *chan, str
return res;
}
#if 0
static char *convertcap(struct ast_format *format)
{
switch (format->id) {
@@ -3260,6 +3261,7 @@ static char *convertcap(struct ast_format *format)
return NULL;
}
}
#endif
static int oh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *rtp, struct ast_rtp_instance *vrtp, struct ast_rtp_instance *trtp, const struct ast_format_cap *codecs, int nat_active)
{
@@ -3267,13 +3269,18 @@ static int oh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance
struct oh323_pvt *pvt;
struct sockaddr_in them = { 0, };
struct sockaddr_in us = { 0, };
#if 0 /* Native bridge still isn't ready */
char *mode;
#endif
if (!rtp) {
return 0;
}
#if 0 /* Native bridge still isn't ready */
mode = convertcap(&chan->writeformat);
#endif
pvt = (struct oh323_pvt *) chan->tech_pvt;
if (!pvt) {
ast_log(LOG_ERROR, "No Private Structure, this is bad\n");