Recorded merge of revisions 265842 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r265842 | mmichelson | 2010-05-26 09:41:55 -0500 (Wed, 26 May 2010) | 9 lines

  Re-enable "always" option for videosupport option in sip.conf.

  (closes issue #17016)
  Reported by: twilson
  Patches:
        17016.patch uploaded by mmichelson (license 60)
  	  Tested by: devmod
........

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c886e4ded3a1d8e63d2690c91042a4b7e7b37c41..f7af488827784692f72b672a6bfa123ebbc586d3 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7244,7 +7244,8 @@ static struct sip_pvt *sip_alloc(ast_string_field callid, struct sockaddr_in *si
        if (sip_methods[intended_method].need_rtp) {
                p->rtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0, bindaddr.sin_addr);
                /* If the global videosupport flag is on, we always create a RTP interface for video */
-               if (ast_test_flag(&p->flags[1], SIP_PAGE2_VIDEOSUPPORT))
+               if (ast_test_flag(&p->flags[1], SIP_PAGE2_VIDEOSUPPORT) ||
+                               ast_test_flag(&p->flags[1], SIP_PAGE2_VIDEOSUPPORT_ALWAYS))
                        p->vrtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0, bindaddr.sin_addr);
                if (ast_test_flag(&p->flags[1], SIP_PAGE2_TEXTSUPPORT))
                        p->trtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0, bindaddr.sin_addr);
@@ -15506,7 +15507,7 @@ static char *_sip_show_peer(int type, int fd, struct mansession *s, const struct
                ast_cli(fd, "  DirectMedia  : %s\n", cli_yesno(ast_test_flag(&peer->flags[0], SIP_DIRECT_MEDIA)));
                ast_cli(fd, "  PromiscRedir : %s\n", cli_yesno(ast_test_flag(&peer->flags[0], SIP_PROMISCREDIR)));
                ast_cli(fd, "  User=Phone   : %s\n", cli_yesno(ast_test_flag(&peer->flags[0], SIP_USEREQPHONE)));
-               ast_cli(fd, "  Video Support: %s\n", cli_yesno(ast_test_flag(&peer->flags[1], SIP_PAGE2_VIDEOSUPPORT)));
+               ast_cli(fd, "  Video Support: %s\n", cli_yesno(ast_test_flag(&peer->flags[1], SIP_PAGE2_VIDEOSUPPORT) || ast_test_flag(&peer->flags[1], SIP_PAGE2_VIDEOSUPPORT_ALWAYS)));
                ast_cli(fd, "  Text Support : %s\n", cli_yesno(ast_test_flag(&peer->flags[1], SIP_PAGE2_TEXTSUPPORT)));
                ast_cli(fd, "  Ign SDP ver  : %s\n", cli_yesno(ast_test_flag(&peer->flags[1], SIP_PAGE2_IGNORESDPVERSION)));
                ast_cli(fd, "  Trust RPID   : %s\n", cli_yesno(ast_test_flag(&peer->flags[0], SIP_TRUSTRPID)));