- gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: ts_31_103: Add TLV + construct for EF_NAFKCA
by laforge 22 Dec '23

22 Dec '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35425?usp=email ) Change subject: ts_31_103: Add TLV + construct for EF_NAFKCA ...................................................................... ts_31_103: Add TLV + construct for EF_NAFKCA Change-Id: I124064994eb695790e9a3aff40be8139b3a2f2cf --- M pySim/ts_31_103.py 1 file changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/25/35425/1 diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index 914a4dc..4bf2b44 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -178,10 +178,17 @@ # TS 31.103 Section 4.2.11 class EF_NAFKCA(LinFixedEF): - # TODO: 80296273662e696d732e6d6e633030302e6d63633733382e7075622e336770706e6574776f726b2e6f7267ffffffffffffff - # TODO: 8030656e65746e61667830312e696d732e6d6e633030302e6d63633733382e7075622e336770706e6574776f726b2e6f7267 + _test_de_encode = [ + ( '80296273662e696d732e6d6e633030302e6d63633733382e7075622e336770706e6574776f726b2e6f7267', + { 'naf_key_centre_address': 'bsf.ims.mnc000.mcc738.pub.3gppnetwork.org' } ), + ( '8030656e65746e61667830312e696d732e6d6e633030302e6d63633733382e7075622e336770706e6574776f726b2e6f7267', + { 'naf_key_centre_address': 'enetnafx01.ims.mnc000.mcc738.pub.3gppnetwork.org' }), + ] + class NafKeyCentreAddress(BER_TLV_IE, tag=0x80): + _construct = Utf8Adapter(GreedyBytes) def __init__(self, fid='6fdd', sfid=None, name='EF.NAFKCA', desc='NAF Key Centre Address', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_NAFKCA.NafKeyCentreAddress # TS 31.103 Section 4.2.16 class EF_UICCIARI(LinFixedEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35425?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I124064994eb695790e9a3aff40be8139b3a2f2cf Gerrit-Change-Number: 35425 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: ts_31_103: Add construct for EF.GBABP and EF.GBANL
by laforge 22 Dec '23

22 Dec '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35424?usp=email ) Change subject: ts_31_103: Add construct for EF.GBABP and EF.GBANL ...................................................................... ts_31_103: Add construct for EF.GBABP and EF.GBANL Change-Id: Ife06f54c2443f3e048bd36f706f309843703403a --- M pySim/ts_31_103.py 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/35424/1 diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index df91ea1..914a4dc 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -156,11 +156,25 @@ class EF_GBABP(TransparentEF): def __init__(self, fid='6fd5', sfid=None, name='EF.GBABP', desc='GBA Bootstrapping', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._construct = Struct('length_of_rand'/Int8ub, + 'rand'/HexAdapter(Bytes(this.length_of_rand)), + 'length_of_b_tid'/Int8ub, + 'b_tid'/HexAdapter(Bytes(this.length_of_b_tid)), + 'length_of_key_lifetime'/Int8ub, + 'key_lifetime'/HexAdapter(Bytes(this.length_of_key_lifetime))) # TS 31.103 Section 4.2.10 class EF_GBANL(LinFixedEF): + class NAF_ID(BER_TLV_IE, tag=0x80): + _construct = Struct('fqdn'/Utf8Adapter(Bytes(this._.total_len-5)), + 'ua_spi'/HexAdapter(Bytes(5))) + class B_TID(BER_TLV_IE, tag=0x81): + _construct = Utf8Adapter(GreedyBytes) + class GbaNlCollection(TLV_IE_Collection, nested=[NAF_ID, B_TID]): + pass def __init__(self, fid='6fd7', sfid=None, name='EF.GBANL', desc='GBA NAF List', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_GBANL.GbaNlCollection # TS 31.103 Section 4.2.11 class EF_NAFKCA(LinFixedEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35424?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ife06f54c2443f3e048bd36f706f309843703403a Gerrit-Change-Number: 35424 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: ts_31_102: Start to use construct for EF.SUCI_Calc_Info
by laforge 22 Dec '23

