- baseband-devel - lists.osmocom.org

[PATCH] Improve hex parser
by ☎ 15 Jan '13

15 Jan '13

Hello. Current implementation of osmo_hexparse have couple of limitations (which are undocumented btw): * it refuses to parse odd-length numbers (e. g. 7abdf) * it fails while parsing 0x prefix (e. g. 0xdead) Both could be worked around by upper-layer code of course but since both cases above are perfectly valid hexadecimal numbers I think they should be handled by osmo_hexparse internally without complicating life of library users. Attached patch does just that. Please review and merge if it feels OK. -- best regards, Max, http://fairwaves.ru

3 6

osmocombb: TS 3 -> TS failed
by jolly 14 Jan '13

14 Jan '13

hi, i just encountered the following problem: the network assigns me from TS 1 to TS 3 it worked, but not when it did another assigment from TS 3 to TS4. i just got noise instead of valid SACCH frames. TS Chg forth: 1 -> 3 | 1856 ... TS Chg forth: 3 -> 4 | 1875 this is the wireshark trace of both assignments. they only differ in the assigned slot: Frame 3225: 81 bytes on wire (648 bits), 81 bytes captured (648 bits) Ethernet II, Src: 00:00:00_00:00:00 (00:00:00:00:00:00), Dst: 00:00:00_00:00:00 (00:00:00:00:00:00) Internet Protocol Version 4, Src: 127.0.0.1 (127.0.0.1), Dst: 127.0.0.1 (127.0.0.1) User Datagram Protocol, Src Port: 52261 (52261), Dst Port: gsmtap (4729) GSM TAP Header, ARFCN: 34 (Downlink), TS: 1, Channel: SDCCH/8 (0) Link Access Procedure, Channel Dm (LAPDm) GSM A-I/F DTAP - Assignment Command Protocol Discriminator: Radio Resources Management messages DTAP Radio Resources Management Message Type: Assignment Command (0x2e) Channel Description 2 - Description of the First Channel, after time 0000 1... = TCH/F + FACCH/F and SACCH/F .... .011 = Timeslot: 3 000. .... = Training Sequence: 0 ...1 .... = Hopping channel: Yes Hopping channel: MAIO 0 Hopping channel: HSN 0 Power Command 0... .... = Spare: 0 .0.. .... = EPC_mode: Channel(s) not in EPC mode ..0. .... = FPC_EPC: FPC not in use/C not in use for uplink power control ...0 0101 = POWER LEVEL: 5 Frequency List - Frequency List, after time Element ID: 5 Length: 16 00.. 000. = Format Identifier: bit map 0 (0x00) List of ARFCNs = 99 34 Channel Mode - Mode of the First Channel(Channel Set 1) Element ID: 99 Channel Mode: speech full rate or half rate version 2(GSM EFR) (33) No. Time Source Destination Protocol Info 3243 464.672890 127.0.0.1 127.0.0.1 LAPDm I, N(R)=1, N(S)=2(DTAP) (RR) Assignment Command Frame 3243: 81 bytes on wire (648 bits), 81 bytes captured (648 bits) Ethernet II, Src: 00:00:00_00:00:00 (00:00:00:00:00:00), Dst: 00:00:00_00:00:00 (00:00:00:00:00:00) Internet Protocol Version 4, Src: 127.0.0.1 (127.0.0.1), Dst: 127.0.0.1 (127.0.0.1) User Datagram Protocol, Src Port: 52261 (52261), Dst Port: gsmtap (4729) GSM TAP Header, ARFCN: 99 (Downlink), TS: 3, Channel: FACCH/F (0) Link Access Procedure, Channel Dm (LAPDm) GSM A-I/F DTAP - Assignment Command Protocol Discriminator: Radio Resources Management messages DTAP Radio Resources Management Message Type: Assignment Command (0x2e) Channel Description 2 - Description of the First Channel, after time 0000 1... = TCH/F + FACCH/F and SACCH/F .... .100 = Timeslot: 4 000. .... = Training Sequence: 0 ...1 .... = Hopping channel: Yes Hopping channel: MAIO 0 Hopping channel: HSN 0 Power Command 0... .... = Spare: 0 .0.. .... = EPC_mode: Channel(s) not in EPC mode ..0. .... = FPC_EPC: FPC not in use/C not in use for uplink power control ...0 0101 = POWER LEVEL: 5 Frequency List - Frequency List, after time Element ID: 5 Length: 16 00.. 000. = Format Identifier: bit map 0 (0x00) List of ARFCNs = 99 34 Channel Mode - Mode of the First Channel(Channel Set 1) Element ID: 99 Channel Mode: speech full rate or half rate version 2(GSM EFR) (33) any idea why this does not work? i used the "[WIP] Ugly hack to compensate lost time on TS change (high TS -> low TS)" path. regards, andreas

