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

[S] Change in osmo-hnbgw[master]: ranap_rab_ass_test: fix use of deprecated ranap_cn_rx_co_decode()

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31432 ) Change subject: ranap_rab_ass_test: fix use of deprecated ranap_cn_rx_co_decode() ...................................................................... Abandoned now part of https://gerrit.osmocom.org/c/osmo-hnbgw/+/31460 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iea41b027d047b2da52d0733fce4c9d75bb74fe48 Gerrit-Change-Number: 31432 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 4 months

1
0
0 0

[XL] Change in osmo-hnbgw[master]: context map: introduce RUA and SCCP FSMs to fix leaks

by neels

Attention is currently required from: laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31431 ) Change subject: context map: introduce RUA and SCCP FSMs to fix leaks ...................................................................... Patch Set 6: (1 comment) This change is ready for review. Patchset: PS6: i cosmetically moved some stuff to separate patches, renamed the events and tried to move some new functions so that the diff doesn't mix in a confusing way. also found a bit of dead code. I hope this is now easier to review... -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6ff7e36532ff57c6f2d3e7e419dd22ef27dafd19 Gerrit-Change-Number: 31431 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 23 Feb 2023 01:50:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: cosmetic: rename context_map_deactivate

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31459 ) Change subject: cosmetic: rename context_map_deactivate ...................................................................... cosmetic: rename context_map_deactivate Rename context_map_deactivate() to context_map_hnb_released(). This function is called only when the HNB is released / lost. Change-Id: I6dcb26c94558fff28faf8f823e490967a9baf2ec --- M include/osmocom/hnbgw/context_map.h M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_rua.c 4 files changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/59/31459/1 diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index 3a145b6..97e1b09 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -79,6 +79,6 @@ struct hnbgw_context_map * context_map_by_cn(struct hnbgw_cnlink *cn, uint32_t scu_conn_id); -void context_map_deactivate(struct hnbgw_context_map *map); +void context_map_hnb_released(struct hnbgw_context_map *map); int context_map_init(struct hnb_gw *gw); diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c index 96365fb..9816918 100644 --- a/src/osmo-hnbgw/context_map.c +++ b/src/osmo-hnbgw/context_map.c @@ -150,7 +150,7 @@ return NULL; } -void context_map_deactivate(struct hnbgw_context_map *map) +void context_map_hnb_released(struct hnbgw_context_map *map) { LOG_MAP(map, DMAIN, LOGL_INFO, "Deactivating\n"); diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index da6df43..322dabe 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -402,7 +402,7 @@ * map garbage collector works fine? */ llist_del(&map->hnb_list); llist_del(&map->cn_list); - context_map_deactivate(map); + context_map_hnb_released(map); } ue_context_free_by_hnb(ctx->gw, ctx); } diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index 5581148..3af0ad6 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -313,7 +313,7 @@ rc = osmo_sccp_user_sap_down(cn->sccp_user, &prim->oph); if (map && release_context_map) - context_map_deactivate(map); + context_map_hnb_released(map); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6dcb26c94558fff28faf8f823e490967a9baf2ec Gerrit-Change-Number: 31459 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[M] Change in osmo-hnbgw[master]: add design charts for new context map FSMs

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31430 to look at the new patch set (#3). Change subject: add design charts for new context map FSMs ...................................................................... add design charts for new context map FSMs Planning new connection-oriented RUA and SCCP FSMs to - conquer confusion about hnbgw_context_map release behavior, and - eradicate SCCP connection leaks. Related: SYS#6297 Change-Id: I661bf65d79972a732c52732934095e8bfcd99694 --- M configure.ac M doc/Makefile.am A doc/charts/Makefile.am A doc/charts/hnbgw_context_map.msc A doc/charts/hnbgw_context_map_fsm.dot 5 files changed, 206 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/30/31430/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I661bf65d79972a732c52732934095e8bfcd99694 Gerrit-Change-Number: 31430 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: log tweak

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31428 to look at the new patch set (#2). Change subject: log tweak ...................................................................... log tweak Change-Id: Ib6f8c46355d4748089e59c80fc1c8c736c887a26 --- M src/osmo-hnbgw/hnbgw_rua.c 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/28/31428/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib6f8c46355d4748089e59c80fc1c8c736c887a26 Gerrit-Change-Number: 31428 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: fix deprecation: use ranap_cn_rx_co_decode2()

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31460 ) Change subject: fix deprecation: use ranap_cn_rx_co_decode2() ...................................................................... fix deprecation: use ranap_cn_rx_co_decode2() Change-Id: I867cbf174beab1eefddc682c1420737e49f9e50d --- M src/osmo-hnbgw/hnbgw_rua.c M tests/ranap_rab_ass/ranap_rab_ass_test.c 2 files changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/60/31460/1 diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index 3af0ad6..6ef7d30 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -278,7 +278,7 @@ if (data && len && map && !release_context_map) { if (!map->is_ps) { message = talloc_zero(map, ranap_message); - rc = ranap_cn_rx_co_decode(map, message, msgb_l2(prim->oph.msg), msgb_l2len(prim->oph.msg)); + rc = ranap_cn_rx_co_decode2(message, msgb_l2(prim->oph.msg), msgb_l2len(prim->oph.msg)); if (rc == 0) { switch (message->procedureCode) { @@ -294,7 +294,7 @@ } else if (hnb_gw_is_gtp_mapping_enabled(hnb->gw)) { /* map->is_ps == true and PFCP is enabled in osmo-hnbgw.cfg */ message = talloc_zero(map, ranap_message); - rc = ranap_cn_rx_co_decode(map, message, msgb_l2(prim->oph.msg), msgb_l2len(prim->oph.msg)); + rc = ranap_cn_rx_co_decode2(message, msgb_l2(prim->oph.msg), msgb_l2len(prim->oph.msg)); if (rc == 0) { switch (message->procedureCode) { diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.c b/tests/ranap_rab_ass/ranap_rab_ass_test.c index f4e7999..03b0836 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.c +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.c @@ -86,7 +86,7 @@ }; uint8_t encoded[sizeof(testvec)]; - rc = ranap_cn_rx_co_decode(talloc_asn1_ctx, &message, testvec, sizeof(testvec)); + rc = ranap_cn_rx_co_decode2(&message, testvec, sizeof(testvec)); OSMO_ASSERT(rc == 0); rc = ranap_rab_ass_resp_encode(encoded, sizeof(encoded), &message.msg.raB_AssignmentResponseIEs); @@ -145,7 +145,7 @@ 0x00, 0x40, 0x04, 0x0a, 0x00, 0x00 }; - rc = ranap_cn_rx_co_decode(talloc_asn1_ctx, &message, testvec, sizeof(testvec)); + rc = ranap_cn_rx_co_decode2(&message, testvec, sizeof(testvec)); OSMO_ASSERT(rc == 0); rc = ranap_rab_ass_resp_ies_extract_inet_addr(&addr, &message.msg.raB_AssignmentResponseIEs, 7); osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); @@ -245,7 +245,7 @@ 0x00, 0x40, 0x04, 0xd2, 0x00, 0x00 }; - rc = ranap_cn_rx_co_decode(talloc_asn1_ctx, &message, testvec_in, sizeof(testvec_in)); + rc = ranap_cn_rx_co_decode2(&message, testvec_in, sizeof(testvec_in)); OSMO_ASSERT(rc == 0); rc = ranap_rab_ass_resp_ies_extract_inet_addr(&addr, &message.msg.raB_AssignmentResponseIEs, 6); @@ -285,7 +285,7 @@ 0x40, 0x03, 0x05, 0xd0, 0x00 }; - rc = ranap_cn_rx_co_decode(talloc_asn1_ctx, &message, testvec, sizeof(testvec)); + rc = ranap_cn_rx_co_decode2(&message, testvec, sizeof(testvec)); OSMO_ASSERT(rc == 0); rab_failed_at_hnb = -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I867cbf174beab1eefddc682c1420737e49f9e50d Gerrit-Change-Number: 31460 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: rua_to_scu(): drop dead code for connection-less

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31461 ) Change subject: rua_to_scu(): drop dead code for connection-less ...................................................................... rua_to_scu(): drop dead code for connection-less From rua_to_scu(), drop dead code for connection-less messages. In fact, rua_to_scu() is only used for connection-oriented messages. Clarify that. Change-Id: Id03c412cde066a6b2bbc26cb6b87053aa2408cba --- M src/osmo-hnbgw/hnbgw_rua.c 1 file changed, 24 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/61/31461/1 diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index 6ef7d30..b979cd1 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -175,8 +175,9 @@ } - -/* forward a RUA message to the SCCP User API to SCCP */ +/* dispatch a RUA connection-oriented message received from a HNB to a context mapping's RUA FSM, so that it is + * forwarded to the CN via SCCP connection-oriented messages. + * Connectionless messages are handled in hnbgw_ranap_rx() instead, not here. */ static int rua_to_scu(struct hnb_context *hnb, RUA_CN_DomainIndicator_t cN_DomainIndicator, enum osmo_scu_prim_type type, @@ -217,18 +218,14 @@ prim = (struct osmo_scu_prim *) msgb_put(msg, sizeof(*prim)); osmo_prim_init(&prim->oph, SCCP_SAP_USER, type, PRIM_OP_REQUEST, msg); - switch (type) { - case OSMO_SCU_PRIM_N_UNITDATA: - LOGHNB(hnb, DRUA, LOGL_DEBUG, "rua_to_scu() %s to %s, rua_ctx_id %u (unitdata, no scu_conn_id)\n", - cn_domain_indicator_to_str(cN_DomainIndicator), osmo_sccp_addr_dump(remote_addr), context_id); - break; - default: - map = context_map_alloc_by_hnb(hnb, context_id, is_ps, cn); - OSMO_ASSERT(map); - LOGHNB(hnb, DRUA, LOGL_DEBUG, "rua_to_scu() %s to %s, rua_ctx_id %u scu_conn_id %u\n", - cn_domain_indicator_to_str(cN_DomainIndicator), osmo_sccp_addr_dump(remote_addr), - map->rua_ctx_id, map->scu_conn_id); - } + /* Only connection-oriented messages are handled by this function */ + OSMO_ASSERT(type != OSMO_SCU_PRIM_N_UNITDATA); + + map = context_map_alloc_by_hnb(hnb, context_id, is_ps, cn); + OSMO_ASSERT(map); + LOGHNB(hnb, DRUA, LOGL_DEBUG, "rua_to_scu() %s to %s, rua_ctx_id %u scu_conn_id %u\n", + cn_domain_indicator_to_str(cN_DomainIndicator), osmo_sccp_addr_dump(remote_addr), + map->rua_ctx_id, map->scu_conn_id); /* add primitive header */ switch (type) { @@ -253,15 +250,6 @@ /* Mark SCCP conn as gracefully disconnected */ map->scu_conn_active = false; break; - case OSMO_SCU_PRIM_N_UNITDATA: - prim->u.unitdata.called_addr = *remote_addr; - prim->u.unitdata.calling_addr = cn->gw->sccp.local_addr; - /* Two separate logs because of osmo_sccp_addr_dump(). */ - LOGHNB(hnb, DRUA, LOGL_DEBUG, "RUA to SCCP N_UNITDATA: called_addr:%s\n", - osmo_sccp_addr_dump(&prim->u.unitdata.called_addr)); - LOGHNB(hnb, DRUA, LOGL_DEBUG, "RUA to SCCP N_UNITDATA: calling_addr:%s\n", - osmo_sccp_addr_dump(&prim->u.unitdata.calling_addr)); - break; default: return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id03c412cde066a6b2bbc26cb6b87053aa2408cba Gerrit-Change-Number: 31461 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: cosmetic: regroup members of hnbgw_context_map

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31463 ) Change subject: cosmetic: regroup members of hnbgw_context_map ...................................................................... cosmetic: regroup members of hnbgw_context_map Change the order in the struct definition so that the items for RUA and for SCCP are grouped together. Tweak comments. Change-Id: I84424617996d8e1a6814aa122e63454c0666b724 --- M include/osmocom/hnbgw/context_map.h 1 file changed, 23 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/63/31463/1 diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index 97e1b09..7bcdf57 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -28,23 +28,26 @@ struct hnbgw_context_map { /* entry in the per-CN list of mappings */ struct llist_head cn_list; - /* entry in the per-HNB list of mappings */ + /* entry in the per-HNB list of mappings. */ struct llist_head hnb_list; - /* pointer to HNB */ + + /* Pointer to HNB for this map, to transceive RUA. */ struct hnb_context *hnb_ctx; - /* pointer to CN */ - struct hnbgw_cnlink *cn_link; - /* RUA contxt ID */ + /* RUA context ID used in RUA messages to/from the hnb_gw. */ uint32_t rua_ctx_id; - /* False for CS, true for PS */ - bool is_ps; - /* SCCP User SAP connection ID */ + + /* Pointer to CN, to transceive SCCP. */ + struct hnbgw_cnlink *cn_link; + /* SCCP User SAP connection ID used in SCCP messages to/from the cn_link. */ uint32_t scu_conn_id; /* Set to true on SCCP Conn Conf, set to false when an OSMO_SCU_PRIM_N_DISCONNECT has been sent for the SCCP * User SAP conn. Useful to avoid leaking SCCP connections: guarantee that an OSMO_SCU_PRIM_N_DISCONNECT gets * sent, even when RUA fails to gracefully disconnect. */ bool scu_conn_active; + /* False for CS, true for PS */ + bool is_ps; + enum hnbgw_context_map_state state; /* FSM instance for the MGW, handles the async MGCP communication necessary to intercept CS RAB Assignment and -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I84424617996d8e1a6814aa122e63454c0666b724 Gerrit-Change-Number: 31463 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[M] Change in osmo-hnbgw[master]: use RUA procedure code for rua_to_scu() arg

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31462 ) Change subject: use RUA procedure code for rua_to_scu() arg ...................................................................... use RUA procedure code for rua_to_scu() arg Instead of osmo_scu_prim_type, use RUA_ProcedureCode to tell rua_to_scu() the RUA message type being handled. Cosmetically prepare for upcoming patch that completely moves osmo_scu_prim composition from rua_to_scu() to a new context map SCCP FSM. Related: I6ff7e36532ff57c6f2d3e7e419dd22ef27dafd19 Change-Id: I28735945844f732e7bd7f09db1f453c608415b84 --- M src/osmo-hnbgw/hnbgw_rua.c 1 file changed, 51 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/62/31462/1 diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index b979cd1..97ced4a 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -174,13 +174,27 @@ return hnbgw_rua_tx(hnb, msg); } +static struct value_string rua_procedure_code_names[] = { + { RUA_ProcedureCode_id_Connect, "Connect" }, + { RUA_ProcedureCode_id_DirectTransfer, "DirectTransfer" }, + { RUA_ProcedureCode_id_Disconnect, "Disconnect" }, + { RUA_ProcedureCode_id_ConnectionlessTransfer, "ConnectionlessTransfer" }, + { RUA_ProcedureCode_id_ErrorIndication, "ErrorIndication" }, + { RUA_ProcedureCode_id_privateMessage, "PrivateMessage" }, + {} +}; + +static inline const char *rua_procedure_code_name(enum RUA_ProcedureCode val) +{ + return get_value_string(rua_procedure_code_names, val); +} /* dispatch a RUA connection-oriented message received from a HNB to a context mapping's RUA FSM, so that it is * forwarded to the CN via SCCP connection-oriented messages. * Connectionless messages are handled in hnbgw_ranap_rx() instead, not here. */ static int rua_to_scu(struct hnb_context *hnb, RUA_CN_DomainIndicator_t cN_DomainIndicator, - enum osmo_scu_prim_type type, + enum RUA_ProcedureCode rua_procedure, uint32_t context_id, uint32_t cause, const uint8_t *data, unsigned int len) { @@ -216,20 +230,18 @@ msg = msgb_alloc(1500, "rua_to_sccp"); prim = (struct osmo_scu_prim *) msgb_put(msg, sizeof(*prim)); - osmo_prim_init(&prim->oph, SCCP_SAP_USER, type, PRIM_OP_REQUEST, msg); - - /* Only connection-oriented messages are handled by this function */ - OSMO_ASSERT(type != OSMO_SCU_PRIM_N_UNITDATA); map = context_map_alloc_by_hnb(hnb, context_id, is_ps, cn); OSMO_ASSERT(map); - LOGHNB(hnb, DRUA, LOGL_DEBUG, "rua_to_scu() %s to %s, rua_ctx_id %u scu_conn_id %u\n", - cn_domain_indicator_to_str(cN_DomainIndicator), osmo_sccp_addr_dump(remote_addr), - map->rua_ctx_id, map->scu_conn_id); + + LOG_MAP(map, DRUA, LOGL_DEBUG, "rx RUA %s with %u bytes RANAP data\n", + rua_procedure_code_name(rua_procedure), data ? len : 0); /* add primitive header */ - switch (type) { - case OSMO_SCU_PRIM_N_CONNECT: + switch (rua_procedure) { + + case RUA_ProcedureCode_id_Connect: + osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_REQUEST, msg); prim->u.connect.called_addr = *remote_addr; prim->u.connect.calling_addr = cn->gw->sccp.local_addr; prim->u.connect.sccp_class = 2; @@ -240,18 +252,24 @@ LOGHNB(hnb, DRUA, LOGL_DEBUG, "RUA to SCCP N_CONNECT: calling_addr:%s\n", osmo_sccp_addr_dump(&prim->u.connect.calling_addr)); break; - case OSMO_SCU_PRIM_N_DATA: + + case RUA_ProcedureCode_id_DirectTransfer: + osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_DATA, PRIM_OP_REQUEST, msg); prim->u.data.conn_id = map->scu_conn_id; break; - case OSMO_SCU_PRIM_N_DISCONNECT: + + case RUA_ProcedureCode_id_Disconnect: + osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_REQUEST, msg); prim->u.disconnect.conn_id = map->scu_conn_id; prim->u.disconnect.cause = cause; release_context_map = true; /* Mark SCCP conn as gracefully disconnected */ map->scu_conn_active = false; break; + default: - return -EINVAL; + /* No caller may ever pass a different RUA procedure code */ + OSMO_ASSERT(false); } /* If there is RANAP data, include it in the msgb. Usually there is data, but this could also be an SCCP CR @@ -385,7 +403,7 @@ cn_domain_indicator_to_str(ies.cN_DomainIndicator), context_id, ies.establishment_Cause == RUA_Establishment_Cause_emergency_call ? "emergency" : "normal"); - rc = rua_to_scu(hnb, ies.cN_DomainIndicator, OSMO_SCU_PRIM_N_CONNECT, + rc = rua_to_scu(hnb, ies.cN_DomainIndicator, RUA_ProcedureCode_id_Connect, context_id, 0, ies.ranaP_Message.buf, ies.ranaP_Message.size); @@ -420,7 +438,7 @@ } rc = rua_to_scu(hnb, ies.cN_DomainIndicator, - OSMO_SCU_PRIM_N_DISCONNECT, + RUA_ProcedureCode_id_Disconnect, context_id, scu_cause, ranap_data, ranap_len); rua_free_disconnecties(&ies); @@ -445,7 +463,7 @@ rc = rua_to_scu(hnb, ies.cN_DomainIndicator, - OSMO_SCU_PRIM_N_DATA, + RUA_ProcedureCode_id_DirectTransfer, context_id, 0, ies.ranaP_Message.buf, ies.ranaP_Message.size); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I28735945844f732e7bd7f09db1f453c608415b84 Gerrit-Change-Number: 31462 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library/DIAMETER_Emulation: add API for generating Session-Id AVP

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31455 ) Change subject: library/DIAMETER_Emulation: add API for generating Session-Id AVP ...................................................................... Patch Set 1: (2 comments) File library/DIAMETER_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31455/comment/f1955efe_720f… PS1, Line 90: var uint32_t g_sess_id_seed_h32; > I suspect that's because uint64_t is not supported in TTCN3? It's supported, but... the problem is that bitwise and shift operators in TTCN-3 can be applied to bitstring, hexstring or octetstring, but *not to integers*. So when doing the initialization and then encoding I would need to convert to one of the supported types. I find this cumbersome. ";" & oct2char(int2oct(g_sess_id_seed, 8) >> 32) ";" & oct2char(int2oct(g_sess_id_seed, 8) and4b 'FFFFFFFF'O) Alternatively, I could use substr(), but it's still rather clumsy: ";" & oct2char(substr(int2oct(g_sess_id_seed, 8), 0, 8)) ";" & oct2char(substr(int2oct(g_sess_id_seed, 8), 8, 8)) I also would not say my solution is perfect, suggestions are welcome. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31455/comment/1afd3184_9379… PS1, Line 393: [] DIAMETER_PROC.getcall(DIAMETEREM_gen_sess_id:{?,?}) -> param(identity) { > ah so they are encoded visibly as 2 parts, weird. Well, this encoding format is recommended by RFC3588, section 8.8. "Session-Id AVP". I'll add this reference to the commit message. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0fbd271ad123e9663aab5163915e1edbf5915bb6 Gerrit-Change-Number: 31455 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 22 Feb 2023 18:25:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023