22 Dec '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35427?usp=email ) Change subject: ts_31_102: Start to use construct for EF.SUCI_Calc_Info ...................................................................... ts_31_102: Start to use construct for EF.SUCI_Calc_Info We cannot fully switch to construct for all of it easily due to the priority value and the ordering/sorting by priority implemented in the hand-coded version. But we can at least migrate the encode/decode of the hnet_pubkey_list via construct. Change-Id: I4ad5ea57bab37c2dc218e7752d538aa4cdc36ee3 --- M pySim/ts_31_102.py M tests/test_utils.py 2 files changed, 44 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/27/35427/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 5429cd2..b4678e2 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -286,17 +286,14 @@ _construct = GreedyRange( Struct('identifier'/Enum(Byte, null=0, A=1, B=2), 'key_index'/Int8ub)) - class HnetPubkeyIdentifier(BER_TLV_IE, tag=0x80): # 3GPP TS 24.501 / 3GPP TS 23.003 _construct = Int8ub - class HnetPubkey(BER_TLV_IE, tag=0x81): - # FIXME: RFC 5480 + # contents according to RFC 7748 / RFC 5480 _construct = HexAdapter(GreedyBytes) - class HnetPubkeyList(BER_TLV_IE, tag=0xa1, nested=[HnetPubkeyIdentifier, HnetPubkey]): pass @@ -319,30 +316,35 @@ return out_bytes - def _encode_hnet_pubkey_list(self, hnet_pubkey_list): - out_bytes = [0xa1] # pubkey list tag - out_bytes.append(0x00) # length filled later - length = 0 + @staticmethod + def _compact_pubkey_list(l: List[dict]) -> List[dict]: + """conversion method to generate list of {hnet_pubkey_identifier, hnet_pubkey} dicts + from flat [{hnet_pubkey_identifier: }, {net_pubkey: }, ...] list""" + out = [] + while len(l): + a = l.pop(0) + b = l.pop(0) + z = {**a, **b} + out.append(z) + return out - for key in hnet_pubkey_list: - out_bytes.append(0x80) # identifier tag - out_bytes.append(0x01) # TODO size, fixed to 1 byte - out_bytes.append(key["hnet_pubkey_identifier"]) - out_bytes.append(0x81) # key tag - out_bytes.append(len(key["hnet_pubkey"])//2) - length += 5+len(key["hnet_pubkey"])//2 - - pubkey_bytes = h2b(key["hnet_pubkey"]) - out_bytes += pubkey_bytes - - # fill length - out_bytes[1] = length - return out_bytes + @staticmethod + def _expand_pubkey_list(l: List[dict]) -> List[dict]: + """conversion method to generate flat [{hnet_pubkey_identifier: }, {net_pubkey: }, ...] list + from compacted list of {hnet_pubkey_identifier, hnet_pubkey} dicts""" + out = [] + for d in l: + for k, v in d.items(): + out.append({k: v}) + return out def _encode_hex(self, in_json): out_bytes = self._encode_prot_scheme_id_list( in_json['prot_scheme_id_list']) - out_bytes += self._encode_hnet_pubkey_list(in_json['hnet_pubkey_list']) + d = self._expand_pubkey_list(in_json['hnet_pubkey_list']) + hpkl = EF_SUCI_Calc_Info.HnetPubkeyList() + hpkl.from_dict(d) + out_bytes += hpkl.to_tlv() return "".join(["%02X" % i for i in out_bytes]) def _decode_prot_scheme_id_list(self, in_bytes): @@ -359,42 +361,6 @@ prot_scheme_id_list.append(prot_scheme) return prot_scheme_id_list - def _decode_hnet_pubkey_list(self, in_bytes): - hnet_pubkey_list = [] - pos = 0 - if in_bytes[pos] != 0xa1: - print("missing Home Network Public Key List data object") - return {} - pos += 1 - hnet_pubkey_list_len = in_bytes[pos] - pos += 1 - - while pos < hnet_pubkey_list_len: - if in_bytes[pos] != 0x80: - print("missing Home Network Public Key Identifier tag") - return {} - pos += 1 - # TODO might be more than 1 byte? - hnet_pubkey_id_len = in_bytes[pos] - pos += 1 - hnet_pubkey_id = in_bytes[pos:pos+hnet_pubkey_id_len][0] - pos += hnet_pubkey_id_len - if in_bytes[pos] != 0x81: - print("missing Home Network Public Key tag") - return {} - pos += 1 - hnet_pubkey_len = in_bytes[pos] - pos += 1 - hnet_pubkey = in_bytes[pos:pos+hnet_pubkey_len] - pos += hnet_pubkey_len - - hnet_pubkey_list.append({ - 'hnet_pubkey_identifier': hnet_pubkey_id, - 'hnet_pubkey': b2h(hnet_pubkey) - }) - - return hnet_pubkey_list - def _decode_bin(self, in_bin): return self._decode_hex(b2h(in_bin)) @@ -415,7 +381,9 @@ pos += prot_scheme_id_list_len # remaining data holds Home Network Public Key Data Object - hnet_pubkey_list = self._decode_hnet_pubkey_list(in_bytes[pos:]) + hpkl = EF_SUCI_Calc_Info.HnetPubkeyList() + hpkl.from_tlv(in_bytes[pos:]) + hnet_pubkey_list = self._compact_pubkey_list(hpkl.to_dict()['hnet_pubkey_list']) return { 'prot_scheme_id_list': prot_scheme_id_list, diff --git a/tests/test_utils.py b/tests/test_utils.py index a30b1ff..99e6df4 100755 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -136,12 +136,12 @@ def testDecodeSuciCalcInfo(self): suci_calc_info = EF_SUCI_Calc_Info() - decoded = suci_calc_info._decode_hex(self.testfile_suci_calc_info) + decoded = suci_calc_info.decode_hex(self.testfile_suci_calc_info) self.assertDictEqual(self.decoded_testfile_suci, decoded) def testEncodeSuciCalcInfo(self): suci_calc_info = EF_SUCI_Calc_Info() - encoded = suci_calc_info._encode_hex(self.decoded_testfile_suci) + encoded = suci_calc_info.encode_hex(self.decoded_testfile_suci) self.assertEqual(encoded.lower(), self.testfile_suci_calc_info.lower()) def testEnc_msisdn(self): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35427?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4ad5ea57bab37c2dc218e7752d538aa4cdc36ee3 Gerrit-Change-Number: 35427 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[L] Change in osmo-mgw[master]: client: collapse codecs[] and ptmap[]; allow codec variants
by neels 22 Dec '23

