osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

pcapng: give a structure member an appropriate name. 

An entire pcapng file is dissected as a unit, so there's only one file;
the "file_number" field counts Section Header Blocks, so it's a section
number, not a file number.  Rename it to "section_number".

Change-Id: I3ee477c9aa0ee4cdfa7496935b2be915c31a4644
Reviewed-on: https://code.wireshark.org/review/36977
Reviewed-by: Guy Harris <gharris@sonic.net>
This commit is contained in:
Guy Harris 2020-04-29 18:20:12 -07:00 committed by Guy Harris
parent 928bbf5984
commit faa4399184
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/file-pcapng.c
View File

@ -183,7 +183,7 @@ static const int *hfx_pcapng_block_type[] = {
};
struct info {
guint32 file_number;
guint32 section_number;
guint32 interface_number;
guint32 darwin_process_event_number;
guint32 frame_number;
@ -1305,8 +1305,8 @@ static gint dissect_block(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
switch (block_type) {
case BLOCK_SECTION_HEADER: /* Section Header Block */
proto_item_append_text(block_item, " %u", info->file_number);
info->file_number += 1;
proto_item_append_text(block_item, " %u", info->section_number);
info->section_number += 1;
info->interface_number = 0;
info->darwin_process_event_number = 0;
info->frame_number = 1;
@ -1699,7 +1699,7 @@ dissect_pcapng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
return 0;
}
info.file_number = 1;
info.section_number = 1;
info.interface_number = 0;
info.darwin_process_event_number = 0;
info.frame_number = 1;