3 2

[PATCH] Improve hex parser robustness.
by Max 14 Jan '13

14 Jan '13

--- src/utils.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/utils.c b/src/utils.c index c36979c..525bff1 100644 --- a/src/utils.c +++ b/src/utils.c @@ -73,7 +73,7 @@ uint8_t osmo_char2bcd(char c) return c - 0x30; } -/*! \brief Parse a string ocntaining hexadecimal digits +/*! \brief Parse a string ocntaining hexadecimal digits, optionally prefixed with 0x * \param[in] str string containing ASCII encoded hexadecimal digits * \param[out] b output buffer * \param[in] max_len maximum space in output buffer @@ -81,10 +81,28 @@ uint8_t osmo_char2bcd(char c) int osmo_hexparse(const char *str, uint8_t *b, int max_len) { - int i, l, v; + int v; + size_t i, l = strlen(str); + + if (l > 2) { /* remove 0x prefix if any */ + if ('0' == str[0] && 'x' == str[1]) { + l -= 2; + str += 2; + } + } + + if (l & 1) i = l + 1; + else i = l; + char hs[i]; /* enough space to store additional leading 0 if str length is odd */ + + if (l & 1) { + memcpy(hs + 1, str, l); + hs[0] = '0'; + } else { + memcpy(hs, str, l); + } - l = strlen(str); - if ((l&1) || ((l>>1) > max_len)) + if ((l>>1) > max_len) return -1; memset(b, 0x00, max_len); -- 1.7.10.4 --------------040904080202060501050607--

1 0

[PATCH] Improve hex parser robustness.
by Max 14 Jan '13

14 Jan '13

--- include/osmocom/core/utils.h | 2 ++ src/utils.c | 48 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 03861d7..05cb2a4 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -15,6 +15,7 @@ #define OSMO_MIN(a, b) ((a) >= (b) ? (b) : (a)) #include <stdint.h> +#include <stdbool.h> /*! \brief A mapping between human-readable string and numeric value */ struct value_string { @@ -30,6 +31,7 @@ char osmo_bcd2char(uint8_t bcd); /* only works for numbers in ascci */ uint8_t osmo_char2bcd(char c); +int osmo_hexparse_adv(const char *str, uint8_t *b, int max_len, bool allow_odd); int osmo_hexparse(const char *str, uint8_t *b, int max_len); char *osmo_ubit_dump(const uint8_t *bits, unsigned int len); diff --git a/src/utils.c b/src/utils.c index c36979c..8c1849e 100644 --- a/src/utils.c +++ b/src/utils.c @@ -3,7 +3,7 @@ #include <stdint.h> #include <errno.h> #include <stdio.h> - +#include <stdbool.h> #include <osmocom/core/utils.h> /*! \addtogroup utils @@ -73,24 +73,60 @@ uint8_t osmo_char2bcd(char c) return c - 0x30; } -/*! \brief Parse a string ocntaining hexadecimal digits +/*! \brief Parse a string ocntaining hexadecimal digits, optionally prefixed with 0x * \param[in] str string containing ASCII encoded hexadecimal digits * \param[out] b output buffer * \param[in] max_len maximum space in output buffer */ int osmo_hexparse(const char *str, uint8_t *b, int max_len) +{ + return osmo_hexparse_adv(str, b, max_len, false); +} +/*! \brief Parse a string ocntaining hexadecimal digits, optionally prefixed with 0x + * \param[in] str string containing ASCII encoded hexadecimal digits + * \param[out] b output buffer + * \param[in] max_len maximum space in output buffer + * \param[in] allow_odd allow odd length (prefix with 0 on the left side) + */ +int osmo_hexparse_adv(const char *str, uint8_t *b, int max_len, bool allow_odd) { - int i, l, v; + int v; + size_t i, l = strlen(str); + const char * src; + + if (l > 2) { /* remove 0x prefix if any */ + if ('0' == str[0] && 'x' == str[1]) { + l -= 2; + str += 2; + } + } + + if (allow_odd) { + if (l & 1) i = l + 1; + else i = l; + char hs[i]; /* enough space to store additional leading 0 if str length is odd */ + + if (l & 1) { + memcpy(hs + 1, str, l); + hs[0] = '0'; + } else { + memcpy(hs, str, l); + } + src = hs; + } else { + if (l & 1) + return -1; + src = str; + } - l = strlen(str); - if ((l&1) || ((l>>1) > max_len)) + if ((l>>1) > max_len) return -1; memset(b, 0x00, max_len); for (i=0; i<l; i++) { - char c = str[i]; + char c = src[i]; if (c >= '0' && c <= '9') v = c - '0'; else if (c >= 'a' && c <= 'f') -- 1.7.10.4 --------------070900070504060905060402--

