stp: fix -latest: add missing f_osmo_repo_is() checks
Change-Id: I9b00d3a72c5a2ad669dbaef65eec792a4c91785d Related: SYS#5424
This commit is contained in:
parent
f587812cd4
commit
7b541af164
|
@ -326,6 +326,12 @@ friend function f_M3UA_listen(integer i) runs on RAW_M3UA_CT {
|
|||
var OptionList opt_list := {};
|
||||
var M3uaConfig m3cfg := mp_m3ua_configs[i];
|
||||
|
||||
/* XXX: M3UA-over-TCP is not supported by osmo-stp <= 1.8.1 */
|
||||
if (not Misc_Helpers.f_osmo_repo_is("nightly") and m3cfg.use_tcp) {
|
||||
log("Not listen()ing m3cfg := ", m3cfg, " (not supported by IUT)");
|
||||
return;
|
||||
}
|
||||
|
||||
if (lengthof(mp_local_m3ua_ip) == 0 ) {
|
||||
setverdict(fail, "Empty local address trying to bind SCTP socket: ",
|
||||
mp_local_m3ua_ip);
|
||||
|
@ -365,6 +371,12 @@ friend function f_init_m3ua(boolean ignore_ssnm := true) runs on RAW_M3UA_CT {
|
|||
}
|
||||
|
||||
for (i := 0; i < NR_M3UA; i:=i+1) {
|
||||
/* XXX: M3UA-over-TCP is not supported by osmo-stp <= 1.8.1 */
|
||||
if (not Misc_Helpers.f_osmo_repo_is("nightly") and mp_m3ua_configs[i].use_tcp) {
|
||||
log("Not connect()ing m3cfg := ", mp_m3ua_configs[i], " (not supported by IUT)");
|
||||
g_m3ua_conn_id[i] := -1;
|
||||
continue;
|
||||
}
|
||||
map(self:M3UA[i], system:M3UA_CODEC_PT);
|
||||
if (mp_m3ua_configs[i].use_tcp) {
|
||||
f_M3UA_connect_tcp(i);
|
||||
|
@ -392,6 +404,12 @@ friend function f_init_m3ua_srv() runs on RAW_M3UA_CT {
|
|||
var PortEvent port_evt;
|
||||
|
||||
for (i := NR_M3UA; i < NR_M3UA+NR_M3UA_SRV; i:=i+1) {
|
||||
/* XXX: M3UA-over-TCP is not supported by osmo-stp <= 1.8.1 */
|
||||
if (not Misc_Helpers.f_osmo_repo_is("nightly") and mp_m3ua_configs[i].use_tcp) {
|
||||
log("Not listen()ing m3cfg := ", mp_m3ua_configs[i], " (not supported by IUT)");
|
||||
g_m3ua_conn_id[i] := -1;
|
||||
continue;
|
||||
}
|
||||
map(self:M3UA[i], system:M3UA_CODEC_PT);
|
||||
/* bind+ listen */
|
||||
f_M3UA_listen(i);
|
||||
|
|
Loading…
Reference in New Issue