June 2022 - gerrit-log - lists.osmocom.org

Change in osmo-hnbgw[master]: use osmo_select_main_ctx(), tweak log in handle_cn_conn_conf()

by neels

Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28229 to look at the new patch set (#2). Change subject: use osmo_select_main_ctx(), tweak log in handle_cn_conn_conf() ...................................................................... use osmo_select_main_ctx(), tweak log in handle_cn_conn_conf() Upcoming patch adds to this function. Let me first combine those four LOGP() to a single one, use proper osmo_sccp_addr_to_str_c(OTC_SELECT). To be able to use OTC_SELECT, switch hnbgw.c to osmo_select_main_ctx(). Related: SYS#5968 Change-Id: I1e0ea0a883e8cf65e6cfb45ed9b6f3d8fb7c59eb --- M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_cn.c 2 files changed, 9 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/29/28229/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1e0ea0a883e8cf65e6cfb45ed9b6f3d8fb7c59eb Gerrit-Change-Number: 28229 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-hnbgw[master]: use osmo_select_main_ctx(), tweak log in handle_cn_conn_conf()

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28229 ) Change subject: use osmo_select_main_ctx(), tweak log in handle_cn_conn_conf() ...................................................................... Patch Set 1: (1 comment) File src/osmo-hnbgw/hnbgw_cn.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28229/comment/7169bfe4_9502753b PS1, Line 333: s" missing \n -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1e0ea0a883e8cf65e6cfb45ed9b6f3d8fb7c59eb Gerrit-Change-Number: 28229 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 Jun 2022 16:09:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: test SCCP CR without payload

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28231 ) Change subject: hnbgw: test SCCP CR without payload ...................................................................... hnbgw: test SCCP CR without payload Various tweaks are required to allow RAN_Emulation to handle, and also to expect, an SCCP CR that has no payload data. Related: SYS#5968 Related: If0c5c0a76e5230bf22871f527dcb2dbdf34d7328 (osmo-hnbgw) Change-Id: I827e081eaacfb8e76684ed1560603e6c8f896c38 --- M hnbgw/HNBGW_Tests.ttcn M library/RAN_Emulation.ttcnpp 2 files changed, 108 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/28231/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index b2c491e..1b1d709 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -167,7 +167,8 @@ hexstring imsi, boolean ps_domain, MgcpParameters mgcp_pars optional, - HnbConfig hnb optional + HnbConfig hnb optional, + boolean separate_sccp_cr } /* We extend: @@ -498,12 +499,21 @@ } /* create an expect on the Iu side for the random NAS portion */ - var template (omit) octetstring nas := f_ranap_extract_l3(valueof(tx)); - f_ran_register_exp(valueof(nas)); + if (g_pars.separate_sccp_cr) { + f_ran_register_sccp_cr_without_payload(); + } else { + var template (omit) octetstring nas := f_ranap_extract_l3(valueof(tx)); + f_ran_register_exp(valueof(nas)); + } /* send it via Iuh (creating a RUA connection) */ RUA.send(RUA_Conn_Req:{g_pars.ps_domain, tx}); + if (g_pars.separate_sccp_cr) { + /* Acknowledge the empty SCCP CR. RAN_Emulation does the confirmation, no need to respond. */ + BSSAP.receive(tr_RANAP_Conn_Req()); + } + /* expect to receive it on the Iu side */ T.start; alt { @@ -634,11 +644,13 @@ ***********************************************************************/ private template (value) TestHdlrParams -t_pars(integer imsi_suffix, boolean ps_domain := false,integer hnb_idx := 0) := { +t_pars(integer imsi_suffix, boolean ps_domain := false, integer hnb_idx := 0, + boolean separate_sccp_cr := false) := { hnb_idx := hnb_idx, imsi := f_gen_imsi(imsi_suffix), ps_domain := ps_domain, - hnb := omit /* filled in later */ + hnb := omit, /* filled in later */ + separate_sccp_cr := separate_sccp_cr } /* Create an Iuh connection; send InitialUE; expect it to appear on new SCCP conenction */ @@ -666,6 +678,43 @@ vc_conn.done; } +private function f_vty_set_sccp_cr_max_payload_len(TELNETasp_PT pt, integer val := 999999) +{ + f_vty_enter_config(pt); + f_vty_transceive(pt, "hnbgw"); + f_vty_transceive(pt, "sccp cr max-payload-len " & int2str(val)); + f_vty_transceive(pt, "end"); +} + +testcase TC_ranap_cs_initial_ue_empty_cr() runs on test_CT { + var ConnHdlr vc_conn; + + f_init(); + f_start_hnbs(); + + f_vty_set_sccp_cr_max_payload_len(HNBGWVTY, 0); + + vc_conn := f_start_handler_with_pars(refers(f_tc_initial_ue), t_pars(1, separate_sccp_cr := true)); + vc_conn.done; + + /* reset */ + f_vty_set_sccp_cr_max_payload_len(HNBGWVTY); +} +testcase TC_ranap_ps_initial_ue_empty_cr() runs on test_CT { + var ConnHdlr vc_conn; + + f_init(); + f_start_hnbs(); + + f_vty_set_sccp_cr_max_payload_len(HNBGWVTY, 0); + + vc_conn := f_start_handler_with_pars(refers(f_tc_initial_ue), t_pars(2, true, separate_sccp_cr := true)); + vc_conn.done; + + /* reset */ + f_vty_set_sccp_cr_max_payload_len(HNBGWVTY); +} + /* Reply to a received CRCX with an OK (or the reply configured in cpars), using the given parameters. * Return true when an OK reply was sent, false otherwise. * Count occurrence of Osmux, include Osmux parameters in the reply if necessary. */ @@ -1104,6 +1153,8 @@ execute(TC_hnb_register()); execute(TC_ranap_cs_initial_ue()); execute(TC_ranap_ps_initial_ue()); + execute(TC_ranap_cs_initial_ue_empty_cr()); + execute(TC_ranap_ps_initial_ue_empty_cr()); execute(TC_ranap_cs_bidir()); execute(TC_ranap_ps_bidir()); execute(TC_rab_assignment()); diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 3198ee1..379a39d 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -555,9 +555,18 @@ type record RANAP_Conn_Req { SCCP_PAR_Address addr_peer, SCCP_PAR_Address addr_own, - RANAP_PDU ranap + RANAP_PDU ranap optional } -template (value) RANAP_Conn_Req ts_RANAP_Conn_Req(SCCP_PAR_Address peer, SCCP_PAR_Address own, RANAP_PDU ranap) := { +template (value) RANAP_Conn_Req ts_RANAP_Conn_Req(SCCP_PAR_Address peer, SCCP_PAR_Address own, + template (omit) RANAP_PDU ranap) := { + addr_peer := peer, + addr_own := own, + ranap := ranap +}; + +template RANAP_Conn_Req tr_RANAP_Conn_Req(template SCCP_PAR_Address peer := ?, + template SCCP_PAR_Address own := ?, + template (omit) RANAP_PDU ranap := omit) := { addr_peer := peer, addr_own := own, ranap := ranap @@ -973,7 +982,12 @@ /* store mapping between client components and SCCP connectionId */ f_conn_table_add(vc_conn, rconn_ind.connectionId); /* handle user payload */ - f_handle_userData_RANAP(vc_conn, rconn_ind.userData); + if (ispresent(rconn_ind.userData)) { + f_handle_userData_RANAP(vc_conn, rconn_ind.userData); + } else { + /* Notify client that we recevied an SCCP CR without user data */ + CLIENT.send(ts_RANAP_Conn_Req(rconn_ind.callingAddress, rconn_ind.calledAddress, omit)); + } /* confirm connection establishment */ RANAP.send(ts_RANAP_CONNECT_res(rconn_ind.connectionId, omit)); } @@ -1250,6 +1264,11 @@ PROC.reply(RAN_register_handoverRequest:{targetPointCode, vc_hdlr}) to vc_hdlr; } + [] PROC.getcall(RAN_register_sccp_cr_without_payload:{?}) -> param(vc_hdlr) { + f_create_expect(omit, vc_hdlr); + PROC.reply(RAN_register_sccp_cr_without_payload:{vc_hdlr}) to vc_hdlr; + } + [] PROC.getcall(RAN_register_imsi:{?,?,?}) -> param(imsi, tmsi, vc_hdlr) { f_create_imsi(imsi, tmsi, vc_hdlr); PROC.reply(RAN_register_imsi:{imsi, tmsi, vc_hdlr}) to vc_hdlr; @@ -1280,6 +1299,7 @@ /* L3 payload based on which we can match it */ octetstring l3_payload optional, integer handoverRequestPointCode optional, + boolean sccp_cr_without_payload, /* component reference for this connection */ RAN_ConnHdlr vc_conn } @@ -1287,6 +1307,7 @@ /* procedure based port to register for incoming connections */ signature RAN_register(in octetstring l3, in RAN_ConnHdlr hdlr); signature RAN_register_handoverRequest(in integer targetPointCode, in RAN_ConnHdlr hdlr); +signature RAN_register_sccp_cr_without_payload(in RAN_ConnHdlr hdlr); /* procedure based port to register for incoming IMSI/TMSI */ signature RAN_register_imsi(in hexstring imsi, in OCT4 tmsi, in RAN_ConnHdlr hdlr); @@ -1299,7 +1320,8 @@ signature RAN_continue_after_n_sd(N_Sd_Array last_n_sd, in RAN_ConnHdlr hdlr); type port RAN_PROC_PT procedure { - inout RAN_register, RAN_register_imsi, RAN_unregister_imsi, RAN_register_handoverRequest, RAN_last_n_sd, RAN_continue_after_n_sd; + inout RAN_register, RAN_register_imsi, RAN_unregister_imsi, RAN_register_handoverRequest, + RAN_register_sccp_cr_without_payload, RAN_last_n_sd, RAN_continue_after_n_sd; } with { extension "internal" }; #ifdef RAN_EMULATION_BSSAP @@ -1360,25 +1382,31 @@ runs on RAN_Emulation_CT return RAN_ConnHdlr { var RAN_ConnHdlr ret := null; var template (omit) octetstring l3_info; + var boolean rx_sccp_cr_without_payload; var integer i; - l3_info := f_ranap_extract_l3(conn_ind.userData); - if (istemplatekind(l3_info, "omit")) { - setverdict(fail, "N-CONNECT.ind without NAS payload"); - mtc.stop; - return ret; + if (ispresent(conn_ind.userData)) { + l3_info := f_ranap_extract_l3(conn_ind.userData); + rx_sccp_cr_without_payload := false; + if (istemplatekind(l3_info, "omit") and not rx_sccp_cr_without_payload) { + setverdict(fail, "N-CONNECT.ind without NAS payload"); + mtc.stop; + return ret; + } + } else { + l3_info := omit; + rx_sccp_cr_without_payload := true; } for (i := 0; i < sizeof(ExpectTable); i:= i+1) { - if (not ispresent(ExpectTable[i].l3_payload)) { - continue; - } - if (valueof(l3_info) == ExpectTable[i].l3_payload) { + if ((rx_sccp_cr_without_payload and ExpectTable[i].sccp_cr_without_payload) + or (ispresent(ExpectTable[i].l3_payload) and valueof(l3_info) == ExpectTable[i].l3_payload)) { ret := ExpectTable[i].vc_conn; /* release this entry to be used again */ + ExpectTable[i].sccp_cr_without_payload := false; ExpectTable[i].l3_payload := omit; ExpectTable[i].vc_conn := null; - log("Found Expect[", i, "] for ", l3_info, " handled at ", ret); + log("Found Expect[", i, "] for l3=", l3_info, " handled at ", ret); /* return the component reference */ return ret; } @@ -1396,9 +1424,12 @@ log("f_create_expect(l3 := ", l3, ", handoverRequest := ", handoverRequestPointCode); for (i := 0; i < sizeof(ExpectTable); i := i+1) { if (not ispresent(ExpectTable[i].l3_payload) + and not ExpectTable[i].sccp_cr_without_payload and not ispresent(ExpectTable[i].handoverRequestPointCode)) { if (ispresent(l3)) { ExpectTable[i].l3_payload := valueof(l3); + } else { + ExpectTable[i].sccp_cr_without_payload := true; } if (ispresent(handoverRequestPointCode)) { ExpectTable[i].handoverRequestPointCode := valueof(handoverRequestPointCode); @@ -1448,6 +1479,7 @@ for (var integer i := 0; i < sizeof(ExpectTable); i := i+1) { ExpectTable[i].l3_payload := omit; ExpectTable[i].handoverRequestPointCode := omit; + ExpectTable[i].sccp_cr_without_payload := false; } } @@ -1484,6 +1516,12 @@ } } +function f_ran_register_sccp_cr_without_payload() runs on RAN_ConnHdlr { + BSSAP_PROC.call(RAN_register_sccp_cr_without_payload:{self}) { + [] BSSAP_PROC.getreply(RAN_register_sccp_cr_without_payload:{?}) {}; + } +} + #ifdef RAN_EMULATION_RANAP /* expect a IuReleaseCommand; Confirm that; expect SCCP-level N-DISCONNET.ind */ altstep as_iu_release_compl_disc(float t := 5.0) runs on RAN_ConnHdlr { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28231 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: I827e081eaacfb8e76684ed1560603e6c8f896c38 Gerrit-Change-Number: 28231 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-hnbgw[master]: use osmo_select_main_ctx(), tweak log in handle_cn_conn_conf()

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28229 ) Change subject: use osmo_select_main_ctx(), tweak log in handle_cn_conn_conf() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1e0ea0a883e8cf65e6cfb45ed9b6f3d8fb7c59eb Gerrit-Change-Number: 28229 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, 07 Jun 2022 16:06:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-hnbgw[master]: add option to send SCCP CR without payload

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28230 ) Change subject: add option to send SCCP CR without payload ...................................................................... add option to send SCCP CR without payload It is reported that a third-party SGSN is rejecting SCCP CR when the SCCP message part exceeds a certain length. The solution is to first send an SCCP CR without payload, and send the payload in a DT later. Add config option hnbgw sccp cr max-payload-len <0-999999> If the RANAP payload surpasses the given length, osmo-hnbgw will first send an SCCP CR without payload, cache the RANAP payload, and put that in an SCCP DT once the SCCP CC is received. The original idea was to limit the size of the entire SCCP part of the message, but I'm currently not sure how to determine that without copying much of the osmo_sccp code. I figured using a limit on the RANAP payload is sufficient. To avoid the error with above third-party SGSN, the easy solution is to set max-payload-len to 0, so that we always get a separate SCCP CR without payload. Related: SYS#5968 Related: I827e081eaacfb8e76684ed1560603e6c8f896c38 (osmo-ttcn3-hacks) Change-Id: If0c5c0a76e5230bf22871f527dcb2dbdf34d7328 --- M include/osmocom/hnbgw/context_map.h M include/osmocom/hnbgw/hnbgw.h M include/osmocom/hnbgw/hnbgw_rua.h M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_rua.c M src/osmo-hnbgw/hnbgw_vty.c 8 files changed, 122 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/30/28230/1 diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index 6910fe8..baa9166 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -2,6 +2,9 @@ #include <stdint.h> #include <osmocom/core/linuxlist.h> +#include <osmocom/rua/RUA_CN-DomainIndicator.h> + +struct msgb; enum hnbgw_context_map_state { MAP_S_NULL, @@ -33,6 +36,10 @@ bool is_ps; /* SCCP User SAP connection ID */ uint32_t scu_conn_id; + /* Pending data to be sent: when we send an "empty" SCCP CR first, the initial RANAP message will be sent in a + * separate DT once the CR is confirmed. This caches the initial RANAP message. */ + struct msgb *cached_msg; + RUA_CN_DomainIndicator_t cached_domain_indicator; enum hnbgw_context_map_state state; @@ -49,6 +56,8 @@ struct hnbgw_context_map * context_map_by_cn(struct hnbgw_cnlink *cn, uint32_t scu_conn_id); +int context_map_send_cached_msg(struct hnbgw_context_map *map); + void context_map_deactivate(struct hnbgw_context_map *map); int context_map_init(struct hnb_gw *gw); diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index 9a46301..76c5b84 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -134,6 +134,7 @@ bool hnbap_allow_tmsi; /*! print hnb-id (true) or MCC-MNC-LAC-RAC-SAC (false) in logs */ bool log_prefix_hnb_id; + unsigned int max_sccp_cr_payload_len; struct mgcp_client_conf *mgcp_client; } config; /*! SCTP listen socket for incoming connections */ @@ -175,3 +176,5 @@ void hnbgw_vty_init(struct hnb_gw *gw, void *tall_ctx); int hnbgw_vty_go_parent(struct vty *vty); + +bool hnbgw_requires_empty_sccp_cr(struct hnb_gw *gw, unsigned int ranap_msg_len); diff --git a/include/osmocom/hnbgw/hnbgw_rua.h b/include/osmocom/hnbgw/hnbgw_rua.h index 4b65115..fa33d6b 100644 --- a/include/osmocom/hnbgw/hnbgw_rua.h +++ b/include/osmocom/hnbgw/hnbgw_rua.h @@ -2,6 +2,7 @@ #include <osmocom/hnbgw/hnbgw.h> #include <osmocom/rua/RUA_Cause.h> +#include <osmocom/rua/RUA_CN-DomainIndicator.h> int hnbgw_rua_rx(struct hnb_context *hnb, struct msgb *msg); int hnbgw_rua_init(void); @@ -11,3 +12,9 @@ const uint8_t *data, unsigned int len); int rua_tx_disc(struct hnb_context *hnb, int is_ps, uint32_t context_id, const RUA_Cause_t *cause, const uint8_t *data, unsigned int len); + +int rua_to_scu(struct hnb_context *hnb, + RUA_CN_DomainIndicator_t cN_DomainIndicator, + enum osmo_scu_prim_type type, + uint32_t context_id, uint32_t cause, + const uint8_t *data, unsigned int len); diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c index 18f71ce..505c0c7 100644 --- a/src/osmo-hnbgw/context_map.c +++ b/src/osmo-hnbgw/context_map.c @@ -25,6 +25,7 @@ #include <osmocom/core/timer.h> #include <osmocom/hnbgw/hnbgw.h> +#include <osmocom/hnbgw/hnbgw_rua.h> #include <osmocom/hnbgw/context_map.h> #include <osmocom/hnbgw/mgw_fsm.h> @@ -130,6 +131,18 @@ return NULL; } +int context_map_send_cached_msg(struct hnbgw_context_map *map) +{ + int rc; + if (!map || !map->cached_msg) + return 0; + rc = rua_to_scu(map->hnb_ctx, map->cached_domain_indicator, OSMO_SCU_PRIM_N_DATA, + map->rua_ctx_id, 0, msgb_data(map->cached_msg), msgb_length(map->cached_msg)); + msgb_free(map->cached_msg); + map->cached_msg = NULL; + return rc; +} + void context_map_deactivate(struct hnbgw_context_map *map) { /* set the state to reserved. We still show up in the list and diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 96c7ad1..04ca34c 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -88,6 +88,10 @@ gw->config.iuh_local_port = IUH_DEFAULT_SCTP_PORT; gw->config.log_prefix_hnb_id = true; + /* No limit by default, always include the initial RANAP message in the SCCP CR towards the CN. + * 999999 is the maximum value in hnbgw_vty.c */ + gw->config.max_sccp_cr_payload_len = 999999; + gw->next_ue_ctx_id = 23; INIT_LLIST_HEAD(&gw->hnb_list); INIT_LLIST_HEAD(&gw->ue_list); @@ -343,6 +347,11 @@ talloc_free(ctx); } +bool hnbgw_requires_empty_sccp_cr(struct hnb_gw *gw, unsigned int ranap_msg_len) +{ + return ranap_msg_len > gw->config.max_sccp_cr_payload_len; +} + /*! call-back when the listen FD has something to read */ static int accept_cb(struct osmo_stream_srv_link *srv, int fd) { diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 9c06497..9c95ed5 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -339,6 +339,10 @@ /* Nothing needs to happen for RUA, RUA towards the HNB doesn't seem to know any confirmations to its CONNECT * operation. */ + /* If our initial SCCP CR was sent without data payload, then the initial RANAP message is cached and waiting to + * be sent as soon as the SCCP connection is confirmed. See if that is the case, send cached data. */ + context_map_send_cached_msg(context_map_by_cn(cnlink, param->conn_id)); + return 0; } diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index 1943ac0..c25eeb5 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -177,11 +177,11 @@ /* forward a RUA message to the SCCP User API to SCCP */ -static int rua_to_scu(struct hnb_context *hnb, - RUA_CN_DomainIndicator_t cN_DomainIndicator, - enum osmo_scu_prim_type type, - uint32_t context_id, uint32_t cause, - const uint8_t *data, unsigned int len) +int rua_to_scu(struct hnb_context *hnb, + RUA_CN_DomainIndicator_t cN_DomainIndicator, + enum osmo_scu_prim_type type, + uint32_t context_id, uint32_t cause, + const uint8_t *data, unsigned int len) { struct msgb *msg; struct osmo_scu_prim *prim; @@ -225,9 +225,9 @@ default: map = context_map_alloc_by_hnb(hnb, context_id, is_ps, cn); OSMO_ASSERT(map); - LOGHNB(hnb, DRUA, LOGL_DEBUG, "rua_to_scu() %s to %s, rua_ctx_id %u scu_conn_id %u\n", + LOGHNB(hnb, DRUA, LOGL_DEBUG, "rua_to_scu() %s to %s, rua_ctx_id %u scu_conn_id %u data-len %u\n", cn_domain_indicator_to_str(cN_DomainIndicator), osmo_sccp_addr_dump(remote_addr), - map->rua_ctx_id, map->scu_conn_id); + map->rua_ctx_id, map->scu_conn_id, len); } /* add primitive header */ @@ -271,7 +271,7 @@ } /* Intercept RAB Assignment Response, inform MGW FSM. */ - if (map && !map->is_ps && !release_context_map) { + if (data && len && map && !map->is_ps && !release_context_map) { message = talloc_zero(map, ranap_message); rc = ranap_cn_rx_co_decode(map, message, msgb_l2(prim->oph.msg), msgb_l2len(prim->oph.msg)); @@ -363,21 +363,69 @@ struct hnb_context *hnb = msg->dst; uint32_t context_id; int rc; + const uint8_t *data; + unsigned int data_len; rc = rua_decode_connecties(&ies, in); if (rc < 0) return rc; context_id = asn1bitstr_to_u24(&ies.context_ID); + data = ies.ranaP_Message.buf; + data_len = ies.ranaP_Message.size; - LOGHNB(hnb, DRUA, LOGL_DEBUG, "RUA %s Connect.req(ctx=0x%x, %s)\n", - cn_domain_indicator_to_str(ies.cN_DomainIndicator), context_id, - ies.establishment_Cause == RUA_Establishment_Cause_emergency_call ? "emergency" : "normal"); + LOGHNB(hnb, DRUA, LOGL_DEBUG, "RUA %s Connect.req(ctx=0x%x, %s, RANAP.size=%u)\n", + cn_domain_indicator_to_str(ies.cN_DomainIndicator), context_id, + ies.establishment_Cause == RUA_Establishment_Cause_emergency_call ? "emergency" : "normal", + data_len); + + if (hnbgw_requires_empty_sccp_cr(hnb->gw, data_len)) { + /* Do not include data in the SCCP CR, to avoid hitting a message size limit at the remote end that may + * lead to rejection. */ + bool is_ps; + struct osmo_sccp_addr *remote_addr; + struct hnbgw_context_map *map; + + switch (ies.cN_DomainIndicator) { + case RUA_CN_DomainIndicator_cs_domain: + remote_addr = &hnb->gw->sccp.iucs_remote_addr; + is_ps = false; + break; + case RUA_CN_DomainIndicator_ps_domain: + remote_addr = &hnb->gw->sccp.iups_remote_addr; + is_ps = true; + break; + default: + LOGHNB(hnb, DRUA, LOGL_ERROR, "Unsupported Domain %ld\n", ies.cN_DomainIndicator); + rua_free_connecties(&ies); + return -1; + } + + if (!hnb->gw->sccp.cnlink) { + LOGHNB(hnb, DRUA, LOGL_NOTICE, "CN=NULL, discarding message\n"); + rua_free_connecties(&ies); + return 0; + } + + map = context_map_alloc_by_hnb(hnb, context_id, is_ps, hnb->gw->sccp.cnlink); + OSMO_ASSERT(map); + LOGHNB(hnb, DRUA, LOGL_DEBUG, "rua_rx_init_connect() %s to %s, rua_ctx_id %u scu_conn_id %u;" + " Sending SCCP CR without payload, caching %u octets\n", + cn_domain_indicator_to_str(ies.cN_DomainIndicator), osmo_sccp_addr_dump(remote_addr), + map->rua_ctx_id, map->scu_conn_id, data_len); + + map->cached_domain_indicator = ies.cN_DomainIndicator; + map->cached_msg = msgb_alloc_c(map, data_len, "map.cached_msg"); + OSMO_ASSERT(map->cached_msg); + memcpy(msgb_put(map->cached_msg, data_len), data, data_len); + + /* Data is cached for after CR is confirmed, send SCCP CR but omit payload. */ + data = NULL; + data_len = 0; + } rc = rua_to_scu(hnb, ies.cN_DomainIndicator, OSMO_SCU_PRIM_N_CONNECT, - context_id, 0, ies.ranaP_Message.buf, - ies.ranaP_Message.size); - + context_id, 0, data, data_len); rua_free_connecties(&ies); return rc; diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index d064b7d..c263ab3 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -330,6 +330,18 @@ return CMD_SUCCESS; } +DEFUN(cfg_hnbgw_max_sccp_cr_payload_len, cfg_hnbgw_max_sccp_cr_payload_len_cmd, + "sccp cr max-payload-len <0-999999>", + "Configure SCCP behavior\n" + "Configure SCCP Connection Request\n" + "Set an upper bound for payload data length included directly in the CR. If an initial RUA message has a" + " RANAP payload larger than this value (octets), send an SCCP CR without data, followed by an SCCP DT." + " This may be necessary if the remote component has a size limit on valid SCCP CR messages.\n") +{ + g_hnb_gw->config.max_sccp_cr_payload_len = atoi(argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_hnbgw_iucs_remote_addr, cfg_hnbgw_iucs_remote_addr_cmd, "remote-addr NAME", @@ -355,6 +367,8 @@ vty_out(vty, "hnbgw%s", VTY_NEWLINE); vty_out(vty, " log-prefix %s%s", g_hnb_gw->config.log_prefix_hnb_id ? "hnb-id" : "umts-cell-id", VTY_NEWLINE); + if (g_hnb_gw->config.max_sccp_cr_payload_len != 999999) + vty_out(vty, " sccp cr max-payload-len %u%s", g_hnb_gw->config.max_sccp_cr_payload_len, VTY_NEWLINE); return CMD_SUCCESS; } @@ -421,6 +435,7 @@ install_element(HNBGW_NODE, &cfg_hnbgw_rnc_id_cmd); install_element(HNBGW_NODE, &cfg_hnbgw_log_prefix_cmd); + install_element(HNBGW_NODE, &cfg_hnbgw_max_sccp_cr_payload_len_cmd); install_element(HNBGW_NODE, &cfg_hnbgw_iuh_cmd); install_node(&iuh_node, config_write_hnbgw_iuh); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If0c5c0a76e5230bf22871f527dcb2dbdf34d7328 Gerrit-Change-Number: 28230 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-hnbgw[master]: use osmo_select_main_ctx(), tweak log in handle_cn_conn_conf()

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28229 ) Change subject: use osmo_select_main_ctx(), tweak log in handle_cn_conn_conf() ...................................................................... use osmo_select_main_ctx(), tweak log in handle_cn_conn_conf() Upcoming patch adds to this function. Let me first combine those four LOGP() to a single one, use proper osmo_sccp_addr_to_str_c(OTC_SELECT). To be able to use OTC_SELECT, switch hnbgw.c to osmo_select_main_ctx(). Related: SYS#5968 Change-Id: I1e0ea0a883e8cf65e6cfb45ed9b6f3d8fb7c59eb --- M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_cn.c 2 files changed, 9 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/29/28229/1 diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 833486c..96c7ad1 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -713,7 +713,7 @@ } while (1) { - rc = osmo_select_main(0); + rc = osmo_select_main_ctx(0); if (rc < 0) exit(3); } diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 5ee5fd4..9c06497 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -329,18 +329,15 @@ const struct osmo_scu_connect_param *param, struct osmo_prim_hdr *oph) { - /* we don't actually need to do anything, as RUA towards the HNB - * doesn't seem to know any confirmations to its CONNECT - * operation */ + struct osmo_ss7_instance *ss7 = osmo_sccp_get_ss7(cnlink->gw->sccp.client); + LOGP(DMAIN, LOGL_DEBUG, "handle_cn_conn_conf() conn_id=%d, addrs: called=%s calling=%s responding=%s", + param->conn_id, + osmo_sccp_addr_to_str_c(OTC_SELECT, ss7, &param->called_addr), + osmo_sccp_addr_to_str_c(OTC_SELECT, ss7, &param->calling_addr), + osmo_sccp_addr_to_str_c(OTC_SELECT, ss7, &param->responding_addr)); - LOGP(DMAIN, LOGL_DEBUG, "handle_cn_conn_conf() conn_id=%d\n", - param->conn_id); - LOGP(DMAIN, LOGL_DEBUG, "handle_cn_conn_conf() called_addr=%s\n", - inet_ntoa(param->called_addr.ip.v4)); - LOGP(DMAIN, LOGL_DEBUG, "handle_cn_conn_conf() calling_addr=%s\n", - inet_ntoa(param->calling_addr.ip.v4)); - LOGP(DMAIN, LOGL_DEBUG, "handle_cn_conn_conf() responding_addr=%s\n", - inet_ntoa(param->responding_addr.ip.v4)); + /* Nothing needs to happen for RUA, RUA towards the HNB doesn't seem to know any confirmations to its CONNECT + * operation. */ return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1e0ea0a883e8cf65e6cfb45ed9b6f3d8fb7c59eb Gerrit-Change-Number: 28229 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/StatsD_Checker: make logging messages more readable

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28222 ) Change subject: library/StatsD_Checker: make logging messages more readable ...................................................................... library/StatsD_Checker: make logging messages more readable Change-Id: I0484f36184fe3724c57cedcf203894d701b91605 --- M library/StatsD_Checker.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/StatsD_Checker.ttcn b/library/StatsD_Checker.ttcn index 1c8fd12..8ace150 100644 --- a/library/StatsD_Checker.ttcn +++ b/library/StatsD_Checker.ttcn @@ -153,14 +153,14 @@ continue; } if (not f_compare_expect(metric, exp.expect)) { - log("EXP mismatch: ", metric, exp.expect); + log("EXP mismatch: ", metric, " vs ", exp.expect); result := { kind := e_Mismatched, idx := i }; break; } else { - log("EXP match: ", metric, exp.expect); + log("EXP match: ", metric, " vs ", exp.expect); result := { kind := e_Matched, idx := i -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28222 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: I0484f36184fe3724c57cedcf203894d701b91605 Gerrit-Change-Number: 28222 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-upf[master]: add pfcp msg test

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27638 ) Change subject: add pfcp msg test ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I30bdfc66a8f96c0639513ef406e9b66525dced6d Gerrit-Change-Number: 27638 Gerrit-PatchSet: 8 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 Jun 2022 13:58:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/StatsD_Checker: make logging messages more readable

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28222 ) Change subject: library/StatsD_Checker: make logging messages more readable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28222 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: I0484f36184fe3724c57cedcf203894d701b91605 Gerrit-Change-Number: 28222 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 Jun 2022 12:49:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTP: Send more QoS IE fields by default

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28228 ) Change subject: GTP: Send more QoS IE fields by default ...................................................................... GTP: Send more QoS IE fields by default This way we trigger more code paths in the IUT. Change-Id: Id195eedf530e2eff753d057ce2302dfb5275bfcd --- M library/GTP_Templates.ttcn 1 file changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/28228/1 diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 493da8f..c7d7824 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -360,7 +360,7 @@ template QualityOfServiceProfile ts_QosDefault := { type_gtpc := '87'O, - lengthf := 4, + lengthf := 17, allocRetensionPrio := '00'O, qos_ProfileValue := { reliabilityClass := '011'B, @@ -371,25 +371,25 @@ peakThroughput := '1001'B, meanThroughput := '11111'B, spare3 := '000'B, - deliverErroneusSDU := omit, - deliveryOrder := omit, - trafficClass := omit, - maxSDUSize := omit, - maxBitrateUplink := omit, - maxBitrateDownlink := omit, - sduErrorRatio := omit, - residualBER := omit, - trafficHandlingPriority := omit, - transferDelay := omit, - guaranteedBitRateUplink := omit, - guaranteedBitRateDownlink := omit, - sourceStatisticsDescriptor := omit, - signallingIndication := omit, - spare4 := omit, - maxBitrateDownlinkExt := omit, - guaranteedBitRateDownlinkExt := omit, - maxBitrateUplinkExt := omit, - guaranteedBitRateUplinkExt := omit + deliverErroneusSDU := '010'B, /* Erroneus SDU are delivered */ + deliveryOrder := '10'B, /* Without delivery order */ + trafficClass := '100'B, /* Background */ + maxSDUSize := '96'O, /* 1500 octets */ + maxBitrateUplink := 'FE'O, /* 8640, continues in extended octet */ + maxBitrateDownlink := 'FE'O, /* 8640, continues in extended octet */ + sduErrorRatio := '0100'B, /* 1x10^-4 */ + residualBER := '0101'B, /* 1x10^-3 */ + trafficHandlingPriority := '01'B, /* prio 1 */ + transferDelay := '000001'B, /* 10 ms */ + guaranteedBitRateUplink := 'FE'O, /* 8640, continues in extended octet */ + guaranteedBitRateDownlink := 'FE'O, /* 8640, continues in extended octet */ + sourceStatisticsDescriptor := '0000'B, /* unknown */ + signallingIndication := '0'B, /* Not optimized */ + spare4 := '000'B, + maxBitrateDownlinkExt := '5B'O, /* 33 mbps */ + guaranteedBitRateDownlinkExt := '5B'O, /* 33 mbps */ + maxBitrateUplinkExt := '6e'O, /* 52 mbps */ + guaranteedBitRateUplinkExt := '6e'O /* 52 mbps */ } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28228 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: Id195eedf530e2eff753d057ce2302dfb5275bfcd Gerrit-Change-Number: 28228 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2022