summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
44 hoursfix generating asp-role that can be parsed when re-opening config fileHEADmasterHarald Welte1-1/+1
The ASP role must be saved in lowercas as the parser during config file reading only understands it in lowercase. Change-Id: I38b8e4d73121f8bf001037fdd2dd164113544d94 Closes: OS#4270
44 hoursasp: Don't override ASP and SCTP role when re-entering asp nodeHarald Welte1-5/+8
The code to set the default role (SG) and default SCTP role (server) must only be executed when the ASP node is first created. Subsequent times entering the pre-existing ASP node should not overwrite those role settings [or any other configuration for that matter] Change-Id: I068996a5e0d870043b652fb69a3c300adc6fda7c Closes: OS#4271
44 hoursosmo_ss7: Add osmo_ss7_asp_find()Harald Welte2-0/+22
This is like osmo_ss7_asp_find_and_create(), i.e. it's doing a full match for an ASP within the specified SS7 instance, of the specified port numbers. It just doesn't create it if it is missing. Change-Id: I1ed3cf2b69ee622d6f9d8b50487f392fe913ae90 Related: OS#4271
44 hoursDon't forget to store the sctp-role during writing config fileHarald Welte1-0/+2
Related to Change-Id I7452a862d45da35dcd58654ca17222eb52d26f1f Related: OS#2005 Change-Id: I14835a7cf137e9d1fe9757a4ec57358dc578446e
6 daysosmo_ss7_vty.c: implement 'active' filter for show_cs7_as_cmdVadim Yanitskiy6-9/+20
Change-Id: I356d90642a500be6a70f60c8240ce1211fd0d934
8 daysxua: Avoid multiline log in xua_msg_dump()Pau Espin Pedrol2-54/+15
In general we want to avoid multiline log messages since they make parsing more difficult. Also output in VTY over telnet looks strange (indentation incremented at each new line). Change-Id: Id9084d0e0f976bb374186db93d6ff8062b99e238
8 daysss7: Set correct local addr and port during dynamic ASP creationPau Espin Pedrol1-2/+5
Change-Id: I54aada351d5fb74f5015fdfe691d0b237354743c
8 daysss7: Improve log formatting during ASP restartPau Espin Pedrol1-2/+2
Since it may act sometimes as a server and sometimes as a client, let's better use one more neutral (2-side arrow) connector, and mark which address is the local and which is the remote. We already use same formatting in other osmocom code. Change-Id: I42feaa16790f02b98bcda65281de8cd9295ddcb6
8 daysxua: ipa_asp_fsm: Allow receiving IPA ID ACK before IPA ID RESPPau Espin Pedrol1-1/+16
Since there's no official spec for IPA and some implementations seem to like sending the IPA ID ACK before the IPA ID RESP, let's catch it and feed it after we receive the IPA ID RESP and we are in correct state. Otherwise the connection would deadlock during the initial handshake. That's the case with our TTCN3 IPA implementation running STP_Tests suite. Change-Id: I99f5346a3854ca07979020245897334197f3cd3b
8 daysxua: ipa_asp_fsm: Allow moving ASP to inactive statePau Espin Pedrol1-1/+26
If AS is configured with Traffic Mode Override, then if a new ASP becomes active, all previous ASPs are considered to be inactive and new data is sent to the newly activated ASP. Remark: It's still unclear which methodology/implementation will follow when the last activated ASP becomes inactive/shutdown. Then probably another one should be activated at that time, but that logic is not there implemented as far as I know. Change-Id: I4ff246b2f899aaa3cf63bbdb3f3d317dc89b3d15
12 daysxua: Don't send NOTIFY messages to IPA ASPsPau Espin Pedrol1-2/+4
Change-Id: Ice3d948e4d2f57a8f52cfb93792d5f4d23284b96
12 daysss7: Set ASP default remote addr to 127.0.0.1 if none set in VTYPau Espin Pedrol1-0/+5
Similar to what we do with local address. Should fix creating the stream when no remote address is provided on an ASP configured through VTY. Related: OS#4260 Change-Id: I33672e76a51a5d5a483906749d30e4c4e08b66ce
13 daystests/sccp/Makefile.am: use sccp.o from $(top_builddir)Vadim Yanitskiy1-2/+5
This change suspends the warnings about option 'subdir-objects', by using the existing object file from the build directory. Change-Id: I4dc2abb19c58fce0a12cc9799019878194c667d1
2019-11-06xua: On new ASPAC, set and notify other ASPs as inactivePau Espin Pedrol1-1/+35
RFC4666 sec 4.3.4.3. ASP Active Procedures: """ In the case of an Override mode AS, receipt of an ASP Active message at an SGP causes the (re)direction of all traffic for the AS to the ASP that sent the ASP Active message. Any previously active ASP in the AS is now considered to be in the state ASP-INACTIVE and SHOULD no longer receive traffic from the SGP within the AS. The SGP or IPSP then MUST send a Notify message ("Alternate ASP_Active") to the previously active ASP in the AS and SHOULD stop traffic to/from that ASP. The ASP receiving this Notify MUST consider itself now in the ASP-INACTIVE state, if it is not already aware of this via inter-ASP communication with the Overriding ASP. """ Change-Id: I474f5cc1f6cbab72d010d1f8ac7ed2285e4c1c45
2019-11-06xua: Select only active ASPs during tx in Override traffic modePau Espin Pedrol1-3/+1
Change-Id: I7eb049011b81c5141fd3edf6f0ae0202ffb2c6c9
2019-11-06osmo_ss7.c: fix xua_accept_cb(): properly assign roleVadim Yanitskiy1-0/+1
Most likely, we want all dynamically allocated ASPs to play the SG role by default. Otherwise when using the following configuration: cs7 instance 0 xua rkm routing-key-allocation dynamic-permitted listen m3ua 2905 accept-asp-connections dynamic-permitted both OsmoMSC and OsmoBSC fail to establish connections. Change-Id: Ib904ecf0e5d192a1024863f6f0fdf79301055655 Fixes: I2df9cd9747ad5c9a05d567d9a71bab6184c53674 Related: OS#4247
2019-11-06xua: Reset AS traffic mode set by peer during shutdownPau Espin Pedrol1-0/+12
This way the AS can be configured to use different traffic modes over time as long as they don't overlap in time. That is in this case where no specific traffic mode is specified in AS local configuration (VTY). Some RFC4666 state similar behvor of deleting data set by ASPs during AS shutdown. For instance: """ Other ASPs may continue to be associated with the Application Server, in which case the Routing Key data SHOULD NOT be deleted. If a Deregistration results in no more ASPs in an Application Server, an SG MAY delete the Routing Key data. """ This allows for tests to easily re-use same AS to test different traffic modes as long as they wait for the recovery timeout (2 secs by default, configurable via VTY). Related: OS#4220 Change-Id: I370aa3b5ddfc456c1be5b2585f2f470d5aa8d289
2019-11-06osmo_ss7.c: fix copy-paste error in xua_accept_cb()Vadim Yanitskiy1-1/+1
Change-Id: I3d991849459378b35a5b4f248cc208f956e494be
2019-11-06osmo_ss7.c: cosmetic: fix typo in xua_accept_cb()Vadim Yanitskiy1-1/+1
Change-Id: Id925d09b9232b5e0124b977fa482e8cdc3c8b835
2019-11-06xua: loadshare: select ASP for tx only if activePau Espin Pedrol3-1/+9
Change-Id: I4f1d1aa9395698e5b6b930a5092a4b914dd15fb3
2019-11-06xua: Fix private function namePau Espin Pedrol1-2/+2
The function clearly does stuff the other way as its name used to describe. Change-Id: Ib65a0f2706e2eefe2446d3c9a6bdd19cf9cb81f2
2019-11-05vty: Permit configuration of ASPs in SCTP client modeHarald Welte3-0/+25
The M3UA specification states that either of the two roles should be the SCTP client and the other the server. It also states that the default for the SGP is to operate as server. However, it permits other configurations. Let's allow this to be configured by the VTY. We need to ensure that while in ASP role, we don't send any NOTIFY messages to the peer SG. Change-Id: I7452a862d45da35dcd58654ca17222eb52d26f1f Closes: OS#2005
2019-11-05Allow ASP role to be configuredHarald Welte5-6/+36
So far, we had a static role model: * SCTP servers (listening, such as OsmoSTP) are role SGW * SCTP clients (connecting, such as OsmoMSC) are role ASP While this is customary, it is not actually required by the specification. The SGW can establish the SCTP connection to an ASP but still remain "SG" role. Let's make things more flexible by having the role configurable. Related: OS#2005 Change-Id: I2df9cd9747ad5c9a05d567d9a71bab6184c53674
2019-11-05introduce public enum osmo_ss7_asp_role for ASP/SG/IPSPHarald Welte4-30/+32
This supersedes the library-internal enum xua_asp_role. Change-Id: I28b0888b8f8206e9dd67ef64ce0f71ba9a7105ce
2019-11-05M3UA: Reject ASP activation + RKM registration for incompatible traffic-modeHarald Welte4-8/+30
If the AS is e.g. configured as broadcast, then individual ASPs cannot be activated in loadshare or override. Everyone must agree. Change-Id: Ic73410fbc88d50710202453f759fa132ce14db4c
2019-11-05xua: Allow traffic mode set by peer if not set by VTYPau Espin Pedrol3-7/+53
Change-Id: I8ca17439b4dd023625f8f22689c0432341986099
2019-11-05xua_asp_fsm: Don't send M3UA ERR and then send ASPAC_ACKHarald Welte1-2/+2
IF we cannot activate the ASP in response to an ASPAC, we should return just the error and not an error + ASPACK_ACK. Change-Id: I681021a13af9b91d8b2b849bd7149d6b1f783865
2019-10-24ss7: Set Traffic mode and Route Ctx in ASPAC ACK msg if knownPau Espin Pedrol1-4/+7
Change-Id: Ic99131489efaef87f882312a042f5feb6a60bb86 Related: OS#4220
2019-10-24xua: Verify all route ctxs received in ASPAC msgPau Espin Pedrol1-5/+10
Change-Id: I16ad0847d671522c8942b441db7e4c460f4f142b
2019-10-24ss7: Only override traffic mode from recv REG REQ if not set by VTYPau Espin Pedrol5-6/+10
RFC 4666 (SS7/MTP3/M3UA) states in isection 4.3.4.3 ASP Active Procedures: """ If the traffic handling mode of the Application Server is not already known via configuration data, then the traffic handling mode indicated in the first ASP Active message causing the transition of the Application Server state to AS-ACTIVE MAY be used to set the mode. """ In section 3.6.1 Registration Request (REG REQ), no related information is provided on how to handle it, but still makes sense to apply same behavior as in 4.3.4.3. Related: OS#4220 Change-Id: Iaebe3a93ad8d2d84ae01e41b02674f8ece9dfc95
2019-10-24ss7: Set configured AS traffic mode when sending Routing Key Register msgPau Espin Pedrol1-0/+1
Otherwise default OSMO_SS7_AS_TMOD_OVERRIDE=0 value is always set regardless of the VTY config "traffic-mode" under AS node. Related: OS#4220 Change-Id: I5d24772f07e77cc3ba6edfa819bb9bc0266a1064
2019-10-24ss7: Implement AS traffic mode loadshare using round robin ASP selectionPau Espin Pedrol3-4/+46
Related: OS#4220 Change-Id: I98144dde237672df2e78c7c92923e6f4cb77a271
2019-10-24ss7: Set default traffic-mode to overridePau Espin Pedrol3-7/+7
Change-Id: I8570ed6634eb20c0f9e4b712de6592b6c3b77227
2019-10-23vty: Print traffic mode during show cs7 instance asPau Espin Pedrol2-28/+29
Change-Id: Ief6b03f50751b8d8f4021e94d54f079681b64d51
2019-10-23xua_rkm: Don't permit de-registration of rctx with ASP activeHarald Welte1-1/+6
Change-Id: Ie47eb205b397f3d2ce94c4ec3531664ed290a819 Closes: OS#4238
2019-10-23xua_rkm: Print NOTICE log message if registration for wrong rctxHarald Welte1-0/+2
Change-Id: Ifb70940e9edfad8c99473ec724dc52f5885561de
2019-10-23Log correct protocol during xua_accept_cb()Harald Welte1-4/+4
This function is used for both actual SIGTRAN (M3UA, SUA over SCTP) as well as for IPA/SCCPLITE (over TCP). Having a static "SCTP" string in the log lines is confusing. Change-Id: Ic34ddbcd528cd871d9772665e1d0863896f33203
2019-10-23vty: ss7: Make sure ASP has at least INET_ANY addr set if not configured in VTYPau Espin Pedrol1-0/+5
Several parts of the code expect an operative ASP to always have at least one local ip addr, be it INET_ANY (NULL, 0.0.0.0) or any specific IP address. This allows osmo_ss7_asp_find_by_socket_addr() matching incoming connectiongs against ASPs defined through VTY "asp" node with no "local-ip" cmd option specified. In that case, we assume the user wants it to bind/match against INET_ANY. Related: OS#3608 Fixes: 80b135581909fef595d48436ab04dbcb147e3895 Change-Id: Id4da0c778890c90cf5bfcf0fd3a7ecf165f2a6df
2019-10-23ss7: Fix finding asp by socket addr if it has no remote hosts configuredPau Espin Pedrol1-5/+8
Fixes: 80b135581909fef595d48436ab04dbcb147e3895 Change-Id: I14a0132a4667cea75fc212dfeeef76d8509b991d
2019-10-23ss7: Fix finding asp by socket addr if local ip addr is 0.0.0.0Pau Espin Pedrol1-1/+2
Fixes: 80b135581909fef595d48436ab04dbcb147e3895 Change-Id: I319e4983b35f63846ed7e8bfa8e8e3688c5d16e6
2019-10-23ss7: Fix osmo_ss7_asp_peer_snprintf() output if peer has zero IP addr assignedPau Espin Pedrol1-1/+1
If no IP addr is assigned yet, until know it'd print "(:3456". Let's print ":34456" in that scenario. Change-Id: Iae85d231093b6f3ce6b969324699858e525c14ea
2019-10-23cosmetic: Fix trailing whitespacePau Espin Pedrol1-3/+3
Change-Id: Ic5bae0b69dcf24da8069709692b5687ad76239dc
2019-10-23vty: Fix write-config of local-ip and remote-ip commandsPau Espin Pedrol1-3/+3
Fixes: CID#205338 Fixes: CID#205337 Change-Id: I7b01e53aa4bfd714467cbd729cfcf4dc12a64bd4
2019-10-22cosmetic: ss7: Fix trailing whitespacePau Espin Pedrol3-3/+3
Change-Id: Ifd947c51067842b83ea43ce25ba0d652baff259b
2019-10-22tests: Introduce test for multi-homing STP featuresPau Espin Pedrol5-5/+211
Config file sets omo-stp instance to bind on 2 IP addresses, and then the test verfies through linux /proc/net/sctp/* that binding is done correctly and that it can be reached from another remote address to one of the configured addresses. Change-Id: Ifa11b1fc882dff415405f62024e94bed67228866
2019-10-22ss7: Log local and remote address set upon ASP restartPau Espin Pedrol1-3/+7
Change-Id: I35c2581923ed3e1f7aff6c137ddf356882bac621
2019-10-22ss7: Support multiple addresses in SCTP connectionsPau Espin Pedrol6-52/+184
After this patch, Several "local-ip" and "remote-ip" lines are accepted under "listen" and "asp" VTY nodes, allowing to configure an SCTP connection with multiple connections, hence allowing control of SCTP multi-homing features. libosmo-sccp clients such as osmo-bsc and osmo-msc also gain support for this feature with this commit. Related: OS#3608 Depends: libosmocore.git Ic8681d9e093216c99c6bca4be81c31ef83688ed1 Depends: libosmo-netif.git I0fe62f518e195db4e34f3b0ad1762bb57ba9d92a Change-Id: Ibd15de7a4e00dbec78ff2e2dd6a686b0f3af22de
2019-10-22Defer xua server binding until exit of VTY nodePau Espin Pedrol4-44/+3
Commit 10d4815bb1b4b548ec0bc97611b2e7ac45e0ebc5 already fixed the issue where binding was done during L_CS7_XUA_NODE (listen) done, meaning local-ip inside it had no effect. In that comment, binding was moved to happen during "local-ip" VTY cmd. Furthermore, that commit added a new osmo_ss7_bind_all_instances() and related APIs to allow osmo-stp to have all xua servers bound if no "local-ip" was provided. These APIs have only been used so far by osmo-stp (which lays in the same git repo that libosmo-sccp) since it's the only program using the xua server features. In the present commit, let's drop the APIs added by commit described above, and instead let libosmo-sccp code to internally bind the xua server upon exit of the VTY node. As a result, the previously introduced APIs can be dropped (not used by anyone anymore) and it will provide ways to support multiple "local-ip" commands in the future, hence supporting SCTP multi-home features. It's recommended to require libosmocore.git Ia6d88c0e63d94ba99e950da6efbc4c1871070012 since it fixes a bug where go_parent_cb was not called for nodes at the end of the file. Related: OS#3608 Change-Id: I2cff17b5e2e2fbfd4591e23a416e510e94e173d6
2019-10-22m3ua: Log incorrect selected ASPau Espin Pedrol1-2/+2
Change-Id: Idfdf6279de1fed453b5f83a5329c50716a79aca9
2019-10-22Fix typo in log message of recent commitPau Espin Pedrol1-1/+1
Change-Id: I53e6395ea564a7f6f5f8c9e1dd3372ba37bdfb39