phone-side
/
osmocom-bb
mirror of https://gerrit.osmocom.org/osmocom-bb
9
0
Fork 0
Code Issues Releases Wiki Activity

VIRT-PHY: Fixed FACCH processing on TCH. 

As TCH is not supported in GSMTAP yet, all incoming frames on the
virt-phy are forwarded as FACCH to the l23 for now.

Cleanup code in virt_prim_data and virt_prim_traffic.

Change-Id: I6b41f21b6984e62ad98edfe4398bd678d5b2dad5
This commit is contained in:
Sebastian Stumpf 2017-03-04 15:42:11 +01:00 committed by Harald Welte
parent a090f635b0
commit e7600a0d57
6 changed files with 160 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/host/virt_phy/include/virtphy/l1ctl_sap.h
View File

@ -55,12 +55,21 @@ void l1ctl_rx_sim_req(struct msgb *msg);
/* transmit routines */
void l1ctl_tx_reset(uint8_t msg_type, uint8_t reset_type);
void l1ctl_tx_rach_conf(uint32_t fn, uint16_t arfcn);
void l1ctl_tx_data_conf(uint32_t fn, uint16_t snr, uint16_t arfcn);
void l1ctl_tx_data_ind(struct msgb *msg, uint16_t arfcn, uint8_t link_id,
uint8_t chan_nr, uint32_t fn, uint8_t snr,
uint8_t signal_dbm, uint8_t num_biterr,
uint8_t fire_crc);
void l1ctl_tx_traffic_conf(uint32_t fn, uint16_t snr, uint16_t arfcn);
void l1ctl_tx_traffic_ind(struct msgb *msg, uint16_t arfcn, uint8_t link_id,
uint8_t chan_nr, uint32_t fn, uint8_t snr,
uint8_t signal_dbm, uint8_t num_biterr,
uint8_t fire_crc);
void l1ctl_tx_pm_conf(struct l1ctl_pm_req *pm_req);
void l1ctl_tx_fbsb_conf(uint8_t res, uint16_t arfcn);
void l1ctl_tx_ccch_mode_conf(uint8_t ccch_mode);
void l1ctl_tx_tch_mode_conf(uint8_t tch_mode, uint8_t audio_mode);
void l1ctl_tx_msg(uint8_t msg_type);
/* scheduler functions */
uint32_t sched_fn_ul(struct gsm_time cur_time, uint8_t chan_nr,
uint8_t link_id);
uint8_t link_id);

111
src/host/virt_phy/src/gsmtapl1_if.c
View File

