Osmocom Open Build Service

osmo-pcu.spec Changed

osmo-pcu_1.2.0.141.e98b.202308170026.dsc -> osmo-pcu_1.2.0.144.6066.202308180026.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-pcu
 Binary: osmo-pcu, osmo-pcu-dbg, osmo-pcu-doc
 Architecture: any all
-Version: 1.2.0.141.e98b.202308170026
+Version: 1.2.0.144.6066.202308180026
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: http://osmocom.org/projects/osmopcu
 Standards-Version: 3.9.8
@@ -14,8 +14,8 @@
  osmo-pcu-dbg deb debug extra arch=any
  osmo-pcu-doc deb doc optional arch=all
 Checksums-Sha1:
- 854bd5a51ca92da6a2d2da9cbb94fd7aa4a8b176 424568 osmo-pcu_1.2.0.141.e98b.202308170026.tar.xz
+ fc989d8b6e21c6a27a50b3a49047a7ee323c52c5 424284 osmo-pcu_1.2.0.144.6066.202308180026.tar.xz
 Checksums-Sha256:
- a637edba6e9e62db020b2a57ad5c07bc237e18153eb7be6a4843df630c233aeb 424568 osmo-pcu_1.2.0.141.e98b.202308170026.tar.xz
+ 2a0555caa8411bbda174e2279892496e7a03b4f02e48ddd7de3b683e570706e3 424284 osmo-pcu_1.2.0.144.6066.202308180026.tar.xz
 Files:
- 67cc9ec06fd2baa6ca2940e9e6ff43f9 424568 osmo-pcu_1.2.0.141.e98b.202308170026.tar.xz
+ 6627f0ca72aeb5c0cc8ad122bce4cd43 424284 osmo-pcu_1.2.0.144.6066.202308180026.tar.xz

osmo-pcu_1.2.0.141.e98b.202308170026.tar.xz/.tarball-version -> osmo-pcu_1.2.0.144.6066.202308180026.tar.xz/.tarball-version Changed

osmo-pcu_1.2.0.141.e98b.202308170026.tar.xz/contrib/osmo-pcu.spec.in -> osmo-pcu_1.2.0.144.6066.202308180026.tar.xz/contrib/osmo-pcu.spec.in Changed

osmo-pcu_1.2.0.141.e98b.202308170026.tar.xz/debian/changelog -> osmo-pcu_1.2.0.144.6066.202308180026.tar.xz/debian/changelog Changed

osmo-pcu_1.2.0.141.e98b.202308170026.tar.xz/debian/control -> osmo-pcu_1.2.0.144.6066.202308180026.tar.xz/debian/control Changed

@@ -16,7 +16,7 @@
 
 Package: osmo-pcu
 Architecture: any
-Depends: osmocom-nightly (= 202308170026), ${shlibs:Depends}, ${misc:Depends}
+Depends: osmocom-nightly (= 202308180026), ${shlibs:Depends}, ${misc:Depends}
 Description: Osmocom GPRS/EDGE Packet Control Unit (PCU)
  The GPRS Packet Control Unit is co-located with the GSM BTS or GSM BSC
  in order to provide packet-switched services for 2G (2.5G, 2.75G)
@@ -28,7 +28,7 @@
 Architecture: any
 Section: debug
 Priority: extra
-Depends: osmocom-nightly (= 202308170026), osmo-pcu (= ${binary:Version}),
+Depends: osmocom-nightly (= 202308180026), osmo-pcu (= ${binary:Version}),
          ${misc:Depends}
 Description: Debug symbols for the Osmocom GPRS/EDGE Packet Control Unit (PCU)
  The GPRS Packet Control Unit is co-located with the GSM BTS or GSM BSC
@@ -41,7 +41,7 @@
 Architecture: all
 Section: doc
 Priority: optional
-Depends: osmocom-nightly (= 202308170026), ${misc:Depends}
+Depends: osmocom-nightly (= 202308180026), ${misc:Depends}
 Description: ${misc:Package} PDF documentation
  Various manuals: user manual, VTY reference manual and/or
  protocol/interface manuals.

osmo-pcu_1.2.0.141.e98b.202308170026.tar.xz/include/osmocom/pcu/pcuif_proto.h -> osmo-pcu_1.2.0.144.6066.202308180026.tar.xz/include/osmocom/pcu/pcuif_proto.h Changed

@@ -18,7 +18,7 @@
 #define PCU_IF_MSG_SUSP_REQ	0x03	/* BTS forwards GPRS SUSP REQ to PCU */
 #define PCU_IF_MSG_APP_INFO_REQ	0x04	/* BTS asks PCU to transmit APP INFO via PACCH */
 #define PCU_IF_MSG_RTS_REQ	0x10	/* ready to send request */
-#define PCU_IF_MSG_DATA_CNF_DT	0x11	/* confirm (with direct tlli) */
+#define PCU_IF_MSG_DATA_CNF_DT	0x11	/* confirm (using message id) */
 #define PCU_IF_MSG_RACH_IND	0x22	/* receive RACH */
 #define PCU_IF_MSG_INFO_IND	0x32	/* retrieve BTS info */
 #define PCU_IF_MSG_E1_CCU_IND	0x33	/* retrieve E1 CCU comm. parameters */
