asterisk/asterisk.patch.xfersips@9fe04d4d4e5a
asterisk/asterisk.patch.xfersips
Mon, 17 Sep 2012 19:10:10 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 17 Sep 2012 19:10:10 +0200
- changeset 689
- 9fe04d4d4e5a
- parent 404
- b6420eee9bde
- child 798
- 4ef5d37e8bb2
- permissions
- -rw-r--r--
Update to new version of vendor software although Oracle fails to deliver.
More specifically, newer db(3) patch revisions exist but Oracle has
removed them from the canonical download server URI for Berkely DB.
1 Index: channels/chan_sip.c
2 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
3 --- channels/chan_sip.c.orig 2011-05-23 17:35:28.358543497 +0200
4 +++ channels/chan_sip.c 2011-05-23 17:57:05.948534524 +0200
5 @@ -29733,6 +29733,7 @@
6 \todo Fix this function so that we wait for reply to the REFER and
7 react to errors, denials or other issues the other end might have.
8 */
9 +/* MSvB: Paramater dest may be SIPS encoded, having '@' before domain */
10 static int sip_sipredirect(struct sip_pvt *p, const char *dest)
11 {
12 char *cdest;
13 @@ -29741,7 +29742,7 @@
14 cdest = ast_strdupa(dest);
16 extension = strsep(&cdest, "@");
17 - domain = cdest;
18 + domain = strsep(&cdest, ":"); /* MSvB: Could begin with '@' if SIPS */
19 if (ast_strlen_zero(extension)) {
20 ast_log(LOG_ERROR, "Missing mandatory argument: extension\n");
21 return 0;
22 @@ -29773,7 +29774,14 @@
23 }
24 }
26 - ast_string_field_build(p, our_contact, "Transfer <sip:%s@%s>", extension, domain);
27 + if (domain && *domain == '@') {
28 + ast_log(LOG_DEBUG, "Decoding TLS incapable Asterisk SIP URI to a standard SIPS URI before redirecting via 302 Moved Temporarily\n");
29 + ast_string_field_build(p, our_contact, "Transfer <sips:%s@%s>", extension, domain);
30 +
31 + }
32 + else
33 + ast_string_field_build(p, our_contact, "Transfer <sip:%s@%s>", extension, domain);
34 +
35 transmit_response_reliable(p, "302 Moved Temporarily", &p->initreq);
37 sip_scheddestroy(p, SIP_TRANS_TIMEOUT); /* Make sure we stop send this reply. */
