aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2016-08-02Fix checkAPI warning for printf.Michael Mann1-1/+2
Another legitimate use, so use ws_debug_printf. Change-Id: I9bebe01e80987caf8e18a59b93a48f9a2d6ee397 Reviewed-on: https://code.wireshark.org/review/16835 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-08-02Remove trailing "." from OID strings.Guy Harris1-0/+5
The previous change removed code that did that. Change-Id: If297018f5902af7a2d9cacb0cc9a5f1ffe1e1d00 Reviewed-on: https://code.wireshark.org/review/16834 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-01Add OSI Layer 4 to exported PDU to handle TCP and UDP payloads.Michael Mann6-10/+340
This allows for much easier anonymized captures for protocols running atop TCP/UDP. Added support for "TCP dissector data" tag within export PDU (34) so that the tcpinfo struct that TCP dissector normally passes to its subdissectors can be saved. Change-Id: Icd63c049162332e5bcb2720159e5cf8aac893788 Reviewed-on: https://code.wireshark.org/review/16285 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-01Reorder ns_dir_vals into numerical orderMichael Mann1-39/+40
Change-Id: I21a50015dd382c62aa2dc84d90bbb4b86ea8b1dc Reviewed-on: https://code.wireshark.org/review/16825 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-08-01IPv6: Display reassembly information under root_treeJoão Valverde1-1/+1
Change-Id: Ibfa934dba59f96b8820d2616d4d3d3990af00918 Reviewed-on: https://code.wireshark.org/review/16822 Reviewed-by: João Valverde <j@v6e.pt>
2016-08-01Remove checkAPI warnings from wmem.Michael Mann3-9/+11
printf and g_warning are not allowed in epan or its subdirectories Change-Id: I4c07a7258f4c9566384bef93af35c350b5c88758 Reviewed-on: https://code.wireshark.org/review/16801 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-31IPv6: Expand blurb for IPv4 embedded addressesJoão Valverde1-3/+3
Change-Id: I540e80517092ab1e475532d8e20a54be24858c5d Reviewed-on: https://code.wireshark.org/review/16816 Reviewed-by: Binh Trinh <beango@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-31wireshark: update WERR definitions from Samba's werror.h.Günther Deschner1-98/+2631
Guenther Change-Id: I457f50dcf86f6e7c74afd9ff773aaf8bfdb52426 Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-on: https://code.wireshark.org/review/16722 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-31BER: Fix segmentation fault when configuring new OIDsVasil Velichckov1-0/+5
Program terminated with signal 11, Segmentation fault. #0 0x00007f573e5bdecf in uat_fld_chk_oid (u1=0x2eb1830, strptr=0x7f573c8431e4 "", len=0, u2=0x0, u3=0x0, err=0x7ffee1668748) at uat.c:494 494 if(strptr[len-1] == '.') { (gdb) (gdb) bt #0 0x00007f573e5bdecf in uat_fld_chk_oid (u1=0x2eb1830, strptr=0x7f573c8431e4 "", len=0, u2=0x0, u3=0x0, err=0x7ffee1668748) at uat.c:494 #1 0x0000000000485dfc in uat_dlg_cb (win=0x3844290, user_data=0x3632bc0) at uat_gui.c:364 #2 0x00007f573b2f19a7 in _g_closure_invoke_va (closure=0x3367130, return_value=0x0, instance=0x3844290, args=0x7ffee1668a78, n_params=0, Change-Id: Ic61480f8c1f2cd833c58de0b2acc24dcb831578f Reviewed-on: https://code.wireshark.org/review/16800 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: Stig Bjørlykke <stig@bjorlykke.org>
2016-07-31IPv6: Remove an unused #define and two macrosJoão Valverde1-6/+3
Change-Id: I0866e4b28b660063ab351022ac943bb5717b5a23 Reviewed-on: https://code.wireshark.org/review/16811 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-07-31packet-erf.c: Pacify OS X buildbot.Michael Mann1-1/+1
Change-Id: I6ec30e77eac91d1b02eaddada75741b2063426f2 Reviewed-on: https://code.wireshark.org/review/16812 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-31oids.c: Use wmem_strbuf instead of trying to accommodate snprintf.Michael Mann1-17/+6
Change-Id: I5222fbd07b7d1301386f7a206fef688793dd6be7 Reviewed-on: https://code.wireshark.org/review/16802 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-31Cleanup the final checkAPI g_warning complaints.Michael Mann1-1/+2
Change-Id: I7606ee55be4428909e255496c0344fffe5847f02 Reviewed-on: https://code.wireshark.org/review/16804 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-31IPv6: Fix typo in comment from gd2cd779Binh Trinh1-1/+1
Change-Id: Id1a053c189fdd374da2447123e5e47d80000b802 Reviewed-on: https://code.wireshark.org/review/16805 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-31[Automatic update for 2016-07-31]Gerald Combs2-13/+198
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia414edeaf04efafd0b5eb2e899dbc69d5b42f07d Reviewed-on: https://code.wireshark.org/review/16807 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-31ERF: Add ERF_TYPE_META clock tagsAnthony Coddington1-152/+380
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-31packet-smb2: fix field type of hf_smb2_ea_data_lenHiroshi Ioka1-1/+1
Change-Id: I85f1ab8777f178dd710564eb0cb15f19383677a7 Reviewed-on: https://code.wireshark.org/review/16798 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-31IPv6: Add support for embedded IPv4 addressess (RFC 6052)Binh Trinh1-0/+43
For Well-Known Prefix 64:ff9b::/96. Change-Id: Ib2d7b42b9c7e6bbe388dca46d6a5eb516242c881 Reviewed-on: https://code.wireshark.org/review/16780 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-07-31Fix indentationJoão Valverde2-4/+4
Change-Id: I6b0c7cda7130f1912b9a83991b43f234ff9d9cec Reviewed-on: https://code.wireshark.org/review/16797 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-31IPv6: Move a declarationJoão Valverde1-8/+8
Change-Id: I94ace6b1837e1f3398a2784945322cde91d4d232 Reviewed-on: https://code.wireshark.org/review/16796 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-31IPv6: Capitalize some field namesJoão Valverde1-7/+7
Change-Id: Ie1d95b521a354df69b4a70b0a8fb209eb97a07fd Reviewed-on: https://code.wireshark.org/review/16795 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-31packet-nstrace.c: General cleanupMichael Mann1-228/+127
Motivation was to clean up the use of offsetof() as the structure definitions aren't necessary for Wireshark. Change-Id: I6fadce0d4823842270be89bbed6081d37254ff2b Reviewed-on: https://code.wireshark.org/review/16791 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-31Properly mask Modbus function codeMichael Mann1-1/+1
Bug: 12693 Change-Id: Ic0b226d2ba9518f9a1efe85527678daa5302cc3f Reviewed-on: https://code.wireshark.org/review/16792 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-30Use correct relative path.Guy Harris1-1/+1
The build is done in epan/wmem, so libwsutil.la is in ../../wsutil. Change-Id: I053f6b925829e9c5e9ded014fbc716abc527b46a Reviewed-on: https://code.wireshark.org/review/16790 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-30ifdef out a variable used only on Windows.Guy Harris1-1/+3
Also, fix identation - tab stops are set every 8 spaces, not every 4 spaces, in UN*X, which is why the mode lines specify that. Change-Id: If7cfc2cdae26feb2d5c13e31a32ed950354fb15b Reviewed-on: https://code.wireshark.org/review/16789 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-30RSVP: Wrong order of Attribute Flags TLVUli Heilmeier1-57/+54
According to RFC 5420 Section 3.1 the MSB is bit zero. Reported by Alexander Okonnikov. Bug: 12652 Change-Id: I9b414464b05ab0724a6560aa441c3f5324130fdb Reviewed-on: https://code.wireshark.org/review/16611 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-30PTP: Expose ptp_v2 value strings for use by other dissectorsAnthony Coddington3-39/+77
Also rename ptp_v2 value strings in packet-ptp for better consistency. TODO: could also be used and combined with definitions in packet-cip. Change-Id: I84a9ae566ae6abdd95910cb5709bb63c2b7c26b8 Reviewed-on: https://code.wireshark.org/review/16781 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-30Add string function times to wmem_test.Gerald Combs3-2/+162
The system, GLib, and wmem string functions can perform differently, particularly on Windows. Start adding performance tests to wmem_test so that we can see the differences. With this change applied "wmem_test --verbose" prints out the following on a Windows 7 x64 VM here. wmem_test is linked against GLib 2.4.20. (MINPERF:g_printf_string_upper_bound (via g_snprintf) 1 string: u 327.602 ms s 0 .000 ms) (MINPERF:g_printf_string_upper_bound (via g_snprintf) 5 strings: u 1419.609 ms s 0.000 ms) (MINPERF:g_printf_string_upper_bound (via g_snprintf) mixed args: u 1606.810 ms s 0.000 ms) (MINPERF:_snprintf_s upper bound 1 string: u 124.801 ms s 0.000 ms) (MINPERF:_snprintf_s upper bound 5 strings: u 140.401 ms s 0.000 ms) (MINPERF:_snprintf_s upper bound mixed args: u 124.801 ms s 0.000 ms) (MINPERF:g_strdup_printf 2 strings: u 702.005 ms s 0.156 ms) (MINPERF:g_strconcat 2 strings: u 78.000 ms s 0.000 ms) (MINPERF:g_strdup_printf 5 strings: u 1419.609 ms s 0.156 ms) (MINPERF:g_strconcat 5 strings: u 93.601 ms s 0.156 ms) (MINPERF:wmem_strdup_printf 2 strings: u 343.202 ms s 0.312 ms) (MINPERF:wmem_strconcat 2 strings: u 93.601 ms s 0.468 ms) (MINPERF:wmem_strdup_printf 5 strings: u 327.602 ms s 8.268 ms) (MINPERF:wmem_strconcat 5 strings: u 62.400 ms s 3.432 ms) Change-Id: Id9b23918829db1719d141e7f830b9eba6245a25b Reviewed-on: https://code.wireshark.org/review/14857 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-30packet-simple: also dissect SIMPLE over TCPPeter Ross1-0/+1
Change-Id: I9310a6fa0b50e54a9e7febb955cdfdab560c4ba9 Reviewed-on: https://code.wireshark.org/review/16779 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-30Move IPv6 inet definitions to wsutil/inet_ipv6.hJoão Valverde3-164/+101
Change-Id: I880adf7fc1e131639f318cdecf7d8e59262d89fb Reviewed-on: https://code.wireshark.org/review/16784 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-07-30Add GeoIP database UN*X system pathJoão Valverde1-7/+18
Most distros provide GeoIP database packages that install to /usr/share/GeoIP. Use this as a system default. Change-Id: I2b4ddf7e2467263491b18a97e908a247db0ac9a3 Reviewed-on: https://code.wireshark.org/review/16767 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: 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-07-30IPv6: Add deprecation expert infosJoão Valverde1-3/+19
Change-Id: I111fd8f74388e9e4b7a9d7fd1b582d2fff86cf59 Reviewed-on: https://code.wireshark.org/review/16764 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-07-30IPv6: Add experimental routing header typesJoão Valverde1-18/+22
Change-Id: I22dfa604abd8ade21d240104bf84af815aa2bc24 Reviewed-on: https://code.wireshark.org/review/16783 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-07-29ieee80211: PMKID is incorrectly decoded under RSN Vendor specific IE in ↵Alexis La Goutte1-0/+1
EAPOL packet 1 Issue reported by Padmaja Reddy Bug:12675 Change-Id: I17323a70fdbe6f52c350a875c467c233877f4505 Reviewed-on: https://code.wireshark.org/review/16761 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-29IPv6: Use some macros to set/allocate addressesJoão Valverde1-22/+32
Change-Id: I30430841ff6f3b89cb778aed9e109a885b412a01 Reviewed-on: https://code.wireshark.org/review/16766 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-29GTPv2: fix test for flags in TWAN Identifier IE (CID 1364616)Pascal Quantin1-5/+5
Change-Id: I7b87624bd60f514f2f5e9aafe19bcebf7799bcd1 Reviewed-on: https://code.wireshark.org/review/16772 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-29GTP: fix dissection of NSAPIPascal Quantin1-1/+1
Bug: 12686 Change-Id: Icdf1fd0f24a2f667b27bb957fd932bd9c17ef0f4 Reviewed-on: https://code.wireshark.org/review/16769 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-29IPv6: Dissect unknown routing header types as dataJoão Valverde1-4/+28
Change-Id: I1fa840d24d56643515c6fc8d73967307bf1951d6 Reviewed-on: https://code.wireshark.org/review/16762 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-07-29Register IPv6 extension header dissectors to "ip.proto" tableJoão Valverde13-145/+168
We may want to add expert infos for IPv6 extension headers over IPv4 (TODO). Any side-effects that don't make sense (e.g: IPv6 Routing over IPv4) are ignored. The IPv6 Next Header decode as is replaced by IP Proto decode as. It didn't fit a conceptual model well and it also was not working very well in practice (for multiple extension headers). We now support decoding any IP Protocol number as an extension header. Bug: 12673 Change-Id: Icbde019aba8990cc556ef2bd832f64cba76c24b6 Reviewed-on: https://code.wireshark.org/review/16681 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-07-29Don't discard unknown coloring rules.Gerald Combs1-2/+2
When processing the colorfilters file, keep and disable unknown coloring rules instead of skipping over and discarding them. This should hopefully keep people from losing the standard "Checksum Errors" rule (and it's less rude in general). Change-Id: I21796c25045d9dbf7612238ce3d27b613f1ec75f Reviewed-on: https://code.wireshark.org/review/16673 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-29Enable airpdcap debugging explicitly.Gerald Combs2-11/+13
Enable airpdcap debugging with explicitly with AIRPDCAP_DEBUG instead of _DEBUG. _DEBUG might be defined automatically by Visual C++ depending on your build type and the extra output breaks the decryption tests. Change-Id: If6d918beb4d91233b07a3bc7b6f2f7e1849171f0 Reviewed-on: https://code.wireshark.org/review/16755 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-28IPv6: Fix Decode As to distinguish a null from a hop-by-hop next header.João Valverde1-12/+39
Both display as zero in the UI. We shouldn't have null values for decode as, but we do for IPv6, and the user (also the developer) can't tell them apart from an IPv6 Hop-by-hop Option extension header. NULL values are represented as IP Protocol 255 (Reserved) in the UI, intead of IP Protocol 0 (Hop-By-Hop extension header). Change-Id: I840db99df212a3bee03027b91fdec9c01886004d Reviewed-on: https://code.wireshark.org/review/16746 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-07-28IPv6: Reduce some expert info PI_PROTOCOL severitiesJoão Valverde1-11/+11
Change-Id: I87bcc47eeee05ea22c646f7ecce9374c070b1ea6 Reviewed-on: https://code.wireshark.org/review/16743 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-07-28CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX ↵Pascal Quantin1-47/+47
functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 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-07-28IPv6: Fix an incorrect bitmaskJoão Valverde1-1/+1
Change-Id: I81dfcb4fb4b10a9d951247460783f81f464c50b7 Reviewed-on: https://code.wireshark.org/review/16747 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-28[BTLE] Add Version 4.2 to ll_version_number_valsAndersBroman1-2/+3
Change-Id: I88e988e11e1cae6f2f6f6d190890b62f2beb1e92 Reviewed-on: https://code.wireshark.org/review/16745 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-28Fixed compile error in packet-ssl-utils.c when HAVE_LIBCRYPT not definedKim Kempf1-2/+2
Bug: 12680 Change-Id: I7219e38be48d1115e7e80b41337423be64776e5a Reviewed-on: https://code.wireshark.org/review/16742 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-28IPv6: Add expert info for option extension header type mismatchJoão Valverde1-11/+57
Change-Id: If9c4e609528a1b72e6d5a002292734e21650e1eb Reviewed-on: https://code.wireshark.org/review/16713 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-07-28IPv6: Add support for SMF_DPD option (RFC 6621)João Valverde1-2/+113
Change-Id: I61a1246a3f68aa03e12949e8271dd4cac055b9db Reviewed-on: https://code.wireshark.org/review/16712 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-27[BTLE] Add new Link layer Feature flags.AndersBroman1-5/+19
Change-Id: Ib646d90c6e44075e7ae67f2022dc633fe6423c20 Reviewed-on: https://code.wireshark.org/review/16724 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 10:26:11 +0000