X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=gsm.h;h=c12baa052a302f5ab582c4fce2e62ff0d02ad2a1;hp=a4653e11bcac24a9149c60d3f68c739ce258f86c;hb=34598a346419f0e661526e6208dade4aff570008;hpb=7239f7e28e0c566c2e9ce2cacc9c32e297dd17d7

diff --git a/gsm.h b/gsm.h
index a4653e1..c12baa0 100644
--- a/gsm.h
+++ b/gsm.h
@@ -1,37 +1,22 @@
-extern "C" {
-#include <openbsc/gsm_data.h>
-}
 
-struct bts_conf {
-	gsm_bts_type type;		/* type of BTS */
-	int card;			/* E1 card number of BS11 BTS */
-	int numtrx;			/* up to 8 TRXs */
-	int frequency[8];		/* up to 8 frequencies for TRXs */
-};
+#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 short_name[64];		/* short network name */
-	char long_name[64];		/* long network name */
-	int mcc;			/* mobile country code */
-	int mnc;			/* mobile network code */
-	int lac;			/* location area code */
-	char hlr[64];			/* database name */
-	int allow_all;			/* accept unknown subscribers */
-	int keep_l2;			/* keep layer 2 after exit */
-	int numbts;			/* number of BTS' */
-	struct bts_conf bts[8];		/* configure BTS' */
-	int noemergshut;		/* don't shut down on emergency */
-	char pcapfile[128];		/* open capture file for BS11 links */
+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_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;
@@ -43,9 +28,12 @@ class Pgsm : public PmISDN
 	Pgsm(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive, int mode);
 	~Pgsm();
 
-	unsigned int p_m_g_callref; /* ref by OpenBSC */
+	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_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 */
 	int p_m_g_gsm_b_index; /* gsm bchannel socket index to use */
 	int p_m_g_gsm_b_active; /* gsm bchannel socket is activated */
 	struct lcr_msg *p_m_g_notify_pending;	/* queue for NOTIFY if not connected */
@@ -59,35 +47,31 @@ class Pgsm : public PmISDN
 	void bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len);
 	void bchannel_send(unsigned int prim, unsigned int id, unsigned char *data, int len);
 
-	void trau_send(void *_tf);
-	void trau_receive(void *_frame);
+	void frame_send(void *_frame);
+	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);
 	void message_disconnect(unsigned int epoint_id, int message_id, union parameter *param);
 	void message_release(unsigned int epoint_id, int message_id, union parameter *param);
 	int message_epoint(unsigned int epoint_id, int message_id, union parameter *param);
-	int handler(void);
 };
 
-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);