diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-04-17 02:26:10 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-04-18 02:38:37 +0200 |
| commit | a4399c8891ec3302a08ab11da6827ef762024c50 (patch) | |
| tree | 8d23f485c8ed373fe0b8ed32989b5ddf33c684c5 /include | |
| parent | 74e4ed6f36d587d9b7d8790cddcd6902b4fe2359 (diff) | |
add gsm0808_cell_{id,id_list}_name() and friends
Provide comprehensive API to obtain string representations of Cell Identifiers
and -Lists.
Change gsm0808_test.c to use the new functions (which simplifies the output a
bit), so that we don't duplicate printing code in gsm0808_test.c, and so that
the not-so-trivial printing code is also tested.
In gsm0808_test, also test gsm0808_cell_id_list_name_buf()'s return value and
truncation behavior.
The rationale for gsm0808_cell_id_list_name(), i.e. printing an entire list of
cell identifiers, is that even though the maximum is 127 elements, a list of
more than a few elements is hardly ever expected in practice (even more than
one element isn't actually expected: either "entire BSS" or a single LAC). It
is thus useful to log the entire list when it shows up in Paging and Handover.
Change-Id: I9b2106805422f96c5cc96ebb9178451355582df3
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmocom/gsm/gsm0808_utils.h | 11 | ||||
| -rw-r--r-- | include/osmocom/gsm/protocol/gsm_08_08.h | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 8e71b43c..8cdb74bb 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -55,6 +55,17 @@ struct gsm0808_cell_id_list2 { unsigned int id_list_len; }; +extern const struct value_string gsm0808_cell_id_discr_names[]; +static inline const char *gsm0808_cell_id_discr_name(enum CELL_IDENT id_discr) +{ return get_value_string(gsm0808_cell_id_discr_names, id_discr); } + +const char *gsm0808_cell_id_name(const struct gsm0808_cell_id *cid); +const char *gsm0808_cell_id_name2(const struct gsm0808_cell_id *cid); +const char *gsm0808_cell_id_list_name(const struct gsm0808_cell_id_list2 *cil); +int gsm0808_cell_id_list_name_buf(char *buf, size_t buflen, const struct gsm0808_cell_id_list2 *cil); +int gsm0808_cell_id_u_name(char *buf, size_t buflen, + enum CELL_IDENT id_discr, const union gsm0808_cell_id_u *u); + uint8_t gsm0808_enc_aoip_trasp_addr(struct msgb *msg, const struct sockaddr_storage *ss); int gsm0808_dec_aoip_trasp_addr(struct sockaddr_storage *ss, diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 4539b960..5d2864ff 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -10,7 +10,8 @@ /* * this is from GSM 03.03 CGI but is copied in GSM 08.08 - * in § 3.2.2.27 for Cell Identifier List + * in § 3.2.2.27 for Cell Identifier List. + * See gsm0808_cell_id_discr_name() for a human readable representation. */ enum CELL_IDENT { CELL_IDENT_WHOLE_GLOBAL = 0, |