fix and work

[lcr.git] / message.h

diff --git a/message.h b/message.h
index 9987fd1..d88d76a 100644 (file)
--- 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
@@ -257,6 +257,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 +353,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 +432,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);