chan_pjsip: Fix crash on reINVITE before initial INVITE completes.

Apparently some endpoints attempt to send a reINVITE before completing the
initial INVITE transaction.  In this case PJSIP responds appropriately to
the reINVITE with a 491 INVITE request pending.  Unfortunately chan_pjsip
is using the initial INVITE transaction state to determine if an INVITE is
the initial INVITE or a reINVITE.  Since the initial INVITE transaction
has not been confirmed yet chan_pjsip thinks the reINVITE is an initial
INVITE and starts another PBX thread on the channel.  The extra PBX thread
ensures that hilarity ensues.

* Fix checks for a reINVITE on incoming requests to look for the presence
of a to-tag instead of the initial INVITE transaction state.

* Made caller_id_incoming_request() determine what to do if there is a
channel on the session or not.  After a channel is created it is too late
to just store the new party id on the session because the session's party
id has already been copied to the channel's caller id.

ASTERISK-25404 #close
Reported by: Chet Stevens

Change-Id: Ie78201c304a2b13226f3a4ce59908beecc2c68be

diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c
index 523a015..d72a25b 100644 (file)
--- a/channels/chan_pjsip.c
+++ b/channels/chan_pjsip.c
@@ -2134,7 +2134,8 @@ static int chan_pjsip_incoming_request(struct ast_sip_session *session, struct p
                return 0;
        }
 
-       if (session->inv_session->state >= PJSIP_INV_STATE_CONFIRMED) {
+       /* Check for a to-tag to determine if this is a reinvite */
+       if (rdata->msg_info.to->tag.slen) {
                /* Weird case. We've received a reinvite but we don't have a channel. The most
                 * typical case for this happening is that a blind transfer fails, and so the
                 * transferer attempts to reinvite himself back into the call. We already got
@@ -2181,8 +2182,9 @@ static int call_pickup_incoming_request(struct ast_sip_session *session, pjsip_r
        struct ast_features_pickup_config *pickup_cfg;
        struct ast_channel *chan;
 
-       /* We don't care about reinvites */
-       if (session->inv_session->state >= PJSIP_INV_STATE_CONFIRMED) {
+       /* Check for a to-tag to determine if this is a reinvite */
+       if (rdata->msg_info.to->tag.slen) {
+               /* We don't care about reinvites */
                return 0;
        }
 
@@ -2229,8 +2231,9 @@ static int pbx_start_incoming_request(struct ast_sip_session *session, pjsip_rx_
 {
        int res;
 
-       /* We don't care about reinvites */
-       if (session->inv_session->state >= PJSIP_INV_STATE_CONFIRMED) {
+       /* Check for a to-tag to determine if this is a reinvite */
+       if (rdata->msg_info.to->tag.slen) {
+               /* We don't care about reinvites */
                return 0;
        }
 

diff --git a/res/res_pjsip_caller_id.c b/res/res_pjsip_caller_id.c
index c084a81..07b1266 100644 (file)
--- a/res/res_pjsip_caller_id.c
+++ b/res/res_pjsip_caller_id.c
@@ -351,10 +351,11 @@ static void update_incoming_connected_line(struct ast_sip_session *session, pjsi
  */
 static int caller_id_incoming_request(struct ast_sip_session *session, pjsip_rx_data *rdata)
 {
-       if (session->inv_session->state < PJSIP_INV_STATE_CONFIRMED) {
+       if (!session->channel) {
                /*
-                * Initial inbound INVITE.  Set the session ID directly
-                * because the channel has not been created yet.
+                * Since we have no channel this must be the initial inbound
+                * INVITE.  Set the session ID directly because the channel
+                * has not been created yet.
                 */
                if (session->endpoint->id.trust_inbound
                        && (!set_id_from_pai(rdata, &session->id)
@@ -367,9 +368,10 @@ static int caller_id_incoming_request(struct ast_sip_session *session, pjsip_rx_
                if (!session->endpoint->id.self.number.valid) {
                        set_id_from_from(rdata, &session->id);
                }
-       } else if (session->channel) {
-               /* Reinvite. Check for changes to the ID and queue a connected line
-                * update if necessary
+       } else {
+               /*
+                * ReINVITE or UPDATE.  Check for changes to the ID and queue
+                * a connected line update if necessary.
                 */
                update_incoming_connected_line(session, rdata);
        }