combine several small .h in msc_common.h

For hysterical raisins, there are some header files that contain few
declarations, and where the name doesn't reflect the content. Combine them to
new msc_common.h:

- common.h
- common_cs.h
- osmo_msc.h

Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28
changes/33/12033/7
Neels Hofmeyr 4 years ago
parent a8945ce37c
commit 7992122bac
  1. 4
      include/osmocom/msc/Makefile.am
  2. 6
      include/osmocom/msc/common.h
  3. 10
      include/osmocom/msc/common_cs.h
  4. 4
      include/osmocom/msc/gsm_data.h
  5. 2
      include/osmocom/msc/gsm_data_shared.h
  6. 12
      include/osmocom/msc/msc_common.h
  7. 1
      src/libmsc/a_iface.c
  8. 1
      src/libmsc/a_iface_bssap.c
  9. 1
      src/libmsc/a_reset.c
  10. 1
      src/libmsc/gsm_04_08.c
  11. 1
      src/libmsc/gsm_04_08_cc.c
  12. 1
      src/libmsc/gsm_04_11.c
  13. 1
      src/libmsc/gsm_09_11.c
  14. 1
      src/libmsc/gsm_subscriber.c
  15. 1
      src/libmsc/iucs.c
  16. 1
      src/libmsc/iucs_ranap.c
  17. 1
      src/libmsc/msc_vty.c
  18. 2
      src/libmsc/osmo_msc.c
  19. 1
      src/libmsc/silent_call.c
  20. 1
      src/libmsc/transaction.c
  21. 1
      src/osmo-msc/msc_main.c
  22. 1
      tests/msc_vlr/msc_vlr_tests.h

@ -1,8 +1,6 @@
noinst_HEADERS = \
a_iface.h \
a_iface_bssap.h \
common.h \
common_cs.h \
db.h \
debug.h \
gsm_04_08.h \
@ -18,10 +16,10 @@ noinst_HEADERS = \
iu_dummy.h \
mncc.h \
mncc_int.h \
msc_common.h \
msc_ifaces.h \
msc_mgcp.h \
a_reset.h \
osmo_msc.h \
ran_conn.h \
rrlp.h \
signal.h \

@ -1,6 +0,0 @@
#pragma once
enum nsap_addr_enc {
NSAP_ADDR_ENC_X213,
NSAP_ADDR_ENC_V4RAW,
};

@ -1,10 +0,0 @@
#pragma once
#include <stdint.h>
struct msgb;
struct gsm_network;
typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *);
struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv);

@ -13,10 +13,10 @@
#include <osmocom/gsm/gsm48.h>
#include <osmocom/crypt/auth.h>
#include <osmocom/msc/common.h>
#include <osmocom/msc/common_cs.h>
#include <osmocom/mgcp_client/mgcp_client.h>
#include <osmocom/msc/msc_common.h>
#include "gsm_data_shared.h"
/* TS 48.008 DLCI containing DCCH/ACCH + SAPI */

@ -12,8 +12,6 @@
#include <osmocom/gsm/tlv.h>
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/msc/common_cs.h>
struct osmo_bsc_data;
struct osmo_bsc_sccp_con;

@ -1,13 +1,21 @@
#pragma once
/* Routines for the MSC handling */
struct msgb;
struct gsm_network;
struct vlr_subscr;
#define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1"
#define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT
enum nsap_addr_enc {
NSAP_ADDR_ENC_X213,
NSAP_ADDR_ENC_V4RAW,
};
typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *);
struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv);
int msc_vlr_alloc(struct gsm_network *net);
int msc_vlr_start(struct gsm_network *net);

@ -39,7 +39,6 @@
#include <osmocom/core/byteswap.h>
#include <osmocom/sccp/sccp_types.h>
#include <osmocom/msc/a_reset.h>
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/msc/vlr.h>
#include <errno.h>

@ -31,7 +31,6 @@
#include <osmocom/msc/gsm_data.h>
#include <osmocom/msc/a_iface_bssap.h>
#include <osmocom/msc/a_iface.h>
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/core/byteswap.h>
#include <osmocom/msc/a_reset.h>
#include <osmocom/msc/transaction.h>

