diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-03-21 03:27:58 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-03-21 03:27:58 +0000 |
| commit | 1d5be2d1c77a84c9c8d7a1e66b1a372c026d4860 (patch) | |
| tree | cda3f5fdab8d1e074021d4d6718f82bf824b0a66 /channels | |
| parent | 7669c0ede7f425c521727172a340d46728a95e9f (diff) | |
Merged revisions 59081 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59081 | file | 2007-03-20 23:25:48 -0400 (Tue, 20 Mar 2007) | 2 lines
Until we can do media level parsing for sendrecv/etc just use the first value found. This crept up when a phone was offered audio+video and returned an inactive video stream. chan_sip thought the phone said to put the person on hold but that was totally wrong. (issue #9319 reported by benbrown)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index bb67890a0..758d28248 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5082,7 +5082,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req) int codec; int destiterator = 0; int iterator; - int sendonly = 0; + int sendonly = -1; int numberofports; struct ast_rtp *newaudiortp, *newvideortp, *newtextrtp; /* Buffers for codec handling */ int newjointcapability; /* Negotiated capability */ @@ -5360,13 +5360,16 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req) continue; } if (!strcasecmp(a, "sendonly")) { - sendonly = 1; + if (sendonly == -1) + sendonly = 1; continue; } else if (!strcasecmp(a, "inactive")) { - sendonly = 2; + if (sendonly == -1) + sendonly = 2; continue; } else if (!strcasecmp(a, "sendrecv")) { - sendonly = 0; + if (sendonly == -1) + sendonly = 0; continue; } else if (strlen(a) > 5 && !strncasecmp(a, "ptime", 5)) { char *tmp = strrchr(a, ':'); @@ -5641,7 +5644,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req) ast_set_write_format(p->owner, p->owner->writeformat); } - if (sin.sin_addr.s_addr && !sendonly) { + if (sin.sin_addr.s_addr && (!sendonly || sendonly == -1)) { ast_queue_control(p->owner, AST_CONTROL_UNHOLD); /* Activate a re-invite */ ast_queue_frame(p->owner, &ast_null_frame); @@ -5657,7 +5660,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req) } /* Manager Hold and Unhold events must be generated, if necessary */ - if (sin.sin_addr.s_addr && !sendonly) { + if (sin.sin_addr.s_addr && (!sendonly || sendonly == -1)) { if (ast_test_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD)) { append_history(p, "Unhold", "%s", req->data); if (global_callevents) |