OpenBSC January 2016

openbsc@lists.osmocom.org

11 participants
44 discussions

[PATCH 1/2] Add missing build leftovers to .gitignore
by suraev＠alumni.ntnu.no 26 Jan '16

26 Jan '16

From: Max <msuraev(a)sysmocom.de> --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 6cc9aa5..46ddeb3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ Makefile.in Makefile .deps +compile aclocal.m4 autom4te.cache config.log @@ -42,3 +43,5 @@ tests/codel/codel_test tests/emu/pcu_emu tests/testsuite tests/testsuite.log +tests/edge/EdgeTest +tests/llc/LlcTest -- 2.5.0

2 2

OAP depends on libgtp? (openbsc:6cacc56d)
by Neels Hofmeyr 26 Jan '16

26 Jan '16

Hi Alexander, about your commit on openbsc, merged as 6cacc56d: libgtp should not be a prerequisite for OAP. OAP is a rather simple protocol built on an IPA connection and doesn't really relate to GTP at all. So if your build of OAP was dependent on libgtp, that's a bug, and probably my fault. Could you please verify / indicate the failure you saw so we/I can fix it? Thanks! ~Neels -- - Neels Hofmeyr <nhofmeyr(a)sysmocom.de> http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschäftsführer / Managing Directors: Holger Freyther, Harald Welte

2 3

GSM demo licenses in Germany?
by Ralph A. Schmid, dk5ras 26 Jan '16

26 Jan '16

Hi, As there are some German GSM experimenters here, what happened to your demo licenses after the DECT guard band frequencies had been auctioned away to AFAIR Vodafone? What a stupid idea, they did not listen to the technicians and just had the $$$ signs in their eyes :( I got a reminder last week, my license would expire soon, and if I would like to renew it. So I answered intentionally unknowingly "yes, please do so". Let's see what they will do now :) The second possibility would be asking the management of a German provider if they would lend me one of their unused guard channels. Although I see there chances I really would hate pulling this wire... Ralph.

1 0

A patch for openbsc
by Alexander Huemer 26 Jan '16

26 Jan '16

Hi, without this patch the needed files of libgtp are only found if they are placed in the same location as other dependencies. When GNU stow is used this may not be the case. Kind regards, -Alex

1 1

[PATCH] gsm0408: Provide unique strings for the gsm 04.08 message
by Holger Hans Peter Freyther 25 Jan '16

25 Jan '16

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> At Rhizomatica we see that some GSM 04.08 messages are leaked and have no other indication if that is Call Control, SMS or something else. --- openbsc/include/openbsc/gsm_04_08.h | 4 +-- openbsc/src/gprs/gb_proxy.c | 4 +-- openbsc/src/gprs/gprs_gmm.c | 36 +++++++++++----------- openbsc/src/libbsc/gsm_04_08_utils.c | 16 +++++----- openbsc/src/libmsc/gsm_04_08.c | 58 +++++++++++++++++------------------ openbsc/src/libmsc/gsm_04_80.c | 6 ++-- openbsc/src/osmo-bsc/osmo_bsc_bssap.c | 2 +- 7 files changed, 63 insertions(+), 63 deletions(-) diff --git a/openbsc/include/openbsc/gsm_04_08.h b/openbsc/include/openbsc/gsm_04_08.h index 02d67f7..fd0b89d 100644 --- a/openbsc/include/openbsc/gsm_04_08.h +++ b/openbsc/include/openbsc/gsm_04_08.h @@ -19,10 +19,10 @@ struct amr_mode; #define GSM48_ALLOC_SIZE 2048 #define GSM48_ALLOC_HEADROOM 256 -static inline struct msgb *gsm48_msgb_alloc(void) +static inline struct msgb *gsm48_msgb_alloc_name(const char *name) { return msgb_alloc_headroom(GSM48_ALLOC_SIZE, GSM48_ALLOC_HEADROOM, - "GSM 04.08"); + name); } static inline int get_radio_link_timeout(struct gsm48_cell_options *cell_options) diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c index 6cad651..9551335 100644 --- a/openbsc/src/gprs/gb_proxy.c +++ b/openbsc/src/gprs/gb_proxy.c @@ -393,7 +393,7 @@ static void gbproxy_acquire_imsi(struct gbproxy_peer *peer, struct msgb *idreq_msg; /* Send IDENT REQ */ - idreq_msg = gsm48_msgb_alloc(); + idreq_msg = gsm48_msgb_alloc_name("GSM 04.08 ACQ IMSI"); gprs_put_identity_req(idreq_msg, GSM_MI_TYPE_IMSI); gbproxy_gsm48_to_peer(peer, link_info, bvci, idreq_msg); } @@ -405,7 +405,7 @@ static void gbproxy_tx_detach_acc(struct gbproxy_peer *peer, struct msgb *detacc_msg; /* Send DETACH ACC */ - detacc_msg = gsm48_msgb_alloc(); + detacc_msg = gsm48_msgb_alloc_name("GSM 04.08 DET ACC"); gprs_put_mo_detach_acc(detacc_msg); gbproxy_gsm48_to_peer(peer, link_info, bvci, detacc_msg); } diff --git a/openbsc/src/gprs/gprs_gmm.c b/openbsc/src/gprs/gprs_gmm.c index 115e898..7d3e3de 100644 --- a/openbsc/src/gprs/gprs_gmm.c +++ b/openbsc/src/gprs/gprs_gmm.c @@ -199,7 +199,7 @@ static int _tx_status(struct msgb *msg, uint8_t cause, static int gsm48_tx_gmm_status(struct sgsn_mm_ctx *mmctx, uint8_t cause) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 GMM STATUS"); mmctx2msgid(msg, mmctx); return _tx_status(msg, cause, mmctx, 0); @@ -207,7 +207,7 @@ static int gsm48_tx_gmm_status(struct sgsn_mm_ctx *mmctx, uint8_t cause) static int gsm48_tx_sm_status(struct sgsn_mm_ctx *mmctx, uint8_t cause) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 SM STATUS"); mmctx2msgid(msg, mmctx); return _tx_status(msg, cause, mmctx, 1); @@ -238,7 +238,7 @@ static int _tx_detach_req(struct msgb *msg, uint8_t detach_type, uint8_t cause, static int gsm48_tx_gmm_detach_req(struct sgsn_mm_ctx *mmctx, uint8_t detach_type, uint8_t cause) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 DET REQ"); mmctx2msgid(msg, mmctx); return _tx_detach_req(msg, detach_type, cause, mmctx); @@ -247,7 +247,7 @@ static int gsm48_tx_gmm_detach_req(struct sgsn_mm_ctx *mmctx, static int gsm48_tx_gmm_detach_req_oldmsg(struct msgb *oldmsg, uint8_t detach_type, uint8_t cause) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 DET OLD"); gmm_copy_id(msg, oldmsg); return _tx_detach_req(msg, detach_type, cause, NULL); @@ -279,7 +279,7 @@ static struct gsm48_qos default_qos = { /* Chapter 9.4.2: Attach accept */ static int gsm48_tx_gmm_att_ack(struct sgsn_mm_ctx *mm) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ATT ACK"); struct gsm48_hdr *gh; struct gsm48_attach_ack *aa; uint8_t *mid; @@ -350,14 +350,14 @@ static int _tx_gmm_att_rej(struct msgb *msg, uint8_t gmm_cause, static int gsm48_tx_gmm_att_rej_oldmsg(const struct msgb *old_msg, uint8_t gmm_cause) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ATT REJ OLD"); gmm_copy_id(msg, old_msg); return _tx_gmm_att_rej(msg, gmm_cause, NULL); } static int gsm48_tx_gmm_att_rej(struct sgsn_mm_ctx *mm, uint8_t gmm_cause) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ATT REJ"); mmctx2msgid(msg, mm); return _tx_gmm_att_rej(msg, gmm_cause, mm); } @@ -382,7 +382,7 @@ static int _tx_detach_ack(struct msgb *msg, uint8_t force_stby, static int gsm48_tx_gmm_det_ack(struct sgsn_mm_ctx *mm, uint8_t force_stby) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 DET ACK"); mmctx2msgid(msg, mm); return _tx_detach_ack(msg, force_stby, mm); @@ -390,7 +390,7 @@ static int gsm48_tx_gmm_det_ack(struct sgsn_mm_ctx *mm, uint8_t force_stby) static int gsm48_tx_gmm_det_ack_oldmsg(struct msgb *oldmsg, uint8_t force_stby) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 DET ACK OLD"); gmm_copy_id(msg, oldmsg); return _tx_detach_ack(msg, force_stby, NULL); @@ -399,7 +399,7 @@ static int gsm48_tx_gmm_det_ack_oldmsg(struct msgb *oldmsg, uint8_t force_stby) /* Transmit Chapter 9.4.12 Identity Request */ static int gsm48_tx_gmm_id_req(struct sgsn_mm_ctx *mm, uint8_t id_type) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ID REQ"); struct gsm48_hdr *gh; LOGMMCTXP(LOGL_DEBUG, mm, "<- GPRS IDENTITY REQUEST: mi_type=%s\n", @@ -420,7 +420,7 @@ static int gsm48_tx_gmm_id_req(struct sgsn_mm_ctx *mm, uint8_t id_type) static int gsm48_tx_gmm_auth_ciph_req(struct sgsn_mm_ctx *mm, uint8_t *rand, uint8_t key_seq, uint8_t algo) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 AUTH CIPH REQ"); struct gsm48_hdr *gh; struct gsm48_auth_ciph_req *acreq; uint8_t *m_rand, *m_cksn; @@ -458,7 +458,7 @@ static int gsm48_tx_gmm_auth_ciph_req(struct sgsn_mm_ctx *mm, uint8_t *rand, /* Section 9.4.11: Authentication and Ciphering Reject */ static int gsm48_tx_gmm_auth_ciph_rej(struct sgsn_mm_ctx *mm) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 AUTH CIPH REJ"); struct gsm48_hdr *gh; LOGMMCTXP(LOGL_NOTICE, mm, "<- GPRS AUTH AND CIPH REJECT\n"); @@ -1020,7 +1020,7 @@ static int gsm48_rx_gmm_det_req(struct sgsn_mm_ctx *ctx, struct msgb *msg) /* Chapter 9.4.15: Routing area update accept */ static int gsm48_tx_gmm_ra_upd_ack(struct sgsn_mm_ctx *mm) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 UPD ACK"); struct gsm48_hdr *gh; struct gsm48_ra_upd_ack *rua; uint8_t *mid; @@ -1067,7 +1067,7 @@ static int gsm48_tx_gmm_ra_upd_ack(struct sgsn_mm_ctx *mm) /* Chapter 9.4.17: Routing area update reject */ static int gsm48_tx_gmm_ra_upd_rej(struct msgb *old_msg, uint8_t cause) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 RA UPD REJ"); struct gsm48_hdr *gh; LOGP(DMM, LOGL_NOTICE, "<- ROUTING AREA UPDATE REJECT\n"); @@ -1502,7 +1502,7 @@ static void msgb_put_pdp_addr_ppp(struct msgb *msg) /* Section 9.5.2: Ativate PDP Context Accept */ int gsm48_tx_gsm_act_pdp_acc(struct sgsn_pdp_ctx *pdp) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 PDP ACC"); struct gsm48_hdr *gh; uint8_t transaction_id = pdp->ti ^ 0x8; /* flip */ @@ -1546,7 +1546,7 @@ int gsm48_tx_gsm_act_pdp_acc(struct sgsn_pdp_ctx *pdp) int gsm48_tx_gsm_act_pdp_rej(struct sgsn_mm_ctx *mm, uint8_t tid, uint8_t cause, uint8_t pco_len, uint8_t *pco_v) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 PDP REJ"); struct gsm48_hdr *gh; uint8_t transaction_id = tid ^ 0x8; /* flip */ @@ -1569,7 +1569,7 @@ int gsm48_tx_gsm_act_pdp_rej(struct sgsn_mm_ctx *mm, uint8_t tid, static int _gsm48_tx_gsm_deact_pdp_req(struct sgsn_mm_ctx *mm, uint8_t tid, uint8_t sm_cause) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 PDP DET REQ"); struct gsm48_hdr *gh; uint8_t transaction_id = tid ^ 0x8; /* flip */ @@ -1595,7 +1595,7 @@ int gsm48_tx_gsm_deact_pdp_req(struct sgsn_pdp_ctx *pdp, uint8_t sm_cause) /* Section 9.5.9: Deactivate PDP Context Accept */ static int _gsm48_tx_gsm_deact_pdp_acc(struct sgsn_mm_ctx *mm, uint8_t tid) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 PDP DET ACC"); struct gsm48_hdr *gh; uint8_t transaction_id = tid ^ 0x8; /* flip */ diff --git a/openbsc/src/libbsc/gsm_04_08_utils.c b/openbsc/src/libbsc/gsm_04_08_utils.c index 4901912..8c6dbef 100644 --- a/openbsc/src/libbsc/gsm_04_08_utils.c +++ b/openbsc/src/libbsc/gsm_04_08_utils.c @@ -224,7 +224,7 @@ static void mr_config_for_ms(struct gsm_lchan *lchan, struct msgb *msg) /* 7.1.7 and 9.1.7: RR CHANnel RELease */ int gsm48_send_rr_release(struct gsm_lchan *lchan) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 RR REL"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); uint8_t *cause; @@ -314,7 +314,7 @@ int gsm48_handle_paging_resp(struct gsm_subscriber_connection *conn, /* Chapter 9.1.9: Ciphering Mode Command */ int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CIPH"); struct gsm48_hdr *gh; uint8_t ciph_mod_set; @@ -410,7 +410,7 @@ int gsm48_multirate_config(uint8_t *lv, struct amr_multirate_conf *mr, struct am int gsm48_send_ho_cmd(struct gsm_lchan *old_lchan, struct gsm_lchan *new_lchan, uint8_t power_command, uint8_t ho_ref) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 HO CMD"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); struct gsm48_ho_cmd *ho = (struct gsm48_ho_cmd *) msgb_put(msg, sizeof(*ho)); @@ -449,7 +449,7 @@ int gsm48_send_ho_cmd(struct gsm_lchan *old_lchan, struct gsm_lchan *new_lchan, /* Chapter 9.1.2: Assignment Command */ int gsm48_send_rr_ass_cmd(struct gsm_lchan *dest_lchan, struct gsm_lchan *lchan, uint8_t power_command) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ASS CMD"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); struct gsm48_ass_cmd *ass = (struct gsm48_ass_cmd *) msgb_put(msg, sizeof(*ass)); @@ -490,7 +490,7 @@ int gsm48_send_rr_ass_cmd(struct gsm_lchan *dest_lchan, struct gsm_lchan *lchan, /* 9.1.5 Channel mode modify: Modify the mode on the MS side */ int gsm48_tx_chan_mode_modify(struct gsm_lchan *lchan, uint8_t mode) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CHN MOD"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); struct gsm48_chan_mode_modify *cmm = (struct gsm48_chan_mode_modify *) msgb_put(msg, sizeof(*cmm)); @@ -650,7 +650,7 @@ struct msgb *gsm48_create_mm_serv_rej(enum gsm48_reject_value value) struct msgb *msg; struct gsm48_hdr *gh; - msg = gsm48_msgb_alloc(); + msg = gsm48_msgb_alloc_name("GSM 04.08 SERV REJ"); if (!msg) return NULL; @@ -667,7 +667,7 @@ struct msgb *gsm48_create_loc_upd_rej(uint8_t cause) struct gsm48_hdr *gh; struct msgb *msg; - msg = gsm48_msgb_alloc(); + msg = gsm48_msgb_alloc_name("GSM 04.08 LOC UPD REJ"); if (!msg) return NULL; @@ -681,7 +681,7 @@ struct msgb *gsm48_create_loc_upd_rej(uint8_t cause) /* 9.2.5 CM service accept */ int gsm48_tx_mm_serv_ack(struct gsm_subscriber_connection *conn) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 SERV ACK"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); msg->lchan = conn->lchan; diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 9d7e2aa..d9d7390 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -458,7 +458,7 @@ int gsm0408_loc_upd_rej(struct gsm_subscriber_connection *conn, uint8_t cause) static int gsm0408_loc_upd_acc(struct gsm_subscriber_connection *conn) { struct gsm_bts *bts = conn->bts; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 LOC UPD ACC"); struct gsm48_hdr *gh; struct gsm48_loc_area_id *lai; uint8_t *mid; @@ -494,7 +494,7 @@ static int gsm0408_loc_upd_acc(struct gsm_subscriber_connection *conn) /* Transmit Chapter 9.2.10 Identity Request */ static int mm_tx_identity_req(struct gsm_subscriber_connection *conn, uint8_t id_type) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ID REQ"); struct gsm48_hdr *gh; msg->lchan = conn->lchan; @@ -707,7 +707,7 @@ static uint8_t bcdify(uint8_t value) /* Section 9.2.15a */ int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 MM INF"); struct gsm48_hdr *gh; struct gsm_network *net = conn->bts->network; struct gsm_bts *bts = conn->bts; @@ -855,7 +855,7 @@ int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn) /* Section 9.2.2 */ int gsm48_tx_mm_auth_req(struct gsm_subscriber_connection *conn, uint8_t *rand, int key_seq) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 AUTH REQ"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); struct gsm48_auth_req *ar = (struct gsm48_auth_req *) msgb_put(msg, sizeof(*ar)); @@ -1261,7 +1261,7 @@ static int gsm0408_rcv_rr(struct gsm_subscriber_connection *conn, struct msgb *m int gsm48_send_rr_app_info(struct gsm_subscriber_connection *conn, uint8_t apdu_id, uint8_t apdu_len, const uint8_t *apdu) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 APP INF"); struct gsm48_hdr *gh; msg->lchan = conn->lchan; @@ -1300,7 +1300,7 @@ static void new_cc_state(struct gsm_trans *trans, int state) static int gsm48_cc_tx_status(struct gsm_trans *trans, void *arg) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC STATUS"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); uint8_t *cause, *call_state; @@ -1320,7 +1320,7 @@ static int gsm48_cc_tx_status(struct gsm_trans *trans, void *arg) static int gsm48_tx_simple(struct gsm_subscriber_connection *conn, uint8_t pdisc, uint8_t msg_type) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 TX SIMPLE"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); msg->lchan = conn->lchan; @@ -1943,7 +1943,7 @@ static int gsm48_cc_rx_setup(struct gsm_trans *trans, struct msgb *msg) static int gsm48_cc_tx_setup(struct gsm_trans *trans, void *arg) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC STUP"); struct gsm48_hdr *gh; struct gsm_mncc *setup = arg; int rc, trans_id; @@ -2067,7 +2067,7 @@ static int gsm48_cc_rx_call_conf(struct gsm_trans *trans, struct msgb *msg) static int gsm48_cc_tx_call_proc(struct gsm_trans *trans, void *arg) { struct gsm_mncc *proceeding = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC PROC"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_CALL_PROC; @@ -2129,7 +2129,7 @@ static int gsm48_cc_rx_alerting(struct gsm_trans *trans, struct msgb *msg) static int gsm48_cc_tx_alerting(struct gsm_trans *trans, void *arg) { struct gsm_mncc *alerting = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC ALERT"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_ALERTING; @@ -2152,7 +2152,7 @@ static int gsm48_cc_tx_alerting(struct gsm_trans *trans, void *arg) static int gsm48_cc_tx_progress(struct gsm_trans *trans, void *arg) { struct gsm_mncc *progress = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC PROGRESS"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_PROGRESS; @@ -2169,7 +2169,7 @@ static int gsm48_cc_tx_progress(struct gsm_trans *trans, void *arg) static int gsm48_cc_tx_connect(struct gsm_trans *trans, void *arg) { struct gsm_mncc *connect = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSN 04.08 CC CON"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_CONNECT; @@ -2258,7 +2258,7 @@ static int gsm48_cc_rx_connect_ack(struct gsm_trans *trans, struct msgb *msg) static int gsm48_cc_tx_connect_ack(struct gsm_trans *trans, void *arg) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC CON ACK"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_CONNECT_ACK; @@ -2324,7 +2324,7 @@ static struct gsm_mncc_cause default_cause = { static int gsm48_cc_tx_disconnect(struct gsm_trans *trans, void *arg) { struct gsm_mncc *disc = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC DISC"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_DISCONNECT; @@ -2415,7 +2415,7 @@ static int gsm48_cc_rx_release(struct gsm_trans *trans, struct msgb *msg) static int gsm48_cc_tx_release(struct gsm_trans *trans, void *arg) { struct gsm_mncc *rel = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC REL"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_RELEASE; @@ -2505,7 +2505,7 @@ static int gsm48_cc_rx_release_compl(struct gsm_trans *trans, struct msgb *msg) static int gsm48_cc_tx_release_compl(struct gsm_trans *trans, void *arg) { struct gsm_mncc *rel = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC REL COMPL"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); int ret; @@ -2561,7 +2561,7 @@ static int gsm48_cc_rx_facility(struct gsm_trans *trans, struct msgb *msg) static int gsm48_cc_tx_facility(struct gsm_trans *trans, void *arg) { struct gsm_mncc *fac = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC FAC"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_FACILITY; @@ -2583,7 +2583,7 @@ static int gsm48_cc_rx_hold(struct gsm_trans *trans, struct msgb *msg) static int gsm48_cc_tx_hold_ack(struct gsm_trans *trans, void *arg) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC HLD ACK"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_HOLD_ACK; @@ -2594,7 +2594,7 @@ static int gsm48_cc_tx_hold_ack(struct gsm_trans *trans, void *arg) static int gsm48_cc_tx_hold_rej(struct gsm_trans *trans, void *arg) { struct gsm_mncc *hold_rej = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC HLD REJ"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_HOLD_REJ; @@ -2620,7 +2620,7 @@ static int gsm48_cc_rx_retrieve(struct gsm_trans *trans, struct msgb *msg) static int gsm48_cc_tx_retrieve_ack(struct gsm_trans *trans, void *arg) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC RETR ACK"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_RETR_ACK; @@ -2631,7 +2631,7 @@ static int gsm48_cc_tx_retrieve_ack(struct gsm_trans *trans, void *arg) static int gsm48_cc_tx_retrieve_rej(struct gsm_trans *trans, void *arg) { struct gsm_mncc *retrieve_rej = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC RETR REJ"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_RETR_REJ; @@ -2668,7 +2668,7 @@ static int gsm48_cc_rx_start_dtmf(struct gsm_trans *trans, struct msgb *msg) static int gsm48_cc_tx_start_dtmf_ack(struct gsm_trans *trans, void *arg) { struct gsm_mncc *dtmf = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 DTMF ACK"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_START_DTMF_ACK; @@ -2683,7 +2683,7 @@ static int gsm48_cc_tx_start_dtmf_ack(struct gsm_trans *trans, void *arg) static int gsm48_cc_tx_start_dtmf_rej(struct gsm_trans *trans, void *arg) { struct gsm_mncc *dtmf = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 DTMF REJ"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_START_DTMF_REJ; @@ -2699,7 +2699,7 @@ static int gsm48_cc_tx_start_dtmf_rej(struct gsm_trans *trans, void *arg) static int gsm48_cc_tx_stop_dtmf_ack(struct gsm_trans *trans, void *arg) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 DTMF STP ACK"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_STOP_DTMF_ACK; @@ -2743,7 +2743,7 @@ static int gsm48_cc_rx_modify(struct gsm_trans *trans, struct msgb *msg) static int gsm48_cc_tx_modify(struct gsm_trans *trans, void *arg) { struct gsm_mncc *modify = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC MOD"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_MODIFY; @@ -2786,7 +2786,7 @@ static int gsm48_cc_rx_modify_complete(struct gsm_trans *trans, struct msgb *msg static int gsm48_cc_tx_modify_complete(struct gsm_trans *trans, void *arg) { struct gsm_mncc *modify = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC MOD COMPL"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_MODIFY_COMPL; @@ -2833,7 +2833,7 @@ static int gsm48_cc_rx_modify_reject(struct gsm_trans *trans, struct msgb *msg) static int gsm48_cc_tx_modify_reject(struct gsm_trans *trans, void *arg) { struct gsm_mncc *modify = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC MOD REJ"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_MODIFY_REJECT; @@ -2851,7 +2851,7 @@ static int gsm48_cc_tx_modify_reject(struct gsm_trans *trans, void *arg) static int gsm48_cc_tx_notify(struct gsm_trans *trans, void *arg) { struct gsm_mncc *notify = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC NOT"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_NOTIFY; @@ -2881,7 +2881,7 @@ static int gsm48_cc_rx_notify(struct gsm_trans *trans, struct msgb *msg) static int gsm48_cc_tx_userinfo(struct gsm_trans *trans, void *arg) { struct gsm_mncc *user = arg; - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USR INFO"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->msg_type = GSM48_MT_CC_USER_INFO; diff --git a/openbsc/src/libmsc/gsm_04_80.c b/openbsc/src/libmsc/gsm_04_80.c index b30f9ee..f1d75f2 100644 --- a/openbsc/src/libmsc/gsm_04_80.c +++ b/openbsc/src/libmsc/gsm_04_80.c @@ -65,7 +65,7 @@ int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn, const struct msgb *in_msg, const char *response_text, const struct ussd_request *req) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD RSP"); struct gsm48_hdr *gh; uint8_t *ptr8; int response_len; @@ -113,7 +113,7 @@ int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn, const struct msgb *in_msg, const struct ussd_request *req) { - struct msgb *msg = gsm48_msgb_alloc(); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD REJ"); struct gsm48_hdr *gh; /* First insert the problem code */ @@ -163,7 +163,7 @@ int gsm0480_send_releaseComplete(struct gsm_subscriber_connection *conn) struct gsm48_hdr *gh; struct msgb *msg; - msg = gsm48_msgb_alloc(); + msg = gsm48_msgb_alloc_name("GSM 04.08 USSD REL COMPL"); if (!msg) return -1; diff --git a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c index 2d2507e..a60940d 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c @@ -473,7 +473,7 @@ static int dtap_rcvmsg(struct osmo_bsc_sccp_con *conn, LOGP(DMSC, LOGL_INFO, "Rx MSC DTAP, SAPI: %u CHAN: %u\n", header->link_id & 0x07, header->link_id & 0xC0); /* forward the data */ - gsm48 = gsm48_msgb_alloc(); + gsm48 = gsm48_msgb_alloc_name("GSM 04.08 DTAP RCV"); if (!gsm48) { LOGP(DMSC, LOGL_ERROR, "Allocation of the message failed.\n"); return -1; -- 2.6.3

1 0

OsmoBTS and T200 handling / libosmocore lapdm
by Harald Welte 25 Jan '16

25 Jan '16

Hi all, T200 is the LAPDm re-transmission timer, after which the sender assumes a L2 frame transmitted was lost and starts with recovery. Until recently, OsmoBTS ignored the T200 values that the BSC specified via OML, always falling back to the (relatively long) T200 values that exist in libosmocore (1s for the main channel, 2s for the associated channel). As you know, OsmoBTS is used in production in this configuration and we never recevied any associated bug reports. Recently, in e9f12acbeb5a369282719f8e0deecc88034a5488 I started to use the T200 values as communicated from the BSC via OML. This is what proprietary BTSs like the BS-11, nanoBTS etc. (supposedly) have been using all the time anyway, so I thought of it as a bug fix. However, as it turns out, it breaks our LAPDm implementation in many ways. The LAPDm performance gets that bad that you cannot even transmit a single SMS anymore, and even LU only occasionally work anymore. You can see the erroneous behavior in the attached PCAP file showing OsmoBTS-generated GSMTAP and RSL. Also attached are log file outputs of LAPDm logging for mo-sms and mt-sms. In them you can find troubling lines like 'S frame response with F=1 error' which should never happen... I suspect two issues related to this: 1) Our lapdm.c code uses regular osmo_timer_* functions to determine once T200 expires, rather than a GSM frame number time-base. This wouldn't be a problem in a synchronous real-time environemnt. However, in OsmoBTS (as in OsmocomBB), there is a relatively long and queue / delay between the point where a frame is pulled out of the bottom end of LAPDm and actual transmission on the radio interface. However, LAPDm T200 starts ticking from the point the frame was pulled out, rather than from the point transmission started. In order to change this, I suggest that we either change LAPDm timers to work on frame numbers passed up from L1 via every L1SAP primitive (comparing RTS.ind for downlink vs. DATA.ind for uplink), or simply keeping a per-PHY/per-TRX measurement of that 'round trip time between the actual radio and the L2'. We can then compensate for this by adding it to T200. I briefly tried this here, where one given hardware indicated about 56ms round-trip-time (13 frames difference between RTS.ind and DATA.ind). However, it didn't help. Even compensating by 120ms was not sufficient. This needs to be revisited. 2) I think libosmogsm LAPDm implementation is actually buggy, specifically in situations where T200 expires. We don't see that often, as the 1s/2s is so long that in reality it rarely happens. Once the T200 value is reduced, the probability of running into T200 expiration increases, and so does the probability of seeing related problems. Our existing lapdm unit tests don't seem to cover timing related behavior, so that definitely is something tha appears to need improvement. Any help on those issues is appreciated. Meanwhile, I decided to revert back to the libosmogsm T200 defaults by the means of commit 3ca59512d2f4eb1f87699e8fada67f33674918b4 Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

1 0

libosmo-netif branch sysmocom/sctp
by Neels Hofmeyr 25 Jan '16

25 Jan '16

Hey Daniel, can we merge libosmo-netif branch sysmocom/sctp to master? ("stream.c: Handle SCTP in osmo_stream_srv_recv()") I'm rebasing it to kill a coverity warning (fixed by Holger). Thx, ~Neels -- - Neels Hofmeyr <nhofmeyr(a)sysmocom.de> http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschäftsführer / Managing Directors: Holger Freyther, Harald Welte

1 0

[PATCH] Fix bit reversion function
by suraev＠alumni.ntnu.no 21 Jan '16

21 Jan '16

From: Max <msuraev(a)sysmocom.de> Mark unsigned value as such. Fix unaligned access error revealed by asan on 32 bit builds. Sponsored-by: On-Waves ehf --- include/osmocom/core/bits.h | 2 +- src/bits.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/osmocom/core/bits.h b/include/osmocom/core/bits.h index 1587b05..d559185 100644 --- a/include/osmocom/core/bits.h +++ b/include/osmocom/core/bits.h @@ -75,7 +75,7 @@ uint32_t osmo_revbytebits_32(uint32_t x); uint32_t osmo_revbytebits_8(uint8_t x); /* \brief reverse the bits of each byte in a given buffer */ -void osmo_revbytebits_buf(uint8_t *buf, int len); +void osmo_revbytebits_buf(uint8_t *buf, unsigned int len); /*! \brief left circular shift * \param[in] in The 16 bit unsigned integer to be rotated diff --git a/src/bits.c b/src/bits.c index 01d7e73..e90bb71 100644 --- a/src/bits.c +++ b/src/bits.c @@ -206,10 +206,9 @@ uint32_t osmo_revbytebits_8(uint8_t x) * * This function reverses the bits in each byte of the buffer */ -void osmo_revbytebits_buf(uint8_t *buf, int len) +void osmo_revbytebits_buf(uint8_t *buf, unsigned int len) { - unsigned int i; - unsigned int unaligned_cnt; + unsigned int i, unaligned_cnt; int len_remain = len; unaligned_cnt = ((unsigned long)buf & 3); @@ -221,8 +220,7 @@ void osmo_revbytebits_buf(uint8_t *buf, int len) } for (i = unaligned_cnt; i + 3 < len; i += 4) { - uint32_t *cur = (uint32_t *) (buf + i); - *cur = osmo_revbytebits_32(*cur); + osmo_store32be(osmo_revbytebits_32(osmo_load32be(buf + i)), buf + i); len_remain -= 4; } -- 2.5.0

2 2

[PATCH] Fix sporadic out-of-bounds error
by suraev＠alumni.ntnu.no 21 Jan '16

21 Jan '16

From: Max <msuraev(a)sysmocom.de> This code dealing with bit shifting sometimes gets 1 byte beyond array boundary while calculating index. This is now explicitly checked and prevented. Ticket: OW#1198 Sponsored-by: On-Waves ehf --- src/gsm/gsm_utils.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index fad59bc..e8e452f 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -129,13 +129,11 @@ uint8_t gsm_get_octet_len(const uint8_t sept_len){ /* GSM 03.38 6.2.1 Character unpacking */ int gsm_7bit_decode_n_hdr(char *text, size_t n, const uint8_t *user_data, uint8_t septet_l, uint8_t ud_hdr_ind) { - int i = 0; - int shift = 0; - uint8_t c7, c8; - uint8_t next_is_ext = 0; + unsigned shift = 0; + uint8_t c7, c8, next_is_ext = 0, lu, ru; + const uint8_t maxlen = gsm_get_octet_len(septet_l); const char *text_buf_begin = text; const char *text_buf_end = text + n; - int nchars; OSMO_ASSERT (n > 0); @@ -148,12 +146,24 @@ int gsm_7bit_decode_n_hdr(char *text, size_t n, const uint8_t *user_data, uint8_ septet_l = septet_l - shift; } + unsigned i, l, r; for (i = 0; i < septet_l && text != text_buf_end - 1; i++) { - c7 = - ((user_data[((i + shift) * 7 + 7) >> 3] << - (7 - (((i + shift) * 7 + 7) & 7))) | - (user_data[((i + shift) * 7) >> 3] >> - (((i + shift) * 7) & 7))) & 0x7f; + + l = ((i + shift) * 7 + 7) >> 3; + r = ((i + shift) * 7) >> 3; + + /* the left side index is always >= right side index + sometimes it even gets beyond array boundary + check for that explicitly and force 0 instead + */ + if (l >= maxlen) + lu = 0; + else + lu = user_data[l] << (7 - (((i + shift) * 7 + 7) & 7)); + + ru = user_data[r] >> (((i + shift) * 7) & 7); + + c7 = (lu | ru) & 0x7f; if (next_is_ext) { /* this is an extension character */ @@ -169,11 +179,9 @@ int gsm_7bit_decode_n_hdr(char *text, size_t n, const uint8_t *user_data, uint8_ *(text++) = c8; } - nchars = text - text_buf_begin; - *text = '\0'; - return nchars; + return text - text_buf_begin; } int gsm_7bit_decode_n(char *text, size_t n, const uint8_t *user_data, uint8_t septet_l) -- 2.5.0

1 0

[PATCH] Add workaround to prevent out-of-bounds error.
by suraev＠alumni.ntnu.no 21 Jan '16

21 Jan '16

From: Max <msuraev(a)sysmocom.de> Refactor and simplify gsm 7 bit decoder. Remove useless tests for legacy functions. Make tests more human-readable. Replace assert inside the library with returning error code. Ticket: OW#1198 Sponsored-by: On-Waves ehf --- src/gsm/gsm_utils.c | 35 +++++++++++++++++------------- tests/sms/sms_test.c | 59 ++++++++++++++++++++++++--------------------------- tests/sms/sms_test.ok | 28 +++++++++--------------- 3 files changed, 58 insertions(+), 64 deletions(-) diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index fad59bc..bcc0271 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -126,18 +126,17 @@ uint8_t gsm_get_octet_len(const uint8_t sept_len){ return octet_len; } -/* GSM 03.38 6.2.1 Character unpacking */ +/* GSM 03.38 6.2.1 Character unpacking + * returns -1 on size errors, number of characters otherwise + */ int gsm_7bit_decode_n_hdr(char *text, size_t n, const uint8_t *user_data, uint8_t septet_l, uint8_t ud_hdr_ind) { - int i = 0; - int shift = 0; - uint8_t c7, c8; - uint8_t next_is_ext = 0; + unsigned shift = 0; + uint8_t c7, c8, next_is_ext = 0, lu, ru, maxlen = gsm_get_octet_len(septet_l); const char *text_buf_begin = text; const char *text_buf_end = text + n; - int nchars; - OSMO_ASSERT (n > 0); + if (n < 1) return -1; /* skip the user data header */ if (ud_hdr_ind) { @@ -148,12 +147,20 @@ int gsm_7bit_decode_n_hdr(char *text, size_t n, const uint8_t *user_data, uint8_ septet_l = septet_l - shift; } + unsigned i, l, r; for (i = 0; i < septet_l && text != text_buf_end - 1; i++) { - c7 = - ((user_data[((i + shift) * 7 + 7) >> 3] << - (7 - (((i + shift) * 7 + 7) & 7))) | - (user_data[((i + shift) * 7) >> 3] >> - (((i + shift) * 7) & 7))) & 0x7f; + + l = ((i + shift) * 7 + 7) >> 3; + r = ((i + shift) * 7) >> 3; + + if (l >= maxlen) + lu = 0; // workaround to prevent getting out of bounds + else + lu = user_data[l] << (7 - (((i + shift) * 7 + 7) & 7)); + + ru = user_data[r] >> (((i + shift) * 7) & 7); + + c7 = (lu | ru) & 0x7f; if (next_is_ext) { /* this is an extension character */ @@ -169,11 +176,9 @@ int gsm_7bit_decode_n_hdr(char *text, size_t n, const uint8_t *user_data, uint8_ *(text++) = c8; } - nchars = text - text_buf_begin; - *text = '\0'; - return nchars; + return text - text_buf_begin; } int gsm_7bit_decode_n(char *text, size_t n, const uint8_t *user_data, uint8_t septet_l) diff --git a/tests/sms/sms_test.c b/tests/sms/sms_test.c index cdd4158..1927925 100644 --- a/tests/sms/sms_test.c +++ b/tests/sms/sms_test.c @@ -44,6 +44,7 @@ struct test_case { const uint16_t expected_octet_length; const uint16_t expected_septet_length; const uint8_t ud_hdr_ind; + const char * descr; }; static const char simple_text[] = "test text"; @@ -131,6 +132,7 @@ static const struct test_case test_multiple_encode[] = .expected_octet_length = sizeof(concatenated_part1_enc), .expected_septet_length = concatenated_part1_septet_length, .ud_hdr_ind = 1, + .descr = "concatenated text p1" }, { .input = (const uint8_t *) concatenated_text, @@ -138,6 +140,7 @@ static const struct test_case test_multiple_encode[] = .expected_octet_length = sizeof(concatenated_part2_enc), .expected_septet_length = concatenated_part2_septet_length, .ud_hdr_ind = 1, + .descr = "concatenated text p2" }, }; @@ -149,6 +152,7 @@ static const struct test_case test_encode[] = .expected_octet_length = sizeof(simple_enc), .expected_septet_length = simple_septet_length, .ud_hdr_ind = 0, + .descr = "simple text" }, { .input = (const uint8_t *) escape_text, @@ -156,6 +160,7 @@ static const struct test_case test_encode[] = .expected_octet_length = sizeof(escape_enc), .expected_septet_length = escape_septet_length, .ud_hdr_ind = 0, + .descr = "escape text" }, { .input = (const uint8_t *) enhanced_text, @@ -163,6 +168,7 @@ static const struct test_case test_encode[] = .expected_octet_length = sizeof(enhanced_enc), .expected_septet_length = enhanced_septet_length, .ud_hdr_ind = 0, + .descr = "enhanced text" }, { .input = (const uint8_t *) enhancedV2_text, @@ -170,6 +176,7 @@ static const struct test_case test_encode[] = .expected_octet_length = sizeof(enhancedV2_enc), .expected_septet_length = enhancedV2_septet_length, .ud_hdr_ind = 0, + .descr = "enhanced text v2" }, }; @@ -181,6 +188,7 @@ static const struct test_case test_decode[] = .expected = (const uint8_t *) simple_text, .expected_septet_length = simple_septet_length, .ud_hdr_ind = 0, + .descr = "simple text" }, { .input = escape_enc, @@ -188,6 +196,7 @@ static const struct test_case test_decode[] = .expected = (const uint8_t *) escape_text, .expected_septet_length = escape_septet_length, .ud_hdr_ind = 0, + .descr = "escape text" }, { .input = enhanced_enc, @@ -195,6 +204,7 @@ static const struct test_case test_decode[] = .expected = (const uint8_t *) enhanced_text, .expected_septet_length = enhanced_septet_length, .ud_hdr_ind = 0, + .descr = "enhanced text" }, { .input = enhancedV2_enc, @@ -202,6 +212,7 @@ static const struct test_case test_decode[] = .expected = (const uint8_t *) enhancedV2_text, .expected_septet_length = enhancedV2_septet_length, .ud_hdr_ind = 0, + .descr = "enhanced text v2" }, { .input = concatenated_part1_enc, @@ -209,6 +220,7 @@ static const struct test_case test_decode[] = .expected = (const uint8_t *) splitted_text_part1, .expected_septet_length = concatenated_part1_septet_length_with_header, .ud_hdr_ind = 1, + .descr = "concatenated text p1" }, { .input = concatenated_part2_enc, @@ -216,7 +228,8 @@ static const struct test_case test_decode[] = .expected = (const uint8_t *) splitted_text_part2, .expected_septet_length = concatenated_part2_septet_length_with_header, .ud_hdr_ind = 1, - }, + .descr = "concatenated text p2" + }, }; static void test_octet_return() @@ -288,29 +301,17 @@ int main(int argc, char** argv) /* test 7-bit encoding */ for (i = 0; i < ARRAY_SIZE(test_encode); ++i) { - /* Test legacy function (return value only) */ - septet_length = gsm_7bit_encode(coded, - (const char *) test_encode[i].input); - printf("Legacy encode case %d: " - "septet length %d (expected %d)\n" - , i - , septet_length, test_encode[i].expected_septet_length - ); - OSMO_ASSERT (septet_length == test_encode[i].expected_septet_length); - - /* Test new function */ memset(coded, 0x42, sizeof(coded)); septet_length = gsm_7bit_encode_n(coded, sizeof(coded), (const char *) test_encode[i].input, &octets_written); computed_octet_length = gsm_get_octet_len(septet_length); - printf("Encode case %d: " - "Octet length %d (expected %d, computed %d), " - "septet length %d (expected %d)\n" - , i - , octets_written, test_encode[i].expected_octet_length, computed_octet_length - , septet_length, test_encode[i].expected_septet_length - ); + printf("Encode case %d (%s): " + "Octet length %d (expected %d, computed %d, test %s), " + "septet length %d (expected %d, test %s)\n", + i, test_encode[i].descr, + octets_written, test_encode[i].expected_octet_length, computed_octet_length, (test_encode[i].expected_octet_length == computed_octet_length) ? "OK" : "FAIL", + septet_length, test_encode[i].expected_septet_length, (septet_length == test_encode[i].expected_septet_length) ? "OK" : "FAIL"); OSMO_ASSERT (octets_written == test_encode[i].expected_octet_length); OSMO_ASSERT (octets_written == computed_octet_length); @@ -377,22 +378,18 @@ int main(int argc, char** argv) /* test 7-bit decoding */ for (i = 0; i < ARRAY_SIZE(test_decode); ++i) { - /* Test legacy function (return value only) */ - if (!test_decode[i].ud_hdr_ind) { - nchars = gsm_7bit_decode(result, test_decode[i].input, - test_decode[i].expected_septet_length); - printf("Legacy decode case %d: " - "return value %d (expected %d)\n", - i, nchars, test_decode[i].expected_septet_length); - } - - /* Test new function */ memset(result, 0x42, sizeof(result)); +// printf("Attempting to 7 bit decode %d to %d with exp %d and ind %d\n", test_decode[i].input_length, sizeof(result), test_decode[i].expected_septet_length, test_decode[i].ud_hdr_ind); nchars = gsm_7bit_decode_n_hdr(result, sizeof(result), test_decode[i].input, test_decode[i].expected_septet_length, test_decode[i].ud_hdr_ind); - printf("Decode case %d: return value %d (expected %d)\n", i, nchars, strlen(result)); + printf("Decode case %d (%s): return value %d, expected %d, test %s\n", i, test_decode[i].descr, nchars, strlen(result), (strlen(result) == nchars) ? "OK" : "FAIL"); + + int res = strcmp(result, (const char *) test_decode[i].expected); + if(0 != res) { + printf("%d:\n%s\n%s\n", res, osmo_hexdump(result, strlen(result)), + osmo_hexdump(test_decode[i].expected, strlen(result))); + } - OSMO_ASSERT(strcmp(result, (const char *) test_decode[i].expected) == 0); OSMO_ASSERT(nchars == strlen(result)); /* check buffer limiting */ diff --git a/tests/sms/sms_test.ok b/tests/sms/sms_test.ok index fa536ea..144e602 100644 --- a/tests/sms/sms_test.ok +++ b/tests/sms/sms_test.ok @@ -1,22 +1,14 @@ SMS testing -Legacy encode case 0: septet length 9 (expected 9) -Encode case 0: Octet length 8 (expected 8, computed 8), septet length 9 (expected 9) -Legacy encode case 1: septet length 41 (expected 41) -Encode case 1: Octet length 36 (expected 36, computed 36), septet length 41 (expected 41) -Legacy encode case 2: septet length 39 (expected 39) -Encode case 2: Octet length 35 (expected 35, computed 35), septet length 39 (expected 39) -Legacy encode case 3: septet length 40 (expected 40) -Encode case 3: Octet length 35 (expected 35, computed 35), septet length 40 (expected 40) -Legacy decode case 0: return value 9 (expected 9) -Decode case 0: return value 9 (expected 9) -Legacy decode case 1: return value 41 (expected 41) -Decode case 1: return value 40 (expected 40) -Legacy decode case 2: return value 39 (expected 39) -Decode case 2: return value 31 (expected 31) -Legacy decode case 3: return value 40 (expected 40) -Decode case 3: return value 32 (expected 32) -Decode case 4: return value 153 (expected 153) -Decode case 5: return value 40 (expected 40) +Encode case 0 (simple text): Octet length 8 (expected 8, computed 8, test OK), septet length 9 (expected 9, test OK) +Encode case 1 (escape text): Octet length 36 (expected 36, computed 36, test OK), septet length 41 (expected 41, test OK) +Encode case 2 (enhanced text): Octet length 35 (expected 35, computed 35, test OK), septet length 39 (expected 39, test OK) +Encode case 3 (enhanced text v2): Octet length 35 (expected 35, computed 35, test OK), septet length 40 (expected 40, test OK) +Decode case 0 (simple text): return value 9, expected 9, test OK +Decode case 1 (escape text): return value 40, expected 40, test OK +Decode case 2 (enhanced text): return value 31, expected 31, test OK +Decode case 3 (enhanced text v2): return value 32, expected 32, test OK +Decode case 4 (concatenated text p1): return value 153, expected 153, test OK +Decode case 5 (concatenated text p2): return value 40, expected 40, test OK Encoding some tests and printing number of septets/octets SEPTETS: 8 OCTETS: 7 Done -- 2.5.0

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC January 2016