Merged revisions 7599 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 22 Dec 2005 20:38:43 +0000 (20:38 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 22 Dec 2005 20:38:43 +0000 (20:38 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7599 | russell | 2005-12-22 15:36:47 -0500 (Thu, 22 Dec 2005) | 3 lines

revert changes to videosupport to allow per-peer setting, since it isn't quite
complete and there is not an obvious fix at this point

........

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

channels/chan_sip.c
configs/sip.conf.sample

index d5899aa..a04d8e2 100644 (file)
@@ -414,6 +414,8 @@ static struct sockaddr_in debugaddr;
 
 static int tos = 0;
 
+static int videosupport = 0;
+
 static int compactheaders = 0;                         /*!< send compact sip headers */
 
 static int recordhistory = 0;                          /*!< Record SIP history. Off by default */
@@ -555,13 +557,11 @@ struct sip_auth {
 #define SIP_CALL_LIMIT         (1 << 29)
 /* Remote Party-ID Support */
 #define SIP_SENDRPID           (1 << 30)
-/* SIP Video Options */
-#define SIP_VIDEOSUPPORT       (1 << 31)
 
 #define SIP_FLAGS_TO_COPY \
        (SIP_PROMISCREDIR | SIP_TRUSTRPID | SIP_SENDRPID | SIP_DTMF | SIP_REINVITE | \
         SIP_PROG_INBAND | SIP_OSPAUTH | SIP_USECLIENTCODE | SIP_NAT | \
-        SIP_INSECURE_PORT | SIP_INSECURE_INVITE | SIP_VIDEOSUPPORT)
+        SIP_INSECURE_PORT | SIP_INSECURE_INVITE)
 
 /* a new page of flags for peer */
 #define SIP_PAGE2_RTCACHEFRIENDS       (1 << 0)
@@ -3045,10 +3045,10 @@ static struct sip_pvt *sip_alloc(char *callid, struct sockaddr_in *sin, int useg
 
        if (sip_methods[intended_method].need_rtp) {
                p->rtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0, bindaddr.sin_addr);
-               if (ast_test_flag(p, SIP_VIDEOSUPPORT))
+               if (videosupport)
                        p->vrtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0, bindaddr.sin_addr);
-               if (!p->rtp || (ast_test_flag(p, SIP_VIDEOSUPPORT) && !p->vrtp)) {
-                       ast_log(LOG_WARNING, "Unable to create RTP audio %s session: %s\n", ast_test_flag(p, SIP_VIDEOSUPPORT) ? "and video" : "", strerror(errno));
+               if (!p->rtp || (videosupport && !p->vrtp)) {
+                       ast_log(LOG_WARNING, "Unable to create RTP audio %s session: %s\n", videosupport ? "and video" : "", strerror(errno));
                        ast_mutex_destroy(&p->lock);
                        if (p->chanvars) {
                                ast_variables_destroy(p->chanvars);
@@ -4415,7 +4415,7 @@ static int add_sdp(struct sip_request *resp, struct sip_pvt *p)
        }
 
        /* Now send any other common codecs, and non-codec formats: */
-       for (x = 1; x <= ((ast_test_flag(p, SIP_VIDEOSUPPORT) && p->vrtp) ? AST_FORMAT_MAX_VIDEO : AST_FORMAT_MAX_AUDIO); x <<= 1) {
+       for (x = 1; x <= ((videosupport && p->vrtp) ? AST_FORMAT_MAX_VIDEO : AST_FORMAT_MAX_AUDIO); x <<= 1) {
                if (!(capability & x))
                        continue;
 
@@ -7520,7 +7520,6 @@ static int _sip_show_peers(int fd, int *total, struct mansession *s, struct mess
                        "IPport: %d\r\n"
                        "Dynamic: %s\r\n"
                        "Natsupport: %s\r\n"
-                       "Video Support: %s\r\n"
                        "ACL: %s\r\n"
                        "Status: %s\r\n\r\n", 
                        idtext,
@@ -7529,7 +7528,6 @@ static int _sip_show_peers(int fd, int *total, struct mansession *s, struct mess
                        ntohs(iterator->addr.sin_port), 
                        ast_test_flag(iterator, SIP_DYNAMIC) ? "yes" : "no",  /* Dynamic or not? */
                        (ast_test_flag(iterator, SIP_NAT) & SIP_NAT_ROUTE) ? "yes" : "no",      /* NAT=yes? */
-                       ast_test_flag(iterator, SIP_VIDEOSUPPORT) ? "yes" : "no",       /* VIDEOSUPPORT=yes? */
                        iterator->ha ? "yes" : "no",       /* permit/deny */
                        status);
                }
@@ -7910,7 +7908,6 @@ static int _sip_show_peer(int type, int fd, struct mansession *s, struct message
                ast_cli(fd, "  CanReinvite  : %s\n", (ast_test_flag(peer, SIP_CAN_REINVITE)?"Yes":"No"));
                ast_cli(fd, "  PromiscRedir : %s\n", (ast_test_flag(peer, SIP_PROMISCREDIR)?"Yes":"No"));
                ast_cli(fd, "  User=Phone   : %s\n", (ast_test_flag(peer, SIP_USEREQPHONE)?"Yes":"No"));
-               ast_cli(fd, "  Video Support: %s\n", (ast_test_flag(peer, SIP_VIDEOSUPPORT)?"Yes":"No"));
                ast_cli(fd, "  Trust RPID   : %s\n", (ast_test_flag(peer, SIP_TRUSTRPID) ? "Yes" : "No"));
                ast_cli(fd, "  Send RPID    : %s\n", (ast_test_flag(peer, SIP_SENDRPID) ? "Yes" : "No"));
 
@@ -7987,7 +7984,6 @@ static int _sip_show_peer(int type, int fd, struct mansession *s, struct message
                ast_cli(fd, "SIP-CanReinvite: %s\r\n", (ast_test_flag(peer, SIP_CAN_REINVITE)?"Y":"N"));
                ast_cli(fd, "SIP-PromiscRedir: %s\r\n", (ast_test_flag(peer, SIP_PROMISCREDIR)?"Y":"N"));
                ast_cli(fd, "SIP-UserPhone: %s\r\n", (ast_test_flag(peer, SIP_USEREQPHONE)?"Y":"N"));
-               ast_cli(fd, "SIP-VideoSupport: %s\r\n", (ast_test_flag(peer, SIP_VIDEOSUPPORT)?"Y":"N"));
 
                /* - is enumerated */
                ast_cli(fd, "SIP-DTMFmode %s\r\n", dtmfmode2str(ast_test_flag(peer, SIP_DTMF)));
@@ -8134,7 +8130,7 @@ static int sip_show_settings(int fd, int argc, char *argv[])
        ast_cli(fd, "----------------\n");
        ast_cli(fd, "  SIP Port:               %d\n", ntohs(bindaddr.sin_port));
        ast_cli(fd, "  Bindaddress:            %s\n", ast_inet_ntoa(tmp, sizeof(tmp), bindaddr.sin_addr));
-       ast_cli(fd, "  Videosupport:           %s\n", ast_test_flag(&global_flags, SIP_VIDEOSUPPORT) ? "Yes" : "No");
+       ast_cli(fd, "  Videosupport:           %s\n", videosupport ? "Yes" : "No");
        ast_cli(fd, "  AutoCreatePeer:         %s\n", autocreatepeer ? "Yes" : "No");
        ast_cli(fd, "  Allow unknown access:   %s\n", global_allowguest ? "Yes" : "No");
        ast_cli(fd, "  Promsic. redir:         %s\n", ast_test_flag(&global_flags, SIP_PROMISCREDIR) ? "Yes" : "No");
@@ -12087,8 +12083,6 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int
                        ast_copy_string(peer->fromdomain, v->value, sizeof(peer->fromdomain));
                else if (!strcasecmp(v->name, "usereqphone"))
                        ast_set2_flag(peer, ast_true(v->value), SIP_USEREQPHONE);
-               else if (!strcasecmp(v->name, "videosupport"))
-                       ast_set2_flag(peer, ast_true(v->value), SIP_VIDEOSUPPORT);
                else if (!strcasecmp(v->name, "fromuser"))
                        ast_copy_string(peer->fromuser, v->value, sizeof(peer->fromuser));
                else if (!strcasecmp(v->name, "host") || !strcasecmp(v->name, "outboundproxy")) {
@@ -12293,6 +12287,7 @@ static int reload_config(void)
        memset(&outboundproxyip, 0, sizeof(outboundproxyip));
        outboundproxyip.sin_port = htons(DEFAULT_SIP_PORT);
        outboundproxyip.sin_family = AF_INET;   /* Type of address: IPv4 */
+       videosupport = 0;
        compactheaders = 0;
        dumphistory = 0;
        recordhistory = 0;
@@ -12373,7 +12368,7 @@ static int reload_config(void)
                                global_rtpkeepalive = 0;
                        }
                } else if (!strcasecmp(v->name, "videosupport")) {
-                       ast_set2_flag((&global_flags), ast_true(v->value), SIP_VIDEOSUPPORT);
+                       videosupport = ast_true(v->value);
                } else if (!strcasecmp(v->name, "compactheaders")) {
                        compactheaders = ast_true(v->value);
                } else if (!strcasecmp(v->name, "notifymimetype")) {
index 4d279aa..3d9299c 100644 (file)
@@ -290,7 +290,6 @@ srvlookup=yes                       ; Enable DNS SRV lookups on outbound calls
 ; call-limit                 call-limit
 ; restrictcid                restrictcid
 ; subscribecontext           subscribecontext
-; videosupport               videosupport
 ;                             mailbox
 ;                             username
 ;                             template