22 Dec '23

Attention is currently required from: fixeria, laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email ) Change subject: client: collapse codecs[] and ptmap[]; allow codec variants ...................................................................... Patch Set 11: (3 comments) This change is ready for review. File include/osmocom/mgcp_client/mgcp_client.h: https://gerrit.osmocom.org/c/osmo-mgw/+/34899/comment/dda640dc_a61a6d04 PS10, Line 82: int ptmap_cmp(const struct ptmap *a, const struct ptmap *b); > yes, it is const ... […] Done File include/osmocom/mgcp_client/mgcp_client_fsm.h: https://gerrit.osmocom.org/c/osmo-mgw/+/34899/comment/cc913811_dab6ce00 PS10, Line 33: enum mgcp_codecs codecs[MGCP_MAX_CODECS]; > IIRC you can mark fields with the OSMO_DEPRECATED flag, this way it shows up in gcc when used by any […] Done File src/libosmo-mgcp-client/mgcp_client_fsm.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34899/comment/8731a67a_b2b77bd4 PS10, Line 700: struct osmo_fsm_inst *mgcp_conn_create(struct mgcp_client *mgcp, struct osmo_fsm_inst *parent_fi, > I would remove it from the .h, make it a static function. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed Gerrit-Change-Number: 34899 Gerrit-PatchSet: 11 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Dec 2023 02:17:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[L] Change in osmo-mgw[master]: mgcp_client_test: add test_parse_response()
by neels 22 Dec '23

22 Dec '23

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35422?usp=email ) Change subject: mgcp_client_test: add test_parse_response() ...................................................................... Patch Set 1: (3 comments) File tests/mgcp_client/mgcp_client_test.c: https://gerrit.osmocom.org/c/osmo-mgw/+/35422/comment/30aef3e9_f7c54974 PS1, Line 739: "m=audio 23 RTP/AVP 3\r\n" /* <-- 112 is missing here. Will it still appear? */ (X) (marker from https://gerrit.osmocom.org/c/osmo-mgw/+/34899/5..11/src/libosmo-mgcp-client… ) https://gerrit.osmocom.org/c/osmo-mgw/+/35422/comment/6279cdb8_2cc7c4e2 PS1, Line 748: { .codec = CODEC_AMR_8000_1, .pt = 112 }, /* <-- yes, it was added to the end. */ (X) (marker from https://gerrit.osmocom.org/c/osmo-mgw/+/34899/5..11/src/libosmo-mgcp-client… ) File tests/mgcp_client/mgcp_client_test.err: https://gerrit.osmocom.org/c/osmo-mgw/+/35422/comment/437e6679_f360505b PS1, Line 159: DLMGCP error in MGCP message: 'a=rtpmap:112' has no matching entry in 'm=audio ... 112' (X) (marker from https://gerrit.osmocom.org/c/osmo-mgw/+/34899/5..11/src/libosmo-mgcp-client… ) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35422?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I842ce65a9a70f313570857b7df53727cc572b9e6 Gerrit-Change-Number: 35422 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 22 Dec 2023 02:15:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-mgw[master]: client SDP: more verbose error logging
by neels 22 Dec '23

