- gerrit-log - lists.osmocom.org

[M] Change in ...osmo_ss7[master]: ipa_proto.erl: Implement TCP/IPA reassembly
by pespin 27 Feb '24

27 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36095?usp=email ) Change subject: ipa_proto.erl: Implement TCP/IPA reassembly ...................................................................... ipa_proto.erl: Implement TCP/IPA reassembly Related: OS#6377 Change-Id: I322e6ab9368ad66be66a9e8d113575f51f9c91c3 --- M src/ipa_proto.erl 1 file changed, 42 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_ss7 refs/changes/95/36095/1 diff --git a/src/ipa_proto.erl b/src/ipa_proto.erl index fcd594b..b0c2647 100644 --- a/src/ipa_proto.erl +++ b/src/ipa_proto.erl @@ -130,11 +130,18 @@ io:format("Unblocking socket ~p:~p~n", [Socket, Ret]). % split an incoming IPA message and split it into Length/StreamID/Payload +split_ipa_msg(DataBin) when byte_size(DataBin) < 3 -> + {need_more_data, DataBin}; split_ipa_msg(DataBin) -> - % FIXME: This will throw an exception if DataBin doesn't contain all payload - <<Length:16/big-unsigned-integer, StreamID:8, Payload:Length/binary, Trailer/binary>> = DataBin, - io:format("Stream ~p, ~p bytes~n", [StreamID, Length]), - {StreamID, Payload, Trailer}. + <<IPALen:16/big-unsigned-integer, StreamID:8, DataRemainBin/binary>> = DataBin, + DataRemainLen = byte_size(DataRemainBin), + case DataRemainLen of + _ when DataRemainLen < IPALen -> {need_more_data, DataBin}; + _ when DataRemainLen >= IPALen -> + <<Payload:IPALen/binary, Trailer/binary>> = DataRemainBin, + io:format("Stream ~p, ~p bytes~n", [StreamID, IPALen]), + {ok, StreamID, Payload, Trailer} + end. % deliver an incoming message to the process that is registered for the socket/stream_id deliver_rx_ipa_msg(Socket, StreamID, StreamMap, DataBin) -> @@ -177,19 +184,22 @@ % process (split + deliver) an incoming IPA message process_rx_ipa_msg(_S, _StreamMap, _, <<>>) -> - ok; + {ok, <<>>}; process_rx_ipa_msg(S, StreamMap, CcmOptions, Data) -> - {StreamID, PayloadBin, Trailer} = split_ipa_msg(Data), - case StreamID of - ?IPAC_PROTO_CCM -> - process_rx_ccm_msg(S, StreamID, CcmOptions, PayloadBin); - ?IPAC_PROTO_OSMO -> - <<ExtStreamID:8, PayloadExt/binary>> = PayloadBin, - deliver_rx_ipa_msg(S, {osmo, ExtStreamID}, StreamMap, PayloadExt); - _ -> - deliver_rx_ipa_msg(S, StreamID, StreamMap, PayloadBin) - end, - process_rx_ipa_msg(S, StreamMap, CcmOptions, Trailer). + case split_ipa_msg(Data) of + {need_more_data} -> {ok, Data}; + {ok, StreamID, PayloadBin, Trailer} -> + case StreamID of + ?IPAC_PROTO_CCM -> + process_rx_ccm_msg(S, StreamID, CcmOptions, PayloadBin); + ?IPAC_PROTO_OSMO -> + <<ExtStreamID:8, PayloadExt/binary>> = PayloadBin, + deliver_rx_ipa_msg(S, {osmo, ExtStreamID}, StreamMap, PayloadExt); + _ -> + deliver_rx_ipa_msg(S, StreamID, StreamMap, PayloadBin) + end, + process_rx_ipa_msg(S, StreamMap, CcmOptions, Trailer) + end. send_close_signal([]) -> ok; @@ -246,9 +256,9 @@ StreamMap = ets:new(stream_map, [set]), ets:insert(ipa_sockets, #ipa_socket{socket=Socket, ipaPid=self(), streamTbl=StreamMap}), CallingPid ! {ipa_init_sock_done, Socket}, - loop(Socket, StreamMap, #ipa_ccm_options{}). + loop(Socket, StreamMap, #ipa_ccm_options{}, <<>>). -loop(S, StreamMap, CcmOptions) -> +loop(S, StreamMap, CcmOptions, RxPendingData) -> receive {request, From, Request} -> case ipa_proto:request(Request, CcmOptions) of @@ -260,15 +270,15 @@ Reply = EmbeddedReply end, ipa_proto:reply(From, Reply), - ipa_proto:loop(S, StreamMap, NextCcmOptions); + ipa_proto:loop(S, StreamMap, NextCcmOptions, RxPendingData); {ipa_send, S, StreamId, Data} -> send(S, StreamId, Data), - ipa_proto:loop(S, StreamMap, CcmOptions); + ipa_proto:loop(S, StreamMap, CcmOptions, RxPendingData); {tcp, S, Data} -> % process incoming IPA message and mark socket active once more - ipa_proto:process_rx_ipa_msg(S, StreamMap, CcmOptions, Data), + {ok, NewRxPendingData} = ipa_proto:process_rx_ipa_msg(S, StreamMap, CcmOptions, <<RxPendingData/binary, Data/binary>>), inet:setopts(S, [{active, once}]), - ipa_proto:loop(S, StreamMap, CcmOptions); + ipa_proto:loop(S, StreamMap, CcmOptions, NewRxPendingData); {tcp_closed, S} -> io:format("Socket ~w closed [~w]~n", [S,self()]), ipa_proto:process_tcp_closed(S, StreamMap), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36095?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I322e6ab9368ad66be66a9e8d113575f51f9c91c3 Gerrit-Change-Number: 36095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: Update pcap pkt size to 1520 bytes
by pespin 27 Feb '24

