Commit Graph

44889 Commits

Author SHA1 Message Date
Bill Meier 32834b7881 Update: Primarily to suggest calling conversation_set_dissector()
once a packet has been identified as being part of
        a particular protocol.

svn path=/trunk/; revision=47621
2013-02-11 00:12:59 +00:00
Evan Huus 2f156d0edc From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8309
Restore an else clause that appears to have been accidentally removed in r44542
which was causing TCP reassembly for SMB2 messages to fail.

svn path=/trunk/; revision=47620
2013-02-10 22:28:15 +00:00
Gerald Combs f8002de6a4 If we're using git, try pulling the SVN revision out of the commit body.
svn path=/trunk/; revision=47619
2013-02-10 22:20:31 +00:00
Guy Harris eb769ce13e Clean up some warnings (including warnings that ultimately come from
trying to modify string constants, which isn't necessarily guaranteed to
work).

svn path=/trunk/; revision=47618
2013-02-10 22:09:21 +00:00
Bill Meier f784806968 Comment out numerous unused hf_.... instances found by checkhf.
svn path=/trunk/; revision=47617
2013-02-10 20:52:21 +00:00
Guy Harris 0a20c5dd91 Add %option noinput to some Flex files, as we aren't using the input()
routine and thus don't need to have it generated - and as it produces
warnings of a routine defined but not used, we don't want to have it
generated.

svn path=/trunk/; revision=47616
2013-02-10 20:21:05 +00:00
Gerald Combs a22790ae51 Use the same destination directory everywhere. If we're building an NSIS
package, assume that we're doing a "release" build.

svn path=/trunk/; revision=47615
2013-02-10 19:45:43 +00:00
Bill Meier af28be3598 Fix a (benign) ERROR: NO ARRAY: opcua/opcua.c, hf_opcua_reassembled_data
svn path=/trunk/; revision=47614
2013-02-10 19:30:37 +00:00
Guy Harris ebacca89a7 Add %option noinput to a bunch of Flex files, as we aren't using the
input() routine and thus don't need to have it generated - and as it
produces warnings of a routine defined but not used, we don't want to
have it generated.

Squelch a casting-const-away warning.

svn path=/trunk/; revision=47613
2013-02-10 19:13:07 +00:00
Bill Meier 19ffe7eb4c Update a comment; tweak a RegEx.
svn path=/trunk/; revision=47612
2013-02-10 18:40:54 +00:00
Bill Meier 3f70cb4406 Add an "Unregistered hf!" hint to DISSECTOR_ASSERT((guint)hfindex < gpa_hfinfo.len).
svn path=/trunk/; revision=47611
2013-02-10 18:38:46 +00:00
Evan Huus ffa42bbdd8 Add svn properties and modelines.
svn path=/trunk/; revision=47608
2013-02-10 16:52:52 +00:00
Bill Meier c2b97dd845 Comment out various unused hf_... instances found by checkhf.
svn path=/trunk/; revision=47607
2013-02-10 16:31:52 +00:00
Michael Mann 27cf61e0a9 Add Bitcoin dissector
From Christian Svensson, bug 6000 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6000)

Cleaned up from the original patch

svn path=/trunk/; revision=47606
2013-02-10 16:23:11 +00:00
Bill Meier 9276c4340b Fix ERROR: NO ARRAY: packet-tlv.c, hf_docsis_rcv_mod_enc_ctr_freq_asgn
##Backport 1.6, 1.8


svn path=/trunk/; revision=47605
2013-02-10 16:18:18 +00:00
Gerald Combs 6da5bbbe9e [Automatic manuf, services and enterprise-numbers update for 2013-02-10]
svn path=/trunk/; revision=47602
2013-02-10 15:03:25 +00:00
Michael Mann 4da35cc956 Add support for IGNORE message type to SSH2 dissector + some minor cleanup
I was hoping this would fix bug 5064 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5064), but all it did was fix the malformed part of the dissector.

svn path=/trunk/; revision=47601
2013-02-10 02:27:08 +00:00
Guy Harris c225aafb8c Pull in a comment from the MATE plugin Makefile.nmake.
Pull in a change from that Makefile.nmake to keep us from trying to hand
a header file to the compiler as if it were a C source file.