1 0

[PATCH] Improve hex parser robustness.
by Max 14 Jan '13

14 Jan '13

--- .gitignore | 1 + include/osmocom/core/utils.h | 5 ++++ src/utils.c | 68 ++++++++++++++++++++++++++++++++---------- tests/Makefile.am | 7 +++-- tests/hex/hex_test.c | 52 ++++++++++++++++++++++++++++++++ tests/hex/hex_test.ok | 18 +++++++++++ tests/testsuite.at | 6 ++++ 7 files changed, 140 insertions(+), 17 deletions(-) create mode 100644 tests/hex/hex_test.c create mode 100644 tests/hex/hex_test.ok diff --git a/.gitignore b/.gitignore index ac19b23..67d9196 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,7 @@ tests/sms/sms_test tests/timer/timer_test tests/msgfile/msgfile_test tests/ussd/ussd_test +tests/hex/hex_test tests/smscb/smscb_test tests/bits/bitrev_test tests/a5/a5_test diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 03861d7..5250094 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -30,6 +30,11 @@ char osmo_bcd2char(uint8_t bcd); /* only works for numbers in ascci */ uint8_t osmo_char2bcd(char c); +enum hex_len_policy { /* define how to deal with odd length during hex string parsing */ + HEX_ODD_NONE, HEX_ODD_LEFT, HEX_ODD_RIGHT +}; + +int osmo_hexparse_ext(const char *str, uint8_t *b, int max_len, enum hex_len_policy pol); int osmo_hexparse(const char *str, uint8_t *b, int max_len); char *osmo_ubit_dump(const uint8_t *bits, unsigned int len); diff --git a/src/utils.c b/src/utils.c index c36979c..cd11618 100644 --- a/src/utils.c +++ b/src/utils.c @@ -73,36 +73,74 @@ uint8_t osmo_char2bcd(char c) return c - 0x30; } -/*! \brief Parse a string ocntaining hexadecimal digits +/*! \brief Parse a string ocntaining hexadecimal digits, optionally prefixed with 0x * \param[in] str string containing ASCII encoded hexadecimal digits * \param[out] b output buffer * \param[in] max_len maximum space in output buffer */ int osmo_hexparse(const char *str, uint8_t *b, int max_len) +{ + return osmo_hexparse_ext(str, b, max_len, HEX_ODD_NONE); +} +inline int _osmo_hexval(char c) { - int i, l, v; + if (c >= '0' && c <= '9') + return c - '0'; + if (c >= 'a' && c <= 'f') + return 10 + (c - 'a'); + if (c >= 'A' && c <= 'F') + return 10 + (c - 'A'); + return -1; +} - l = strlen(str); - if ((l&1) || ((l>>1) > max_len)) +/*! \brief Parse a string ocntaining hexadecimal digits, optionally prefixed with 0x + * \param[in] str string containing ASCII encoded hexadecimal digits + * \param[out] b output buffer + * \param[in] max_len maximum space in output buffer + * \param[in] pol defines how to treat odd length case + */ +int osmo_hexparse_ext(const char *str, uint8_t *b, int max_len, enum hex_len_policy pol) +{ + int v; + size_t i, left_adj = 0, right_adj = 0, l = strlen(str); + const char * src; + + if (l > 2) { /* remove 0x prefix if any */ + if (!strncmp(str, "0x", 2)) { + l -= 2; + str += 2; + } + } + + if (l & 1) { + switch (pol) { + case HEX_ODD_LEFT: + left_adj = 1; + break; + case HEX_ODD_NONE: + return -1; + case HEX_ODD_RIGHT: + right_adj = 1; + break; + default: + return -1; + } + } + /* left_adj and right_adj are mutually exclusive so left_adj + right_adj is either 1 or 0 */ + if ((l>>1) > max_len + left_adj + right_adj) return -1; - memset(b, 0x00, max_len); + memset(b, 0x00, max_len + left_adj + right_adj); for (i=0; i<l; i++) { - char c = str[i]; - if (c >= '0' && c <= '9') - v = c - '0'; - else if (c >= 'a' && c <= 'f') - v = 10 + (c - 'a'); - else if (c >= 'A' && c <= 'F') - v = 10 + (c - 'A'); - else + v = _osmo_hexval(str[i]); + if (-1 == v) return -1; - b[i>>1] |= v << (i&1 ? 0 : 4); + b[(i + left_adj) >> 1] |= v << ( (i + left_adj) & 1 ? 0 : 4); } - return i>>1; + return (l + left_adj + right_adj)/2; } static char hexd_buff[4096]; diff --git a/tests/Makefile.am b/tests/Makefile.am index b60f675..fbefab1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,7 +4,7 @@ check_PROGRAMS = timer/timer_test sms/sms_test ussd/ussd_test \ smscb/smscb_test bits/bitrev_test a5/a5_test \ conv/conv_test auth/milenage_test lapd/lapd_test \ gsm0808/gsm0808_test gsm0408/gsm0408_test \ - gb/bssgp_fc_test logging/logging_test + gb/bssgp_fc_test hex/hex_test logging/logging_test if ENABLE_MSGFILE check_PROGRAMS += msgfile/msgfile_test endif @@ -21,6 +21,9 @@ bits_bitrev_test_LDADD = $(top_builddir)/src/libosmocore.la conv_conv_test_SOURCES = conv/conv_test.c conv_conv_test_LDADD = $(top_builddir)/src/libosmocore.la +hex_hex_test_SOURCES = hex/hex_test.c +hex_hex_test_LDADD = $(top_builddir)/src/libosmocore.la + gsm0808_gsm0808_test_SOURCES = gsm0808/gsm0808_test.c gsm0808_gsm0808_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la @@ -77,7 +80,7 @@ EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) \ gsm0808/gsm0808_test.ok gb/bssgp_fc_tests.err \ gb/bssgp_fc_tests.ok gb/bssgp_fc_tests.sh \ msgfile/msgfile_test.ok msgfile/msgconfig.cfg \ - logging/logging_test.ok logging/logging_test.err + logging/logging_test.ok hex/hex_test.ok logging/logging_test.err DISTCLEANFILES = atconfig diff --git a/tests/hex/hex_test.c b/tests/hex/hex_test.c new file mode 100644 index 0000000..fa85065 --- /dev/null +++ b/tests/hex/hex_test.c @@ -0,0 +1,52 @@ +#include <stdio.h> +#include <stdlib.h> +#include <time.h> + +#include <osmocom/core/utils.h> + +/* ------------------------------------------------------------------------ */ +/* Test vectors */ +/* ------------------------------------------------------------------------ */ + +char * long_rand_x = "0xa63c3b465eb79b3e06ae66eb816eace"; +char * long_rand = "39ea2e536e6a2c0d3e59110df20e4bf"; +char * small_even_x = "0xDEAD"; +char * small_even = "FACE"; +char * small_odd_x = "0xFFACE"; +char * small_odd = "bee"; + +/* ------------------------------------------------------------------------ */ +/* Main */ +/* ------------------------------------------------------------------------ */ + +inline void _run_tests(char * vec, size_t len) +{ + uint8_t test[len]; + + int parsed = osmo_hexparse_ext(vec, test, len, HEX_ODD_NONE); + printf("NONE parsed %s: %d", vec, parsed); + if (-1 != parsed) printf(", dumped: %s\n", osmo_hexdump_nospc(test, len)); + else printf("\n"); + + parsed = osmo_hexparse_ext(vec, test, len, HEX_ODD_LEFT); + printf("LEFT parsed %s: %d", vec, parsed); + if (-1 != parsed) printf(", dumped: %s\n", osmo_hexdump_nospc(test, len)); + else printf("\n"); + + parsed = osmo_hexparse_ext(vec, test, len, HEX_ODD_RIGHT); + printf("RIGHT parsed %s: %d", vec, parsed); + if (-1 != parsed) printf(", dumped: %s\n", osmo_hexdump_nospc(test, len)); + else printf("\n"); +} + +int main(int argc, char argv[]) +{ + _run_tests(long_rand_x, 16); + _run_tests(long_rand, 16); + _run_tests(small_even_x, 2); + _run_tests(small_even, 2); + _run_tests(small_odd_x, 3); + _run_tests(small_odd, 2); + + return 0; +} diff --git a/tests/hex/hex_test.ok b/tests/hex/hex_test.ok new file mode 100644 index 0000000..1419b8c --- /dev/null +++ b/tests/hex/hex_test.ok @@ -0,0 +1,18 @@ +NONE parsed 0xa63c3b465eb79b3e06ae66eb816eace: -1 +LEFT parsed 0xa63c3b465eb79b3e06ae66eb816eace: 16, dumped: 0a63c3b465eb79b3e06ae66eb816eace +RIGHT parsed 0xa63c3b465eb79b3e06ae66eb816eace: 16, dumped: a63c3b465eb79b3e06ae66eb816eace0 +NONE parsed 39ea2e536e6a2c0d3e59110df20e4bf: -1 +LEFT parsed 39ea2e536e6a2c0d3e59110df20e4bf: 16, dumped: 039ea2e536e6a2c0d3e59110df20e4bf +RIGHT parsed 39ea2e536e6a2c0d3e59110df20e4bf: 16, dumped: 39ea2e536e6a2c0d3e59110df20e4bf0 +NONE parsed 0xDEAD: 2, dumped: dead +LEFT parsed 0xDEAD: 2, dumped: dead +RIGHT parsed 0xDEAD: 2, dumped: dead +NONE parsed FACE: 2, dumped: face +LEFT parsed FACE: 2, dumped: face +RIGHT parsed FACE: 2, dumped: face +NONE parsed 0xFFACE: -1 +LEFT parsed 0xFFACE: 3, dumped: 0fface +RIGHT parsed 0xFFACE: 3, dumped: fface0 +NONE parsed bee: -1 +LEFT parsed bee: 2, dumped: 0bee +RIGHT parsed bee: 2, dumped: bee0 diff --git a/tests/testsuite.at b/tests/testsuite.at index 1cfae03..cfbcf78 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -28,6 +28,12 @@ cat $abs_srcdir/conv/conv_test.ok > expout AT_CHECK([$abs_top_builddir/tests/conv/conv_test], [], [expout]) AT_CLEANUP +AT_SETUP([hex]) +AT_KEYWORDS([hex]) +cat $abs_srcdir/hex/hex_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/hex/hex_test], [], [expout]) +AT_CLEANUP + if ENABLE_MSGFILE AT_SETUP([msgfile]) AT_KEYWORDS([msgfile]) -- 1.7.10.4 --------------040406000709000102010704--