27 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36091?usp=email ) Change subject: Update pcap pkt size to 1520 bytes ...................................................................... Update pcap pkt size to 1520 bytes I see packets of 1520 bytes in the generated pcap running under the docker setup. This happens when a lot of IPA concurrent clients send messages and end up in the same TCP packet due to naggle algorithm. Change-Id: I362371508ba83acc48376b6ed012a97a59d4b31b --- M ttcn3-dumpcap-start.sh M ttcn3-tcpdump-start.sh 2 files changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/36091/1 diff --git a/ttcn3-dumpcap-start.sh b/ttcn3-dumpcap-start.sh index eb390fd..a1e64fc 100755 --- a/ttcn3-dumpcap-start.sh +++ b/ttcn3-dumpcap-start.sh @@ -80,7 +80,7 @@ fi done -$CMD -s 1500 -n ${ADDL_ARGS} -w "$TTCN3_PCAP_PATH/$TESTCASE.pcapng" >$TTCN3_PCAP_PATH/$TESTCASE.pcapng.stdout 2>&1 & +$CMD -s 1520 -n ${ADDL_ARGS} -w "$TTCN3_PCAP_PATH/$TESTCASE.pcapng" >$TTCN3_PCAP_PATH/$TESTCASE.pcapng.stdout 2>&1 & PID=$! echo $PID > $PIDFILE_PCAP diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index c4905d9..36aa320 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -84,9 +84,9 @@ # Log stderr to CMD_OUTFILE and a dedicated error log file tee $CMD_OUTFILE < $FIFO > $CMD_OUTFILE_ERR & -CMD_STR="$CMD -s 1500 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE 2>$FIFO &" +CMD_STR="$CMD -s 1520 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE 2>$FIFO &" eval $CMD_STR -# $CMD -s 1500 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE & +# $CMD -s 1520 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE & PID=$! echo $PID > $PIDFILE_PCAP if [ -f $CMD_OUTFILE_ERR ] && [ $(wc -l $CMD_OUTFILE_ERR | awk '{print $1}') -ne 0 ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36091?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: I362371508ba83acc48376b6ed012a97a59d4b31b Gerrit-Change-Number: 36091 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Add tests to validate concurrent connections
by pespin 27 Feb '24

