Commit Graph

48869 Commits

Author SHA1 Message Date
Gerald Combs 34e2a96d0b Define NOMINMAX for the entire Qt build.
svn path=/trunk/; revision=51955
2013-09-11 19:59:22 +00:00
Martin Kaiser 52bcaf69af remove unused variable, mark unused parameter
svn path=/trunk/; revision=51954
2013-09-11 19:49:16 +00:00
Anders Broman e3cccd17f4 Get rid of some users the addrinfo_list.
svn path=/trunk/; revision=51953
2013-09-11 19:22:24 +00:00
Chris Maynard bf59c708f8 Instead of prepending "LLC " to the UI table name, just modify the table name.
svn path=/trunk/; revision=51952
2013-09-11 18:06:29 +00:00
Gerald Combs 6986eb4866 Move a lot of includes from follow_stream_dialog.h to
follow_stream_dialog.cpp. Remove the ones that we don't use. Use
QMessageBox in place of simple_dialog.

Move IP6OPT_HOME_ADDRESS and related definitions to packet-ipv6.c. It
looks like we only use it there and it conflicts with WinPcap.

Mark some items unused.

svn path=/trunk/; revision=51951
2013-09-11 17:39:49 +00:00
Chris Maynard 2d132d3a38 Add a link to IANA's Assigned Internet Protocol Numbers page.
svn path=/trunk/; revision=51950
2013-09-11 17:31:24 +00:00
Gerald Combs 8daede4cf9 Make sure we can link on Windows.
svn path=/trunk/; revision=51949
2013-09-11 16:18:17 +00:00
Anders Broman 73d116275f From Tommy Wu:
Update-Reason should be an integer.

svn path=/trunk/; revision=51948
2013-09-11 04:56:44 +00:00
Gerald Combs eb6d67d149 Use the correct GnuTLS include directory.
svn path=/trunk/; revision=51947
2013-09-10 22:25:41 +00:00
Pascal Quantin d7cdca59d6 Update User Guide
svn path=/trunk/; revision=51946
2013-09-10 22:19:24 +00:00
Gerald Combs ef6ad2800e Add a hack to allow builds to succeed on 64-bit systems.
svn path=/trunk/; revision=51945
2013-09-10 22:01:42 +00:00
Pascal Quantin 33beb2609a Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9116 :
README.stats_tree shows the wrong function parameters for stats_tree_register

svn path=/trunk/; revision=51944
2013-09-10 21:43:51 +00:00
Gerald Combs 17678f9b5d Homebrew installs gettext (including libintl, which GLib requires) in
/usr/local/opt/gettext. Tell CMake to update our include and library
paths accordingly.

svn path=/trunk/; revision=51943
2013-09-10 21:24:52 +00:00
Pascal Quantin 84069ac0eb From Philippe Rosenfeld via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9126 :
Fix the value of 'SEND_TO_UE' in the DIAMETER Gx dictionary for Packet-Filter-Usage AVP

svn path=/trunk/; revision=51942
2013-09-10 21:18:28 +00:00
Pascal Quantin 10193e1ef2 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9128 :
ZigBee ZCL epoch is January 1, 2000

svn path=/trunk/; revision=51939
2013-09-10 19:37:13 +00:00
Martin Kaiser eee252d372 proto_tree -> proto_item
svn path=/trunk/; revision=51936
2013-09-10 17:55:31 +00:00
Gerald Combs 8a5db6b66c Add newlines to the AsciiDoc output.
svn path=/trunk/; revision=51930
2013-09-10 15:39:05 +00:00
Martin Kaiser 4b0a906f78 remove unnecessary if (tree)
no need for tvb_ensure_bytes_exist()
replace += 1;; with ++;

svn path=/trunk/; revision=51929
2013-09-10 15:01:52 +00:00
Stig Bjørlykke db96634f08 Enable Lua ldap, smb and smb2 taps
svn path=/trunk/; revision=51928
2013-09-10 11:18:41 +00:00
Balint Reczey ed31edea01 Make compare-abis.sh work with versions having multiple digits in version number
svn path=/trunk/; revision=51927
2013-09-10 11:10:00 +00:00
Stig Bjørlykke 152a9c5982 Added TreeItem prepend_text().
svn path=/trunk/; revision=51924
2013-09-10 10:35:30 +00:00
Guy Harris d5909d38a1 Use -m32, instead, as per Michael Tuexen's suggestion.
svn path=/trunk/; revision=51923
2013-09-10 10:28:30 +00:00
Stig Bjørlykke 860856b424 Fixed some NSTime error texts.
svn path=/trunk/; revision=51922
2013-09-10 10:27:47 +00:00
Guy Harris 2891a58aa8 When building for 10.4 or 10.5, force 32-bit x86 on x86 and 32-bit PPC
on PPC.

svn path=/trunk/; revision=51921
2013-09-10 10:24:00 +00:00
Stig Bjørlykke 8bde188792 Fixed FieldInfo documentation.
svn path=/trunk/; revision=51920
2013-09-10 10:07:40 +00:00
Anders Broman 9378661d4e From Selvamegala:
GTS starting slot in the Beacon frame is not parsed correctly. As per the Spec, in the 3byte gts descriptor value bit 0- 15  refers Device Short address bit 16-19 – Starting slot bit 20-23 – GTS length.

(I Dug out the onliner from the attached file)

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8946

