- gerrit-log - lists.osmocom.org

[XL] Change in libosmocore[master]: Introduce tests/osmo-config-merge testsuite

by pespin

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: Introduce tests/osmo-config-merge testsuite ...................................................................... Introduce tests/osmo-config-merge testsuite This allows catching current bugs and possible regressions when fixing them. For instance, testB2.ok already shows a bug where lots of lines expected to be merged under the "cs7 instance 0" end up put in an un expected place. This happens due to comments being used by osmo-config-merge during tree creation, and will be fixed in a follow-up commit. Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 --- M .gitignore M configure.ac M tests/Makefile.am A tests/osmo-config-merge/Makefile.am A tests/osmo-config-merge/atlocal.in A tests/osmo-config-merge/testA.cfg A tests/osmo-config-merge/testA.confmerge A tests/osmo-config-merge/testA.ok A tests/osmo-config-merge/testB.cfg A tests/osmo-config-merge/testB.confmerge A tests/osmo-config-merge/testB.ok A tests/osmo-config-merge/testB2.cfg A tests/osmo-config-merge/testB2.confmerge A tests/osmo-config-merge/testB2.ok A tests/osmo-config-merge/testsuite.at 15 files changed, 1,100 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/40295/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 Gerrit-Change-Number: 40295 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[L] Change in libosmocore[master]: osmo-config-merge: Fix comments with different indentation creating m...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/40296?usp=email ) Change subject: osmo-config-merge: Fix comments with different indentation creating merge problems ...................................................................... osmo-config-merge: Fix comments with different indentation creating merge problems VTY comments are not part of the tree structure, since they can be placed anywhere and are just ignored. Hence, ignore them when generating the tree structure during file read. This has the backside that of course when merging files, comments on the 0-level show up in the end in testB.ok since the content below it in testB.confmerge is now merged (properly) into previous nodes. This can be slightly improved by placing the comments in the proper indentation level, since if a new node is appended from the .confmerge, they will be added in order and hence will show up properly. Change-Id: I7de78d3ed3ca27e3470ea66a78ff9c5acfe65741 --- M tests/osmo-config-merge/testA.ok M tests/osmo-config-merge/testB.ok M tests/osmo-config-merge/testB2.ok M utils/osmo-config-merge.c 4 files changed, 156 insertions(+), 128 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/40296/1 diff --git a/tests/osmo-config-merge/testA.ok b/tests/osmo-config-merge/testA.ok index b0768ad..c244bd0 100644 --- a/tests/osmo-config-merge/testA.ok +++ b/tests/osmo-config-merge/testA.ok @@ -15,7 +15,6 @@ logging print level 1 logging timestamp 1 logging color 1 -! logging level set-all notice logging level rsl info logging level meas info @@ -28,6 +27,7 @@ logging level lmib info logging level lmux info ! +! line vty no login bind 127.0.0.1 diff --git a/tests/osmo-config-merge/testB.ok b/tests/osmo-config-merge/testB.ok index 64860f8..0edb5a9 100644 --- a/tests/osmo-config-merge/testB.ok +++ b/tests/osmo-config-merge/testB.ok @@ -54,6 +54,74 @@ local-ip 127.0.0.1 local-ip ::1 accept-asp-connections dynamic-permitted + asp asp-sender 9999 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-receiver0 10000 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-receiver1 10001 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-client0 10002 2906 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role asp + sctp-role client + asp asp-client60-norctx0 11060 2907 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role asp + sctp-role client + asp asp-client61-norctx0 11061 2907 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role asp + sctp-role client + as as-sender m3ua + asp asp-sender + routing-key 1023 23 + as as-receiver m3ua + asp asp-receiver0 + asp asp-receiver1 + routing-key 1042 42 + as as-client m3ua + routing-key 1055 55 + asp asp-client0 + as as-client60-norctx m3ua + routing-key 0 60 + asp asp-client60-norctx0 + as as-client61-norctx m3ua + routing-key 0 61 + asp asp-client61-norctx0 + route-table system + update route 23 16777215 linkset as-sender + update route 42 16777215 linkset as-receiver + update route 55 16777215 linkset as-client + update route 60 16777215 linkset as-client60-norctx + update route 61 16777215 linkset as-client61-norctx + listen m3ua 2905 + local-ip 127.0.0.1 + local-ip ::1 + accept-asp-connections dynamic-permitted ! ! IPA AS/ASP: ! @@ -124,77 +192,9 @@ ! !M3UA AS/ASP: ! - asp asp-sender 9999 2905 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role sg - sctp-role server - asp asp-receiver0 10000 2905 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role sg - sctp-role server - asp asp-receiver1 10001 2905 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role sg - sctp-role server - asp asp-client0 10002 2906 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role asp - sctp-role client - asp asp-client60-norctx0 11060 2907 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role asp - sctp-role client - asp asp-client61-norctx0 11061 2907 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role asp - sctp-role client - as as-sender m3ua - asp asp-sender - routing-key 1023 23 - as as-receiver m3ua - asp asp-receiver0 - asp asp-receiver1 - routing-key 1042 42 - as as-client m3ua - routing-key 1055 55 - asp asp-client0 - as as-client60-norctx m3ua - routing-key 0 60 - asp asp-client60-norctx0 - as as-client61-norctx m3ua - routing-key 0 61 - asp asp-client61-norctx0 ! ! ROUTING TABLE: ! - route-table system - update route 23 16777215 linkset as-sender - update route 42 16777215 linkset as-receiver - update route 55 16777215 linkset as-client - update route 60 16777215 linkset as-client60-norctx - update route 61 16777215 linkset as-client61-norctx ! !SERVERS: ! - listen m3ua 2905 - local-ip 127.0.0.1 - local-ip ::1 - accept-asp-connections dynamic-permitted diff --git a/tests/osmo-config-merge/testB2.ok b/tests/osmo-config-merge/testB2.ok index 6a44388..e206e74 100644 --- a/tests/osmo-config-merge/testB2.ok +++ b/tests/osmo-config-merge/testB2.ok @@ -1,37 +1,4 @@ ! - asp ipa-asp-loadshare-sender0 20000 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - asp ipa-asp-loadshare-sender1 20001 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - as ipa-as-loadshare-sender ipa - routing-key 0 6 - point-code override dpc 31 - asp ipa-asp-loadshare-sender0 - asp ipa-asp-loadshare-sender1 - asp ipa-asp-loadshare-receiver0 20002 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - role sg - sctp-role server - asp ipa-asp-loadshare-receiver1 20003 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - role sg - sctp-role server - as ipa-as-loadshare-receiver ipa - traffic-mode loadshare - routing-key 0 7 - point-code override dpc 32 - asp ipa-asp-loadshare-receiver0 - asp ipa-asp-loadshare-receiver1 - route-table system - update route 31 16777215 linkset ipa-as-loadshare-receiver - update route 33 16777215 linkset ipa-as-override-receiver - update route 5 16777215 linkset ipa-as-dynamic-asp - listen ipa 5000 - accept-asp-connections dynamic-permitted ! OsmoSTP (1.1.0.2-3884) configuration saved from vty !! ! @@ -80,13 +47,13 @@ route-table system update route 123 16777215 linkset as-sender-tcp update route 155 16777215 linkset as-client-tcp + update route 31 16777215 linkset ipa-as-loadshare-receiver + update route 33 16777215 linkset ipa-as-override-receiver + update route 5 16777215 linkset ipa-as-dynamic-asp listen m3ua 2905 tcp local-ip 127.0.0.1 local-ip ::1 accept-asp-connections dynamic-permitted -! -!M3UA AS/ASP: -! asp asp-sender 9999 2905 m3ua local-ip 127.0.0.1 local-ip ::1 @@ -145,27 +112,43 @@ as as-client61-norctx m3ua routing-key 0 61 asp asp-client61-norctx0 -! -! ROUTING TABLE: -! route-table system update route 23 16777215 linkset as-sender update route 42 16777215 linkset as-receiver update route 55 16777215 linkset as-client update route 60 16777215 linkset as-client60-norctx update route 61 16777215 linkset as-client61-norctx -! -!SERVERS: -! listen m3ua 2905 local-ip 127.0.0.1 local-ip ::1 accept-asp-connections dynamic-permitted -cs7 instance 0 -! -! IPA AS/ASP: -! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3. -! OVERRIDE: + asp ipa-asp-loadshare-sender0 20000 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + asp ipa-asp-loadshare-sender1 20001 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + as ipa-as-loadshare-sender ipa + routing-key 0 6 + point-code override dpc 31 + asp ipa-asp-loadshare-sender0 + asp ipa-asp-loadshare-sender1 + asp ipa-asp-loadshare-receiver0 20002 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + asp ipa-asp-loadshare-receiver1 20003 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as ipa-as-loadshare-receiver ipa + traffic-mode loadshare + routing-key 0 7 + point-code override dpc 32 + asp ipa-asp-loadshare-receiver0 + asp ipa-asp-loadshare-receiver1 asp ipa-asp-override-sender 20005 5000 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 @@ -189,11 +172,29 @@ point-code override dpc 34 asp ipa-asp-override-receiver0 asp ipa-asp-override-receiver1 -! DYNAMIC AS: as ipa-as-dynamic-asp ipa routing-key 0 5 point-code override dpc 23 + listen ipa 5000 + accept-asp-connections dynamic-permitted +! +!M3UA AS/ASP: +! ! ! ROUTING TABLE: ! +! !SERVERS: +! +! +! IPA AS/ASP: +! +! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3. +! OVERRIDE: +! DYNAMIC AS: +! +! ROUTING TABLE: +! +! +!SERVERS: +! diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c index ed2039a..63367f3 100644 --- a/utils/osmo-config-merge.c +++ b/utils/osmo-config-merge.c @@ -39,6 +39,7 @@ */ #include <stdio.h> +#include <stdbool.h> #include <string.h> #include <errno.h> @@ -89,16 +90,35 @@ return NULL; } +/* Return pointer to line content, or empty string if only whitspace is found */ +static const char *line_lstrip(const char *line) +{ + OSMO_ASSERT(line); + unsigned int len = strlen(line); + for (unsigned int i = 0; i < len; i++) { + if (line[i] == ' ') + continue; + return &line[i]; + } + /* points to empty string '\0' */ + return &line[len]; +} + /* count the number of spaces / indent level */ static int count_indent(const char *line) { - int i; + const char *content = line_lstrip(line); + return content - line; +} - for (i = 0; i < strlen(line); i++) { - if (line[i] != ' ') - return i; - } - return i; +static bool line_is_comment(const char *line) +{ + const char *content = line_lstrip(line); + if (content[0] == '\0') + return true; + if (content[0] == '!' || line[0] == '#') + return true; + return false; } /* strip any triling CR / LF */ @@ -141,7 +161,9 @@ line_num++; chomp(line); int indent = count_indent(line); + bool coment = line_is_comment(&line[indent]); struct node *n; + if (indent > cur_indent) { if (indent > cur_indent+1) { fprintf(stderr, "File '%s' isn't well-formed in line %u, aborting!\n", @@ -153,20 +175,25 @@ n = node_alloc_child(last); } else if (indent < cur_indent) { int i; + struct node *par = last; for (i = 0; i < cur_indent - indent; i++) { /* go to parent, add another sibling */ - if (last->parent) - last = last->parent; + if (par->parent) + par = par->parent; } - n = node_alloc_child(last->parent); + n = node_alloc_child(par->parent); } else { /* add a new sibling (child of parent) */ n = node_alloc_child(last->parent); } n->line = talloc_strdup(n, line); - last = n; - cur_indent = indent; + /* comments are not part of the indentation structre of the + * file, hence commands after it are not to be affected by them: */ + if (!coment) { + last = n; + cur_indent = indent; + } } fclose(infile); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40296?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7de78d3ed3ca27e3470ea66a78ff9c5acfe65741 Gerrit-Change-Number: 40296 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: SCOC -> SCRC: Delay called addr lookup until needed [2/3]

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40291?usp=email ) Change subject: sccp: SCOC -> SCRC: Delay called addr lookup until needed [2/3] ...................................................................... sccp: SCOC -> SCRC: Delay called addr lookup until needed [2/3] Follow more closely the diagrams in Figure C.1/Q.714. This is important because according to ITU Q.714 section 2.2.2, the "Addressing information" is obtained in a different way: * CL msgs (N-UNITDATA.req): Obtained from the "Called address" parameter * CO msgs == CR (N-CONNECT.req): Obtained from the "Called address" parameter * CO msgs != CR (eg. N-DATA.req): Obtained from connection info (DPC + MTP-SAP instance). Change-Id: I1dda9b9288f3f34dfad6064e3f9fff6dcd6abbd7 --- M src/sccp_scrc.c 1 file changed, 23 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index 990987a..706e01c 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -245,12 +245,20 @@ /* "Figure C.1/Q.714 - SCCP routing control procedures (SCRC) (sheet 5 of 12)" * Only used for Connection Oriented messages */ -static int scrc_node_2(struct osmo_sccp_instance *inst, struct xua_msg *xua, - const struct osmo_sccp_addr *called) +static int scrc_node_2(struct osmo_sccp_instance *inst, struct xua_msg *xua) { - /* Node 2 on Sheet 5, only CO */ + struct osmo_sccp_addr called; + int rc; + + rc = sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + return -EINVAL; + } + /* Is DPC accessible? */ - if (!dpc_accessible(inst, called->pc)) { + if (!dpc_accessible(inst, called.pc)) { /* Error: MTP Failure */ /* Routing Failure SCRC -> SCOC */ sccp_scoc_rx_scrc_rout_fail(inst, xua, @@ -258,14 +266,14 @@ return 0; } /* Is SCCP available? */ - if (!sccp_available(inst, called)) { + if (!sccp_available(inst, &called)) { /* Error: SCCP Failure */ /* Routing Failure SCRC -> SCOC */ sccp_scoc_rx_scrc_rout_fail(inst, xua, SCCP_RETURN_CAUSE_SCCP_FAILURE); return 0; } - return scrc_node_12(inst, xua, called); + return scrc_node_12(inst, xua, &called); } static int scrc_node_7(struct osmo_sccp_instance *inst, @@ -448,6 +456,15 @@ LOGPSCI(inst, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); + /* Is this a CR message ? */ + if (xua->hdr.msg_type != SUA_CO_CORE) + return scrc_node_2(inst, xua); + +#if 0 + if (/* TODO: Coupling performed (not supported) */) + return scrc_node_2(inst, xua); +#endif + rc = sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); if (rc < 0) { LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", @@ -455,15 +472,6 @@ return -EINVAL; } - /* Is this a CR message ? */ - if (xua->hdr.msg_type != SUA_CO_CORE) - return scrc_node_2(inst, xua, &called); - - /* TOOD: Coupling performed (not supported) */ - if (0) { - return scrc_node_2(inst, xua, &called); - } - return scrc_local_out_common(inst, xua, &called); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40291?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I1dda9b9288f3f34dfad6064e3f9fff6dcd6abbd7 Gerrit-Change-Number: 40291 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: sccp: Validate SUA address parsing succeeds [1/3]

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40289?usp=email ) Change subject: sccp: Validate SUA address parsing succeeds [1/3] ...................................................................... sccp: Validate SUA address parsing succeeds [1/3] Make sure sua_addr_parse() is successful everywhere to avoid checking on potentially uninitialized memory otherwise. This patch indeed uncovers a sua_addr_parse() failure in sccp_scrc_rx_scoc_conn_msg() triggered eg. when submitting a RANAP msg over SCCP in osmo-hnbgw. This happens because Connection Oriented messages (!= CREQ) contain no "Called Address". This is issue is fixed in the 2 patches following up this one. Change-Id: I36387eb53e160425844b20a296fa5dc75db1ec54 --- M src/sccp_sclc.c M src/sccp_scrc.c 2 files changed, 73 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c index 9d424fa..7fee2a3 100644 --- a/src/sccp_sclc.c +++ b/src/sccp_sclc.c @@ -44,6 +44,7 @@ */ #include <string.h> +#include <errno.h> #include <osmocom/core/utils.h> #include <osmocom/core/linuxlist.h> @@ -188,6 +189,7 @@ struct msgb *upmsg; struct osmo_sccp_user *scu; uint32_t protocol_class; + int rc; if (!data_ie) { LOGPSCI(inst, LOGL_ERROR, "SCCP/SUA CLDT without user data?!?\n"); @@ -201,8 +203,23 @@ osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION, upmsg); - sua_addr_parse(&param->called_addr, xua, SUA_IEI_DEST_ADDR); - sua_addr_parse(&param->calling_addr, xua, SUA_IEI_SRC_ADDR); + + rc = sua_addr_parse(&param->called_addr, xua, SUA_IEI_DEST_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + msgb_free(upmsg); + return -EINVAL; + } + + rc = sua_addr_parse(&param->calling_addr, xua, SUA_IEI_SRC_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + msgb_free(upmsg); + return -EINVAL; + } + param->in_sequence_control = xua_msg_get_u32(xua, SUA_IEI_SEQ_CTRL); protocol_class = xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS); param->return_option = protocol_class & 0x80; @@ -210,7 +227,6 @@ scu = sccp_user_find(inst, param->called_addr.ssn, param->called_addr.pc); - if (!scu) { /* FIXME: Send destination unreachable? */ _LOGPSCI(inst, DLSUA, LOGL_NOTICE, "Received SUA message for unequipped SSN %u\n", @@ -237,6 +253,7 @@ struct xua_msg_part *data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA); struct msgb *upmsg; struct osmo_sccp_user *scu; + int rc; if (!data_ie) { LOGPSCI(inst, LOGL_ERROR, "SCCP/SUA CLDR without user data?!?\n"); @@ -251,8 +268,22 @@ OSMO_SCU_PRIM_N_NOTICE, PRIM_OP_INDICATION, upmsg); - sua_addr_parse(&param->called_addr, xua, SUA_IEI_DEST_ADDR); - sua_addr_parse(&param->calling_addr, xua, SUA_IEI_SRC_ADDR); + rc = sua_addr_parse(&param->called_addr, xua, SUA_IEI_DEST_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + msgb_free(upmsg); + return -EINVAL; + } + + rc = sua_addr_parse(&param->calling_addr, xua, SUA_IEI_SRC_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + msgb_free(upmsg); + return -EINVAL; + } + param->importance = xua_msg_get_u32(xua, SUA_IEI_IMPORTANCE); param->cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE); @@ -335,13 +366,14 @@ /* Optional: Data */ xua_msg_copy_part(xua_out, SUA_IEI_DATA, xua_in, SUA_IEI_DATA); - sua_addr_parse(&called, xua_out, SUA_IEI_DEST_ADDR); + OSMO_ASSERT(sua_addr_parse(&called, xua_out, SUA_IEI_DEST_ADDR) == 0); + /* Route on PC + SSN ? */ if (called.ri == OSMO_SCCP_RI_SSN_PC) { /* if no PC, copy OPC into called addr */ if (!(called.presence & OSMO_SCCP_ADDR_T_PC)) { struct osmo_sccp_addr calling; - sua_addr_parse(&calling, xua_out, SUA_IEI_SRC_ADDR); + OSMO_ASSERT(sua_addr_parse(&calling, xua_out, SUA_IEI_SRC_ADDR) == 0); called.presence |= OSMO_SCCP_ADDR_T_PC; called.pc = calling.pc; /* Re-encode / replace called address */ diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index abf86e4..990987a 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -21,6 +21,7 @@ */ #include <stdbool.h> +#include <errno.h> #include <osmocom/core/logging.h> #include <osmocom/core/msgb.h> @@ -443,10 +444,16 @@ struct xua_msg *xua) { struct osmo_sccp_addr called; + int rc; LOGPSCI(inst, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); - sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + rc = sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + return -EINVAL; + } /* Is this a CR message ? */ if (xua->hdr.msg_type != SUA_CO_CORE) @@ -465,10 +472,16 @@ struct xua_msg *xua) { struct osmo_sccp_addr called; + int rc; LOGPSCI(inst, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); - sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + rc = sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + return -EINVAL; + } /* Message Type */ if (xua->hdr.msg_type == SUA_CL_CLDR) { @@ -487,12 +500,18 @@ } /* ensure the CallingParty address doesn't just contain SSN, but at least SSN+PC */ -static void ensure_opc_in_calling_ssn(struct osmo_sccp_instance *inst, +static int ensure_opc_in_calling_ssn(struct osmo_sccp_instance *inst, struct xua_msg *xua) { struct osmo_sccp_addr calling; + int rc; - sua_addr_parse(&calling, xua, SUA_IEI_SRC_ADDR); + rc = sua_addr_parse(&calling, xua, SUA_IEI_SRC_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + return -EINVAL; + } /* if we route on SSN and only have a SSN in the address... */ if (calling.ri == OSMO_SCCP_RI_SSN_PC && @@ -504,6 +523,7 @@ xua_msg_free_tag(xua, SUA_IEI_SRC_ADDR); xua_msg_add_sccp_addr(xua, SUA_IEI_SRC_ADDR, &calling); } + return 0; } /* Figure C.1/Q.714 Sheet 1 of 12, after we converted the @@ -514,6 +534,7 @@ struct osmo_sccp_addr called; uint32_t proto_class; struct xua_msg_part *hop_ctr_part; + int rc; LOGPSCI(inst, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); /* TODO: SCCP or nodal congestion? */ @@ -528,9 +549,16 @@ /* We only treat connectionless and CR below */ /* ensure we have at least OPC+SSN and not just SSN in CallingParty (OS#5146) */ - ensure_opc_in_calling_ssn(inst, xua); + rc = ensure_opc_in_calling_ssn(inst, xua); + if (rc < 0) + return -EINVAL; - sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + rc = sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + return -EINVAL; + } /* Route on GT? */ if (called.ri != OSMO_SCCP_RI_GT) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40289?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I36387eb53e160425844b20a296fa5dc75db1ec54 Gerrit-Change-Number: 40289 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: SCOC -> SCRC: Use DPC provided from conn info in msg_type != CR...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40292?usp=email ) Change subject: sccp: SCOC -> SCRC: Use DPC provided from conn info in msg_type != CR [3/3] ...................................................................... sccp: SCOC -> SCRC: Use DPC provided from conn info in msg_type != CR [3/3] See Q.714 section 2.2 for more info on how the "addressing information" is obtained depending on the msg. Change-Id: I602c5be73d7fe6ef2af1cbfe6888227a9f602562 --- M src/sccp_scrc.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index 706e01c..ebc9a11 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -252,7 +252,16 @@ rc = sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); if (rc < 0) { - LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + /* Q.714 2.2.2: It is expectd that CO msgs != CREQ have no "Called Address". + * Use MTP DPC info provided by SCOC in xua->mtp.dpc instead. */ + called = (struct osmo_sccp_addr){ + .ri = OSMO_SCCP_RI_SSN_PC, + .presence = OSMO_SCCP_ADDR_T_PC, + .pc = xua->mtp.dpc, + }; + } + if (!(called.presence & OSMO_SCCP_ADDR_T_PC)) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DPC address information\n", xua_hdr_dump(xua, &xua_dialect_sua)); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40292?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I602c5be73d7fe6ef2af1cbfe6888227a9f602562 Gerrit-Change-Number: 40292 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: m3ua: Discard rx MSUs for non-active AS

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40294?usp=email ) Change subject: m3ua: Discard rx MSUs for non-active AS ...................................................................... m3ua: Discard rx MSUs for non-active AS TODO originally added long time ago in d11fa298c5f179a03307c185b0d433e6ba61d40f. Change-Id: Ibd3c85b9c5ac24fe1447c82b1f2cff4453105b84 --- M src/m3ua.c M src/ss7_as.c M src/ss7_as.h 3 files changed, 9 insertions(+), 2 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/m3ua.c b/src/m3ua.c index 35e2bb7..f073c8e 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -625,9 +625,14 @@ if (rc) goto ret_free; - rate_ctr_inc2(as->ctrg, SS7_AS_CTR_RX_MSU_TOTAL); + if (!osmo_ss7_as_active(as)) { + rate_ctr_inc2(as->ctrg, SS7_AS_CTR_RX_MSU_DISCARD); + LOGPAS(as, DLM3UA, LOGL_INFO, "Discarding received XUA Message %s, AS state %s\n", + xua_hdr_dump(xua, &xua_dialect_sua), osmo_fsm_inst_state_name(as->fi)); + goto ret_free; + } - /* FIXME: check for AS state == ACTIVE */ + rate_ctr_inc2(as->ctrg, SS7_AS_CTR_RX_MSU_TOTAL); /* store the MTP-level information in the xua_msg for use by * higher layer protocols */ diff --git a/src/ss7_as.c b/src/ss7_as.c index 4dedfc3..fac5ffe 100644 --- a/src/ss7_as.c +++ b/src/ss7_as.c @@ -58,6 +58,7 @@ #define SS7_AS_CTR_RX_MSU_SLS_STR "Number of MSU received on SLS " #define SS7_AS_CTR_TX_MSU_SLS_STR "Number of MSU transmitted on SLS " static const struct rate_ctr_desc ss7_as_rcd[] = { + [SS7_AS_CTR_RX_MSU_DISCARD] = { "rx:msu:discard", "Total number of incoming MSU discarded" }, [SS7_AS_CTR_RX_MSU_TOTAL] = { "rx:msu:total", "Total number of MSU received" }, [SS7_AS_CTR_RX_MSU_SLS_0] = { "rx:msu:sls:0", SS7_AS_CTR_RX_MSU_SLS_STR "0" }, [SS7_AS_CTR_RX_MSU_SLS_1] = { "rx:msu:sls:1", SS7_AS_CTR_RX_MSU_SLS_STR "1" }, diff --git a/src/ss7_as.h b/src/ss7_as.h index bc17726..5bc3574 100644 --- a/src/ss7_as.h +++ b/src/ss7_as.h @@ -25,6 +25,7 @@ }; enum ss7_as_ctr { + SS7_AS_CTR_RX_MSU_DISCARD, SS7_AS_CTR_RX_MSU_TOTAL, SS7_AS_CTR_RX_MSU_SLS_0, SS7_AS_CTR_RX_MSU_SLS_1, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40294?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ibd3c85b9c5ac24fe1447c82b1f2cff4453105b84 Gerrit-Change-Number: 40294 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: Rename files in src: s/osmo_ss7/ss7/g

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40293?usp=email ) Change subject: Rename files in src: s/osmo_ss7/ss7/g ...................................................................... Rename files in src: s/osmo_ss7/ss7/g This matches the related internal files, and drops the unnecessary osmo_ prefix from the files. Change-Id: I946f787e7bf7d4948d61f50a6cc8ec9a6253f074 --- M src/Makefile.am R src/ss7.c R src/ss7_as.c R src/ss7_asp.c R src/ss7_asp_peer.c R src/ss7_combined_linkset.c R src/ss7_hmrt.c R src/ss7_instance.c R src/ss7_link.c R src/ss7_linkset.c R src/ss7_route.c R src/ss7_route_table.c R src/ss7_user.c R src/ss7_vty.c R src/ss7_xua_srv.c 15 files changed, 14 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve diff --git a/src/Makefile.am b/src/Makefile.am index f108f06..bba3d22 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,20 +41,6 @@ libosmo_sigtran_la_SOURCES = \ ipa.c \ m3ua.c \ - osmo_ss7.c \ - osmo_ss7_as.c \ - osmo_ss7_asp.c \ - osmo_ss7_asp_peer.c \ - osmo_ss7_combined_linkset.c \ - osmo_ss7_hmrt.c \ - osmo_ss7_instance.c \ - osmo_ss7_link.c \ - osmo_ss7_linkset.c \ - osmo_ss7_vty.c \ - osmo_ss7_xua_srv.c \ - osmo_ss7_route.c \ - osmo_ss7_route_table.c \ - osmo_ss7_user.c \ sccp2sua.c \ sccp_helpers.c \ sccp_lbcs.c \ @@ -66,6 +52,20 @@ sccp_types.c \ sccp_user.c \ sccp_vty.c \ + ss7.c \ + ss7_as.c \ + ss7_asp.c \ + ss7_asp_peer.c \ + ss7_combined_linkset.c \ + ss7_hmrt.c \ + ss7_instance.c \ + ss7_link.c \ + ss7_linkset.c \ + ss7_vty.c \ + ss7_xua_srv.c \ + ss7_route.c \ + ss7_route_table.c \ + ss7_user.c \ sua.c \ xua_asp_fsm.c \ xua_as_fsm.c \ diff --git a/src/osmo_ss7.c b/src/ss7.c similarity index 100% rename from src/osmo_ss7.c rename to src/ss7.c diff --git a/src/osmo_ss7_as.c b/src/ss7_as.c similarity index 100% rename from src/osmo_ss7_as.c rename to src/ss7_as.c diff --git a/src/osmo_ss7_asp.c b/src/ss7_asp.c similarity index 100% rename from src/osmo_ss7_asp.c rename to src/ss7_asp.c diff --git a/src/osmo_ss7_asp_peer.c b/src/ss7_asp_peer.c similarity index 100% rename from src/osmo_ss7_asp_peer.c rename to src/ss7_asp_peer.c diff --git a/src/osmo_ss7_combined_linkset.c b/src/ss7_combined_linkset.c similarity index 100% rename from src/osmo_ss7_combined_linkset.c rename to src/ss7_combined_linkset.c diff --git a/src/osmo_ss7_hmrt.c b/src/ss7_hmrt.c similarity index 100% rename from src/osmo_ss7_hmrt.c rename to src/ss7_hmrt.c diff --git a/src/osmo_ss7_instance.c b/src/ss7_instance.c similarity index 100% rename from src/osmo_ss7_instance.c rename to src/ss7_instance.c diff --git a/src/osmo_ss7_link.c b/src/ss7_link.c similarity index 100% rename from src/osmo_ss7_link.c rename to src/ss7_link.c diff --git a/src/osmo_ss7_linkset.c b/src/ss7_linkset.c similarity index 100% rename from src/osmo_ss7_linkset.c rename to src/ss7_linkset.c diff --git a/src/osmo_ss7_route.c b/src/ss7_route.c similarity index 100% rename from src/osmo_ss7_route.c rename to src/ss7_route.c diff --git a/src/osmo_ss7_route_table.c b/src/ss7_route_table.c similarity index 100% rename from src/osmo_ss7_route_table.c rename to src/ss7_route_table.c diff --git a/src/osmo_ss7_user.c b/src/ss7_user.c similarity index 100% rename from src/osmo_ss7_user.c rename to src/ss7_user.c diff --git a/src/osmo_ss7_vty.c b/src/ss7_vty.c similarity index 100% rename from src/osmo_ss7_vty.c rename to src/ss7_vty.c diff --git a/src/osmo_ss7_xua_srv.c b/src/ss7_xua_srv.c similarity index 100% rename from src/osmo_ss7_xua_srv.c rename to src/ss7_xua_srv.c -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40293?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I946f787e7bf7d4948d61f50a6cc8ec9a6253f074 Gerrit-Change-Number: 40293 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[L] Change in pysim[master]: Get rid of [now] superfluous HexAdapter

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/40237?usp=email ) Change subject: Get rid of [now] superfluous HexAdapter ...................................................................... Get rid of [now] superfluous HexAdapter With the introduction of using osmocom.construct.{Bytes,GreedyBytes} in Change-Id I1c8df6350c68aa408ec96ff6cd1e405ceb1a4fbb we don't have a need for wrapping each instance of Bytes or GreedyBytes into a HexAdapter anymore. The osmocom.construct.{Bytes,GreedyBytes} will automatically perform the related hex-string-to-bytes conversion if needed - and during printing we have osmocom.utils.JsonEncoder that makes sure to convert any bytes type to a hex-string. Change-Id: I9c77e420c314f5e74458628dc4e767eab6d97123 --- M pySim/cat.py M pySim/cdma_ruim.py M pySim/euicc.py M pySim/global_platform/__init__.py M pySim/global_platform/install_param.py M pySim/gsm_r.py M pySim/sms.py M pySim/sysmocom_sja2.py M pySim/ts_102_221.py M pySim/ts_102_310.py M pySim/ts_31_102.py M pySim/ts_31_103.py M pySim/ts_31_103_shared.py M pySim/ts_51_011.py M tests/unittests/test_utils.py 15 files changed, 202 insertions(+), 197 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/cat.py b/pySim/cat.py index ae4e06e..2d4b41b 100644 --- a/pySim/cat.py +++ b/pySim/cat.py @@ -24,8 +24,8 @@ from construct import Struct, Enum, BitStruct, this from construct import Switch, GreedyRange, FlagsEnum from osmocom.tlv import TLV_IE, COMPR_TLV_IE, BER_TLV_IE, TLV_IE_Collection -from osmocom.construct import PlmnAdapter, BcdAdapter, HexAdapter, GsmStringAdapter, TonNpi, GsmString, Bytes, GreedyBytes -from osmocom.utils import b2h +from osmocom.construct import PlmnAdapter, BcdAdapter, GsmStringAdapter, TonNpi, GsmString, Bytes, GreedyBytes +from osmocom.utils import b2h, h2b from pySim.utils import dec_xplmn_w_act # Tag values as per TS 101 220 Table 7.23 @@ -255,24 +255,24 @@ 'launch_browser_generic_error': AddlInfoLaunchBrowser, 'bearer_independent_protocol_error': AddlInfoBip, 'frames_error': AddlInfoFrames - }, default=HexAdapter(GreedyBytes))) + }, default=GreedyBytes)) # TS 102 223 Section 8.13 + TS 31.111 Section 8.13 class SMS_TPDU(COMPR_TLV_IE, tag=0x8B): - _construct = Struct('tpdu'/HexAdapter(GreedyBytes)) + _construct = Struct('tpdu'/GreedyBytes) # TS 31.111 Section 8.14 class SsString(COMPR_TLV_IE, tag=0x89): - _construct = Struct('ton_npi'/TonNpi, 'ss_string'/HexAdapter(GreedyBytes)) + _construct = Struct('ton_npi'/TonNpi, 'ss_string'/GreedyBytes) # TS 102 223 Section 8.15 class TextString(COMPR_TLV_IE, tag=0x8D): _test_de_encode = [ - ( '8d090470617373776f7264', {'dcs': 4, 'text_string': '70617373776f7264'} ), + ( '8d090470617373776f7264', {'dcs': 4, 'text_string': b'password'} ) ] _construct = Struct('dcs'/Int8ub, # TS 03.38 - 'text_string'/HexAdapter(GreedyBytes)) + 'text_string'/GreedyBytes) # TS 102 223 Section 8.16 class Tone(COMPR_TLV_IE, tag=0x8E): @@ -308,11 +308,11 @@ # TS 31 111 Section 8.17 class USSDString(COMPR_TLV_IE, tag=0x8A): _construct = Struct('dcs'/Int8ub, - 'ussd_string'/HexAdapter(GreedyBytes)) + 'ussd_string'/GreedyBytes) # TS 102 223 Section 8.18 class FileList(COMPR_TLV_IE, tag=0x92): - FileId=HexAdapter(Bytes(2)) + FileId=Bytes(2) _construct = Struct('number_of_files'/Int8ub, 'files'/GreedyRange(FileId)) @@ -335,7 +335,7 @@ # TS 102 223 Section 8.23 class DefaultText(COMPR_TLV_IE, tag=0x97): _construct = Struct('dcs'/Int8ub, - 'text_string'/HexAdapter(GreedyBytes)) + 'text_string'/GreedyBytes) # TS 102 223 Section 8.24 class ItemsNextActionIndicator(COMPR_TLV_IE, tag=0x98): @@ -394,7 +394,7 @@ # TS 102 223 Section 8.35 class CApdu(COMPR_TLV_IE, tag=0xA2): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # TS 102 223 Section 8.37 class TimerIdentifier(COMPR_TLV_IE, tag=0xA4): @@ -406,7 +406,7 @@ # TS 102 223 Section 8.40 class AtCommand(COMPR_TLV_IE, tag=0xA8): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # TS 102 223 Section 8.43 class ImmediateResponse(COMPR_TLV_IE, tag=0xAB): @@ -418,7 +418,7 @@ # TS 102 223 Section 8.45 class Language(COMPR_TLV_IE, tag=0xAD): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # TS 31.111 Section 8.46 class TimingAdvance(COMPR_TLV_IE, tag=0xC6): @@ -440,7 +440,7 @@ # TS 102 223 Section 8.50 class ProvisioningFileReference(COMPR_TLV_IE, tag=0xB3): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # TS 102 223 Section 8.51 class BrowserTerminationCause(COMPR_TLV_IE, tag=0xB4): @@ -449,7 +449,7 @@ # TS 102 223 Section 8.52 class BearerDescription(COMPR_TLV_IE, tag=0xB5): _test_de_encode = [ - ( 'b50103', {'bearer_parameters': '', 'bearer_type': 'default'} ), + ( 'b50103', {'bearer_parameters': b'', 'bearer_type': 'default'} ), ] # TS 31.111 Section 8.52.1 BearerParsCs = Struct('data_rate'/Int8ub, @@ -492,11 +492,11 @@ 'packet_grps_utran_eutran': BearerParsPacket, 'packet_with_extd_params': BearerParsPacketExt, 'ng_ran': BearerParsNgRan, - }, default=HexAdapter(GreedyBytes))) + }, default=GreedyBytes)) # TS 102 223 Section 8.53 class ChannelData(COMPR_TLV_IE, tag = 0xB6): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # TS 102 223 Section 8.54 class ChannelDataLength(COMPR_TLV_IE, tag = 0xB7): @@ -510,15 +510,15 @@ class ChannelStatus(COMPR_TLV_IE, tag = 0xB8): # complex decoding, depends on out-of-band context/knowledge :( # for default / TCP Client mode: bit 8 of first byte indicates connected, 3 LSB indicate channel nr - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # TS 102 223 Section 8.58 class OtherAddress(COMPR_TLV_IE, tag = 0xBE): _test_de_encode = [ - ( 'be052101020304', {'address': '01020304', 'type_of_address': 'ipv4'} ), + ( 'be052101020304', {'address': h2b('01020304'), 'type_of_address': 'ipv4'} ), ] _construct = Struct('type_of_address'/Enum(Int8ub, ipv4=0x21, ipv6=0x57), - 'address'/HexAdapter(GreedyBytes)) + 'address'/GreedyBytes) # TS 102 223 Section 8.59 class UiccTransportLevel(COMPR_TLV_IE, tag = 0xBC): @@ -532,7 +532,7 @@ # TS 102 223 Section 8.60 class Aid(COMPR_TLV_IE, tag=0xAF): - _construct = Struct('aid'/HexAdapter(GreedyBytes)) + _construct = Struct('aid'/GreedyBytes) # TS 102 223 Section 8.61 class AccessTechnology(COMPR_TLV_IE, tag=0xBF): @@ -546,35 +546,35 @@ BearerTechId = Enum(Int8ub, technology_independent=0, bluetooth=1, irda=2, rs232=3, usb=4) _construct = Struct('local_bearer_technology'/BearerTechId, 'service_identifier'/Int8ub, - 'service_record'/HexAdapter(GreedyBytes)) + 'service_record'/GreedyBytes) # TS 102 223 Section 8.64 class DeviceFilter(COMPR_TLV_IE, tag=0xC2): _construct = Struct('local_bearer_technology'/ServiceRecord.BearerTechId, - 'device_filter'/HexAdapter(GreedyBytes)) + 'device_filter'/GreedyBytes) # TS 102 223 Section 8.65 class ServiceSearchIE(COMPR_TLV_IE, tag=0xC3): _construct = Struct('local_bearer_technology'/ServiceRecord.BearerTechId, - 'service_search'/HexAdapter(GreedyBytes)) + 'service_search'/GreedyBytes) # TS 102 223 Section 8.66 class AttributeInformation(COMPR_TLV_IE, tag=0xC4): _construct = Struct('local_bearer_technology'/ServiceRecord.BearerTechId, - 'attribute_information'/HexAdapter(GreedyBytes)) + 'attribute_information'/GreedyBytes) # TS 102 223 Section 8.68 class RemoteEntityAddress(COMPR_TLV_IE, tag=0xC9): _construct = Struct('coding_type'/Enum(Int8ub, ieee802_16=0, irda=1), - 'address'/HexAdapter(GreedyBytes)) + 'address'/GreedyBytes) # TS 102 223 Section 8.70 class NetworkAccessName(COMPR_TLV_IE, tag=0xC7): _test_de_encode = [ - ( 'c704036e6161', '036e6161' ), + ( 'c704036e6161', h2b('036e6161') ), ] - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # TS 102 223 Section 8.72 class TextAttribute(COMPR_TLV_IE, tag=0xD0): @@ -618,15 +618,15 @@ # TS 102 223 Section 8.82 class MultimediaMessageReference(COMPR_TLV_IE, tag=0xEA): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # TS 102 223 Section 8.83 class MultimediaMessageIdentifier(COMPR_TLV_IE, tag=0xEB): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # TS 102 223 Section 8.85 class MmContentIdentifier(COMPR_TLV_IE, tag=0xEE): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # TS 102 223 Section 8.89 class ActivateDescriptor(COMPR_TLV_IE, tag=0xFB): @@ -649,7 +649,7 @@ # TS 31.111 Section 8.91 class RoutingAreaIdentification(COMPR_TLV_IE, tag=0xF3): _construct = Struct('mcc_mnc'/PlmnAdapter(Bytes(3)), - 'lac'/HexAdapter(Bytes(2)), + 'lac'/Bytes(2), 'rac'/Int8ub) # TS 31.111 Section 8.92 @@ -709,15 +709,15 @@ # TS 102 223 Section 8.99 class EncryptedTlvList(COMPR_TLV_IE, tag=0xA2): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # TS 102 223 Section 8.100 class Mac(COMPR_TLV_IE, tag=0xE0): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # TS 102 223 Section 8.101 class SaTemplate(COMPR_TLV_IE, tag=0xA3): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # TS 102 223 Section 8.103 class RefreshEnforcementPolicy(COMPR_TLV_IE, tag=0xBA): @@ -725,7 +725,7 @@ # TS 102 223 Section 8.104 class DnsServerAddress(COMPR_TLV_IE, tag=0xC0): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # TS 102 223 Section 8.105 class SupportedRadioAccessTechnologies(COMPR_TLV_IE, tag=0xB4): diff --git a/pySim/cdma_ruim.py b/pySim/cdma_ruim.py index f20e77c..0aac683 100644 --- a/pySim/cdma_ruim.py +++ b/pySim/cdma_ruim.py @@ -115,7 +115,7 @@ '''3.4.33 Administrative Data''' _test_de_encode = [ - ( "000000", { 'ms_operation_mode' : 'normal', 'additional_info' : '0000', 'rfu' : '' } ), + ( "000000", { 'ms_operation_mode' : 'normal', 'additional_info' : b'\x00\x00', 'rfu' : b'' } ), ] _test_no_pad = True @@ -134,9 +134,9 @@ # Byte 1: Display Condition 'ms_operation_mode'/Enum(Byte, self.OP_MODE), # Bytes 2-3: Additional information - 'additional_info'/HexAdapter(Bytes(2)), + 'additional_info'/Bytes(2), # Bytes 4..: RFU - 'rfu'/HexAdapter(GreedyBytesRFU), + 'rfu'/GreedyBytesRFU, ) diff --git a/pySim/euicc.py b/pySim/euicc.py index 64eb29c..ccb65be 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -120,7 +120,7 @@ # SGP.22 Section 5.7.7: GetEUICCChallenge class EuiccChallenge(BER_TLV_IE, tag=0x80): - _construct = HexAdapter(Bytes(16)) + _construct = Bytes(16) class GetEuiccChallenge(BER_TLV_IE, tag=0xbf2e, nested=[EuiccChallenge]): pass @@ -128,7 +128,7 @@ class SVN(BER_TLV_IE, tag=0x82): _construct = VersionType class SubjectKeyIdentifier(BER_TLV_IE, tag=0x04): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class EuiccCiPkiListForVerification(BER_TLV_IE, tag=0xa9, nested=[SubjectKeyIdentifier]): pass class EuiccCiPkiListForSigning(BER_TLV_IE, tag=0xaa, nested=[SubjectKeyIdentifier]): @@ -140,15 +140,15 @@ class EuiccFirmwareVer(BER_TLV_IE, tag=0x83): _construct = VersionType class ExtCardResource(BER_TLV_IE, tag=0x84): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class UiccCapability(BER_TLV_IE, tag=0x85): - _construct = HexAdapter(GreedyBytes) # FIXME + _construct = GreedyBytes # FIXME class TS102241Version(BER_TLV_IE, tag=0x86): _construct = VersionType class GlobalPlatformVersion(BER_TLV_IE, tag=0x87): _construct = VersionType class RspCapability(BER_TLV_IE, tag=0x88): - _construct = HexAdapter(GreedyBytes) # FIXME + _construct = GreedyBytes # FIXME class EuiccCategory(BER_TLV_IE, tag=0x8b): _construct = Enum(Int8ub, other=0, basicEuicc=1, mediumEuicc=2, contactlessEuicc=3) class PpVersion(BER_TLV_IE, tag=0x04): @@ -211,7 +211,7 @@ class ProfileInfoListReq(BER_TLV_IE, tag=0xbf2d, nested=[TagList]): # FIXME: SearchCriteria pass class IsdpAid(BER_TLV_IE, tag=0x4f): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class ProfileState(BER_TLV_IE, tag=0x9f70): _construct = Enum(Int8ub, disabled=0, enabled=1) class ProfileNickname(BER_TLV_IE, tag=0x90): @@ -281,7 +281,7 @@ # SGP.22 Section 5.7.20 GetEID class EidValue(BER_TLV_IE, tag=0x5a): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class GetEuiccData(BER_TLV_IE, tag=0xbf3e, nested=[TagList, EidValue]): pass @@ -373,7 +373,7 @@ ged_cmd = GetEuiccData(children=[TagList(decoded=[0x5A])]) ged = CardApplicationISDR.store_data_tlv(scc, ged_cmd, GetEuiccData) d = ged.to_dict() - return flatten_dict_lists(d['get_euicc_data'])['eid_value'] + return b2h(flatten_dict_lists(d['get_euicc_data'])['eid_value']) def decode_select_response(self, data_hex: Hexstr) -> object: t = FciTemplate() diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index d82bd08..bfd5e5d 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -318,7 +318,7 @@ # GlobalPlatform v2.3.1 Section 11.3.3.1.3 class ApplicationAID(BER_TLV_IE, tag=0x4f): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class ApplicationTemplate(BER_TLV_IE, tag=0x61, ntested=[ApplicationAID]): pass class ListOfApplications(BER_TLV_IE, tag=0x2f00, nested=[ApplicationTemplate]): @@ -425,10 +425,10 @@ pass class IssuerIdentificationNumber(BER_TLV_IE, tag=0x42): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class CardImageNumber(BER_TLV_IE, tag=0x45): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class SequenceCounterOfDefaultKvn(BER_TLV_IE, tag=0xc1): _construct = GreedyInteger() @@ -487,7 +487,7 @@ # Section 11.4.3.1 Table 11-36 class ExecutableLoadFileAID(BER_TLV_IE, tag=0xc4): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # Section 11.4.3.1 Table 11-36 class ExecutableLoadFileVersionNumber(BER_TLV_IE, tag=0xce): @@ -495,15 +495,15 @@ # specification. It shall consist of the version information contained in the original Load File: on a # Java Card based card, this version number represents the major and minor version attributes of the # original Load File Data Block. - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # Section 11.4.3.1 Table 11-36 class ExecutableModuleAID(BER_TLV_IE, tag=0x84): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # Section 11.4.3.1 Table 11-36 class AssociatedSecurityDomainAID(BER_TLV_IE, tag=0xcc): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # Section 11.4.3.1 Table 11-36 class GpRegistryRelatedData(BER_TLV_IE, tag=0xe3, nested=[ApplicationAID, LifeCycleState, Privileges, @@ -640,8 +640,8 @@ # Table 11-68: Key Data Field - Format 1 (Basic Format) KeyDataBasic = GreedyRange(Struct('key_type'/KeyType, - 'kcb'/HexAdapter(Prefixed(Int8ub, GreedyBytes)), - 'kcv'/HexAdapter(Prefixed(Int8ub, GreedyBytes)))) + 'kcb'/Prefixed(Int8ub, GreedyBytes), + 'kcv'/Prefixed(Int8ub, GreedyBytes))) def put_key(self, old_kvn:int, kvn: int, kid: int, key_dict: dict) -> bytes: """Perform the GlobalPlatform PUT KEY command in order to store a new key on the card. @@ -704,7 +704,7 @@ def set_status(self, scope:str, status:str, aid:Hexstr = ''): SetStatus = Struct(Const(0x80, Byte), Const(0xF0, Byte), 'scope'/SetStatusScope, 'status'/CLifeCycleState, - 'aid'/HexAdapter(Prefixed(Int8ub, COptional(GreedyBytes)))) + 'aid'/Prefixed(Int8ub, COptional(GreedyBytes))) apdu = build_construct(SetStatus, {'scope':scope, 'status':status, 'aid':aid}) _data, _sw = self._cmd.lchan.scc.send_apdu_checksw(b2h(apdu)) @@ -738,12 +738,12 @@ @cmd2.with_argparser(inst_inst_parser) def do_install_for_install(self, opts): """Perform GlobalPlatform INSTALL [for install] command in order to install an application.""" - InstallForInstallCD = Struct('load_file_aid'/HexAdapter(Prefixed(Int8ub, GreedyBytes)), - 'module_aid'/HexAdapter(Prefixed(Int8ub, GreedyBytes)), - 'application_aid'/HexAdapter(Prefixed(Int8ub, GreedyBytes)), + InstallForInstallCD = Struct('load_file_aid'/Prefixed(Int8ub, GreedyBytes), + 'module_aid'/Prefixed(Int8ub, GreedyBytes), + 'application_aid'/Prefixed(Int8ub, GreedyBytes), 'privileges'/Prefixed(Int8ub, Privileges._construct), - 'install_parameters'/HexAdapter(Prefixed(Int8ub, GreedyBytes)), - 'install_token'/HexAdapter(Prefixed(Int8ub, GreedyBytes))) + 'install_parameters'/Prefixed(Int8ub, GreedyBytes), + 'install_token'/Prefixed(Int8ub, GreedyBytes)) p1 = 0x04 if opts.make_selectable: p1 |= 0x08 @@ -770,11 +770,11 @@ """Perform GlobalPlatform INSTALL [for load] command in order to prepare to load an application.""" if opts.load_token != '' and opts.load_file_hash == '': raise ValueError('Load File Data Block Hash is mandatory if a Load Token is present') - InstallForLoadCD = Struct('load_file_aid'/HexAdapter(Prefixed(Int8ub, GreedyBytes)), - 'security_domain_aid'/HexAdapter(Prefixed(Int8ub, GreedyBytes)), - 'load_file_hash'/HexAdapter(Prefixed(Int8ub, GreedyBytes)), - 'load_parameters'/HexAdapter(Prefixed(Int8ub, GreedyBytes)), - 'load_token'/HexAdapter(Prefixed(Int8ub, GreedyBytes))) + InstallForLoadCD = Struct('load_file_aid'/Prefixed(Int8ub, GreedyBytes), + 'security_domain_aid'/Prefixed(Int8ub, GreedyBytes), + 'load_file_hash'/Prefixed(Int8ub, GreedyBytes), + 'load_parameters'/Prefixed(Int8ub, GreedyBytes), + 'load_token'/Prefixed(Int8ub, GreedyBytes)) ifl_bytes = build_construct(InstallForLoadCD, vars(opts)) self.install(0x02, 0x00, b2h(ifl_bytes)) diff --git a/pySim/global_platform/install_param.py b/pySim/global_platform/install_param.py index 45d1d1a..ec0ef66 100644 --- a/pySim/global_platform/install_param.py +++ b/pySim/global_platform/install_param.py @@ -23,7 +23,7 @@ class AppSpecificParams(BER_TLV_IE, tag=0xC9): # GPD_SPE_013, table 11-49 - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class VolatileMemoryQuota(BER_TLV_IE, tag=0xC7): # GPD_SPE_013, table 11-49 @@ -36,7 +36,7 @@ class StkParameter(BER_TLV_IE, tag=0xCA): # GPD_SPE_013, table 11-49 # ETSI TS 102 226, section 8.2.1.3.2.1 - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class SystemSpecificParams(BER_TLV_IE, tag=0xEF, nested=[VolatileMemoryQuota, NonVolatileMemoryQuota, StkParameter]): # GPD_SPE_013 v1.1 Table 6-5 diff --git a/pySim/gsm_r.py b/pySim/gsm_r.py index 5798df7..9a71119 100644 --- a/pySim/gsm_r.py +++ b/pySim/gsm_r.py @@ -184,13 +184,13 @@ class EF_Shunting(TransparentEF): """Section 7.6""" _test_de_encode = [ - ( "03f8ffffff000000", { "common_gid": 3, "shunting_gid": "f8ffffff000000" } ), + ( "03f8ffffff000000", { "common_gid": 3, "shunting_gid": h2b("f8ffffff000000") } ), ] def __init__(self): super().__init__(fid='6ff4', sfid=None, name='EF.Shunting', desc='Shunting', size=(8, 8)) self._construct = Struct('common_gid'/Int8ub, - 'shunting_gid'/HexAdapter(Bytes(7))) + 'shunting_gid'/Bytes(7)) class EF_GsmrPLMN(LinFixedEF): @@ -199,13 +199,13 @@ ( "22f860f86f8d6f8e01", { "plmn": "228-06", "class_of_network": { "supported": { "vbs": True, "vgcs": True, "emlpp": True, "fn": True, "eirene": True }, "preference": 0 }, - "ic_incoming_ref_tbl": "6f8d", "outgoing_ref_tbl": "6f8e", - "ic_table_ref": "01" } ), + "ic_incoming_ref_tbl": h2b("6f8d"), "outgoing_ref_tbl": h2b("6f8e"), + "ic_table_ref": h2b("01") } ), ( "22f810416f8d6f8e02", { "plmn": "228-01", "class_of_network": { "supported": { "vbs": False, "vgcs": False, "emlpp": False, "fn": True, "eirene": False }, "preference": 1 }, - "ic_incoming_ref_tbl": "6f8d", "outgoing_ref_tbl": "6f8e", - "ic_table_ref": "02" } ), + "ic_incoming_ref_tbl": h2b("6f8d"), "outgoing_ref_tbl": h2b("6f8e"), + "ic_table_ref": h2b("02") } ), ] def __init__(self): super().__init__(fid='6ff5', sfid=None, name='EF.GsmrPLMN', @@ -213,24 +213,24 @@ self._construct = Struct('plmn'/PlmnAdapter(Bytes(3)), 'class_of_network'/BitStruct('supported'/FlagsEnum(BitsInteger(5), vbs=1, vgcs=2, emlpp=4, fn=8, eirene=16), 'preference'/BitsInteger(3)), - 'ic_incoming_ref_tbl'/HexAdapter(Bytes(2)), - 'outgoing_ref_tbl'/HexAdapter(Bytes(2)), - 'ic_table_ref'/HexAdapter(Bytes(1))) + 'ic_incoming_ref_tbl'/Bytes(2), + 'outgoing_ref_tbl'/Bytes(2), + 'ic_table_ref'/Bytes(1)) class EF_IC(LinFixedEF): """Section 7.8""" _test_de_encode = [ - ( "f06f8e40f10001", { "next_table_type": "decision", "id_of_next_table": "6f8e", + ( "f06f8e40f10001", { "next_table_type": "decision", "id_of_next_table": h2b("6f8e"), "ic_decision_value": "041f", "network_string_table_index": 1 } ), - ( "ffffffffffffff", { "next_table_type": "empty", "id_of_next_table": "ffff", + ( "ffffffffffffff", { "next_table_type": "empty", "id_of_next_table": h2b("ffff"), "ic_decision_value": "ffff", "network_string_table_index": 65535 } ), ] def __init__(self): super().__init__(fid='6f8d', sfid=None, name='EF.IC', desc='International Code', rec_len=(7, 7)) self._construct = Struct('next_table_type'/NextTableType, - 'id_of_next_table'/HexAdapter(Bytes(2)), + 'id_of_next_table'/Bytes(2), 'ic_decision_value'/BcdAdapter(Bytes(2)), 'network_string_table_index'/Int16ub) @@ -252,18 +252,18 @@ class EF_Switching(LinFixedEF): """Section 8.4""" _test_de_encode = [ - ( "f26f87f0ff00", { "next_table_type": "num_dial_digits", "id_of_next_table": "6f87", + ( "f26f87f0ff00", { "next_table_type": "num_dial_digits", "id_of_next_table": h2b("6f87"), "decision_value": "0fff", "string_table_index": 0 } ), - ( "f06f8ff1ff01", { "next_table_type": "decision", "id_of_next_table": "6f8f", + ( "f06f8ff1ff01", { "next_table_type": "decision", "id_of_next_table": h2b("6f8f"), "decision_value": "1fff", "string_table_index": 1 } ), - ( "f16f89f5ff05", { "next_table_type": "predefined", "id_of_next_table": "6f89", + ( "f16f89f5ff05", { "next_table_type": "predefined", "id_of_next_table": h2b("6f89"), "decision_value": "5fff", "string_table_index": 5 } ), ] def __init__(self, fid='1234', name='Switching', desc=None): super().__init__(fid=fid, sfid=None, name=name, desc=desc, rec_len=(6, 6)) self._construct = Struct('next_table_type'/NextTableType, - 'id_of_next_table'/HexAdapter(Bytes(2)), + 'id_of_next_table'/Bytes(2), 'decision_value'/BcdAdapter(Bytes(2)), 'string_table_index'/Int8ub) @@ -271,12 +271,12 @@ class EF_Predefined(LinFixedEF): """Section 8.5""" _test_de_encode = [ - ( "f26f85", 1, { "next_table_type": "num_dial_digits", "id_of_next_table": "6f85" } ), + ( "f26f85", 1, { "next_table_type": "num_dial_digits", "id_of_next_table": h2b("6f85") } ), ( "f0ffc8", 2, { "predefined_value1": "0fff", "string_table_index1": 200 } ), ] # header and other records have different structure. WTF !?! construct_first = Struct('next_table_type'/NextTableType, - 'id_of_next_table'/HexAdapter(Bytes(2))) + 'id_of_next_table'/Bytes(2)) construct_others = Struct('predefined_value1'/BcdAdapter(Bytes(2)), 'string_table_index1'/Int8ub) @@ -301,13 +301,13 @@ class EF_DialledVals(TransparentEF): """Section 8.6""" _test_de_encode = [ - ( "ffffff22", { "next_table_type": "empty", "id_of_next_table": "ffff", "dialed_digits": "22" } ), - ( "f16f8885", { "next_table_type": "predefined", "id_of_next_table": "6f88", "dialed_digits": "58" }), + ( "ffffff22", { "next_table_type": "empty", "id_of_next_table": h2b("ffff"), "dialed_digits": "22" } ), + ( "f16f8885", { "next_table_type": "predefined", "id_of_next_table": h2b("6f88"), "dialed_digits": "58" }), ] def __init__(self, fid='1234', name='DialledVals', desc=None): super().__init__(fid=fid, sfid=None, name=name, desc=desc, size=(4, 4)) self._construct = Struct('next_table_type'/NextTableType, - 'id_of_next_table'/HexAdapter(Bytes(2)), + 'id_of_next_table'/Bytes(2), 'dialed_digits'/BcdAdapter(Bytes(1))) diff --git a/pySim/sms.py b/pySim/sms.py index 7c22c75..aefc874 100644 --- a/pySim/sms.py +++ b/pySim/sms.py @@ -23,7 +23,7 @@ from construct import Int8ub, Byte, Bit, Flag, BitsInteger from construct import Struct, Enum, Tell, BitStruct, this, Padding from construct import Prefixed, GreedyRange -from osmocom.construct import HexAdapter, BcdAdapter, TonNpi, Bytes, GreedyBytes +from osmocom.construct import BcdAdapter, TonNpi, Bytes, GreedyBytes from osmocom.utils import Hexstr, h2b, b2h from smpp.pdu import pdu_types, operations diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index 438df23..17abfa8 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -51,13 +51,13 @@ ( 'f1030331323334ffffffff0a0a3132333435363738', { 'state': { 'valid': True, 'change_able': True, 'unblock_able': True, 'disable_able': True, 'not_initialized': False, 'disabled': True }, - 'attempts_remaining': 3, 'maximum_attempts': 3, 'pin': '31323334', - 'puk': { 'attempts_remaining': 10, 'maximum_attempts': 10, 'puk': '3132333435363738' } + 'attempts_remaining': 3, 'maximum_attempts': 3, 'pin': b'1234', + 'puk': { 'attempts_remaining': 10, 'maximum_attempts': 10, 'puk': b'12345678' } } ), ( 'f003039999999999999999', { 'state': { 'valid': True, 'change_able': True, 'unblock_able': True, 'disable_able': True, 'not_initialized': False, 'disabled': False }, - 'attempts_remaining': 3, 'maximum_attempts': 3, 'pin': '9999999999999999', + 'attempts_remaining': 3, 'maximum_attempts': 3, 'pin': h2b('9999999999999999'), 'puk': None } ), ] def __init__(self, fid='6f01', name='EF.CHV1'): @@ -66,29 +66,32 @@ change_able=0x40, valid=0x80) PukStruct = Struct('attempts_remaining'/Int8ub, 'maximum_attempts'/Int8ub, - 'puk'/HexAdapter(Rpad(Bytes(8)))) + 'puk'/Rpad(Bytes(8))) self._construct = Struct('state'/StateByte, 'attempts_remaining'/Int8ub, 'maximum_attempts'/Int8ub, - 'pin'/HexAdapter(Rpad(Bytes(8))), + 'pin'/Rpad(Bytes(8)), 'puk'/COptional(PukStruct)) class EF_MILENAGE_CFG(TransparentEF): _test_de_encode = [ ( '40002040600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000020000000000000000000000000000000400000000000000000000000000000008', - {"r1": 64, "r2": 0, "r3": 32, "r4": 64, "r5": 96, "c1": "00000000000000000000000000000000", "c2": - "00000000000000000000000000000001", "c3": "00000000000000000000000000000002", "c4": - "00000000000000000000000000000004", "c5": "00000000000000000000000000000008"} ), + {"r1": 64, "r2": 0, "r3": 32, "r4": 64, "r5": 96, + "c1": h2b("00000000000000000000000000000000"), + "c2": h2b("00000000000000000000000000000001"), + "c3": h2b("00000000000000000000000000000002"), + "c4": h2b("00000000000000000000000000000004"), + "c5": h2b("00000000000000000000000000000008")} ), ] def __init__(self, fid='6f21', name='EF.MILENAGE_CFG', desc='Milenage connfiguration'): super().__init__(fid, name=name, desc=desc) self._construct = Struct('r1'/Int8ub, 'r2'/Int8ub, 'r3'/Int8ub, 'r4'/Int8ub, 'r5'/Int8ub, - 'c1'/HexAdapter(Bytes(16)), - 'c2'/HexAdapter(Bytes(16)), - 'c3'/HexAdapter(Bytes(16)), - 'c4'/HexAdapter(Bytes(16)), - 'c5'/HexAdapter(Bytes(16))) + 'c1'/Bytes(16), + 'c2'/Bytes(16), + 'c3'/Bytes(16), + 'c4'/Bytes(16), + 'c5'/Bytes(16)) class EF_0348_KEY(LinFixedEF): @@ -102,18 +105,18 @@ self._construct = Struct('security_domain'/Int8ub, 'key_set_version'/Int8ub, 'key_len_and_type'/KeyLenAndType, - 'key'/HexAdapter(Bytes(this.key_len_and_type.key_length))) + 'key'/Bytes(this.key_len_and_type.key_length)) class EF_0348_COUNT(LinFixedEF): _test_de_encode = [ - ( 'fe010000000000', {"sec_domain": 254, "key_set_version": 1, "counter": "0000000000"} ), + ( 'fe010000000000', {"sec_domain": 254, "key_set_version": 1, "counter": h2b("0000000000")} ), ] def __init__(self, fid='6f23', name='EF.0348_COUNT', desc='TS 03.48 OTA Counters'): super().__init__(fid, name=name, desc=desc, rec_len=(7, 7)) self._construct = Struct('sec_domain'/Int8ub, 'key_set_version'/Int8ub, - 'counter'/HexAdapter(Bytes(5))) + 'counter'/Bytes(5)) class EF_SIM_AUTH_COUNTER(TransparentEF): @@ -145,8 +148,9 @@ class EF_SIM_AUTH_KEY(TransparentEF): _test_de_encode = [ ( '14000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f', - {"cfg": {"sres_deriv_func": 1, "use_opc_instead_of_op": True, "algorithm": "milenage"}, "key": - "000102030405060708090a0b0c0d0e0f", "op_opc": "101112131415161718191a1b1c1d1e1f"} ), + {"cfg": {"sres_deriv_func": 1, "use_opc_instead_of_op": True, "algorithm": "milenage"}, + "key": h2b("000102030405060708090a0b0c0d0e0f"), + "op_opc": h2b("101112131415161718191a1b1c1d1e1f")} ), ] def __init__(self, fid='6f20', name='EF.SIM_AUTH_KEY'): super().__init__(fid, name=name, desc='USIM authentication key') @@ -155,8 +159,8 @@ 'use_opc_instead_of_op'/Flag, 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3)) self._construct = Struct('cfg'/CfgByte, - 'key'/HexAdapter(Bytes(16)), - 'op_opc' /HexAdapter(Bytes(16))) + 'key'/Bytes(16), + 'op_opc' /Bytes(16)) class DF_SYSTEM(CardDF): @@ -209,13 +213,13 @@ _test_de_encode = [ ( '141898d827f70120d33b3e7462ee5fd6fe6ca53d7a0a804561646816d7b0c702fb', { "cfg": { "only_4bytes_res_in_3g": False, "sres_deriv_func_in_2g": 1, "use_opc_instead_of_op": True, "algorithm": "milenage" }, - "key": "1898d827f70120d33b3e7462ee5fd6fe", "op_opc": "6ca53d7a0a804561646816d7b0c702fb" } ), + "key": h2b("1898d827f70120d33b3e7462ee5fd6fe"), "op_opc": h2b("6ca53d7a0a804561646816d7b0c702fb") } ), ( '160a04101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f000102030405060708090a0b0c0d0e0f', { "cfg" : { "algorithm" : "tuak", "key_length" : 128, "sres_deriv_func_in_2g" : 1, "use_opc_instead_of_op" : True }, "tuak_cfg" : { "ck_and_ik_size" : 128, "mac_size" : 128, "res_size" : 128 }, "num_of_keccak_iterations" : 4, - "k" : "000102030405060708090a0b0c0d0e0f", - "op_opc" : "101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f" + "k" : h2b("000102030405060708090a0b0c0d0e0f"), + "op_opc" : h2b("101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f") } ), ] def __init__(self, fid='af20', name='EF.USIM_AUTH_KEY'): @@ -226,8 +230,8 @@ 'use_opc_instead_of_op'/Mapping(Bit, {False:0, True:1}), 'algorithm'/Algorithm) self._construct = Struct('cfg'/CfgByte, - 'key'/HexAdapter(Bytes(16)), - 'op_opc' /HexAdapter(Bytes(16))) + 'key'/Bytes(16), + 'op_opc'/Bytes(16)) # TUAK has a rather different layout for the data, so we define a different # construct below and use explicit _{decode,encode}_bin() methods for separating # the TUAK and non-TUAK situation @@ -243,8 +247,8 @@ self._constr_tuak = Struct('cfg'/CfgByteTuak, 'tuak_cfg'/TuakCfgByte, 'num_of_keccak_iterations'/Int8ub, - 'op_opc'/HexAdapter(Bytes(32)), - 'k'/HexAdapter(Bytes(this.cfg.key_length//8))) + 'op_opc'/Bytes(32), + 'k'/Bytes(this.cfg.key_length//8)) def _decode_bin(self, raw_bin_data: bytearray) -> dict: if raw_bin_data[0] & 0x0F == 0x06: @@ -263,8 +267,9 @@ _test_de_encode = [ ( '14000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f', {"cfg": {"only_4bytes_res_in_3g": False, "sres_deriv_func_in_2g": 1, "use_opc_instead_of_op": True, - "algorithm": "milenage"}, "key": "000102030405060708090a0b0c0d0e0f", "op_opc": - "101112131415161718191a1b1c1d1e1f"} ), + "algorithm": "milenage"}, + "key": h2b("000102030405060708090a0b0c0d0e0f"), + "op_opc": h2b("101112131415161718191a1b1c1d1e1f")} ), ] def __init__(self, fid='af22', name='EF.USIM_AUTH_KEY_2G'): super().__init__(fid, name=name, desc='USIM authentication key in 2G context') @@ -273,8 +278,8 @@ 'use_opc_instead_of_op'/Flag, 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3, xor=14)) self._construct = Struct('cfg'/CfgByte, - 'key'/HexAdapter(Bytes(16)), - 'op_opc' /HexAdapter(Bytes(16))) + 'key'/Bytes(16), + 'op_opc'/Bytes(16)) class EF_GBA_SK(TransparentEF): diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 5508be7..d97b3cf 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -119,11 +119,11 @@ # ETSI TS 102 221 11.1.1.4.4 class FileIdentifier(BER_TLV_IE, tag=0x83): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # ETSI TS 102 221 11.1.1.4.5 class DfName(BER_TLV_IE, tag=0x84): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes # ETSI TS 102 221 11.1.1.4.6.1 class UiccCharacteristics(BER_TLV_IE, tag=0x80): @@ -217,7 +217,7 @@ # ETSI TS 102 221 11.1.1.4.7.3 class SecurityAttribReferenced(BER_TLV_IE, tag=0x8b): # TODO: longer format with SEID - _construct = Struct('ef_arr_file_id'/HexAdapter(Bytes(2)), 'ef_arr_record_nr'/Int8ub) + _construct = Struct('ef_arr_file_id'/Bytes(2), 'ef_arr_record_nr'/Int8ub) # ETSI TS 102 221 11.1.1.4.8 class ShortFileIdentifier(BER_TLV_IE, tag=0x88): diff --git a/pySim/ts_102_310.py b/pySim/ts_102_310.py index e4c1b92..8764933 100644 --- a/pySim/ts_102_310.py +++ b/pySim/ts_102_310.py @@ -27,9 +27,9 @@ # TS102 310 Section 7.1 class EF_EAPKEYS(TransparentEF): class Msk(BER_TLV_IE, tag=0x80): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class Emsk(BER_TLV_IE, tag=0x81): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class MskCollection(TLV_IE_Collection, nested=[EF_EAPKEYS.Msk, EF_EAPKEYS.Emsk]): pass diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 1795341..d33ec44 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -217,7 +217,7 @@ # 3gPP TS 31.102 Section 7.5.2.1 class SUCI_TlvDataObject(BER_TLV_IE, tag=0xA1): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes ###################################################################### # ADF.USIM @@ -230,7 +230,7 @@ _construct = Int8ub class K_AMF(BER_TLV_IE, tag=0x81): - _construct = HexAdapter(Bytes(32)) + _construct = Bytes(32) class UplinkNASCount(BER_TLV_IE, tag=0x82): _construct = Int32ub @@ -260,10 +260,10 @@ # 3GPP TS 31.102 Section 4.4.11.6 class EF_5GAUTHKEYS(TransparentEF): class K_AUSF(BER_TLV_IE, tag=0x80): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class K_SEAF(BER_TLV_IE, tag=0x81): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class FiveGAuthKeys(TLV_IE_Collection, nested=[K_AUSF, K_SEAF]): pass @@ -281,9 +281,9 @@ "identifier": 0, "key_index": 0}], "hnet_pubkey_list": [{"hnet_pubkey_identifier": 10, "hnet_pubkey": - "4e858c4d49d1343e6181284c47ca721730c98742cb7c6182d2e8126e08088d36"}, + h2b("4e858c4d49d1343e6181284c47ca721730c98742cb7c6182d2e8126e08088d36")}, {"hnet_pubkey_identifier": 11, "hnet_pubkey": - "d1bc365f4997d17ce4374e72181431cbfeba9e1b98d7618f79d48561b144672a"}]} ), + h2b("d1bc365f4997d17ce4374e72181431cbfeba9e1b98d7618f79d48561b144672a")}]} ), ] # 3GPP TS 31.102 Section 4.4.11.8 class ProtSchemeIdList(BER_TLV_IE, tag=0xa0): @@ -298,7 +298,7 @@ class HnetPubkey(BER_TLV_IE, tag=0x81): # contents according to RFC 7748 / RFC 5480 - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class HnetPubkeyList(BER_TLV_IE, tag=0xa1, nested=[HnetPubkeyIdentifier, HnetPubkey]): pass @@ -425,7 +425,7 @@ desc='Ciphering and Integrity Keys'): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) self._construct = Struct( - 'ksi'/Int8ub, 'ck'/HexAdapter(Bytes(16)), 'ik'/HexAdapter(Bytes(16))) + 'ksi'/Int8ub, 'ck'/Bytes(16), 'ik'/Bytes(16)) # TS 31.102 Section 4.2.6 class EF_HPPLMN(TransparentEF): @@ -536,15 +536,15 @@ class EF_LOCI(TransparentEF): _test_de_encode = [ ( '47d1264a62f21037211e00', - { "tmsi": "47d1264a", "lai": { "mcc_mnc": "262-01", "lac": "3721" }, + { "tmsi": h2b("47d1264a"), "lai": { "mcc_mnc": "262-01", "lac": h2b("3721") }, "rfu": 30, "lu_status": 0 } ), ( 'ffffffff62f2200000ff01', - {"tmsi": "ffffffff", "lai": {"mcc_mnc": "262-02", "lac": "0000"}, "rfu": 255, "lu_status": 1} ), + {"tmsi": h2b("ffffffff"), "lai": {"mcc_mnc": "262-02", "lac": h2b("0000") }, "rfu": 255, "lu_status": 1} ), ] def __init__(self, fid='6f7e', sfid=0x0b, name='EF.LOCI', desc='Location information', size=(11, 11)): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) - Lai = Struct('mcc_mnc'/PlmnAdapter(Bytes(3)), 'lac'/HexAdapter(Bytes(2))) - self._construct = Struct('tmsi'/HexAdapter(Bytes(4)), 'lai'/Lai, 'rfu'/Int8ub, 'lu_status'/Int8ub) + Lai = Struct('mcc_mnc'/PlmnAdapter(Bytes(3)), 'lac'/Bytes(2)) + self._construct = Struct('tmsi'/Bytes(4), 'lai'/Lai, 'rfu'/Int8ub, 'lu_status'/Int8ub) # TS 31.102 Section 4.2.18 class EF_AD(TransparentEF): @@ -585,15 +585,15 @@ class EF_PSLOCI(TransparentEF): def __init__(self, fid='6f73', sfid=0x0c, name='EF.PSLOCI', desc='PS Location information', size=(14, 14)): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) - self._construct = Struct('ptmsi'/HexAdapter(Bytes(4)), 'ptmsi_sig'/HexAdapter(Bytes(3)), - 'rai'/HexAdapter(Bytes(6)), 'rau_status'/Int8ub) + self._construct = Struct('ptmsi'/Bytes(4), 'ptmsi_sig'/Bytes(3), + 'rai'/Bytes(6), 'rau_status'/Int8ub) # TS 31.102 Section 4.2.33 class EF_ICI(CyclicEF): def __init__(self, fid='6f80', sfid=0x14, name='EF.ICI', rec_len=(28, 48), desc='Incoming Call Information', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) - self._construct = Struct('alpha_id'/HexAdapter(Bytes(this._.total_len-28)), + self._construct = Struct('alpha_id'/Bytes(this._.total_len-28), 'len_of_bcd_contents'/Int8ub, 'ton_npi'/Int8ub, 'call_number'/BcdAdapter(Bytes(10)), @@ -602,14 +602,14 @@ 'date_and_time'/BcdAdapter(Bytes(7)), 'duration'/Int24ub, 'status'/Byte, - 'link_to_phonebook'/HexAdapter(Bytes(3))) + 'link_to_phonebook'/Bytes(3)) # TS 31.102 Section 4.2.34 class EF_OCI(CyclicEF): def __init__(self, fid='6f81', sfid=0x15, name='EF.OCI', rec_len=(27, 47), desc='Outgoing Call Information', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) - self._construct = Struct('alpha_id'/HexAdapter(Bytes(this._.total_len-27)), + self._construct = Struct('alpha_id'/Bytes(this._.total_len-27), 'len_of_bcd_contents'/Int8ub, 'ton_npi'/Int8ub, 'call_number'/BcdAdapter(Bytes(10)), @@ -617,7 +617,7 @@ 'ext5_record_id'/Int8ub, 'date_and_time'/BcdAdapter(Bytes(7)), 'duration'/Int24ub, - 'link_to_phonebook'/HexAdapter(Bytes(3))) + 'link_to_phonebook'/Bytes(3)) # TS 31.102 Section 4.2.35 class EF_ICT(CyclicEF): @@ -655,7 +655,7 @@ def __init__(self, fid='6f57', sfid=None, name='EF.ACL', size=(32, None), desc='Access Point Name Control List', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) - self._construct = Struct('num_of_apns'/Int8ub, 'tlvs'/HexAdapter(GreedyBytes)) + self._construct = Struct('num_of_apns'/Int8ub, 'tlvs'/GreedyBytes) # TS 31.102 Section 4.2.51 class EF_START_HFN(TransparentEF): @@ -705,16 +705,16 @@ def __init__(self, fid='6fd7', sfid=None, name='EF.MSK', desc='MBMS Service Key List', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=(20, None), **kwargs) msk_ts_constr = Struct('msk_id'/Int32ub, 'timestamp_counter'/Int32ub) - self._construct = Struct('key_domain_id'/HexAdapter(Bytes(3)), + self._construct = Struct('key_domain_id'/Bytes(3), 'num_msk_id'/Int8ub, 'msk_ids'/msk_ts_constr[this.num_msk_id]) # TS 31.102 Section 4.2.81 class EF_MUK(LinFixedEF): class MUK_Idr(BER_TLV_IE, tag=0x80): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class MUK_Idi(BER_TLV_IE, tag=0x82): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class MUK_ID(BER_TLV_IE, tag=0xA0, nested=[MUK_Idr, MUK_Idi]): pass @@ -732,10 +732,10 @@ # TS 31.102 Section 4.2.83 class EF_GBANL(LinFixedEF): class NAF_ID(BER_TLV_IE, tag=0x80): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class B_TID(BER_TLV_IE, tag=0x81): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class EF_GBANL_Collection(BER_TLV_IE, nested=[NAF_ID, B_TID]): pass @@ -759,7 +759,7 @@ # TS 31.102 Section 4.2.87 class EF_NAFKCA(LinFixedEF): class NAF_KeyCentreAddress(BER_TLV_IE, tag=0x80): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes def __init__(self, fid='6fdd', sfid=None, name='EF.NAFKCA', rec_len=(None, None), desc='NAF Key Centre Address', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) @@ -770,11 +770,11 @@ class DataDestAddrRange(TLV_IE, tag=0x83): _construct = Struct('type_of_address'/Enum(Byte, IPv4=0x21, IPv6=0x56), 'prefix_length'/Int8ub, - 'prefix'/HexAdapter(GreedyBytes)) + 'prefix'/GreedyBytes) class AccessPointName(TLV_IE, tag=0x80): # coded as per TS 23.003 - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class Login(TLV_IE, tag=0x81): # as per SMS DCS TS 23.038 @@ -803,8 +803,8 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) upd_status_constr = Enum( Byte, updated=0, not_updated=1, roaming_not_allowed=2) - self._construct = Struct('guti'/HexAdapter(Bytes(12)), - 'last_visited_registered_tai'/HexAdapter(Bytes(5)), + self._construct = Struct('guti'/Bytes(12), + 'last_visited_registered_tai'/Bytes(5), 'eps_update_status'/upd_status_constr) # TS 31.102 Section 4.2.92 @@ -813,7 +813,7 @@ _construct = Int8ub class K_ASME(BER_TLV_IE, tag=0x81): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class UplinkNASCount(BER_TLV_IE, tag=0x82): _construct = Int32ub @@ -822,7 +822,7 @@ _construct = Int32ub class IDofNASAlgorithms(BER_TLV_IE, tag=0x84): - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class EPS_NAS_Security_Context(BER_TLV_IE, tag=0xa0, nested=[KSI_ASME, K_ASME, UplinkNASCount, DownlinkNASCount, @@ -1062,8 +1062,8 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) upd_status_constr = Enum( Byte, updated=0, not_updated=1, roaming_not_allowed=2) - self._construct = Struct('5g_guti'/HexAdapter(Bytes(13)), - 'last_visited_registered_tai_in_5gs'/HexAdapter(Bytes(6)), + self._construct = Struct('5g_guti'/Bytes(13), + 'last_visited_registered_tai_in_5gs'/Bytes(6), '5gs_update_status'/upd_status_constr) # TS 31.102 Section 4.4.11.7 (Rel 15) @@ -1083,8 +1083,8 @@ class EF_OPL5G(LinFixedEF): def __init__(self, fid='4f08', sfid=0x08, name='EF.OPL5G', desc='5GS Operator PLMN List', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=(10, None), **kwargs) - Tai = Struct('mcc_mnc'/PlmnAdapter(Bytes(3)), 'tac_min'/HexAdapter(Bytes(3)), - 'tac_max'/HexAdapter(Bytes(3))) + Tai = Struct('mcc_mnc'/PlmnAdapter(Bytes(3)), 'tac_min'/Bytes(3), + 'tac_max'/Bytes(3)) self._construct = Struct('tai'/Tai, 'pnn_record_id'/Int8ub) # TS 31.102 Section 4.4.11.10 (Rel 15) @@ -1119,7 +1119,7 @@ # operator decides to assign less than 4 digits to Routing Indicator, the remaining digits # shall be coded as "1111" to fill the 4 digits coding of Routing Indicator self._construct = Struct('routing_indicator'/Rpad(BcdAdapter(Bytes(2)), 'f', 2), - 'rfu'/HexAdapter(Bytes(2))) + 'rfu'/Bytes(2)) # TS 31.102 Section 4.4.11.13 (Rel 16) class EF_TN3GPPSNN(TransparentEF): @@ -1135,14 +1135,14 @@ def __init__(self, fid='4f0d', sfid=0x0d, name='EF.CAG', desc='Pre-configured CAG information list EF', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) - self._construct = HexAdapter(GreedyBytes) + self._construct = GreedyBytes # TS 31.102 Section 4.4.11.15 (Rel 17) class EF_SOR_CMCI(TransparentEF): def __init__(self, fid='4f0e', sfid=0x0e, name='EF.SOR-CMCI', desc='Steering Of Roaming - Connected Mode Control Information', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) - self._construct = HexAdapter(GreedyBytes) + self._construct = GreedyBytes # TS 31.102 Section 4.4.11.17 (Rel 17) class EF_DRI(TransparentEF): @@ -1153,9 +1153,9 @@ 'parameters_indicator_status'/FlagsEnum(Byte, roaming_wait_range=1, return_wait_range=2, applicability_indicator=3), - 'roaming_wait_range'/HexAdapter(Bytes(2)), - 'return_wait_range'/HexAdapter(Bytes(2)), - 'applicability_indicator'/HexAdapter(Byte)) + 'roaming_wait_range'/Bytes(2), + 'return_wait_range'/Bytes(2), + 'applicability_indicator'/Byte) # TS 31.102 Section 4.4.12.2 (Rel 17) class EF_PWS_SNPN(TransparentEF): @@ -1173,7 +1173,7 @@ self._construct = Struct('assignment_mode'/Enum(Byte, coordinated_ass_opt1=0, self_ass=1, coordinated_ass_opt2=2), - 'network_identifier'/HexAdapter(Bytes(5))) + 'network_identifier'/Bytes(5)) # TS 31.102 Section 4.4.12 (Rel 17) class DF_SNPN(CardDF): @@ -1413,7 +1413,7 @@ 'nid'/COptional(Bytes(6))) class Tmgi(BER_TLV_IE, tag=0x81): TmgiEntry = Struct('tmgi'/Bytes(6), - 'usd_fid'/HexAdapter(Bytes(2)), + 'usd_fid'/Bytes(2), 'service_type'/FlagsEnum(Byte, mbs_service_announcement=1, mbs_user_service=2)) _construct = GreedyRange(TmgiEntry) class NrArfcnList(BER_TLV_IE, tag=0x82): @@ -1482,7 +1482,7 @@ def __init__(self, fid='4f16', sfid=0x16, name='EF.KAUSF_DERIVATION', desc='K_AUSF derivation configuration', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) - self._construct = Struct('k_ausf_deriv_cfg'/FlagsEnum(Byte, use_msk=1), 'rfu'/HexAdapter(GreedyBytes)) + self._construct = Struct('k_ausf_deriv_cfg'/FlagsEnum(Byte, use_msk=1), 'rfu'/GreedyBytes) # TS 31.102 Section 4.4.5 class DF_WLAN(CardDF): @@ -1826,7 +1826,7 @@ do = SUCI_TlvDataObject() do.from_tlv(h2b(data)) do_d = do.to_dict() - self._cmd.poutput('SUCI TLV Data Object: %s' % do_d['suci__tlv_data_object']) + self._cmd.poutput('SUCI TLV Data Object: %s' % b2h(do_d['suci__tlv_data_object'])) # TS 31.102 Section 7.3 diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index b281659..b3f5474 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -167,7 +167,7 @@ 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))) + 'ua_spi'/Bytes(5)) class B_TID(BER_TLV_IE, tag=0x81): _construct = Utf8Adapter(GreedyBytes) # pylint: disable=undefined-variable diff --git a/pySim/ts_31_103_shared.py b/pySim/ts_31_103_shared.py index 8c56923..3355217 100644 --- a/pySim/ts_31_103_shared.py +++ b/pySim/ts_31_103_shared.py @@ -21,7 +21,7 @@ from construct import Struct, Switch, GreedyString, Int8ub, Prefixed, Enum, Byte from osmocom.tlv import BER_TLV_IE, TLV_IE_Collection -from osmocom.construct import Bytes, HexAdapter, Utf8Adapter, GreedyBytes +from osmocom.construct import Bytes, Utf8Adapter, GreedyBytes from pySim.filesystem import * # TS 31.103 Section 4.2.16 @@ -36,7 +36,7 @@ # TS 31.103 Section 4.2.18 class EF_IMSConfigData(BerTlvEF): class ImsConfigDataEncoding(BER_TLV_IE, tag=0x80): - _construct = HexAdapter(Bytes(1)) + _construct = Bytes(1) class ImsConfigData(BER_TLV_IE, tag=0x81): _construct = GreedyString # pylint: disable=undefined-variable @@ -103,7 +103,7 @@ # TS 31.103 Section 4.2.21 class EF_MuDMiDConfigData(BerTlvEF): class MudMidConfigDataEncoding(BER_TLV_IE, tag=0x80): - _construct = HexAdapter(Bytes(1)) + _construct = Bytes(1) class MudMidConfigData(BER_TLV_IE, tag=0x81): _construct = GreedyString # pylint: disable=undefined-variable diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index eb1984e..2dc814b 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -250,7 +250,7 @@ "tp_sc_addr": { "length": 255, "ton_npi": { "ext": True, "type_of_number": "reserved_for_extension", "numbering_plan_id": "reserved_for_extension" }, "call_number": "" }, - "tp_pid": "00", "tp_dcs": "00", "tp_vp_minutes": 1440 } ), + "tp_pid": b"\x00", "tp_dcs": b"\x00", "tp_vp_minutes": 1440 } ), ] _test_no_pad = True class ValidityPeriodAdapter(Adapter): @@ -286,8 +286,8 @@ 'tp_dest_addr'/ScAddr, 'tp_sc_addr'/ScAddr, - 'tp_pid'/HexAdapter(Bytes(1)), - 'tp_dcs'/HexAdapter(Bytes(1)), + 'tp_pid'/Bytes(1), + 'tp_dcs'/Bytes(1), 'tp_vp_minutes'/EF_SMSP.ValidityPeriodAdapter(Byte)) # TS 51.011 Section 10.5.7 @@ -309,14 +309,14 @@ def __init__(self, fid='6f47', sfid=None, name='EF.SMSR', desc='SMS status reports', rec_len=(30, 30), **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct( - 'sms_record_id'/Int8ub, 'sms_status_report'/HexAdapter(Bytes(29))) + 'sms_record_id'/Int8ub, 'sms_status_report'/Bytes(29)) class EF_EXT(LinFixedEF): def __init__(self, fid, sfid=None, name='EF.EXT', desc='Extension', rec_len=(13, 13), **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct( - 'record_type'/Int8ub, 'extension_data'/HexAdapter(Bytes(11)), 'identifier'/Int8ub) + 'record_type'/Int8ub, 'extension_data'/Bytes(11), 'identifier'/Int8ub) # TS 51.011 Section 10.5.16 class EF_CMI(LinFixedEF): @@ -589,11 +589,11 @@ class EF_LOCI(TransparentEF): _test_de_encode = [ ( "7802570222f81009780000", - { "tmsi": "78025702", "lai": "22f8100978", "tmsi_time": 0, "lu_status": "updated" } ), + { "tmsi": h2b("78025702"), "lai": h2b("22f8100978"), "tmsi_time": 0, "lu_status": "updated" } ), ] def __init__(self, fid='6f7e', sfid=None, name='EF.LOCI', desc='Location Information', size=(11, 11)): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) - self._construct = Struct('tmsi'/HexAdapter(Bytes(4)), 'lai'/HexAdapter(Bytes(5)), 'tmsi_time'/Int8ub, + self._construct = Struct('tmsi'/Bytes(4), 'lai'/Bytes(5), 'tmsi_time'/Int8ub, 'lu_status'/Enum(Byte, updated=0, not_updated=1, plmn_not_allowed=2, location_area_not_allowed=3)) @@ -751,22 +751,22 @@ # TS 51.011 Section 10.3.32 class EF_Kc(TransparentEF): _test_de_encode = [ - ( "837d783609a3858f05", { "kc": "837d783609a3858f", "cksn": 5 } ), + ( "837d783609a3858f05", { "kc": h2b("837d783609a3858f"), "cksn": 5 } ), ] def __init__(self, fid='6f20', sfid=None, name='EF.Kc', desc='Ciphering key Kc', size=(9, 9), **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) - self._construct = Struct('kc'/HexAdapter(Bytes(8)), 'cksn'/Int8ub) + self._construct = Struct('kc'/Bytes(8), 'cksn'/Int8ub) # TS 51.011 Section 10.3.33 class EF_LOCIGPRS(TransparentEF): _test_de_encode = [ ( "ffffffffffffff22f8990000ff01", - { "ptmsi": "ffffffff", "ptmsi_sig": "ffffff", "rai": "22f8990000ff", "rau_status": "not_updated" } ), + { "ptmsi": h2b("ffffffff"), "ptmsi_sig": h2b("ffffff"), "rai": h2b("22f8990000ff"), "rau_status": "not_updated" } ), ] def __init__(self, fid='6f53', sfid=None, name='EF.LOCIGPRS', desc='GPRS Location Information', size=(14, 14)): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) - self._construct = Struct('ptmsi'/HexAdapter(Bytes(4)), 'ptmsi_sig'/HexAdapter(Bytes(3)), - 'rai'/HexAdapter(Bytes(6)), + self._construct = Struct('ptmsi'/Bytes(4), 'ptmsi_sig'/Bytes(3), + 'rai'/Bytes(6), 'rau_status'/Enum(Byte, updated=0, not_updated=1, plmn_not_allowed=2, routing_area_not_allowed=3)) @@ -867,12 +867,12 @@ class FullNameForNetwork(BER_TLV_IE, tag=0x43): # TS 24.008 10.5.3.5a # TODO: proper decode - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class ShortNameForNetwork(BER_TLV_IE, tag=0x45): # TS 24.008 10.5.3.5a # TODO: proper decode - _construct = HexAdapter(GreedyBytes) + _construct = GreedyBytes class NetworkNameCollection(TLV_IE_Collection, nested=[FullNameForNetwork, ShortNameForNetwork]): pass @@ -885,14 +885,14 @@ class EF_OPL(LinFixedEF): _test_de_encode = [ ( '62f2100000fffe01', - { "lai": { "mcc_mnc": "262-01", "lac_min": "0000", "lac_max": "fffe" }, "pnn_record_id": 1 } ), + { "lai": { "mcc_mnc": "262-01", "lac_min": h2b("0000"), "lac_max": h2b("fffe") }, "pnn_record_id": 1 } ), ( '216354789abcde12', - { "lai": { "mcc_mnc": "123-456", "lac_min": "789a", "lac_max": "bcde" }, "pnn_record_id": 18 } ), + { "lai": { "mcc_mnc": "123-456", "lac_min": h2b("789a"), "lac_max": h2b("bcde") }, "pnn_record_id": 18 } ), ] def __init__(self, fid='6fc6', sfid=None, name='EF.OPL', rec_len=(8, 8), desc='Operator PLMN List', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct('lai'/Struct('mcc_mnc'/PlmnAdapter(Bytes(3)), - 'lac_min'/HexAdapter(Bytes(2)), 'lac_max'/HexAdapter(Bytes(2))), 'pnn_record_id'/Int8ub) + 'lac_min'/Bytes(2), 'lac_max'/Bytes(2)), 'pnn_record_id'/Int8ub) # TS 51.011 Section 10.3.44 + TS 31.102 4.2.62 class EF_MBI(LinFixedEF): @@ -941,8 +941,8 @@ class EF_MMSN(LinFixedEF): def __init__(self, fid='6fce', sfid=None, name='EF.MMSN', rec_len=(4, 20), desc='MMS Notification', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) - self._construct = Struct('mms_status'/HexAdapter(Bytes(2)), 'mms_implementation'/HexAdapter(Bytes(1)), - 'mms_notification'/HexAdapter(Bytes(this._.total_len-4)), 'ext_record_nr'/Byte) + self._construct = Struct('mms_status'/Bytes(2), 'mms_implementation'/Bytes(1), + 'mms_notification'/Bytes(this._.total_len-4), 'ext_record_nr'/Byte) # TS 51.011 Annex K.1 class MMS_Implementation(BER_TLV_IE, tag=0x80): diff --git a/tests/unittests/test_utils.py b/tests/unittests/test_utils.py index 04ceba4..4cb9478 100755 --- a/tests/unittests/test_utils.py +++ b/tests/unittests/test_utils.py @@ -36,8 +36,8 @@ {'priority': 1, 'identifier': 1, 'key_index': 2}, {'priority': 2, 'identifier': 0, 'key_index': 0}], 'hnet_pubkey_list': [ - {'hnet_pubkey_identifier': 27, 'hnet_pubkey': hnet_pubkey_profile_b.lower()}, # because h2b/b2h returns all lower-case - {'hnet_pubkey_identifier': 30, 'hnet_pubkey': hnet_pubkey_profile_a.lower()}] + {'hnet_pubkey_identifier': 27, 'hnet_pubkey': h2b(hnet_pubkey_profile_b)}, # because h2b/b2h returns all lower-case + {'hnet_pubkey_identifier': 30, 'hnet_pubkey': h2b(hnet_pubkey_profile_a)}] } def testSplitHexStringToListOf5ByteEntries(self): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40237?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9c77e420c314f5e74458628dc4e767eab6d97123 Gerrit-Change-Number: 40237 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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>

1 month, 3 weeks

1
0
0 0

[L] Change in pysim[master]: Get rid of [now] superfluous HexAdapter

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/40237?usp=email ) Change subject: Get rid of [now] superfluous HexAdapter ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40237?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9c77e420c314f5e74458628dc4e767eab6d97123 Gerrit-Change-Number: 40237 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 17:10:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[M] Change in ...osmo-epdg[master]: Enable the use of an UE requested IP type and address to be used for ...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40277?usp=email ) Change subject: Enable the use of an UE requested IP type and address to be used for gtpv2 PDN Address Allocation ...................................................................... Enable the use of an UE requested IP type and address to be used for gtpv2 PDN Address Allocation Change-Id: If0c77b1e366df36439d3a1b72030d831dd1b3a05 --- M src/conv.erl M src/epdg_gtpc_s2b.erl M src/epdg_ue_fsm.erl M src/gsup_server.erl 4 files changed, 47 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/conv.erl b/src/conv.erl index 5832c64..3e081e5 100644 --- a/src/conv.erl +++ b/src/conv.erl @@ -41,7 +41,7 @@ -export([ip_to_bin/1, bin_to_ip/1]). -export([cause_gtp2gsup/1]). -export([dia_rc_success/1, dia_rc_to_gsup_cause/1]). --export([gtp2_paa_to_epdg_eua/1, epdg_eua_to_gsup_pdp_address/1]). +-export([gtp2_paa_to_epdg_eua/1, pdp_address_to_gtp2_paa/2, epdg_eua_to_gsup_pdp_address/1]). -export([nai_to_imsi/1]). % ergw_aaa/src/ergw_aaa_3gpp_dict.erl @@ -62,6 +62,9 @@ bin_to_ip({_, _, _, _, _, _, _, _} = IP) -> IP. +%% Add "IPv6 Prefix Length" to PAA (3GPP TS 29.274 Table 8.14). +add_v6_prefix_len_byte(<< IPv6:16/binary >>) -> << 8, IPv6/binary >>. + %% Remove "IPv6 Prefix Length" from PAA (3GPP TS 29.274 Table 8.14). remove_v6_prefix_len_byte(<<_:8, Rest/binary>>) -> Rest. @@ -129,6 +132,13 @@ ipv4 = get_4_from_v4v6(Addr), ipv6 = get_6_from_v4v6(Addr)}. +pdp_address_to_gtp2_paa(?GTP_PDP_ADDR_TYPE_NR_IPv4, Address) -> + #v2_pdn_address_allocation{type = ipv4, address = maps:get(ipv4, Address)}; +pdp_address_to_gtp2_paa(?GTP_PDP_ADDR_TYPE_NR_IPv6, Address) -> + #v2_pdn_address_allocation{type = ipv6, address = add_v6_prefix_len_byte(maps:get(ipv6, Address))}; +pdp_address_to_gtp2_paa(?GTP_PDP_ADDR_TYPE_NR_IPv4v6, Address) -> + #v2_pdn_address_allocation{type = ipv4v6, address = get_v4v6(maps:get(ipv4, Address), maps:get(ipv6, Address))}. + epdg_eua_to_gsup_pdp_address(#epdg_eua{type_nr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, ipv4 = Addr}) -> #{pdp_type_org => 1, pdp_type_nr => ?GTP_PDP_ADDR_TYPE_NR_IPv4, diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 4b88be3..cf3e90d 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -41,6 +41,7 @@ -behaviour(gen_server). -include_lib("gtplib/include/gtp_packet.hrl"). +-include("conv.hrl"). %% API Function Exports -export([start_link/6]). @@ -48,7 +49,7 @@ %% gen_server Function Exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3]). --export([create_session_req/4, delete_session_req/1]). +-export([create_session_req/6, delete_session_req/1]). %% Application Definitions -define(SERVER, ?MODULE). @@ -144,13 +145,13 @@ lager:error("GTPv2C UDP socket open error: ~w~n", [Reason]) end. -create_session_req(Imsi, Apn, APCO, PGWAddrCandidateList) -> - gen_server:call(?SERVER, {gtpc_create_session_req, {Imsi, Apn, APCO, PGWAddrCandidateList}}). +create_session_req(Imsi, Apn, APCO, PdpTypeNr, PdpAddress, PGWAddrCandidateList) -> + gen_server:call(?SERVER, {gtpc_create_session_req, {Imsi, Apn, APCO, PdpTypeNr, PdpAddress, PGWAddrCandidateList}}). delete_session_req(Imsi) -> gen_server:call(?SERVER, {gtpc_delete_session_req, {Imsi}}). -handle_call({gtpc_create_session_req, {Imsi, Apn, APCO, PGWAddrCandidateList}}, {Pid, _Tag} = _From, State0) -> +handle_call({gtpc_create_session_req, {Imsi, Apn, APCO, PdpTypeNr, PdpAddress, PGWAddrCandidateList}}, {Pid, _Tag} = _From, State0) -> RemoteAddrStr = pick_gtpc_remote_address(PGWAddrCandidateList, State0), lager:debug("Selected PGW Remote Address ~p~n", [RemoteAddrStr]), {ok, RemoteAddrInet} = inet_parse:address(RemoteAddrStr), @@ -160,7 +161,8 @@ raddr_str = RemoteAddrInet, raddr = RemoteAddrInet}, State0), - Req = gen_create_session_request(Sess0, APCO, State1), + Paa = conv:pdp_address_to_gtp2_paa(PdpTypeNr, PdpAddress), + Req = gen_create_session_request(Sess0, APCO, Paa, State1), tx_gtp(Req, State1), State2 = inc_seq_no(State1), lager:debug("Waiting for CreateSessionResponse~n", []), @@ -514,6 +516,7 @@ apn = Apn, local_control_tei = LocalCtlTEI} = Sess, APCO, + Paa, #gtp_state{laddr = LocalAddr, laddr_gtpu = LocalAddrGtpu, restart_counter = RCnt, @@ -548,7 +551,7 @@ }, #v2_access_point_name{instance = 0, apn = [Apn]}, #v2_selection_mode{mode = 0}, - #v2_pdn_address_allocation{type = ipv4, address = <<0,0,0,0>>}, + Paa, %% v2_pdn_address_allocation #v2_bearer_context{group = BearersIE}, #v2_recovery{restart_counter = RCnt}, #v2_additional_protocol_configuration_options{instance = 0, config = APCO_decoded} diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 2e4f417..52af81a 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -66,6 +66,8 @@ -record(ue_fsm_data, { imsi, + pdp_type_nr, + pdp_address, apn = "internet" :: string(), pgw_rem_addr_list = [] :: list(), tun_pdp_ctx :: #epdg_tun_pdp_ctx{}, @@ -96,10 +98,10 @@ {error, Err} end. -auth_request(Pid, {PdpTypeNr, Apn, EAP}) -> +auth_request(Pid, {PdpTypeNr, PdpAddress, Apn, EAP}) -> lager:info("ue_fsm auth_request~n", []), try - gen_statem:call(Pid, {auth_request, PdpTypeNr, Apn, EAP}) + gen_statem:call(Pid, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP}) catch exit:Err -> {error, Err} @@ -227,7 +229,7 @@ %% Internal helpers %% ------------------------------------------------------------------ -ev_handle({call, From}, {auth_request, PdpTypeNr, Apn, EAP}, Data) -> +ev_handle({call, From}, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP}, Data) -> epdg_diameter_swm:tx_der_auth_request(Data#ue_fsm_data.imsi, PdpTypeNr, Apn, EAP), {next_state, state_wait_auth_resp, Data, [{reply,From,ok}]}. @@ -258,9 +260,10 @@ state_new(enter, _OldState, Data) -> {keep_state, Data}; -state_new({call, _From} = EvType, {auth_request, PdpTypeNr, Apn, EAP} = EvContent, Data) -> - lager:info("ue_fsm state_new event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), - ev_handle(EvType, EvContent, Data); +state_new({call, _From} = EvType, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP} = EvContent, Data) -> + lager:info("ue_fsm state_new event=auth_request {~p, ~p, ~p, ~p}, ~p~n", [PdpTypeNr, PdpAddress, Apn, EAP, Data]), + Data1 = Data#ue_fsm_data{pdp_type_nr = PdpTypeNr, pdp_address = PdpAddress, apn = Apn}, + ev_handle(EvType, EvContent, Data1); state_new({call, From}, purge_ms_request, Data) -> lager:info("ue_fsm state_new event=purge_ms_request, ~p~n", [Data]), @@ -300,8 +303,8 @@ state_authenticating(enter, _OldState, Data) -> {keep_state, Data}; -state_authenticating({call, _From} = EvType, {auth_request, PdpTypeNr, Apn, EAP} = EvContent, Data) -> - lager:info("ue_fsm state_authenticating event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), +state_authenticating({call, _From} = EvType, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP} = EvContent, Data) -> + lager:info("ue_fsm state_authenticating event=auth_request {~p, ~p, ~p, ~p}, ~p~n", [PdpTypeNr, PdpAddress, Apn, EAP, Data]), ev_handle(EvType, EvContent, Data); state_authenticating({call, From}, lu_request, Data) -> @@ -339,8 +342,8 @@ state_authenticated(enter, _OldState, Data) -> {keep_state, Data}; -state_authenticated({call, _From}, {auth_request, PdpTypeNr, Apn, EAP}, Data) -> - lager:info("ue_fsm state_authenticated event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), +state_authenticated({call, _From}, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP}, Data) -> + lager:info("ue_fsm state_authenticated event=auth_request {~p, ~p, ~p, ~p}, ~p~n", [PdpTypeNr, PdpAddress, Apn, EAP, Data]), {next_state, state_new, Data, [postpone]}; state_authenticated({call, From}, {tunnel_request, PCO}, Data) -> @@ -348,6 +351,8 @@ epdg_gtpc_s2b:create_session_req(Data#ue_fsm_data.imsi, Data#ue_fsm_data.apn, PCO, + Data#ue_fsm_data.pdp_type_nr, + Data#ue_fsm_data.pdp_address, Data#ue_fsm_data.pgw_rem_addr_list), {next_state, state_wait_create_session_resp, Data, [{reply,From,ok}]}; @@ -437,8 +442,8 @@ state_active(enter, _OldState, Data) -> {keep_state, Data}; -state_active({call, _From}, {auth_request, PdpTypeNr, Apn, EAP}, Data) -> - lager:info("ue_fsm state_active event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), +state_active({call, _From}, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP}, Data) -> + lager:info("ue_fsm state_active event=auth_request {~p, ~p, ~p, ~p}, ~p~n", [PdpTypeNr, PdpAddress, Apn, EAP, Data]), gtp_u_tun:delete_pdp_context(Data#ue_fsm_data.tun_pdp_ctx), Data1 = Data#ue_fsm_data{tun_pdp_ctx = undefined}, {next_state, state_new, Data1, [postpone]}; diff --git a/src/gsup_server.erl b/src/gsup_server.erl index c5d3738..c4c28cf 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -296,13 +296,20 @@ case maps:find(pdp_info_list, GsupMsgRx) of {ok, [PdpInfo]} -> #{pdp_context_id := _PDPCtxId, - pdp_address := #{address := #{}, + pdp_address := #{address := PdpAddress, pdp_type_nr := PdpTypeNr, pdp_type_org := 241}, access_point_name := Apn - } = PdpInfo; + } = PdpInfo, + case maps:is_key(ipv4,PdpAddress) or maps:is_key(ipv6,PdpAddress) of + true -> ok; %% Address received so do nothing + false -> %% No address received from strongswan, use a default value + PdpTypeNr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, + PdpAddress = #{ipv4 => <<0,0,0,0>>} + end; error -> % Use some sane defaults: PdpTypeNr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, + PdpAddress = #{ipv4 => <<0,0,0,0>>}, Apn = "*" end, EAP = parse_eap(GsupMsgRx), @@ -310,7 +317,7 @@ undefined -> {ok, Pid} = epdg_ue_fsm:start(Imsi); Pid -> Pid end, - case epdg_ue_fsm:auth_request(Pid, {PdpTypeNr, Apn, EAP}) of + case epdg_ue_fsm:auth_request(Pid, {PdpTypeNr, PdpAddress, Apn, EAP}) of ok -> ok; {error, Err} -> lager:error("Auth Req for Imsi ~p failed: ~p~n", [Imsi, Err]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40277?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: If0c77b1e366df36439d3a1b72030d831dd1b3a05 Gerrit-Change-Number: 40277 Gerrit-PatchSet: 4 Gerrit-Owner: clufn <callumfarrbennett(a)yahoo.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log