SOCKET BRANCH:

[lcr.git] / mISDN.h

diff --git a/mISDN.h b/mISDN.h
index 4e0d40d..de33e16 100644 (file)
--- a/mISDN.h
+++ b/mISDN.h
@@ -36,7 +36,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 */
@@ -47,8 +47,10 @@ struct mISDNport {
        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 procids[256]; /* keep track of free ids */
        int b_stid[128];
        unsigned long b_addr[128];
 #endif
@@ -56,8 +58,8 @@ struct mISDNport {
        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,7 +82,7 @@ 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);
@@ -92,11 +94,11 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi
 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);
+void setup_queue(struct mISDNport *mISDNport, int link);
 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);
@@ -110,7 +112,7 @@ class PmISDN : public Port
        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);
+       void bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len);
 #else
        void bchannel_receive(iframe_t *frm);
 #endif