Osmocom Open Build Service

osmo-hnbgw.spec Changed

osmo-hnbgw_1.3.0.1.7eb8.202207280002.dsc Deleted

@@ -1,21 +0,0 @@
-Format: 3.0 (native)
-Source: osmo-hnbgw
-Binary: osmo-hnbgw, osmo-hnbgw-dbg, osmo-hnbgw-doc
-Architecture: any all
-Version: 1.3.0.1.7eb8.202207280002
-Maintainer: Osmocom team <openbsc@lists.osmocom.org>
-Homepage: https://projects.osmocom.org/projects/osmo-hnbgw
-Standards-Version: 3.9.8
-Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-hnbgw
-Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-hnbgw
-Build-Depends: debhelper (>= 9), dh-autoreconf, autotools-dev, autoconf, automake, libtool, pkg-config, python3-minimal, libtalloc-dev, libasn1c-dev (>= 0.9.30), libsctp-dev, libosmocore-dev (>= 1.7.0), libosmo-sigtran-dev (>= 1.6.0), libosmo-abis-dev (>= 1.3.0), libosmo-netif-dev (>= 1.2.0), libosmo-mgcp-client-dev (>= 1.10.0), libosmo-hnbap-dev (>= 1.3.0), libosmo-ranap-dev (>= 1.3.0), libosmo-rua-dev (>= 1.3.0), osmo-gsm-manuals-dev (>= 1.3.0)
-Package-List:
- osmo-hnbgw deb net extra arch=any
- osmo-hnbgw-dbg deb debug extra arch=any
- osmo-hnbgw-doc deb doc optional arch=all
-Checksums-Sha1:
- 5364f56aba5ad95f6a56116cce7a45eef2ca9784 58252 osmo-hnbgw_1.3.0.1.7eb8.202207280002.tar.xz
-Checksums-Sha256:
- 2759545835c86663b2fdf417a3c8c5be6b9617a50fa9f64cf840839f6e38251b 58252 osmo-hnbgw_1.3.0.1.7eb8.202207280002.tar.xz
-Files:
- dcbe92248cebffe9c7b8b8eab66de347 58252 osmo-hnbgw_1.3.0.1.7eb8.202207280002.tar.xz

osmo-hnbgw_1.3.0.4.223a.202207290002.dsc Added

@@ -0,0 +1,21 @@
+Format: 3.0 (native)
+Source: osmo-hnbgw
+Binary: osmo-hnbgw, osmo-hnbgw-dbg, osmo-hnbgw-doc
+Architecture: any all
+Version: 1.3.0.4.223a.202207290002
+Maintainer: Osmocom team <openbsc@lists.osmocom.org>
+Homepage: https://projects.osmocom.org/projects/osmo-hnbgw
+Standards-Version: 3.9.8
+Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-hnbgw
+Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-hnbgw
+Build-Depends: debhelper (>= 9), dh-autoreconf, autotools-dev, autoconf, automake, libtool, pkg-config, python3-minimal, libtalloc-dev, libasn1c-dev (>= 0.9.30), libsctp-dev, libosmocore-dev (>= 1.7.0), libosmo-sigtran-dev (>= 1.6.0), libosmo-abis-dev (>= 1.3.0), libosmo-netif-dev (>= 1.2.0), libosmo-mgcp-client-dev (>= 1.10.0), libosmo-hnbap-dev (>= 1.3.0), libosmo-ranap-dev (>= 1.3.0), libosmo-rua-dev (>= 1.3.0), osmo-gsm-manuals-dev (>= 1.3.0)
+Package-List:
+ osmo-hnbgw deb net extra arch=any
+ osmo-hnbgw-dbg deb debug extra arch=any
+ osmo-hnbgw-doc deb doc optional arch=all
+Checksums-Sha1:
+ f3af2c16ebedb2897475d77a1f99e0de1d5324d5 58316 osmo-hnbgw_1.3.0.4.223a.202207290002.tar.xz
+Checksums-Sha256:
+ 5b7ea6185a8ea51ceaf7990ac7a843a1d65a7d56f115b35c9e1c6991d34eb49d 58316 osmo-hnbgw_1.3.0.4.223a.202207290002.tar.xz
+Files:
+ a296b73c7e79a0300356bd7a0b972d0d 58316 osmo-hnbgw_1.3.0.4.223a.202207290002.tar.xz

osmo-hnbgw_1.3.0.1.7eb8.202207280002.tar.xz/.tarball-version -> osmo-hnbgw_1.3.0.4.223a.202207290002.tar.xz/.tarball-version Changed

osmo-hnbgw_1.3.0.1.7eb8.202207280002.tar.xz/debian/changelog -> osmo-hnbgw_1.3.0.4.223a.202207290002.tar.xz/debian/changelog Changed

