X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=message.h;h=471e2c8eccd5ea5f86c748acd7b50c56b8139f66;hp=1db509c10fd5b8e6185ad7de6fe41b558da18dc7;hb=46d07c5968b7de37943182f85499b30735145e03;hpb=db6990e487255e8b206ef67d8d99fa74849a9a11

diff --git a/message.h b/message.h
index 1db509c..471e2c8 100644
--- a/message.h
+++ b/message.h
@@ -10,38 +10,40 @@
 \*****************************************************************************/ 
 
 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,
+	INFO_ITYPE_VBOX
 };
 
 enum { /* number types */
+	INFO_NTYPE_NOTPRESENT = 0,
 	INFO_NTYPE_UNKNOWN,
 	INFO_NTYPE_SUBSCRIBER,
 	INFO_NTYPE_NATIONAL,
-	INFO_NTYPE_INTERNATIONAL,
+	INFO_NTYPE_INTERNATIONAL
 };
 
 enum { /* number presentation */
-	INFO_PRESENT_NULL,
-	INFO_PRESENT_ALLOWED,
-	INFO_PRESENT_RESTRICTED,
 	INFO_PRESENT_NOTAVAIL,
+	INFO_PRESENT_ALLOWED,
+	INFO_PRESENT_RESTRICTED
 };
 
 enum { /* number presentation */
 	INFO_SCREEN_USER, /* user provided */
-	INFO_SCREEN_NETWORK, /* network provided */
+	INFO_SCREEN_USER_VERIFIED_PASSED,
+	INFO_SCREEN_USER_VERIFIED_FAILED,
+	INFO_SCREEN_NETWORK /* network provided */
 };
 
 enum { /* redirection reason */
-	INFO_REDIR_UNKNOWN,
+	INFO_REDIR_UNKNOWN = 0,
 	INFO_REDIR_BUSY,
 	INFO_REDIR_NORESPONSE,
 	INFO_REDIR_UNCONDITIONAL,
 	INFO_REDIR_OUTOFORDER,
-	INFO_REDIR_CALLDEFLECT,
+	INFO_REDIR_CALLDEFLECT
 };
 
 #define	INFO_NOTIFY_NONE			0x00
