Bill Meier [Fri, 1 Jun 2012 14:08:12 +0000 (14:08 -0000)]
Windows: Set Makefile.common as a plugin.c dependency so plugin.c is rebuilt if Makefile.common is changed
ToDo: ditto for Makefile.am ?
svn path=/trunk/; revision=42971
Anders Broman [Fri, 1 Jun 2012 13:01:32 +0000 (13:01 -0000)]
For RLC re-assembly to work we need to fake urnti.
svn path=/trunk/; revision=42970
Anders Broman [Fri, 1 Jun 2012 12:28:05 +0000 (12:28 -0000)]
Don't call subdissectors if the CRCI bit is set.
svn path=/trunk/; revision=42969
Anders Broman [Fri, 1 Jun 2012 12:27:04 +0000 (12:27 -0000)]
Make the cosnaming dissector a builtin dissector.
svn path=/trunk/; revision=42968
Anders Broman [Fri, 1 Jun 2012 10:31:34 +0000 (10:31 -0000)]
Make the tango dissector a builtin dissector.
svn path=/trunk/; revision=42967
Anders Broman [Fri, 1 Jun 2012 10:26:49 +0000 (10:26 -0000)]
make it compile.
I suppose we do random access if compressed.
svn path=/trunk/; revision=42966
Anders Broman [Fri, 1 Jun 2012 09:04:28 +0000 (09:04 -0000)]
parlay changes to Cmake
svn path=/trunk/; revision=42965
Anders Broman [Fri, 1 Jun 2012 08:48:31 +0000 (08:48 -0000)]
Make the parlay dissector a buil tin dissector.
svn path=/trunk/; revision=42964
Guy Harris [Fri, 1 Jun 2012 08:45:39 +0000 (08:45 -0000)]
Move wtap_fdreopen() to file_access.c for now, as it requires many of
the same #includes.
svn path=/trunk/; revision=42963
Guy Harris [Fri, 1 Jun 2012 08:33:25 +0000 (08:33 -0000)]
Need fcntl.h for the O_ #defines on Windows.
svn path=/trunk/; revision=42962
Guy Harris [Fri, 1 Jun 2012 08:05:12 +0000 (08:05 -0000)]
Sigh. There appears to be no way to get Windows to allow us to rename a
file that we ourselves have open. In the "safe save" code path for
capture files, on Windows temporarily close the file descriptors for the
currently-open capture before doing the rename and then, if the rename
failed, reopen them, leaving the rest of the wtap and capture_file
structures intact.
Rename filed_open() to file_fdopen(), to make its name match what it
does a bit better (it's an fdopen()-style routine, i.e. do the
equivalent of an open with an already-open file descriptor rather than a
pathname, in the file_wrappers.c set of routines).
Remove the file_ routines from the .def file for Wiretap - they should
only be called by code inside Wiretap.
Closing a descriptor open for input has no reason to fail (closing a
descriptor open for *writing* could fail if the file is on a server and
dirty pages are pushed asynchronously to the server and synchronously on
a close), so just have file_close() return void.
svn path=/trunk/; revision=42961
Anders Broman [Fri, 1 Jun 2012 07:02:04 +0000 (07:02 -0000)]
From Alexander Koeppe.
Patch that creates the filter according to the protocol tree selected.
Fixes
IPv6 filters built from "Protocol Hierarchy Statistics" dialog not specific
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7250
svn path=/trunk/; revision=42960
Anders Broman [Fri, 1 Jun 2012 06:14:08 +0000 (06:14 -0000)]
Remove debug code left by mistake
svn path=/trunk/; revision=42959
Anders Broman [Fri, 1 Jun 2012 05:55:45 +0000 (05:55 -0000)]
Fix a couple of warnings
svn path=/trunk/; revision=42958
Anders Broman [Fri, 1 Jun 2012 05:55:20 +0000 (05:55 -0000)]
Fix a couple of warnings
svn path=/trunk/; revision=42957
Anders Broman [Fri, 1 Jun 2012 05:36:52 +0000 (05:36 -0000)]
Fix a couple of warnings
svn path=/trunk/; revision=42956
Gerald Combs [Thu, 31 May 2012 23:34:19 +0000 (23:34 -0000)]
Update the release notes. The new protocol count is now over 100.
svn path=/trunk/; revision=42953
Gerald Combs [Thu, 31 May 2012 21:40:55 +0000 (21:40 -0000)]
From Martin Kaiser via bug 7312:
there's three coverity defects about division by zero in ui/cli/tap-iostat.c,
function iostat_packet()
This can be triggered from the command line
martin@greta# ./tshark -z io,stat,0.2,AVG\(frame.number\)
Capturing on eth0
Floating point exception
it->num is 0, wireshark crashes in
parent->max_vals[it->colnum] =
MAX(parent->max_vals[it->colnum], it->counter/it->num);
(and similar for other data types)
My proposal for a fix is to not update parent->max_vals[it->colnum] when
it->num==0, see the attached patch.
svn path=/trunk/; revision=42952
Gerald Combs [Thu, 31 May 2012 21:30:40 +0000 (21:30 -0000)]
g_snprintf → ep_strbuf. I can't find an ERF file with a virtual
container but the conversion seemed be straightforward enough.
svn path=/trunk/; revision=42951
Jeff Morriss [Thu, 31 May 2012 21:19:39 +0000 (21:19 -0000)]
Look only for calls to strlen() within an snprintf() call (not for any file
that has the string "strlen" somewhere after a call to snprintf()).
svn path=/trunk/; revision=42950
Pascal Quantin [Thu, 31 May 2012 20:40:07 +0000 (20:40 -0000)]
From Erwin Rol via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7311 :
Fix a cut and paste error in packet-dmx.c
svn path=/trunk/; revision=42949
Gerald Combs [Thu, 31 May 2012 20:24:04 +0000 (20:24 -0000)]
Fix a possible zero division found by scan-build. While we're at it replace
occurrences of g_snprintf+strlen with ep_strbuf.
svn path=/trunk/; revision=42948
Gerald Combs [Thu, 31 May 2012 20:12:27 +0000 (20:12 -0000)]
If we're feeding the output of strlen to an snprintf-style function
there's a good chance we're doing something wrong.
svn path=/trunk/; revision=42947
Pascal Quantin [Thu, 31 May 2012 18:56:02 +0000 (18:56 -0000)]
Use GeoIP package 1.4.8-2 for win64 also (I guess that's what was intended in r42933)
svn path=/trunk/; revision=42946
Anders Broman [Thu, 31 May 2012 13:23:42 +0000 (13:23 -0000)]
Set dir if we don't have it.
svn path=/trunk/; revision=42945
Pascal Quantin [Thu, 31 May 2012 13:22:52 +0000 (13:22 -0000)]
Display hf_smb_server_guid, hf_smb_volume_guid and hf_smb_dfs_referral_server_guid as FT_GUID
svn path=/trunk/; revision=42944
Anders Broman [Thu, 31 May 2012 13:09:27 +0000 (13:09 -0000)]
Add fix-encoding-args.pl to the distribution.
svn path=/trunk/; revision=42943
Anders Broman [Thu, 31 May 2012 12:46:51 +0000 (12:46 -0000)]
Minor updates to the AVP:s
svn path=/trunk/; revision=42942
Anders Broman [Thu, 31 May 2012 12:46:09 +0000 (12:46 -0000)]
Remove redundant code from the template.
svn path=/trunk/; revision=42941
Pascal Quantin [Thu, 31 May 2012 08:56:19 +0000 (08:56 -0000)]
From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7306 :
RPC: show the AUTH_GLUSTERFS/lk_owner as hex
svn path=/trunk/; revision=42940
Pascal Quantin [Thu, 31 May 2012 08:25:00 +0000 (08:25 -0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7307
svn path=/trunk/; revision=42939
Pascal Quantin [Thu, 31 May 2012 08:08:44 +0000 (08:08 -0000)]
Clean GeoIP-1.4.8-*-win??ws folder with setup target
svn path=/trunk/; revision=42938
Anders Broman [Thu, 31 May 2012 07:25:11 +0000 (07:25 -0000)]
From Sheetal Kshirsagar and Andrew Williams:
Updating the RPL SRH dissector and implementing RPL Options header dissection.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6986
svn path=/trunk/; revision=42937
Anders Broman [Thu, 31 May 2012 05:42:02 +0000 (05:42 -0000)]
Try to squelch a couple of warnings
svn path=/trunk/; revision=42936
Gerald Combs [Wed, 30 May 2012 23:14:07 +0000 (23:14 -0000)]
Add some needed parenthesis as pointed out by Jakub and the OS X
builders.
svn path=/trunk/; revision=42935
Gerald Combs [Wed, 30 May 2012 22:55:02 +0000 (22:55 -0000)]
Use the updated GeoIP package (1.4.8-2).
svn path=/trunk/; revision=42933
Jakub Zawadzki [Wed, 30 May 2012 22:39:56 +0000 (22:39 -0000)]
Revert r42853, cleanup packet-jxta which might really fix CID 280210
References: http://www.wireshark.org/lists/wireshark-dev/201205/msg00226.html
svn path=/trunk/; revision=42932
Gerald Combs [Wed, 30 May 2012 21:42:24 +0000 (21:42 -0000)]
In recent versions of GLib (test with 2.32) g_log_default_handler
helpfully ignores G_LOG_LEVEL_INFO and G_LOG_LEVEL_DEBUG messages by
default. If the console_log_level preference includes either of those
two levels set the G_MESSAGES_DEBUG environment variable so that those
messages are printed.
Add checks for various console log messages to the stdin capture suite.
Fixes bug 7265.
svn path=/trunk/; revision=42930
Jeff Morriss [Wed, 30 May 2012 21:32:32 +0000 (21:32 -0000)]
The GIOP plugin is now one big plugin (instead of 2, or was it 4?).
svn path=/trunk/; revision=42929
Anders Broman [Wed, 30 May 2012 20:51:36 +0000 (20:51 -0000)]
Dissable -Werror
svn path=/trunk/; revision=42928
Anders Broman [Wed, 30 May 2012 19:51:54 +0000 (19:51 -0000)]
Forgot to change the name to giop
svn path=/trunk/; revision=42927
Anders Broman [Wed, 30 May 2012 19:03:56 +0000 (19:03 -0000)]
Replace IDL generated dissector with common dll
svn path=/trunk/; revision=42926
Anders Broman [Wed, 30 May 2012 19:02:53 +0000 (19:02 -0000)]
Modify IDL generated plugin interface (untested)
svn path=/trunk/; revision=42925
Anders Broman [Wed, 30 May 2012 19:01:29 +0000 (19:01 -0000)]
Add files to use 'new plugin build style'
svn path=/trunk/; revision=42924
Jeff Morriss [Wed, 30 May 2012 18:29:37 +0000 (18:29 -0000)]
From Richard Sharpe on -dev:
Attached is a patch that fixes (I think) the handling of extended
responses on NTCreate&X requests.
svn path=/trunk/; revision=42923
Pascal Quantin [Wed, 30 May 2012 18:27:40 +0000 (18:27 -0000)]
Prefix TransportFormatSet_type_enum values with NBAP_ to avoid a clash with 'PCH' in <WinNT.h>
svn path=/trunk/; revision=42922
Chris Maynard [Wed, 30 May 2012 17:26:00 +0000 (17:26 -0000)]
Mark pinfo as unused. Change args to proto_tree_add_text().
svn path=/trunk/; revision=42921
Chris Maynard [Wed, 30 May 2012 17:02:44 +0000 (17:02 -0000)]
PPP CCP improvements. And yay, checkAPIs no longer complains about the number of useless add_text()'s since the ratio is finally below 50%. This ratio should continue to drop as more and more fields become filterable.
svn path=/trunk/; revision=42920
Gerald Combs [Wed, 30 May 2012 15:36:48 +0000 (15:36 -0000)]
Revert GEOIP_CFLAGS back to r42905. It looks like the builders picked up
the wrong archive yesterday before I had a chance to upload the right one.
svn path=/trunk/; revision=42919
Chris Maynard [Wed, 30 May 2012 15:30:07 +0000 (15:30 -0000)]
Ugh. Fix GEOIP_CFLAGS again. 3rd time's the charm?
svn path=/trunk/; revision=42918
Chris Maynard [Wed, 30 May 2012 15:05:21 +0000 (15:05 -0000)]
Try it with Windows style path separator instead.
svn path=/trunk/; revision=42917
Chris Maynard [Wed, 30 May 2012 14:33:00 +0000 (14:33 -0000)]
Fix GEOIP_CFLAGS so GeoIP.h can be found.
svn path=/trunk/; revision=42916
Anders Broman [Wed, 30 May 2012 14:04:45 +0000 (14:04 -0000)]
Stab at DCH 31 dissection.
svn path=/trunk/; revision=42915
Anders Broman [Wed, 30 May 2012 11:48:05 +0000 (11:48 -0000)]
Dissect non segmented MiB and SiB:s
svn path=/trunk/; revision=42914
Pascal Quantin [Wed, 30 May 2012 08:49:56 +0000 (08:49 -0000)]
Use ett variable for proto_item_add_subtree function call
svn path=/trunk/; revision=42913
Anders Broman [Wed, 30 May 2012 08:41:00 +0000 (08:41 -0000)]
Add an application id.
svn path=/trunk/; revision=42912
Jakub Zawadzki [Wed, 30 May 2012 06:44:37 +0000 (06:44 -0000)]
Fix part of bug #4030
GeoIP strings from r39299 are encoded in UTF-8 so don't use format_text.
svn path=/trunk/; revision=42911
Jakub Zawadzki [Wed, 30 May 2012 06:13:12 +0000 (06:13 -0000)]
Fix make-authors-short.pl warning:
Use of uninitialized value $nextline in pattern match (m//) at ./make-authors-short.pl line 23, <> line 3660
svn path=/trunk/; revision=42910
Jakub Zawadzki [Wed, 30 May 2012 05:39:39 +0000 (05:39 -0000)]
Fix bug #5077 in IPv6.
svn path=/trunk/; revision=42909
Jakub Zawadzki [Wed, 30 May 2012 05:33:37 +0000 (05:33 -0000)]
Cleanup geoip support in ipv6.
svn path=/trunk/; revision=42908
Gerald Combs [Wed, 30 May 2012 00:11:11 +0000 (00:11 -0000)]
Back out previous change.
svn path=/trunk/; revision=42907
Gerald Combs [Wed, 30 May 2012 00:04:03 +0000 (00:04 -0000)]
Extract into the right directory.
svn path=/trunk/; revision=42906
Gerald Combs [Tue, 29 May 2012 23:31:00 +0000 (23:31 -0000)]
Use GeoIP 1.4.8 which includes a DLL instead of a static library.
svn path=/trunk/; revision=42905
Pascal Quantin [Tue, 29 May 2012 21:51:52 +0000 (21:51 -0000)]
Avoid using C99 '%hh' length modifier
svn path=/trunk/; revision=42904
Pascal Quantin [Tue, 29 May 2012 21:36:39 +0000 (21:36 -0000)]
From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7301:
Dissector for DVB Application Information Table (AIT)
svn path=/trunk/; revision=42903
Pascal Quantin [Tue, 29 May 2012 21:09:46 +0000 (21:09 -0000)]
From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7302:
Small updates to ISO 7816 dissector
svn path=/trunk/; revision=42902
Pascal Quantin [Tue, 29 May 2012 20:28:41 +0000 (20:28 -0000)]
From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7303
Remove unnecessary null checks before calling proto_item_set_len() in DVB-CI dissector
svn path=/trunk/; revision=42901
Jakub Zawadzki [Tue, 29 May 2012 20:27:22 +0000 (20:27 -0000)]
Fix bug #7304, stupid mistake.
svn path=/trunk/; revision=42900
Jakub Zawadzki [Tue, 29 May 2012 20:01:25 +0000 (20:01 -0000)]
Fix bug #5735
dissect_attribute_value_pairs() should be also called with NULL tree.
Broken from r29964.
svn path=/trunk/; revision=42899
Anders Broman [Tue, 29 May 2012 14:34:34 +0000 (14:34 -0000)]
Handle E-DCH
svn path=/trunk/; revision=42898
Ronnie Sahlberg [Tue, 29 May 2012 11:25:38 +0000 (11:25 -0000)]
SCSI SBC: Add dissection of GET_LBA_STATUS command
svn path=/trunk/; revision=42897
Anders Broman [Tue, 29 May 2012 08:23:10 +0000 (08:23 -0000)]
From Porus Mehta:
Wireshark's RADIUS dictionaries for Starent need an update.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6243
svn path=/trunk/; revision=42896
Anders Broman [Tue, 29 May 2012 08:00:35 +0000 (08:00 -0000)]
From Deepti Ragha:
Additions to the ARP dissector as per the IANA specifications for ARP
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7216
svn path=/trunk/; revision=42895
Anders Broman [Tue, 29 May 2012 07:45:40 +0000 (07:45 -0000)]
From Aditya Ambadkar and Diana Chris:
Enhancement to LDP dissector to support changes proposed in RFC6391 - flow aware transport of PW over an MPLS PSN.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7046
svn path=/trunk/; revision=42894
Anders Broman [Tue, 29 May 2012 07:31:38 +0000 (07:31 -0000)]
From Evan Huus:
Fix to
BACapp item length causes Buildbot crash output: randpkt-2011-04-13-1899.pcap
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5825
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7296
svn path=/trunk/; revision=42893
Anders Broman [Tue, 29 May 2012 07:27:35 +0000 (07:27 -0000)]
From Evan Huus:
Misc resource leaks.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7296
svn path=/trunk/; revision=42892
Guy Harris [Tue, 29 May 2012 01:18:16 +0000 (01:18 -0000)]
Test was backwards - if fname_new is *NON*-null, it was the name of a
temporary file to which we were writing in order to do a "safe save".
Thanks to Coverity for pointing this out - should fix CIDs 703317 and
703316.
svn path=/trunk/; revision=42891
Guy Harris [Tue, 29 May 2012 00:05:39 +0000 (00:05 -0000)]
From Erwin Rol: fix a copy-and-paste leftover.
svn path=/trunk/; revision=42890
Pascal Quantin [Mon, 28 May 2012 20:34:27 +0000 (20:34 -0000)]
Keep backward compatibility with UDP framing format for UMTS RLC dissector
Fix a few typo errors while we are at it
svn path=/trunk/; revision=42889
Anders Broman [Mon, 28 May 2012 20:11:59 +0000 (20:11 -0000)]
Use C/T as rbid
svn path=/trunk/; revision=42888
Anders Broman [Mon, 28 May 2012 20:09:00 +0000 (20:09 -0000)]
Use ett instead of hf variable
svn path=/trunk/; revision=42887
Chris Maynard [Mon, 28 May 2012 18:37:10 +0000 (18:37 -0000)]
Fix Coverity CID's 702388 and 702422: OVERFLOW_BEFORE_WIDEN.
svn path=/trunk/; revision=42886
Anders Broman [Mon, 28 May 2012 17:55:47 +0000 (17:55 -0000)]
Set but not used variable
svn path=/trunk/; revision=42885
Anders Broman [Mon, 28 May 2012 16:00:20 +0000 (16:00 -0000)]
Remove C++ style comments initilize some variables.
svn path=/trunk/; revision=42884
Jakub Zawadzki [Mon, 28 May 2012 15:59:00 +0000 (15:59 -0000)]
While iterating over string characters don't use strlen(), but check for NUL.
svn path=/trunk/; revision=42883
Anders Broman [Mon, 28 May 2012 15:30:09 +0000 (15:30 -0000)]
Set SVN properties.
svn path=/trunk/; revision=42882
Anders Broman [Mon, 28 May 2012 15:29:36 +0000 (15:29 -0000)]
Set SVN properties.
svn path=/trunk/; revision=42881
Anders Broman [Mon, 28 May 2012 15:24:54 +0000 (15:24 -0000)]
From Erwin Rol:
Artnet, RDM and DMX dissector updates
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7286
svn path=/trunk/; revision=42880
Anders Broman [Mon, 28 May 2012 15:09:33 +0000 (15:09 -0000)]
Extend the switch statement.
svn path=/trunk/; revision=42879
Anders Broman [Mon, 28 May 2012 14:50:54 +0000 (14:50 -0000)]
Move defenition of rlc_mode.
svn path=/trunk/; revision=42878
Anders Broman [Mon, 28 May 2012 13:53:33 +0000 (13:53 -0000)]
Try to pacify the Ubuntu buildbot.
svn path=/trunk/; revision=42877
Anders Broman [Mon, 28 May 2012 13:38:40 +0000 (13:38 -0000)]
Enhance CHANNEL_HSDSCH dissection.
svn path=/trunk/; revision=42876
Ronnie Sahlberg [Mon, 28 May 2012 09:40:54 +0000 (09:40 -0000)]
Sometimes you might have plaintext LDAP for a SASL LDAP connection if the handshake never occured.
Observed with exchange in some configurations.
From Matthieu Patou <mat@matws.net>
svn path=/trunk/; revision=42875
Guy Harris [Mon, 28 May 2012 01:23:28 +0000 (01:23 -0000)]
That doesn't work correctly if we read in a file with no interface
information, as it'll fill in whatever stuff happens to be in the
capture info. We should somehow figure uot whether this is a capture we
just did (note: cf->is_tempfile does *NOT* necessarily tell us that, as
it's set for the result of a merge, and is cleared if we save the
capture) and fill in the interface information only if that's the case.
Put in a comment to note that we need to do that.
svn path=/trunk/; revision=42874
Guy Harris [Mon, 28 May 2012 01:17:48 +0000 (01:17 -0000)]
Correctly implement what was my intent when removing the HAVE_LIBPCAP
stuff - arrange that the interface summary list is set, if we've read a
capture file that has interface information, *regardless* of whether we
have libpcap/WinPcap or not.
That means that summary_fill_in() should fill in the interface
information for the summary if there's interface information from the
capture file, and summary_fill_in_capture() - which is called only if
HAVE_LIBPCAP is defined, and can exist only if HAVE_LIBPCAP is defined
(as it takes an argument of a type that's defined only if HAVE_LIBPCAP
is defined) - just fills in interface information from the capture
options and does so only if there's none from the file.
svn path=/trunk/; revision=42873
Guy Harris [Mon, 28 May 2012 00:43:13 +0000 (00:43 -0000)]
Interface lists currently have to be constructed in the open routine
(otherwise, nobody sees them); do so.
Fix some cases where we weren't doing the proper post-processing after
doing the heuristics for format changes that didn't involve magic-number
changes (discovered because constructing the interface list is now being
done as part of that post-processing).
Fixes bug 7287.
svn path=/trunk/; revision=42872
Guy Harris [Mon, 28 May 2012 00:31:27 +0000 (00:31 -0000)]
Don't use pcap LINKTYPE_ values in the iface_options structure, use
Wiretap encapsulation values; rename the field in question encap_type to
emphasize that. (Code that looks at that field already assumes it's a
Wiretap encapsulation value.)
For live captures, map the LINKTYPE_ value to a Wiretap encapsulation
value.
wtap_encap_string() never returns NULL, so don't check for a null return
value.
svn path=/trunk/; revision=42871
Guy Harris [Sun, 27 May 2012 23:50:14 +0000 (23:50 -0000)]
Clean up indentation (use spaces, not tabs).
svn path=/trunk/; revision=42870
Guy Harris [Sun, 27 May 2012 23:41:03 +0000 (23:41 -0000)]
Clean up indentation (remove tabs from one structure definition).
svn path=/trunk/; revision=42869
Guy Harris [Sun, 27 May 2012 23:32:12 +0000 (23:32 -0000)]
Clean up indentation (use spaces, not tabs).
svn path=/trunk/; revision=42868