Merge branch 'master' of ssh://jolly@www.misdn.org/var/git/lcr

[lcr.git] / lcrsocket.h

diff --git a/lcrsocket.h b/lcrsocket.h
index 86497f9..931afb8 100644 (file)
--- a/lcrsocket.h
+++ b/lcrsocket.h
@@ -9,7 +9,7 @@
 **                                                                           **
 \*****************************************************************************/
 
-#define SOCKET_NAME "/var/run/LCR.socket"
+#define SOCKET_NAME "%s/LCR.socket"
 
 /* structures that define message between admin-tool and pbx */
 
@@ -39,6 +39,7 @@ enum { /* messages */
        ADMIN_CALL_DISCONNECT,
        ADMIN_CALL_RELEASE,
        ADMIN_CALL_NOTIFY,
+       ADMIN_CALL_PROGRESS,
        ADMIN_TRACE_REQUEST,
        ADMIN_TRACE_RESPONSE,
        ADMIN_MESSAGE,
@@ -65,19 +66,25 @@ struct admin_response_state {
 struct admin_response_interface {
        char            interface_name[32];
        int             portnum;
+       char            portname[64];
        int             block;
        int             ntmode;
        int             ptp;
+       int             l1hold;
+       int             l2hold;
        int             pri;
        int             extension;
        int             use; /* number of ports that use this interface */
        int             l1link; /* down(0) or up(1) */
        int             l2link; /* down(0) or up(1) */
+       unsigned char   l2mask[16]; /* one bit for each tei */
        int             los, ais, rdi, slip_tx, slip_rx;
        int             channels;
        char            busy[256]; /* if port is idle(0) busy(1) */
        unsigned int    port[256]; /* current port */
        int             mode[256];
+       char            out_channel[256];
+       char            in_channel[256];
 };
 
 struct admin_response_remote {
@@ -126,7 +133,7 @@ struct admin_call {
        int             present; /* presentation */
        int             cause; /* cause to send */
        int             location;
-       int             notify;
+       int             notify_progress;
        int             bc_capa;
        int             bc_mode;
        int             bc_info1;
@@ -184,4 +191,5 @@ enum {
        ADMIN_STATE_CONNECT,
        ADMIN_STATE_IN_DISCONNECT,
        ADMIN_STATE_OUT_DISCONNECT,
+       ADMIN_STATE_RELEASE,
 };