diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-11-30 21:22:01 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-11-30 21:22:01 +0000 |
| commit | 869101028b619423f7c4d78ee96d3b669efc8cb4 (patch) | |
| tree | 3228da5ddf405a44a55083a5cc1979f85561a5c9 /channels | |
| parent | 813f8d26fec6286542e3d202cc4f1bb6c9fc5a90 (diff) | |
Merged revisions 48168 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48168 | file | 2006-11-30 16:18:24 -0500 (Thu, 30 Nov 2006) | 2 lines
Do not do a partial bridge for Google Talk since we need to handle STUN. (issue #8448 reported by phsultan)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48169 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_gtalk.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index f64bc125b..e5ec59de6 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -163,7 +163,6 @@ struct gtalk_container { }; static const char desc[] = "Gtalk Channel"; -static const char type[] = "Gtalk"; static int global_capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263; @@ -192,7 +191,7 @@ static int gtalk_get_codec(struct ast_channel *chan); /*! \brief PBX interface structure for channel registration */ static const struct ast_channel_tech gtalk_tech = { - .type = type, + .type = "Gtalk", .description = "Gtalk Channel Driver", .capabilities = ((AST_FORMAT_MAX_AUDIO << 1) - 1), .requester = gtalk_request, @@ -220,7 +219,7 @@ static struct in_addr __ourip; /*! \brief RTP driver interface */ static struct ast_rtp_protocol gtalk_rtp = { - type: "gtalk", + type: "Gtalk", get_rtp_info: gtalk_get_rtp_peer, set_rtp_peer: gtalk_set_rtp_peer, get_codec: gtalk_get_codec, @@ -921,10 +920,12 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i, fmt = ast_best_codec(tmp->nativeformats); if (i->rtp) { + ast_rtp_setstun(i->rtp, 1); tmp->fds[0] = ast_rtp_fd(i->rtp); tmp->fds[1] = ast_rtcp_fd(i->rtp); } if (i->vrtp) { + ast_rtp_setstun(i->rtp, 1); tmp->fds[2] = ast_rtp_fd(i->vrtp); tmp->fds[3] = ast_rtcp_fd(i->vrtp); } @@ -1790,7 +1791,7 @@ static int load_module(void) /* Make sure we can register our channel type */ if (ast_channel_register(>alk_tech)) { - ast_log(LOG_ERROR, "Unable to register channel class %s\n", type); + ast_log(LOG_ERROR, "Unable to register channel class %s\n", gtalk_tech.type); return -1; } return 0; |