diff --git a/bin/check.sh b/bin/check.sh index 16eb64f9..667fce83 100755 --- a/bin/check.sh +++ b/bin/check.sh @@ -351,7 +351,6 @@ get_ip() { ip=${scen[2]} port=${scen[3]} mport=${scen[4]} - foreign_dom=${scen[6]} done< <(grep "$1" "${SCEN_CHECK_DIR}/scenario.csv") } @@ -427,11 +426,6 @@ run_sipp() { fi get_ip "$(basename "${res}")" - if [ "${foreign_dom}" == "yes" ]; then - echo "$(date) - foreign domain detected... using 5060 port" - port="5060" - fi - if [ -f "${SCEN_CHECK_DIR}/${base}_reg.xml" ]; then echo "$(date) - Register ${base} ${ip}:${port}-${mport}" "${BIN_DIR}/sipp.sh" -T "$transport" -i "${ip}" -p "${port}" \ diff --git a/bin/scenario.pl b/bin/scenario.pl index bfbb5e88..cb00701e 100755 --- a/bin/scenario.pl +++ b/bin/scenario.pl @@ -241,6 +241,9 @@ sub network_data $rdata = generate_net_values($net_data->{scen}); } $rdata->{username} = $resp->{username}; + if (defined($resp->{foreign}) && $resp->{foreign} eq "yes") { + $rdata->{port} = 5060; + } $resp->{ip} = $rdata->{ip}; $resp->{port} = $rdata->{port}; $resp->{mport} = $rdata->{mport};