diff options
author | Richard Mudgett <rmudgett@digium.com> | 2013-12-19 17:13:53 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2013-12-19 17:13:53 +0000 |
commit | 3ccd5dee18dfbd64b01cba68790721680477df19 (patch) | |
tree | 00e9575547264fcdc6149a836bf317959dd982fa /addons/chan_ooh323.c | |
parent | c061f634da53715c0aa17a450c1177a14fdf4713 (diff) |
udptl: Dead code elimination. ast_udptl_bridge was not used.
Removing dead code starting with ast_udptl_bridge() eliminated the code in
this change.
Note: This code has actually been dead since Asterisk v1.4 when it was
first put in.
Review: https://reviewboard.asterisk.org/r/3079/
........
Merged revisions 404354 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404355 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'addons/chan_ooh323.c')
-rw-r--r-- | addons/chan_ooh323.c | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index 52c0404a5..ca81f9bfd 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -92,9 +92,6 @@ static int ooh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance static void ooh323_get_codec(struct ast_channel *chan, struct ast_format_cap *result); void setup_rtp_remote(ooCallData *call, const char *remoteIp, int remotePort); -static struct ast_udptl *ooh323_get_udptl_peer(struct ast_channel *chan); -static int ooh323_set_udptl_peer(struct ast_channel *chan, struct ast_udptl *udptl); - static void print_codec_to_cli(int fd, struct ast_codec_pref *pref); struct ooh323_peer *find_friend(const char *name, int port); @@ -130,13 +127,6 @@ static struct ast_rtp_glue ooh323_rtp = { .get_codec = ooh323_get_codec, }; -static struct ast_udptl_protocol ooh323_udptl = { - .type = "H323", - .get_udptl_info = ooh323_get_udptl_peer, - .set_udptl_peer = ooh323_set_udptl_peer, -}; - - struct ooh323_user; @@ -3796,7 +3786,6 @@ static int load_module(void) return 0; } ast_rtp_glue_register(&ooh323_rtp); - ast_udptl_proto_register(&ooh323_udptl); ast_cli_register_multiple(cli_ooh323, sizeof(cli_ooh323) / sizeof(struct ast_cli_entry)); /* fire up the H.323 Endpoint */ @@ -4233,7 +4222,6 @@ static int unload_module(void) /* First, take us out of the channel loop */ ast_cli_unregister_multiple(cli_ooh323, sizeof(cli_ooh323) / sizeof(struct ast_cli_entry)); ast_rtp_glue_unregister(&ooh323_rtp); - ast_udptl_proto_unregister(&ooh323_udptl); ast_channel_unregister(&ooh323_tech); #if 0 ast_unregister_atexit(&ast_ooh323c_exit); @@ -4785,41 +4773,6 @@ void close_rtp_connection(ooCallData *call) udptl handling functions */ -static struct ast_udptl *ooh323_get_udptl_peer(struct ast_channel *chan) -{ - struct ooh323_pvt *p; - struct ast_udptl *udptl = NULL; - - p = ast_channel_tech_pvt(chan); - if (!p) - return NULL; - - ast_mutex_lock(&p->lock); - if (p->udptl) - udptl = p->udptl; - ast_mutex_unlock(&p->lock); - return udptl; -} - -static int ooh323_set_udptl_peer(struct ast_channel *chan, struct ast_udptl *udptl) -{ - struct ooh323_pvt *p; - - p = ast_channel_tech_pvt(chan); - if (!p) - return -1; - ast_mutex_lock(&p->lock); - - if (udptl) { - ast_udptl_get_peer(udptl, &p->udptlredirip); - } else - memset(&p->udptlredirip, 0, sizeof(p->udptlredirip)); - - ast_mutex_unlock(&p->lock); - /* free(callToken); */ - return 0; -} - void setup_udptl_connection(ooCallData *call, const char *remoteIp, int remotePort) { |