pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26825 )
Change subject: iuup: Improve CRC checksum error logging ......................................................................
iuup: Improve CRC checksum error logging
Change-Id: I14f2ff14af24f20b788d123c0bfb47aeb0333d19 --- M src/gsm/iuup.c 1 file changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/26825/1
diff --git a/src/gsm/iuup.c b/src/gsm/iuup.c index c0e12a7..7881257 100644 --- a/src/gsm/iuup.c +++ b/src/gsm/iuup.c @@ -835,7 +835,7 @@
header_crc_computed = osmo_iuup_compute_header_crc(data, len); if (iuup_get_hdr_crc(data) != header_crc_computed) { - LOGP(DLIUUP, LOGL_NOTICE, "Checksum error: rx 0x%02x vs exp 0x%02x\n", + LOGP(DLIUUP, LOGL_NOTICE, "Header Checksum error: rx 0x%02x vs exp 0x%02x\n", iuup_get_hdr_crc(data), header_crc_computed); return -EIO; } @@ -849,7 +849,7 @@ payload_crc = ((uint16_t)t0h->payload_crc_hi << 8) | t0h->payload_crc_lo; payload_crc_computed = osmo_iuup_compute_payload_crc(data, len); if (payload_crc != payload_crc_computed) - return -EIO; + goto payload_crc_err; break; case IUUP_PDU_T_CONTROL: t14h = (struct iuup_pdutype14_hdr *) data; @@ -857,13 +857,18 @@ payload_crc = ((uint16_t)t14h->payload_crc_hi << 8) | t14h->payload_crc_lo; payload_crc_computed = osmo_iuup_compute_payload_crc(data, len); if (payload_crc != payload_crc_computed) - return -EIO; + goto payload_crc_err; } break; default: return -EINVAL; } return 0; + +payload_crc_err: + LOGP(DLIUUP, LOGL_NOTICE, "Payload Checksum error: rx 0x%02x vs exp 0x%02x\n", + payload_crc, payload_crc_computed); + return -EIO; }
/* A IuUP TNL SAP primitive from transport (lower layer) */
Hello Jenkins Builder, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmocore/+/26825
to look at the new patch set (#2).
Change subject: iuup: Improve CRC checksum error logging ......................................................................
iuup: Improve CRC checksum error logging
Change-Id: I14f2ff14af24f20b788d123c0bfb47aeb0333d19 --- M src/gsm/iuup.c 1 file changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/26825/2
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26825 )
Change subject: iuup: Improve CRC checksum error logging ......................................................................
Patch Set 2: Code-Review+2
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26825 )
Change subject: iuup: Improve CRC checksum error logging ......................................................................
iuup: Improve CRC checksum error logging
Change-Id: I14f2ff14af24f20b788d123c0bfb47aeb0333d19 --- M src/gsm/iuup.c 1 file changed, 8 insertions(+), 3 deletions(-)
Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified
diff --git a/src/gsm/iuup.c b/src/gsm/iuup.c index c0e12a7..dbca344 100644 --- a/src/gsm/iuup.c +++ b/src/gsm/iuup.c @@ -835,7 +835,7 @@
header_crc_computed = osmo_iuup_compute_header_crc(data, len); if (iuup_get_hdr_crc(data) != header_crc_computed) { - LOGP(DLIUUP, LOGL_NOTICE, "Checksum error: rx 0x%02x vs exp 0x%02x\n", + LOGP(DLIUUP, LOGL_NOTICE, "Header Checksum error: rx 0x%02x vs exp 0x%02x\n", iuup_get_hdr_crc(data), header_crc_computed); return -EIO; } @@ -849,7 +849,7 @@ payload_crc = ((uint16_t)t0h->payload_crc_hi << 8) | t0h->payload_crc_lo; payload_crc_computed = osmo_iuup_compute_payload_crc(data, len); if (payload_crc != payload_crc_computed) - return -EIO; + goto payload_crc_err; break; case IUUP_PDU_T_CONTROL: t14h = (struct iuup_pdutype14_hdr *) data; @@ -857,13 +857,18 @@ payload_crc = ((uint16_t)t14h->payload_crc_hi << 8) | t14h->payload_crc_lo; payload_crc_computed = osmo_iuup_compute_payload_crc(data, len); if (payload_crc != payload_crc_computed) - return -EIO; + goto payload_crc_err; } break; default: return -EINVAL; } return 0; + +payload_crc_err: + LOGP(DLIUUP, LOGL_NOTICE, "Payload Checksum error (pdu type %u): rx 0x%02x vs exp 0x%02x\n", + pdu_type, payload_crc, payload_crc_computed); + return -EIO; }
/* A IuUP TNL SAP primitive from transport (lower layer) */