X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=message.h;h=fc00c0235f05e018b6b46576428fe90ea7c75e89;hp=0a56b9811ce4501083f5aaff481af0f7d4368e4a;hb=3754d8f73ff7cb55e204f7ede6569028407a00e5;hpb=2ed0fee489c37a6e2d4473f6185ebbe3e746ac11

diff --git a/message.h b/message.h
index 0a56b98..fc00c02 100644
--- a/message.h
+++ b/message.h
@@ -1,6 +1,6 @@
 /*****************************************************************************\
 **                                                                           **
-** PBX4Linux                                                                 **
+** Linux Call Router                                                         **
 **                                                                           **
 **---------------------------------------------------------------------------**
 ** Copyright: Andreas Eversberg                                              **
@@ -118,17 +118,17 @@ enum { /* diversion types */
 #define INFO_HLC_AUDIOVISUAL				0xe0
 
 enum { /* isdnsignal */
-	mISDNSIGNAL_VOLUME,
-	mISDNSIGNAL_CONF,
-	mISDNSIGNAL_NODATA,		/* no data required */
-	mISDNSIGNAL_ECHO,
+	mISDNSIGNAL_VOLUME,		/* change volume */
+	mISDNSIGNAL_CONF,		/* joint/split conference */
+	mISDNSIGNAL_CALLDATA,		/* data required by call instance */
+	mISDNSIGNAL_ECHO,		/* enable/disable echoe */
+	mISDNSIGNAL_DELAY,		/* use delay or adaptive jitter */
 };
 
 /* call-info structure CALLER */
 struct caller_info {
 	char id[32];			/* id of caller (user number) */
-	char voip[64];			/* URI of voip (or gateway) */
-	char intern[32];		/* internal id */
+	char extension[32];		/* internal id */
 	char name[16];
 	int isdn_port;			/* internal/external port (if call is isdn) */
 	char interface[32];		/* interface name the call was from */
@@ -141,7 +141,7 @@ struct caller_info {
 
 /* call-info structure DIALING */
 struct dialing_info {
-	char number[256];		/* number dialing (so far) */
+	char id[256];			/* number dialing (so far) */
 	char interfaces[128];		/* interfaces for extenal calls */
 	int itype;			/* type of interface */
 	int ntype;			/* type of number */
@@ -151,8 +151,7 @@ struct dialing_info {
 /* call-info structure CONNECT */
 struct connect_info {
 	char id[32];			/* id of caller (user number) */
-	char voip[64];			/* URI of voip (or gateway) */
-	char intern[32];		/* internal id */
+	char extension[32];		/* internal id */
 	char name[16];
 	int isdn_port;			/* internal/external port (if call is isdn) */
 	char interfaces[128];		/* interfaces for extenal calls */
@@ -173,8 +172,7 @@ struct disconnect_info {
 /* call-info structure REDIR */
 struct redir_info {
 	char id[32];			/* id of caller (user number) */
-	char voip[64];			/* host of voip (or gateway) */
-	char intern[32];		/* internal id */
+	char extension[32];		/* internal id */
 	int isdn_port;			/* internal/external port (if call is isdn) */
 	int itype;			/* type of interface */
 	int ntype;			/* type of number */
@@ -196,8 +194,7 @@ struct capa_info {
 struct notify_info {
 	int notify;			/* notifications (see INFO_NOTIFY_*) */
 	char id[32];			/* redirection id (user number) */
-	char voip[64];			/* host of voip (or gateway) */
-	char intern[32];		/* internal id */
+	char extension[32];		/* internal id */
 	int isdn_port;			/* internal/external port (if call is isdn) */
 	int itype;			/* type of interface */
 	int ntype;			/* type of number */
@@ -221,7 +218,7 @@ struct useruser_info {
 
 /* call-info structure SETUP */ 
 struct message_setup {
-	int isdn_port; /* card number 1...n (only on calls from internal isdn port) */
+	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 */
@@ -242,9 +239,6 @@ struct park_info {
 struct param_data {
 	unsigned char data[512]; /* audio/hdlc data */
 	int len; /* audio/hdlc data */
-	int compressed; /* 0 for law-data, 1 for 16-bit data */
-	unsigned long port_id; /* to identify the source of this data */
-	int port_type; /* type of the source's port  */
 };
 
 struct param_play {
@@ -267,9 +261,10 @@ struct param_mISDNsignal {
 	int rxvol;
 	int txvol;
 	int conf;
-	int nodata;
+	int calldata;
 	int tone;
 	int echo;
+	int delay;
 };
 
 /* encryption control structure CRYPT */
@@ -341,7 +336,7 @@ enum { /* messages between entities */
 	MESSAGE_RESUME,		/* resume port */
 
 	MESSAGE_CHANNEL,	/* set status of audio path to endpoint (to call, audio is also set) */
-	MESSAGE_REMOTE_AUDIO,	/* tell remote to set audio status */
+//	MESSAGE_REMOTE_AUDIO,	/* tell remote to set audio status */
 	MESSAGE_PATTERN,	/* pattern information tones available */
 	MESSAGE_NOPATTERN,	/* pattern information tones unavailable */
 	MESSAGE_CRYPT,		/* encryption message */
@@ -353,7 +348,6 @@ enum { /* messages between entities */
 	MESSAGE_VBOX_TONE,	/* set answering VBOX tone */
 	MESSAGE_TONE_COUNTER,	/* tone counter (for VBOX tone use) */
 	MESSAGE_TONE_EOF,	/* tone is end of file */
-	MESSAGE_VBOX_RECORD,	/* tell endpoint to start recording */
 };
 
 #define MESSAGES static const char *messages_txt[] = { \
@@ -375,7 +369,7 @@ enum { /* messages between entities */
 	"MESSAGE_SUSPEND", \
 	"MESSAGE_RESUME", \
 	"MESSAGE_CHANNEL", \
-	"MESSAGE_REMOTE_AUDIO", \
+/*	"MESSAGE_REMOTE_AUDIO",*/ \
 	"MESSAGE_PATTERN", \
 	"MESSAGE_NOPATTERN", \
 	"MESSAGE_CRYPT", \
@@ -385,7 +379,6 @@ enum { /* messages between entities */
 	"MESSAGE_VBOX_TONE", \
 	"MESSAGE_TONE_COUNTER", \
 	"MESSAGE_TONE_EOF", \
-	"MESSAGE_VBOX_RECORD", \
 };