fixed trace bug

[lcr.git] / message.h

diff --git a/message.h b/message.h
index f07745c..a1f5baf 100644 (file)
--- a/message.h
+++ b/message.h
@@ -166,6 +166,7 @@ struct dialing_info {
        int itype;                      /* type of interface */
        int ntype;                      /* type of number */
        int sending_complete;           /* end of dialing */
+       char display[84];               /* display information */
 };
 
 /* call-info structure CONNECT */
@@ -240,7 +241,6 @@ struct useruser_info {
 struct message_setup {
        int isdn_port; /* card number 1...n (only on calls from isdn port) */
        int port_type; /* type of port (only required if message is port -> epoint) */
-       int dtmf; /* used to enabled dtmf dialing at setup state */
        int partyline; /* if set, call will be a conference room */
        int partyline_jingle; /* if set, the jingle will be played on conference join */
        struct caller_info callerinfo;          /* information about the caller */
@@ -302,7 +302,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];
@@ -348,8 +348,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;
 };
@@ -358,6 +358,7 @@ enum { /* messages between entities */
        MESSAGE_NONE,           /* no message */
        MESSAGE_TONE,           /* set information tone (to isdn port) */
        MESSAGE_DTMF,           /* dtmf digit (from isdn port) */
+       MESSAGE_ENABLEKEYPAD,   /* remote application requests keypad/dtmf */
        MESSAGE_mISDNSIGNAL,    /* special mixer command (down to isdn port) */
        MESSAGE_SETUP,          /* setup message */
        MESSAGE_INFORMATION,    /* additional digit information */
@@ -392,6 +393,7 @@ enum { /* messages between entities */
        "MESSAGE_NONE", \
        "MESSAGE_TONE", \
        "MESSAGE_DTMF", \
+       "MESSAGE_ENABLEKEYPAD", \
        "MESSAGE_mISDNSIGNAL", \
        "MESSAGE_SETUP", \
        "MESSAGE_INFORMATION", \