fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29404 )

Change subject: llc: osmo_gprs_llc_hdr_dump[_buf](): also print SAPI name ......................................................................

llc: osmo_gprs_llc_hdr_dump[_buf](): also print SAPI name

Change-Id: I95763e622bb3c3678c06901ddaecfc200d359d8d --- M src/llc/llc_pdu.c M tests/llc_pdu_codec/pdu_codec_test.ok 2 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/src/llc/llc_pdu.c b/src/llc/llc_pdu.c index 19c4112..e55e311 100644 --- a/src/llc/llc_pdu.c +++ b/src/llc/llc_pdu.c @@ -94,8 +94,8 @@ { struct osmo_strbuf sb = { .buf = buf, .len = buf_size };

- OSMO_STRBUF_PRINTF(sb, "SAPI=%u, %s func=%s C/R=%c", - pdu->sapi, /* TODO: print value_string */ + OSMO_STRBUF_PRINTF(sb, "SAPI=%u (%s), %s func=%s C/R=%c", + pdu->sapi, osmo_gprs_llc_sapi_name(pdu->sapi), osmo_gprs_llc_frame_fmt_name(pdu->fmt), osmo_gprs_llc_frame_func_name(pdu->func), pdu->flags & OSMO_GPRS_LLC_PDU_F_CMD_RSP ? '1' : '0'); diff --git a/tests/llc_pdu_codec/pdu_codec_test.ok b/tests/llc_pdu_codec/pdu_codec_test.ok index 5eb5045..691e983 100644 --- a/tests/llc_pdu_codec/pdu_codec_test.ok +++ b/tests/llc_pdu_codec/pdu_codec_test.ok @@ -1,6 +1,6 @@ test_pdu_dec_enc(): decoding testData[0] = 01c010080509afe633 osmo_gprs_llc_pdu_decode() returns 0 - osmo_gprs_llc_pdu_hdr_dump(): SAPI=1, UI func=UI C/R=0 PM=0 E=0 IP=0 N(U)=4 FCS=33e6af + osmo_gprs_llc_pdu_hdr_dump(): SAPI=1 (GMM), UI func=UI C/R=0 PM=0 E=0 IP=0 N(U)=4 FCS=33e6af hdr.data[] (len=3): 080509 test_pdu_dec_enc(): encoding decoded testData[0] osmo_gprs_llc_pdu_encode() returns 0 @@ -8,7 +8,7 @@ memcmp() returns 0 test_pdu_dec_enc(): decoding testData[1] = 41c001081502de8e9a osmo_gprs_llc_pdu_decode() returns 0 - osmo_gprs_llc_pdu_hdr_dump(): SAPI=1, UI func=UI C/R=1 PM=1 E=0 IP=0 N(U)=0 FCS=9a8ede + osmo_gprs_llc_pdu_hdr_dump(): SAPI=1 (GMM), UI func=UI C/R=1 PM=1 E=0 IP=0 N(U)=0 FCS=9a8ede hdr.data[] (len=3): 081502 test_pdu_dec_enc(): encoding decoded testData[1] osmo_gprs_llc_pdu_encode() returns 0 @@ -16,14 +16,14 @@ memcmp() returns 0 test_pdu_dec_enc(): decoding testData[2] = 01e01ca2b3 osmo_gprs_llc_pdu_decode() returns 0 - osmo_gprs_llc_pdu_hdr_dump(): SAPI=1, U func=NULL C/R=0 P/F=0 FCS=b3a21c + osmo_gprs_llc_pdu_hdr_dump(): SAPI=1 (GMM), U func=NULL C/R=0 P/F=0 FCS=b3a21c test_pdu_dec_enc(): encoding decoded testData[2] osmo_gprs_llc_pdu_encode() returns 0 osmo_gprs_llc_pdu_encode(): 01e01ca2b3 memcmp() returns 0 test_pdu_dec_enc(): decoding testData[3] = 43fb01001601f41a05df8c7c4e osmo_gprs_llc_pdu_decode() returns 0 - osmo_gprs_llc_pdu_hdr_dump(): SAPI=3, U func=XID C/R=1 P/F=1 FCS=4e7c8c + osmo_gprs_llc_pdu_hdr_dump(): SAPI=3 (SNDCP3), U func=XID C/R=1 P/F=1 FCS=4e7c8c hdr.data[] (len=8): 01001601f41a05df test_pdu_dec_enc(): encoding decoded testData[3] osmo_gprs_llc_pdu_encode() returns 0 @@ -31,7 +31,7 @@ memcmp() returns 0 test_pdu_dec_enc(): decoding testData[4] = 03fb1604d216f984 osmo_gprs_llc_pdu_decode() returns 0 - osmo_gprs_llc_pdu_hdr_dump(): SAPI=3, U func=XID C/R=0 P/F=1 FCS=84f916 + osmo_gprs_llc_pdu_hdr_dump(): SAPI=3 (SNDCP3), U func=XID C/R=0 P/F=1 FCS=84f916 hdr.data[] (len=3): 1604d2 test_pdu_dec_enc(): encoding decoded testData[4] osmo_gprs_llc_pdu_encode() returns 0

2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one.