asterisk/asterisk.patch.xfersips@2289d64c2123 (annotated)
asterisk/asterisk.patch.xfersips
Mon, 28 Mar 2011 19:41:02 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 28 Mar 2011 19:41:02 +0200
- changeset 332
- 2289d64c2123
- child 347
- 10bd406e1c51
- permissions
- -rw-r--r--
Completely rework package including...
Simpify 64-bit -fPIC logic, instruct make to build in parallel,
force error condition on failed profile dependency, build the
standard 'bootstrap' target as suggested, correct grammar, wording,
and punctuation in general, upgrade to latest upstream vendor version,
rearrange package dependencies mpc, mpfr, and gmp, correct buildconf
thanks to new lto-plugin forced, avoid failed platform specific stage
comparison, adjust patch code to reflect new version update, and most
importantly adjust optimization flags to platform. Please note that
block 'correct hardcoded paths' is likely no yet complete.
| michael@311 | 1 | Index: channels/chan_sip.c |
| michael@311 | 2 | diff -Nau channels/chan_sip.c.orig channels/chan_sip.c |
| michael@311 | 3 | --- channels/chan_sip.c.orig 2011-01-14 18:32:52.000000000 +0100 |
| michael@311 | 4 | +++ channels/chan_sip.c 2011-03-13 14:32:58.000000000 +0100 |
| michael@311 | 5 | @@ -27854,6 +27854,7 @@ |
| michael@311 | 6 | \todo Fix this function so that we wait for reply to the REFER and |
| michael@311 | 7 | react to errors, denials or other issues the other end might have. |
| michael@311 | 8 | */ |
| michael@311 | 9 | +/* MSvB: Paramater dest may be SIPS encoded, having '@' before domain */ |
| michael@311 | 10 | static int sip_sipredirect(struct sip_pvt *p, const char *dest) |
| michael@311 | 11 | { |
| michael@311 | 12 | char *cdest; |
| michael@311 | 13 | @@ -27862,7 +27863,7 @@ |
| michael@311 | 14 | cdest = ast_strdupa(dest); |
| michael@311 | 15 | |
| michael@311 | 16 | extension = strsep(&cdest, "@"); |
| michael@311 | 17 | - domain = strsep(&cdest, ":"); |
| michael@311 | 18 | + domain = strsep(&cdest, ":"); /* MSvB: Could begin with '@' if SIPS */ |
| michael@311 | 19 | if (ast_strlen_zero(extension)) { |
| michael@311 | 20 | ast_log(LOG_ERROR, "Missing mandatory argument: extension\n"); |
| michael@311 | 21 | return 0; |
| michael@311 | 22 | @@ -27894,7 +27895,14 @@ |
| michael@311 | 23 | } |
| michael@311 | 24 | } |
| michael@311 | 25 | |
| michael@311 | 26 | - ast_string_field_build(p, our_contact, "Transfer <sip:%s@%s>", extension, domain); |
| michael@311 | 27 | + if (domain && *domain == '@') { |
| michael@311 | 28 | + ast_log(LOG_DEBUG, "Decoding TLS incapable Asterisk SIP URI to a standard SIPS URI before redirecting via 302 Moved Temporarily\n"); |
| michael@311 | 29 | + ast_string_field_build(p, our_contact, "Transfer <sips:%s@%s>", extension, domain); |
| michael@311 | 30 | + |
| michael@311 | 31 | + } |
| michael@311 | 32 | + else |
| michael@311 | 33 | + ast_string_field_build(p, our_contact, "Transfer <sip:%s@%s>", extension, domain); |
| michael@311 | 34 | + |
| michael@311 | 35 | transmit_response_reliable(p, "302 Moved Temporarily", &p->initreq); |
| michael@311 | 36 | |
| michael@311 | 37 | sip_scheddestroy(p, SIP_TRANS_TIMEOUT); /* Make sure we stop send this reply. */ |
