[S] Change in libosmo-sccp[master]: fix regression in sctp-proto / transport-proto

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36114?usp=email ) Change subject: fix regression in sctp-proto / transport-proto ...................................................................... fix regression in sctp-proto / transport-proto We saw some fall-out in automatic testing where configs with sctp-role would suddenly save as transport-role. Let's avoid this by keeping sctp-role for users of SCTP. This is an incremental fix to Iab6c898181d79a5ed2bea767ee90e55bc3af16a5 Related: SYS#5424 Change-Id: Ic666b62948880445e030c637298d4e369b4c7e8e --- M src/osmo_ss7_vty.c 1 file changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/14/36114/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 890dded..9d58fb6 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1726,7 +1726,10 @@ vty_out(vty, " qos-class %u%s", asp->cfg.qos_class, VTY_NEWLINE); vty_out(vty, " role %s%s", osmo_str_tolower(get_value_string(osmo_ss7_asp_role_names, asp->cfg.role)), VTY_NEWLINE); - vty_out(vty, " transport-role %s%s", asp->cfg.is_server ? "server" : "client", VTY_NEWLINE); + if (asp->cfg.trans_proto == IPPROTO_SCTP) + vty_out(vty, " sctp-role %s%s", asp->cfg.is_server ? "server" : "client", VTY_NEWLINE); + else + vty_out(vty, " transport-role %s%s", asp->cfg.is_server ? "server" : "client", VTY_NEWLINE); if (asp->cfg.sctp_init.num_ostreams_present) vty_out(vty, " sctp-param init num-ostreams %u%s", asp->cfg.sctp_init.num_ostreams_value, VTY_NEWLINE); if (asp->cfg.sctp_init.max_instreams_present) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36114?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic666b62948880445e030c637298d4e369b4c7e8e Gerrit-Change-Number: 36114 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange