summaryrefslogtreecommitdiff
path: root/wiretap
AgeCommit message (Collapse)AuthorFilesLines
2016-07-31ERF: Add ERF_TYPE_META clock tagsAnthony Coddington1-0/+32
Adds various clock configuration related tags. Uses ptp_v2 value strings exported from packet-ptp. Refactor out common ERF_TYPE_META bitfield code. Also clean up field registration a bit. Add flow_hash_mode enum, other minor wording cleanup. Manually display relative timestamps as nanoseconds for <1ms. Fix ns_host_* tag subtree summary field name duplication. Ping-Bug: 12303 Change-Id: I76264d141f1c4a3590627637daa5dcd4fdfd2e93 Reviewed-on: https://code.wireshark.org/review/16782 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-27If we don't get any OS information, remove the old OS information.Guy Harris1-0/+5
The old information is copied over from one of the input files; if we don't have information about the OS on the machine writing the *output* file, just throw the old information away. (We need a better way to preserve information from the input files; perhaps this: http://www.winpcap.org/pipermail/pcap-ng-format/2016-June/000362.html might work.) Change-Id: Ia25771736d267173f2b6949a91e81e217ee7d16f Reviewed-on: https://code.wireshark.org/review/16730 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-26Ensure to have a valid string pointer when writing OS SHB optionPascal Quantin2-3/+13
Change-Id: Ib0b6dcdf1700e88383d30bf43739312fce10e1c7 Reviewed-on: https://code.wireshark.org/review/16696 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-26Fix some of the checkAPIs.pl warnings for g_warning.Michael Mann1-10/+10
1. Create ws_g_warning for legitimate uses of g_warning 2. Use proto_tree_add_debug_text 3. Comment some out Change-Id: Ida044bf40286b955fdd529c4f9907c8e09b3d7c5 Reviewed-on: https://code.wireshark.org/review/16678 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-24Fix shadow variable warnings.Michael Mann1-3/+3
Change-Id: I1e6bd722b3f04f171b462fc680ca080bb7ec03c7 Reviewed-on: https://code.wireshark.org/review/16625 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-21Don't pass NULL to wtap_block_set_string_option_value().Guy Harris1-4/+2
To remove OPT_SHB_HARDWARE, use wtap_block_remove_option(). To get the string value from a GString, use g_string_free(string, FALSE), not g_string_free(string, TRUE) - the latter will free the string value and return NULL. Change-Id: I0c5a9f818543f6752f455f04fb3c024208e23954 Reviewed-on: https://code.wireshark.org/review/16567 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-21Remove more string option value null checks.Guy Harris1-53/+38
Also, rename routines that write out an option write_wtap_XXb_option() from write_wtap_XXb_block(). Change-Id: I4884a2f5275a5e2e32137b47255fac6995f311ef Reviewed-on: https://code.wireshark.org/review/16566 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-21No need to check for string option values being null.Guy Harris1-1/+1
A string option, if present, always has a value; it might be a null *string*, but you won't get a null pointer (if the option isn't present, it simply isn't present). Fix some comments while we're at it. Change-Id: I9c1420f56998a7d04de5c5cc2e92631b181f303a Reviewed-on: https://code.wireshark.org/review/16564 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-18block->options is never null; don't check for it.Guy Harris1-2/+1
A wtap_block_t always has an array of options, even if it's empty. Fixes CID 1364135. Change-Id: Ib1ba791ddcac078ec34def321d63d140c5576037 Reviewed-on: https://code.wireshark.org/review/16535 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-18Remove wtap_block_num_options_of_type().Guy Harris1-36/+0
It's not used; currently, everything that accesses instances of a multiple-instance-allowed option do so in a loop that iterates over option instances by fetching values of the Nth option until the attempt to fetch the option fails, making only one pass over the options. Change-Id: Ife9583a5d246027dbfc133ab58027ef6641d65ef Reviewed-on: https://code.wireshark.org/review/16534 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-16Comment cleanups.Guy Harris1-9/+9
Change-Id: I995ba14cbd9bbe2c01b0770c16095084895498db Reviewed-on: https://code.wireshark.org/review/16486 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-16Add APIs to remove option instances from blocks.Guy Harris2-16/+128
That will allow deletion of comments, stripping of options when sanitizing captures, etc.. Change-Id: I9667ba2ccf4e548ff3b7d500796b260a437bcea0 Reviewed-on: https://code.wireshark.org/review/16485 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-15Use spaces rather than tabs for indentation.Guy Harris1-2/+2
Change-Id: I6028253f7c8c30804eaa4b23d2b09827aacb3c9d Reviewed-on: https://code.wireshark.org/review/16481 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-15Update comments, give option numbers in decimal.Guy Harris1-27/+27
The pcapng spec gives option numbers in decimal, not hex. Get rid of the "XXX if not available" comments - if an option isn't present in a block, it's not present, and doesn't have *any* value. Change-Id: I1bf0c9a5aaad7dfadf9248e22b67e172625bdd0d Reviewed-on: https://code.wireshark.org/review/16480 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-15Squelch a compiler warning.Guy Harris1-1/+1
Explicitly cst the results of g_memdup(). Change-Id: I20fd1f355e68735d7cc9bbeb41717a1c2a74de37 Reviewed-on: https://code.wireshark.org/review/16477 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-15wtap_opttypes.c: Fix build error.Michael Mann1-1/+1
Change-Id: I3ee146d441e4d59701c72ed85dcb4efe97766df8 Reviewed-on: https://code.wireshark.org/review/16473 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-15Do a deep copy in wtap_block_add_custom_option().Guy Harris4-5/+45
That way, we don't have to worry about multiple instances of an option pointing to the same data. and having to worry about freeing data that's pointed to by another instance. Change-Id: I3470a9eebf346023713fd0d6ff2451d727c25089 Reviewed-on: https://code.wireshark.org/review/16471 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-15Fix the snapshot length part of the "same interface?" check.Guy Harris1-12/+24
Fix a typo - compare for unequal snapshot lengths, not equal snapshot lengths. Also, move the debug messages about checks right above the checks. Change-Id: If6f5e125f05f3788b63e9f75d98f55e27830870b Reviewed-on: https://code.wireshark.org/review/16470 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-15Squelch compiler warnings.Guy Harris1-2/+2
Cast some numerical values to wtap_block_type_t. Change-Id: I56651c62045880638175c39174341feffb4b1068 Reviewed-on: https://code.wireshark.org/review/16451 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-15Fix signature of wtap_opttype_block_register().Guy Harris1-1/+1
It gets passed a wtap_block_type_t value, so declare it as such. Change-Id: I6980cab7e1885c9920b2a75e12f9d2d2a64d6f96 Reviewed-on: https://code.wireshark.org/review/16450 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-14Redo the block options APIs.Guy Harris10-1095/+1824
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 <guy@alum.mit.edu>
2016-07-14vwr.c Dynamically allocate large buffersMichael Mann1-9/+33
VS Code Analysis claims the arrays are too large and should be moved to help Change-Id: I741ebe8cc73a108cb6e6d9ecbda37e2a4b6e1b4b Reviewed-on: https://code.wireshark.org/review/16423 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-14pcapng.c: Use preprocessor directive to compare G_BYTE_ORDER with ↵Michael Mann1-1/+5
G_LITTLE_ENDIAN. VS Code analysis considers them hardcoded values so the if statement is either always true or always false. Change-Id: Iabb8462b66f728195bf378ae26c79a783feddb03 Reviewed-on: https://code.wireshark.org/review/16422 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-30Remove Makefile.common filesJoão Valverde3-196/+173
Now that nmake build system has been removed they are not needed anymore. Change-Id: I88075f955bb4349185859c1af4be22e53de5850f Reviewed-on: https://code.wireshark.org/review/16050 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-22Windows: rename wiretap-${PROJECT_VERSION}.dll to libwiretap.dllPascal Quantin1-3/+1
This aligns the name with what is done for other Wireshark shared libraries. Moreover it allows to compile a wiretap plugin once per major release, without the need to recompile it each time ${PROJECT_VERSION} changes (each nightly build / official release). Change-Id: I53c82277223a4f323079cf695168ac85c2fba523 Reviewed-on: https://code.wireshark.org/review/16058 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-21pcap: ERF per-Host ID/Source ID interface supportAnthony Coddington1-7/+31
Add encap_priv pointer to libpcap_t. Initialize erf_priv when ENCAP_ERF. Use erf_populate_interface_from_header() to dynamically create interfaces. Free encap_priv on pcap_close. Ping-Bug: 12303 Change-Id: Ieda425ef3e50a124d9c38ee4538aa3644128ce60 Reviewed-on: https://code.wireshark.org/review/15362 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-21Add support for Opencontrail virtual networkRudra Rugge3-1/+7
Change-Id: Ia6012e0f6425be069e222538eafb1191b398ec83 Reviewed-on: https://code.wireshark.org/review/15930 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16randpktdump: fix a crash.Dario Lombardo1-1/+1
Randpktdump requires the init the wtap opttypes. Fixed making the init function public and calling it. Bug: 12539 Change-Id: I02585c41012deacff1526b51ed09ab555cbfc8ce Reviewed-on: https://code.wireshark.org/review/15951 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16ip-over-ib description entry was missingRudra Rugge1-1/+3
Description entry was missing in the list. Change-Id: Ia8f8bd4608ee6800a352f4979752b5c45c4a5086 Reviewed-on: https://code.wireshark.org/review/15947 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16Export wtap_optionblock_copy_options() symbolPascal Quantin1-1/+1
It can be useful for wiretap plugins Change-Id: Ic56e4357ba3bfcef30d13615efc1361399c3133e Reviewed-on: https://code.wireshark.org/review/15955 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-15Remove Nmake build systemPascal Quantin2-83/+0
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-15Don't map the interface ID for records that don't pertain to an interface.Guy Harris1-5/+11
And revert to the previous behavior of map_phdr_interface_id(); that change broke the mergecap tests when it was merging pcap files into a pcapng file. Change-Id: I2e079b0e87dce06e98faa9ab7615f9b9b2701b77 Reviewed-on: https://code.wireshark.org/review/15932 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-15wtap: Make default_filter staticStig Bjørlykke1-2/+1
Address of stack memory associated with local variable 'default_filter' is still referred to by the global variable 'filter_option' upon returning to the caller. This will be a dangling reference. Change-Id: I6160a37f05b8aea245b723ec50803e4062886738 Reviewed-on: https://code.wireshark.org/review/14427 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-15More Sysdig / system event support.Gerald Combs3-3/+129
Add REC_TYPE_SYSCALL to wiretap and use it for Sysdig events. Call the Sysdig event dissector from the frame dissector. Create a "syscall" protocol for system calls, but add "frame" items to it for now. Add the ability to write Sysdig events. This lets us merge packet capture and syscall capture files. Change-Id: I12774ec69c89d8e329b6130c67f29aade4e3d778 Reviewed-on: https://code.wireshark.org/review/15078 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-10More comment clarification.Guy Harris1-2/+4
That's not "the biggest record we're willing to write", it's "the biggest record the pcapng format supports, as the record length is a 16-bit field". Change-Id: Icbd5e0cc4ed8e2a3a0d474245a9b9ed2c999d520 Reviewed-on: https://code.wireshark.org/review/15818 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 09de28933f9a17d4472206e1ac4b7c92001e44f5) Reviewed-on: https://code.wireshark.org/review/15820
2016-06-10Make the IPv4 NRB code's comments match the IPv6 NRB code's comments.Guy Harris1-1/+8
The IPv6 comments gave more details. Change-Id: I4e4d865feadbabfd625cdf2b2b162b99c4f23efa Reviewed-on: https://code.wireshark.org/review/15815 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-08Support reading in and storing multiple Section Header and Name Resolution ↵Michael Mann1-14/+8
blocks. The data is not applied anywhere, just stored. The first Section Header block is still the only one that is used to read a pcapng file. Change-Id: If9546401101d2fe79b2325bacbd597b92127e86e Reviewed-on: https://code.wireshark.org/review/15705 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-07ERF: Make ERF wiretap forwards compatible.Anthony Coddington2-11/+6
Dissector has always been able to cope with unknown record types so pass them through (and call the data dissector from the ERF dissector in this case). Previously was stopping processing on the first unrecognized record which is very unhelpful for otherwise valid files that have new types mixed in. Remove ERF type check altogether from open heuristic as ERF type could be past 48 in future and with more extension headers bit any byte value could be valid. Also allow setting ERF_RECORDS_TO_CHECK to 0 to force skipping the heuristic. Change-Id: I8331eef30ba2e949564f418b3100bd73b8f58116 Reviewed-on: https://code.wireshark.org/review/15361 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-06Move ip6_to_str_buf() to to_str.c and make it take the buffer length.João Valverde1-1/+1
Also make it use ws_inet_ntop6() (rather than implementing the string conversion ourselves). Remove ip6_to_str_buf_len(). Change-Id: I1eff3a8941e00987c2ff0c4dcfda13476af86191 Reviewed-on: https://code.wireshark.org/review/15692 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-06*_stdup_printf -> strdup for "single string only" formatting.Michael Mann9-17/+17
Done for performance improvements. This could probably be done in checkAPIs.pl, but this was just a quick manual check with grepping. Change-Id: I91ff102cb528bb00fa2f65489de53890e7e46f2d Reviewed-on: https://code.wireshark.org/review/15751 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-06Add a routine to get an array of all instances of a string option.Guy Harris2-0/+41
Use it for OPT_COMMENT in the SHB, as there may be ore than one instance of OPT_COMMENT in an SHB. Also, use wtap_optionblock_get_option_string for OPT_SHB_HARDWARE, OPT_SHB_OS, and OPT_SHB_USERAPPL; they're specified as "only one instance allowed". Change-Id: I23ad87e41e40b7ae1155e96c0523a6f8caad5204 Reviewed-on: https://code.wireshark.org/review/15750 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-06Directly use wtap_opttypes calls to fetch SHB options.Guy Harris2-87/+96
Don't put them in the summary structure; the summary routines should calculate summary statistics, not dig up every bit of information that *could* appear in a summary. Instead, have the GUI code call wtap_file_get_shb() to get the SHB information and call wtap_optionblock_get_option_string() to fetch the option values. Move the option code definitions into wtap_opttypes.h, as they're used by the API. Change-Id: Icef11f5fb30fdc3df1bb0208aae9ed0aebaf0182 Reviewed-on: https://code.wireshark.org/review/15748 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-01Add data structures necessary to support multiple Name Resolution blocks.Michael Mann5-35/+47
This doesn't try to use any data from multiple Name Resolution blocks, it just converts single Name Resolution block usage into a GArray, so the potential is there to then use/support multiple Name Resolution blocks within a file format (like pcapng) Change-Id: Ib0b584af0bd263f183bd6d31ba18275ab0577d0c Reviewed-on: https://code.wireshark.org/review/15684 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-01Add data structures necessary to support multiple Section Header blocks.Michael Mann11-82/+112
This doesn't try to use any data from multiple Section Header blocks, it just converts single Section Header block usage into a GArray, so the potential is there to then use/support multiple Section Header blocks within a file format (like pcapng) Change-Id: I6ad1f7b8daf4b1ad7ba0eb1ecf2e170421505486 Reviewed-on: https://code.wireshark.org/review/15636 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-01Allow create_tempfile to support a suffix.Michael Mann2-2/+2
Ping-Bug: 10203 Change-Id: Ifa24870d711449b87e9839dd46af614e4aa28fde Reviewed-on: https://code.wireshark.org/review/15608 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2016-06-01Register a few more file extensions as belonging to Wireshark.Jeff Morriss1-2/+2
Register Wireshark for PacketLogger, ERF, IPFIX, and VWR files on freedesktop.org, OS X, and Windows (we were already registered for ERF and VWR files on Windows). Change-Id: I8105997cb15ea06e1c078489fd88763d4ce9e40c Reviewed-on: https://code.wireshark.org/review/15635 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-31Suggest that file types should also be registered in the WiX installer.Jeff Morriss1-2/+2
Change-Id: If65ff14589ccd0b2d643256f3443dc26b3b71371 Reviewed-on: https://code.wireshark.org/review/15640 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-05-30If routines return a wtap_opttype_return_val, declare them as doing so.Guy Harris2-48/+68
Also, improve the doxygen comments. Change-Id: I57929dfba23d926fd806ac001a5a3924bb636ae0 Reviewed-on: https://code.wireshark.org/review/15634 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-30Copy all options when creating SHB block for new file.Michael Mann1-4/+1
Change-Id: I666d4f546d9fdc026ccd7fac7750e80df7f9b697 Reviewed-on: https://code.wireshark.org/review/15611 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-28Make wtap_optionblock_foreach_option public.Guy Harris1-1/+1
Change-Id: I99e448319669acfdb0ec3b96e8e1195ba4a1f4f9 Reviewed-on: https://code.wireshark.org/review/15594 Reviewed-by: Guy Harris <guy@alum.mit.edu>