osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

as we have BSWAP64() now, at least read 64bit section_length (but currently unused) 

svn path=/trunk/; revision=24149
This commit is contained in:
Ulf Lamping 2008-01-21 01:54:28 +00:00
parent 8f6398d5ba
commit 7c59586e56
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wiretap/pcapng.c
View File

@ -346,8 +346,12 @@ pcapng_read_section_header_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t
return 0;
}
/* XXX - no proper way to read/swap 64 bit values -> so ignore the 64bit section_length for now! */
wblock->data.section.section_length = -1; /* shb.section_length */
/* 64bit section_length (currently unused) */
if(pn->byte_swapped) {
wblock->data.section.section_length = BSWAP64(shb.section_length);
} else {
wblock->data.section.section_length = shb.section_length;
}
/* Option defaults */
wblock->data.section.opt_comment = NULL;
@ -538,7 +542,6 @@ pcapng_read_if_descr_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, w
wblock->data.if_descr.if_speed = *((guint64 *)option_content);
if(pn->byte_swapped)
wblock->data.if_descr.if_speed = BSWAP64(wblock->data.if_descr.if_speed);
g_warning("pcapng_read_if_descr_block: if_speed %" G_GINT64_MODIFIER "u (bps)", wblock->data.if_descr.if_speed);
} else {
g_warning("pcapng_read_if_descr_block: if_speed length %u not 8 as expected", oh.option_length);