X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=gsm.h;h=4959e00948855cf8533427e4b69ab8e39dcc7d82;hp=1fbcee7202c956e0130a7b70aa57a4ba8e27d19f;hb=5b5923141c3ac53d3e63395d9197080d087342f3;hpb=cf1ea15cc320019d7b41eb56aeeb3c1956fbb7a0

diff --git a/gsm.h b/gsm.h
index 1fbcee7..4959e00 100644
--- a/gsm.h
+++ b/gsm.h
@@ -15,7 +15,6 @@ struct gsm_conf {
 	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 */
-	int rtp_proxy;			/* enable RTP proxy */
 };
 
 struct lcr_gsm {
@@ -34,9 +33,11 @@ class Pgsm : public PmISDN
 	Pgsm(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive, int mode);
 	~Pgsm();
 
+	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 */
 	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 */
@@ -50,8 +51,8 @@ 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);
@@ -73,11 +74,9 @@ class Pgsm : public PmISDN
 	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);
+int gsm_conf(struct gsm_conf *gsm_conf, char *conf_error);
 int handle_gsm(void);
 int gsm_exit(int rc);
 int gsm_init(void);