svn path=/trunk/; revision=51919
2013-09-10 06:32:41 +00:00
Anders Broman 0bb9585cd6 Freom Dennis:
As I looked into the implementation in epan/dissectors/packet-ieee802a.c, there's a bug in the dissect_ieee802a(). After OUI and PID is parsed, it looks for the customized sub-dissector_table by 
oui_info = (oui_info_t *)g_hash_table_lookup(oui_info_table, GUINT_TO_POINTER(oui))
The problem is that the oui is defined as an array (guint8 oui[3]), whose value contains the 3-byte customized OUI. However, here GUINT_TO_POINTER(oui) converts the local array oui's address to the hash table key, instead of the value. That cause the search in the hash table to fail, because the ieee802_add_oui() use the OUI value as the key.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9122

svn path=/trunk/; revision=51918
2013-09-10 06:06:55 +00:00
Anders Broman 60aaa2d842 Change the default preference on how to dissect dunneled data to GTP_TPDU_AS_TPDU.
svn path=/trunk/; revision=51917
2013-09-10 05:47:28 +00:00
Anders Broman b1e6fc8411 From: Michal Labedzki <michal.labedzki@tieto.com>
Subject: [PATCH] NFC: PN532: Implement half of PN532 specification

Implement TG_* and RF_* commands/responses.
Also decode "status" field in all commands.
Update USB CCID to decode "escaped" payload.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9119

svn path=/trunk/; revision=51916
2013-09-10 05:43:17 +00:00
Guy Harris 8646abfc17 It's such fun to have four count 'em four different build systems
(autotools, CMake, nmake, qmake).  Throw something at qmake in the hopes
of letting it use GnuTLS in the "follow SSL stream" code.

svn path=/trunk/; revision=51915
2013-09-10 01:18:09 +00:00
Evan Huus fca3bb6ad4 Restart the splash timer *after* the paint has completed, so that in situations
when the paint takes a long time (for very large windows, or on older machines)
that doesn't cause every single event to paint (which slows the whole thing to
a crawl). Drop the splash timer to 15ms, since we're no longer counting paints
this seems like a more appropriate value. The old value of 50ms would causing
the splash to only paint once or twice during startup.

svn path=/trunk/; revision=51914
2013-09-10 01:08:07 +00:00
Guy Harris 6a06b06006 Explicitly refer to ui/follow.h, as we do with other header files from
the ui directory, so see if that fixes the build issues.

svn path=/trunk/; revision=51913
2013-09-10 00:15:15 +00:00
Guy Harris 0df1640896 Get rid of a whole bunch of things that are supposed to be included by
source files rather than header files in most if not all cases.

svn path=/trunk/; revision=51908
2013-09-09 23:33:51 +00:00
Chris Maynard d3f277c015 More dissector table UI name changes (a continuation of r51904).
svn path=/trunk/; revision=51907
2013-09-09 22:30:40 +00:00
Guy Harris bc48d52d04 "uni", in "unistd.h", stands for "Unix". Only include it if we have it,
which we don't on Windows.

svn path=/trunk/; revision=51905
2013-09-09 22:21:36 +00:00
Chris Maynard 0c41507bad Change some internal dissector table UI names so it's clear which protocol they pertain to and it's easier to find in the list.
svn path=/trunk/; revision=51904
2013-09-09 21:55:57 +00:00
Stig Bjørlykke 408b498a12 Return ByteArray as "value" for FieldInfo's with type FT_NONE (which has data).
This fixes bug 5201.

svn path=/trunk/; revision=51903
2013-09-09 21:42:49 +00:00
Pascal Quantin 8fbfb0f4fd Add svn:mime-type property to follow_stream_dialog.ui
svn path=/trunk/; revision=51902
2013-09-09 21:32:45 +00:00
Chris Maynard 9d49aa7dd7 Replace the simpler chop example with a more detailed example.
svn path=/trunk/; revision=51901
2013-09-09 21:32:03 +00:00
Jeff Morriss fb6d18fe0d Set *.ts files' mime type to be XML; set svn properties on tools/pre-commit.
svn path=/trunk/; revision=51900
2013-09-09 21:24:54 +00:00
Stig Bjørlykke f8624cef20 Initialize all tvb values in FieldInfo_get_range.
This fixes bug 5200.

svn path=/trunk/; revision=51899
2013-09-09 21:20:26 +00:00
Guy Harris fb621af77a But we *do* have to include <zlib.h> here.
svn path=/trunk/; revision=51898
2013-09-09 21:12:49 +00:00
Guy Harris 0f849713dc Another "this depends on a ui_XXX.h" required to force the ui_XXX.h to
be built.

svn path=/trunk/; revision=51897
2013-09-09 21:09:03 +00:00
Chris Maynard c3fe87f04b With the change from r51895, revert r51894.
svn path=/trunk/; revision=51896
2013-09-09 21:09:00 +00:00
Pascal Quantin e5947cfa45 Cleanup follow.h a bit:
- no need to include zlib.h
- sgetline() function is not used outside of follow.c

svn path=/trunk/; revision=51895
2013-09-09 21:04:41 +00:00
Chris Maynard 85cb27ba2e Add $(ZLIB_CFLAGS) to the GENERATED_CFLAGS list to fix compile error.
svn path=/trunk/; revision=51894
2013-09-09 21:02:07 +00:00
Pascal Quantin 9ac9114f98 Add missing svn properties
svn path=/trunk/; revision=51893
2013-09-09 20:43:31 +00:00
Jörg Mayer 18a8525a54 While the previous fix to this file added the ; at the end,
it shoud have added _;

Was the original commit compile tested before committing?

svn path=/trunk/; revision=51892
2013-09-09 20:37:50 +00:00
Jörg Mayer 0a20370169 Make follow_stream_dialog.h compile.
Question: Should all this stuff really be included in the .h file
or in the .cpp file(s)?

svn path=/trunk/; revision=51891
2013-09-09 20:33:09 +00:00
Jörg Mayer 1d095d1b56 Add a missing ;
svn path=/trunk/; revision=51890
2013-09-09 20:25:59 +00:00