svn path=/trunk/; revision=47600
2013-02-09 23:41:43 +00:00
Guy Harris a13d58a509 Put NODIST_ at the beginning of macro names, as was done for the plugins
directory.

svn path=/trunk/; revision=47599
2013-02-09 23:35:30 +00:00
Bill Meier 233fcd672f Remove blank lines separately after removing comments rather than as
part of the 'remove comments' regex.

Fixes a bug introduced in SVN #47583 which broke '#if 0' handling.


svn path=/trunk/; revision=47598
2013-02-09 22:14:13 +00:00
Guy Harris eca5bd1c65 We *did* fix the APIs used.
svn path=/trunk/; revision=47597
2013-02-09 20:21:37 +00:00
Guy Harris 4824a391e8 Pull the definition of NODIST_HEADER_FILES up into
plugins/Makefile.common.inc.

svn path=/trunk/; revision=47596
2013-02-09 20:15:18 +00:00
Gerald Combs 0eb047bcef Fix EXTRA_BINFILES for CMake + OS X.
svn path=/trunk/; revision=47595
2013-02-09 19:56:03 +00:00
Guy Harris 19aa5dbe46 "make maintainer-clean" should nuke all generated files.
svn path=/trunk/; revision=47594
2013-02-09 19:32:31 +00:00
Guy Harris c8af93ea2d Get rid of trailing tabs, make comments more similar.
svn path=/trunk/; revision=47593
2013-02-09 19:30:18 +00:00
Guy Harris ccadade242 Define GENERATED_HEADER_FILES in plugins/Makefile.common.inc.
svn path=/trunk/; revision=47592
2013-02-09 19:20:13 +00:00
Guy Harris 9c4e108387 plugins/Makefile.common.inc defines NODIST_SRC_FILES, and
plugins/mate/Makefile.common includes it, so there's no need to define
it in plugins/mate/Makefile.common.

svn path=/trunk/; revision=47591
2013-02-09 19:15:24 +00:00
Guy Harris df33477429 Define FLEX_GENERATED_SRC_FILES and LEMON_GENERATED_SRC_FILES in
plugins/Makefile.common.inc, and use it in plugins/mate/Makefile.nmake.

svn path=/trunk/; revision=47590
2013-02-09 19:11:14 +00:00
Guy Harris fa596409e0 plugins/Makefile.common.inc should already be defining
GENERATED_SRC_FILES, and plugins/mate/Makefile.common includes it, so it
shouldn't need to define GENERATED_SRC_FILES itself.

svn path=/trunk/; revision=47589
2013-02-09 18:54:27 +00:00
Guy Harris 518e27bc00 The type of the second argument to g_snprintf() is gulong. (It *should*
have been size_t, just as with Boring Old Snprintf; what were they
thinking?)

svn path=/trunk/; revision=47588
2013-02-09 18:41:06 +00:00
Anders Broman 4e4cf2b9a5 Add casts to make it build on win64.
svn path=/trunk/; revision=47587
2013-02-09 17:08:41 +00:00
Anders Broman 3f00e454a5 Try to fix the makefiles to be able to build mate after distclean.
svn path=/trunk/; revision=47586
2013-02-09 16:34:51 +00:00
Bill Meier 404460c14d Cleanup: Ditch CamelCase; use braces around references.
svn path=/trunk/; revision=47585
2013-02-09 16:28:01 +00:00
Bill Meier 7b40629a16 Fix a syntax error which causes a compile error
(altho not in my version Cygwin Perl V5.14 for some reason).

svn path=/trunk/; revision=47584
2013-02-09 14:52:02 +00:00
Bill Meier 4c41fd5df9 Tweaks to RegEx usage for consistency and performance (and
to fix a monor bug or two).

svn path=/trunk/; revision=47583
2013-02-09 14:25:18 +00:00
Evan Huus f07a2b1080 Get rid of a '- i' that appears to have been accidentally inserted in r47581.
i is definitely not initialized at that point (GCC was complaining), and there
seems to be no need to subtract anything from the value in question in the
first place.