@@ -127,6 +129,7 @@ enum { /* isdnsignal */
 
 enum { /* bchannel assignment */
 	BCHANNEL_REQUEST,		/* application requests bchannel */
+	BCHANNEL_RELEASE,		/* application releases bchannel */
 	BCHANNEL_ASSIGN,		/* bchannel assigned by LCR */
 	BCHANNEL_ASSIGN_ACK,		/* application acknowledges */
 	BCHANNEL_REMOVE,		/* bchannel removed by LCR */
@@ -142,16 +145,10 @@ enum {
 	B_STATE_IMPORTING,	/* BCHANNEL_REMOVE sent */
 };
 enum {
-	B_EVENT_USE,		/* activate/export bchannel */
-	B_EVENT_EXPORTREQUEST,	/* remote app requests bchannel */
-	B_EVENT_ACTIVATED,	/* DL_ESTABLISH received */
-	B_EVENT_DROP,		/* deactivate/re-import bchannel */
-	B_EVENT_DEACTIVATED,	/* DL_RELEASE received */
-	B_EVENT_EXPORTED,	/* BCHANNEL_ASSIGN received */
-	B_EVENT_IMPORTED,	/* BCHANNEL_REMOVE received */
+	B_MODE_TRANSPARENT,	/* normal transparent audio */
+	B_MODE_HDLC,		/* hdlc data mode */
 };
 
-
 /* call-info structure CALLER */
 struct caller_info {
 	char id[32];			/* id of caller (user number) */
@@ -164,6 +161,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 */
@@ -173,6 +175,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 */
@@ -187,6 +191,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 */
@@ -194,6 +199,7 @@ struct disconnect_info {
 	int cause;			/* reason for disconnect */
 	int location;			/* disconnect location */
 	char display[84];		/* optional display information */
+	int force;			/* special flag to release imediately */
 };
 
 /* call-info structure REDIR */
@@ -210,6 +216,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,... */
@@ -230,6 +237,12 @@ struct notify_info {
 	int local;			/* if set, endpoints gets information about audio channel (open/close) */
 };
 
+/* call-info structure PROGRESS */
+struct progress_info {
+	int progress;			/* progress indicator */
+	int location;			/* progress location */
+};
+
 /* call-info structure FACILITY */
 struct facility_info {
 	char data[256];			/* data info about facility */
@@ -247,7 +260,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 */
@@ -255,6 +267,8 @@ struct message_setup {
 	struct redir_info redirinfo;		/* info on redirection (to the calling user) */
 	struct capa_info capainfo;		/* info on l2,l3 capability */
 	struct useruser_info useruser;		/* user-user */
+//	struct progress_info progress;		/* info on call progress */
+	char context[128];			/* asterisk context */
 };
 
 /* call-info structure PARK */
@@ -263,10 +277,11 @@ struct park_info {
 	int len;
 };
 
+#define ISDN_TRANSMIT 256
 /* DATA */
 struct param_data {
-	unsigned char data[512]; /* audio/hdlc data */
-	int len; /* audio/hdlc data */
+	unsigned char data[ISDN_TRANSMIT]; /* audio data */
+	int len; /* audio data */
 };
 
 struct param_play {
@@ -286,8 +301,8 @@ struct param_counter {
 
 struct param_mISDNsignal {
 	int message;
-	int rxvol;
-	int txvol;
+	int tx_gain;
+	int rx_gain;
 	int conf;
 	int joindata;
 	int tone;
@@ -308,7 +323,12 @@ 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];
+	int crypt_len;
+	int crypt_type; /* 1 = blowfish */
 };
 
 /* structure of message parameter */
@@ -320,6 +340,7 @@ union parameter {
 	struct connect_info connectinfo; /* CONNECT INFO */
 	struct disconnect_info disconnectinfo; /* DISCONNECT INFO */
 	struct notify_info notifyinfo; /* some notifications */
+	struct progress_info progressinfo; /* some progress */
 	struct facility_info facilityinfo; /* some notifications */
 	struct park_info parkinfo; /* MESSAGE_SUSPEND, MESSAGE_RESUME */
 	int state; /* MESSAGE_TIMEOUT */
@@ -345,12 +366,12 @@ enum { /* message flow */
 };
 
 /* message structure */
-struct message {
-	struct message *next;
+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;
 };
@@ -359,8 +380,8 @@ 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 */
 	MESSAGE_OVERLAP,	/* call accepted, send more information */
@@ -370,20 +391,17 @@ enum { /* messages between entities */
 	MESSAGE_DISCONNECT,	/* disconnect with cause */
 	MESSAGE_RELEASE,	/* release with cause */
 	MESSAGE_TIMEOUT,	/* protocol state has timed out (port->epoint) */
-	MESSAGE_NOTIFY,		/* used to send progress and notify infos */
+	MESSAGE_NOTIFY,		/* used to send notify info */
+	MESSAGE_PROGRESS,	/* used to send progress info */
 	MESSAGE_FACILITY,	/* used to facility infos, like aocd */
-
 	MESSAGE_SUSPEND,	/* suspend port */
 	MESSAGE_RESUME,		/* resume port */
-
 	MESSAGE_AUDIOPATH,	/* set status of audio path to endpoint (to call, audio is also set) */
 //	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 */
-
 	MESSAGE_DATA,		/* audio/hdlc data */
-
 	MESSAGE_VBOX_PLAY,	/* play recorded file */
 	MESSAGE_VBOX_PLAY_SPEED,/* change speed of file */
 	MESSAGE_VBOX_TONE,	/* set answering VBOX tone */
@@ -398,6 +416,7 @@ enum { /* messages between entities */
 	"MESSAGE_NONE", \
 	"MESSAGE_TONE", \
 	"MESSAGE_DTMF", \
+	"MESSAGE_ENABLEKEYPAD", \
 	"MESSAGE_mISDNSIGNAL", \
 	"MESSAGE_SETUP", \
 	"MESSAGE_INFORMATION", \
@@ -429,11 +448,12 @@ enum { /* messages between entities */
 };
 
 
-struct message *message_create(int id_from, int id_to, int flow, int type);
-void message_put(struct message *message);
-struct message *message_forward(int id_from, int id_to, int flow, union parameter *param);
-struct message *message_get(void);
-void message_free(struct message *message);
-
+struct lcr_msg *message_create(int id_from, int id_to, int flow, int type);
+void message_put(struct lcr_msg *message);
+struct lcr_msg *message_forward(int id_from, int id_to, int flow, union parameter *param);
+struct lcr_msg *message_get(void);
+void message_free(struct lcr_msg *message);
+void init_message(void);
+void cleanup_message(void);