X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=gsm.h;h=5d126465e7f838b13cbc4419d5da20d1b57e9f05;hp=6c09fa83cf17cfbd71eeeb780650c575ed193f86;hb=0345a55ca7308efdcebee25ec90ef0f11f78810e;hpb=b0bd74e35e935aa976b68c594def4e8d2c22ef95

diff --git a/gsm.h b/gsm.h
index 6c09fa8..5d12646 100644
--- a/gsm.h
+++ b/gsm.h
@@ -1,27 +1,37 @@
-extern "C" {
-#include <openbsc/gsm_data.h>
-}
+
+#include <sys/un.h>
+
+extern int new_callref;
 
 struct gsm_conf {
 	char debug[128];		/* debug info */
-	char interface_bsc[64];		/* loopback interface BSC side */
-	char interface_lcr[64];		/* loopback interface LCR side */
 	char openbsc_cfg[128];		/* openbsc config file */
 	char short_name[64];		/* short network name */
 	char long_name[64];		/* long network name */
 	char hlr[64];			/* database name */
 	int allow_all;			/* accept unknown subscribers */
 	int keep_l2;			/* keep layer 2 after exit */
-	int noemergshut;		/* don't shut down on emergency */
 	char pcapfile[128];		/* open capture file for BS11 links */
 	int reject_cause;		/* reject cause for unsubcribed IMSIs */
 };
 
+struct mncc_q_entry {
+	struct mncc_q_entry *next;
+	unsigned int len;
+	char data[0];			/* struct gsm_mncc */
+};
+
 struct lcr_gsm {
 	void		*network;	/* OpenBSC network handle */
 	struct gsm_conf	conf;		/* gsm.conf options */
-	int		gsm_sock;	/* loopback interface BSC side */
+	int		gsm_sock;	/* loopback interface GSM side */
 	int		gsm_port;	/* loopback interface port number */
+
+	struct lcr_fd	mncc_lfd;	/* Unix domain socket to OpenBSC MNCC */
+	struct mncc_q_entry *mncc_q_hd;
+	struct mncc_q_entry *mncc_q_tail;
+	struct lcr_timer socket_retry;	/* Timer to re-try connecting to BSC socket */
+	struct sockaddr_un sun;		/* Socket address of MNCC socket */
 };
 
 extern struct lcr_gsm *gsm;
@@ -33,8 +43,9 @@ class Pgsm : public PmISDN
 	Pgsm(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive, int mode);
 	~Pgsm();
 
+	void *p_m_g_instance; /* pointer to network/ms instance */
+	unsigned int p_m_g_callref; /* ref by OpenBSC/Osmocom-BB */
 	struct lcr_work p_m_g_delete;		/* timer for audio transmission */
-	unsigned int p_m_g_callref; /* ref by OpenBSC */
 	unsigned int p_m_g_mode; /* data/transparent mode */
 	int p_m_g_gsm_b_sock; /* gsm bchannel socket */
 	struct lcr_fd p_m_g_gsm_b_fd; /* event node */
@@ -55,19 +66,14 @@ class Pgsm : public PmISDN
 	void frame_receive(void *_frame);
 
 	int hunt_bchannel(void);
-	void setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc);
-	void start_dtmf_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc);
-	void stop_dtmf_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc);
 	void call_conf_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *gsm);
+	void call_proc_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc);
 	void alert_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc);
 	void setup_cnf(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc);
 	void setup_compl_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc);
 	void disc_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc);
 	void rel_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc);
 	void notify_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc);
-	void hold_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc);
-	void retr_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc);
-	void message_setup(unsigned int epoint_id, int message_id, union parameter *param);
 	void message_notify(unsigned int epoint_id, int message_id, union parameter *param);
 	void message_alerting(unsigned int epoint_id, int message_id, union parameter *param);
 	void message_connect(unsigned int epoint_id, int message_id, union parameter *param);
@@ -76,9 +82,14 @@ class Pgsm : public PmISDN
 	int message_epoint(unsigned int epoint_id, int message_id, union parameter *param);
 };
 
-extern char *gsm_conf_error;
-int gsm_conf(struct gsm_conf *gsm_conf);
+struct gsm_mncc *create_mncc(int msg_type, unsigned int callref);
+int send_and_free_mncc(void *instance, unsigned int msg_type, void *data);
+void gsm_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsigned int msg_type, int direction);
 int handle_gsm(void);
+int gsm_conf(struct gsm_conf *gsm_conf, char *conf_error);
 int gsm_exit(int rc);
 int gsm_init(void);
 
+extern "C" {
+int mncc_send(struct gsm_network *instance, int msg_type, void *data);
+};