1 0

[PATCH] Improve hex parser robustness.
by Max 14 Jan '13

14 Jan '13

--- .gitignore | 1 + include/osmocom/core/utils.h | 5 ++++ src/utils.c | 68 ++++++++++++++++++++++++++++++++---------- tests/Makefile.am | 7 +++-- tests/hex/hex_test.c | 57 +++++++++++++++++++++++++++++++++++ tests/hex/hex_test.ok | 18 +++++++++++ tests/testsuite.at | 6 ++++ 7 files changed, 145 insertions(+), 17 deletions(-) create mode 100644 tests/hex/hex_test.c create mode 100644 tests/hex/hex_test.ok diff --git a/.gitignore b/.gitignore index ac19b23..67d9196 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,7 @@ tests/sms/sms_test tests/timer/timer_test tests/msgfile/msgfile_test tests/ussd/ussd_test +tests/hex/hex_test tests/smscb/smscb_test tests/bits/bitrev_test tests/a5/a5_test diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 03861d7..5250094 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -30,6 +30,11 @@ char osmo_bcd2char(uint8_t bcd); /* only works for numbers in ascci */ uint8_t osmo_char2bcd(char c); +enum hex_len_policy { /* define how to deal with odd length during hex string parsing */ + HEX_ODD_NONE, HEX_ODD_LEFT, HEX_ODD_RIGHT +}; + +int osmo_hexparse_ext(const char *str, uint8_t *b, int max_len, enum hex_len_policy pol); int osmo_hexparse(const char *str, uint8_t *b, int max_len); char *osmo_ubit_dump(const uint8_t *bits, unsigned int len); diff --git a/src/utils.c b/src/utils.c index c36979c..a93d72c 100644 --- a/src/utils.c +++ b/src/utils.c @@ -73,36 +73,74 @@ uint8_t osmo_char2bcd(char c) return c - 0x30; } -/*! \brief Parse a string ocntaining hexadecimal digits +/*! \brief Parse a string ocntaining hexadecimal digits, optionally prefixed with 0x * \param[in] str string containing ASCII encoded hexadecimal digits * \param[out] b output buffer * \param[in] max_len maximum space in output buffer */ int osmo_hexparse(const char *str, uint8_t *b, int max_len) +{ + return osmo_hexparse_ext(str, b, max_len, HEX_ODD_NONE); +} +static inline int _osmo_hexval(char c) { - int i, l, v; + if (c >= '0' && c <= '9') + return c - '0'; + if (c >= 'a' && c <= 'f') + return 10 + (c - 'a'); + if (c >= 'A' && c <= 'F') + return 10 + (c - 'A'); + return -1; +} - l = strlen(str); - if ((l&1) || ((l>>1) > max_len)) +/*! \brief Parse a string ocntaining hexadecimal digits, optionally prefixed with 0x + * \param[in] str string containing ASCII encoded hexadecimal digits + * \param[out] b output buffer + * \param[in] max_len maximum space in output buffer + * \param[in] pol defines how to treat odd length case + */ +int osmo_hexparse_ext(const char *str, uint8_t *b, int max_len, enum hex_len_policy pol) +{ + int v; + size_t i, left_adj = 0, right_adj = 0, l = strlen(str); + const char *src; + + if (l > 2) { /* remove 0x prefix if any */ + if (!strncmp(str, "0x", 2)) { + l -= 2; + str += 2; + } + } + + if (l & 1) { + switch (pol) { + case HEX_ODD_LEFT: + left_adj = 1; + break; + case HEX_ODD_NONE: + return -1; + case HEX_ODD_RIGHT: + right_adj = 1; + break; + default: + return -1; + } + } +/* left_adj and right_adj are mutually exclusive so left_adj + right_adj is either 1 or 0 */ + if ((l>>1) + left_adj + right_adj > max_len) return -1; memset(b, 0x00, max_len); - for (i=0; i<l; i++) { - char c = str[i]; - if (c >= '0' && c <= '9') - v = c - '0'; - else if (c >= 'a' && c <= 'f') - v = 10 + (c - 'a'); - else if (c >= 'A' && c <= 'F') - v = 10 + (c - 'A'); - else + for (i = 0; i < l; i++) { + v = _osmo_hexval(str[i]); + if (-1 == v) return -1; - b[i>>1] |= v << (i&1 ? 0 : 4); + b[(i + left_adj) >> 1] |= v << ((i + left_adj) & 1 ? 0 : 4); } - return i>>1; + return (l + left_adj + right_adj)/2; } static char hexd_buff[4096]; diff --git a/tests/Makefile.am b/tests/Makefile.am index b60f675..fbefab1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,7 +4,7 @@ check_PROGRAMS = timer/timer_test sms/sms_test ussd/ussd_test \ smscb/smscb_test bits/bitrev_test a5/a5_test \ conv/conv_test auth/milenage_test lapd/lapd_test \ gsm0808/gsm0808_test gsm0408/gsm0408_test \ - gb/bssgp_fc_test logging/logging_test + gb/bssgp_fc_test hex/hex_test logging/logging_test if ENABLE_MSGFILE check_PROGRAMS += msgfile/msgfile_test endif @@ -21,6 +21,9 @@ bits_bitrev_test_LDADD = $(top_builddir)/src/libosmocore.la conv_conv_test_SOURCES = conv/conv_test.c conv_conv_test_LDADD = $(top_builddir)/src/libosmocore.la +hex_hex_test_SOURCES = hex/hex_test.c +hex_hex_test_LDADD = $(top_builddir)/src/libosmocore.la + gsm0808_gsm0808_test_SOURCES = gsm0808/gsm0808_test.c gsm0808_gsm0808_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la @@ -77,7 +80,7 @@ EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) \ gsm0808/gsm0808_test.ok gb/bssgp_fc_tests.err \ gb/bssgp_fc_tests.ok gb/bssgp_fc_tests.sh \ msgfile/msgfile_test.ok msgfile/msgconfig.cfg \ - logging/logging_test.ok logging/logging_test.err + logging/logging_test.ok hex/hex_test.ok logging/logging_test.err DISTCLEANFILES = atconfig diff --git a/tests/hex/hex_test.c b/tests/hex/hex_test.c new file mode 100644 index 0000000..5c060c4 --- /dev/null +++ b/tests/hex/hex_test.c @@ -0,0 +1,57 @@ +#include <stdio.h> +#include <stdlib.h> +#include <time.h> + +#include <osmocom/core/utils.h> + +/* ------------------------------------------------------------------------ */ +/* Test vectors */ +/* ------------------------------------------------------------------------ */ + +char * long_rand_x = "0xa63c3b465eb79b3e06ae66eb816eace"; +char * long_rand = "39ea2e536e6a2c0d3e59110df20e4bf"; +char * small_even_x = "0xDEAD"; +char * small_even = "FACE"; +char * small_odd_x = "0xFFACE"; +char * small_odd = "bee"; + +/* ------------------------------------------------------------------------ */ +/* Main */ +/* ------------------------------------------------------------------------ */ + +inline void _single_test(char * vec, size_t len, uint8_t * test, enum hex_len_policy pol) +{ + int r = osmo_hexparse_ext(vec, test, len, pol); + printf(" parsed %s (%u): %d", vec, len, r); + if (-1 != r) printf(", dumped: %s, check %x,%d,%d\n", osmo_hexdump_nospc(test, len), test[len - 1], test[len], test[len + 1]); + else printf("\n"); +} + +inline void _run_tests(char * vec, size_t len) +{ + uint8_t test[len + 4]; + int r; + + for (r = 0; r < len + 4; r++) test[r] = r; + + printf("NONE"); + _single_test(vec, len, test, HEX_ODD_NONE); + + printf("LEFT"); + _single_test(vec, len, test, HEX_ODD_LEFT); + + printf("RIGHT"); + _single_test(vec, len, test, HEX_ODD_RIGHT); +} + +int main(int argc, char **argv) +{ + _run_tests(long_rand_x, 16); + _run_tests(long_rand, 16); + _run_tests(small_even_x, 2); + _run_tests(small_even, 2); + _run_tests(small_odd_x, 3); + _run_tests(small_odd, 2); + + return 0; +} diff --git a/tests/hex/hex_test.ok b/tests/hex/hex_test.ok new file mode 100644 index 0000000..44e89d2 --- /dev/null +++ b/tests/hex/hex_test.ok @@ -0,0 +1,18 @@ +NONE parsed 0xa63c3b465eb79b3e06ae66eb816eace (16): -1 +LEFT parsed 0xa63c3b465eb79b3e06ae66eb816eace (16): 16, dumped: 0a63c3b465eb79b3e06ae66eb816eace, check ce,16,17 +RIGHT parsed 0xa63c3b465eb79b3e06ae66eb816eace (16): 16, dumped: a63c3b465eb79b3e06ae66eb816eace0, check e0,16,17 +NONE parsed 39ea2e536e6a2c0d3e59110df20e4bf (16): -1 +LEFT parsed 39ea2e536e6a2c0d3e59110df20e4bf (16): 16, dumped: 039ea2e536e6a2c0d3e59110df20e4bf, check bf,16,17 +RIGHT parsed 39ea2e536e6a2c0d3e59110df20e4bf (16): 16, dumped: 39ea2e536e6a2c0d3e59110df20e4bf0, check f0,16,17 +NONE parsed 0xDEAD (2): 2, dumped: dead, check ad,2,3 +LEFT parsed 0xDEAD (2): 2, dumped: dead, check ad,2,3 +RIGHT parsed 0xDEAD (2): 2, dumped: dead, check ad,2,3 +NONE parsed FACE (2): 2, dumped: face, check ce,2,3 +LEFT parsed FACE (2): 2, dumped: face, check ce,2,3 +RIGHT parsed FACE (2): 2, dumped: face, check ce,2,3 +NONE parsed 0xFFACE (3): -1 +LEFT parsed 0xFFACE (3): 3, dumped: 0fface, check ce,3,4 +RIGHT parsed 0xFFACE (3): 3, dumped: fface0, check e0,3,4 +NONE parsed bee (2): -1 +LEFT parsed bee (2): 2, dumped: 0bee, check ee,2,3 +RIGHT parsed bee (2): 2, dumped: bee0, check e0,2,3 diff --git a/tests/testsuite.at b/tests/testsuite.at index 1cfae03..cfbcf78 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -28,6 +28,12 @@ cat $abs_srcdir/conv/conv_test.ok > expout AT_CHECK([$abs_top_builddir/tests/conv/conv_test], [], [expout]) AT_CLEANUP +AT_SETUP([hex]) +AT_KEYWORDS([hex]) +cat $abs_srcdir/hex/hex_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/hex/hex_test], [], [expout]) +AT_CLEANUP + if ENABLE_MSGFILE AT_SETUP([msgfile]) AT_KEYWORDS([msgfile]) -- 1.7.10.4 --------------080702070805090503080203--