27 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093?usp=email ) Change subject: epdg: Add tests to validate concurrent connections ...................................................................... epdg: Add tests to validate concurrent connections Change-Id: I842dacda56abe47afb19e951eaae746b5e8d9fe7 --- M epdg/EPDG_Tests.ttcn 1 file changed, 90 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/36093/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 44dc80f..1ff4629 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -55,6 +55,14 @@ integer mp_diam_watchdog_initial_wait_sec := 6*3; } +type port Coord_PT message +{ + inout charstring; +} with { extension "internal" }; +private const charstring COORD_CMD_READY := "COORD_CMD_READY"; +private const charstring COORD_CMD_START := "COORD_CMD_START"; +private const charstring COORD_CMD_ATTACHED := "COORD_CMD_ATTACHED"; +private const charstring COORD_CMD_STOP := "COORD_CMD_STOP"; type component MTC_CT { var DIAMETER_Emulation_CT vc_SWx; @@ -72,6 +80,8 @@ var GTPv2_Emulation_CT vc_GTP2; port GTP2EM_PT TEID0; + port Coord_PT COORD; + timer g_Tguard; }; @@ -93,7 +103,6 @@ f_diameter_expect_imsi(imsi); - while (true) { alt { [] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg { @@ -119,8 +128,9 @@ port DIAMETEREM_PROC_PT SWx_PROC; port DIAMETER_Conn_PT S6b; port DIAMETEREM_PROC_PT S6b_PROC; + port Coord_PT COORD; }; - +type record of EPDG_ConnHdlr EPDG_ConnHdlrList; type record BearerConfig { /* EPS Bearer ID */ @@ -157,12 +167,22 @@ } } -private function f_init_pars(integer imsi_suffix := 1) +private function f_gen_addr_in_pool(integer idx := 0) return charstring +{ + /* Skip first 2 addresses reserved for TUN */ + var integer internal_idx := idx + 2; + var integer suffix := internal_idx rem (256*256); + var integer C := suffix / 256; + var integer D := suffix rem 256; + return "192.168." & int2str(C) & "." & int2str(D); +} + +private function f_init_pars(integer idx := 0) runs on MTC_CT return EPDG_ConnHdlrPars { var EPDG_ConnHdlrPars pars := { - imsi := f_gen_imsi(imsi_suffix), + imsi := f_rnd_imsi('26242'H), apn := "internet", - ue_ip := "192.168.123.50", + ue_ip := f_gen_addr_in_pool(idx), teic_local := '00000000'O, teic_remote := omit, bearer := { @@ -335,6 +355,9 @@ connect(vc_conn:S6b_PROC, vc_conn_s6b:DIAMETER_PROC_CLIENT); vc_conn_s6b.start(f_diam_connhldr_ct_main(pars.imsi)); + /* COORD */ + connect(vc_conn:COORD, self:COORD); + vc_conn.start(f_init_handler(fn, id, pars)); return vc_conn; } @@ -711,7 +734,6 @@ f_initial_attach(); f_GSUP_PurgeMS_success(); } - testcase TC_authinfo_normal() runs on MTC_CT { var EPDG_ConnHdlrPars pars := f_init_pars(); var EPDG_ConnHdlr vc_conn; @@ -728,7 +750,6 @@ f_GTP2C_CreateBearer_success(); f_GSUP_PurgeMS_success(); } - testcase TC_ho_lte_to_wifi() runs on MTC_CT { var EPDG_ConnHdlrPars pars := f_init_pars(); var EPDG_ConnHdlr vc_conn; @@ -744,7 +765,6 @@ * cause="Access changed from non-3gpp to 3gpp" */ f_GTP2C_DeleteBearer_success(); } - testcase TC_ho_wifi_to_lte() runs on MTC_CT { var EPDG_ConnHdlrPars pars := f_init_pars(); var EPDG_ConnHdlr vc_conn; @@ -754,10 +774,63 @@ setverdict(pass); } +private function f_TC_concurrent_ues(charstring id) runs on EPDG_ConnHdlr { + COORD.send(COORD_CMD_READY); + COORD.receive(COORD_CMD_START); + f_initial_attach(); + COORD.send(COORD_CMD_ATTACHED); + COORD.receive(COORD_CMD_STOP); + f_GSUP_PurgeMS_success(); +} +private function f_TC_concurrent_ues_MTC(integer num_ues) runs on MTC_CT { + var EPDG_ConnHdlrList vc_conn_list := {}; + var EPDG_ConnHdlr vc_conn; + f_init(t_guard := 100.0); + + for (var integer i := 0; i < num_ues; i := i + 1) { + var EPDG_ConnHdlrPars pars := f_init_pars(i); + vc_conn := f_start_handler(refers(f_TC_concurrent_ues), pars); + vc_conn_list := vc_conn_list & { vc_conn }; + } + + for (var integer i := 0; i < num_ues; i := i + 1) { + COORD.receive(COORD_CMD_READY) -> sender vc_conn; + } + + for (var integer i := 0; i < num_ues; i := i + 1) { + COORD.send(COORD_CMD_START) to vc_conn_list[i]; + } + + for (var integer i := 0; i < num_ues; i := i + 1) { + COORD.receive(COORD_CMD_ATTACHED) -> sender vc_conn; + } + + log("All attached!"); + f_sleep(1.0); + + for (var integer i := 0; i < num_ues; i := i + 1) { + COORD.send(COORD_CMD_STOP) to vc_conn_list[i]; + } + + for (var integer i := 0; i < num_ues; i := i + 1) { + vc_conn_list[i].done; + } + + setverdict(pass); +} +testcase TC_concurrent_ues2() runs on MTC_CT { + f_TC_concurrent_ues_MTC(2) +} +testcase TC_concurrent_ues100() runs on MTC_CT { + f_TC_concurrent_ues_MTC(100) +} + control { execute ( TC_authinfo_normal() ); execute ( TC_ho_lte_to_wifi() ); execute ( TC_ho_wifi_to_lte() ); + execute ( TC_concurrent_ues2() ); + execute ( TC_concurrent_ues100() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093?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: I842dacda56abe47afb19e951eaae746b5e8d9fe7 Gerrit-Change-Number: 36093 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: GSUP_Emulation: Update internal tables to allow 256 sessions
by pespin 27 Feb '24

27 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36092?usp=email ) Change subject: GSUP_Emulation: Update internal tables to allow 256 sessions ...................................................................... GSUP_Emulation: Update internal tables to allow 256 sessions Other Emulations like GTPv2 and DIAMETER already support that number of sessions. Increase it to the same number in GSUP_Emulation to allow handling a high amount of concurrent sessions while testing ePDG. Change-Id: I9ce650140fc372debc85b603a20bbe9ea165c972 --- M library/GSUP_Emulation.ttcn 1 file changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/36092/1 diff --git a/library/GSUP_Emulation.ttcn b/library/GSUP_Emulation.ttcn index 5e15d06..4f7e5d6 100644 --- a/library/GSUP_Emulation.ttcn +++ b/library/GSUP_Emulation.ttcn @@ -60,11 +60,10 @@ /* GSUP port to the per-connection clients */ port GSUP_Conn_PT GSUP_CLIENT; - /* use 16 as this is also the number of SCCP connections that SCCP_Emulation can handle */ - var ConnectionData GsupImsiTable[16]; + var ConnectionData GsupImsiTable[256]; /* pending expected incoming connections */ - var ExpectData GsupExpectTable[16]; + var ExpectData GsupExpectTable[256]; /* procedure based port to register for incoming connections */ port GSUPEM_PROC_PT GSUP_PROC; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36092?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: I9ce650140fc372debc85b603a20bbe9ea165c972 Gerrit-Change-Number: 36092 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-gsm-manuals[master]: gsup: Introduce a new PCO IE
by pespin 27 Feb '24

27 Feb '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/36023?usp=email ) Change subject: gsup: Introduce a new PCO IE ...................................................................... gsup: Introduce a new PCO IE This IE will be required by the UE creating a tunnel at the ePDG (EPDG Tunnel Req). The ePDG will convert the IKEv2 Configuration Attributes into TS 29.060 PCO, and sends them in S2b GTPv2C CreateSessionReq+Resp as PCO. Change-Id: Id912ead4e1205f84a40af6505a5ddf050d1e086d --- M common/chapters/gsup.adoc 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index 1f70c5b..d88c579 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -1379,6 +1379,7 @@ |0x12|Access Point Name|<<gsup-ie-apn>> |0x13|QoS|<<gsup-ie-qos>> |0x14|PDP-Charging Characteristics|<<gsup-ie-charging>> +|0x15|PCO|<<gsup-ie-pco>> |0x20|RAND|<<gsup-ie-rand>> |0x21|SRES|<<gsup-ie-sres>> |0x22|Kc|<<gsup-ie-kc>> @@ -1527,6 +1528,12 @@ } ---- +[[gsup-ie-pco]] +==== Protocol Configuration Options (PCO) + +This encodes the Protocol Configuration Options (PCO) of 3GPP TS 29.060 clause +7.7.31, which are the same as those specified in 3GPP TS 24.008 10.5.6.3. It +will be used by the ePDG during the PDP Context activation. [[gsup-ie-hlr]] ==== HLR Number encoded as 3GPP TS 09.02 ISDN-AddressString -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/36023?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Id912ead4e1205f84a40af6505a5ddf050d1e086d Gerrit-Change-Number: 36023 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-gsm-manuals[master]: gsup: Introduce a new PCO IE
by fixeria 27 Feb '24

27 Feb '24

Attention is currently required from: laforge, lynxis lazus, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/36023?usp=email ) Change subject: gsup: Introduce a new PCO IE ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/36023?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Id912ead4e1205f84a40af6505a5ddf050d1e086d Gerrit-Change-Number: 36023 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 27 Feb 2024 17:12:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: gsup.h: define newly added PCO IE
by pespin 27 Feb '24

27 Feb '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36024?usp=email ) Change subject: gsup.h: define newly added PCO IE ...................................................................... gsup.h: define newly added PCO IE PCO - Protocol Configuration Options 3GPP TS 24.008 / 10.5.6.3. The PCO will be used by the osmo-epdg to pass PCO internally. The PCO will be passed towards to the PGW in the Session Request. Related: OS#6369 Related: osmo-gsm-manuals.git Change-Id Id912ead4e1205f84a40af6505a5ddf050d1e086d Change-Id: I0f9de90c7c67fe194b441a9d118eba70f09afb5e --- M TODO-RELEASE M include/osmocom/gsm/gsup.h M src/gsm/gsup.c 3 files changed, 34 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved dexter: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/TODO-RELEASE b/TODO-RELEASE index 3e75184..01f7c41 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -20,3 +20,4 @@ gsm ABI change add UI queue to struct lapdm_datalink gsm ADD gsup.h: struct osmo_gsup_pdp_info fields pdp_type_nr, pdp_type_org, deprecate pdp_type. gsm ABI change gsup.h: Add field pdp_address in struct osmo_gsup_pdp_info shifts the struct, and in turn fields in struct osmo_gsup_message. +gsm ABI change gsup.h: Add field pco in struct osmo_gsup_message. Length of the struct osmo_gsup_message increase. diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index a17a729..6ad72d2 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -61,6 +61,7 @@ /*! Maximum number of octets encoding MSISDN in BCD format */ #define OSMO_GSUP_MAX_MSISDN_LEN 9 #define OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN 43 /* TS 24.008 10.5.4.7 */ +#define OSMO_GSUP_MAX_PCO_LEN 251 /*! Information Element Identifiers for GSUP IEs */ enum osmo_gsup_iei { @@ -80,6 +81,7 @@ OSMO_GSUP_ACCESS_POINT_NAME_IE = 0x12, OSMO_GSUP_PDP_QOS_IE = 0x13, OSMO_GSUP_CHARG_CHAR_IE = 0x14, + OSMO_GSUP_PCO_IE = 0x15, OSMO_GSUP_RAND_IE = 0x20, OSMO_GSUP_SRES_IE = 0x21, OSMO_GSUP_KC_IE = 0x22, @@ -406,6 +408,12 @@ enum osmo_rat_type current_rat_type; enum osmo_rat_type supported_rat_types[8]; /*!< arbitrary choice */ size_t supported_rat_types_len; + + /*! PCO protocol option 3GPP TS 24.008 10.5.6.3 / Table 10.5.136. PCO contains Octet 3-ZA */ + const uint8_t *pco; + /*! Number of bytes of the PCO. */ + size_t pco_len; + }; int osmo_gsup_decode(const uint8_t *data, size_t data_len, diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 3daf75c..4f0a1b5 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -506,6 +506,11 @@ gsup_msg->rand = value; break; + case OSMO_GSUP_PCO_IE: + gsup_msg->pco = value; + gsup_msg->pco_len = value_len; + break; + case OSMO_GSUP_MSISDN_IE: gsup_msg->msisdn_enc = value; gsup_msg->msisdn_enc_len = value_len; @@ -872,6 +877,11 @@ if (gsup_msg->rand) msgb_tlv_put(msg, OSMO_GSUP_RAND_IE, 16, gsup_msg->rand); + if (gsup_msg->pco && gsup_msg->pco_len > 0) { + if (gsup_msg->pco_len > OSMO_GSUP_MAX_PCO_LEN) + return -EINVAL; + msgb_tlv_put(msg, OSMO_GSUP_PCO_IE, gsup_msg->pco_len, gsup_msg->pco); + } if (gsup_msg->cn_domain) { uint8_t dn = gsup_msg->cn_domain; msgb_tlv_put(msg, OSMO_GSUP_CN_DOMAIN_IE, 1, &dn); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36024?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0f9de90c7c67fe194b441a9d118eba70f09afb5e Gerrit-Change-Number: 36024 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: gsup.h: define newly added PCO IE
by fixeria 27 Feb '24

27 Feb '24

Attention is currently required from: dexter, laforge, lynxis lazus, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36024?usp=email ) Change subject: gsup.h: define newly added PCO IE ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36024?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0f9de90c7c67fe194b441a9d118eba70f09afb5e Gerrit-Change-Number: 36024 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Feb 2024 17:07:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcu_sock: forward PCU_VERSION only once
by pespin 27 Feb '24

27 Feb '24

Attention is currently required from: dexter, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email ) Change subject: pcu_sock: forward PCU_VERSION only once ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/36018/comment/c2120884_af04d5ab PS1, Line 10: is not active the PCU even sends the version number in regular > In osmo-pcu there is the following mechanism: A BTS becomes active (bts->active == true) when pcu_rx […] I'm still not following @pmaier@sysmocom.de. If the BTS sends the INFO.ind when it becomes active, why are you receiving it all the time? You should receive it once afaiu. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id82fe0504d0cbdf71473c1e7dfe6125a3471bd85 Gerrit-Change-Number: 36018 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Feb 2024 16:45:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcu_sock: forward PCU_VERSION only once
by dexter 27 Feb '24

27 Feb '24

Attention is currently required from: laforge, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email ) Change subject: pcu_sock: forward PCU_VERSION only once ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/36018/comment/0febe25e_e2ac144f PS1, Line 10: is not active the PCU even sends the version number in regular > I'm also confused. […] In osmo-pcu there is the following mechanism: A BTS becomes active (bts->active == true) when pcu_rx_info_ind has run once. This means that osmo-bts has to send a valid info indication once and the BTS will be active. Then the text indications with the version in it cease. On the osmo-bts side we can see in pcu_rx_txt_ind what happens when PCU_VERSION is received. In particular the following is done: regenerate_si3_restoctets(bts); regenerate_si4_restoctets(bts); pcu_tx_si_all(bts); My first idea was to cease the PCU_VERSION txt indications when pcu_rx_info_ind is received the first time, regardless whether the BTS becomes active or not. However, I was afraid to do that since I am not sure if this would break something. If you think this initial idea is safe to do, then I can give it a try (and test it of course) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id82fe0504d0cbdf71473c1e7dfe6125a3471bd85 Gerrit-Change-Number: 36018 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Feb 2024 16:32:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log