sim-card
/
osmo-remsim
mirror of https://gerrit.osmocom.org/osmo-remsim
10
0
Fork 0
Code Issues Releases Wiki Activity

bankd: Print error messages in more error cases during IPA read 

Change-Id: I5b9720688ebda8ad37109c0cd32e8804678f46ac
This commit is contained in:
Harald Welte 2018-09-24 14:54:58 +02:00
parent f1dd16291e
commit e1176cf510
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bankd_main.c
View File

@ -383,26 +383,36 @@ static int worker_transceive_loop(struct bankd_worker *worker)
data_len = rc;
hh = (struct ipaccess_head *) buf;
if (hh->proto != IPAC_PROTO_OSMO)
if (hh->proto != IPAC_PROTO_OSMO) {
LOGW(worker, "Received unsupported IPA protocol != OSMO: 0x%02x\n", hh->proto);
return -4;
}
hh_ext = (struct ipaccess_head_ext *) buf + sizeof(*hh);
if (data_len < sizeof(*hh_ext))
if (data_len < sizeof(*hh_ext)) {
LOGW(worker, "Received short message\n");
return -5;
}
data_len -= sizeof(*hh_ext);
if (hh_ext->proto != IPAC_PROTO_EXT_RSPRO)
if (hh_ext->proto != IPAC_PROTO_EXT_RSPRO) {
LOGW(worker, "Received unsupported IPA EXT protocol != RSPRO: 0x%02x\n", hh_ext->proto);
return -6;
}
/* 2) ASN1 BER decode of the message */
rval = ber_decode(NULL, &asn_DEF_RsproPDU, (void **) &pdu, hh_ext->data, data_len);
if (rval.code != RC_OK)
if (rval.code != RC_OK) {
LOGW(worker, "Error during BER decode of RSPRO\n");
return -7;
}
/* 3) handling of the message, possibly resulting in PCSC commands */
rc = worker_handle_rspro(worker, pdu);
ASN_STRUCT_FREE(asn_DEF_RsproPDU, pdu);
if (rc < 0)
if (rc < 0) {
LOGW(worker, "Error handling RSPRO\n");
return rc;
}
/* everything OK if we reach here */
return 0;