error inside information elements are now reported inside trace and main log,

[lcr.git] / apppbx.h

diff --git a/apppbx.h b/apppbx.h
index 43404f9..070bce5 100644 (file)
--- a/apppbx.h
+++ b/apppbx.h
@@ -55,7 +55,7 @@ extern class EndpointAppPBX *apppbx_first;
 class EndpointAppPBX : public EndpointApp
 {
        public:
-       EndpointAppPBX(class Endpoint *epoint);
+       EndpointAppPBX(class Endpoint *epoint, int origin);
        ~EndpointAppPBX();
 
        class EndpointAppPBX    *next;
@@ -75,7 +75,7 @@ class EndpointAppPBX : public EndpointApp
        struct redir_info       e_redirinfo;            /* info on redirection (to the calling user) */
        struct capa_info        e_capainfo;             /* info on l3,l2 capacity */
        time_t                  e_start, e_stop;        /* time */
-//     int                     e_origin;               /* origin of call */
+       int                     e_origin;               /* origin of call 0=incoming 1=outgoing */
        struct route_ruleset    *e_ruleset;             /* current ruleset pointer (NULL=no ruleset) */
        struct route_rule       *e_rule;                /* current rule pointer (NULL=no rule) */
        struct route_action     *e_action;              /* current action pointer (NULL=no action) */
@@ -214,7 +214,7 @@ class EndpointAppPBX : public EndpointApp
        void join_proceeding(struct port_list *portlist, int message_type, union parameter *param);
        void join_alerting(struct port_list *portlist, int message_type, union parameter *param);
        void join_connect(struct port_list *portlist, int message_type, union parameter *param);
-       void join_disconnect_release(struct port_list *portlist, int message_type, union parameter *param);
+       void join_disconnect_release(int message_type, union parameter *param);
        void join_notify(struct port_list *portlist, int message_type, union parameter *param);
        void join_facility(struct port_list *portlist, int message_type, union parameter *param);
 
@@ -347,13 +347,12 @@ class EndpointAppPBX : public EndpointApp
        void message_disconnect_port(struct port_list *portlist, int cause, int location, char *display);
        void logmessage(int message_type, union parameter *param, unsigned long port_id, int dir);
        void trace_header(char *name, int direction);
-       void screen(int out, char *id, int idsize, int *type, int *present, struct interface *interface);
 };
 
 
 char *nationalize_callerinfo(char *string, int *type);
 char *numberrize_callerinfo(char *string, int type);
-void apply_callerid_restriction(int anon_ignore, char *id, int *ntype, int *present, int *screen, char *extension, char *name);
+void apply_callerid_restriction(struct extension *ext, char *id, int *ntype, int *present, int *screen, char *extension, char *name);
 void send_mail(char *filename, char *callerid, char *callerintern, char *callername, char *vbox_email, int vbox_year, int vbox_mon, int vbox_mday, int vbox_hour, int vbox_min, char *terminal);