Osmocom Open Build Service

osmo-remsim_1.1.1.tar.gz/.git/objects/pack/pack-faf189027dd31addde229aab00f9cbcc9728eea5.idx Deleted

osmo-remsim_1.1.1.tar.gz/.git/objects/pack/pack-faf189027dd31addde229aab00f9cbcc9728eea5.pack Deleted

osmo-remsim_1.1.1.dsc -> osmo-remsim_1.1.2.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-remsim
 Binary: libosmo-rspro2, libosmo-rspro-dev, osmo-remsim-server, osmo-remsim-apitool, osmo-remsim-bankd, osmo-remsim-client-st2, osmo-remsim-client-shell, libifd-osmo-remsim-client0, osmo-remsim-doc
 Architecture: any all
-Version: 1.1.1
+Version: 1.1.2
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmo-remsim
 Standards-Version: 3.9.8
@@ -20,8 +20,8 @@
  osmo-remsim-doc deb doc optional arch=all
  osmo-remsim-server deb net optional arch=any
 Checksums-Sha1:
- f4b23f42bf3a6439986c7fbdd4335f6eb051b100 1198515 osmo-remsim_1.1.1.tar.gz
+ 69d0320a3c3c2257139aa4320e9466f8dee781b2 1220751 osmo-remsim_1.1.2.tar.gz
 Checksums-Sha256:
- c14b5f7dee279c27a9349a988458d40dcefceba0874d670400fe393db5bfe90c 1198515 osmo-remsim_1.1.1.tar.gz
+ 27a6dcc4814906301b4768d76c339a594028dc592a0948980a0a7421343bf091 1220751 osmo-remsim_1.1.2.tar.gz
 Files:
- 639196ef0325f58fbb24b8ea62d4c23b 1198515 osmo-remsim_1.1.1.tar.gz
+ 9caf9f0198ee2cda1ff8a5dd87aa6587 1220751 osmo-remsim_1.1.2.tar.gz

osmo-remsim_1.1.1.tar.gz/.git/HEAD -> osmo-remsim_1.1.2.tar.gz/.git/HEAD Changed

osmo-remsim_1.1.1.tar.gz/.git/ORIG_HEAD -> osmo-remsim_1.1.2.tar.gz/.git/ORIG_HEAD Changed

osmo-remsim_1.1.1.tar.gz/.git/index -> osmo-remsim_1.1.2.tar.gz/.git/index Changed

osmo-remsim_1.1.1.tar.gz/.git/logs/HEAD -> osmo-remsim_1.1.2.tar.gz/.git/logs/HEAD Changed

osmo-remsim_1.1.1.tar.gz/.git/logs/refs/heads/master -> osmo-remsim_1.1.2.tar.gz/.git/logs/refs/heads/master Changed

osmo-remsim_1.1.1.tar.gz/.git/logs/refs/remotes/origin/HEAD -> osmo-remsim_1.1.2.tar.gz/.git/logs/refs/remotes/origin/HEAD Changed

osmo-remsim_1.1.2.tar.gz/.git/objects/pack/pack-99aecf5a3427ed43c1d5a55ef1790cdef5b6501b.idx Added

osmo-remsim_1.1.2.tar.gz/.git/objects/pack/pack-99aecf5a3427ed43c1d5a55ef1790cdef5b6501b.pack Added

osmo-remsim_1.1.1.tar.gz/.git/packed-refs -> osmo-remsim_1.1.2.tar.gz/.git/packed-refs Changed

osmo-remsim_1.1.1.tar.gz/.git/refs/heads/master -> osmo-remsim_1.1.2.tar.gz/.git/refs/heads/master Changed

osmo-remsim_1.1.1.tar.gz/.tarball-version -> osmo-remsim_1.1.2.tar.gz/.tarball-version Changed

osmo-remsim_1.1.1.tar.gz/debian/changelog -> osmo-remsim_1.1.2.tar.gz/debian/changelog Changed

