Merge "chan_pjsip: Don't assume a session will have a channel."
authorzuul <zuul@gerrit.asterisk.org>
Tue, 14 Mar 2017 19:07:51 +0000 (14:07 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 14 Mar 2017 19:07:51 +0000 (14:07 -0500)
channels/chan_sip.c
third-party/pjproject/Makefile

index 8241b67..d158b0d 100644 (file)
@@ -23980,6 +23980,7 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
        case 422: /* Session-Timers: Session interval too small */
                xmitres = transmit_request(p, SIP_ACK, seqno, XMIT_UNRELIABLE, FALSE);
                ast_string_field_set(p, theirtag, NULL);
+               p->invitestate = INV_CALLING;
                proc_422_rsp(p, req);
                break;
 
index bfd1c27..99c22fa 100644 (file)
@@ -135,7 +135,7 @@ source/pjlib/include/pj/%.h: patches/%.h
        $(ECHO_PREFIX) Applying custom include file $<
        $(CMD_PREFIX) cp -f $< source/pjlib/include/pj/
 
-.rebuild_needed: $(wildcard ../../makeopts) $(wildcard ../../menuselect.makeopts)
+.rebuild_needed: $(wildcard ../../.lastclean)
        $(ECHO_PREFIX) Rebuilding
        $(CMD_PREFIX) $(MAKE) clean $(REALLY_QUIET)