X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=mISDN.h;h=f9bae487a8344a19ea45e1e4b578a01b0439560f;hp=4e0d40d8d9e1240d575aafda4bbb2c9bffbcfe61;hb=cbc232643c7b26d64204ba7f6151007e9c0267e4;hpb=da21ec0158f0be010a75d42c058fdc8891498b2d

diff --git a/mISDN.h b/mISDN.h
index 4e0d40d..f9bae48 100644
--- a/mISDN.h
+++ b/mISDN.h
@@ -15,18 +15,21 @@
 extern int entity;
 extern int mISDNdevice;
 
+enum {
+	B_EVENT_USE,		/* activate/export bchannel */
+	B_EVENT_EXPORTREQUEST,	/* remote app requests bchannel */
+	B_EVENT_IMPORTREQUEST,	/* remote app releases bchannel */
+	B_EVENT_ACTIVATED,	/* DL_ESTABLISH received */
+	B_EVENT_DROP,		/* deactivate/re-import 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 */
+};
+
 /* mISDN port structure list */
 struct mISDNport {
-#ifdef SOCKET_MISDN
 	struct mlayer3 *ml3;
-#else
-	net_stack_t nst; /* MUST be the first entry, so &nst equals &mISDNlist */
-	manager_t mgr;
-	int upper_id; /* id to transfer data down */
-	int lower_id; /* id to transfer data up */
-	int d_stid;
-	msg_queue_t downqueue;		/* l4->l3 */
-#endif
 	struct mISDNport *next;
 	char name[64]; /* name of port, if available */
 	struct interface_port *ifport; /* link to interface_port */
@@ -36,7 +39,7 @@ struct mISDNport {
 	int ptp; /* if ptp is set, we keep track of l2link */
 	int l1link; /* if l1 is available (only works with nt-mode) */
 	int l2link; /* if l2 is available (at PTP we take this serious) */
-//	time_t l1timeout; /* timout when establishing link */
+	int l2hold; /* set, if layer 2 must be hold/checked */
 	time_t l2establish; /* time until establishing after link failure */
 	int use; /* counts the number of port that uses this port */
 	int ntmode; /* is TRUE if port is nt mode */
@@ -46,18 +49,14 @@ struct mISDNport {
 	int b_num; /* number of bchannels */
 	int b_reserved; /* number of bchannels reserved or in use */
 	class PmISDN *b_port[128]; /* bchannel assigned to port object */
-#ifdef SOCKET_MISDN
+	struct mqueue upqueue;
 	int b_socket[128];
-#else
-	int b_stid[128];
-	unsigned long b_addr[128];
-#endif
 	int b_state[128]; /* statemachine, 0 = IDLE */
 	double b_timer[128]; /* timer for state machine */
 	unsigned long b_remote_id[128]; /* the socket currently exported */
 	unsigned long b_remote_ref[128]; /* the ref currently exported */
-	int procids[128]; /* keep track of free ids */
 	int locally; /* local causes are sent as local causes not remote */
+	int los, ais, rdi, slip_rx, slip_tx;
 };
 extern mISDNport *mISDNport_first;
 
@@ -80,27 +79,19 @@ calls with no bchannel (call waiting, call on hold).
 int mISDN_initialize(void);
 void mISDN_deinitialize(void);
 void mISDN_port_info(void);
-struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, int force_nt, struct interface *interface);
+struct mISDNport *mISDNport_open(int port, int ptp, int force_nt, int l2hold, struct interface *interface);
 void mISDNport_close_all(void);
 void mISDNport_close(struct mISDNport *mISDNport);
 void mISDN_port_reorder(void);
 int mISDN_handler(void);
-#ifdef SOCKET_MISDN
 void enc_ie_cause_standalone(struct l3_msg *l3m, int location, int cause);
 int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
-#else
-void enc_ie_cause_standalone(unsigned char **ntmode, msg_t *msg, int location, int cause);
-int stack2manager_te(struct mISDNport *mISDNport, msg_t *msg);
-int stack2manager_nt(void *dat, void *arg);
-msg_t *create_l2msg(int prim, int dinfo, int size);
-#endif
 void ph_control(struct mISDNport *mISDNport, class PmISDN *isdnport, unsigned long handle, unsigned long c1, unsigned long c2, char *trace_name, int trace_value);
 void ph_control_block(struct mISDNport *mISDNport, unsigned long handle, unsigned long c1, void *c2, int c2_len, char *trace_name, int trace_value);
-void setup_queue(struct mISDNport *mISDNport, int link);
 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);
-void message_bchannel_from_join(class JoinRemote *joinremote, int type, unsigned long handle);
+void message_bchannel_from_remote(class JoinRemote *joinremote, int type, unsigned long handle);
 
 
 /* mISDN port classes */
@@ -109,11 +100,7 @@ class PmISDN : public Port
 	public:
 	PmISDN(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive);
 	~PmISDN();
-#ifdef SOCKET_MISDN
-	void bchannel_receive(unsigned char *frm, int len);
-#else
-	void bchannel_receive(iframe_t *frm);
-#endif
+	void bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len);
 	int handler(void);
 	void transmit(unsigned char *buffer, int length);
 	int message_epoint(unsigned long epoint_id, int message, union parameter *param);