osmo-remsim_1.1.1.tar.gz/doc/manuals/Makefile.am -> osmo-remsim_1.1.2.tar.gz/doc/manuals/Makefile.am Changed

osmo-remsim_1.1.1.tar.gz/src/bankd/bankd_main.c -> osmo-remsim_1.1.2.tar.gz/src/bankd/bankd_main.c Changed

@@ -207,7 +207,8 @@
 		} else {
 			rspro2bank_slot(&bs, &creq->bank);
 			rspro2client_slot(&cs, &creq->client);
-			/* check if map exists */
+
+			/* check if slot map exists */
 			map = slotmap_by_bank(g_bankd->slotmaps, &bs);
 			if (map) {
 				if (client_slot_equals(&map->client, &cs)) {
@@ -215,10 +216,20 @@
 					resp = rspro_gen_CreateMappingRes(ResultCode_ok);
 					goto send_resp;
 				} else {
-					LOGPFSML(srvc->fi, LOGL_NOTICE, "implicitly removing slotmap\n");
+					LOGPFSML(srvc->fi, LOGL_NOTICE, "slot already connected to client %d:%d. Removing old mapping.\n",
+						 map->client.client_id, map->client.slot_nr);
 					bankd_srvc_remove_mapping(map);
 				}
 			}
+
+			/* check if client map exists */
+			map = slotmap_by_client(g_bankd->slotmaps, &cs);
+			if (map) {
+				LOGPFSML(srvc->fi, LOGL_NOTICE, "client already connected to slot %d:%d. Removing old mapping.\n",
+					 map->bank.bank_id, map->bank.slot_nr);
+				bankd_srvc_remove_mapping(map);
+			}
+
 			/* Add a new mapping */
 			map = slotmap_add(g_bankd->slotmaps, &bs, &cs);
 			if (!map) {
@@ -247,15 +258,15 @@
 			/* Remove a mapping */
 			map = slotmap_by_bank(g_bankd->slotmaps, &bs);
 			if (!map) {
-				LOGPFSML(srvc->fi, LOGL_ERROR, "could not find to-be-deleted slotmap\n");
+				LOGPFSML(srvc->fi, LOGL_ERROR, "B(%lu:%lu) could not find to-be-deleted slotmap\n", rreq->bank.bankId, rreq->bank.slotNr);
 				resp = rspro_gen_RemoveMappingRes(ResultCode_unknownSlotmap);
 			} else {
 				rspro2client_slot(&cs, &rreq->client);
 				if (!client_slot_equals(&map->client, &cs)) {
-					LOGPFSML(srvc->fi, LOGL_NOTICE, "ClientId in removeMappingReq != map\n");
+					LOGPFSML(srvc->fi, LOGL_NOTICE, "B(%lu:%lu): ClientId in removeMappingReq != map\n", rreq->bank.bankId, rreq->bank.slotNr);
 					resp = rspro_gen_RemoveMappingRes(ResultCode_unknownSlotmap);
 				} else {
-					LOGPFSML(srvc->fi, LOGL_INFO, "removing slotmap\n");
+					LOGPFSML(srvc->fi, LOGL_INFO, "B(%lu:%lu): removing slotmap\n", rreq->bank.bankId, rreq->bank.slotNr);
 					bankd_srvc_remove_mapping(map);
 					resp = rspro_gen_RemoveMappingRes(ResultCode_ok);
 				}
@@ -781,7 +792,7 @@
 {
 	const struct TpduModemToCard *mdm2sim = &pdu->msg.choice.tpduModemToCard;
 	uint8_t rx_buf1024;
-	DWORD rx_buf_len = sizeof(rx_buf);
+	size_t rx_buf_len = sizeof(rx_buf);
 	RsproPDU_t *pdu_resp;
 	struct client_slot clslot;
 	struct bank_slot bslot;

osmo-remsim_1.1.1.tar.gz/src/bankd/bankd_pcsc.c -> osmo-remsim_1.1.2.tar.gz/src/bankd/bankd_pcsc.c Changed

Changes of Revision 5