@ -51,8 +51,8 @@ static const struct value_string gsmtap_channels[22] = {
{GSMTAP_CHANNEL_SDCCH, "SDCCH"},
{GSMTAP_CHANNEL_SDCCH4, "SDCCH/4"},
{GSMTAP_CHANNEL_SDCCH8, "SDCCH/8"},
{GSMTAP_CHANNEL_TCH_F, "FACCH/F"},
{GSMTAP_CHANNEL_TCH_H, "FACCH/H"},
{GSMTAP_CHANNEL_TCH_F, "TCH/F/FACCH/F"},
{GSMTAP_CHANNEL_TCH_H, "TCH/H/FACCH/H"},
{GSMTAP_CHANNEL_PACCH, "PACCH"},
{GSMTAP_CHANNEL_CBCH52, "CBCH"},
{GSMTAP_CHANNEL_PDCH, "PDCH"},
@ -90,7 +90,8 @@ void gsmtapl1_init(struct l1_model_ms *model)
/**
* Replace l11 header of given msgb by a gsmtap header and send it over the virt um.
*/
void gsmtapl1_tx_to_virt_um_inst(uint32_t fn, struct virt_um_inst *vui, struct msgb *msg)
void gsmtapl1_tx_to_virt_um_inst(uint32_t fn, struct virt_um_inst *vui,
struct msgb *msg)
{
struct l1ctl_hdr *l1h = (struct l1ctl_hdr *)msg->data;
struct l1ctl_info_ul *ul = (struct l1ctl_info_ul *)l1h->data;
@ -112,21 +113,22 @@ void gsmtapl1_tx_to_virt_um_inst(uint32_t fn, struct virt_um_inst *vui, struct m
// arfcn needs to be flagged to be able to distinguish between uplink and downlink
outmsg = gsmtap_makemsg(arfcn | GSMTAP_ARFCN_F_UPLINK, timeslot,
gsmtap_chan, subslot, fn, signal_dbm, snr, data,
data_len);
gsmtap_chan, subslot, fn, signal_dbm, snr, data,
data_len);
if (outmsg) {
outmsg->l1h = msgb_data(outmsg);
gh = msgb_l1(outmsg);
if (virt_um_write_msg(l1_model_ms->vui, outmsg) == -1) {
LOGP(DVIRPHY, LOGL_ERROR,
"Gsmtap msg could not send to virt um - (arfcn=%u, type=%u, subtype=%u, timeslot=%u, subslot=%u)\n",
gh->arfcn, gh->type, gh->sub_type,
gh->timeslot, gh->sub_slot);
LOGP(DVIRPHY,
LOGL_ERROR,
"Gsmtap msg could not send to virt um - (arfcn=%u, type=%u, subtype=%u, timeslot=%u, subslot=%u)\n",
gh->arfcn, gh->type, gh->sub_type, gh->timeslot,
gh->sub_slot);
} else {
DEBUGP(DVIRPHY,
"Sending gsmtap msg to virt um - (arfcn=%u, type=%u, subtype=%u, timeslot=%u, subslot=%u)\n",
gh->arfcn, gh->type, gh->sub_type,
gh->timeslot, gh->sub_slot);
"Sending gsmtap msg to virt um - (arfcn=%u, type=%u, subtype=%u, timeslot=%u, subslot=%u)\n",
gh->arfcn, gh->type, gh->sub_type, gh->timeslot,
gh->sub_slot);
}
} else {
LOGP(DVIRPHY, LOGL_ERROR, "Gsmtap msg could not be created!\n");
@ -172,9 +174,6 @@ void gsmtapl1_rx_from_virt_um_inst_cb(struct virt_um_inst *vui,
struct gsmtap_hdr *gh = msgb_l1(msg);
struct msgb *l1ctl_msg = NULL;
struct l1ctl_info_dl *l1dl;
struct l1ctl_traffic_ind * l1ti;
struct l1ctl_data_ind * l1di;
uint32_t fn = ntohl(gh->frame_number); // frame number of the rcv msg
uint16_t arfcn = ntohs(gh->arfcn); // arfcn of the received msg
uint8_t gsmtap_chantype = gh->sub_type; // gsmtap channel type
@ -196,22 +195,25 @@ void gsmtapl1_rx_from_virt_um_inst_cb(struct virt_um_inst *vui,
virt_l1_sched_execute(fn);
DEBUGP(DVIRPHY,
"Receiving gsmtap msg from virt um - (arfcn=%u, framenumber=%u, type=%s, subtype=%s, timeslot=%u, subslot=%u, rsl_chan_type=0x%2x, link_id=0x%2x, chan_nr=0x%2x)\n",
arfcn, fn, get_value_string(gsmtap_types, gh->type),
get_value_string(gsmtap_channels, gsmtap_chantype),
timeslot, subslot, rsl_chantype, link_id, chan_nr);
"Receiving gsmtap msg from virt um - (arfcn=%u, framenumber=%u, type=%s, subtype=%s, timeslot=%u, subslot=%u, rsl_chan_type=0x%2x, link_id=0x%2x, chan_nr=0x%2x)\n",
arfcn, fn, get_value_string(gsmtap_types, gh->type),
get_value_string(gsmtap_channels, gsmtap_chantype), timeslot,
subslot, rsl_chantype, link_id, chan_nr);
// generally ignore all messages coming from another arfcn than the camped one
if (l1_model_ms->state->serving_cell.arfcn != (arfcn & GSMTAP_ARFCN_MASK)) {
LOGP(DVIRPHY, LOGL_NOTICE,
"Ignoring gsmtap msg from virt um - msg arfcn=%d not equal synced arfcn=%d!\n", arfcn & GSMTAP_ARFCN_MASK, l1_model_ms->state->serving_cell.arfcn);
LOGP(DVIRPHY,
LOGL_NOTICE,
"Ignoring gsmtap msg from virt um - msg arfcn=%d not equal synced arfcn=%d!\n",
arfcn & GSMTAP_ARFCN_MASK,
l1_model_ms->state->serving_cell.arfcn);
goto nomessage;
}
// generally ignore all uplink messages received
if (arfcn & GSMTAP_ARFCN_F_UPLINK) {
LOGP(DVIRPHY, LOGL_NOTICE,
"Ignoring gsmtap msg from virt um - uplink flag set!\n");
"Ignoring gsmtap msg from virt um - uplink flag set!\n");
goto nomessage;
}
@ -219,54 +221,25 @@ void gsmtapl1_rx_from_virt_um_inst_cb(struct virt_um_inst *vui,
switch (gsmtap_chantype & ~GSMTAP_CHANNEL_ACCH & 0xff) {
case GSMTAP_CHANNEL_TCH_H:
case GSMTAP_CHANNEL_TCH_F:
l1ctl_msg = l1ctl_msgb_alloc(L1CTL_TRAFFIC_IND);
l1dl = (struct l1ctl_info_dl *)msgb_put(l1ctl_msg,
sizeof(struct l1ctl_info_dl));
l1ti = (struct l1ctl_traffic_ind *)msgb_put(l1ctl_msg,
sizeof(struct l1ctl_traffic_ind));
l1dl->band_arfcn = htons(arfcn);
l1dl->link_id = link_id;
l1dl->chan_nr = chan_nr;
l1dl->frame_nr = htonl(fn);
l1dl->snr = snr;
l1dl->rx_level = signal_dbm;
l1dl->num_biterr = 0; // no biterrors
l1dl->fire_crc = 0;
// TODO: traffic decoding and decryption
memcpy(l1ti->data, msgb_data(msg), msgb_length(msg));
break;
#if(0)
// TODO: handle msgs on TCH that are neither FACCH nor TCH/ACCH
if(!facch && ! tch_acch) {
l1ctl_tx_traffic_ind(msg, arfcn, link_id, chan_nr, fn,
snr, signal_dbm, 0, 0);
}
#endif
case GSMTAP_CHANNEL_SDCCH4:
case GSMTAP_CHANNEL_SDCCH8:
// TODO: we might need to implement own channel handling for standalone dedicated channels
case GSMTAP_CHANNEL_AGCH:
case GSMTAP_CHANNEL_PCH:
case GSMTAP_CHANNEL_BCCH:
l1ctl_msg = l1ctl_msgb_alloc(L1CTL_DATA_IND);
l1dl = (struct l1ctl_info_dl *)msgb_put(l1ctl_msg,
sizeof(struct l1ctl_info_dl));
l1di = (struct l1ctl_data_ind *)msgb_put(l1ctl_msg,
sizeof(struct l1ctl_data_ind));
l1dl->band_arfcn = htons(arfcn);
l1dl->link_id = link_id;
l1dl->chan_nr = chan_nr;
l1dl->frame_nr = htonl(fn);
l1dl->snr = snr;
l1dl->rx_level = signal_dbm;
l1dl->num_biterr = 0; // no biterrors
l1dl->fire_crc = 0; // TODO: check if this means fire crc is not used or crc produced no error
// TODO: data decoding and decryption
memcpy(l1di->data, msgb_data(msg), msgb_length(msg));
l1ctl_tx_data_ind(msg, arfcn, link_id, chan_nr, fn, snr,
signal_dbm, 0, 0);
break;
case GSMTAP_CHANNEL_RACH:
LOGP(DVIRPHY, LOGL_NOTICE,
"Ignoring gsmtap msg from virt um - channel type is uplink only!\n");
LOGP(DVIRPHY,
LOGL_NOTICE,
"Ignoring gsmtap msg from virt um - channel type is uplink only!\n");
break;
case GSMTAP_CHANNEL_SDCCH:
case GSMTAP_CHANNEL_CCCH:
@ -275,12 +248,14 @@ void gsmtapl1_rx_from_virt_um_inst_cb(struct virt_um_inst *vui,
case GSMTAP_CHANNEL_PTCCH:
case GSMTAP_CHANNEL_CBCH51:
case GSMTAP_CHANNEL_CBCH52:
LOGP(DVIRPHY, LOGL_NOTICE,
"Ignoring gsmtap msg from virt um - channel type not supported!\n");
LOGP(DVIRPHY,
LOGL_NOTICE,
"Ignoring gsmtap msg from virt um - channel type not supported!\n");
break;
default:
LOGP(DVIRPHY, LOGL_NOTICE,
"Ignoring gsmtap msg from virt um - channel type unknown.\n");
LOGP(DVIRPHY,
LOGL_NOTICE,
"Ignoring gsmtap msg from virt um - channel type unknown.\n");
break;
}
@ -288,7 +263,7 @@ void gsmtapl1_rx_from_virt_um_inst_cb(struct virt_um_inst *vui,
if (l1ctl_msg) {
l1ctl_sap_tx_to_l23(l1ctl_msg);
}
nomessage:
nomessage:
// handle memory deallocation
talloc_free(msg);
}

14
src/host/virt_phy/src/l1ctl_sap.c
View File

@ -149,7 +149,7 @@ struct msgb *l1ctl_create_l2_msg(int msg_type, uint32_t fn, uint16_t snr,
dl = (struct l1ctl_info_dl *)msgb_put(msg, sizeof(*dl));
dl->frame_nr = htonl(fn);
dl->snr = snr;
dl->snr = htons(snr);
dl->band_arfcn = htons(arfcn);
return msg;
@ -607,18 +607,6 @@ void l1ctl_tx_reset(uint8_t msg_type, uint8_t reset_type)
l1ctl_sap_tx_to_l23(msg);
}
/**
* @brief Transmit L1CTL msg of a given type to layer 23.
*
* @param [in] msg_type L1CTL primitive message type.
*/
void l1ctl_tx_msg(uint8_t msg_type)
{
struct msgb *msg = l1ctl_msgb_alloc(msg_type);
DEBUGP(DL1C, "Sending to l23 - %s\n", getL1ctlPrimName(msg_type));
l1ctl_sap_tx_to_l23(msg);
}
/**
* @brief Transmit L1CTL_CCCH_MODE_CONF to layer 23.
*

2
src/host/virt_phy/src/logging.c
View File

@ -87,7 +87,7 @@ int ms_log_init(char *cat_mask)
log_add_target(stderr_target);
log_set_all_filter(stderr_target, 1);
//log_set_log_level(stderr_target, 1);
log_set_print_filename(stderr_target, 0);
log_set_print_filename(stderr_target, 1);
log_set_use_color(stderr_target, 0);
log_set_print_timestamp(stderr_target, 1);
log_set_print_category(stderr_target, 1);

56
src/host/virt_phy/src/virt_prim_data.c
View File

@ -42,15 +42,13 @@ static void virt_l1_sched_handler_cb(uint32_t fn, struct msgb * msg);
/**
* @brief Handler callback function for DATA request.
*
* @param [in] fn frame number
* @param [in] msg the msg to sent over virtual um.
*/
static void virt_l1_sched_handler_cb(uint32_t fn, struct msgb * msg)
{
gsmtapl1_tx_to_virt_um(fn, msg);
// send confirm to layer23
msg = l1ctl_create_l2_msg(L1CTL_DATA_CONF,
fn, 0, 0);
l1ctl_sap_tx_to_l23(msg);
l1ctl_tx_data_conf(fn, 0, l1_model_ms->state->serving_cell.arfcn);
}
/**
@ -70,7 +68,8 @@ void l1ctl_rx_data_req(struct msgb *msg)
struct l1ctl_info_ul *ul = (struct l1ctl_info_ul *)l1h->data;
struct l1ctl_data_ind *data_ind = (struct l1ctl_data_ind *)ul->payload;
uint8_t rsl_chantype, subslot, timeslot;
uint32_t fn_sched = sched_fn_ul(l1_model_ms->state->current_time, ul->chan_nr, ul->link_id);
uint32_t fn_sched = sched_fn_ul(l1_model_ms->state->current_time,
ul->chan_nr, ul->link_id);
rsl_dec_chan_nr(ul->chan_nr, &rsl_chantype, &subslot, &timeslot);
DEBUGP(DL1C,
@ -85,6 +84,53 @@ void l1ctl_rx_data_req(struct msgb *msg)
}
void l1ctl_tx_data_ind(struct msgb *msg, uint16_t arfcn, uint8_t link_id,
uint8_t chan_nr, uint32_t fn, uint8_t snr,
uint8_t signal_dbm, uint8_t num_biterr, uint8_t fire_crc)
{
struct msgb *l1ctl_msg = NULL;
struct l1ctl_data_ind * l1di;
struct l1ctl_info_dl * l1dl;
l1ctl_msg = l1ctl_msgb_alloc(L1CTL_DATA_IND);
l1dl = (struct l1ctl_info_dl *)msgb_put(l1ctl_msg,
sizeof(struct l1ctl_info_dl));
l1di = (struct l1ctl_data_ind *)msgb_put(l1ctl_msg,
sizeof(struct l1ctl_data_ind));
l1dl->band_arfcn = htons(arfcn);
l1dl->link_id = link_id;
l1dl->chan_nr = chan_nr;
l1dl->frame_nr = htonl(fn);
l1dl->snr = snr;
l1dl->rx_level = signal_dbm;
l1dl->num_biterr = 0; // no biterrors
l1dl->fire_crc = 0;
// TODO: data decoding and decryption
memcpy(l1di->data, msgb_data(msg), msgb_length(msg));
DEBUGP(DL1C, "Sending signaling-data to l23.\n");
l1ctl_sap_tx_to_l23(l1ctl_msg);
}
/**
* @brief Send a L1CTL_DATA_CONF to L23.
*
* @param [in] fn frame number
* @param [in] snr signal noise ratio
* @param [in] arfcn arfcn of the cell the message was send on
*
*/
void l1ctl_tx_data_conf(uint32_t fn, uint16_t snr, uint16_t arfcn)
{
struct msgb * l1ctl_msg;
l1ctl_msg = l1ctl_create_l2_msg(L1CTL_DATA_CONF, fn, snr, arfcn);
// send confirm to layer23
l1ctl_sap_tx_to_l23(l1ctl_msg);
}
/**
* @brief Initialize virtual prim data.
*

58
src/host/virt_phy/src/virt_prim_traffic.c
View File

@ -42,15 +42,13 @@ static void virt_l1_sched_handler_cb(uint32_t fn, struct msgb * msg);
/**
* @brief Handler callback function for TRAFFIC request.
*
* @param [in] fn frame number
* @param [in] msg the msg to sent over virtual um.
*/
static void virt_l1_sched_handler_cb(uint32_t fn, struct msgb * msg)
{
gsmtapl1_tx_to_virt_um(fn, msg);
// send confirm to layer23
msg = l1ctl_create_l2_msg(L1CTL_TRAFFIC_CONF,
fn, 0, 0);
l1ctl_sap_tx_to_l23(msg);
l1ctl_tx_traffic_conf(fn, 0, l1_model_ms->state->serving_cell.arfcn);
}
/**
@ -69,7 +67,8 @@ void l1ctl_rx_traffic_req(struct msgb *msg)
struct l1ctl_info_ul *ul = (struct l1ctl_info_ul *)l1h->data;
struct l1ctl_traffic_req *tr = (struct l1ctl_traffic_req *)ul->payload;
uint8_t rsl_chantype, subslot, timeslot;
uint32_t fn_sched = sched_fn_ul(l1_model_ms->state->current_time, ul->chan_nr, ul->link_id);
uint32_t fn_sched = sched_fn_ul(l1_model_ms->state->current_time,
ul->chan_nr, ul->link_id);
rsl_dec_chan_nr(ul->chan_nr, &rsl_chantype, &subslot, &timeslot);
DEBUGP(DL1C, "Received and handled from l23 - L1CTL_TRAFFIC_REQ\n");
@ -80,6 +79,55 @@ void l1ctl_rx_traffic_req(struct msgb *msg)
&virt_l1_sched_handler_cb);
}
void l1ctl_tx_traffic_ind(struct msgb *msg, uint16_t arfcn, uint8_t link_id,
uint8_t chan_nr, uint32_t fn, uint8_t snr,
uint8_t signal_dbm, uint8_t num_biterr,
uint8_t fire_crc)
{
struct msgb *l1ctl_msg = NULL;
struct l1ctl_traffic_ind * l1ti;
struct l1ctl_info_dl * l1dl;
uint8_t rsl_chan_type, subchan, timeslot;
l1ctl_msg = l1ctl_msgb_alloc(L1CTL_TRAFFIC_IND);
l1dl = (struct l1ctl_info_dl *)msgb_put(l1ctl_msg,
sizeof(struct l1ctl_info_dl));
l1ti = (struct l1ctl_traffic_ind *)msgb_put(
l1ctl_msg, sizeof(struct l1ctl_traffic_ind));
rsl_dec_chan_nr(chan_nr, &rsl_chan_type, &subchan, &timeslot);
l1dl->band_arfcn = htons(arfcn);
l1dl->link_id = link_id;
l1dl->chan_nr = chan_nr;
l1dl->frame_nr = htonl(fn);
l1dl->snr = snr;
l1dl->rx_level = signal_dbm;
l1dl->num_biterr = 0; // no biterrors
l1dl->fire_crc = 0;
// TODO: traffic decoding and decryption
memcpy(l1ti->data, msgb_data(msg), msgb_length(msg));
DEBUGP(DL1C, "Sending to l23 - L1CTL_TRAFFIC_IND\n");
l1ctl_sap_tx_to_l23(l1ctl_msg);
}
/**
* @brief Send a L1CTL_TRAFFIC_CONF to L23.
*
* @param [in] fn frame number
* @param [in] snr signal noise ratio
* @param [in] arfcn arfcn of the cell the message was send on
*
*/
void l1ctl_tx_traffic_conf(uint32_t fn, uint16_t snr, uint16_t arfcn)
{
struct msgb * l1ctl_msg;
l1ctl_msg = l1ctl_create_l2_msg(L1CTL_TRAFFIC_CONF, fn, snr, arfcn);
// send confirm to layer23
l1ctl_sap_tx_to_l23(l1ctl_msg);
}
/**
* @brief Initialize virtual prim traffic.
*