[PATCH] osmo-bts[master]: Add Abis OML failure event reporting

Max gerrit-no-reply at lists.osmocom.org
Mon Jan 2 19:26:32 UTC 2017


Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/1522

to look at the new patch set (#2).

Add Abis OML failure event reporting

Send 3GPP TS 12.21 § 8.8.2 Abis/OML failure event report.

Change-Id: Ib1170edca2207752984a554d7a6a57c224f6d5f5
Related: OS#1615
---
M include/osmo-bts/oml.h
M src/common/main.c
M src/common/oml.c
3 files changed, 35 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/22/1522/2

diff --git a/include/osmo-bts/oml.h b/include/osmo-bts/oml.h
index 9f49444..217ec64 100644
--- a/include/osmo-bts/oml.h
+++ b/include/osmo-bts/oml.h
@@ -1,6 +1,8 @@
 #ifndef _OML_H
 #define _OML_H
 
+#include <osmocom/gsm/protocol/gsm_12_21.h>
+
 struct gsm_bts;
 struct gsm_abis_mo;
 struct msgb;
@@ -42,4 +44,8 @@
 int oml_set_lchan_t200(struct gsm_lchan *lchan);
 extern const unsigned int oml_default_t200_ms[7];
 
+/* Transmit failure event report */
+int oml_tx_failure_event_rep(struct gsm_abis_mo *mo, uint16_t cause_value,
+			     const char *fmt, ...);
+
 #endif // _OML_H */
diff --git a/src/common/main.c b/src/common/main.c
index 1b2549e..f99f196 100644
--- a/src/common/main.c
+++ b/src/common/main.c
@@ -50,6 +50,7 @@
 #include <osmo-bts/bts_model.h>
 #include <osmo-bts/pcu_if.h>
 #include <osmo-bts/control_if.h>
+#include <osmo-bts/oml.h>
 
 int quit = 0;
 static const char *config_file = "osmo-bts.cfg";
@@ -181,13 +182,21 @@
 	switch (signal) {
 	case SIGINT:
 		//osmo_signal_dispatch(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL);
-		if (!quit)
+		if (!quit) {
+			oml_tx_failure_event_rep(&bts->mo,
+						 OSMO_EVT_CRIT_PROC_STOP,
+						 "BTS: SIGINT received -> "
+						 "shutdown\n");
 			bts_shutdown(bts, "SIGINT");
+		}
 		quit++;
 		break;
 	case SIGABRT:
 	case SIGUSR1:
 	case SIGUSR2:
+		oml_tx_failure_event_rep(&bts->mo, OSMO_EVT_CRIT_PROC_STOP,
+					 "BTS: signal %s received\n",
+					 strsignal(signal));
 		talloc_report_full(tall_bts_ctx, stderr);
 		break;
 	default:
diff --git a/src/common/oml.c b/src/common/oml.c
index 0700aa2..870ef3c 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -1140,6 +1140,25 @@
 	return ret;
 }
 
+/* 3GPP TS 12.21 § 8.8.2 */
+int oml_tx_failure_event_rep(struct gsm_abis_mo *mo, uint16_t cause_value,
+			     const char *fmt, ...)
+{
+	struct msgb *nmsg;
+	va_list ap;
+
+	va_start(ap, fmt);
+	nmsg = abis_nm_fail_evt_rep(NM_EVT_PROC_FAIL, NM_SEVER_CRITICAL,
+				    NM_PCAUSE_T_MANUF, cause_value, fmt, ap);
+	LOGP(DOML, LOGL_INFO, fmt, ap);
+	va_end(ap);
+
+	if (!nmsg)
+		return -ENOMEM;
+
+	return oml_mo_send_msg(mo, nmsg, NM_MT_FAILURE_EVENT_REP);
+}
+
 int oml_init(void)
 {
 	DEBUGP(DOML, "Initializing OML attribute definitions\n");

-- 
To view, visit https://gerrit.osmocom.org/1522
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ib1170edca2207752984a554d7a6a57c224f6d5f5
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Minh-Quang Nguyen <minh-quang.nguyen at nutaq.com>


More information about the gerrit-log mailing list