Merge branch 'master' of ssh://jolly@www.mISDN.org/var/git/lcr

[lcr.git] / joinpbx.cpp

diff --git a/joinpbx.cpp b/joinpbx.cpp
index 406d9e8..73b9f59 100644 (file)
--- a/joinpbx.cpp
+++ b/joinpbx.cpp
@@ -28,7 +28,7 @@
 static int notify_state_change(int join_id, int epoint_id, int old_state, int new_state)
 {
        int notify_off = 0, notify_on = 0;
-       struct message *message;
+       struct lcr_msg *message;
 
        if (old_state == new_state)
                return(old_state);
@@ -255,6 +255,7 @@ JoinPBX::JoinPBX(class Endpoint *epoint) : Join()
        j_pid = getpid();
        j_updatebridge = 0;
        j_partyline = 0;
+       j_partyline_jingle = 0;
        j_multicause = 0;
        j_multilocation = 0;
 
@@ -297,7 +298,7 @@ JoinPBX::~JoinPBX()
 void JoinPBX::bridge(void)
 {
        struct join_relation *relation;
-       struct message *message;
+       struct lcr_msg *message;
        int numconnect = 0, relations = 0;
        class Endpoint *epoint;
        struct port_list *portlist;
@@ -417,7 +418,7 @@ void JoinPBX::bridge(void)
                relation->next->tx_state = notify_state_change(j_serial, relation->next->epoint_id, relation->next->tx_state, relation->rx_state);
        } else
        /* one member in a join, so we put her on hold */
-       if (relations==1 || numconnect==1)
+       if ((relations==1 || numconnect==1)/* && !j_partyline_jingle*/)
        {
                PDEBUG(DEBUG_JOIN, "join%d 1 member or only 1 connected, put on hold\n");
                relation = j_relation;
@@ -430,7 +431,7 @@ void JoinPBX::bridge(void)
                        relation = relation->next;
                }
        } else
-       /* if conference/partyline or (more than two members and more than one is connected), so we set conference state */ 
+       /* if conference/partyline (or more than two members and more than one is connected), so we set conference state */ 
        {
                PDEBUG(DEBUG_JOIN, "join%d %d members, %d connected, signal conference\n", relations, numconnect);
                relation = j_relation;
@@ -492,7 +493,7 @@ void JoinPBX::bridge_data(unsigned long epoint_from, struct join_relation *relat
 int JoinPBX::release(struct join_relation *relation, int location, int cause)
 {
        struct join_relation *reltemp, **relationpointer;
-       struct message *message;
+       struct lcr_msg *message;
        class Join *join;
        int destroy = 0;
 
@@ -655,7 +656,7 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa
        struct join_relation *relation, *reltemp;
        int num;
        int new_state;
-       struct message *message;
+       struct lcr_msg *message;
 //     int size, writesize, oldpointer;
        char *number, *numbers;
 
@@ -699,9 +700,10 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa
        }
 
        /* process party line */
-       if (message_type == MESSAGE_SETUP) if (param->setup.partyline)
+       if (message_type == MESSAGE_SETUP) if (param->setup.partyline && !j_partyline)
        {
                j_partyline = param->setup.partyline;
+               j_partyline_jingle = param->setup.partyline_jingle;
        }
        if (j_partyline)
        {
@@ -715,6 +717,8 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa
                        message->param.connectinfo.ntype = INFO_NTYPE_UNKNOWN;
                        message_put(message);
                        j_updatebridge = 1; /* update bridge flag */
+                       if (j_partyline_jingle)
+                              play_jingle(1);
                        break;
                        
                        case MESSAGE_AUDIOPATH:
@@ -739,6 +743,8 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa
                        case MESSAGE_RELEASE:
                        PDEBUG(DEBUG_JOIN, "releasing from join\n");
                        release(relation, 0, 0);
+                       if (j_relation && j_partyline_jingle)
+                              play_jingle(0);
                        break;
 
                        default:
@@ -849,6 +855,12 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa
                        break;
 
                        case RELATION_TYPE_CALLING: /* by calling */
+                       /* remove us, if we don't have a called releation yet */
+                       if (!j_relation->next)
+                       {
+                               release(j_relation, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL);
+                               return; // must return, because join IS destroyed
+                       }
                        /* remove all relations that are in called */
                        release_again2:
                        reltemp = j_relation;
@@ -994,7 +1006,7 @@ int track_notify(int oldstate, int notify)
 int JoinPBX::out_setup(unsigned long epoint_id, int message_type, union parameter *param, char *newnumber)
 {
        struct join_relation *relation;
-       struct message *message;
+       struct lcr_msg *message;
        class Endpoint *epoint;
 
        PDEBUG(DEBUG_JOIN, "no endpoint found, so we will create an endpoint and send the setup message we have.\n");
@@ -1009,7 +1021,7 @@ int JoinPBX::out_setup(unsigned long epoint_id, int message_type, union paramete
        epoint = new Endpoint(0, j_serial);
        if (!epoint)
                FATAL("No memory for Endpoint instance\n");
-       if (!(epoint->ep_app = new DEFAULT_ENDPOINT_APP(epoint)))
+       if (!(epoint->ep_app = new DEFAULT_ENDPOINT_APP(epoint, 1))) // outgoing
                FATAL("No memory for Endpoint Application instance\n");
        relation->epoint_id = epoint->ep_serial;
        /* send setup message to new endpoint */
@@ -1026,3 +1038,26 @@ int JoinPBX::out_setup(unsigned long epoint_id, int message_type, union paramete
 }
 
 
+/* send play message to all members to play join/release jingle */
+void JoinPBX::play_jingle(int in)
+{
+       struct join_relation *relation;
+       struct lcr_msg *message;
+
+       relation = j_relation;
+
+       if (!relation)
+               return;
+       if (!relation->next)
+               return;
+
+       while(relation)
+       {
+               message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_TONE);
+               SCPY(message->param.tone.name, (char *)((in)?"left":"joined"));
+               message_put(message);
+               relation = relation->next;
+       }
+}
+
+