osmocom
/
osmo-pcap
mirror of https://gerrit.osmocom.org/osmo-pcap
11
0
Fork 0
Code Issues Releases Wiki Activity

wireformat: Send the length in the network order.. 

this is a format change. but it is necessary now.
This commit is contained in:
Holger Hans Peter Freyther 2011-06-01 17:29:15 +02:00
parent 59bfb5854d
commit 9df7dc5f69
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osmo-pcap/wireformat.h
View File

@ -38,8 +38,8 @@
struct osmo_pcap_data { struct osmo_pcap_data {
uint8_t type; uint8_t type;
uint8_t spare[3]; uint8_t spare;
uint32_t len; uint16_t len;
uint8_t data[0]; uint8_t data[0];
} __attribute__((packed)); } __attribute__((packed));

4
src/osmo_client_network.c
View File

@ -119,7 +119,7 @@ void osmo_client_send_data(struct osmo_pcap_client *client,
msg->l3h = msgb_put(msg, in_hdr->caplen); msg->l3h = msgb_put(msg, in_hdr->caplen);
memcpy(msg->l3h, data, in_hdr->caplen); memcpy(msg->l3h, data, in_hdr->caplen);
om_hdr->len = msgb_l2len(msg); om_hdr->len = htons(msgb_l2len(msg));
write_data(client, msg); write_data(client, msg);
} }
@ -138,7 +138,7 @@ void osmo_client_send_link(struct osmo_pcap_client *client)
om_hdr = (struct osmo_pcap_data *) msgb_put(msg, sizeof(*om_hdr)); om_hdr = (struct osmo_pcap_data *) msgb_put(msg, sizeof(*om_hdr));
om_hdr->type = PKT_LINK_HDR; om_hdr->type = PKT_LINK_HDR;
om_hdr->len = sizeof(*hdr); om_hdr->len = htons(sizeof(*hdr));
hdr = (struct pcap_file_header *) msgb_put(msg, sizeof(*hdr)); hdr = (struct pcap_file_header *) msgb_put(msg, sizeof(*hdr));
hdr->magic = 0xa1b2c3d4; hdr->magic = 0xa1b2c3d4;

1
src/osmo_server_network.c
View File

@ -188,6 +188,7 @@ static int read_cb(struct osmo_fd *fd, unsigned int what)
return -1; return -1;
} }
data->len = ntohs(data->len);
if (data->len > 2000) { if (data->len > 2000) {
LOGP(DSERVER, LOGL_ERROR, "Unplausible result %u\n", data->len); LOGP(DSERVER, LOGL_ERROR, "Unplausible result %u\n", data->len);
close_connection(conn); close_connection(conn);