May 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-hnbgw[master]: fixup: compilation error: unused var in map_rua_init_action()

by neels

Attention is currently required from: neels, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin Change subject: fixup: compilation error: unused var in map_rua_init_action() ...................................................................... fixup: compilation error: unused var in map_rua_init_action() The variable was left unused by recent patch I3e1ad7a2aa71674a22a27c31512600f2de139032 aka a5974d7906a333bfd3399f83cc8072b4604f49cd Change-Id: I871bc43f6f47d4b78fbf88826615f2dbb8e1f807 --- M src/osmo-hnbgw/context_map_rua.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/87/36887/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I871bc43f6f47d4b78fbf88826615f2dbb8e1f807 Gerrit-Change-Number: 36887 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 1 month

1
0
0 0

[S] Change in osmo-hnbgw[master]: fixup: compilation error: unused var in map_rua_init_action()

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email ) Change subject: fixup: compilation error: unused var in map_rua_init_action() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I871bc43f6f47d4b78fbf88826615f2dbb8e1f807 Gerrit-Change-Number: 36887 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 May 2024 15:57:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters

by neels

Attention is currently required from: laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email ) Change subject: KPI: Add initial set of DTAP message type rate counters ...................................................................... Patch Set 5: (1 comment) File src/osmo-hnbgw/context_map_rua.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788/comment/ece32614_96601772 PS5, Line 217: struct hnbgw_context_map *map = fi->priv; This is now an unused variable -- why did jenkins not complain about this? see also https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 21 May 2024 15:54:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-hnbgw[master]: fixup: compilation error: unused var in map_rua_init_action()

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email ) Change subject: fixup: compilation error: unused var in map_rua_init_action() ...................................................................... fixup: compilation error: unused var in map_rua_init_action() Change-Id: I871bc43f6f47d4b78fbf88826615f2dbb8e1f807 --- M src/osmo-hnbgw/context_map_rua.c 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/87/36887/1 diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c index d5b2cb7..3c6ea1e 100644 --- a/src/osmo-hnbgw/context_map_rua.c +++ b/src/osmo-hnbgw/context_map_rua.c @@ -214,7 +214,6 @@ static void map_rua_init_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct hnbgw_context_map *map = fi->priv; struct msgb *ranap_msg = data; switch (event) { -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36887?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I871bc43f6f47d4b78fbf88826615f2dbb8e1f807 Gerrit-Change-Number: 36887 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Action PJSIPAccessNetworkInfo

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email ) Change subject: asterisk: Use Action PJSIPAccessNetworkInfo ...................................................................... asterisk: Use Action PJSIPAccessNetworkInfo Validate P-Access-Network-Info should only be present in 2nd REGISTER sent over ipsec. Change-Id: I2759d12caeaca81a9224997a29541c325d65fe30 --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.ttcn M asterisk/IMS_ConnectionHandler.ttcn M library/SIP_Templates.ttcn 4 files changed, 107 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/36886/1 diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index 9fbe973..4969905 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -28,6 +28,7 @@ const charstring AMI_FIELD_ACTION := "Action"; const charstring AMI_FIELD_ACTION_ID := "ActionID"; const charstring AMI_FIELD_EVENT := "Event"; +const charstring AMI_FIELD_INFO := "Info"; const charstring AMI_FIELD_USERNAME := "Username"; const charstring AMI_FIELD_SECRET := "Secret"; const charstring AMI_FIELD_RESPONSE := "Response"; @@ -79,6 +80,8 @@ template (value) AMI_Field ts_AMI_Field_Event(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_EVENT, val); template (value) AMI_Field +ts_AMI_Field_Info(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_INFO, val); +template (value) AMI_Field ts_AMI_Field_Username(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_USERNAME, val); template (value) AMI_Field ts_AMI_Field_Secret(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_SECRET, val); @@ -93,6 +96,8 @@ template (present) AMI_Field tr_AMI_Field_Event(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_EVENT, val); template (present) AMI_Field +tr_AMI_Field_Info(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_INFO, val); +template (present) AMI_Field tr_AMI_Field_Username(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_USERNAME, val); template (present) AMI_Field tr_AMI_Field_Secret(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_SECRET, val); @@ -139,6 +144,23 @@ tr_AMI_Field_Secret(secret) ); +/* Action: PJSIPAccessNetworkInfo + * Registration: volte_ims + * Info: 3GPP-E-UTRAN-FDD; utran-cell-id-3gpp=2380100010000101 + */ +template (value) AMI_Msg +ts_AMI_Action_PJSIPAccessNetworkInfo(template (value) charstring registration := "volte_ims", + template (value) charstring info := "", + template (value) charstring action_id := "0001") := { + ts_AMI_Field_Action("PJSIPAccessNetworkInfo"), + ts_AMI_Field_ActionId(action_id), + ts_AMI_Field_Registration(registration), + ts_AMI_Field_Info(info) +}; +function f_ami_gen_PJSIPAccessNetworkInfo_Info_EUTRAN(charstring uli_str) return charstring { + return "3GPP-E-UTRAN-FDD; utran-cell-id-3gpp=" & uli_str; +} + /* Action: PJSIPRegister * ActionID: <value> * Registration: volte_ims @@ -508,6 +530,13 @@ f_ami_transceive_match_response_success(pt, ts_AMI_Action_Login(username, secret, reg_action_id)); } +function f_ami_action_PJSIPAccessNetworkInfo(AMI_Msg_PT pt, + template (value) charstring registration, + template (value) charstring info) { + var charstring reg_action_id := f_gen_action_id(); + f_ami_transceive_match_response_success(pt, ts_AMI_Action_PJSIPAccessNetworkInfo(registration, info, reg_action_id)); +} + function f_ami_action_PJSIPRegister(AMI_Msg_PT pt, charstring register) { var charstring reg_action_id := f_gen_action_id(); f_ami_transceive_match_response_success(pt, ts_AMI_Action_PJSIPRegister(register, reg_action_id)); diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index a71bcad..df5904b 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -376,6 +376,12 @@ f_sleep(1.0); /* Clear events: */ AMI_CLIENT.clear; + + /* Announce network information, this should usually happen when UE + * becomes attached to network and before IMS APN is set up: */ + f_ami_action_PJSIPAccessNetworkInfo(AMI_CLIENT, mp_volte_ims_outbound_registration, + f_ami_gen_PJSIPAccessNetworkInfo_Info_EUTRAN(pars.uli_str)); + /* Trigger registration: */ f_ami_action_PJSIPRegister(AMI_CLIENT, mp_volte_ims_outbound_registration); /* TODO: Rx "Event: AuthRequest" */ diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index d1e3185..ae291b5 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -66,6 +66,8 @@ charstring user, charstring display_name, charstring password, + /* Expected User-Location-Info in P-Access-Network-Info */ + charstring uli_str, octetstring rand, octetstring autn, charstring ipsec_auth_key, @@ -148,6 +150,7 @@ user := user, display_name := f_sip_str_quote(display_name), password := password, + uli_str := "2380100010000101", /* The Nonce field is the Base64 encoded version of the RAND value and concatenated with the AUTN: */ rand := '14987631f65f8e3788a0798b6ebcd08e'O, autn := 'f6e19a7ccb028000a06b19c9544516e5'O, @@ -272,6 +275,33 @@ be indicated by adding a “video” media feature tag to the contact: header." */ } +/* Validate P-Access-Network-Info: RFC7315 6.4 */ +private function f_ims_validate_register_P_Access_Network_info(PDU_SIP_Request req, + boolean exp_present := true) runs on IMS_ConnHdlr + +{ + if (not exp_present) { + if (ispresent(g_rx_sip_req.msgHeader.p_access_network_info)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received unexpected [rfc7315 6.4] P-Access-Info := ", + g_rx_sip_req.msgHeader.p_access_network_info)); + } + return; + } + + /* exp_present: */ + var template (present) P_Access_Network_Info expl_tmpl := + tr_P_Access_Network_Info({ tr_Access_net_spec_EUTRAN(g_pars.uli_str) }); + + if (not match(g_rx_sip_req.msgHeader.p_access_network_info, expl_tmpl)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received unexpected P-Access-Info := ", + g_rx_sip_req.msgHeader.p_access_network_info, + "\nvs exp := ", expl_tmpl)); + } + +} + private function f_ims_parse_security_client(Security_client security_client) runs on IMS_ConnHdlr { var boolean found := false; @@ -390,6 +420,16 @@ contact := g_rx_sip_req.msgHeader.contact; f_ims_validate_register_contact(contact); + /* Validate P-Access-Network-Info: rfc7315 6.4: + * "3GPP will use the P-Access-Network-Info header field to + * carry relatively sensitive information like the cell ID. Therefore, + * the information MUST NOT be sent outside of the 3GPP domain."" + * [...] "the sensitive information carried in the + * P-Access-Network-Info header field MUST NOT be sent in any initial + * unauthenticated and unprotected requests (e.g., REGISTER)." + */ + f_ims_validate_register_P_Access_Network_info(g_rx_sip_req, exp_present := false); + /* TODO: Validate "Expires" is 600000 */ /* Tx 100 Tyring */ @@ -490,6 +530,9 @@ userAgent := omit); SIP.send(tx_resp); + /* Validate P-Access-Network-Info: */ + f_ims_validate_register_P_Access_Network_info(g_rx_sip_req, exp_present := true); + /* Tx 200 OK */ to_addr.params := f_sip_param_set(to_addr.params, "tag", f_sip_rand_tag()); tx_resp := ts_SIP_Response(sip_call_id, diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index 7ef49cf..7da56bc 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -224,6 +224,23 @@ deltaSec := deltaSec } +// [RFC3455 5.4] + 3GPP 24.229 V8.7.0 +template (present) Access_net_spec tr_Access_net_spec(template (present) charstring access_type := ?, + template SemicolonParam_List access_info := *) := { + access_type := access_type, + access_info := access_info +} +template (present) Access_net_spec tr_Access_net_spec_EUTRAN(template (present) charstring uli_str := ?) := { + access_type := "3GPP-E-UTRAN-FDD", + access_info := {tr_Param("utran-cell-id-3gpp", uli_str)} +} + +// [RFC3455 5.4] + 3GPP 24.229 V8.7.0 +template (present) P_Access_Network_Info tr_P_Access_Network_Info(template (present) Access_net_spec_list access_net_specs := ?) := { + fieldName := P_ACCESS_NETWORK_INFO, + access_net_specs := access_net_specs +} + // [20.32] template (value) Require ts_Require(template (value) OptionTag_List optionsTags := {}) := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2759d12caeaca81a9224997a29541c325d65fe30 Gerrit-Change-Number: 36886 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in libosmo-sccp[for-1.8]: Bump version: 1.8.1-dirty → 1.8.2

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email ) Change subject: Bump version: 1.8.1-dirty → 1.8.2 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: I63c39cfd7af0b8deb7f7c9ff0ec519f2bc05117c Gerrit-Change-Number: 36885 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 21 May 2024 12:38:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in libosmo-sccp[for-1.8]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email ) Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7 Gerrit-Change-Number: 36884 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 21 May 2024 12:37:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in libosmo-sccp[for-1.8]: Bump version: 1.8.1-dirty → 1.8.2

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email ) Change subject: Bump version: 1.8.1-dirty → 1.8.2 ...................................................................... Bump version: 1.8.1-dirty → 1.8.2 Let's tag a 1.8.2 just containing the change of more random SLS allocation in IPA / SCCPlite links. Change-Id: I63c39cfd7af0b8deb7f7c9ff0ec519f2bc05117c --- M debian/changelog M src/Makefile.am 2 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/85/36885/1 diff --git a/debian/changelog b/debian/changelog index cd1c181..b3bf213 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmo-sccp (1.8.2) unstable; urgency=medium + + * ipa: Use pseudo-random number for SLS in IPA->M3UA direction + + -- Harald Welte <laforge(a)osmocom.org> Tue, 21 May 2024 14:28:44 +0200 + libosmo-sccp (1.8.1) unstable; urgency=medium * Fix counting received IPA packets in server mode diff --git a/src/Makefile.am b/src/Makefile.am index c87848d..5fba62a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=9:1:0 +LIBVERSION=9:2:0 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: I63c39cfd7af0b8deb7f7c9ff0ec519f2bc05117c Gerrit-Change-Number: 36885 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in libosmo-sccp[for-1.8]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction

