Merge master into fairwaves/production

7 files changed, 33 insertions, 6 deletions

diff --git a/include/osmocom/bsc/abis_nm.h b/include/osmocom/bsc/abis_nm.h
index 45bbe2c02..83bc2f809 100644
--- a/include/osmocom/bsc/abis_nm.h
+++ b/include/osmocom/bsc/abis_nm.h
@@ -27,6 +27,7 @@
 #include <osmocom/gsm/protocol/gsm_12_21.h>
 
 #include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/signal.h>
 
 /* max number of attributes represented as 3GPP TS 52.021 §9.4.62 SW Description array */
 #define MAX_BTS_ATTR 5
@@ -170,6 +171,8 @@ void abis_nm_queue_send_next(struct gsm_bts *bts);	/* for bs11_config. */
 
 int abis_nm_select_newest_sw(const struct abis_nm_sw_desc *sw, const size_t len);
 
+struct nm_fail_rep_signal_data *abis_nm_fail_evt_rep_parse(struct msgb *mb, struct gsm_bts *bts);
+
 /* Helper functions for updating attributes */
 int abis_nm_update_max_power_red(struct gsm_bts_trx *trx);
 
diff --git a/include/osmocom/bsc/abis_om2000.h b/include/osmocom/bsc/abis_om2000.h
index b093a0350..49e8510aa 100644
--- a/include/osmocom/bsc/abis_om2000.h
+++ b/include/osmocom/bsc/abis_om2000.h
@@ -29,6 +29,7 @@ enum abis_om2k_mo_cls {
 	OM2K_MO_CLS_IS				= 0x05,
 	OM2K_MO_CLS_CON				= 0x06,
 	OM2K_MO_CLS_DP				= 0x07,
+	OM2K_MO_CLS_MCTR			= 0x08,
 	OM2K_MO_CLS_CF				= 0x0a,
 	OM2K_MO_CLS_TX				= 0x0b,
 	OM2K_MO_CLS_RX				= 0x0c,
diff --git a/include/osmocom/bsc/debug.h b/include/osmocom/bsc/debug.h
index adc6abbe1..82c0703a8 100644
--- a/include/osmocom/bsc/debug.h
+++ b/include/osmocom/bsc/debug.h
@@ -19,7 +19,6 @@ enum {
 	DHO,
 	DHODEC,
 	DREF,
-	DNAT,
 	DCTRL,
 	DFILTER,
 	DPCU,
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 040e36d79..9a1db07e5 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -1005,6 +1005,12 @@ struct bts_smscb_chan_state {
 	uint8_t overflow;
 };
 
+struct bts_oml_fail_rep {
+	struct llist_head list;
+	time_t time;
+	struct msgb *mb;
+};
+
 /* One BTS */
 struct gsm_bts {
 	/* list header in net->bts_list */
@@ -1144,7 +1150,6 @@ struct gsm_bts {
 
 	/* Not entirely sure how ip.access specific this is */
 	struct {
-		uint8_t supports_egprs_11bit_rach;
 		enum bts_gprs_mode mode;
 		struct {
 			struct gsm_abis_mo mo;
@@ -1161,6 +1166,7 @@ struct gsm_bts {
 		uint8_t rac;
 		uint8_t net_ctrl_ord;
 		bool ctrl_ack_type_use_block;
+		bool egprs_pkt_chan_request;
 	} gprs;
 
 	/* threshold (in percent) when BTS shall send CCCH LOAD IND */
@@ -1267,6 +1273,8 @@ struct gsm_bts {
 	struct bts_smscb_chan_state cbch_basic;
 	struct bts_smscb_chan_state cbch_extended;
 	struct osmo_timer_list etws_timer;	/* when to stop ETWS PN */
+
+	struct llist_head oml_fail_rep;
 };
 
 /* One rejected BTS */
@@ -1608,6 +1616,9 @@ struct gsm_network {
 
 	/* Remote BSS Cell Identifier Lists */
 	struct neighbor_ident_list *neighbor_bss_cells;
+
+	/* Don't refuse to start with mutually exclusive codec settings */
+	bool allow_unusable_timeslots;
 };
 
 struct gsm_audio_support {
diff --git a/include/osmocom/bsc/handover.h b/include/osmocom/bsc/handover.h
index b00ee60f8..d22ac8696 100644
--- a/include/osmocom/bsc/handover.h
+++ b/include/osmocom/bsc/handover.h
@@ -23,7 +23,7 @@ struct gsm_network;
 struct gsm_lchan;
 struct gsm_bts;
 struct gsm_subscriber_connection;
-struct gsm_meas_rep mr;
+struct gsm_meas_rep;
 
 enum handover_result {
 	HO_RESULT_OK,
diff --git a/include/osmocom/bsc/rest_octets.h b/include/osmocom/bsc/rest_octets.h
index f7ad682b7..7df66f732 100644
--- a/include/osmocom/bsc/rest_octets.h
+++ b/include/osmocom/bsc/rest_octets.h
@@ -82,14 +82,13 @@ struct gprs_cell_options {
 	uint32_t t3192;	/* in milliseconds */
 	uint32_t drx_timer_max;/* in seconds */
 	uint32_t bs_cv_max;
-	uint8_t  supports_egprs_11bit_rach;
 	bool ctrl_ack_type_use_block; /* use PACKET CONTROL ACKNOWLEDGMENT */
 
 	uint8_t ext_info_present;
 	struct {
 		uint8_t egprs_supported;
-			uint8_t use_egprs_p_ch_req;
-			uint8_t bep_period;
+		uint8_t use_egprs_p_ch_req;
+		uint8_t bep_period;
 		uint8_t pfc_supported;
 		uint8_t dtm_supported;
 		uint8_t bss_paging_coordination;
diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h
index 62a3d2c88..952e03ce1 100644
--- a/include/osmocom/bsc/signal.h
+++ b/include/osmocom/bsc/signal.h
@@ -149,6 +149,20 @@ struct nm_nack_signal_data {
 	uint8_t mt;
 };
 
+struct nm_fail_rep_signal_data {
+	struct gsm_bts *bts;
+	/* raw data */
+	struct msgb *msg;
+	struct tlv_parsed tp;
+	/* parsed data */
+	struct {
+		const char *event_type;
+		const char *severity;
+		const char *additional_text;
+		const uint8_t *probable_cause;
+	} parsed;
+};
+
 struct challoc_signal_data {
 	struct gsm_bts *bts;
 	struct gsm_lchan *lchan;