@@ -41,7 +41,7 @@
 #define PCU_IF_SAPI_PDTCH	0x05	/* packet data/control/ccch block */
 #define PCU_IF_SAPI_PRACH	0x06	/* packet random access channel */
 #define PCU_IF_SAPI_PTCCH	0x07	/* packet TA control channel */
-#define PCU_IF_SAPI_PCH_DT	0x08	/* assignment on PCH (confirmed using TLLI) */
+#define PCU_IF_SAPI_PCH_DT	0x08	/* assignment on PCH (confirmed using message id) */
 
 /* flags */
 #define PCU_IF_FLAG_ACTIVE	(1 << 0)/* BTS is active */
@@ -93,19 +93,10 @@
 	int16_t		lqual_cb;	/* !< \brief Link quality in centiBel */
 } __attribute__ ((packed));
 
-/* data confirmation with direct tlli (instead of raw mac block with tlli) */
+/* data confirmation with message id (instead of raw mac block) */
 struct gsm_pcu_if_data_cnf_dt {
 	uint8_t		sapi;
-	uint32_t	tlli;
-	uint32_t	fn;
-	uint16_t	arfcn;
-	uint8_t		trx_nr;
-	uint8_t		ts_nr;
-	uint8_t		block_nr;
-	int8_t		rssi;
-	uint16_t	ber10k;		/* !< \brief BER in units of 0.01% */
-	int16_t		ta_offs_qbits;	/* !< \brief Burst TA Offset in quarter bits */
-	int16_t		lqual_cb;	/* !< \brief Link quality in centiBel */
+	uint32_t	msg_id;
 } __attribute__ ((packed));
 
 struct gsm_pcu_if_rts_req {
@@ -274,8 +265,8 @@
 /* Struct to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The struct is sent as a data request
  * (data_req) under SAPI PCU_IF_SAPI_PCH_DT. */
 struct gsm_pcu_if_pch_dt {
-	/* TLLI as reference for confirmation */
-	uint32_t tlli;
+	/* message id as reference for confirmation */
+	uint32_t msg_id;
 	/* IMSI (to derive paging group) */
 	char imsiOSMO_IMSI_BUF_SIZE;
 	/* GSM mac-block (with immediate assignment message) */

osmo-pcu_1.2.0.141.e98b.202308170026.tar.xz/src/bts.cpp -> osmo-pcu_1.2.0.144.6066.202308180026.tar.xz/src/bts.cpp Changed

@@ -666,7 +666,7 @@
 	return best_first_tfi;
 }
 
-static int tlli_from_imm_ass(uint32_t *tlli, const uint8_t *data, uint32_t fn)
+static int tlli_from_imm_ass(uint32_t *tlli, const uint8_t *data)
 {
 	const struct gsm48_imm_ass *imm_ass = (struct gsm48_imm_ass *)data;
 	uint8_t plen;
@@ -680,9 +680,9 @@
 	data += 1 + plen;
 
 	if ((*data & 0xf0) != 0xd0) {
-		LOGP(DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm, but rest "
+		LOGP(DTBFDL, LOGL_ERROR, "Got IMM.ASS confirm, but rest "
 			"octets do not start with bit sequence 'HH01' "
-			"(Packet Downlink Assignment)\n", fn);
+			"(Packet Downlink Assignment)\n");
 		return -EINVAL;
 	}
 
@@ -696,7 +696,7 @@
 	return 0;
 }
 
-int bts_rcv_imm_ass_cnf(struct gprs_rlcmac_bts *bts, const uint8_t *data, uint32_t tlli, uint32_t fn)
+int bts_rcv_imm_ass_cnf(struct gprs_rlcmac_bts *bts, const uint8_t *data, uint32_t tlli)
 {
 	struct gprs_rlcmac_dl_tbf *dl_tbf;
 	GprsMs *ms;
@@ -710,30 +710,30 @@
 	/* Extract TLLI from the presented IMMEDIATE ASSIGNMENT
 	 * (if present and only when TLLI that is supplied as function parameter is valid.) */
 	if (data && tlli == GSM_RESERVED_TMSI) {
-		rc = tlli_from_imm_ass(&tlli, data, fn);
+		rc = tlli_from_imm_ass(&tlli, data);
 		if (rc != 0)
 			return -EINVAL;
 	}
 
 	/* Make sure TLLI is valid */
 	if (tlli == GSM_RESERVED_TMSI) {
-		LOGP(DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm, but TLLI is invalid!\n", fn);
+		LOGP(DTBFDL, LOGL_ERROR, "Got IMM.ASS confirm, but TLLI is invalid!\n");
 		return -EINVAL;
 	}
 
 	/* Find related TBF and send confirmation signal to FSM */
 	ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI);
 	if (!ms) {
-		LOGP(DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm for unknown MS with TLLI=%08x\n", fn, tlli);
+		LOGP(DTBFDL, LOGL_ERROR, "Got IMM.ASS confirm for unknown MS with TLLI=%08x\n", tlli);
 		return -EINVAL;
 	}
 	dl_tbf = ms_dl_tbf(ms);
 	if (!dl_tbf) {
-		LOGPMS(ms, DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm, but MS has no DL TBF!\n", fn);
+		LOGPMS(ms, DTBFDL, LOGL_ERROR, "Got IMM.ASS confirm, but MS has no DL TBF!\n");
 		return -EINVAL;
 	}
 
-	LOGPTBFDL(dl_tbf, LOGL_DEBUG, "FN=%u Got IMM.ASS confirm\n", fn);
+	LOGPTBFDL(dl_tbf, LOGL_DEBUG, "Got IMM.ASS confirm\n");
 	osmo_fsm_inst_dispatch(dl_tbf->state_fi, TBF_EV_ASSIGN_PCUIF_CNF, NULL);
 
 	return 0;

osmo-pcu_1.2.0.141.e98b.202308170026.tar.xz/src/bts.h -> osmo-pcu_1.2.0.144.6066.202308180026.tar.xz/src/bts.h Changed

osmo-pcu_1.2.0.141.e98b.202308170026.tar.xz/src/pcu_l1_if.cpp -> osmo-pcu_1.2.0.144.6066.202308180026.tar.xz/src/pcu_l1_if.cpp Changed

@@ -300,11 +300,11 @@
 /* Send a MAC block via the paging channel. This will (obviously) only work for MAC blocks that contain an
  * IMMEDIATE ASSIGNMENT or a PAGING COMMAND message. In case the MAC block contains an IMMEDIATE ASSIGNMENT
  * message, the receiving end is required to confirm when the IMMEDIATE ASSIGNMENT has been sent. */
-void pcu_l1if_tx_pch_dt(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi, uint32_t tlli)
+void pcu_l1if_tx_pch_dt(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi, uint32_t msg_id)
 {
 	struct gsm_pcu_if_pch_dt pch_dt = { 0 };
 
-	pch_dt.tlli = tlli;
+	pch_dt.msg_id = msg_id;
 	if (imsi)
 		OSMO_STRLCPY_ARRAY(pch_dt.imsi, imsi);
 	/* OS#6097: if strlen(pch_dt.imsi) == 0: We assume the MS is in non-DRX
@@ -534,15 +534,13 @@
 static int pcu_rx_data_cnf(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_data *data_cnf)
 {
 	int rc = 0;
-	int current_fn = bts_current_frame_number(bts);
 
-	LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d fn=%d cur_fn=%d\n",
-		data_cnf->sapi, data_cnf->fn, current_fn);
+	LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d\n", data_cnf->sapi);
 
 	switch (data_cnf->sapi) {
 	case PCU_IF_SAPI_PCH:
 		if (data_cnf->data2 == GSM48_MT_RR_IMM_ASS)
-			bts_rcv_imm_ass_cnf(bts, data_cnf->data, GSM_RESERVED_TMSI, data_cnf->fn);
+			bts_rcv_imm_ass_cnf(bts, data_cnf->data, GSM_RESERVED_TMSI);
 		break;
 	default:
 		LOGP(DL1IF, LOGL_ERROR, "Received PCU data confirm with "
@@ -556,14 +554,12 @@
 static int pcu_rx_data_cnf_dt(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_data_cnf_dt *data_cnf_dt)
 {
 	int rc = 0;
-	int current_fn = bts_current_frame_number(bts);
 
-	LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d fn=%d cur_fn=%d\n",
-	     data_cnf_dt->sapi, data_cnf_dt->fn, current_fn);
+	LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d\n", data_cnf_dt->sapi);
 
 	switch (data_cnf_dt->sapi) {
 	case PCU_IF_SAPI_PCH_DT:
-		bts_rcv_imm_ass_cnf(bts, NULL, data_cnf_dt->tlli, data_cnf_dt->fn);
+		bts_rcv_imm_ass_cnf(bts, NULL, data_cnf_dt->msg_id);
 		break;
 	default:
 		LOGP(DL1IF, LOGL_ERROR, "Received PCU data confirm with unsupported sapi %d\n", data_cnf_dt->sapi);
@@ -789,7 +785,7 @@
 
 	/* NOTE: The classic way to confirm an IMMEDIATE assignment is to send the whole MAC block payload back to the
 	 * PCU. So it is the MAC block itsself that serves a reference for the confirmation. This method has certain
-	 * disadvantages so it was replaced with a method that uses the TLLI as a reference ("Direct TLLI"). This new
+	 * disadvantages so it was replaced with a method that uses the TLLI as a reference (msg_id). This new
 	 * method will replace the old one. The code that handles the old method will be removed in the foreseeable
 	 * future. (see also OS#5927) */
 	if (info_ind->version == 0x0a) {

osmo-pcu_1.2.0.141.e98b.202308170026.tar.xz/src/pcu_l1_if.h -> osmo-pcu_1.2.0.144.6066.202308180026.tar.xz/src/pcu_l1_if.h Changed

Changes of Revision 425