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

diff --git a/mISDN.h b/mISDN.h
index e3e59a4..d8c504b 100644
--- a/mISDN.h
+++ b/mISDN.h
@@ -18,15 +18,11 @@ extern int mISDNdevice;
 extern int mISDNsocket;
 
 enum {
-	B_EVENT_USE,		/* activate/export bchannel */
-	B_EVENT_EXPORTREQUEST,	/* remote app requests bchannel */
-	B_EVENT_IMPORTREQUEST,	/* remote app releases bchannel */
+	B_EVENT_USE,		/* activate bchannel */
 	B_EVENT_ACTIVATED,	/* DL_ESTABLISH received */
-	B_EVENT_DROP,		/* deactivate/re-import bchannel */
+	B_EVENT_DROP,		/* deactivate bchannel */
 	B_EVENT_DEACTIVATED,	/* DL_RELEASE received */
-	B_EVENT_EXPORTED,	/* BCHANNEL_ASSIGN received */
-	B_EVENT_IMPORTED,	/* BCHANNEL_REMOVE received */
-	B_EVENT_TIMEOUT,	/* timeout for bchannel state */
+	B_EVENT_TIMEOUT,	/* timeout happed during (de)activation */
 };
 
 /* mISDN port structure list */
@@ -49,6 +45,8 @@ struct mISDNport {
 	int ntmode; /* is TRUE if port is NT mode */
 	int tespecial; /* is TRUE if port uses special TE mode */
 	int pri; /* is TRUE if port is a primary rate interface */
+	int pots; /* is TRUE if port is of type POTS */
+	struct lcr_fd pots_sock; /* socket for L1 */
 	int tones; /* TRUE if tones are sent outside connect state */
 	int earlyb; /* TRUE if tones are received outside connect state */
 	int b_num; /* number of bchannels */
@@ -59,14 +57,9 @@ struct mISDNport {
 	int b_mode[128]; /* B_MODE_* */
 	int b_state[128]; /* statemachine, 0 = IDLE */
 	struct lcr_timer b_timer[128]; /* timer for bchannel state machine */
-	int b_remote_id[128]; /* the socket currently exported (0=none) */
-	unsigned int b_remote_ref[128]; /* the ref currently exported */
 	int locally; /* local causes are sent as local causes not remote */
 	int los, ais, rdi, slip_rx, slip_tx;
 
-	int lcr_sock; /* socket of loopback on LCR side */
-	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 */
 };
@@ -103,14 +96,13 @@ void ph_control_block(struct mISDNport *mISDNport, unsigned int handle, unsigned
 void chan_trace_header(struct mISDNport *mISDNport, class PmISDN *port, const char *msgtext, int direction);
 void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsigned int prim, int direction);
 void bchannel_event(struct mISDNport *mISDNport, int i, int event);
-void message_bchannel_from_remote(class JoinRemote *joinremote, int type, unsigned int handle);
 
 
 /* mISDN port classes */
 class PmISDN : public Port
 {
 	public:
-	PmISDN(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive, int mode);
+	PmISDN(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, struct interface *interface, int channel, int exclusive, int mode);
 	~PmISDN();
 	void bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len);
 	void transmit(unsigned char *buffer, int length);
@@ -119,6 +111,9 @@ class PmISDN : public Port
 	void message_crypt(unsigned int epoint_id, int message_id, union parameter *param);
 	struct mISDNport *p_m_mISDNport;	/* pointer to port */
 	int p_m_delay;				/* use delay instead of dejitter */
+	int p_m_tx_dejitter;			/* use dejitter on transmit data to DSP */
+	int p_m_disable_dejitter;		/* usefull to send fax via bridge */
+	int p_m_preload;			/* set to ISDN_LOAD, but may be changed later */
 	int p_m_tx_gain, p_m_rx_gain;		/* volume shift (0 = no change) */
 	char p_m_pipeline[256];			/* filter pipeline */
 	int p_m_echo, p_m_conf;			/* remote echo, conference number */
@@ -163,8 +158,6 @@ class PmISDN : public Port
 	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 */
-	unsigned int p_m_remote_ref;		/* join to export bchannel to */
-	int p_m_remote_id;			/* sock to export bchannel to */
 
 	int p_m_inband_send_on;			/* triggers optional send function */
 	int p_m_inband_receive_on;		/* triggers optional receive function */