22 Dec '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35421?usp=email ) Change subject: client SDP: more verbose error logging ...................................................................... client SDP: more verbose error logging So far it was pure guess work to find out why a message fails. Change-Id: Ibc6343db82281789004c140ba98d99e5f6f73d83 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 27 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/35421/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 8df65cd..489ce69 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -329,20 +329,31 @@ errno = 0; pt = strtoul(pt_str, &pt_end, 0); if ((errno == ERANGE && pt == ULONG_MAX) || (errno && !pt) || - pt_str == pt_end) + pt_str == pt_end) { + LOGP(DLMGCP, LOGL_ERROR, "SDP: cannot parse payload type number from '%s'\n", pt_str); goto response_parse_failure_pt; + } - if (pt >> 7) /* PT is 7 bit field, higher values not allowed */ + /* PT is 7 bit field, higher values not allowed */ + if (pt >> 7) { + LOGP(DLMGCP, LOGL_ERROR, "SDP: payload type number out of range: %lu > 127\n", pt); goto response_parse_failure_pt; + } /* Do not allow duplicate payload types */ - for (i = 0; i < ptmap_len; i++) - if (r->ptmap[i].pt == pt) + for (i = 0; i < ptmap_len; i++) { + if (r->ptmap[i].pt == pt) { + LOGP(DLMGCP, LOGL_ERROR, "SDP: payload type number %lu listed twice\n", pt); goto response_parse_failure_pt; + } + } /* Do not allow excessive payload types */ - if (ptmap_len >= ARRAY_SIZE(r->ptmap)) + if (ptmap_len >= ARRAY_SIZE(r->ptmap)) { + LOGP(DLMGCP, LOGL_ERROR, + "SDP: can parse only up to %zu payload type numbers\n", ARRAY_SIZE(r->ptmap)); goto response_parse_failure_pt; + } /* Some payload type numbers imply a specific codec. For those, using the PT number as enum mgcp_codecs * yields the correct result. If no more specific information on the codec follows in "a=rtpmap:N" -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35421?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibc6343db82281789004c140ba98d99e5f6f73d83 Gerrit-Change-Number: 35421 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-mgw[master]: client: allow MGCP_MAX_CODECS entries
by neels 22 Dec '23

22 Dec '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35420?usp=email ) Change subject: client: allow MGCP_MAX_CODECS entries ...................................................................... client: allow MGCP_MAX_CODECS entries So far we allow only MGCP_MAX_CODECS-1 entries, because the parsing exit condition hits only after the array size check. Instead, check the array size a bit later, just before actually adding a valid entry. This is verified to work as expected in upcoming patch I842ce65a9a70f313570857b7df53727cc572b9e6 that adds a new mgcp_client_test.c section for this. Change-Id: I9a28da85e437f118026ea71a5a708e5758fff623 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 21 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/20/35420/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 60c54a6..8df65cd 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -323,10 +323,6 @@ pt_str = strtok(line, " "); while (1) { - /* Do not allow excessive payload types */ - if (ptmap_len >= ARRAY_SIZE(r->ptmap)) - goto response_parse_failure_pt; - pt_str = strtok(NULL, " "); if (!pt_str) break; @@ -344,6 +340,10 @@ if (r->ptmap[i].pt == pt) goto response_parse_failure_pt; + /* Do not allow excessive payload types */ + if (ptmap_len >= ARRAY_SIZE(r->ptmap)) + goto response_parse_failure_pt; + /* Some payload type numbers imply a specific codec. For those, using the PT number as enum mgcp_codecs * yields the correct result. If no more specific information on the codec follows in "a=rtpmap:N" * lines, then this default number takes over. This only applies for PT below the dynamic range (<96). */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35420?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I9a28da85e437f118026ea71a5a708e5758fff623 Gerrit-Change-Number: 35420 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-mgw[master]: client: deprecate legacy API
by neels 22 Dec '23

