diff options
author | Guy Harris <gharris@sonic.net> | 2021-07-14 01:01:27 -0700 |
---|---|---|
committer | Guy Harris <gharris@sonic.net> | 2021-07-14 01:01:27 -0700 |
commit | cc36b7413932350cd7bfa90396f3d6b5321af5fb (patch) | |
tree | 651f2c02cdd670c1f3a30977311d83d18984c120 | |
parent | 7b0c4950a53beeb2d42d72cf683b1862a99f63ea (diff) |
pcapng: shuffle functions that process various option types.
Define them in the order in which wiretap/wtap_opttypes.h defines the
corresponding enum values for wtap_opttype_e.
-rw-r--r-- | wiretap/pcapng.c | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 6ff7c70f00..035073a259 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -512,20 +512,6 @@ register_pcapng_option_handler(guint block_type, guint option_code, } static void -pcapng_process_string_option(wtapng_block_t *wblock, guint16 option_code, - guint16 option_length, const guint8 *option_content) -{ - wtap_block_add_string_option(wblock->block, option_code, (const char *)option_content, option_length); -} - -static void -pcapng_process_bytes_option(wtapng_block_t *wblock, guint16 option_code, - guint16 option_length, const guint8 *option_content) -{ - wtap_block_add_bytes_option(wblock->block, option_code, (const char *)option_content, option_length); -} - -static void pcapng_process_uint8_option(wtapng_block_t *wblock, guint16 option_code, guint16 option_length, const guint8 *option_content) @@ -612,6 +598,20 @@ pcapng_process_uint64_option(wtapng_block_t *wblock, } } +static void +pcapng_process_string_option(wtapng_block_t *wblock, guint16 option_code, + guint16 option_length, const guint8 *option_content) +{ + wtap_block_add_string_option(wblock->block, option_code, (const char *)option_content, option_length); +} + +static void +pcapng_process_bytes_option(wtapng_block_t *wblock, guint16 option_code, + guint16 option_length, const guint8 *option_content) +{ + wtap_block_add_bytes_option(wblock->block, option_code, (const char *)option_content, option_length); +} + static gboolean pcapng_process_custom_option(wtapng_block_t *wblock, const section_info_t *section_info, @@ -3715,23 +3715,6 @@ static gboolean pcapng_write_uint32_option(wtap_dumper *wdh, guint option_id, wt return TRUE; } -static gboolean pcapng_write_ipv4_option(wtap_dumper *wdh, guint option_id, wtap_optval_t *optval, int *err) -{ - struct pcapng_option_header option_hdr; - - option_hdr.type = (guint16)option_id; - option_hdr.value_length = (guint16)4; - if (!wtap_dump_file_write(wdh, &option_hdr, 4, err)) - return FALSE; - wdh->bytes_dumped += 4; - - if (!wtap_dump_file_write(wdh, &optval->ipv4val, 1, err)) - return FALSE; - wdh->bytes_dumped += 4; - - return TRUE; -} - static gboolean pcapng_write_uint64_option(wtap_dumper *wdh, guint option_id, wtap_optval_t *optval, int *err) { struct pcapng_option_header option_hdr; @@ -3749,23 +3732,6 @@ static gboolean pcapng_write_uint64_option(wtap_dumper *wdh, guint option_id, wt return TRUE; } -static gboolean pcapng_write_ipv6_option(wtap_dumper *wdh, guint option_id, wtap_optval_t *optval, int *err) -{ - struct pcapng_option_header option_hdr; - - option_hdr.type = (guint16)option_id; - option_hdr.value_length = (guint16)IPv6_ADDR_SIZE; - if (!wtap_dump_file_write(wdh, &option_hdr, 4, err)) - return FALSE; - wdh->bytes_dumped += 4; - - if (!wtap_dump_file_write(wdh, &optval->ipv6val.bytes, IPv6_ADDR_SIZE, err)) - return FALSE; - wdh->bytes_dumped += IPv6_ADDR_SIZE; - - return TRUE; -} - static gboolean pcapng_write_timestamp_option(wtap_dumper *wdh, guint option_id, wtap_optval_t *optval, int *err) { struct pcapng_option_header option_hdr; @@ -3883,6 +3849,40 @@ static gboolean pcapng_write_bytes_option(wtap_dumper *wdh, guint option_id, wta return TRUE; } +static gboolean pcapng_write_ipv4_option(wtap_dumper *wdh, guint option_id, wtap_optval_t *optval, int *err) +{ + struct pcapng_option_header option_hdr; + + option_hdr.type = (guint16)option_id; + option_hdr.value_length = (guint16)4; + if (!wtap_dump_file_write(wdh, &option_hdr, 4, err)) + return FALSE; + wdh->bytes_dumped += 4; + + if (!wtap_dump_file_write(wdh, &optval->ipv4val, 1, err)) + return FALSE; + wdh->bytes_dumped += 4; + + return TRUE; +} + +static gboolean pcapng_write_ipv6_option(wtap_dumper *wdh, guint option_id, wtap_optval_t *optval, int *err) +{ + struct pcapng_option_header option_hdr; + + option_hdr.type = (guint16)option_id; + option_hdr.value_length = (guint16)IPv6_ADDR_SIZE; + if (!wtap_dump_file_write(wdh, &option_hdr, 4, err)) + return FALSE; + wdh->bytes_dumped += 4; + + if (!wtap_dump_file_write(wdh, &optval->ipv6val.bytes, IPv6_ADDR_SIZE, err)) + return FALSE; + wdh->bytes_dumped += IPv6_ADDR_SIZE; + + return TRUE; +} + static gboolean pcapng_write_if_filter_option(wtap_dumper *wdh, guint option_id, wtap_optval_t *optval, int *err) { if_filter_opt_t* filter = &optval->if_filterval; |