X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=gsm.h;h=3ecaf0d83c1471fdca4b23da9ab50dbfea566256;hp=5080a8a5f734bf75b8198a01751e93e56832cf9e;hb=c67eb259868a81432a68fe14d3caeea33d7eafb2;hpb=2f9f37a9110e3c8fe7a317894c8aec5ed602b39c

diff --git a/gsm.h b/gsm.h
index 5080a8a..3ecaf0d 100644
--- a/gsm.h
+++ b/gsm.h
@@ -1,16 +1,7 @@
-extern int new_callref;
 
-struct gsm_conf {
-	char debug[128];		/* debug info */
-	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 */
-	char pcapfile[128];		/* open capture file for BS11 links */
-	int reject_cause;		/* reject cause for unsubcribed IMSIs */
-};
+#include <sys/un.h>
+
+extern int new_callref;
 
 struct mncc_q_entry {
 	struct mncc_q_entry *next;
@@ -18,19 +9,23 @@ struct mncc_q_entry {
 	char data[0];			/* struct gsm_mncc */
 };
 
+enum {
+	LCR_GSM_TYPE_NETWORK,
+	LCR_GSM_TYPE_MS,
+};
+
 struct lcr_gsm {
-	void		*network;	/* OpenBSC network handle */
-	struct gsm_conf	conf;		/* gsm.conf options */
-	int		gsm_sock;	/* loopback interface GSM side */
-	int		gsm_port;	/* loopback interface port number */
+	struct lcr_gsm	*gsm_ms_next;	/* list of MS instances, in case of MS */
+	char		name[16];	/* name of MS instance, in case of MS */
+	int		type;		/* LCR_GSM_TYPE_*/
 
 	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;
-
 /* GSM port class */
 class Pgsm : public PmISDN
 {
@@ -38,9 +33,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 */
+	struct lcr_gsm *p_m_g_lcr_gsm; /* 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 */
+	struct lcr_work p_m_g_delete; /* queue destruction of GSM port instance */
 	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 */
@@ -78,13 +73,10 @@ class Pgsm : public PmISDN
 };
 
 struct gsm_mncc *create_mncc(int msg_type, unsigned int callref);
-int send_and_free_mncc(void *instance, unsigned int msg_type, void *data);
+int send_and_free_mncc(struct lcr_gsm *lcr_gsm, 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);
+int mncc_socket_retry_cb(struct lcr_timer *timer, void *inst, int index);
 
-extern "C" {
-int mncc_send(struct gsm_network *instance, int msg_type, void *data);
-};