aboutsummaryrefslogtreecommitdiffstats
path: root/main/asterisk/ASTERISK-20527.patch
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2012-10-09 08:51:05 +0300
committerTimo Teräs <timo.teras@iki.fi>2012-10-09 08:51:57 +0300
commit6e8ed58d7ceee30d3cf4c04569ecb02ead1e9daa (patch)
tree8453769e926c0f90eed0ea388fe3026fecaca76e /main/asterisk/ASTERISK-20527.patch
parent3f9e2f0dc2c02fa02996aac227fdde9226b11d30 (diff)
downloadaports-6e8ed58d7ceee30d3cf4c04569ecb02ead1e9daa.tar.bz2
aports-6e8ed58d7ceee30d3cf4c04569ecb02ead1e9daa.tar.xz
main/asterisk: upgrade to 10.9.0
* remove upstreamed ASTERISK-19610 * rebase ASTERISK-13456 and ASTERISK-20527 patches * update patch applying snippet
Diffstat (limited to 'main/asterisk/ASTERISK-20527.patch')
-rw-r--r--main/asterisk/ASTERISK-20527.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/main/asterisk/ASTERISK-20527.patch b/main/asterisk/ASTERISK-20527.patch
index eba41d72ce..42a81d8ca5 100644
--- a/main/asterisk/ASTERISK-20527.patch
+++ b/main/asterisk/ASTERISK-20527.patch
@@ -6,11 +6,11 @@ index 7569bba..24a8cec 100644
olddirectmediaacl = ast_free_acl_list(olddirectmediaacl);
if (!ast_strlen_zero(peer->callback)) { /* build string from peer info */
char *reg_string;
-- if (asprintf(&reg_string, "%s?%s:%s@%s/%s", peer->name, peer->username, !ast_strlen_zero(peer->remotesecret) ? peer->remotesecret : peer->secret, peer->tohost, peer->callback) < 0) {
-+ if (asprintf(&reg_string, "%s?%s:%s:%s@%s/%s", peer->name, S_OR(peer->fromuser, peer->username), S_OR(peer->remotesecret, peer->secret), peer->username, peer->tohost, peer->callback) < 0) {
- ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
- } else if (reg_string) {
+- if (ast_asprintf(&reg_string, "%s?%s:%s@%s/%s", peer->name, peer->username, !ast_strlen_zero(peer->remotesecret) ? peer->remotesecret : peer->secret, peer->tohost, peer->callback) >= 0) {
++ if (ast_asprintf(&reg_string, "%s?%s:%s:%s@%s/%s", peer->name, S_OR(peer->fromuser, peer->username), S_OR(peer->remotesecret, peer->secret), peer->username, peer->tohost, peer->callback) >= 0) {
sip_register(reg_string, 0); /* XXX TODO: count in registry_count */
+ ast_free(reg_string);
+ }
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 81ca998..812be7b 100644
--- a/configs/sip.conf.sample