September 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-trx[master]: ms: reduce rx burst queue size

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34272?usp=email ) Change subject: ms: reduce rx burst queue size ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifb8bf2894c87e4234e3d3f65d66c1e98c8f63c53 Gerrit-Change-Number: 34272 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Sep 2023 17:52:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: reduce rx burst queue size

by Hoernchen

Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34272?usp=email ) Change subject: ms: reduce rx burst queue size ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifb8bf2894c87e4234e3d3f65d66c1e98c8f63c53 Gerrit-Change-Number: 34272 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 20 Sep 2023 17:50:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sccp: Introduce test TC_process_rx_ludt

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34469?usp=email ) Change subject: sccp: Introduce test TC_process_rx_ludt ...................................................................... sccp: Introduce test TC_process_rx_ludt Related: SYS#6566 Change-Id: I0880ccce872e79f057e17e29e09a566645365e96 --- M library/SCCP_Templates.ttcn M sccp/SCCP_Tests_RAW.ttcn 2 files changed, 82 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/34469/1 diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn index 74f1a20..a87ef5c 100644 --- a/library/SCCP_Templates.ttcn +++ b/library/SCCP_Templates.ttcn @@ -217,6 +217,52 @@ } } +template (value) PDU_SCCP ts_SCCP_LUDT(SCCP_PAR_Address calling, SCCP_PAR_Address called, + template (value) octetstring data, + template (value) BIT4 msg_hdl := '0000'B, + template (value) integer hop_ctr := 16) := { + longudata := { + messageType := ludt, + protClass := {'0000'B, msg_hdl}, + hopCounter := hop_ctr, + pointer1 := 0, /* overwritten */ + pointer2 := 0, /* overwritten */ + pointer3 := 0, /* overwritten */ + pointer4 := 0, /* overwritten */ + calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), + callingPAddress := ConvertASPAddressToEncodedAddress_itu(calling), + longData := { + paramLength := 0, + data := data + }, + optionalPart := omit, + eop := omit + } +} + +template PDU_SCCP tr_SCCP_LUDT(template (present) SCCP_PAR_Address calling, template (present) SCCP_PAR_Address called, + template octetstring data := ?, + template BIT4 msg_hdl := '0000'B, + template integer hop_ctr := ?) := { + longudata := { + messageType := ludt, + protClass := {'0000'B, msg_hdl}, + hopCounter := hop_ctr, + pointer1 := ?, + pointer2 := ?, + pointer3 := ?, + pointer4 := ?, + calledPAddress := tr_Addr(called), + callingPAddress := tr_Addr(calling), + longData := { + paramLength := ?, + data := data + }, + optionalPart := { segmentation:= omit, importance := * } ifpresent, + eop := { paramName:= con_SCCP_eop } ifpresent + } +} + template PDU_SCCP tr_SCCP_IT(template (present) OCT3 source_lref := ?, template (present) OCT3 dest_lref := ?) := { diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 505deb6..1c81d98 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -340,6 +340,31 @@ setverdict(pass); } +private function f_tx_ludt_exp(SCCP_PAR_Address calling, SCCP_PAR_Address called, octetstring data) runs on SCCP_Test_RAW_CT { + var template PDU_SCCP exp_rx; + f_send_sccp(ts_SCCP_LUDT(calling, called, data)); + exp_rx := tr_SCCP_LUDT(called, calling, data); + f_exp_sccp(exp_rx); +} + +/* Test if the IUT SCCP code processes a LUDT [treat it like UDT] and answers back. */ +testcase TC_process_rx_ludt() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var octetstring data := f_rnd_octstring(1000); + + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, mp_sccp_cfg[0].peer_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + + /* Make sure an LUDT is echoed back just like an UDT */ + f_tx_ludt_exp(calling, called, data); + setverdict(pass); +} + function f_scmg_xceive(SCCP_PAR_Address calling, SCCP_PAR_Address called, template (value) PDU_SCMG_message tx, template (omit) PDU_SCMG_message rx_exp, @@ -464,6 +489,7 @@ execute( TC_tiar_timeout() ); execute( TC_it_avoids_tiar() ); execute( TC_process_rx_xudt() ); + execute( TC_process_rx_ludt() ); execute( TC_scmg_sst_ssn1() ); execute( TC_scmg_sst_ssn_valid() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34469?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: I0880ccce872e79f057e17e29e09a566645365e96 Gerrit-Change-Number: 34469 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34468?usp=email ) Change subject: deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom fork rebase ...................................................................... deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom fork rebase The osmocom git fork containing an extra patch has been rebase to current upstream master, which now contains a fix for LUDT(S) messages which will be required in a follow-up patch. Related: OS#6185 Related: SYS#6566 Change-Id: Id8b7ab652b656841a9b73d40d79077a47f45e735 --- M deps/Makefile 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index 0c8688f..bd6ce8a 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -86,7 +86,7 @@ # file changed. titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= f086e78d74defa044d864f17adaad9433fedc961 -titan.ProtocolEmulations.SCCP_commit= 17a894fc6620a0df11d0d98c897fb66168276b16 +titan.ProtocolEmulations.SCCP_commit= f8a44f2cdef44d0c3adf787ab3184c293a9a58be titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8 titan.ProtocolModules.BSSGP_v13.0.0_commit= e97d92a8b66bec399babea52f593771b76cb175a titan.ProtocolModules.BSSMAP_commit= 814c5d786ab633bce384eea99685f0e49a386172 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34468?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: Id8b7ab652b656841a9b73d40d79077a47f45e735 Gerrit-Change-Number: 34468 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom...

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34468?usp=email ) Change subject: deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom fork rebase ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: I'll merge this now to avoid breakage for people using it, since the old reference in the git repo doesn't exist anymore. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34468?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: Id8b7ab652b656841a9b73d40d79077a47f45e735 Gerrit-Change-Number: 34468 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 20 Sep 2023 17:35:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34468?usp=email ) Change subject: deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom fork rebase ...................................................................... deps/Makefile: Update titan.ProtocolEmulations.SCCP ref after osmocom fork rebase The osmocom git fork containing an extra patch has been rebase to current upstream master, which now contains a fix for LUDT(S) messages which will be required in a follow-up patch. Related: OS#6185 Related: SYS#6566 Change-Id: Id8b7ab652b656841a9b73d40d79077a47f45e735 --- M deps/Makefile 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/34468/1 diff --git a/deps/Makefile b/deps/Makefile index 0c8688f..bd6ce8a 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -86,7 +86,7 @@ # file changed. titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= f086e78d74defa044d864f17adaad9433fedc961 -titan.ProtocolEmulations.SCCP_commit= 17a894fc6620a0df11d0d98c897fb66168276b16 +titan.ProtocolEmulations.SCCP_commit= f8a44f2cdef44d0c3adf787ab3184c293a9a58be titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8 titan.ProtocolModules.BSSGP_v13.0.0_commit= e97d92a8b66bec399babea52f593771b76cb175a titan.ProtocolModules.BSSMAP_commit= 814c5d786ab633bce384eea99685f0e49a386172 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34468?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: Id8b7ab652b656841a9b73d40d79077a47f45e735 Gerrit-Change-Number: 34468 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[L] Change in libosmo-sccp[master]: sccp: Introduce initial support for SCCP LUDT + LUDTS messages

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34467?usp=email to look at the new patch set (#2). Change subject: sccp: Introduce initial support for SCCP LUDT + LUDTS messages ...................................................................... sccp: Introduce initial support for SCCP LUDT + LUDTS messages * LUDT/LUDTS is now properly received and passed along to the app. * LUDT/LUDTS is now used if the data to transmit spans more than 255 bytes. Related: SYS#6566 Change-Id: Ic91abfc921f5e4f36045bfa325333112cddd9fa6 --- M include/osmocom/sccp/sccp_types.h M include/osmocom/sigtran/xua_msg.h M src/sccp2sua.c M src/xua_msg.c M tests/xua/sccp_test_data.c M tests/xua/sccp_test_data.h M tests/xua/xua_test.c M tests/xua/xua_test.ok 8 files changed, 380 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/67/34467/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34467?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic91abfc921f5e4f36045bfa325333112cddd9fa6 Gerrit-Change-Number: 34467 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[S] Change in libosmo-sccp[master]: sccp2sua: remove unused msg param from sccp_{addr,data}_to_sua_ptr

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34464?usp=email ) Change subject: sccp2sua: remove unused msg param from sccp_{addr,data}_to_sua_ptr ...................................................................... sccp2sua: remove unused msg param from sccp_{addr,data}_to_sua_ptr Change-Id: If4a8283614639d456d2bdf2b31873e28c68f59bc --- M src/sccp2sua.c 1 file changed, 25 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/64/34464/1 diff --git a/src/sccp2sua.c b/src/sccp2sua.c index 59cb64b..ed224cf 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -338,7 +338,7 @@ } /*! \brief convenience wrapper around sccp_addr_to_sua() for variable mandatory addresses */ -static int sccp_addr_to_sua_ptr(struct xua_msg *xua, uint16_t iei, struct msgb *msg, uint8_t *ptr_addr) +static int sccp_addr_to_sua_ptr(struct xua_msg *xua, uint16_t iei, uint8_t *ptr_addr) { uint8_t *addr = ptr_addr + *ptr_addr + 1; unsigned int addrlen = *(ptr_addr + *ptr_addr); @@ -456,7 +456,7 @@ } /*! \brief convenience wrapper around xua_msg_add_data() for variable mandatory data */ -static int sccp_data_to_sua_ptr(struct xua_msg *xua, uint16_t iei, struct msgb *msg, uint8_t *ptr_addr) +static int sccp_data_to_sua_ptr(struct xua_msg *xua, uint16_t iei, uint8_t *ptr_addr) { uint8_t *addr = ptr_addr + *ptr_addr + 1; unsigned int addrlen = *(ptr_addr + *ptr_addr); @@ -1028,7 +1028,7 @@ /* Variable Part */ if (!sccp_ptr_part_consistent(msg, &req->variable_called)) return NULL; - sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, msg, &req->variable_called); + sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, &req->variable_called); /* Optional Part */ return sccp_to_xua_opt(msg, &req->optional_start, xua); } @@ -1188,7 +1188,7 @@ /* Variable Part */ if (!sccp_ptr_part_consistent(msg, &dt1->variable_start)) return NULL; - sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, msg, &dt1->variable_start); + sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, &dt1->variable_start); return xua; } @@ -1219,13 +1219,13 @@ /* Variable Part */ if (!sccp_ptr_part_consistent(msg, &udt->variable_called)) return NULL; - sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, msg, &udt->variable_called); + sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, &udt->variable_called); if (!sccp_ptr_part_consistent(msg, &udt->variable_calling)) return NULL; - sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, msg, &udt->variable_calling); + sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, &udt->variable_calling); if (!sccp_ptr_part_consistent(msg, &udt->variable_data)) return NULL; - sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, msg, &udt->variable_data); + sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, &udt->variable_data); return xua; } @@ -1263,13 +1263,13 @@ /* Variable Part */ if (!sccp_ptr_part_consistent(msg, &xudt->variable_called)) return NULL; - sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, msg, &xudt->variable_called); + sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, &xudt->variable_called); if (!sccp_ptr_part_consistent(msg, &xudt->variable_calling)) return NULL; - sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, msg, &xudt->variable_calling); + sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, &xudt->variable_calling); if (!sccp_ptr_part_consistent(msg, &xudt->variable_data)) return NULL; - sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, msg, &xudt->variable_data); + sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, &xudt->variable_data); /* Optional Part */ return sccp_to_xua_opt(msg, &xudt->optional_start, xua); @@ -1303,13 +1303,13 @@ /* Variable Part */ if (!sccp_ptr_part_consistent(msg, &udts->variable_called)) return NULL; - sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, msg, &udts->variable_called); + sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, &udts->variable_called); if (!sccp_ptr_part_consistent(msg, &udts->variable_calling)) return NULL; - sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, msg, &udts->variable_calling); + sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, &udts->variable_calling); if (!sccp_ptr_part_consistent(msg, &udts->variable_data)) return NULL; - sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, msg, &udts->variable_data); + sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, &udts->variable_data); return xua; } @@ -1348,13 +1348,13 @@ /* Variable Part */ if (!sccp_ptr_part_consistent(msg, &xudts->variable_called)) return NULL; - sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, msg, &xudts->variable_called); + sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, &xudts->variable_called); if (!sccp_ptr_part_consistent(msg, &xudts->variable_calling)) return NULL; - sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, msg, &xudts->variable_calling); + sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, &xudts->variable_calling); if (!sccp_ptr_part_consistent(msg, &xudts->variable_data)) return NULL; - sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, msg, &xudts->variable_data); + sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, &xudts->variable_data); /* Optional Part */ return sccp_to_xua_opt(msg, &xudts->optional_start, xua); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34464?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: If4a8283614639d456d2bdf2b31873e28c68f59bc Gerrit-Change-Number: 34464 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in libosmo-sccp[master]: sccp2sua: Produce smaller output if msg contains no optional section

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34466?usp=email ) Change subject: sccp2sua: Produce smaller output if msg contains no optional section ...................................................................... sccp2sua: Produce smaller output if msg contains no optional section Change-Id: I5c8fcb30b76ac7bafd4a99bc3004049644e7e3f9 --- M src/sccp2sua.c M tests/xua/xua_test.c M tests/xua/xua_test.ok 3 files changed, 28 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/66/34466/1 diff --git a/src/sccp2sua.c b/src/sccp2sua.c index 9bad528..2f09a8f 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -987,18 +987,26 @@ enum sccp_message_types type, const struct xua_msg *xua) { const struct xua_msg_part *part; - - /* store relative pointer to start of optional part */ - *ptr_opt = msg->tail - ptr_opt; + bool any_added = false; + uint8_t *old_tail = msg->tail; llist_for_each_entry(part, &xua->headers, entry) { /* make sure we don't add a SCCP option for information * that is already present in mandatory fixed or * mandatory variable parts of the header */ - if (!sccp_is_mandatory(type, part) && sccp_option_permitted(type, part)) + if (!sccp_is_mandatory(type, part) && sccp_option_permitted(type, part)) { sccp_msg_add_sua_opt(type, msg, part); + any_added = true; + } } - msgb_put_u8(msg, SCCP_PNC_END_OF_OPTIONAL); + if (any_added) { + msgb_put_u8(msg, SCCP_PNC_END_OF_OPTIONAL); + /* store relative pointer to start of optional part */ + *ptr_opt = old_tail - ptr_opt; + } else { + /* If nothing was added, simply update the pointer to 0 to signal the optional part is ommited. */ + ptr_opt[0] = 0; + } return 0; } diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c index 6b4eef5..628d860 100644 --- a/tests/xua/xua_test.c +++ b/tests/xua/xua_test.c @@ -439,6 +439,10 @@ }, }, }, { + /* This case expectedly prints "Input != re-encoded output!" because input has + * (struct sccp_connection_confirm).optional_start=1 pointing to SCCP_PNC_END_OF_OPTIONAL, + * while our (re-)encoder uses optional_start=0 which means entire msg is 1 byte + * lower (hence better). Both are valid. */ .name = "BSSMAP-CC", .sccp = PANDSIZ(bssmap_cc), .sua = { diff --git a/tests/xua/xua_test.ok b/tests/xua/xua_test.ok index 6738cc0..cb6aab1 100644 --- a/tests/xua/xua_test.ok +++ b/tests/xua/xua_test.ok @@ -55,7 +55,8 @@ Transcoding message SCCP -> XUA Decoded SUA: HDR=(CO:COAK,V=0,LEN=0), PART(T=Protocol Class,L=4,D=00000002), PART(T=Destination Reference,L=4,D=00010203), PART(T=Source Reference,L=4,D=00000003) Re-Encoding decoded SUA to SCCP -SCCP Output: [L2]> 02 01 02 03 00 00 03 02 01 00 +SCCP Output: [L2]> 02 01 02 03 00 00 03 02 00 +Input != re-encoded output! => BSSMAP-DTAP SCCP Input: [L2]> 06 00 00 03 00 01 0f 01 00 0c 03 05 5c 08 11 81 33 66 02 13 45 f4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34466?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I5c8fcb30b76ac7bafd4a99bc3004049644e7e3f9 Gerrit-Change-Number: 34466 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[M] Change in libosmo-sccp[master]: sscp2sua: Constify several more parameters

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34465?usp=email ) Change subject: sscp2sua: Constify several more parameters ...................................................................... sscp2sua: Constify several more parameters Change-Id: I0d0997a137f65bccdf8eeda70d95f3f908d2d91a --- M src/sccp2sua.c 1 file changed, 62 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/65/34465/1 diff --git a/src/sccp2sua.c b/src/sccp2sua.c index ed224cf..9bad528 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -338,9 +338,9 @@ } /*! \brief convenience wrapper around sccp_addr_to_sua() for variable mandatory addresses */ -static int sccp_addr_to_sua_ptr(struct xua_msg *xua, uint16_t iei, uint8_t *ptr_addr) +static int sccp_addr_to_sua_ptr(struct xua_msg *xua, uint16_t iei, const uint8_t *ptr_addr) { - uint8_t *addr = ptr_addr + *ptr_addr + 1; + const uint8_t *addr = ptr_addr + *ptr_addr + 1; unsigned int addrlen = *(ptr_addr + *ptr_addr); return sccp_addr_to_sua(xua, iei, addr, addrlen); @@ -350,7 +350,7 @@ * \param msg user-provided message buffer to which address shall be * appended * \param[in] part SUA wire format binary address * \returns 0 in case of success; negative on error */ -static int sua_addr_to_sccp(struct msgb *msg, struct xua_msg_part *part) +static int sua_addr_to_sccp(struct msgb *msg, const struct xua_msg_part *part) { struct osmo_sccp_addr osa; int rc; @@ -370,7 +370,7 @@ * \param[out] var_ptr pointer to relative pointer in SCCP header * \param[in] xua xUA message from which to use address * \param[in] iei xUA information element identifier of address */ -static int sccp_add_var_addr(struct msgb *msg, uint8_t *var_ptr, struct xua_msg *xua, uint16_t iei) +static int sccp_add_var_addr(struct msgb *msg, uint8_t *var_ptr, const struct xua_msg *xua, uint16_t iei) { struct xua_msg_part *part = xua_msg_find_tag(xua, iei); uint8_t *lenbyte; @@ -401,7 +401,7 @@ * \param[out] var_ptr pointer to relative pointer in SCCP header * \param[in] xua xUA message from which to use source data * \param[in] iei xUA information element identifier of source data */ -static int sccp_add_variable_part(struct msgb *msg, uint8_t *var_ptr, struct xua_msg *xua, uint16_t iei) +static int sccp_add_variable_part(struct msgb *msg, uint8_t *var_ptr, const struct xua_msg *xua, uint16_t iei) { struct xua_msg_part *part = xua_msg_find_tag(xua, iei); uint8_t *lenbyte; @@ -456,9 +456,9 @@ } /*! \brief convenience wrapper around xua_msg_add_data() for variable mandatory data */ -static int sccp_data_to_sua_ptr(struct xua_msg *xua, uint16_t iei, uint8_t *ptr_addr) +static int sccp_data_to_sua_ptr(struct xua_msg *xua, uint16_t iei, const uint8_t *ptr_addr) { - uint8_t *addr = ptr_addr + *ptr_addr + 1; + const uint8_t *addr = ptr_addr + *ptr_addr + 1; unsigned int addrlen = *(ptr_addr + *ptr_addr); return xua_msg_add_data(xua, iei, addrlen, addr); @@ -471,7 +471,7 @@ * \param[in] opt pointer to wire-format encoded SCCP option data * \returns 0 in case of success; negative on error */ static int xua_msg_add_sccp_opt(struct xua_msg *xua, uint8_t sccp_opt_type, - uint16_t opt_len, uint8_t *opt) + uint16_t opt_len, const uint8_t *opt) { switch (sccp_opt_type) { case SCCP_PNC_DESTINATION_LOCAL_REFERENCE: @@ -587,7 +587,7 @@ * \param msg caller-provided message buffer to which option is to be appended * \param[in] opt xUA option/IE (messge part) to be converted+added * \returns 0 in case of success; negative on error */ -static int sccp_msg_add_sua_opt(enum sccp_message_types type, struct msgb *msg, struct xua_msg_part *opt) +static int sccp_msg_add_sua_opt(enum sccp_message_types type, struct msgb *msg, const struct xua_msg_part *opt) { uint32_t tmp32; uint8_t pnc, *lenptr; @@ -699,9 +699,9 @@ * \param[in] ptr_opt address of relative pointer to optional part * \param xua caller-provided xUA message to which options are added * \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static struct xua_msg *sccp_to_xua_opt(struct msgb *msg, uint8_t *ptr_opt, struct xua_msg *xua) +static struct xua_msg *sccp_to_xua_opt(const struct msgb *msg, const uint8_t *ptr_opt, struct xua_msg *xua) { - uint8_t *opt_start, *oneopt; + const uint8_t *opt_start, *oneopt; /* some bounds checking */ if (ptr_opt < msg->data || ptr_opt > msg->tail) @@ -984,9 +984,9 @@ } static int xua_ies_to_sccp_opts(struct msgb *msg, uint8_t *ptr_opt, - enum sccp_message_types type, struct xua_msg *xua) + enum sccp_message_types type, const struct xua_msg *xua) { - struct xua_msg_part *part; + const struct xua_msg_part *part; /* store relative pointer to start of optional part */ *ptr_opt = msg->tail - ptr_opt; @@ -1004,7 +1004,7 @@ } /* store a 'local reference' as big-endian 24bit value at local_ref */ -static int store_local_ref(struct sccp_source_reference *local_ref, struct xua_msg *xua, uint16_t iei) +static int store_local_ref(struct sccp_source_reference *local_ref, const struct xua_msg *xua, uint16_t iei) { uint32_t tmp32 = xua_msg_get_u32(xua, iei); if (tmp32 > 0x00fffffe) { @@ -1018,7 +1018,7 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static struct xua_msg *sccp_to_xua_cr(struct msgb *msg, struct xua_msg *xua) +static struct xua_msg *sccp_to_xua_cr(const struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_request *req = (struct sccp_connection_request *)msg->l2h; @@ -1034,7 +1034,7 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static int sua_to_sccp_cr(struct msgb *msg, struct xua_msg *xua) +static int sua_to_sccp_cr(struct msgb *msg, const struct xua_msg *xua) { struct sccp_connection_request *req; int rc; @@ -1054,7 +1054,7 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static struct xua_msg *sccp_to_xua_cc(struct msgb *msg, struct xua_msg *xua) +static struct xua_msg *sccp_to_xua_cc(const struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_confirm *cnf = (struct sccp_connection_confirm *)msg->l2h; @@ -1067,7 +1067,7 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static int sua_to_sccp_cc(struct msgb *msg, struct xua_msg *xua) +static int sua_to_sccp_cc(struct msgb *msg, const struct xua_msg *xua) { struct sccp_connection_confirm *cnf; int rc; @@ -1087,9 +1087,9 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static struct xua_msg *sccp_to_xua_cref(struct msgb *msg, struct xua_msg *xua) +static struct xua_msg *sccp_to_xua_cref(const struct msgb *msg, struct xua_msg *xua) { - struct sccp_connection_refused *ref = (struct sccp_connection_refused *)msg->l2h; + const struct sccp_connection_refused *ref = (const struct sccp_connection_refused *)msg->l2h; /* Fixed Part */ xua_msg_add_u32(xua, SUA_IEI_DEST_REF, load_24be(&ref->destination_local_reference)); @@ -1099,7 +1099,7 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static int sua_to_sccp_cref(struct msgb *msg, struct xua_msg *xua) +static int sua_to_sccp_cref(struct msgb *msg, const struct xua_msg *xua) { struct sccp_connection_refused *ref; int rc; @@ -1116,9 +1116,9 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static struct xua_msg *sccp_to_xua_rlsd(struct msgb *msg, struct xua_msg *xua) +static struct xua_msg *sccp_to_xua_rlsd(const struct msgb *msg, struct xua_msg *xua) { - struct sccp_connection_released *rlsd = (struct sccp_connection_released *)msg->l2h; + const struct sccp_connection_released *rlsd = (const struct sccp_connection_released *)msg->l2h; /* Fixed Part */ xua_msg_add_u32(xua, SUA_IEI_DEST_REF, load_24be(&rlsd->destination_local_reference)); @@ -1128,7 +1128,7 @@ return sccp_to_xua_opt(msg, &rlsd->optional_start, xua); } -static int sua_to_sccp_rlsd(struct msgb *msg, struct xua_msg *xua) +static int sua_to_sccp_rlsd(struct msgb *msg, const struct xua_msg *xua) { struct sccp_connection_released *rlsd; int rc; @@ -1149,10 +1149,10 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static struct xua_msg *sccp_to_xua_rlc(struct msgb *msg, struct xua_msg *xua) +static struct xua_msg *sccp_to_xua_rlc(const struct msgb *msg, struct xua_msg *xua) { - struct sccp_connection_release_complete *rlc; - rlc = (struct sccp_connection_release_complete *) msg->l2h; + const struct sccp_connection_release_complete *rlc; + rlc = (const struct sccp_connection_release_complete *) msg->l2h; /* Fixed Part */ xua_msg_add_u32(xua, SUA_IEI_DEST_REF, load_24be(&rlc->destination_local_reference)); @@ -1160,7 +1160,7 @@ return xua; } -static int sua_to_sccp_rlc(struct msgb *msg, struct xua_msg *xua) +static int sua_to_sccp_rlc(struct msgb *msg, const struct xua_msg *xua) { struct sccp_connection_release_complete *rlc; int rc; @@ -1178,9 +1178,9 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static struct xua_msg *sccp_to_xua_dt1(struct msgb *msg, struct xua_msg *xua) +static struct xua_msg *sccp_to_xua_dt1(const struct msgb *msg, struct xua_msg *xua) { - struct sccp_data_form1 *dt1 = (struct sccp_data_form1 *) msg->l2h; + const struct sccp_data_form1 *dt1 = (const struct sccp_data_form1 *) msg->l2h; /* Fixed Part */ xua_msg_add_u32(xua, SUA_IEI_DEST_REF, load_24be(&dt1->destination_local_reference)); @@ -1192,7 +1192,7 @@ return xua; } -static int sua_to_sccp_dt1(struct msgb *msg, struct xua_msg *xua) +static int sua_to_sccp_dt1(struct msgb *msg, const struct xua_msg *xua) { struct sccp_data_form1 *dt1; int rc; @@ -1210,9 +1210,9 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static struct xua_msg *sccp_to_xua_udt(struct msgb *msg, struct xua_msg *xua) +static struct xua_msg *sccp_to_xua_udt(const struct msgb *msg, struct xua_msg *xua) { - struct sccp_data_unitdata *udt = (struct sccp_data_unitdata *)msg->l2h; + const struct sccp_data_unitdata *udt = (const struct sccp_data_unitdata *)msg->l2h; /* Fixed Part */ xua_msg_add_u32(xua, SUA_IEI_PROTO_CLASS, udt->proto_class); @@ -1230,9 +1230,9 @@ } -static int sua_to_sccp_xudt(struct msgb *msg, struct xua_msg *xua); +static int sua_to_sccp_xudt(struct msgb *msg, const struct xua_msg *xua); -static int sua_to_sccp_udt(struct msgb *msg, struct xua_msg *xua) +static int sua_to_sccp_udt(struct msgb *msg, const struct xua_msg *xua) { struct sccp_data_unitdata *udt; @@ -1253,9 +1253,9 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static struct xua_msg *sccp_to_xua_xudt(struct msgb *msg, struct xua_msg *xua) +static struct xua_msg *sccp_to_xua_xudt(const struct msgb *msg, struct xua_msg *xua) { - struct sccp_data_ext_unitdata *xudt = (struct sccp_data_ext_unitdata *)msg->l2h; + const struct sccp_data_ext_unitdata *xudt = (const struct sccp_data_ext_unitdata *)msg->l2h; /* Fixed Part */ xua_msg_add_u32(xua, SUA_IEI_PROTO_CLASS, xudt->proto_class); @@ -1275,7 +1275,7 @@ } -static int sua_to_sccp_xudt(struct msgb *msg, struct xua_msg *xua) +static int sua_to_sccp_xudt(struct msgb *msg, const struct xua_msg *xua) { struct sccp_data_ext_unitdata *xudt; xudt = (struct sccp_data_ext_unitdata *) msgb_put(msg, sizeof(*xudt)); @@ -1293,10 +1293,10 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static struct xua_msg *sccp_to_xua_udts(struct msgb *msg, struct xua_msg *xua) +static struct xua_msg *sccp_to_xua_udts(const struct msgb *msg, struct xua_msg *xua) { - struct sccp_data_unitdata_service *udts; - udts =(struct sccp_data_unitdata_service *)msg->l2h; + const struct sccp_data_unitdata_service *udts; + udts = (const struct sccp_data_unitdata_service *)msg->l2h; /* Fixed Part */ xua_msg_add_u32(xua, SUA_IEI_CAUSE, SUA_CAUSE_T_RETURN | udts->return_cause); @@ -1314,9 +1314,9 @@ } -static int sua_to_sccp_xudts(struct msgb *msg, struct xua_msg *xua); +static int sua_to_sccp_xudts(struct msgb *msg, const struct xua_msg *xua); -static int sua_to_sccp_udts(struct msgb *msg, struct xua_msg *xua) +static int sua_to_sccp_udts(struct msgb *msg, const struct xua_msg *xua) { struct sccp_data_unitdata_service *udts; @@ -1337,10 +1337,10 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static struct xua_msg *sccp_to_xua_xudts(struct msgb *msg, struct xua_msg *xua) +static struct xua_msg *sccp_to_xua_xudts(const struct msgb *msg, struct xua_msg *xua) { - struct sccp_data_ext_unitdata_service *xudts; - xudts = (struct sccp_data_ext_unitdata_service *)msg->l2h; + const struct sccp_data_ext_unitdata_service *xudts; + xudts = (const struct sccp_data_ext_unitdata_service *)msg->l2h; /* Fixed Part */ xua_msg_add_u32(xua, SUA_IEI_CAUSE, SUA_CAUSE_T_RETURN | xudts->return_cause); @@ -1359,7 +1359,7 @@ return sccp_to_xua_opt(msg, &xudts->optional_start, xua); } -static int sua_to_sccp_xudts(struct msgb *msg, struct xua_msg *xua) +static int sua_to_sccp_xudts(struct msgb *msg, const struct xua_msg *xua) { struct sccp_data_ext_unitdata_service *xudts; xudts = (struct sccp_data_ext_unitdata_service *) msgb_put(msg, sizeof(*xudts)); @@ -1377,9 +1377,9 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static struct xua_msg *sccp_to_xua_it(struct msgb *msg, struct xua_msg *xua) +static struct xua_msg *sccp_to_xua_it(const struct msgb *msg, struct xua_msg *xua) { - struct sccp_data_it *it = (struct sccp_data_it *)msg->l2h; + const struct sccp_data_it *it = (const struct sccp_data_it *)msg->l2h; /* Fixed Part */ xua_msg_add_u32(xua, SUA_IEI_PROTO_CLASS, it->proto_class); @@ -1392,7 +1392,7 @@ return xua; } -static int sua_to_sccp_it(struct msgb *msg, struct xua_msg *xua) +static int sua_to_sccp_it(struct msgb *msg, const struct xua_msg *xua) { struct sccp_data_it *it; int rc; @@ -1416,9 +1416,9 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static struct xua_msg *sccp_to_xua_err(struct msgb *msg, struct xua_msg *xua) +static struct xua_msg *sccp_to_xua_err(const struct msgb *msg, struct xua_msg *xua) { - struct sccp_proto_err *err = (struct sccp_proto_err *)msg->l2h; + const struct sccp_proto_err *err = (const struct sccp_proto_err *)msg->l2h; /* Fixed Part */ xua_msg_add_u32(xua, SUA_IEI_DEST_REF, load_24be(&err->destination_local_reference)); @@ -1426,7 +1426,7 @@ return xua; } -static int sua_to_sccp_err(struct msgb *msg, struct xua_msg *xua) +static int sua_to_sccp_err(struct msgb *msg, const struct xua_msg *xua) { struct sccp_proto_err *err; int rc; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34465?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0d0997a137f65bccdf8eeda70d95f3f908d2d91a Gerrit-Change-Number: 34465 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023