From 1f8999bb96018446e48529e75e56bf17dd3c77cf Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 14 Jul 2016 16:01:57 -0700 Subject: Redo the block options APIs. A block can have zero or more instances of a given option. We distinguish between "one instance only" options, where a block can have zero or one instance, and "multiple instances allowed" options, where a block can have zero or more instances. For "one instance only" options: "add" routines add an instance if there isn't one already and fail if there is; "set" routines add an instance if there isn't one already and change the value of the existing instance if there is one; "set nth" routines fail; "get" routines return the value of the instance if there is one and fail if there isn't; "get nth" routines fail. For "multiple instances allowed" options: "add" routines add an instance; "set" routines fail; "set nth" routines set the value of the nth instance if there is one and fail otherwise; "get" routines fail; "get nth" routines get the value if the nth instance if there is one and fail otherwise. Rename "optionblock" to just "block"; it describes the contents of a block, including both mandatory items and options. Add some support for NRB options, including IPv4 and IPv6 option types. Change-Id: Iad184f668626c3d1498b2ed00c7f1672e4abf52e Reviewed-on: https://code.wireshark.org/review/16444 Reviewed-by: Guy Harris --- wiretap/lanalyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wiretap/lanalyzer.c') diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index 947e3e13df..6e6f3f49dc 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -330,7 +330,7 @@ wtap_open_return_val lanalyzer_open(wtap *wth, int *err, gchar **err_info) g_free(comment); return WTAP_OPEN_NOT_MINE; } - wtap_optionblock_set_option_string(g_array_index(wth->shb_hdrs, wtap_optionblock_t, 0), OPT_COMMENT, comment, record_length); + wtap_block_add_string_option(g_array_index(wth->shb_hdrs, wtap_block_t, 0), OPT_COMMENT, comment, record_length); g_free(comment); } -- cgit v1.2.3