1 0

sylvains talk from 29c3
by Vic Delorge 12 Jan '13

12 Jan '13

Speaker: Sylvain Munaut or how to turn a phone into a BTS The calypso baseband and its companion chips are used on the Motorola C123 among other and are now well known for being supported by the Osmocom-BB open source GSM baseband implementation. A couple years ago, it was hacked a little further by using it as a raw bits capture device allowing the interception of GSM traffic very cheaply. This talk will present some further work on that platform, showing that just because a device wasn't design for a given task doesn't mean it can't do it. More specifically how you can hack this phone to act as a GSM basestation and broadcast your own network. http://youtu.be/xFjVcxMpA6c

3 3

calypso-talk 29c3
by Erich Dachleger 12 Jan '13

12 Jan '13

Hi list, I saw the interesting talk about turning the osmocombb-phone into a proof of concept bts using openbts. During the talk:When OpenBts was configured(before using sipauthserve) was it the option --with-uhd (as is for umtrx )that was used? Does anybody know when the code will be released? [I built sylvain/testing branch as well as branch jolly/meas branch some days ago, but I couldn't find that code anywhere, so I guess it is not available anywhere yet] regards erich

1 0

Re: GTA02 Burst_ind baudrate
by Alex Badea 11 Jan '13

11 Jan '13

On Thu, Jan 10, 2013 at 11:33 PM, Heiko Besemann <heiko(a)noordsee.de> wrote: > > Hello Alex, You should send mail to the mailing list, instead of specific individuals. This way, i) you may get a responder quicker, and ii) information can reach other interested people. > > I read on Osmocom-BB mailing-list that you are using a GTA02 with > cross-compiled tools. Well, I did cross-compiling of the sylvain/burst_ind > branch for the OpenMoko, but starting osmocon I get an error that the > higher non-standard baudrate can not be set to /dev/ttySAC0. On the GTA02 the calypso is wired to one internal UART of the application processor SoC. AFAIR the SoC only supports up to 115200 bps so it won't be usable with burst_ind. Cheers, Alex

