cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity

Set correct GSMTAP channel type for PDTCH messages returning error 

For instance, that may happen because the len of the message is not
filling the expect size (because padding is missing for example). Still,
in this case we know the channel type, so we set it so that wireshark
tries to decode the message as a data one.

Change-Id: Ifea94095d669b528874e64ca823a776cd6e22b4b
This commit is contained in:
Pau Espin 2020-06-30 17:57:42 +02:00
parent 259532fcf9
commit 72e395656d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pcu_l1_if.cpp
View File

@ -315,6 +315,7 @@ static int pcu_rx_data_ind(struct gsm_pcu_if_data *data_ind)
int rc; int rc;
int current_fn = get_current_fn(); int current_fn = get_current_fn();
pcu_l1_meas meas; pcu_l1_meas meas;
uint8_t gsmtap_chantype;
LOGP(DL1IF, LOGL_DEBUG, "Data indication received: sapi=%d arfcn=%d " LOGP(DL1IF, LOGL_DEBUG, "Data indication received: sapi=%d arfcn=%d "
"fn=%d cur_fn=%d block=%d data=%s\n", data_ind->sapi, "fn=%d cur_fn=%d block=%d data=%s\n", data_ind->sapi,
@ -335,19 +336,22 @@ static int pcu_rx_data_ind(struct gsm_pcu_if_data *data_ind)
rc = pcu_rx_data_ind_pdtch(data_ind->trx_nr, data_ind->ts_nr, rc = pcu_rx_data_ind_pdtch(data_ind->trx_nr, data_ind->ts_nr,
data_ind->data, data_ind->len, data_ind->fn, data_ind->data, data_ind->len, data_ind->fn,
&meas); &meas);
gsmtap_chantype = GSMTAP_CHANNEL_PDTCH;
break; break;
case PCU_IF_SAPI_BCCH: case PCU_IF_SAPI_BCCH:
rc = pcu_rx_data_ind_bcch(data_ind->data, data_ind->len); rc = pcu_rx_data_ind_bcch(data_ind->data, data_ind->len);
gsmtap_chantype = GSMTAP_CHANNEL_BCCH;
break; break;
default: default:
LOGP(DL1IF, LOGL_ERROR, "Received PCU data indication with " LOGP(DL1IF, LOGL_ERROR, "Received PCU data indication with "
"unsupported sapi %d\n", data_ind->sapi); "unsupported sapi %d\n", data_ind->sapi);
rc = -EINVAL; rc = -EINVAL;
gsmtap_chantype = GSMTAP_CHANNEL_UNKNOWN;
} }
if (rc < 0 && (bts->gsmtap_categ_mask & (1 <<PCU_GSMTAP_C_UL_UNKNOWN))) { if (rc < 0 && (bts->gsmtap_categ_mask & (1 <<PCU_GSMTAP_C_UL_UNKNOWN))) {
gsmtap_send(bts->gsmtap, data_ind->arfcn | GSMTAP_ARFCN_F_UPLINK, data_ind->ts_nr, gsmtap_send(bts->gsmtap, data_ind->arfcn | GSMTAP_ARFCN_F_UPLINK, data_ind->ts_nr,
GSMTAP_CHANNEL_UNKNOWN, 0, data_ind->fn, meas.rssi, meas.link_qual, data_ind->data, data_ind->len); gsmtap_chantype, 0, data_ind->fn, meas.rssi, meas.link_qual, data_ind->data, data_ind->len);
} }
return rc; return rc;