Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10428 )

Change subject: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()
......................................................................

libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()

lchan_type was removed from gsm_mncc and the hello message
on initial import from legacy OpenBSC in
Change-Id: Id3705236350d5f69e447046b0a764bbabc3d493c

This patch follows on from Change-Id: Ia02373a36df7605507ee3de49173a9fd6547b726
which reintroduced lchan_type to the gsm_mncc struct.

This patch restores the lchan_type_offset to the hello protocol message

Without this patch, LCR will issue an error and disconnect from the MNCC socket.

Change-Id: I65312082fa5dc0721170f923840e992ef9481a63
Closes: OS#3461
---
M src/libmsc/mncc_sock.c
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c
index 74ea9d2..57b4bd8 100644
--- a/src/libmsc/mncc_sock.c
+++ b/src/libmsc/mncc_sock.c
@@ -228,6 +228,7 @@
        hello->called_offset = offsetof(struct gsm_mncc, called);
        hello->signal_offset = offsetof(struct gsm_mncc, signal);
        hello->emergency_offset = offsetof(struct gsm_mncc, emergency);
+       hello->lchan_type_offset = offsetof(struct gsm_mncc, lchan_type);

        msgb_enqueue(&mncc->net->upqueue, msg);
        mncc->conn_bfd.when |= BSC_FD_WRITE;

--
To view, visit https://gerrit.osmocom.org/10428
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I65312082fa5dc0721170f923840e992ef9481a63
Gerrit-Change-Number: 10428
Gerrit-PatchSet: 2
Gerrit-Owner: Keith Whyte <ke...@rhizomatica.org>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy <axilira...@gmail.com>

Reply via email to