Osmocom Open Build Service

osmo-bsc.spec Changed

commit_a5249dd96cac3fbf6c2627bc72730e152ad57ab2.txt Added

commit_ea423714540ac79862821a055036d4aaa5d574a6.txt Deleted

osmo-bsc_1.11.0.74.ea423.dsc -> osmo-bsc_1.11.0.75.a5249.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-bsc
 Binary: osmo-bsc, osmo-bsc-dbg, abisip-find, osmo-bsc-ipaccess-utils, osmo-bsc-bs11-utils, osmo-bsc-meas-utils, osmo-bsc-doc
 Architecture: any all
-Version: 1.11.0.74.ea423
+Version: 1.11.0.75.a5249
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmo-bsc
 Standards-Version: 3.9.8
@@ -18,8 +18,8 @@
  osmo-bsc-ipaccess-utils deb net extra arch=any
  osmo-bsc-meas-utils deb net extra arch=any
 Checksums-Sha1:
- 50680e3b60f36440115650fa92a1279712d81a81 622996 osmo-bsc_1.11.0.74.ea423.tar.xz
+ ee988d27f3f58c50ac4435cb5f2351bdb98aba95 623380 osmo-bsc_1.11.0.75.a5249.tar.xz
 Checksums-Sha256:
- cfd8c42a56458403457ba355f323a8f338ddb1aedaceba6cd624a416b43ae784 622996 osmo-bsc_1.11.0.74.ea423.tar.xz
+ 55b6587f783dbb501233873b974738334062613f5378511a13730816959cd038 623380 osmo-bsc_1.11.0.75.a5249.tar.xz
 Files:
- a0c44de85f88183f9aa4d0c66ff66d7a 622996 osmo-bsc_1.11.0.74.ea423.tar.xz
+ 3b01f9de6a6c4605ba92752e36fb3963 623380 osmo-bsc_1.11.0.75.a5249.tar.xz

osmo-bsc_1.11.0.74.ea423.tar.xz/.tarball-version -> osmo-bsc_1.11.0.75.a5249.tar.xz/.tarball-version Changed

osmo-bsc_1.11.0.74.ea423.tar.xz/debian/changelog -> osmo-bsc_1.11.0.75.a5249.tar.xz/debian/changelog Changed

osmo-bsc_1.11.0.74.ea423.tar.xz/src/osmo-bsc/bts_trx_ts_lchan_ctrl.c -> osmo-bsc_1.11.0.75.a5249.tar.xz/src/osmo-bsc/bts_trx_ts_lchan_ctrl.c Changed

@@ -22,6 +22,7 @@
 #include <osmocom/bsc/bts.h>
 #include <osmocom/bsc/system_information.h>
 #include <osmocom/bsc/abis_rsl.h>
+#include <osmocom/bsc/lchan_fsm.h>
 
 static int verify_lchan_ms_power(struct ctrl_cmd *cmd, const char *value, void *_data)
 {
@@ -67,11 +68,87 @@
 
 CTRL_CMD_DEFINE(lchan_ms_power, "ms-power");
 
+/* Return full information about a logical channel.
+ * format: bts.<0-255>.trx.<0-255>.ts.<0-8>.lchan.<0-8>.show.full
+ * result format: <bts>,<trx>,<ts>,<lchan>,<type>,<connection>,<state>,<last error>,<bs power>,<ms power>,<interference dbm>,
+ *	<interference band>,<channel mode>,<imsi>,<tmsi>,<ipa bound ip>,<ipa bound port>,<ipa bound conn id>,<ipa conn ip>,
+ *	<ipa conn port>,<ipa conn sppech mode>
+ */
+static int get_lchan_show_full(struct ctrl_cmd *cmd, void *data)
+{
+	struct gsm_lchan *lchan = cmd->node;
+	struct in_addr ia;
+	char *interference = ",", *tmsi = "", *ipa_bound = ",,", *ipa_conn = ",,";
+
+	if (lchan->interf_dbm != INTERF_DBM_UNKNOWN) {
+		interference = talloc_asprintf(cmd, "%d,%u", lchan->interf_dbm, lchan->interf_band);
+		if (!interference) {
+			cmd->reply = "OOM";
+			return CTRL_CMD_ERROR;
+		}
+	}
+
+	if (lchan->conn && lchan->conn->bsub && lchan->conn->bsub->tmsi != GSM_RESERVED_TMSI) {
+		tmsi = talloc_asprintf(cmd, "0x%08x", lchan->conn->bsub->tmsi);
+		if (!tmsi) {
+			cmd->reply = "OOM";
+			return CTRL_CMD_ERROR;
+		}
+	}
+
+	if (is_ipa_abisip_bts(lchan->ts->trx->bts) && lchan->abis_ip.bound_ip) {
+		ia.s_addr = htonl(lchan->abis_ip.bound_ip);
+		ipa_bound = talloc_asprintf(cmd, "%s,%u,%u", inet_ntoa(ia), lchan->abis_ip.bound_port,
+								lchan->abis_ip.conn_id);
+		if (!ipa_bound) {
+			cmd->reply = "OOM";
+			return CTRL_CMD_ERROR;
+		}
+	}
+
+	if (is_ipa_abisip_bts(lchan->ts->trx->bts) && lchan->abis_ip.connect_ip) {
+		ia.s_addr = htonl(lchan->abis_ip.connect_ip);
+		ipa_conn = talloc_asprintf(cmd, "%s,%u,0x%02x", inet_ntoa(ia), lchan->abis_ip.connect_port,
+								lchan->abis_ip.speech_mode);
+		if (!ipa_conn) {
+			cmd->reply = "OOM";
+			return CTRL_CMD_ERROR;
+		}
+	}
+
+	cmd->reply = talloc_asprintf(cmd, "%u,%u,%u,%u,%s,%u,%s,%s,%u,%u,%s,%s,%s,%s,%s,%s",
+		lchan->ts->trx->bts->nr,
+		lchan->ts->trx->nr,
+		lchan->ts->nr,
+		lchan->nr,
+		gsm_chan_t_name(lchan->type),
+		lchan->conn ? 1 : 0, lchan_state_name(lchan),
+		lchan->fi && lchan->fi->state == LCHAN_ST_BORKEN ? lchan->last_error : "",
+		lchan->ts->trx->nominal_power - lchan->ts->trx->max_power_red - lchan->bs_power_db,
+		ms_pwr_dbm(lchan->ts->trx->bts->band, lchan->ms_power),
+		interference,
+		gsm48_chan_mode_name(lchan->current_ch_mode_rate.chan_mode),
+		lchan->conn && lchan->conn->bsub && strlen(lchan->conn->bsub->imsi) ? lchan->conn->bsub->imsi : "",
+		tmsi,
+		ipa_bound,
+		ipa_conn
+	);
+	if (!cmd->reply) {
+		cmd->reply = "OOM";
+		return CTRL_CMD_ERROR;
+	}
+
+	return CTRL_CMD_REPLY;
+}
+CTRL_CMD_DEFINE_RO(lchan_show_full, "show full");
+
+
 int bsc_bts_trx_ts_lchan_ctrl_cmds_install(void)
 {
 	int rc = 0;
 
 	rc |= ctrl_cmd_install(CTRL_NODE_LCHAN, &cmd_lchan_ms_power);
+	rc |= ctrl_cmd_install(CTRL_NODE_LCHAN, &cmd_lchan_show_full);
 
 	return rc;
 }

Changes of Revision 231