@ -27,6 +27,7 @@
#include <string.h>
#include <osmocom/msc/debug.h>
#include <osmocom/msc/a_reset.h>
#include <osmocom/msc/msc_common.h>
#define RESET_RESEND_INTERVAL 2 /* sec */
#define RESET_RESEND_TIMER_NO 16 /* See also 3GPP TS 48.008 Chapter 3.1.4.1.3.2 */

@ -46,7 +46,6 @@
#include <osmocom/msc/signal.h>
#include <osmocom/msc/transaction.h>
#include <osmocom/msc/silent_call.h>
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/msc/mncc_int.h>
#include <osmocom/abis/e1_input.h>
#include <osmocom/core/bitvec.h>

@ -44,7 +44,6 @@
#include <osmocom/msc/signal.h>
#include <osmocom/msc/transaction.h>
#include <osmocom/msc/silent_call.h>
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/msc/mncc_int.h>
#include <osmocom/abis/e1_input.h>
#include <osmocom/core/bitvec.h>

@ -52,7 +52,6 @@
#include <osmocom/msc/db.h>
#include <osmocom/msc/transaction.h>
#include <osmocom/msc/msc_ifaces.h>
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/msc/vlr.h>
#ifdef BUILD_SMPP

@ -42,7 +42,6 @@
#include <osmocom/msc/gsm_04_80.h>
#include <osmocom/msc/gsm_subscriber.h>
#include <osmocom/msc/debug.h>
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/msc/vlr.h>
#include <osmocom/msc/gsm_04_08.h>
#include <osmocom/msc/transaction.h>

@ -46,7 +46,6 @@
#include <osmocom/msc/signal.h>
#include <osmocom/msc/db.h>
#include <osmocom/msc/vlr.h>
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/msc/msc_ifaces.h>
#include <osmocom/msc/a_iface.h>

@ -31,7 +31,6 @@
#include <osmocom/msc/gsm_data.h>
#include <osmocom/msc/gsm_subscriber.h>
#include <osmocom/msc/transaction.h>
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/msc/vlr.h>
#include <osmocom/core/byteswap.h>

@ -37,7 +37,6 @@
#include <osmocom/msc/iucs.h>
#include <osmocom/msc/vlr.h>
#include <osmocom/msc/iucs_ranap.h>
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/msc/msc_mgcp.h>
#include <asn1c/asn1helpers.h>

@ -43,7 +43,6 @@
#endif
#include <osmocom/msc/vty.h>
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/msc/gsm_data.h>
#include <osmocom/msc/gsm_subscriber.h>
#include <osmocom/msc/vlr.h>

@ -21,12 +21,10 @@
*
*/
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/msc/debug.h>
#include <osmocom/msc/transaction.h>
#include <osmocom/msc/db.h>
#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>

@ -29,7 +29,6 @@
#include <osmocom/msc/debug.h>
#include <osmocom/msc/gsm_data.h>
#include <osmocom/msc/gsm_subscriber.h>
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/msc/vlr.h>
/* paging of the requested subscriber has completed */

@ -25,7 +25,6 @@
#include <osmocom/core/talloc.h>
#include <osmocom/msc/gsm_04_08.h>
#include <osmocom/msc/mncc.h>
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/msc/vlr.h>
void *tall_trans_ctx;

@ -46,7 +46,6 @@
#include <osmocom/abis/e1_input.h>
#include <osmocom/core/talloc.h>
#include <osmocom/msc/signal.h>
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/msc/sms_queue.h>
#include <osmocom/vty/telnet_interface.h>
#include <osmocom/vty/ports.h>

@ -27,7 +27,6 @@
#include <stdio.h>
#include <osmocom/msc/gsm_data.h>
#include <osmocom/msc/osmo_msc.h>
#include <osmocom/msc/vlr.h>
#include <osmocom/msc/mncc.h>

Loading…
Cancel
Save