asterisk/asterisk.patch.proxymwi@870131689a5c (annotated)
asterisk/asterisk.patch.proxymwi
Sat, 21 May 2011 22:05:42 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 21 May 2011 22:05:42 +0200
- changeset 340
- 870131689a5c
- child 347
- 10bd406e1c51
- permissions
- -rw-r--r--
Correct diverse buildconf of upstream release and reconcile packaging somewhat.
These changes stem from the obvious changes in the latest vendor release, but
from discussions with trolls Daniel and Oswald as well regarding build config.
This commital follows conclusion of buildconf adjustments to allow the new
vendor version to build on Linux AMD64, but is incomplete as many packaging
comments show. The next series of changes focus on Solaris IA32 and reduction
of buildconf adjustments testing old problems comprehensively in anticipation
of discussion at the upcoming Nokia Contributor Summit in Berlin.
| 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:34:29.000000000 +0100 |
| michael@311 | 5 | @@ -24267,6 +24267,7 @@ |
| michael@311 | 6 | /* Called with peerl lock, but releases it */ |
| michael@311 | 7 | struct sip_pvt *p; |
| michael@311 | 8 | int newmsgs = 0, oldmsgs = 0; |
| michael@311 | 9 | + char *s = NULL; |
| michael@311 | 10 | |
| michael@311 | 11 | if (ast_test_flag((&peer->flags[1]), SIP_PAGE2_SUBSCRIBEMWIONLY) && !peer->mwipvt) |
| michael@311 | 12 | return 0; |
| michael@311 | 13 | @@ -24307,6 +24308,11 @@ |
| michael@311 | 14 | } |
| michael@311 | 15 | /* Recalculate our side, and recalculate Call ID */ |
| michael@311 | 16 | ast_sip_ouraddrfor(&p->sa, &p->ourip, p); |
| michael@311 | 17 | + /* Set the username = mailbox and remove the context */ |
| michael@311 | 18 | + ast_string_field_build(p, username, "%s", peer->name); |
| michael@311 | 19 | + s = strchr(p->username, '@'); |
| michael@311 | 20 | + if (s != NULL) |
| michael@311 | 21 | + *s = 0; |
| michael@311 | 22 | build_via(p); |
| michael@311 | 23 | ao2_t_unlink(dialogs, p, "About to change the callid -- remove the old name"); |
| michael@311 | 24 | build_callid_pvt(p); |
