phone-side
/
osmo-qcdiag
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DPL: add parsing of results from modem 

we can now get a list of DPL interfaces and their links.
This commit is contained in:
Harald Welte 2017-01-01 19:49:47 +01:00
parent f727edcd7d
commit 3b144a27fa
3 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/diag_dpl.c
View File

@ -17,6 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <errno.h>
#include <string.h>
#include <osmocom/core/utils.h>
#include <osmocom/core/msgb.h>
@ -48,10 +50,14 @@ int diag_dpl_get_sup_if(struct diag_instance *di)
{
struct msgb *msg = msgb_alloc_diag();
struct msgb *rx;
diag_push_subsys_hdr(msg, DIAG_SUBSYS_PS_DATA_LOGGING,
DIAG_DPL_GET_SUPPORTED_IFACES);
rx = diag_transceive_msg(di, msg);
/* FIXME */
struct dpl_get_sup_if_resp *gsir;
rx = diag_subsys_transceive_msg(di, msg, DIAG_SUBSYS_PS_DATA_LOGGING,
DIAG_DPL_GET_SUPPORTED_IFACES);
if (!rx)
return -EINVAL;
gsir = (struct dpl_get_sup_if_resp *) msg->l3h;
printf("DPL Supported interfaces: %s\n",
osmo_hexdump(gsir->iface_id, gsir->num_ifaces));
msgb_free(rx);
return 0;
}
@ -61,13 +67,25 @@ int diag_dpl_get_if_desc(struct diag_instance *di, uint8_t iface_id)
struct msgb *msg = msgb_alloc_diag();
struct msgb *rx;
struct dpl_get_if_desc_req *gidr;
uint8_t if_num, num_links;
char *if_name, *link_name;
unsigned int i;
gidr = (struct dpl_get_if_desc_req *) msgb_put(msg, sizeof(*gidr));
gidr->iface_id = iface_id;
diag_push_subsys_hdr(msg, DIAG_SUBSYS_PS_DATA_LOGGING,
DIAG_DPL_GET_IFACE_DESC);
rx = diag_transceive_msg(di, msg);
/* FIXME */
rx = diag_subsys_transceive_msg(di, msg, DIAG_SUBSYS_PS_DATA_LOGGING,
DIAG_DPL_GET_IFACE_DESC);
if (!rx)
return -EINVAL;
if_num = rx->l3h[0];
if_name = (char *)rx->l3h+1;
num_links = *(rx->l3h+1+strlen(if_name)+1);
printf("DPL Interface %u \"%s\" num_links=%u\n", if_num, if_name, num_links);
link_name = (char *) rx->l3h+1+strlen(if_name)+1+1;
for (i = 0; i < num_links; i++) {
printf("\tLink %u: %s\n", i, link_name);
link_name += strlen(link_name) + 1;
}
msgb_free(rx);
return 0;
}

21
src/diag_io.c
View File

@ -166,6 +166,27 @@ struct msgb *diag_transceive_msg(struct diag_instance *di, struct msgb *tx)
return NULL;
}
struct msgb *diag_subsys_transceive_msg(struct diag_instance *di, struct msgb *tx,
uint8_t subsys, uint16_t code)
{
struct msgb *rx;
struct diagpkt_subsys_hdr *dsh;
diag_push_subsys_hdr(tx, subsys, code);
rx = diag_transceive_msg(di, tx);
if (!rx)
return NULL;
dsh = (struct diagpkt_subsys_hdr *) rx->l2h;
if (msgb_l2len(rx) < sizeof(*dsh) ||
dsh->subsys_id != subsys ||
osmo_load16le(&dsh->subsys_cmd_code) != code) {
msgb_free(rx);
return NULL;
}
rx->l3h = rx->l2h + sizeof(*dsh);
return rx;
}
/* transmit a message, wait for response, then ignore response */
void diag_transceive_msg_ign(struct diag_instance *di, struct msgb *tx)
{

2
src/diag_io.h
View File

@ -23,6 +23,8 @@ int diag_transmit_buf(struct diag_instance *di, const uint8_t *data, size_t data
struct msgb *diag_read_msg(struct diag_instance *di);
int diag_process_msg(struct diag_instance *di, struct msgb *msg);
struct msgb *diag_transceive_msg(struct diag_instance *di, struct msgb *tx);
struct msgb *diag_subsys_transceive_msg(struct diag_instance *di, struct msgb *tx,
uint8_t subsys, uint16_t code);
void diag_transceive_msg_ign(struct diag_instance *di, struct msgb *tx);
struct msgb *diag_transceive_buf(struct diag_instance *di, const uint8_t *data, size_t data_len);
void diag_transceive_buf_ign(struct diag_instance *di, const uint8_t *data, size_t data_len);