X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=gsm.h;h=71ed759e85d0fb2695e028b40ba9c214c2581ee4;hp=15477efb4f138d7d7cea373ea52bdf3cf9e8a622;hb=5a16de16711325f1a9d4b86e6b7a99b9fda258ca;hpb=03cb33b51da2596a2ef4373debe52ccde8e5cc7b

diff --git a/gsm.h b/gsm.h
index 15477ef..71ed759 100644
--- a/gsm.h
+++ b/gsm.h
@@ -1,6 +1,4 @@
-extern "C" {
-#include <openbsc/gsm_data.h>
-}
+extern int new_callref;
 
 struct gsm_conf {
 	char debug[128];		/* debug info */
@@ -12,7 +10,6 @@ struct gsm_conf {
 	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 */
 };
@@ -20,7 +17,7 @@ struct gsm_conf {
 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 */
 };
 
@@ -33,9 +30,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 */
@@ -53,31 +53,27 @@ 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);
 	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);