July 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: add library/PFCP_*, deps/PFCP

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 ) Change subject: add library/PFCP_*, deps/PFCP ...................................................................... Patch Set 3: (4 comments) File library/Osmocom_VTY_Functions.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817/comment/6b08e191_1d2e… PS1, Line 247: type record of charstring StrList; > You may be probably reusing this for something no VTY related? then maybe move it to another module […] oh wait, this patch isn't even using this File library/PFCP_CodecPort_CtrlFunct.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817/comment/08125310_038b… PS1, Line 7: inout PFCP_PT portRef, > did you copy this? indentation looks weird. yes, i most definitely copied it, because i would not have had a clue how to structure a new kind of port. maybe from MGCP or RSL, don't remember which exactly. i guess it would be an idea to fix the whitespace... at first i was just happy that it worked at all File library/PFCP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817/comment/805c91e5_37e5… PS1, Line 18: type enumerated e_PFCP_Cause { > You could move some of these into PFCP_Types. […] i put them directly above the template using them, because that's the only place using it. makes sense to move it to *Types.ttcn as soon as it is a more generally useful type, but for now can stay here, agree? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817/comment/ca8feda7_4d03… PS1, Line 418: function ts_PFCP_Session_Est_Req(charstring node_id, OCT8 cp_seid, Create_PDR_list create_pdr, Create_FAR_list create_far) return template PDU_PFCP { > Please improve the scope of template types. […] the thing that annoys me there is that universal-ctags in general does a good job of taging ttcn3, but fails to tag functions with such (value) or (present) directives. so i can easily navigate the code as long as those things are not there, as soon as it says '(value)' i have to start grepping manually and copy paste file paths and line numbers. that's my personal motivation to keep those keywords away for as long as i can. And also I do not notice any functional/semantic difference at all! i don't understand why those directives should be added, how does it help, what is the point i am missing? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 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: I0723b931b3f755ea291bffa2f27c34ba446c2f2f Gerrit-Change-Number: 28817 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 14:00:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-hnbgw[master]: fix test_ranap_rab_ass_resp_decode_encode

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28814 ) Change subject: fix test_ranap_rab_ass_resp_decode_encode ...................................................................... fix test_ranap_rab_ass_resp_decode_encode There is an extra zero octet at the end of the test data, which does not get encoded back. The test currently does not detect this, but will in upcoming patch I85e715326e1d8f4f301f82f78da109f1a7a92f30. Related: SYS#5895 Change-Id: Ifb98a52e56db1227a834c0d7b7a260314d9f547e --- M tests/ranap_rab_ass/ranap_rab_ass_test.c M tests/ranap_rab_ass/ranap_rab_ass_test.ok 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.c b/tests/ranap_rab_ass/ranap_rab_ass_test.c index 9a98cf8..482b0fc 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.c +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.c @@ -53,7 +53,7 @@ 0xc0, 0x35, 0x00, 0x01, 0x0a, 0x09, 0x01, 0xa2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x1f, 0x76, - 0x00, 0x00, 0x40, 0x01, 0x00, 0x00 + 0x00, 0x00, 0x40, 0x01, 0x00 }; uint8_t encoded[sizeof(testvec)]; diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.ok b/tests/ranap_rab_ass/ranap_rab_ass_test.ok index aca4ff3..80def36 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.ok +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.ok @@ -1,6 +1,6 @@ ranap_rab_ass_req_encode rc=93 -INPUT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f76000040010000 -RESULT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f76000040010000 +INPUT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f760000400100 +RESULT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f760000400100 ranap_rab_ass_resp_encode rc=46 INPUT: 6000002a000001003440230000010033401c603a7c3500010a0901a40000000000000000000000000040040a0000 RESULT: 6000002a000001003440230000010033401c603a7c3500010a0901a40000000000000000000000000040040a0000 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ifb98a52e56db1227a834c0d7b7a260314d9f547e Gerrit-Change-Number: 28814 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-hnbgw[master]: ranap_rab_ass_req_encode(): return msgb

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28815 ) Change subject: ranap_rab_ass_req_encode(): return msgb ...................................................................... ranap_rab_ass_req_encode(): return msgb ranap_rab_ass_req_encode() forms a msgb, then copies the data to a buffer provided by the caller. Instead, just return the msgb. This removes one unnecessary memcpy() and simplifies some code. In ranap_rab_ass_test.c, actually ensure the correct size of the returned data. See also the fix of expected test data in patch Ifb98a52e56db1227a834c0d7b7a260314d9f547e Related: SYS#5895 Change-Id: I85e715326e1d8f4f301f82f78da109f1a7a92f30 --- M include/osmocom/hnbgw/ranap_rab_ass.h M src/osmo-hnbgw/mgw_fsm.c M src/osmo-hnbgw/ranap_rab_ass.c M tests/ranap_rab_ass/Makefile.am M tests/ranap_rab_ass/ranap_rab_ass_test.c M tests/ranap_rab_ass/ranap_rab_ass_test.ok 6 files changed, 25 insertions(+), 29 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/hnbgw/ranap_rab_ass.h b/include/osmocom/hnbgw/ranap_rab_ass.h index 13fd2df..ae288af 100644 --- a/include/osmocom/hnbgw/ranap_rab_ass.h +++ b/include/osmocom/hnbgw/ranap_rab_ass.h @@ -1,7 +1,6 @@ #pragma once -int ranap_rab_ass_req_encode(uint8_t *data, unsigned int len, - RANAP_RAB_AssignmentRequestIEs_t *rab_assignment_request_ies); +struct msgb *ranap_rab_ass_req_encode(RANAP_RAB_AssignmentRequestIEs_t *rab_assignment_request_ies); int ranap_rab_ass_resp_encode(uint8_t *data, unsigned int len, RANAP_RAB_AssignmentResponseIEs_t *rab_assignment_response_ies); diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index a343e80..8e42f58 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -235,20 +235,19 @@ { struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; struct hnbgw_context_map *map = mgw_fsm_priv->map; - uint8_t encoded[IUH_MSGB_SIZE]; RANAP_RAB_AssignmentRequestIEs_t *ies; - int rc; + struct msgb *msg; ies = &mgw_fsm_priv->ranap_rab_ass_req_message->msg.raB_AssignmentRequestIEs; - rc = ranap_rab_ass_req_encode(encoded, sizeof(encoded), ies); - if (rc < 0) { + msg = ranap_rab_ass_req_encode(ies); + if (!msg) { LOGPFSML(fi, LOGL_ERROR, "failed to re-encode RAB-AssignmentRequest message\n"); osmo_fsm_inst_state_chg(fi, MGW_ST_FAILURE, 0, 0); return; } LOGPFSML(fi, LOGL_DEBUG, "forwarding modified RAB-AssignmentRequest to HNB\n"); - rua_tx_dt(map->hnb_ctx, map->is_ps, map->rua_ctx_id, encoded, rc); + rua_tx_dt(map->hnb_ctx, map->is_ps, map->rua_ctx_id, msg->data, msg->len); } static void mgw_fsm_assign(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/osmo-hnbgw/ranap_rab_ass.c b/src/osmo-hnbgw/ranap_rab_ass.c index 5930451..78805b8 100644 --- a/src/osmo-hnbgw/ranap_rab_ass.c +++ b/src/osmo-hnbgw/ranap_rab_ass.c @@ -37,20 +37,18 @@ * \ptmap[in] len length of user provided memory to store resulting ASN.1 encoded message. * \ptmap[in] ies user provided memory with RANAP_RAB_AssignmentRequestIEs. * \returns resulting message length on success; negative on error. */ -int ranap_rab_ass_req_encode(uint8_t *data, unsigned int len, - RANAP_RAB_AssignmentRequestIEs_t *rab_assignment_request_ies) +struct msgb *ranap_rab_ass_req_encode(RANAP_RAB_AssignmentRequestIEs_t *rab_assignment_request_ies) { int rc; struct msgb *msg; RANAP_RAB_AssignmentRequest_t _rab_assignment_request; RANAP_RAB_AssignmentRequest_t *rab_assignment_request = &_rab_assignment_request; - memset(data, 0, len); memset(rab_assignment_request, 0, sizeof(*rab_assignment_request)); rc = ranap_encode_rab_assignmentrequesties(rab_assignment_request, rab_assignment_request_ies); if (rc < 0) - return -EINVAL; + return NULL; /* generate an Initiating Mesasage */ msg = ranap_generate_initiating_message(RANAP_ProcedureCode_id_RAB_Assignment, @@ -60,15 +58,7 @@ /* 'msg' has been generated, we cann now release the input 'out' */ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_AssignmentRequest, rab_assignment_request); - if (!msg) - return -EINVAL; - if (msg->len > len) - return -EINVAL; - - memcpy(data, msg->data, msg->len); - rc = msg->len; - msgb_free(msg); - return rc; + return msg; } /*! Encode RABAP RAB AssignmentRequest from RANAP_RAB_AssignmentResponseIEs. diff --git a/tests/ranap_rab_ass/Makefile.am b/tests/ranap_rab_ass/Makefile.am index 8d1df7a..70ca6f6 100644 --- a/tests/ranap_rab_ass/Makefile.am +++ b/tests/ranap_rab_ass/Makefile.am @@ -35,3 +35,7 @@ $(COVERAGE_LDFLAGS) \ $(top_builddir)/src/osmo-hnbgw/ranap_rab_ass.o \ $(NULL) + +.PHONY: update_exp +update_exp: + $(builddir)/ranap_rab_ass_test >$(srcdir)/ranap_rab_ass_test.ok diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.c b/tests/ranap_rab_ass/ranap_rab_ass_test.c index 482b0fc..043b16b 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.c +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.c @@ -55,19 +55,21 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x1f, 0x76, 0x00, 0x00, 0x40, 0x01, 0x00 }; - uint8_t encoded[sizeof(testvec)]; + struct msgb *encoded; rc = ranap_ran_rx_co_decode(talloc_asn1_ctx, &message, testvec, sizeof(testvec)); OSMO_ASSERT(rc == 0); - rc = ranap_rab_ass_req_encode(encoded, sizeof(encoded), &message.msg.raB_AssignmentRequestIEs); - printf("ranap_rab_ass_req_encode rc=%d\n", rc); + encoded = ranap_rab_ass_req_encode(&message.msg.raB_AssignmentRequestIEs); + printf("ranap_rab_ass_req_encode %s\n", encoded ? "ok" : "ERROR"); printf("INPUT: %s\n", osmo_hexdump_nospc(testvec, sizeof(testvec))); - printf("RESULT: %s\n", osmo_hexdump_nospc(encoded, sizeof(encoded))); - OSMO_ASSERT(memcmp(testvec, encoded, sizeof(testvec)) == 0); + printf("RESULT: %s\n", osmo_hexdump_nospc(encoded->data, encoded->len)); + OSMO_ASSERT(encoded->len == sizeof(testvec)); + OSMO_ASSERT(memcmp(testvec, encoded->data, sizeof(testvec)) == 0); ranap_ran_rx_co_free(&message); + msgb_free(encoded); } void test_ranap_rab_ass_resp_decode_encode(void) @@ -158,6 +160,7 @@ struct osmo_sockaddr addr; struct osmo_sockaddr_str addr_str; ranap_message message; + struct msgb *encoded; uint8_t rab_id; uint8_t testvec_in[] = { 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x01, 0x00, @@ -210,11 +213,12 @@ osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); printf("after: addr=%s, port=%u, rab_id=%u\n", addr_str.ip, addr_str.port, rab_id); - rc = ranap_rab_ass_req_encode(testvec_in, sizeof(testvec_in), &message.msg.raB_AssignmentRequestIEs); - OSMO_ASSERT(rc == sizeof(testvec_in)); - OSMO_ASSERT(memcmp(testvec_in, testvec_expected_out, sizeof(testvec_in)) == 0); + encoded = ranap_rab_ass_req_encode(&message.msg.raB_AssignmentRequestIEs); + OSMO_ASSERT(encoded->len == sizeof(testvec_expected_out)); + OSMO_ASSERT(memcmp(encoded->data, testvec_expected_out, encoded->len) == 0); ranap_ran_rx_co_free(&message); + msgb_free(encoded); } void test_ranap_rab_ass_resp_ies_replace_inet_addr(void) diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.ok b/tests/ranap_rab_ass/ranap_rab_ass_test.ok index 80def36..47fb97f 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.ok +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.ok @@ -1,4 +1,4 @@ -ranap_rab_ass_req_encode rc=93 +ranap_rab_ass_req_encode ok INPUT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f760000400100 RESULT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f760000400100 ranap_rab_ass_resp_encode rc=46 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I85e715326e1d8f4f301f82f78da109f1a7a92f30 Gerrit-Change-Number: 28815 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-hnbgw[master]: mgw_fsm: move MGCP timeout to mgw_fsm_T_defs

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28813 ) Change subject: mgw_fsm: move MGCP timeout to mgw_fsm_T_defs ...................................................................... mgw_fsm: move MGCP timeout to mgw_fsm_T_defs For the tdefs used by libosmo-mgcp-client, passed via osmo_mgcpc_ep_alloc(), do not use the separate mgw_tdefs. Instead, move X2427 to mgw_fsm_T_defs. This makes X2427 VTY configurable. Related: SYS#5895 Change-Id: I2aa67121c20dc3da5fd937a02b6747468622f317 --- M src/osmo-hnbgw/mgw_fsm.c M src/osmo-hnbgw/tdefs.c 2 files changed, 3 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index 1dc9884..a343e80 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -122,12 +122,7 @@ uint16_t msc_rtp_port; }; -static const struct osmo_tdef mgw_tdefs[] = { - {.T = -2427, .default_val = 5, .desc = "timeout for MGCP response from MGW" }, - { } -}; - -static const struct osmo_tdef_state_timeout mgw_fsm_timeouts[32] = { +struct osmo_tdef_state_timeout mgw_fsm_timeouts[32] = { [MGW_ST_CRCX_HNB] = {.T = -1001 }, [MGW_ST_ASSIGN] = {.T = -1002 }, [MGW_ST_MDCX_HNB] = {.T = -1003 }, @@ -179,7 +174,7 @@ epname = mgcp_client_rtpbridge_wildcard(map->hnb_ctx->gw->mgcp_client); mgw_fsm_priv->mgcpc_ep = - osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, map->hnb_ctx->gw->mgcp_client, mgw_tdefs, fi->id, "%s", epname); + osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, map->hnb_ctx->gw->mgcp_client, mgw_fsm_T_defs, fi->id, "%s", epname); mgw_fsm_priv->mgcpc_ep_ci_hnb = osmo_mgcpc_ep_ci_add(mgw_fsm_priv->mgcpc_ep, "to-HNB"); osmo_mgcpc_ep_ci_request(mgw_fsm_priv->mgcpc_ep_ci_hnb, MGCP_VERB_CRCX, &mgw_info, fi, MGW_EV_MGCP_OK, diff --git a/src/osmo-hnbgw/tdefs.c b/src/osmo-hnbgw/tdefs.c index d8198f2..13e04c5 100644 --- a/src/osmo-hnbgw/tdefs.c +++ b/src/osmo-hnbgw/tdefs.c @@ -21,6 +21,7 @@ {.T = -1002, .default_val = 10, .desc = "Timeout for the HNB to respond to RAB Assignment Request" }, {.T = -1003, .default_val = 5, .desc = "Timeout for HNB side call-leg (to-HNB) completion" }, {.T = -1004, .default_val = 5, .desc = "Timeout for MSC side call-leg (to-MSC) completion" }, + {.T = -2427, .default_val = 5, .desc = "timeout for MGCP response from MGW" }, { } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2aa67121c20dc3da5fd937a02b6747468622f317 Gerrit-Change-Number: 28813 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-hnbgw[master]: reduce code dup in handle_cn_data_ind()

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827 ) Change subject: reduce code dup in handle_cn_data_ind() ...................................................................... Patch Set 2: (1 comment) File src/osmo-hnbgw/hnbgw_cn.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827/comment/b61a3c4b_132ec98f PS1, Line 414: talloc_free(message); > if rc==0, then these 2 get called: […] See how it pairs up with talloc_zero() and ranap_ran_rx_co_decode() above -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I4bca25d1643693cf3a9d3c49f35b29ff1dce0859 Gerrit-Change-Number: 28827 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 13:56:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Introduce logging category smscb

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28825 ) Change subject: Introduce logging category smscb ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6e686747ddde9540ff3f765ef461bfca812615ba Gerrit-Change-Number: 28825 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 13:55:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Log info about messages received and trasmitted

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28819 ) Change subject: sbcap: Log info about messages received and trasmitted ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/sbcap_link.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/8443944d_07e2a7a3 PS1, Line 403: LOGPSBCAPC(link, LOGL_DEBUG, "Encoded message %s: %s\n", > Yes, I'm printing it as debug after encoding it, this is helpful to find out that it was encoded suc […] Not critical. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ifd1eca79bf4fac63de8066cd6a18004138d51d04 Gerrit-Change-Number: 28819 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 13:47:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-hnbgw[master]: add ps_rab_ass FSM to map GTP via UPF

by neels

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 to look at the new patch set (#3). Change subject: add ps_rab_ass FSM to map GTP via UPF ...................................................................... add ps_rab_ass FSM to map GTP via UPF Related: SYS#5895 Depends: If80c35c6a942bf9593781b5a6bc28ba37323ce5e (libosmo-pfcp) Change-Id: Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a --- M configure.ac M contrib/jenkins.sh M include/osmocom/hnbgw/Makefile.am M include/osmocom/hnbgw/context_map.h M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/hnbgw_pfcp.h A include/osmocom/hnbgw/ps_rab_ass_fsm.h A include/osmocom/hnbgw/ps_rab_fsm.h M include/osmocom/hnbgw/tdefs.h M include/osmocom/hnbgw/vty.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_cn.c A src/osmo-hnbgw/hnbgw_pfcp.c M src/osmo-hnbgw/hnbgw_rua.c M src/osmo-hnbgw/hnbgw_vty.c A src/osmo-hnbgw/ps_rab_ass_fsm.c A src/osmo-hnbgw/ps_rab_fsm.c M src/osmo-hnbgw/tdefs.c 20 files changed, 1,962 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/16/28816/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a Gerrit-Change-Number: 28816 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-hnbgw[master]: add ps_rab_ass FSM to map GTP via UPF

by neels

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 ) Change subject: add ps_rab_ass FSM to map GTP via UPF ...................................................................... Patch Set 2: (3 comments) File include/osmocom/hnbgw/hnbgw.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/d54c4fe7_c1f5b210 PS2, Line 193: /* Return true when the user configured GTP mapping to be enabled, by configuring a PFCP link to a UPF. > I we should not allow running osmo-hnbgw without proxying GTP through it (in detail, through its ass […] i disagree, osmo-hnbgw has so far always run without proxying/mapping GTP. we are adding a new feature to use a UPF, and should still allow osmo-hnbgw to run the same way it always did. Firstly to allow users to keep their current installations working, secondly it also makes sense in lab or non-complex sites to just pass GTP through without a UPF. The same is true for RTP proxying, next time i test 3G with a lab setup i will be annoyed that the hnbgw *requires* an MGW, and will rather submit a patch to make MGW optional and allow running as it did before RTP proxying File include/osmocom/hnbgw/hnbgw.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/1f75cf19_ef2877b5 PS1, Line 193: static inline bool hnb_gw_is_gtp_mapping_enabled(const struct hnb_gw *gw) > can you document this function? what does gtp_mapping mean exactly? "mapping" == "proxying" ... should we decide on one of those terms? File src/osmo-hnbgw/hnbgw.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/43e9c42d_e3e95728 PS1, Line 230: LOGP(DHNBAP, LOGL_INFO, "deallocating UE context: id 0x%x, imsi %s, tmsi 0x%x\n", > AFAICT this was not resolved. sorry i was distracted by a visitor and lost track -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a Gerrit-Change-Number: 28816 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 13:17:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: apply refactoring of osmo_pfcp_endpoint API

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28755 ) Change subject: apply refactoring of osmo_pfcp_endpoint API ...................................................................... apply refactoring of osmo_pfcp_endpoint API libosmo-pfcp If80c35c6a942bf9593781b5a6bc28ba37323ce5e changes the osmo_pfcp_endpoint API, apply the necessary changes here. Related: SYS#5599 Depends: If80c35c6a942bf9593781b5a6bc28ba37323ce5e (libosmo-pfcp) Change-Id: I01deb3f347435c9fa1c49e9a0c5ef70742444ad4 --- M src/osmo-pfcp-tool/osmo_pfcp_tool_main.c M src/osmo-pfcp-tool/pfcp_tool_vty.c M src/osmo-upf/up_endpoint.c M src/osmo-upf/up_peer.c M src/osmo-upf/up_session.c 5 files changed, 44 insertions(+), 35 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c b/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c index 9a4de1c..43c3b45 100644 --- a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c +++ b/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c @@ -344,8 +344,7 @@ do { if (pfcp_tool_mainloop()) break; - } while (!llist_empty(&g_pfcp_tool->ep->sent_requests) - || !llist_empty(&g_pfcp_tool->ep->sent_responses)); + } while (osmo_pfcp_endpoint_retrans_queue_is_busy(g_pfcp_tool->ep)); printf("Done\n"); } else { printf("Listening for commands on VTY...\n"); diff --git a/src/osmo-pfcp-tool/pfcp_tool_vty.c b/src/osmo-pfcp-tool/pfcp_tool_vty.c index 8593217..4b402a3 100644 --- a/src/osmo-pfcp-tool/pfcp_tool_vty.c +++ b/src/osmo-pfcp-tool/pfcp_tool_vty.c @@ -48,7 +48,7 @@ { if (g_pfcp_tool->ep != NULL) { vty_out(vty, "Already listening on %s%s", - osmo_sockaddr_to_str_c(OTC_SELECT, &g_pfcp_tool->ep->cfg.local_addr), + osmo_sockaddr_to_str_c(OTC_SELECT, osmo_pfcp_endpoint_get_local_addr(g_pfcp_tool->ep)), VTY_NEWLINE); return CMD_WARNING; } @@ -63,38 +63,43 @@ "Bind local PFCP port and listen; see also 'local-addr'\n") { struct osmo_sockaddr_str local_addr; + struct osmo_pfcp_endpoint_cfg cfg; int rc; OSMO_ASSERT(g_pfcp_tool); if (g_pfcp_tool->ep != NULL) { vty_out(vty, "Already listening on %s%s", - osmo_sockaddr_to_str_c(OTC_SELECT, &g_pfcp_tool->ep->cfg.local_addr), + osmo_sockaddr_to_str_c(OTC_SELECT, osmo_pfcp_endpoint_get_local_addr(g_pfcp_tool->ep)), VTY_NEWLINE); return CMD_WARNING; } - g_pfcp_tool->ep = osmo_pfcp_endpoint_create(g_pfcp_tool, g_pfcp_tool); - if (!g_pfcp_tool->ep) { - vty_out(vty, "Failed to allocate PFCP endpoint.%s", VTY_NEWLINE); - return CMD_WARNING; - } - g_pfcp_tool->ep->rx_msg = pfcp_tool_rx_msg; - g_pfcp_tool->ep->seq_nr_state = rand(); + cfg = (struct osmo_pfcp_endpoint_cfg){ + .rx_msg_cb = pfcp_tool_rx_msg, + }; /* Translate address string from VTY config to osmo_sockaddr: first read into osmo_sockaddr_str, then write to * osmo_sockaddr. */ osmo_sockaddr_str_from_str(&local_addr, g_pfcp_tool->vty_cfg.local_ip, g_pfcp_tool->vty_cfg.local_port); - osmo_sockaddr_str_to_sockaddr(&local_addr, &g_pfcp_tool->ep->cfg.local_addr.u.sas); + osmo_sockaddr_str_to_sockaddr(&local_addr, &cfg.local_addr.u.sas); - /* Store this address as the local PFCP Node Id */ - osmo_pfcp_ie_node_id_from_osmo_sockaddr(&g_pfcp_tool->ep->cfg.local_node_id, &g_pfcp_tool->ep->cfg.local_addr); + /* Also use this address as the local PFCP Node Id */ + osmo_pfcp_ie_node_id_from_osmo_sockaddr(&cfg.local_node_id, &cfg.local_addr); + + g_pfcp_tool->ep = osmo_pfcp_endpoint_create(g_pfcp_tool, &cfg); + if (!g_pfcp_tool->ep) { + vty_out(vty, "Failed to allocate PFCP endpoint.%s", VTY_NEWLINE); + return CMD_WARNING; + } + + osmo_pfcp_endpoint_set_seq_nr_state(g_pfcp_tool->ep, rand()); rc = osmo_pfcp_endpoint_bind(g_pfcp_tool->ep); if (rc) { vty_out(vty, "Failed to bind PFCP endpoint on %s: %s%s\n", - osmo_sockaddr_to_str_c(OTC_SELECT, &g_pfcp_tool->ep->cfg.local_addr), strerror(rc), - VTY_NEWLINE); + osmo_sockaddr_to_str_c(OTC_SELECT, osmo_pfcp_endpoint_get_local_addr(g_pfcp_tool->ep)), + strerror(rc), VTY_NEWLINE); return CMD_WARNING; } return CMD_SUCCESS; @@ -194,7 +199,7 @@ } m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_ASSOC_SETUP_REQ); - m->ies.assoc_setup_req.recovery_time_stamp = g_pfcp_tool->ep->recovery_time_stamp; + m->ies.assoc_setup_req.recovery_time_stamp = osmo_pfcp_endpoint_get_recovery_timestamp(g_pfcp_tool->ep); m->ies.assoc_setup_req.cp_function_features_present = true; osmo_pfcp_bits_set(m->ies.assoc_setup_req.cp_function_features.bits, OSMO_PFCP_CP_FEAT_BUNDL, true); @@ -367,7 +372,7 @@ .teid = session->access.teid.local, .ip_addr = { .v4_present = true, - .v4 = g_pfcp_tool->ep->cfg.local_addr, + .v4 = osmo_pfcp_endpoint_get_cfg(g_pfcp_tool->ep)->local_addr, }, }, }; @@ -391,7 +396,7 @@ cp_f_seid = (struct osmo_pfcp_ie_f_seid){ .seid = session->cp_seid, }; - osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &g_pfcp_tool->ep->cfg.local_addr); + osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, osmo_pfcp_endpoint_get_local_addr(g_pfcp_tool->ep)); m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_SESSION_EST_REQ); m->h.seid_present = true; @@ -508,7 +513,7 @@ .teid = session->access.teid.local, .ip_addr = { .v4_present = true, - .v4 = g_pfcp_tool->ep->cfg.local_addr, + .v4 = osmo_pfcp_endpoint_get_cfg(g_pfcp_tool->ep)->local_addr, }, }, }; @@ -542,7 +547,7 @@ .teid = session->core.teid.local, .ip_addr = { .v4_present = true, - .v4 = g_pfcp_tool->ep->cfg.local_addr, + .v4 = osmo_pfcp_endpoint_get_cfg(g_pfcp_tool->ep)->local_addr, }, }, }; @@ -565,7 +570,7 @@ cp_f_seid = (struct osmo_pfcp_ie_f_seid){ .seid = session->cp_seid, }; - osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &g_pfcp_tool->ep->cfg.local_addr); + osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, osmo_pfcp_endpoint_get_local_addr(g_pfcp_tool->ep)); m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_SESSION_EST_REQ); m->h.seid_present = true; @@ -685,7 +690,7 @@ cp_f_seid = (struct osmo_pfcp_ie_f_seid){ .seid = session->cp_seid, }; - osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &g_pfcp_tool->ep->cfg.local_addr); + osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, osmo_pfcp_endpoint_get_local_addr(g_pfcp_tool->ep)); m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_SESSION_MOD_REQ); m->h.seid_present = true; diff --git a/src/osmo-upf/up_endpoint.c b/src/osmo-upf/up_endpoint.c index ef3702a..f687f4c 100644 --- a/src/osmo-upf/up_endpoint.c +++ b/src/osmo-upf/up_endpoint.c @@ -30,7 +30,7 @@ static void up_endpoint_set_msg_ctx(struct osmo_pfcp_endpoint *ep, struct osmo_pfcp_msg *m, struct osmo_pfcp_msg *req) { - struct up_endpoint *up_ep = ep->priv; + struct up_endpoint *up_ep = osmo_pfcp_endpoint_get_cfg(ep)->priv; struct up_peer *peer; /* If this is a response to an earlier request, just take the msg context from the request message. */ @@ -188,7 +188,7 @@ static void up_endpoint_rx_cb(struct osmo_pfcp_endpoint *ep, struct osmo_pfcp_msg *m, struct osmo_pfcp_msg *req) { - struct up_endpoint *up_ep = ep->priv; + struct up_endpoint *up_ep = osmo_pfcp_endpoint_get_priv(ep); switch (m->h.message_type) { case OSMO_PFCP_MSGT_PFD_MGMT_REQ: @@ -230,17 +230,21 @@ struct up_endpoint *up_endpoint_init(void *ctx, const struct osmo_sockaddr *local_addr) { int rc; + struct osmo_pfcp_endpoint_cfg cfg; struct up_endpoint *up_ep; up_ep = talloc_zero(ctx, struct up_endpoint); INIT_LLIST_HEAD(&up_ep->peers); - up_ep->pfcp_ep = osmo_pfcp_endpoint_create(up_ep, up_ep); - up_ep->pfcp_ep->cfg.local_addr = *local_addr; + cfg = (struct osmo_pfcp_endpoint_cfg){ + .local_addr = *local_addr, + .set_msg_ctx_cb = up_endpoint_set_msg_ctx, + .rx_msg_cb = up_endpoint_rx_cb, + .priv = up_ep, + }; + osmo_pfcp_ie_node_id_from_osmo_sockaddr(&cfg.local_node_id, local_addr); - up_ep->pfcp_ep->set_msg_ctx = up_endpoint_set_msg_ctx; - up_ep->pfcp_ep->rx_msg = up_endpoint_rx_cb; - - osmo_pfcp_ie_node_id_from_osmo_sockaddr(&up_ep->pfcp_ep->cfg.local_node_id, local_addr); + up_ep->pfcp_ep = osmo_pfcp_endpoint_create(up_ep, &cfg); + OSMO_ASSERT(up_ep->pfcp_ep); rc = osmo_pfcp_endpoint_bind(up_ep->pfcp_ep); if (rc) { diff --git a/src/osmo-upf/up_peer.c b/src/osmo-upf/up_peer.c index 633e458..2c2eda1 100644 --- a/src/osmo-upf/up_peer.c +++ b/src/osmo-upf/up_peer.c @@ -211,11 +211,10 @@ resp->ies.assoc_setup_resp = (struct osmo_pfcp_msg_assoc_setup_resp) { .cause = cause, - .recovery_time_stamp = g_upf->pfcp.ep->pfcp_ep->recovery_time_stamp, + .recovery_time_stamp = osmo_pfcp_endpoint_get_recovery_timestamp(g_upf->pfcp.ep->pfcp_ep), .up_function_features_present = true, .up_function_features = peer->local_up_features, }; - resp->ies.assoc_setup_resp.recovery_time_stamp = g_upf->pfcp.ep->pfcp_ep->recovery_time_stamp; if (osmo_pfcp_endpoint_tx(peer->up_endpoint->pfcp_ep, resp)) { OSMO_LOG_PFCP_MSG(resp, LOGL_ERROR, "Error sending response, cannot associate with peer\n"); diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index a2ea5e5..f35a6eb 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -141,7 +141,8 @@ } LOGPFSML(session->fi, LOGL_INFO, "Allocated new local TEID 0x%x\n", dst->fixed.teid); - if (osmo_pfcp_ip_addrs_set(&dst->fixed.ip_addr, &up_ep->pfcp_ep->cfg.local_addr)) { + if (osmo_pfcp_ip_addrs_set(&dst->fixed.ip_addr, + osmo_pfcp_endpoint_get_local_addr(up_ep->pfcp_ep))) { LOGPFSML(session->fi, LOGL_ERROR, "Invalid local address in pfcp_endpoint cfg\n"); return OSMO_PFCP_CAUSE_PFCP_ENTITY_IN_CONGESTION; } @@ -550,7 +551,8 @@ goto nack_response; /* Success, send ACK */ - osmo_pfcp_ie_f_seid_set(&resp->up_f_seid, session->up_seid, &peer->up_endpoint->pfcp_ep->cfg.local_addr); + osmo_pfcp_ie_f_seid_set(&resp->up_f_seid, session->up_seid, + osmo_pfcp_endpoint_get_local_addr(peer->up_endpoint->pfcp_ep)); resp->up_f_seid_present = true; rc = osmo_pfcp_endpoint_tx(peer->up_endpoint->pfcp_ep, tx); -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I01deb3f347435c9fa1c49e9a0c5ef70742444ad4 Gerrit-Change-Number: 28755 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022