X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=message.h;h=7ac4a844f4f92fad1abf0c868c496c2337e2e1f6;hp=f07745ce99d6de954e28c8042a10a758f690ce30;hb=57549529c86785b7ecf5f56d2a3ff42b5e519755;hpb=026b04fc75011a144285f399b82890803b4315bd

diff --git a/message.h b/message.h
index f07745c..7ac4a84 100644
--- a/message.h
+++ b/message.h
@@ -19,17 +19,17 @@ enum { /* interface types */
 };
 
 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 */
@@ -144,6 +144,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 +161,10 @@ 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 */
 };
 
 /* call-info structure DIALING */
@@ -166,6 +174,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 */
@@ -203,6 +212,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,... */
@@ -240,7 +250,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 +311,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 +357,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 +367,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 +402,7 @@ enum { /* messages between entities */
 	"MESSAGE_NONE", \
 	"MESSAGE_TONE", \
 	"MESSAGE_DTMF", \
+	"MESSAGE_ENABLEKEYPAD", \
 	"MESSAGE_mISDNSIGNAL", \
 	"MESSAGE_SETUP", \
 	"MESSAGE_INFORMATION", \