Osmocom Open Build Service

osmo-bts.spec Changed

commit_035080e4f439a0536dd4865d54713a9df77b0ee3.txt Added

commit_a590b1a15a27c308dad4be7498c6bb07d7dea16f.txt Deleted

osmo-bts_1.5.0.47.a590.dsc -> osmo-bts_1.5.0.48.03508.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-bts
 Binary: osmo-bts, osmo-bts-trx, osmo-bts-trx-dbg, osmo-bts-virtual, osmo-bts-virtual-dbg, osmo-bts-doc
 Architecture: any all
-Version: 1.5.0.47.a590
+Version: 1.5.0.48.03508
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmobts
 Standards-Version: 3.9.8
@@ -17,8 +17,8 @@
  osmo-bts-virtual deb net optional arch=any
  osmo-bts-virtual-dbg deb debug extra arch=any
 Checksums-Sha1:
- f44661d46e3c1c5cab4c62b67006f7e71f89f995 460076 osmo-bts_1.5.0.47.a590.tar.xz
+ 1fc4e2b0a577e12c411cb7c00fc0f006b8a684e9 461184 osmo-bts_1.5.0.48.03508.tar.xz
 Checksums-Sha256:
- 974fe5fd020656017e50a373c7bd2215ee5f9e5653f592f3b4950567441f5113 460076 osmo-bts_1.5.0.47.a590.tar.xz
+ e1fcf149aecdea6745f2566005d432076ec0121fdce49f320fbcce604fbeed92 461184 osmo-bts_1.5.0.48.03508.tar.xz
 Files:
- 88ecb15b34ba11202701ea3b79e55bc1 460076 osmo-bts_1.5.0.47.a590.tar.xz
+ 32fffe05f473c0a4a2d8fbdfa4ca7637 461184 osmo-bts_1.5.0.48.03508.tar.xz

osmo-bts_1.5.0.47.a590.tar.xz/.tarball-version -> osmo-bts_1.5.0.48.03508.tar.xz/.tarball-version Changed

osmo-bts_1.5.0.47.a590.tar.xz/debian/changelog -> osmo-bts_1.5.0.48.03508.tar.xz/debian/changelog Changed

osmo-bts_1.5.0.47.a590.tar.xz/src/common/osmux.c -> osmo-bts_1.5.0.48.03508.tar.xz/src/common/osmux.c Changed

@@ -43,26 +43,46 @@
 /* Bitmask containing Allocated Osmux circuit ID. +7 to round up to 8 bit boundary. */
 static uint8_t osmux_cid_bitmapOSMO_BYTES_FOR_BITS(OSMUX_CID_MAX + 1);
 
-/*! Find and reserve a free OSMUX cid.
+/*! Find and reserve a free OSMUX cid. Keep state of last allocated CID to
+ *  rotate allocated CIDs over time. This helps in letting CIDs unused for some
+ *  time after last use.
  *  \returns OSMUX cid */
 static int osmux_get_local_cid(void)
 {
-	int i, j;
+	static uint8_t next_free_osmux_cid_lookup = 0;
+	uint8_t start_i, start_j;
+	uint8_t i, j, cid;
 
-	for (i = 0; i < sizeof(osmux_cid_bitmap); i++) {
-		for (j = 0; j < 8; j++) {
+	/* i = octet index, j = bit index inside ith octet */
+	start_i = next_free_osmux_cid_lookup >> 3;
+	start_j = next_free_osmux_cid_lookup & 0x07;
+
+	for (i = start_i; i < sizeof(osmux_cid_bitmap); i++) {
+		for (j = start_j; j < 8; j++) {
 			if (osmux_cid_bitmapi & (1 << j))
 				continue;
+			goto found;
+		}
+	}
 
-			osmux_cid_bitmapi |= (1 << j);
-			LOGP(DOSMUX, LOGL_DEBUG,
-			     "Allocating Osmux CID %u from pool\n", (i * 8) + j);
-			return (i * 8) + j;
+	for (i = 0; i <= start_i; i++) {
+		for (j = 0; j < start_j; j++) {
+			if (osmux_cid_bitmapi & (1 << j))
+				continue;
+			goto found;
 		}
 	}
 
 	LOGP(DOSMUX, LOGL_ERROR, "All Osmux circuits are in use!\n");
 	return -1;
+
+found:
+	osmux_cid_bitmapi |= (1 << j);
+	cid = (i << 3) | j;
+	next_free_osmux_cid_lookup = (cid + 1) & 0xff;
+	LOGP(DOSMUX, LOGL_DEBUG,
+		"Allocating Osmux CID %u from pool\n", cid);
+	return cid;
 }
 
 /*! put back a no longer used OSMUX cid.

Changes of Revision 16