X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=mISDN.h;h=1798b883da671b4704b999285d96fd676a29cd18;hp=49ff539520b258b58a66f1849028295ac530db34;hb=e9daaa4ef7ee895e6a8610ebb2166cc99c891a4e;hpb=7dc10dcae129d2ef7f40a455aba45179eb68d1d8

diff --git a/mISDN.h b/mISDN.h
index 49ff539..1798b88 100644
--- a/mISDN.h
+++ b/mISDN.h
@@ -9,12 +9,22 @@
 **                                                                           **
 \*****************************************************************************/ 
 
+enum {
+	B_STATE_IDLE,
+	B_STATE_ACTIVATING,
+	B_STATE_ACTIVE,
+	B_STATE_DEACTIVATING,
+};
 
-#define B_STATE_IDLE		0
-#define B_STATE_ACTIVATING	1
-#define B_STATE_ACTIVE		2
-#define B_STATE_DEACTIVATING	3
+enum {
+	B_EVENT_ACTIVATE,
+	B_EVENT_ACTIVATED,
+	B_EVENT_DEACTIVATE,
+	B_EVENT_DEACTIVATED,
+};
 
+#define FROMUP_BUFFER_SIZE 1024
+#define FROMUP_BUFFER_MASK 1023
 
 extern int entity;
 extern int mISDNdevice;
@@ -69,25 +79,28 @@ calls with no bchannel (call waiting, call on hold).
 
 /* mISDN none-object functions */
 void mISDN_port_info(void);
-struct mISDNport *mISDNport_open(int port, int ptp);
+struct mISDNport *mISDNport_open(int port, int ptp, int ptmp);
 void mISDNport_close_all(void);
 void mISDNport_close(struct mISDNport *mISDNport);
 void mISDN_port_reorder(void);
 int mISDN_handler(void);
 void enc_ie_cause_standalone(unsigned char **ntmode, msg_t *msg, int location, int cause);
-void ph_control(unsigned long b_addr, int c1, int c2);
-void ph_control_block(unsigned long b_addr, int c1, void *c2, int c2_len);
+void ph_control(struct mISDNport *mISDNport, class PmISDN *isdnport, unsigned long b_addr, int c1, int c2, char *trace_name, int trace_value);
+void ph_control_block(struct mISDNport *mISDNport, unsigned long b_addr, int c1, void *c2, int c2_len, char *trace_name, int trace_value);
 msg_t *create_l2msg(int prim, int dinfo, int size);
 void setup_queue(struct mISDNport *mISDNport, int link);
 int stack2manager_nt(void *dat, void *arg);
 int stack2manager_te(struct mISDNport *mISDNport, msg_t *msg);
+void chan_trace_header(struct mISDNport *mISDNport, class PmISDN *port, char *msgtext, int direction);
+void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsigned long prim, int direction);
+void bchannel_event(struct mISDNport *mISDNport, int i, int event);
 
 
 /* mISDN port classes */
 class PmISDN : public Port
 {
 	public:
-	PmISDN(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel);
+	PmISDN(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive);
 	~PmISDN();
 	void bchannel_receive(iframe_t *frm);
 	int handler(void);
@@ -101,10 +114,15 @@ class PmISDN : public Port
 	int p_m_echo, p_m_conf;			/* remote echo, conference number */
 	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_txmix;				/* mix tx with conference */
-//	int p_m_txmix_on;			/* delay for turning back on after sending a binary message, must be signed */
+//	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_calldata;			/* the call requires data due to no briging capability */
+
+	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 */
@@ -127,9 +145,7 @@ class PmISDN : public Port
 	int p_m_b_index;			/* index 0,1 0..29 */
 	int p_m_b_channel;			/* number 1,2 1..15,17... */
 	int p_m_b_exclusive;			/* if bchannel is exclusive */
-//	int p_m_b_reserved;			/* set if channel is reserved */
-	int p_m_b_stid;				/* current stack id */
-	int p_m_b_addr;				/* current layer address */
+	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_delete;				/* true if obj. must del. */
@@ -137,8 +153,8 @@ class PmISDN : public Port
 	unsigned long p_m_timeout;		/* timeout of timers */
 	time_t p_m_timer;			/* start of timer */
 
-	int alloc_bchannel(int channel, int exclusive);
-	void free_bchannel(void);
+	int seize_bchannel(int channel, int exclusive); /* requests / reserves / links bchannels, but does not open it! */
+	void drop_bchannel(void);
 };
 
 extern unsigned char mISDN_rand[256]; /* noisy randomizer */