diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-03-18 23:01:22 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2014-03-19 05:13:30 +0000 |
commit | 488f2a097402b1bfb941547939d13fbcbb90c6c9 (patch) | |
tree | 9d7b38d10b565d2928282517aa270ab5929cef11 /ui/tap_export_pdu.c | |
parent | 30ba425e7e95f7b61b3a3e5ff0c46e4be9d3d8d7 (diff) |
Exported PDU: add support for data length on the wire
Change-Id: Iff14ec4d0297ec85f3597b33871fb0ab5256a597
Reviewed-on: https://code.wireshark.org/review/728
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/tap_export_pdu.c')
-rw-r--r-- | ui/tap_export_pdu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index e93014d97e..7c35ad36d5 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -48,7 +48,7 @@ export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, co int buffer_len; guint8 *packet_buf; - buffer_len = exp_pdu_data->tvb_length + exp_pdu_data->tlv_buffer_len; + buffer_len = exp_pdu_data->tvb_captured_length + exp_pdu_data->tlv_buffer_len; packet_buf = (guint8 *)g_malloc(buffer_len); if(exp_pdu_data->tlv_buffer_len > 0){ @@ -60,7 +60,8 @@ export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, co } pkthdr.ts.secs = pinfo->fd->abs_ts.secs; pkthdr.ts.nsecs = pinfo->fd->abs_ts.nsecs; - pkthdr.caplen = pkthdr.len = buffer_len; + pkthdr.caplen = buffer_len; + pkthdr.len = exp_pdu_data->tvb_reported_length + exp_pdu_data->tlv_buffer_len; pkthdr.pkt_encap = exp_pdu_tap_data->pkt_encap; pkthdr.interface_id = 0; |