aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-02-23autotools: Display build flags in configure summaryJoão Valverde2-7/+18
Add more AX_APPEND_FLAGS to handle whitespace better too. Change-Id: I679fc76076c2d800e3524fe7bf22d0af8e58b284 Reviewed-on: https://code.wireshark.org/review/14062 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-23BGP-LS: Protocol-ID aware Prefix/Adj Flags dissectionFrancesco Fondelli1-70/+276
BGP-LS is just a collector of IGP link state information. Some fields are encoded "as-is" from the IGP, hence in order to dissect them properly we must be aware of their origin, e.g. IS-IS or OSPF. So, *before* dissecting LINK_STATE attributes we must get the 'Protocol-ID' field that is present in the MP_[UN]REACH_NLRI attribute. The tricky thing is that there is no strict order for path attributes on the wire, hence we have to keep track of 1) the 'Protocol-ID' from the MP_[UN]REACH_NLRI and 2) the offset/len of the LINK_STATE attribute. We store them in per-packet proto_data and once we got both we are ready for the LINK_STATE attribute dissection. Change-Id: Ibe2b7f5c9039ad63a72f3f9fb8a9c33c0be44ed0 Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com> Reviewed-on: https://code.wireshark.org/review/13970 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-23Have "make maintainer-clean" remove extcap/Makefile.in.Guy Harris1-0/+3
(Is there some reason why automake doesn't make this happen by default?) Change-Id: I1a4fff32696012d0fd83faf86a2f40df4ea5fa80 Reviewed-on: https://code.wireshark.org/review/14085 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-23Explicitly require autoconf 2.64.Guy Harris2-4/+4
AX_APPEND_FLAG requires it, and we use AX_APPEND_FLAG, so explicitly require it up front. Change-Id: Ieff378e63eba245fdf1454bc388b6be7fc94a10c Reviewed-on: https://code.wireshark.org/review/14084 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-23Making wiretap option blocks more generic.Michael Mann26-1019/+1713
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>
2016-02-22wmem: add null-terminator support.Dario Lombardo3-0/+45
This change makes wmem_array more similar to GArray by adding two functions that mimic the first two params of g_array_new(). Change-Id: Iaec999cd2e44f79f44d766be5d39741b73602e5a Reviewed-on: https://code.wireshark.org/review/13989 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2016-02-22caputils: fix crash when calling 'dumpcap -i' without having WinPcap installedPascal Quantin1-1/+2
Add a test on err_str buffer presence before trying to use it, like what is done in other code paths. Bug: 12143 Change-Id: I30ae49a33224dc190c202637767df9d7de2c0f2b Reviewed-on: https://code.wireshark.org/review/14074 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-22LTE RRC: add a unit to gnss-TOD-msec fieldPascal Quantin2-0/+2
Change-Id: I48b15d47d9bdf1bb4078a03ee7183f05bb57fa04 Reviewed-on: https://code.wireshark.org/review/14072 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-22HTTP2: Reduce resource usage.Tatsuhiro Tsujikawa1-18/+141
Cache decoded header fields in order to conserve memory. If we try to decompress more than 256 KB or find 200 or more headers stop decompressing and add an expert item. Note that we might want to make the maximum values configurable via preferences. Bug:12077 Change-Id: Idf7cb1046c96cf87e1b53af6c56e19b4abad1dfb Reviewed-on: https://code.wireshark.org/review/13746 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-22Cisco Marker: Fix endian type for some fieldPeter Membrey1-8/+8
Fixed several decoded fields that were poorly described in the original documentation Change-Id: I688c5fd7e011d0dd49fb201ca294348d177bb4fa Reviewed-on: https://code.wireshark.org/review/14067 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-22Fix some hf_ field datatype conflicts.Michael Mann21-86/+85
'ieee17221.clock_source_id' exists multiple times with NOT compatible types: FT_UINT16 and FT_UINT64 'ieee17221.stream_format' exists multiple times with NOT compatible types: FT_NONE and FT_UINT64 'afp.unknown' exists multiple times with NOT compatible types: FT_UINT16 and FT_BYTES 'afp.toc_offset' exists multiple times with NOT compatible types: FT_NONE and FT_UINT64 'bootp.client_id.iaid' exists multiple times with NOT compatible types: FT_UINT32 and FT_STRING 'bthfp.chld.mode' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8 'canopen.pdo.data' exists multiple times with NOT compatible types: FT_STRINGZ and FT_BYTES 'canopen.sdo.data' exists multiple times with NOT compatible types: FT_UINT32 and FT_BYTES 'ceph.msg.' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'ceph.version' exists multiple times with NOT compatible types: FT_UINT16 and FT_UINT64 'cip.linkaddress' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8 'dnp3.al.ana' exists multiple times with NOT compatible types: FT_FLOAT and FT_INT32 'dnp3.al.anaout' exists multiple times with NOT compatible types: FT_FLOAT and FT_INT32 'dtls.handshake.cert_url.url_hash_len' exists multiple times with NOT compatible types: FT_STRING and FT_UINT16 'ssl.handshake.cert_url.url_hash_len' exists multiple times with NOT compatible types: FT_STRING and FT_UINT16 'dvb-s2_gse.label' exists multiple times with NOT compatible types: FT_UINT24 and FT_ETHER 'fcdns.rply.fc4type' exists multiple times with NOT compatible types: FT_NONE and FT_UINT8 'fcdns.req.fc4type' exists multiple times with NOT compatible types: FT_NONE and FT_UINT8 'icmp.int_info.name' exists multiple times with NOT compatible types: FT_STRING and FT_BOOLEAN 'icmpv6.ilnp.nb_locs' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT8 'icmpv6.ilnp.nb_locs' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'mausb.clear_transfers.status' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_NONE 'mikey.v' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_NONE 'mswsp.rangeboundry.ultype' exists multiple times with NOT compatible types: FT_STRING and FT_UINT32 'mswsp.arrayvector.address64' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'nlm.lock.l_offset' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'nlm.lock.l_len' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'pflog.saddr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pflog.daddr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pflog.saddr' exists multiple times with NOT compatible types: FT_BYTES and FT_IPv6 'pflog.daddr' exists multiple times with NOT compatible types: FT_BYTES and FT_IPv6 'pgm.spm.path' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.nak.src' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.nak.grp' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.poll.path' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv4 and FT_IPv6 'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.opts.redirect.dlr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 Change-Id: Iaf694699d108a12db172da8dd9fbab211adb329d Reviewed-on: https://code.wireshark.org/review/14070 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-02-22packet-cigi.c: Fix conflicting datatypes for hf_ fields.Michael Mann1-118/+107
'cigi.entity_control' exists multiple times with NOT compatible types: FT_FLOAT and FT_STRINGZ 'cigi.entity_control' exists multiple times with NOT compatible types: FT_STRINGZ and FT_FLOAT 'cigi.art_part_control.yaw_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8 'cigi.rate_control.part_id' exists multiple times with NOT compatible types: FT_UINT8 and FT_INT8 'cigi.view_control.yoff_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8 'cigi.view_control.zoff_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8 'cigi.view_control.roll_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8 'cigi.view_control.pitch_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8 'cigi.view_control.yaw_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8 'cigi.short_symbol_control.value1' exists multiple times with NOT compatible types: FT_FLOAT and FT_UINT32 'cigi.short_symbol_control.value2' exists multiple times with NOT compatible types: FT_FLOAT and FT_UINT32 Also replace some homemade true_false_string with some from tfs.h Change-Id: Ied8dfb320abb6f3218304fd06c5481167f1169ec Reviewed-on: https://code.wireshark.org/review/14069 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-22Separate hf_ fields that share filter names with FT_UINT32 and FT_UINT64 ↵Michael Mann14-59/+59
datatypes. 'bitcoin.addr.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.inv.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.getdata.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.notfound.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.getblocks.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.getheaders.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.tx.input_count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.tx.in.script_length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.tx.output_count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.tx.out.script_length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.block.num_transactions' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.headers.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.merkleblock.flags.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.merkleblock.hashes.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.string.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'bitcoin.data.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'dcerpc.referent_id' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'dmp.body.id' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'edonkey.start_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'edonkey.end_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.entry' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.phoff' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.shoff' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.p_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.p_vaddr' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.p_paddr' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.p_filesz' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.p_memsz' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.p_align' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.sh_addr' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.sh_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.sh_size' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.sh_addralign' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.sh_entsize' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.symbol_table.value' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.symbol_table.size' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.dynamic.tag' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.dynamic.value' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.dynamic.pointer' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.dynamic.ignored' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'elf.dynamic.unspecified' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'h248.contextId' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'hcrt.data32' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'wlan_mgt.fixed.psmp.stainfo.reserved' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'isakmp.tf.attr.life_duration' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'isakmp.ike.attr.life_duration' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'jxta.message.element.content.length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'rmt-lct.tsi' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'rmt-lct.toi' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'smb.alloc_size' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 'trmac.response_code' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32 Change-Id: I903933e6448bac3d3374eef1a6a0bc4771c1a9f4 Reviewed-on: https://code.wireshark.org/review/14060 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-22Resolve hf_ field name conflicts with protocol strings.Michael Mann6-38/+5
Change-Id: Ie719e2f14c6eaf536035ab30dcb40e91c431c6e4 Reviewed-on: https://code.wireshark.org/review/14061 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-22pvfs2: read a 64bit value in one goMartin Kaiser1-3/+1
Change-Id: If630e03f82add403cb978969a8ebbb6f0bbcbad0 Reviewed-on: https://code.wireshark.org/review/14064 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: Michael Mann <mmann78@netscape.net>
2016-02-21sigcomp: don't THROW() an exception from a dissectorMartin Kaiser1-2/+27
when there's a decompression failure, we already flag up an expert info and exit we can just delete the exception in dissect_udvm_reference_operand_memory(), we return 0 on error and let the caller do a check Change-Id: I2cd301896794260457f57209e5efc0939b27b339 Reviewed-on: https://code.wireshark.org/review/14063 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-21tshark: load decode_as_entries fileMichael Mann5-13/+30
With Wireshark 2.0, some dissector preferences were removed in favor of 'Decode As' functionality. But the settings saved in the GUI are not loaded in tshark, preventing their use without an explicit call to '-d' option. Let's load decode_as_entries file by default and have it overridden by the '-d' option if required. Ping-Bug: 12124 Change-Id: I134a424cb6cf8fc89b7096a659ef1605314a70a2 Reviewed-on: https://code.wireshark.org/review/13956 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-21autotools: Add GLib/GTK configuration definitions to package cflagsJoão Valverde1-29/+38
Change-Id: I67e1d41ded89114db80dd33b966840fca6175eb0 Reviewed-on: https://code.wireshark.org/review/14048 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-02-21autotools: Improve libnl configuration and dependencyJoão Valverde3-12/+11
Change-Id: I3de7c2a6292a2f3fc57fdb849c23c3b31f6e4a13 Reviewed-on: https://code.wireshark.org/review/14052 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21[Automatic update for 2016-02-21]Gerald Combs17-4690/+5635
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I80f7d5b45ef26dc4fb1ca34d549acfb2c0a54bcf Reviewed-on: https://code.wireshark.org/review/14054 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-21[SPICE] Prevent really long loop in dissect_spice_link_capabilities.Michael Mann1-61/+49
Not all paths will access the tvb to have it throw a bounds error for large loop values. Bug: 12151 Change-Id: I74a6d0d8ddece0f95027493a7d408cc54d94d25a Reviewed-on: https://code.wireshark.org/review/14051 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-02-21Fix typo in PTP / Follow_Up Message / Follow Up information TLV.Michael Mann1-4/+4
scaledLastGMPhaseChange -> scaledLastGmFreqChange Bug: 12150 Change-Id: I7b3d58c7d59364acb029e87f42da464c8840b95a Reviewed-on: https://code.wireshark.org/review/14050 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-21autotools: Use pkg-config autoconf macros for GLib/GTKJoão Valverde43-802/+253
Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add dependency flags explicitly instead of using WS_CPPFLAGS. Some minor improvements and fixes for missing/unnecessary variables (no impact on our test builds). Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671 Reviewed-on: https://code.wireshark.org/review/14005 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21autotools: Cleanup some installation directory stuffJoão Valverde4-28/+8
Replace hacky code to set install dirs in config.h and use path definitions only where required. Change-Id: I78735f730725382c1b3aca876705e5e6e1872d78 Reviewed-on: https://code.wireshark.org/review/14033 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21autotools: Fix multiple repetitions of -L build flagsJoão Valverde3-2/+74
Before: WS_LDFLAGS=' -Wl,--as-needed -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib' After: WS_LDFLAGS=' -Wl,--as-needed -L/usr/local/lib' Bumps autoconf required version to 2.64. Change-Id: Idac0e0382481ddd954b07d9ac729f33c9d11639a Reviewed-on: https://code.wireshark.org/review/14041 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-02-21No need to export the 48-byte-header Linux USB dissector.Guy Harris1-3/+2
Nobody looks it up, so just register it in the wtap_encap table, as we do with the 64-byte-header Linux USB dissector, the USBPCAP dissector, and the FreeBSD USB dissector. Change-Id: I5da098d799a63449f17a26924b3ba2de36536896 Reviewed-on: https://code.wireshark.org/review/14046 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-21Disssect the flags fields in the FreeBSD USB headers.Guy Harris1-4/+245
Change-Id: I6f59028b1134378762691c35897cfcdc04e6dbfe Reviewed-on: https://code.wireshark.org/review/14045 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-20ieee80211: handle reserved grouping valuePeter Wu1-0/+8
Prevents a buffer overrun (read). Show expert info such that it can be detected (in case the value is non-reserved in the future). Bug: 11818 Change-Id: I6cd2f4c9deb5cb515a53743aa83193521b2331e8 Reviewed-on: https://code.wireshark.org/review/14040 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-20MIP6: fix mip6.lri.reserved exists multiple times with NOT compatible types: ↵Alexis La Goutte1-3/+3
FT_BOOLEAN and FT_UINT16 It is a typo on display field and fix also wrong comment... Change-Id: Idb93641d6e4197b59e453e4ad629af4c0454c8d3 Reviewed-on: https://code.wireshark.org/review/14038 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-20DLM3: Remove macro for declare header field (hf)Alexis La Goutte1-241/+506
checkhf don't like macro and for avoid warning/error, remove macro for declare hf Change-Id: I5521b3176027ddc673e8f6c793ab4eb0d01cd8fd Reviewed-on: https://code.wireshark.org/review/14018 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-20MIH: fix exists multiple times with NOT compatible typesAlexis La Goutte1-4/+4
'mih.tlv_length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT8 'mih.mihf_id' exists multiple times with NOT compatible types: FT_ETHER and FT_STRING 'mih.mihf_id' exists multiple times with NOT compatible types: FT_IPv4 and FT_ETHER 'mih.mihf_id' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 Change-Id: Ib4be551920c7389100ece668e1af288a7d712725 Reviewed-on: https://code.wireshark.org/review/14027 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-20Fix various off-by-one in buffer sizesPeter Wu5-14/+14
Some only allow buffer overruns (read), others also buffer overflows (write). Found by looking for '\[ *N *\]' where N is 255, 0xff, 15 and 0xf (case insensitive). Change-Id: I250687e2fdeb8fbd5eaf0bbb8251c3dab9640760 Reviewed-on: https://code.wireshark.org/review/14034 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-02-20ber: fix buffer overrun when handling empty setsPeter Wu1-0/+4
When a set is empty, only a terminator (ber_sequence_t with NULL func) is present. In that case, do not try to find more values as that will never succeed. Bug: 12106 Change-Id: I26cd4ba84a9580e92d5921592a27c2af17c0bebf Reviewed-on: https://code.wireshark.org/review/14028 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-02-20gsm_abis_oml: fix buffer overrunPeter Wu1-1/+1
Do not read outside boundaries when tag is exactly 0xff. tag = tvb_get_guint8(tvb, offset); tdef = find_tlv_tag(tag); ... return &nm_att_tlvdef_base.def[tag]; Bug: 11825 Change-Id: I42e624185abb2166aa0f8d0dbd71a2a86fc0b18e Reviewed-on: https://code.wireshark.org/review/14030 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-02-20sober: fix cannot optimize loops warning [-Wunsafe-loop-optimizations]João Valverde1-4/+4
Change-Id: I180b1ef53f9adcf4625d0cf9ee35066aa21ee59b Reviewed-on: https://code.wireshark.org/review/13934 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-20autotools: Use Qt flags only for building Qt GUIJoão Valverde4-5/+4
Change-Id: I041e2fab6de948c803cc059e78358077000efee8 Reviewed-on: https://code.wireshark.org/review/14006 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-02-20Qt: only "Comment" column should be editable in Local Interfaces management tabPascal Quantin2-1/+12
Bug: 12146 Change-Id: Ife481b7c0b201a54749e212416571aa3dcaf7542 Reviewed-on: https://code.wireshark.org/review/14017 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> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-20autotools: Move common automake code for plugins to an include fileJoão Valverde16-804/+109
Change-Id: Icac1eb17ff78ae5ae54b61820618bf3c5733bd96 Reviewed-on: https://code.wireshark.org/review/14003 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-20Fix indentation.Guy Harris1-1/+1
Change-Id: I4737a3410cde2d8ead79b42d9734b4412cb5ca77 Reviewed-on: https://code.wireshark.org/review/14026 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-20Initial support for FreeBSD USB captures.Guy Harris4-27/+327
(There's also work needed in libpcap; that's also in progress.) Change-Id: Iff5a34c139a000865e2d78cc17a4af5ff24fb44b Reviewed-on: https://code.wireshark.org/review/14025 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-20Qt: Set maximumSize on AccordionFrame widget buttonsStig Bjørlykke2-0/+24
After switching to QPushButton for buttons in SearchFrame and GoToFrame the widgets needs a maximum size to reduce the height of the frame. Change-Id: I504e65add446c4262e9b1e02ff3e41c08d1cfdfd Reviewed-on: https://code.wireshark.org/review/14019 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-20Couchbase: Dissect optional expiry in subdoc mutation requestsDave Rigby1-13/+38
Add support for dissecting the optional 4-byte expiry field in sub-document API request packets. This is permitted for any single-path mutation request; increasing the length of the extras section from 3 to 7 bytes. Change-Id: I0609dbc6f6a8e62028cd20a28609fc3016e44910 Reviewed-on: https://code.wireshark.org/review/14004 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-20Put back a define to make the Lua build happy.Guy Harris1-1/+7
DO NOT USE THIS FOR ANYTHING NEW. Change-Id: Iee2ddaa2eeb735b33aef9e81b32bb4a3535e3451 Reviewed-on: https://code.wireshark.org/review/14023 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-19Get rid of PCAP_ENCAP_USB.Guy Harris3-11/+1
It doesn't correspond to anything we support - and the old Linux USB LINKTYPE_ value of 186 doesn't give enough information to dissect the packets (it discards the event type, for example), so we drop the rest of our support for it as well. Change-Id: I6f537d9263174aba4320edf5140e1d1540e979c8 Reviewed-on: https://code.wireshark.org/review/14020 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-19Fix implicit conversion from 64 to 32 bitsJoão Valverde4-5/+9
Change size_t to something that is guaranteed to fit in a socklen_t. Fix incorrect AC_DEFINE too. Change-Id: I710f32fb1e5bd4f51843d380aa8ed8b6acd98c02 Reviewed-on: https://code.wireshark.org/review/14009 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-19Qt: Fix Open protocol preferences button.Stig Bjørlykke1-1/+1
Do showProtocolPreferences before removing the variable which this depends on. The button does not work without at module. Change-Id: I7d31aa5ab19340a4102523b13de961e799cae5e4 Reviewed-on: https://code.wireshark.org/review/14015 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-19rsl: avoid buffer overreadPeter Wu1-1/+1
Fixes a buffer overrun in dissct_rsl_ipaccess_msg when the tag is exactly 0xff: tag = tvb_get_guint8(tvb, offset); tdef = &rsl_att_tlvdef.def[tag]; Bug: 11829 Change-Id: I25a3c6948242a52f59431ce84c108b2e52008930 Reviewed-on: https://code.wireshark.org/review/14011 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-02-19Add inet_pton/inet_ntop interface to libwsutilJoão Valverde20-273/+219
Change-Id: Ifc344ed33f2f7ca09a6912a5adb49dc35f07c81f Reviewed-on: https://code.wireshark.org/review/13881 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-02-19BER/PER: Add dissector assertions to squelch scan-build bugsJoão Valverde2-0/+4
packet-per.c:959:6: warning: Access to field 'aligned' results in a dereference of a null pointer (loaded from variable 'actx') packet-ber.c:1606:29: warning: Access to field 'pinfo' results in a dereference of a null pointer (loaded from variable 'actx') packet-ber.c:1612:24: warning: Access to field 'created_item' results in a dereference of a null pointer (loaded from variable 'actx') packet-ber.c:3156:41: warning: Access to field 'pinfo' results in a dereference of a null pointer (loaded from variable 'actx') packet-ber.c:3182:24: warning: Access to field 'created_item' results in a dereference of a null pointer (loaded from variable 'actx') Change-Id: Ibae00dc29a869701fe903a5b0c9944279aaa3df7 Reviewed-on: https://code.wireshark.org/review/13936 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-02-19DLM3: Add support for the Need Slots Recovery Command Status FlagAndreas Gruenbacher1-5/+68
DLM3 minor version 1, introduced in mainline kernel commit 757a4271 from October 2011, added some fields and a Need Slots flag to Recovery Command Status packets. Change-Id: Ib994223afeae6b8d6ddb75404ab2031c5a63185b Reviewed-on: https://code.wireshark.org/review/13983 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-23 07:15:06 +0000