svn path=/trunk/; revision=47582
2013-02-09 14:15:11 +00:00
Guy Harris 89d226b733 Get rid of g_sprintf() and strncpy() usage - this is somewhat of a hack,
but this should really be completely rewritten to use the packet-ber.c
routines and to handle strings better (code that handles strings should
not be written in a language that doesn't have a string datatype; that
eliminates C as a possibility, and that's not a bug, that's a
feature...).

svn path=/trunk/; revision=47581
2013-02-09 09:57:05 +00:00
Guy Harris 10e2296c79 The stats_tree plugin doesn't, at present, have anything that looks for
register routines, so there's no plugin.c and hence no plugin.obj.

svn path=/trunk/; revision=47580
2013-02-09 06:09:16 +00:00
Guy Harris e30d2b5001 Make the other plugin makefiles use the new style introduced in the MATE
makefiles.

svn path=/trunk/; revision=47579
2013-02-09 05:31:15 +00:00
Jeff Morriss 4aae84271d Add MIME types for more capture file formats Wireshark understands:
- Radcom WAN/LAN Analyzer
 - Wildpackets/Etherpeek/Airopeek tagged/v9
 - Visual Networks
 - Network Instruments Observer
 - Accellent/InfoVista 5view

The magic matching comes from Fedora's magic file, the file extensions from
wiretap.

(Yes, I just made the application/x-* MIME types up.)

svn path=/trunk/; revision=47578
2013-02-09 02:44:11 +00:00
Evan Huus 47d20bf9be From Lori Tribble via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8306
Fix decoding the Loop Object Setpoint-Reference property in BACapp packets.

svn path=/trunk/; revision=47577
2013-02-09 01:32:19 +00:00
Gerald Combs 942650fe0e Try to figure out if we built the rest of the project using Autotools or
CMake automatically.

svn path=/trunk/; revision=47576
2013-02-09 00:25:24 +00:00
Chris Maynard efa7e8f2b6 Fix bug 8056: Maximum value of Duration should be 32767.
Duration/ID field dissected according to Table 8-3 of 8.2.4.2 of the IEEE std. 802.11-2012: http://www.techstreet.com/cgi-bin/pdf/free/1071374/802.11-2012.pdf

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8056
#BACKPORT(1.8, 1.6)

svn path=/trunk/; revision=47575
2013-02-08 19:25:59 +00:00
Jeff Morriss 8f819bb5bf Also build the source RPM. Clean up after ourselves when done.
svn path=/trunk/; revision=47574
2013-02-08 19:14:37 +00:00
Gerald Combs d21f62b73b Add a directory name preference type (PREF_DIRNAME) and registration
routine (prefs_register_directory_preference). Add PREF_FILENAME and
PREF_DIRNAME support to the Qt module preferences. Change a couple of
preferences to directory names.

Clean up some names and default settings.

svn path=/trunk/; revision=47573
2013-02-08 18:07:34 +00:00
Michael Mann c752593698 Handle SIP "resends" within SDP. This is to handle "duplicate" OFFERs so they don't end up being handled by setup_sdp_transport() because the current frame couldn't match a request (due to duplication).
setup_sdp_transport_resend() should be unnecessary once all higher layers use setup_sdp_transport() and the "registration" code within dissect_sdp() is removed.

svn path=/trunk/; revision=47572
2013-02-08 17:52:12 +00:00
Evan Huus 8c8533e0dd Use the new realloc API when growing a string-buffer.
svn path=/trunk/; revision=47571
2013-02-08 17:09:18 +00:00
Pascal Quantin d6af95490a Fix error: no newline at end of file
svn path=/trunk/; revision=47570
2013-02-08 16:45:15 +00:00
Bill Meier f5dd71e30e Fix code to delete blank lines to remove all blank lines;
Update some Perl usage.

svn path=/trunk/; revision=47569
2013-02-08 16:25:46 +00:00
Chris Maynard 73b49715c9 Fix Coverity CID 973548: Dereference null return value.
#BACKPORT(1.8, 1.6)


svn path=/trunk/; revision=47568
2013-02-08 16:23:02 +00:00