Skip to content
Snippets Groups Projects
Commit 53014fcf authored by George Yang's avatar George Yang
Browse files

Fix #35275 (PART2) - TR104: Support multiple SIP accounts

When applying asterisk server URI, asterisk.sip_service_provider.host
should take precedence over asterisk.sip_service_provider.domain.

TR104 parameters ...SIP.Network.RegistrarServer and .ProxyServer
are all mapped to UCI asterisk.sip_service_provider.host.

Change-Id: I685480308740b9ced922274f6837d0471bdf574c
parent f57639f7
No related branches found
No related tags found
1 merge request!115Fix #35275 (PART2) - TR104: Support multiple SIP accounts
...@@ -255,6 +255,7 @@ configure_sip_provider() { ...@@ -255,6 +255,7 @@ configure_sip_provider() {
local outbound_proxy local outbound_proxy
local outbound_proxy_port local outbound_proxy_port
local domain local domain
local host
local user local user
local authuser local authuser
local secret local secret
...@@ -277,6 +278,7 @@ configure_sip_provider() { ...@@ -277,6 +278,7 @@ configure_sip_provider() {
config_get outbound_proxy $1 outbound_proxy "" config_get outbound_proxy $1 outbound_proxy ""
config_get outbound_proxy_port $1 outbound_proxy_port "" config_get outbound_proxy_port $1 outbound_proxy_port ""
config_get domain $1 domain "" config_get domain $1 domain ""
config_get host $1 host "$domain"
config_get user $1 user config_get user $1 user
config_get authuser $1 authuser config_get authuser $1 authuser
config_get secret $1 secret config_get secret $1 secret
...@@ -308,7 +310,7 @@ configure_sip_provider() { ...@@ -308,7 +310,7 @@ configure_sip_provider() {
fi fi
if [ -z "$outbound_proxy" ] ; then if [ -z "$outbound_proxy" ] ; then
server_uri=$domain; server_uri=$host;
if [ "$transport" == "udp" -o "$transport" == "tcp" ] ; then if [ "$transport" == "udp" -o "$transport" == "tcp" ] ; then
port=5060; port=5060;
elif [ "$transport" == "tls" ] ; then elif [ "$transport" == "tls" ] ; then
...@@ -368,10 +370,10 @@ configure_sip_provider() { ...@@ -368,10 +370,10 @@ configure_sip_provider() {
sed -i "s/|TOS_VIDEO|/$(escape_sed_substitution $tos_video)/g" $WORK_DIR/pjsip_endpoint sed -i "s/|TOS_VIDEO|/$(escape_sed_substitution $tos_video)/g" $WORK_DIR/pjsip_endpoint
fi fi
if [ -z "$domain" ] ; then if [ -z "$host" ] ; then
sed -i "s/|DOMAIN|/$outbound_proxy/" $WORK_DIR/pjsip_endpoint sed -i "s/|DOMAIN|/$outbound_proxy/" $WORK_DIR/pjsip_endpoint
else else
sed -i "s/|DOMAIN|/$domain/" $WORK_DIR/pjsip_endpoint sed -i "s/|DOMAIN|/$host/" $WORK_DIR/pjsip_endpoint
fi fi
sed -i "s/|USER|/$(escape_sed_substitution $user)/" $WORK_DIR/pjsip_endpoint sed -i "s/|USER|/$(escape_sed_substitution $user)/" $WORK_DIR/pjsip_endpoint
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment