keith submitted this change.

View Change

Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved
Set MNCC_F_GCR field when the gcr is present

Commit bd66804082bf813a1f925c6af4df28fd664ac1de established that the
MNCC field flag MNCC_F_GCR should be set when the GCR is present,
but did not set it.

Change-Id: Idad3210055a0d25be6220301b965e3d4c7323692
---
M src/mncc.c
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mncc.c b/src/mncc.c
index f302b3e..02ba2cc 100644
--- a/src/mncc.c
+++ b/src/mncc.c
@@ -936,10 +936,12 @@
/* Encode the Global Call Reference (if present) */
if (call->gcr_present) {
msg = msgb_alloc(sizeof(mncc.gcr), "MNCC GCR");
- if (msg == NULL || (rc = osmo_enc_gcr(msg, &call->gcr)) == 0)
+ if (msg == NULL || (rc = osmo_enc_gcr(msg, &call->gcr)) == 0) {
LOGP(DMNCC, LOGL_ERROR, "MNCC leg(%u) failed to encode GCR\n", call->id);
- else
+ } else {
memcpy(&mncc.gcr[0], msg->data, rc);
+ mncc.fields |= MNCC_F_GCR;
+ }
msgb_free(msg);
}


To view, visit change 29560. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: Idad3210055a0d25be6220301b965e3d4c7323692
Gerrit-Change-Number: 29560
Gerrit-PatchSet: 2
Gerrit-Owner: keith <keith@rhizomatica.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: keith <keith@rhizomatica.org>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged