diff options
author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-05-07 12:12:48 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-05-07 12:58:59 +0200 |
commit | c0d17f22663ba78f1620043316ac7d374ff45b86 (patch) | |
tree | 3d374c0934694dd5cac6afc5991ffa5968869157 /openbsc/src/libmsc | |
parent | dfb342c19af19b60350849f40d1be5e8f7a530a5 (diff) |
src: use namespace prefix osmo_* for misc utils
Summary of changes:
s/bcd2char/osmo_bcd2char/g
s/char2bcd/osmo_char2bcd/g
s/hexparse/osmo_hexparse/g
s/hexdump/osmo_hexdump/g
s/hexdump_nospc/osmo_hexdump_nospc/g
s/ubit_dump/osmo_ubit_dump/g
s/static_assert/osmo_static_assert/g
Diffstat (limited to 'openbsc/src/libmsc')
-rw-r--r-- | openbsc/src/libmsc/auth.c | 4 | ||||
-rw-r--r-- | openbsc/src/libmsc/db.c | 6 | ||||
-rw-r--r-- | openbsc/src/libmsc/gsm_04_08.c | 8 | ||||
-rw-r--r-- | openbsc/src/libmsc/gsm_04_11.c | 6 | ||||
-rw-r--r-- | openbsc/src/libmsc/vty_interface_layer3.c | 10 |
5 files changed, 17 insertions, 17 deletions
diff --git a/openbsc/src/libmsc/auth.c b/openbsc/src/libmsc/auth.c index 1683a5f9f..10d8edf67 100644 --- a/openbsc/src/libmsc/auth.c +++ b/openbsc/src/libmsc/auth.c @@ -38,7 +38,7 @@ _use_xor(struct gsm_auth_info *ainfo, struct gsm_auth_tuple *atuple) if ((l > A38_XOR_MAX_KEY_LEN) || (l < A38_XOR_MIN_KEY_LEN)) { LOGP(DMM, LOGL_ERROR, "Invalid XOR key (len=%d) %s\n", ainfo->a3a8_ki_len, - hexdump(ainfo->a3a8_ki, ainfo->a3a8_ki_len)); + osmo_hexdump(ainfo->a3a8_ki, ainfo->a3a8_ki_len)); return -1; } @@ -56,7 +56,7 @@ _use_comp128_v1(struct gsm_auth_info *ainfo, struct gsm_auth_tuple *atuple) if (ainfo->a3a8_ki_len != A38_COMP128_KEY_LEN) { LOGP(DMM, LOGL_ERROR, "Invalid COMP128v1 key (len=%d) %s\n", ainfo->a3a8_ki_len, - hexdump(ainfo->a3a8_ki, ainfo->a3a8_ki_len)); + osmo_hexdump(ainfo->a3a8_ki, ainfo->a3a8_ki_len)); return -1; } diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c index d25bc21be..1ddd3fdf4 100644 --- a/openbsc/src/libmsc/db.c +++ b/openbsc/src/libmsc/db.c @@ -297,7 +297,7 @@ struct gsm_subscriber *db_create_subscriber(struct gsm_network *net, char *imsi) return subscr; } -static_assert(sizeof(unsigned char) == sizeof(struct gsm48_classmark1), classmark1_size); +osmo_static_assert(sizeof(unsigned char) == sizeof(struct gsm48_classmark1), classmark1_size); static int get_equipment_by_subscr(struct gsm_subscriber *subscr) { @@ -744,10 +744,10 @@ int db_sync_equipment(struct gsm_equipment *equip) equip->imei, classmark1); if (equip->classmark2_len) DEBUGPC(DDB, ", classmark2=%s", - hexdump(equip->classmark2, equip->classmark2_len)); + osmo_hexdump(equip->classmark2, equip->classmark2_len)); if (equip->classmark3_len) DEBUGPC(DDB, ", classmark3=%s", - hexdump(equip->classmark3, equip->classmark3_len)); + osmo_hexdump(equip->classmark3, equip->classmark3_len)); DEBUGPC(DDB, "\n"); dbi_conn_quote_binary_copy(conn, equip->classmark2, diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 6486b19f6..a6ed3e83e 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -720,7 +720,7 @@ int gsm48_tx_mm_auth_req(struct gsm_subscriber_connection *conn, uint8_t *rand, 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)); - DEBUGP(DMM, "-> AUTH REQ (rand = %s)\n", hexdump(rand, 16)); + DEBUGP(DMM, "-> AUTH REQ (rand = %s)\n", osmo_hexdump(rand, 16)); msg->lchan = conn->lchan; gh->proto_discr = GSM48_PDISC_MM; @@ -942,7 +942,7 @@ static int gsm48_rx_mm_auth_resp(struct gsm_subscriber_connection *conn, struct struct gsm_network *net = conn->bts->network; DEBUGP(DMM, "MM AUTHENTICATION RESPONSE (sres = %s): ", - hexdump(ar->sres, 4)); + osmo_hexdump(ar->sres, 4)); /* Safety check */ if (!conn->sec_operation) { @@ -956,7 +956,7 @@ static int gsm48_rx_mm_auth_resp(struct gsm_subscriber_connection *conn, struct gsm_cbfn *cb = conn->sec_operation->cb; DEBUGPC(DMM, "Invalid (expected %s)\n", - hexdump(conn->sec_operation->atuple.sres, 4)); + osmo_hexdump(conn->sec_operation->atuple.sres, 4)); if (cb) cb(GSM_HOOK_RR_SECURITY, GSM_SECURITY_AUTH_FAILED, @@ -1145,7 +1145,7 @@ static int gsm48_rx_rr_app_info(struct gsm_subscriber_connection *conn, struct m apdu_data = gh->data+2; DEBUGP(DNM, "RX APPLICATION INFO id/flags=0x%02x apdu_len=%u apdu=%s", - apdu_id_flags, apdu_len, hexdump(apdu_data, apdu_len)); + apdu_id_flags, apdu_len, osmo_hexdump(apdu_data, apdu_len)); return db_apdu_blob_store(conn->subscr, apdu_id_flags, apdu_len, apdu_data); } diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c index 5069be7bf..ba72c37bd 100644 --- a/openbsc/src/libmsc/gsm_04_11.c +++ b/openbsc/src/libmsc/gsm_04_11.c @@ -175,7 +175,7 @@ struct msgb *gsm411_msgb_alloc(void) static int gsm411_sendmsg(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t link_id) { - DEBUGP(DSMS, "GSM4.11 TX %s\n", hexdump(msg->data, msg->len)); + DEBUGP(DSMS, "GSM4.11 TX %s\n", osmo_hexdump(msg->data, msg->len)); msg->l3h = msg->data; return gsm0808_submit_dtap(conn, msg, link_id, 1); } @@ -645,7 +645,7 @@ static int gsm340_rx_tpdu(struct gsm_subscriber_connection *conn, struct msgb *m gsms->protocol_id, gsms->data_coding_scheme, gsms->dest_addr, gsms->user_data_len, sms_alphabet == DCS_7BIT_DEFAULT ? gsms->text : - hexdump(gsms->user_data, gsms->user_data_len)); + osmo_hexdump(gsms->user_data, gsms->user_data_len)); gsms->validity_minutes = gsm340_validity_period(sms_vpf, sms_vp); @@ -728,7 +728,7 @@ static int gsm411_rx_rp_ud(struct msgb *msg, struct gsm_trans *trans, } msg->l4h = tpdu; - DEBUGP(DSMS, "DST(%u,%s)\n", dst_len, hexdump(dst, dst_len)); + DEBUGP(DSMS, "DST(%u,%s)\n", dst_len, osmo_hexdump(dst, dst_len)); rc = gsm340_rx_tpdu(trans->conn, msg); if (rc == 0) diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c index f75155558..f31f05b1c 100644 --- a/openbsc/src/libmsc/vty_interface_layer3.c +++ b/openbsc/src/libmsc/vty_interface_layer3.c @@ -74,7 +74,7 @@ static void subscr_dump_full_vty(struct vty *vty, struct gsm_subscriber *subscr, vty_out(vty, " A3A8 algorithm id: %d%s", ainfo.auth_algo, VTY_NEWLINE); vty_out(vty, " A3A8 Ki: %s%s", - hexdump(ainfo.a3a8_ki, ainfo.a3a8_ki_len), + osmo_hexdump(ainfo.a3a8_ki, ainfo.a3a8_ki_len), VTY_NEWLINE); } @@ -85,13 +85,13 @@ static void subscr_dump_full_vty(struct vty *vty, struct gsm_subscriber *subscr, vty_out(vty, " seq # : %d%s", atuple.key_seq, VTY_NEWLINE); vty_out(vty, " RAND : %s%s", - hexdump(atuple.rand, sizeof(atuple.rand)), + osmo_hexdump(atuple.rand, sizeof(atuple.rand)), VTY_NEWLINE); vty_out(vty, " SRES : %s%s", - hexdump(atuple.sres, sizeof(atuple.sres)), + osmo_hexdump(atuple.sres, sizeof(atuple.sres)), VTY_NEWLINE); vty_out(vty, " Kc : %s%s", - hexdump(atuple.kc, sizeof(atuple.kc)), + osmo_hexdump(atuple.kc, sizeof(atuple.kc)), VTY_NEWLINE); } if (pending) @@ -581,7 +581,7 @@ DEFUN(ena_subscr_a3a8, } if (ki_str) { - rc = hexparse(ki_str, ainfo.a3a8_ki, sizeof(ainfo.a3a8_ki)); + rc = osmo_hexparse(ki_str, ainfo.a3a8_ki, sizeof(ainfo.a3a8_ki)); if ((rc > maxlen) || (rc < minlen)) { subscr_put(subscr); vty_out(vty, "%% Wrong Ki `%s'%s", |