osmo-hnbgw_1.3.0.1.7eb8.202207280002.tar.xz/debian/control -> osmo-hnbgw_1.3.0.4.223a.202207290002.tar.xz/debian/control Changed

@@ -30,7 +30,7 @@
 Package: osmo-hnbgw
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-nightly (= 1.0.0.202207280002), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 1.0.0.202207290002), ${misc:Depends}, ${shlibs:Depends}
 Recommends: osmo-mgw
 Description: OsmoHNBGW: Osmocom Home Node B Gateway
 
@@ -38,14 +38,14 @@
 Section: debug
 Architecture: any
 Multi-Arch: same
-Depends: osmocom-nightly (= 1.0.0.202207280002), osmo-hnbgw (= ${binary:Version}), ${misc:Depends}
+Depends: osmocom-nightly (= 1.0.0.202207290002), osmo-hnbgw (= ${binary:Version}), ${misc:Depends}
 Description: OsmoHNBGW: Osmocom Home Node B Gateway
 
 Package: osmo-hnbgw-doc
 Architecture: all
 Section: doc
 Priority: optional
-Depends: osmocom-nightly (= 1.0.0.202207280002), ${misc:Depends}
+Depends: osmocom-nightly (= 1.0.0.202207290002), ${misc:Depends}
 Description: ${misc:Package} PDF documentation
  Various manuals: user manual, VTY reference manual and/or
  protocol/interface manuals.

osmo-hnbgw_1.3.0.1.7eb8.202207280002.tar.xz/include/osmocom/hnbgw/ranap_rab_ass.h -> osmo-hnbgw_1.3.0.4.223a.202207290002.tar.xz/include/osmocom/hnbgw/ranap_rab_ass.h Changed

osmo-hnbgw_1.3.0.1.7eb8.202207280002.tar.xz/src/osmo-hnbgw/mgw_fsm.c -> osmo-hnbgw_1.3.0.4.223a.202207290002.tar.xz/src/osmo-hnbgw/mgw_fsm.c Changed

@@ -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_timeouts32 = {
+struct osmo_tdef_state_timeout mgw_fsm_timeouts32 = {
 	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,
@@ -240,20 +235,19 @@
 {
 	struct mgw_fsm_priv *mgw_fsm_priv = fi->priv;
 	struct hnbgw_context_map *map = mgw_fsm_priv->map;
-	uint8_t encodedIUH_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)

osmo-hnbgw_1.3.0.1.7eb8.202207280002.tar.xz/src/osmo-hnbgw/ranap_rab_ass.c -> osmo-hnbgw_1.3.0.4.223a.202207290002.tar.xz/src/osmo-hnbgw/ranap_rab_ass.c Changed

@@ -37,20 +37,18 @@
  *  \ptmapin len length of user provided memory to store resulting ASN.1 encoded message.
  *  \ptmapin 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.

osmo-hnbgw_1.3.0.1.7eb8.202207280002.tar.xz/src/osmo-hnbgw/tdefs.c -> osmo-hnbgw_1.3.0.4.223a.202207290002.tar.xz/src/osmo-hnbgw/tdefs.c Changed

osmo-hnbgw_1.3.0.1.7eb8.202207280002.tar.xz/tests/ranap_rab_ass/Makefile.am -> osmo-hnbgw_1.3.0.4.223a.202207290002.tar.xz/tests/ranap_rab_ass/Makefile.am Changed

osmo-hnbgw_1.3.0.1.7eb8.202207280002.tar.xz/tests/ranap_rab_ass/ranap_rab_ass_test.c -> osmo-hnbgw_1.3.0.4.223a.202207290002.tar.xz/tests/ranap_rab_ass/ranap_rab_ass_test.c Changed

@@ -53,21 +53,23 @@
 		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 encodedsizeof(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)

osmo-hnbgw_1.3.0.1.7eb8.202207280002.tar.xz/tests/ranap_rab_ass/ranap_rab_ass_test.ok -> osmo-hnbgw_1.3.0.4.223a.202207290002.tar.xz/tests/ranap_rab_ass/ranap_rab_ass_test.ok Changed

@@ -1,6 +1,6 @@
-ranap_rab_ass_req_encode rc=93
-INPUT:  0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f76000040010000
-RESULT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f76000040010000
+ranap_rab_ass_req_encode ok
+INPUT:  0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f760000400100
+RESULT: 0000005900000100364052000001003500487822cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f760000400100
 ranap_rab_ass_resp_encode rc=46
 INPUT:  6000002a000001003440230000010033401c603a7c3500010a0901a40000000000000000000000000040040a0000
 RESULT: 6000002a000001003440230000010033401c603a7c3500010a0901a40000000000000000000000000040040a0000

Changes of Revision 32