SIP: Fix incoming re-invite

[lcr.git] / joinpbx.h

diff --git a/joinpbx.h b/joinpbx.h
index 3e275b7..cda5419 100644 (file)
--- a/joinpbx.h
+++ b/joinpbx.h
@@ -50,7 +50,6 @@ class JoinPBX : public Join
        JoinPBX(class Endpoint *epoint);
        ~JoinPBX();
        void message_epoint(unsigned int epoint_id, int message, union parameter *param);
-       int handler(void);
        int release(struct join_relation *relation, int location, int cause);
 
        char j_caller[32];              /* caller number */
@@ -60,17 +59,18 @@ class JoinPBX : public Join
        int j_multicause, j_multilocation;
        
        int j_pid;                      /* pid of join to generate bridge id */
-       int j_updatebridge;             /* bridge must be updated */
+       struct lcr_work j_updatebridge;         /* bridge must be updated */
        struct join_relation *j_relation; /* list of endpoints that are related to the join */
 
        int j_partyline;                /* if set, join is conference room */
        int j_partyline_jingle;         /* also play jingle on join/leave */
 
+       unsigned int j_3pty;            /* other join if a 3pty-bridge is requested */
+
        void bridge(void);
-       void bridge_data(unsigned int epoint_from, struct join_relation *relation_from, union parameter *param);
        void remove_relation(struct join_relation *relation);
        struct join_relation *add_relation(void);
-       int out_setup(unsigned int epoint_id, int message, union parameter *param, char *newnumber);
+       int out_setup(unsigned int epoint_id, int message, union parameter *param, char *newnumber, char *newkeypad);
        void play_jingle(int in);
 };