22 Dec '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35419?usp=email ) Change subject: client: deprecate legacy API ...................................................................... client: deprecate legacy API Change-Id: I7409907dafbb2fe905fee9bc22d6870056bf3022 --- M include/osmocom/mgcp_client/mgcp_client_fsm.h 1 file changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/19/35419/1 diff --git a/include/osmocom/mgcp_client/mgcp_client_fsm.h b/include/osmocom/mgcp_client/mgcp_client_fsm.h index ade4f49..4e9ba89 100644 --- a/include/osmocom/mgcp_client/mgcp_client_fsm.h +++ b/include/osmocom/mgcp_client/mgcp_client_fsm.h @@ -64,11 +64,15 @@ }; struct osmo_fsm_inst *mgcp_conn_create(struct mgcp_client *mgcp, struct osmo_fsm_inst *parent_fi, uint32_t parent_term_evt, - uint32_t parent_evt, struct mgcp_conn_peer *conn_peer); -int mgcp_conn_modify(struct osmo_fsm_inst *fi, uint32_t parent_evt, struct mgcp_conn_peer *conn_peer); -void mgcp_conn_delete(struct osmo_fsm_inst *fi); + uint32_t parent_evt, struct mgcp_conn_peer *conn_peer) + OSMO_DEPRECATED_OUTSIDE_LIBOSMOMGCPCLIENT("use osmo_mgcpc_ep_alloc() and osmo_mgcpc_ep_ci_add() instead"); +int mgcp_conn_modify(struct osmo_fsm_inst *fi, uint32_t parent_evt, struct mgcp_conn_peer *conn_peer) + OSMO_DEPRECATED_OUTSIDE_LIBOSMOMGCPCLIENT("use osmo_mgcpc_ep_ci_request() instead"); +void mgcp_conn_delete(struct osmo_fsm_inst *fi) + OSMO_DEPRECATED_OUTSIDE_LIBOSMOMGCPCLIENT("use osmo_mgcpc_ep_ci_dlcx() instead"); -const char *mgcp_conn_get_ci(struct osmo_fsm_inst *fi); +const char *mgcp_conn_get_ci(struct osmo_fsm_inst *fi) + OSMO_DEPRECATED_OUTSIDE_LIBOSMOMGCPCLIENT("use osmo_mgcpc_ep_ci.mgcp_ci_str instead"); struct mgcp_client *mgcp_conn_get_client(struct osmo_fsm_inst *fi); const char *osmo_mgcpc_conn_peer_name(const struct mgcp_conn_peer *info); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35419?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7409907dafbb2fe905fee9bc22d6870056bf3022 Gerrit-Change-Number: 35419 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in osmo-mgw[master]: mgcp_client_test: add test_parse_response()
by neels 22 Dec '23