by laforge

laforge has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36883?usp=email ) Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction ...................................................................... Abandoned replaced by https://gerrit.osmocom.org/c/libosmo-sccp/+/36884 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36883?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733 Gerrit-Change-Number: 36883 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon

1 year, 1 month

1
0
0 0

[S] Change in libosmo-sccp[for-1.8]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email ) Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction ...................................................................... ipa: Use pseudo-random number for SLS in IPA->M3UA direction [back-port of Ia4e66d660b6057338f66a47fffc8a0d32759f733] In Change-Id Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 we introduced code that would make the LSB of the file descriptor be used as SLS when passing packets from IPA in M3UA direction. This did however not achieve sufficient entropy in real-world use cases. In this change, we change over to allocating a pseudo-random SLS to each IPA connection at the time it is established; We then assign that SLS to each packet received on that IPA connection. Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7 Related: SYS#6543 Closes: SYS#6802 --- M src/osmo_ss7_asp.c M stp/stp_main.c 2 files changed, 34 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/84/36884/1 diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index e1c197c..b017510 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -906,7 +906,9 @@ } msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - return ipa_rx_msg(asp, msg, ofd->fd & 0xf); + /* we simply use the lower 4 bits of the asp_id, which is initialized to a pseudo-random value upon + * connect */ + return ipa_rx_msg(asp, msg, asp->asp_id & 0xf); } /* netif code tells us we can read something from the socket */ @@ -996,6 +998,12 @@ if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA) { rc = ss7_asp_apply_peer_primary_address(asp); rc = ss7_asp_apply_primary_address(asp); + } else { + if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) { + /* we use the lower 4 bits of the asp_id feld as SLS; let's initialize it here from a + * pseudo-random value */ + asp->asp_id = rand() & 0xf; + } } if (asp->lm && asp->lm->prim_cb) { diff --git a/stp/stp_main.c b/stp/stp_main.c index 01d1865..d630032 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -213,6 +213,8 @@ { int rc; + srand(time(NULL)); + tall_stp_ctx = talloc_named_const(NULL, 1, "osmo-stp"); msgb_talloc_ctx_init(tall_stp_ctx, 0); osmo_init_logging2(tall_stp_ctx, &log_info); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7 Gerrit-Change-Number: 36884 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2024