diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-06-09 21:35:42 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-06-09 21:35:42 -0500 |
| commit | 88dfcd21b2e199db8ef6efb6676d04c2a49f3558 (patch) | |
| tree | 75340f59a58ba9a9af412bb96c14db48d9831aff /channels/chan_sip.c | |
| parent | 9e4efe9e1644938f256d2135003e8b9ccbf24104 (diff) | |
| parent | 538c6415c6d255876a808d69acd9f5ebd603b286 (diff) | |
Merge "chan_sip: Support auth username for callbackextension feature"
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 4c3516d8c..8f547bf1a 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); } |