22 Dec '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35422?usp=email ) Change subject: mgcp_client_test: add test_parse_response() ...................................................................... mgcp_client_test: add test_parse_response() Change-Id: I842ce65a9a70f313570857b7df53727cc572b9e6 --- M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.err 2 files changed, 266 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/22/35422/1 diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index 3883c3a..9b356c3 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -673,6 +673,214 @@ OSMO_ASSERT(epname == NULL); } +struct parse_response_test { + const char *body; + int expect_rc; + struct mgcp_response expect_params; +}; + +static struct parse_response_test parse_response_tests[] = { + { + .body = "200 2 OK\r\n" + "I: foo\r\n" + "\r\n" + "v=0\r\n" + "o=- name 23 IN IP4 0.0.0.0\r\n" + "s=-\r\n" + "c=IN IP4 1.2.3.4\r\n" + "t=0 0\r\n" + "m=audio 23 RTP/AVP 112 3\r\n" /* <-- implicit: 3 = GSM-FR */ + "a=rtpmap:112 AMR/8000\r\n" + "a=ptime:20\r\n", + .expect_rc = 0, + .expect_params = { + .audio_port = 23, + .audio_ip = "1.2.3.4", + .ptmap = { + { .codec = CODEC_AMR_8000_1, .pt = 112 }, + { .codec = CODEC_GSM_8000_1, .pt = 3 }, + }, + .ptmap_len = 2, + }, + }, + { + .body = "200 2 OK\r\n" + "I: foo\r\n" + "\r\n" + "v=0\r\n" + "o=- name 23 IN IP4 0.0.0.0\r\n" + "s=-\r\n" + "c=IN IP4 1.2.3.4\r\n" + "t=0 0\r\n" + "m=audio 23 RTP/AVP 112 3\r\n" + "a=rtpmap:112 AMR/8000\r\n" + "a=rtpmap:3 GSM/8000\r\n" /* 3 == GSM-FR implicitly, is an explicit entry a problem? */ + "a=ptime:20\r\n", + .expect_rc = 0, + .expect_params = { + .audio_port = 23, + .audio_ip = "1.2.3.4", + .ptmap = { + { .codec = CODEC_AMR_8000_1, .pt = 112 }, + { .codec = CODEC_GSM_8000_1, .pt = 3 }, /* no, not a problem */ + }, + .ptmap_len = 2, + }, + }, + { + .body = "200 2 OK\r\n" + "I: foo\r\n" + "\r\n" + "v=0\r\n" + "o=- name 23 IN IP4 0.0.0.0\r\n" + "s=-\r\n" + "c=IN IP4 1.2.3.4\r\n" + "t=0 0\r\n" + "m=audio 23 RTP/AVP 3\r\n" /* <-- 112 is missing here. Will it still appear? */ + "a=rtpmap:112 AMR/8000\r\n" + "a=ptime:20\r\n", + .expect_rc = 0, + .expect_params = { + .audio_port = 23, + .audio_ip = "1.2.3.4", + .ptmap = { + { .codec = CODEC_GSM_8000_1, .pt = 3 }, + { .codec = CODEC_AMR_8000_1, .pt = 112 }, /* <-- yes, it was added to the end. */ + }, + .ptmap_len = 2, + }, + }, + { + /* test MGCP_MAX_CODECS */ + .body = "200 2 OK\r\n" + "I: foo\r\n" + "\r\n" + "v=0\r\n" + "o=- name 23 IN IP4 0.0.0.0\r\n" + "s=-\r\n" + "c=IN IP4 1.2.3.4\r\n" + "t=0 0\r\n" + "m=audio 23 RTP/AVP 101 102 103 104 105 106 107 108 109 110\r\n" /* <-- 10 codecs max */ + "a=rtpmap:101 AMR/8000\r\n" + "a=rtpmap:102 AMR/8000\r\n" + "a=rtpmap:103 AMR/8000\r\n" + "a=rtpmap:104 AMR/8000\r\n" + "a=rtpmap:105 AMR/8000\r\n" + "a=rtpmap:106 AMR/8000\r\n" + "a=rtpmap:107 AMR/8000\r\n" + "a=rtpmap:108 AMR/8000\r\n" + "a=rtpmap:109 AMR/8000\r\n" + "a=rtpmap:110 AMR/8000\r\n" + "a=ptime:20\r\n", + .expect_rc = 0, + .expect_params = { + .audio_port = 23, + .audio_ip = "1.2.3.4", + .ptmap = { + { .codec = CODEC_AMR_8000_1, .pt = 101 }, + { .codec = CODEC_AMR_8000_1, .pt = 102 }, + { .codec = CODEC_AMR_8000_1, .pt = 103 }, + { .codec = CODEC_AMR_8000_1, .pt = 104 }, + { .codec = CODEC_AMR_8000_1, .pt = 105 }, + { .codec = CODEC_AMR_8000_1, .pt = 106 }, + { .codec = CODEC_AMR_8000_1, .pt = 107 }, + { .codec = CODEC_AMR_8000_1, .pt = 108 }, + { .codec = CODEC_AMR_8000_1, .pt = 109 }, + { .codec = CODEC_AMR_8000_1, .pt = 110 }, + }, + .ptmap_len = 10, + }, + }, + { + /* test MGCP_MAX_CODECS */ + .body = "200 2 OK\r\n" + "I: foo\r\n" + "\r\n" + "v=0\r\n" + "o=- name 23 IN IP4 0.0.0.0\r\n" + "s=-\r\n" + "c=IN IP4 1.2.3.4\r\n" + "t=0 0\r\n" + "m=audio 23 RTP/AVP 101 102 103 104 105 106 107 108 109 110 3\r\n" /* <-- 11 > MGCP_MAX_CODECS */ + "a=rtpmap:101 AMR/8000\r\n" + "a=rtpmap:102 AMR/8000\r\n" + "a=rtpmap:103 AMR/8000\r\n" + "a=rtpmap:104 AMR/8000\r\n" + "a=rtpmap:105 AMR/8000\r\n" + "a=rtpmap:106 AMR/8000\r\n" + "a=rtpmap:107 AMR/8000\r\n" + "a=rtpmap:108 AMR/8000\r\n" + "a=rtpmap:109 AMR/8000\r\n" + "a=rtpmap:110 AMR/8000\r\n" + "a=ptime:20\r\n", + .expect_rc = -EINVAL, + }, +}; + +static void test_parse_response(void) +{ + int i; + int failures = 0; + + for (i = 0; i < ARRAY_SIZE(parse_response_tests); i++) { + int rc; + struct parse_response_test *t = &parse_response_tests[i]; + struct mgcp_response *r = talloc_zero(ctx, struct mgcp_response); + int p; + + r->body = talloc_strdup(r, t->body); + + //printf("\n%s() test [%d]:\n", __func__, i); + fprintf(stderr, "\n%s() test [%d]:\n", __func__, i); + fprintf(stderr, "body: \"%s\"\n", osmo_escape_str(r->body, -1)); + + rc = mgcp_response_parse_params(r); + + fprintf(stderr, "got rc=%d\n", rc); + if (rc != t->expect_rc) { + fprintf(stderr, "FAIL: Expected rc=%d\n", t->expect_rc); + failures++; + } + if (rc) { + talloc_free(r); + continue; + } + + fprintf(stderr, "got audio_ip=\"%s\"\n", r->audio_ip); + if (strcmp(r->audio_ip, t->expect_params.audio_ip)) { + fprintf(stderr, "FAIL: Expected audio_ip=\"%s\"\n", t->expect_params.audio_ip); + failures++; + } + fprintf(stderr, "got audio_port=%u\n", r->audio_port); + if (r->audio_port != t->expect_params.audio_port) { + fprintf(stderr, "FAIL: Expected audio_port=%u\n", t->expect_params.audio_port); + failures++; + } + + for (p = 0; p < r->ptmap_len; p++) { + struct ptmap *got = &r->ptmap[p]; + struct ptmap *expect = NULL; + fprintf(stderr, " %d %s\n", got->pt, osmo_mgcpc_codec_name(got->codec)); + if (p >= t->expect_params.ptmap_len) { + fprintf(stderr, " - ERROR: too many codec entries\n"); + failures++; + continue; + } + expect = &t->expect_params.ptmap[p]; + if (ptmap_cmp(got, expect)) { + fprintf(stderr, " - ERROR: expected: %d %s\n", + expect->pt, osmo_mgcpc_codec_name(expect->codec)); + failures++; + } + } + + talloc_free(r); + } + + OSMO_ASSERT(!failures); +} + + static const struct log_info_cat log_categories[] = { }; @@ -704,6 +912,8 @@ test_map_str_to_codec(); test_mgcp_client_e1_epname(); + test_parse_response(); + printf("Done\n"); fprintf(stderr, "Done\n"); return EXIT_SUCCESS; diff --git a/tests/mgcp_client/mgcp_client_test.err b/tests/mgcp_client/mgcp_client_test.err index 22ad3cc..94fe351 100644 --- a/tests/mgcp_client/mgcp_client_test.err +++ b/tests/mgcp_client/mgcp_client_test.err @@ -137,4 +137,51 @@ DLMGCP MGW(mgw) Cannot compose MGCP e1-endpoint name (ds/e1-15/s-1/su8-16@mgw), rate(8)/offset(16) combination is invalid! DLMGCP MGW(mgw) Cannot compose MGCP e1-endpoint name (ds/e1-15/s-0/su8-2@mgw), E1-timeslot number (0) is invalid! DLMGCP MGW(mgw) Cannot compose MGCP e1-endpoint name (ds/e1-15/s-64/su8-2@mgw), E1-timeslot number (64) is invalid! + +test_parse_response() test [0]: +body: "200 2 OK\r\nI: foo\r\n\r\nv=0\r\no=- name 23 IN IP4 0.0.0.0\r\ns=-\r\nc=IN IP4 1.2.3.4\r\nt=0 0\r\nm=audio 23 RTP/AVP 112 3\r\na=rtpmap:112 AMR/8000\r\na=ptime:20\r\n" +got rc=0 +got audio_ip="1.2.3.4" +got audio_port=23 + 112 AMR/8000/1 + 3 GSM/8000/1 + +test_parse_response() test [1]: +body: "200 2 OK\r\nI: foo\r\n\r\nv=0\r\no=- name 23 IN IP4 0.0.0.0\r\ns=-\r\nc=IN IP4 1.2.3.4\r\nt=0 0\r\nm=audio 23 RTP/AVP 112 3\r\na=rtpmap:112 AMR/8000\r\na=rtpmap:3 GSM/8000\r\na=ptime:20\r\n" +got rc=0 +got audio_ip="1.2.3.4" +got audio_port=23 + 112 AMR/8000/1 + 3 GSM/8000/1 + +test_parse_response() test [2]: +body: "200 2 OK\r\nI: foo\r\n\r\nv=0\r\no=- name 23 IN IP4 0.0.0.0\r\ns=-\r\nc=IN IP4 1.2.3.4\r\nt=0 0\r\nm=audio 23 RTP/AVP 3\r\na=rtpmap:112 AMR/8000\r\na=ptime:20\r\n" +DLMGCP error in MGCP message: 'a=rtpmap:112' has no matching entry in 'm=audio ... 112' +got rc=0 +got audio_ip="1.2.3.4" +got audio_port=23 + 3 GSM/8000/1 + 112 AMR/8000/1 + +test_parse_response() test [3]: +body: "200 2 OK\r\nI: foo\r\n\r\nv=0\r\no=- name 23 IN IP4 0.0.0.0\r\ns=-\r\nc=IN IP4 1.2.3.4\r\nt=0 0\r\nm=audio 23 RTP/AVP 101 102 103 104 105 106 107 108 109 110\r\na=rtpmap:101 AMR/8000\r\na=rtpmap:102 AMR/8000\r\na=rtpmap:103 AMR/8000\r\na=rtpmap:104 AMR/8" +got rc=0 +got audio_ip="1.2.3.4" +got audio_port=23 + 101 AMR/8000/1 + 102 AMR/8000/1 + 103 AMR/8000/1 + 104 AMR/8000/1 + 105 AMR/8000/1 + 106 AMR/8000/1 + 107 AMR/8000/1 + 108 AMR/8000/1 + 109 AMR/8000/1 + 110 AMR/8000/1 + +test_parse_response() test [4]: +body: "200 2 OK\r\nI: foo\r\n\r\nv=0\r\no=- name 23 IN IP4 0.0.0.0\r\ns=-\r\nc=IN IP4 1.2.3.4\r\nt=0 0\r\nm=audio 23 RTP/AVP 101 102 103 104 105 106 107 108 109 110 3\r\na=rtpmap:101 AMR/8000\r\na=rtpmap:102 AMR/8000\r\na=rtpmap:103 AMR/8000\r\na=rtpmap:104 AMR" +DLMGCP SDP: can parse only up to 10 payload type numbers +DLMGCP Failed to parse SDP parameter payload types (RTP/AVP) +got rc=-22 Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35422?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I842ce65a9a70f313570857b7df53727cc572b9e6 Gerrit-Change-Number: 35422 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: fix encode/decode of xPLMNwAcT
by laforge 21 Dec '23

21 Dec '23

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35415?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: fix encode/decode of xPLMNwAcT ...................................................................... fix encode/decode of xPLMNwAcT There are some pretty intricate rules about how GSM and E-UTRAN are encoded, let's make sure we fully support both as per 3GPP TS 31.102 Release 17. As part of this, swithc from a list of access technologies to a set, as there is no order. Change-Id: I398ac2a2527bd11e9c652e49fa46d6ca8d334b88 --- M pySim/ts_51_011.py M pySim/utils.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok M tests/test_utils.py 7 files changed, 62 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/15/35415/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35415?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I398ac2a2527bd11e9c652e49fa46d6ca8d334b88 Gerrit-Change-Number: 35415 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

2026

2025

2024

2023

2022

gerrit-log