Added keypad forwarding, keypad parameter, chan_lcr keypad option 'k'.

[lcr.git] / message.h

diff --git a/message.h b/message.h
index c84ab19..63abc65 100644 (file)
--- a/message.h
+++ b/message.h
@@ -12,28 +12,30 @@
 #define ISDN_TRANSMIT  256 // samples
 
 enum { /* interface types */
-       INFO_ITYPE_ISDN,
+       INFO_ITYPE_ISDN, /* call from external */
        INFO_ITYPE_ISDN_EXTENSION, /* call from internal extension */
        INFO_ITYPE_CHAN,
        INFO_ITYPE_VBOX
 };
 
 enum { /* number types */
-       INFO_NTYPE_UNKNOWN = 0,
+       INFO_NTYPE_NOTPRESENT = 0,
+       INFO_NTYPE_UNKNOWN,
        INFO_NTYPE_SUBSCRIBER,
        INFO_NTYPE_NATIONAL,
        INFO_NTYPE_INTERNATIONAL
 };
 
 enum { /* number presentation */
-       INFO_PRESENT_NULL = 0,
+       INFO_PRESENT_NOTAVAIL,
        INFO_PRESENT_ALLOWED,
-       INFO_PRESENT_RESTRICTED,
-       INFO_PRESENT_NOTAVAIL
+       INFO_PRESENT_RESTRICTED
 };
 
 enum { /* number presentation */
        INFO_SCREEN_USER, /* user provided */
+       INFO_SCREEN_USER_VERIFIED_PASSED,
+       INFO_SCREEN_USER_VERIFIED_FAILED,
        INFO_SCREEN_NETWORK /* network provided */
 };
 
@@ -144,6 +146,10 @@ enum {
        B_STATE_REMOTE,         /* bchannel assigned to remote application */
        B_STATE_IMPORTING,      /* BCHANNEL_REMOVE sent */
 };
+enum {
+       B_MODE_TRANSPARENT,     /* normal transparent audio */
+       B_MODE_HDLC,            /* hdlc data mode */
+};
 
 /* call-info structure CALLER */
 struct caller_info {
@@ -157,6 +163,11 @@ struct caller_info {
        int present;                    /* presentation */
        int screen;                     /* who provided the number */
        char display[84];               /* display information */
+       char id2[32];                   /* second callerid */
+       int ntype2;                     /* second type of number */
+       int present2;                   /* second presentation */
+       int screen2;                    /* second who provided the number */
+       char imsi[16];                  /* IMSI for gsm originated calls */
 };
 
 /* call-info structure DIALING */
@@ -166,6 +177,8 @@ struct dialing_info {
        int itype;                      /* type of interface */
        int ntype;                      /* type of number */
        int sending_complete;           /* end of dialing */
+       char display[84];               /* display information */
+       char keypad[33];                /* send keypad facility */
 };
 
 /* call-info structure CONNECT */
@@ -180,6 +193,7 @@ struct connect_info {
        int present;                    /* presentation */
        int screen;                     /* who provided the number */
        char display[84];               /* display information */
+       char imsi[16];                  /* IMSI for gsm terminated calls */
 };
 
 /* call-info structure DISCONNECT */
@@ -203,6 +217,7 @@ struct redir_info {
 
 /* call-info structure capability */
 struct capa_info {
+       int source_mode;                /* forward mode */
        int bearer_capa;                /* capability */
        int bearer_mode;                /* circuit/packet */
        int bearer_info1;               /* alaw,ulaw,... */
@@ -301,7 +316,7 @@ struct param_hello {
 
 struct param_bchannel {
        int type; /* BCHANNEL_* */
-       unsigned long handle; /* bchannel stack/portid */
+       unsigned int handle; /* bchannel stack/portid */
        int tx_gain, rx_gain;
        char pipeline[256];
        unsigned char crypt[128];
@@ -347,8 +362,8 @@ struct lcr_msg {
        struct lcr_msg *next;
        int type; /* type of message */
        int flow; /* from where to where */
-       unsigned long id_from; /* in case of flow==PORT_TO_EPOINT: id_from is the port's serial, id_to is the epoint's serial */
-       unsigned long id_to;
+       unsigned int id_from; /* in case of flow==PORT_TO_EPOINT: id_from is the port's serial, id_to is the epoint's serial */
+       unsigned int id_to;
        int keep;
        union parameter param;
 };