diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-06-03 09:33:08 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-06-03 09:35:53 +0300 |
| commit | 538c6415c6d255876a808d69acd9f5ebd603b286 (patch) | |
| tree | 9dd9ea48fafae8565ca3d262f02a7039d8868503 | |
| parent | 48843a107d050eff2e2c7078078ffee4e782a81b (diff) | |
chan_sip: Support auth username for callbackextension feature
ASTERISK-20527 #close
Change-Id: I659cf7f00836a09d09d146ad226a40477d731239
| -rw-r--r-- | channels/chan_sip.c | 2 | ||||
| -rw-r--r-- | configs/samples/sip.conf.sample | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 19f8aa308..03cba9244 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -31811,7 +31811,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str olddirectmediaacl = ast_free_acl_list(olddirectmediaacl); if (!ast_strlen_zero(peer->callback)) { /* build string from peer info */ char *reg_string; - if (ast_asprintf(®_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(®_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/samples/sip.conf.sample b/configs/samples/sip.conf.sample index 8f28e2680..a7b74df69 100644 --- a/configs/samples/sip.conf.sample +++ b/configs/samples/sip.conf.sample @@ -786,7 +786,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; A similar effect can be achieved by adding a "callbackextension" option in a peer section. ; this is equivalent to having the following line in the general section: ; -; register => username:secret@host/callbackextension +; register => fromuser:secret:username@host/callbackextension ; ; and more readable because you don't have to write the parameters in two places ; (note that the "port" is ignored - this is a bug that should be fixed). |