Change in ...osmo-sip-connector[master]: Fix bug with MO calls not connecting.
keith has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 )
Change subject: Fix bug with MO calls not connecting.
..
Fix bug with MO calls not connecting.
Fixes a bug I introduced in 5f73c2033b6b4e690f30292020d7361f48b5f2c2
where we would not call mncc_call_leg_connect() on receiving 200 from
SIP side, and therefore never send MNCC_SETUP_RSP to the MS
Fixes: 5f73c2033b6b4e690f30292020d7361f48b5f2c2
Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6
---
M src/sip.c
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/sip.c b/src/sip.c
index b652b4b..4eb7689 100644
--- a/src/sip.c
+++ b/src/sip.c
@@ -332,11 +332,13 @@
if (status == 180 || status == 183)
call_progress(leg, sip, status);
else if (status == 200) {
- struct sip_call_leg *leg = sip_find_leg(nh);
- if (leg)
+ if (leg->state == SIP_CC_CONNECTED || leg->state ==
SIP_CC_HOLD) {
+ /* This 200 is a response to our re-INVITE on
+* a connected call. We just need to ACK it. */
nua_ack(leg->nua_handle, TAG_END());
- else
+ } else {
call_connect(leg, sip);
+ }
}
else if (status >= 300) {
struct call_leg *other = call_leg_other(>base);
--
To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6
Gerrit-Change-Number: 15068
Gerrit-PatchSet: 2
Gerrit-Owner: keith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: keith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-sip-connector[master]: Fix bug with MO calls not connecting.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 ) Change subject: Fix bug with MO calls not connecting. .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6 Gerrit-Change-Number: 15068 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 17:42:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sip-connector[master]: Fix bug with MO calls not connecting.
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 to look at the new patch set (#2). Change subject: Fix bug with MO calls not connecting. .. Fix bug with MO calls not connecting. Fixes a bug I introduced in 5f73c2033b6b4e690f30292020d7361f48b5f2c2 where we would not call mncc_call_leg_connect() on receiving 200 from SIP side, and therefore never send MNCC_SETUP_RSP to the MS Fixes: 5f73c2033b6b4e690f30292020d7361f48b5f2c2 Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6 --- M src/sip.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/68/15068/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6 Gerrit-Change-Number: 15068 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-sip-connector[master]: Fix bug with MO calls not connecting.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 ) Change subject: Fix bug with MO calls not connecting. .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15068/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15068/1//COMMIT_MSG@9 PS1, Line 9: Fixes a bug I introduced in 5f73c2033b6b4e690f30292020d7361f48b5f2c2 Usually in this scenario you add a tag below in the commit description: blablabla... Fixes: 5f73c2033b6b4e690f30292020d7361f48b5f2c2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6 Gerrit-Change-Number: 15068 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 06 Aug 2019 16:50:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-sip-connector[master]: Fix bug with MO calls not connecting.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 ) Change subject: Fix bug with MO calls not connecting. .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6 Gerrit-Change-Number: 15068 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 06 Aug 2019 16:22:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sip-connector[master]: Fix bug with MO calls not connecting.
keith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068
Change subject: Fix bug with MO calls not connecting.
..
Fix bug with MO calls not connecting.
Fixes a bug I introduced in 5f73c2033b6b4e690f30292020d7361f48b5f2c2
where we would not call mncc_call_leg_connect() on receiving 200 from
SIP side, and therefore never send MNCC_SETUP_RSP to the MS
Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6
---
M src/sip.c
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector
refs/changes/68/15068/1
diff --git a/src/sip.c b/src/sip.c
index b652b4b..4eb7689 100644
--- a/src/sip.c
+++ b/src/sip.c
@@ -332,11 +332,13 @@
if (status == 180 || status == 183)
call_progress(leg, sip, status);
else if (status == 200) {
- struct sip_call_leg *leg = sip_find_leg(nh);
- if (leg)
+ if (leg->state == SIP_CC_CONNECTED || leg->state ==
SIP_CC_HOLD) {
+ /* This 200 is a response to our re-INVITE on
+* a connected call. We just need to ACK it. */
nua_ack(leg->nua_handle, TAG_END());
- else
+ } else {
call_connect(leg, sip);
+ }
}
else if (status >= 300) {
struct call_leg *other = call_leg_other(>base);
--
To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15068
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: Ic7cc56c0d68a27eb1229c0c4aa1fa54d00b660b6
Gerrit-Change-Number: 15068
Gerrit-PatchSet: 1
Gerrit-Owner: keith
Gerrit-MessageType: newchange
