X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=message.h;h=f07745ce99d6de954e28c8042a10a758f690ce30;hp=1abab34365367219e950fea5adb51cb12c5dceb4;hb=026b04fc75011a144285f399b82890803b4315bd;hpb=14f76f1e81f0a4e7a63e83136d1ac958bf85c8a5

diff --git a/message.h b/message.h
index 1abab34..f07745c 100644
--- a/message.h
+++ b/message.h
@@ -15,35 +15,35 @@ enum { /* interface types */
 	INFO_ITYPE_ISDN,
 	INFO_ITYPE_ISDN_EXTENSION, /* call from internal extension */
 	INFO_ITYPE_CHAN,
-	INFO_ITYPE_VBOX,
+	INFO_ITYPE_VBOX
 };
 
 enum { /* number types */
-	INFO_NTYPE_UNKNOWN,
+	INFO_NTYPE_UNKNOWN = 0,
 	INFO_NTYPE_SUBSCRIBER,
 	INFO_NTYPE_NATIONAL,
-	INFO_NTYPE_INTERNATIONAL,
+	INFO_NTYPE_INTERNATIONAL
 };
 
 enum { /* number presentation */
-	INFO_PRESENT_NULL,
+	INFO_PRESENT_NULL = 0,
 	INFO_PRESENT_ALLOWED,
 	INFO_PRESENT_RESTRICTED,
-	INFO_PRESENT_NOTAVAIL,
+	INFO_PRESENT_NOTAVAIL
 };
 
 enum { /* number presentation */
 	INFO_SCREEN_USER, /* user provided */
-	INFO_SCREEN_NETWORK, /* network provided */
+	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
@@ -129,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 */
@@ -143,16 +144,6 @@ enum {
 	B_STATE_REMOTE,		/* bchannel assigned to remote application */
 	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 */
-};
-
 
 /* call-info structure CALLER */
 struct caller_info {
@@ -257,6 +248,7 @@ 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 */
+	char context[128];			/* asterisk context */
 };
 
 /* call-info structure PARK */
@@ -352,8 +344,8 @@ 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 */
@@ -431,11 +423,11 @@ 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);