laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27599 )

Change subject: Add ss7 instances to osmo_ss7_instances in creation order ......................................................................

Add ss7 instances to osmo_ss7_instances in creation order

Otherwise when configuring ss7 instances in numerical order in the VTY and then printing the VTY configuration they end up ordered this way: cs7 instance 2 cs7 instance 1 cs7 instance 0

Related: SYS#5912 Change-Id: Id4d0a20cc5b0811b505b2d1051d496f8bd17d54c --- M src/osmo_ss7.c M tests/vty/ss7_asp_test.vty 2 files changed, 5 insertions(+), 5 deletions(-)

Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve laforge: Looks good to me, approved

diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 99536d3..a4af727 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -399,7 +399,7 @@ inst->cfg.pc_fmt.component_len[1] = 8; inst->cfg.pc_fmt.component_len[2] = 3;

- llist_add(&inst->list, &osmo_ss7_instances); + llist_add_tail(&inst->list, &osmo_ss7_instances);

INIT_LLIST_HEAD(&inst->cfg.sccp_address_book);

diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index bfbb77e..09be45b 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -337,10 +337,6 @@

ss7_asp_vty_test(config)# show running-config ... -cs7 instance 1 - sccp-address bar - routing-indicator PC - point-code 1.2.3 cs7 instance 0 asp my-asp 12345 54321 m3ua local-ip 127.0.0.100 @@ -351,6 +347,10 @@ sccp-address foo routing-indicator PC point-code 1.2.3 +cs7 instance 1 + sccp-address bar + routing-indicator PC + point-code 1.2.3 end

ss7_asp_vty_test(config)# do show cs7 instance 0 users