Change in libosmo-abis[master]: Remove mISDN header from received channel data

[laforge]

laforge has submitted this change. ( 
https://gerrit.osmocom.org/c/libosmo-abis/+/30448 )

Change subject: Remove mISDN header from received channel data
......................................................................

Remove mISDN header from received channel data

Change-Id: I37f12baa1013cd1cfc6f6531b132669071eec926
---
M src/input/misdn.c
1 file changed, 10 insertions(+), 6 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/src/input/misdn.c b/src/input/misdn.c
index 5f6dd62..5d47a79 100644
--- a/src/input/misdn.c
+++ b/src/input/misdn.c
@@ -372,9 +372,10 @@

        switch (hh->prim) {
        case PH_DATA_IND:
-               msg->l2h = msg->data + MISDN_HEADER_LEN;
+               /* remove the Misdn Header */
+               msg->l2h = msgb_pull(msg, MISDN_HEADER_LEN);
                LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "BCHAN RX: %s\n",
-                       osmo_hexdump(msgb_l2(msg), ret - MISDN_HEADER_LEN));
+                       osmo_hexdump(msgb_l2(msg), msgb_l2len(msg)));
                /* the number of bytes received indicates that data to send */
                handle_tsX_write(bfd, msgb_l2len(msg));
                return e1inp_rx_ts(e1i_ts, msg, 0, 0);
@@ -454,9 +455,10 @@

        switch (hh->prim) {
        case PH_DATA_IND:
-               msg->l2h = msg->data + MISDN_HEADER_LEN;
+               /* remove the Misdn Header */
+               msg->l2h = msgb_pull(msg, MISDN_HEADER_LEN);
                LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "RAW CHAN RX: %s\n",
-                       osmo_hexdump(msgb_l2(msg), ret - MISDN_HEADER_LEN));
+                       osmo_hexdump(msgb_l2(msg), msgb_l2len(msg)));
                /* the number of bytes received indicates that data to send */
                handle_ts_raw_write(bfd, msgb_l2len(msg));
                return e1inp_rx_ts(e1i_ts, msg, 0, 0);
@@ -539,9 +541,11 @@

        switch (hh->prim) {
        case PH_DATA_IND:
-               msg->l2h = msg->data + MISDN_HEADER_LEN;
+               /* remove the Misdn Header */
+               msgb_pull(msg, MISDN_HEADER_LEN);
+               msg->l2h = msg->data;
                LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "HDLC CHAN RX: %s\n",
-                       osmo_hexdump(msgb_l2(msg), ret - MISDN_HEADER_LEN));
+                       osmo_hexdump(msgb_l2(msg), msgb_l2len(msg)));
                return e1inp_rx_ts(e1i_ts, msg, 0, 0);
        case PH_ACTIVATE_IND:
                break;

--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30448
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I37f12baa1013cd1cfc6f6531b132669071eec926
Gerrit-Change-Number: 30448
Gerrit-PatchSet: 2
Gerrit-Owner: jolly <andr...@eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged