X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=mISDN.h;h=e3e59a4e94145e587d5f2046a774bb1ab82ed9b3;hp=644658b21d53cb64f6718b5ee4ae16f931df7580;hb=5463e1b62a39ce417b610584e3d34a8bc30ac15e;hpb=a12d7eee22a72f4c999535892763dde15212e89e

diff --git a/mISDN.h b/mISDN.h
index 644658b..e3e59a4 100644
--- a/mISDN.h
+++ b/mISDN.h
@@ -64,16 +64,8 @@ struct mISDNport {
 	int locally; /* local causes are sent as local causes not remote */
 	int los, ais, rdi, slip_rx, slip_tx;
 
-	/* gsm */
-#ifdef WITH_GSM_BS
-	int gsm_bs; /* this is the (only) GSM BS interface */
-#endif
-#ifdef WITH_GSM_MS
-	int gsm_ms; /* this is the an GSM MS interface */
-#endif
-#if defined WITH_GSM_BS || defined WITH_GSM_MS
 	int lcr_sock; /* socket of loopback on LCR side */
-#endif
+	int isloopback; /* will be set on open, in case it is a loopback if */
 
 	/* ss5 */
 	unsigned int ss5; /* set, if SS5 signalling enabled, also holds feature bits */
@@ -133,10 +125,10 @@ class PmISDN : public Port
 	int p_m_mute;				/* if set, conf is disconnected */
 	int p_m_tone;				/* current kernel space tone */
 	int p_m_rxoff;				/* rx from driver is disabled */
-//	int p_m_nodata;				/* all parties within a conf are isdn ports, so pure bridging is possible */
 	int p_m_txdata;				/* get what we transmit */
 	int p_m_dtmf;				/* dtmf decoding is enabled */
-	int p_m_joindata;			/* the call requires data due to no briging capability */
+
+	int bridge_rx(unsigned char *data, int len);
 
 	struct lcr_timer p_m_loadtimer;		/* timer for audio transmission */
 	virtual void update_load(void);
@@ -144,10 +136,6 @@ class PmISDN : public Port
 	int p_m_load;				/* current data in dsp tx buffer */
 	unsigned int p_m_last_tv_sec;		/* time stamp of last tx_load call, (to sync audio data */
 	unsigned int p_m_last_tv_msec;
-//	int p_m_fromup_buffer_readp;		/* buffer for audio from remote endpoint */
-//	int p_m_fromup_buffer_writep;
-//	unsigned char p_m_fromup_buffer[FROMUP_BUFFER_SIZE];
-	void txfromup(unsigned char *data, int length);
 
 	int p_m_crypt;				/* encryption is enabled */
 	int p_m_crypt_msg_loops;		/* sending a message */
@@ -172,8 +160,6 @@ class PmISDN : public Port
 	int p_m_b_channel;			/* number 1,2 1..15,17... */
 	int p_m_b_exclusive;			/* if bchannel is exclusive */
 	int p_m_b_reserve;			/* set if channel is reserved */
-//	long long p_m_jittercheck;		/* time of audio data */
-//	long long p_m_jitterdropped;		/* number of bytes dropped */
 	int p_m_b_mode;				/* bchannel mode */
 	int p_m_hold;				/* if port is on hold */
 	struct lcr_timer p_m_timeout;		/* timeout of timers */