diff options
author | Michael Mann <mmann78@netscape.net> | 2016-01-25 20:17:21 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-02-23 00:39:38 +0000 |
commit | 08d49ff2e06cb35dc9084735aa60c83686afdd9c (patch) | |
tree | 93d55773a42d4a1cf64b6544c6e2f3ec03ef4f4e /wiretap/lanalyzer.c | |
parent | 37acf433dbb2ef1d443c9ee09a315b0b4ce136d8 (diff) |
Making wiretap option blocks more generic.
This was inspired by https://code.wireshark.org/review/9729/, but takes it in a different direction where all options are put into an array, regardless of whether they are "standard" or "custom". It should be easier to add "custom" options in this design. Some, but not all blocks have been converted.
Descriptions of some of the block options have been moved from wtap.h to pcapng.h as it seems to be the one that implements the description of the blocks.
Also what could be added/refactored is registering block behavior.
Change-Id: I3dffa38f0bb088f98749a4f97a3b7655baa4aa6a
Reviewed-on: https://code.wireshark.org/review/13667
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wiretap/lanalyzer.c')
-rw-r--r-- | wiretap/lanalyzer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index 50ce3339e0..8f9fd0f63b 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -24,6 +24,7 @@ #include "wtap-int.h" #include "file_wrappers.h" #include "lanalyzer.h" +#include "pcapng.h" /* The LANalyzer format is documented (at least in part) in Novell document TID022037, which can be found at, among other places: @@ -327,7 +328,7 @@ wtap_open_return_val lanalyzer_open(wtap *wth, int *err, gchar **err_info) return WTAP_OPEN_NOT_MINE; } comment[record_length] = '\0'; - wth->shb_hdr.opt_comment = comment; + wtap_optionblock_set_option_string(wth->shb_hdr, OPT_COMMENT, comment); } /* If we made it this far, then the file is a LANAlyzer file. |