Remove rest_octets.h

The MSC should not fiddle with low-level SI details like rest octets
anyway. Unfortunately simply removing the header is impossible as it
causes massive fallout due to missing includes. Fixed it as well.

The only other parameter which required removal is cell_ro_sel_par which
is not referenced anywhere in the code anyway.

Change-Id: Ibff77330de056fad4288cd4c48d016aad8105354

11 files changed, 16 insertions, 1 deletions

diff --git a/src/libcommon-cs/common_cs.c b/src/libcommon-cs/common_cs.c
index 8a28b7235..bad826264 100644
--- a/src/libcommon-cs/common_cs.c
+++ b/src/libcommon-cs/common_cs.c
@@ -29,6 +29,7 @@
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/gsm_04_11.h>
+#include <osmocom/msc/gsm_04_08.h>
 
 /* Warning: if bsc_network_init() is not called, some of the members of
  * gsm_network are not initialized properly and must not be used! (In
diff --git a/src/libcommon/gsm_subscriber_base.c b/src/libcommon/gsm_subscriber_base.c
index 58a6ff089..20147a3c3 100644
--- a/src/libcommon/gsm_subscriber_base.c
+++ b/src/libcommon/gsm_subscriber_base.c
@@ -29,6 +29,7 @@
 
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/utils.h>
+#include <osmocom/gsm/gsm48.h>
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/debug.h>
 #include <osmocom/msc/vlr.h>
diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c
index 3e8649435..4892fb8c5 100644
--- a/src/libmsc/a_iface.c
+++ b/src/libmsc/a_iface.c
@@ -40,6 +40,8 @@
 #include <osmocom/msc/a_reset.h>
 #include <osmocom/msc/osmo_msc.h>
 
+#include <errno.h>
+
 /* A pointer to the GSM network we work with. By the current paradigm,
  * there can only be one gsm_network per MSC. The pointer is set once
  * when calling a_init() */
diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c
index 3d5755a4c..922dca955 100644
--- a/src/libmsc/a_iface_bssap.c
+++ b/src/libmsc/a_iface_bssap.c
@@ -24,6 +24,7 @@
 #include <osmocom/sigtran/sccp_helpers.h>
 #include <osmocom/sccp/sccp_types.h>
 #include <osmocom/gsm/gsm0808.h>
+#include <osmocom/gsm/gsm48.h>
 #include <osmocom/gsm/gsm0808_utils.h>
 #include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
@@ -32,6 +33,9 @@
 #include <osmocom/msc/osmo_msc.h>
 #include <osmocom/core/byteswap.h>
 #include <osmocom/msc/a_reset.h>
+#include <osmocom/msc/transaction.h>
+
+#include <errno.h>
 
 #define IP_V4_ADDR_LEN 4
 
diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c
index 05c943985..b6b1bc9d9 100644
--- a/src/libmsc/mncc_sock.c
+++ b/src/libmsc/mncc_sock.c
@@ -38,6 +38,7 @@
 #include <osmocom/msc/debug.h>
 #include <osmocom/msc/mncc.h>
 #include <osmocom/msc/gsm_data.h>
+#include <osmocom/msc/gsm_04_08.h>
 
 struct mncc_sock_state {
 	struct gsm_network *net;
diff --git a/src/libmsc/msc_ifaces.c b/src/libmsc/msc_ifaces.c
index f54426e18..1c8e5efa0 100644
--- a/src/libmsc/msc_ifaces.c
+++ b/src/libmsc/msc_ifaces.c
@@ -29,6 +29,7 @@
 #include <osmocom/mgcp_client/mgcp_client.h>
 #include <osmocom/msc/vlr.h>
 #include <osmocom/msc/a_iface.h>
+#include <osmocom/msc/gsm_04_08.h>
 
 #include "../../bscconfig.h"
 
diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c
index db247579f..f807f2aee 100644
--- a/src/libmsc/osmo_msc.c
+++ b/src/libmsc/osmo_msc.c
@@ -29,7 +29,7 @@
 #include <osmocom/msc/vlr.h>
 #include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/a_iface.h>
-
+#include <osmocom/msc/gsm_04_08.h>
 #include <osmocom/msc/gsm_04_11.h>
 
 #include "../../bscconfig.h"
diff --git a/src/libmsc/ussd.c b/src/libmsc/ussd.c
index e3263d2c8..7b450a2df 100644
--- a/src/libmsc/ussd.c
+++ b/src/libmsc/ussd.c
@@ -34,6 +34,7 @@
 #include <osmocom/msc/debug.h>
 #include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/vlr.h>
+#include <osmocom/msc/gsm_04_08.h>
 
 /* Declarations of USSD strings to be recognised */
 const char USSD_TEXT_OWN_NUMBER[] = "*#100#";
diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c
index a9aacbd6f..6094c9c43 100644
--- a/src/libvlr/vlr.c
+++ b/src/libvlr/vlr.c
@@ -25,6 +25,7 @@
 #include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
 #include <osmocom/gsm/gsup.h>
 #include <osmocom/gsm/apn.h>
+#include <osmocom/gsm/gsm48.h>
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/gsup_client.h>
 #include <osmocom/msc/vlr.h>
@@ -35,6 +36,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <limits.h>
+#include <errno.h>
 
 #include "vlr_core.h"
 #include "vlr_auth_fsm.h"
diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c
index 9d9e4c1c3..41620b90d 100644
--- a/src/libvlr/vlr_access_req_fsm.c
+++ b/src/libvlr/vlr_access_req_fsm.c
@@ -21,6 +21,7 @@
 
 #include <osmocom/core/fsm.h>
 #include <osmocom/gsm/gsup.h>
+#include <osmocom/gsm/gsm48.h>
 #include <osmocom/msc/vlr.h>
 #include <osmocom/msc/debug.h>
 
diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c
index c9223f854..ea7529eb3 100644
--- a/src/libvlr/vlr_lu_fsm.c
+++ b/src/libvlr/vlr_lu_fsm.c
@@ -20,6 +20,7 @@
  */
 
 #include <osmocom/core/fsm.h>
+#include <osmocom/gsm/gsm48.h>
 #include <osmocom/gsm/gsup.h>
 #include <osmocom/msc/vlr.h>
 #include <osmocom/msc/debug.h>