3 2

Re: MDL-Error in case of OsmocomBB+OpenBTS
by Pavel Baturko 11 Jan '13

11 Jan '13

Hi, Erich, I'm using OpenBTS with USRP B100 & SBX. I encountered new problem, maybe it's similar to initial problem. Calls and MO SMS works fine (not in 100%, but it's ok). But MT SMS does not work (actually I received only 1 SMS from many attempts). Mobile log (error part, from line 454): <0001> gsm48_rr.c:429 new SAPI 3 link state idle -> established <000e> gsm48_rr.c:5042 Radio link SAPI3 is established <0005> gsm48_mm.c:3911 (ms 1) Received 'RR_EST_IND' from RR in state wait for network command (sapi 3) <0001> gsm48_rr.c:662 MON: f=50 lev=>=-47 snr= 0 ber= 0 LAI=001 01 0001 ID=0001 TA=3 pwr=19 TS=0/0 <0001> gsm48_rr.c:2864 MEAS REP: pwr=19 TA=3 meas-invalid=0 rxlev-full=-47 rxlev-sub=-47 rxqual-full=0 rxqual-sub=0 dtx 0 ba 0 no-ncell-n 0 <0001> gsm48_rr.c:4767 Indicated ta 3 (actual ta 3) <0001> gsm48_rr.c:4769 Indicated tx_power 19 <0001> gsm48_rr.c:4767 Indicated ta 3 (actual ta 3) <0001> gsm48_rr.c:4769 Indicated tx_power 19 <0001> gsm48_rr.c:4984 MDL-Error (cause 4) ignoring Dropping frame with 71 bit errors <0001> gsm48_rr.c:4767 Indicated ta 3 (actual ta 3) <0001> gsm48_rr.c:4769 Indicated tx_power 19 <0001> gsm48_rr.c:662 MON: f=50 lev=>=-47 snr=10 ber= 42 LAI=001 01 0001 ID=0001 TA=3 pwr=19 TS=0/0 <0001> gsm48_rr.c:2864 MEAS REP: pwr=19 TA=3 meas-invalid=0 rxlev-full=-47 rxlev-sub=-47 rxqual-full=0 rxqual-sub=0 dtx 0 ba 0 no-ncell-n 0 <0001> gsm48_rr.c:3389 channel release request with cause 0x62 <0001> gsm48_rr.c:355 new state dedicated -> release pending In trace (from packet 5509): BTS send SABM MS receive SABM MS respond with UA BTS receive UA BTS send I frame MS receive SABM (extra message?) MS respond with UA BTS receive UA BTS send DM (disconnect request? because of extra UA respond from MS?) BTS send Channel Release after that MS receive I frame and send RR with ack but as I understand this does not matter because of Chan Release.. Thanks, Pavel On Thu, Jan 10, 2013 at 6:02 PM, Erich Dachleger <edachleger(a)yahoo.com> wrote: > What do you use to generate the network? > The osmocombb-phone or other bts? > cheers > Erich > > ________________________________ > Fra: Pavel Baturko <pabftk(a)gmail.com> > Til: baseband-devel(a)lists.osmocom.org > Sendt: Mandag, 7. januar 2013 21.04 > Emne: MDL-Error in case of OsmocomBB+OpenBTS > > Hi list, > > I'm trying to connect my OsmocomBB phone to OpenBTS and I always got > MDL-Error in mobile app log when MS trying to perform LU. > Part of log (full mobile log in attach): > <0001> gsm48_rr.c:355 new state connection pending -> dedicated > <0005> gsm48_mm.c:3911 (ms 1) Received 'RR_EST_CNF' from RR in state wait > for RR connection (location updating) (sapi 0) > <0005> gsm48_mm.c:404 starting T3210 (loc. upd. timeout) with 20.0 seconds > <0005> gsm48_mm.c:924 new state wait for RR connection (location updating) > -> location updating initiated > <0001> gsm48_rr.c:4984 MDL-Error (cause 3) ignoring > <0001> gsm48_rr.c:4987 MDL-Error (cause 3) aborting > <0001> gsm48_rr.c:355 new state dedicated -> idle > > In wireshark trace (from OpenBTS, attached) I see that MS sends LURequest > (packet 359) and BTS responds with LUAccept (packet 440) but MS never > receive this message because of error. > > As I understand this is "unsolicited UA response" from 08.58 (9.3.22) but I > do not know how to fix that or properly debug. > I'm using latest sylvain/testing and official OpenBTS 2.8. "Usual" (not with > OsmocomBB) phones works with OpenBTS fine and OsmocomBB phones works fine > with "usual" (not OpenBTS) networks. > > Thanks, > Pavel > >

1 0