Commit Graph

45183 Commits

Author SHA1 Message Date
Martin Kaiser 27051346f9 TABs -> spaces
add modelines

svn path=/trunk/; revision=47781
2013-02-20 22:53:26 +00:00
Martin Kaiser 4099ef9457 make function names consistent
edit_capture_dlg_launch() -> edit_capture_comment_dlg_launch()

svn path=/trunk/; revision=47780
2013-02-20 22:18:56 +00:00
Martin Kaiser 18ec6f01a3 kill an "edit capture comment" popup if the underlying file is closed
(at the moment, the edit window remains open even if the file is closed or
changed, this allows effectively to overwrite a file's capture commment with
the capture comment of a previously used file)

svn path=/trunk/; revision=47779
2013-02-20 22:08:00 +00:00
Gerald Combs f14ad04d4d More 1.9.0 → 1.9.1 changes. Release note updates.
svn path=/trunk/; revision=47777
2013-02-20 21:17:30 +00:00
Evan Huus d7865654fc From Chris Maynard via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8360
Bail out if length is less than the minimum required length.

svn path=/trunk/; revision=47776
2013-02-20 20:49:36 +00:00
Evan Huus 4b8a9dfefa Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8359
Prevent an infinite loop if we don't recognize the param type and
the length is 0.

svn path=/trunk/; revision=47775
2013-02-20 20:41:33 +00:00
Gerald Combs 6d358bcba6 Forcing everyone to use the development update channel probably isn't
the best idea.

svn path=/trunk/; revision=47774
2013-02-20 20:16:49 +00:00
Gerald Combs 3ba2c108f1 As http://www.jrsoftware.org/iskb.php?mutexsessions points out, a session
mutex may not be visible to other sessions and we may not be able to
create a global mutex. Try to create both, and make each one accessible
to all users. Update the NSIS installer to check for both global and
session mutexes.

svn path=/trunk/; revision=47773
2013-02-20 19:58:55 +00:00
Anders Broman 63093db8d2 From Michael Mann:
Add text/parameters
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5714
If we need something better we should make a  text/parameters dissector I suppose.

svn path=/trunk/; revision=47772
2013-02-20 19:50:12 +00:00
Gerald Combs 7df948dd4a 1.9.0 → 1.9.1.
svn path=/trunk/; revision=47771
2013-02-20 16:42:34 +00:00
Gerald Combs 3e0d6732cc Build 1.9.0.
svn path=/trunk/; revision=47770
2013-02-20 16:36:47 +00:00
Guy Harris 6c575002e5 Fix copy-and-pasteo.
svn path=/trunk/; revision=47769
2013-02-20 08:37:40 +00:00
Guy Harris 67e692da1c Add a tvb_new_subset_length() that takes a tvbuff, an offset in a
tvbuff, and a length from that offset, and returns a subset tvbuff
referring to that data (or throws an exception).  This does what most if
not all calls to tvb_new_subset() (other than the ones that really
should be calls to tvb_new_subset_remaining()) should be doing, i.e.
setting the reported length of the tvbuff to the specified length and
calculating the appropriate value of the captured length based on that.

We aren't using it yet, but we will....

svn path=/trunk/; revision=47768
2013-02-20 08:10:14 +00:00
Gerald Combs 1129239b15 Add software_update.c.
svn path=/trunk/; revision=47767
2013-02-20 06:51:16 +00:00
Gerald Combs b5e9e86826 Only call create_app_running_mutex on Windows.
svn path=/trunk/; revision=47766
2013-02-20 05:04:57 +00:00
Chris Maynard 503cab9ff7 From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8353 : Document http-related '-z' statistics; also add document -z help.
From me: Don't print an error message for "-z help".

(Only "http,stat," is suitable for backport to 1.8 and 1.6)

svn path=/trunk/; revision=47763
2013-02-20 03:06:46 +00:00
Gerald Combs 8f478c5c44 Exclude create_app_running_mutex.
svn path=/trunk/; revision=47762
2013-02-20 03:01:12 +00:00
Chris Maynard 1455b36647 Fix Coverity CID 751720: Logically dead code.
In fixing this bug, also fix another:  Be sure to use tvb_length() and not tvb_reported_length() in get_utp_version(), since this is essentially where the heuristics are being applied to decide whether to accept the packet or not.

svn path=/trunk/; revision=47761
2013-02-20 02:15:20 +00:00
Guy Harris c5f0b68669 And one more case where tvb_new_subset_remaining() is appropriate.
svn path=/trunk/; revision=47760
2013-02-20 01:38:58 +00:00
Guy Harris 021069a56b Clean up white space - get rid of 4-space tabs.
Reformat the hf[] array to be consistent, and get rid of some bogus
blurbs (probably copy-and-pasteos).

svn path=/trunk/; revision=47759
2013-02-20 01:37:08 +00:00
Gerald Combs bd4cffae58 When any of our executables start on Windows create or open a "Wireshark
is running" mutex. Have the NSIS installer check for this mutex and ask
the user to close Wireshark if it's found. While not perfect this makes
the WinSparkle update process much less annoying.

svn path=/trunk/; revision=47758
2013-02-20 01:19:42 +00:00
Guy Harris cf1070b4b1 Swallow up tvb_set_real_data_no_exceptions() into tvb_new_real_data() -
the only caller is tvb_new_real_data().

svn path=/trunk/; revision=47757
2013-02-20 01:01:32 +00:00
Guy Harris 5f5e1085ea Reflect that tvb_new() is now an internal routine.
svn path=/trunk/; revision=47756
2013-02-20 00:57:10 +00:00
Guy Harris 0aef9fc00d Improve a comment - what matters is that tvb_new_real_data() can throw
an exception, not how it happens to be implemented currently.

svn path=/trunk/; revision=47755
2013-02-20 00:56:44 +00:00
Chris Maynard 552e98b7a3 Fix Coverity CID 984638: Unused pointer value.
svn path=/trunk/; revision=47754
2013-02-20 00:53:19 +00:00
Guy Harris 75168f6bf7 No more tvb_new(), so no more need for tvb_set_real_data() or
tvb_set_subset(); code should use tvb_new_real_data() and various
tvb_new_subset routines.  (Neither tvb_new() nor tvb_set_real_data() nor
tvb_set_subset() were exported in libwireshark.def, nor were they used
outside tvbuff.c; tvb_set_real_data() and tvb_set_subset() weren't even
being used *inside* tvbuff.c.)

svn path=/trunk/; revision=47753
2013-02-20 00:09:41 +00:00
Guy Harris bd7c0171a9 Make tvb_new() an internal routine to epan/tvbuff.c; we export various
routines to create new tvbuffs that do what dissectors need to do, and
those are the only routines that should be used.

svn path=/trunk/; revision=47752
2013-02-19 23:55:19 +00:00
Guy Harris 29715ccc8f How can I get a new tvbuff that starts at an offset within a given
tvbuff and runs to the end of the tvbuff?  Let me count the ways....

Replace a bunch of different ways of doing that (some incorrect, in that
they're not properly handling tvbuffs where the captured and reported
lengths are different) with tvb_new_subset_remaining().

svn path=/trunk/; revision=47751
2013-02-19 23:17:07 +00:00
Gerald Combs 5a5d872639 Register the gui.update.interval preference.
svn path=/trunk/; revision=47750
2013-02-19 23:05:27 +00:00
Gerald Combs 81a5be5813 Enable automatic updates for Win64. Fix a copy/paste error.
svn path=/trunk/; revision=47749
2013-02-19 22:57:40 +00:00
Gerald Combs e48236a436 Add automatic software update checks for Win32 using WinSparkle. Add
preferences (currently hidden) to disable updates, set the update
frequency, and set the update "channel" (stable vs development). Add a
"Help" menu item to manually check for updates.

svn path=/trunk/; revision=47748
2013-02-19 22:21:17 +00:00
Anders Broman 9736ff7cb5 Remove experiment with global code
svn path=/trunk/; revision=47747
2013-02-19 18:53:47 +00:00
Anders Broman fc2b80ac0b Add the remaining asn1 files "CODE global" not handled yet.
svn path=/trunk/; revision=47746
2013-02-19 18:44:06 +00:00
Guy Harris f910cb502c calc_checksum() should be passed the length of the block to be
checksummed, which is the length of the TPDU, not that length + 1.

Calculate the TPDU length correctly - use
tvb_reported_length_remaining(), not tvb_length_remaining() (we want the
*actual* length, not the amount of captured data we have), and take the
offset handed to the dissector routine into account.  Don't take the
length indicator into account for TPDUs with user data, as they run to
the end of the lower-level packet containing the TPDU(s).  The CLTP UD
TPDU contains user data.

Note that this dissects both COTP *and* CLTP (that's why it's
"packet-ositp.c", not "packet-cotp.c").

Separate some groups of #includes with blank lines.

svn path=/trunk/; revision=47745
2013-02-19 07:06:55 +00:00
Chris Maynard 2a02a5d367 According to wikipedia, the A6M was outdated by 1944. Let it rest in peace.
svn path=/trunk/; revision=47744
2013-02-19 04:48:34 +00:00
Guy Harris c037516c5e Whitespace tweaks.
svn path=/trunk/; revision=47743
2013-02-19 03:55:14 +00:00
Chris Maynard 3010f6a0cc Don't call expert_add_info_format() from within an if (tree) {} block.
Misc. whitespace changes, remove tabs, add modelines to match current scheme.

svn path=/trunk/; revision=47742
2013-02-19 01:56:42 +00:00
Michael Mann 425ede28b4 Bugfix OSITP - Incorrect TP4 checksum calculation (ATN extended checksum) in case of multiple TPDU's per frame.
Bug 8293 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8293)

svn path=/trunk/; revision=47741
2013-02-19 01:34:15 +00:00
Guy Harris ef715a28ae For each dynamic-payload hash table, keep a Boolean indicating whether
it's been used in an rtp_set_address() or srtp_set_address() call and,
if that Boolean is set, don't free the hash table; this fixes a case
where the hash table was freed while it was in use.

svn path=/trunk/; revision=47740
2013-02-18 22:37:07 +00:00
Michael Mann 5effa93ce0 Use tcp_dissect_pdus for better dissection on TCP. Adjusted UDP dissection accordingly.
Various cleanup to use proto_tree_add_item more often.

svn path=/trunk/; revision=47739
2013-02-18 22:12:07 +00:00
Anders Broman b38062ff8f Dissect more supplementarry services
svn path=/trunk/; revision=47738
2013-02-18 19:34:04 +00:00
Guy Harris 6a420594ab Enums aren't guaranteed to be able to hold a value that doesn't fit in
an int, so don't use enums for special values of the PLP length field.

In addition, use G_GINT64_CONSTANT() to tag them as appropriate for a
guint64.

svn path=/trunk/; revision=47737
2013-02-18 19:31:46 +00:00
Evan Huus e606c22ee3 From Alex Gaertner via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8313
Misc. fixes to the SML dissector:
- one more define added
- removed data_handle (unused)
- removed "check = tvb_get_guint8(tvb, temp_offset);" (value hasn't changed)
- added PI_NOTE 
- CRC fixed, calculation now correct if CRC is transmitted as UINT8

From me:
- clean up indentation
- change modelines to actually match the indentation most commonly used

svn path=/trunk/; revision=47736
2013-02-18 18:19:38 +00:00
Alexis La Goutte 18a87fc0d6 Fix small typo in TPC Report IE
svn path=/trunk/; revision=47734
2013-02-18 17:24:30 +00:00
Alexis La Goutte e9463ef07f Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47733
2013-02-18 17:24:21 +00:00
Alexis La Goutte e5fc3c8c4b From 802.11-2012.pdf Update Reason Code and Status Code fields
svn path=/trunk/; revision=47732
2013-02-18 17:24:07 +00:00
Alexis La Goutte 8e4e16aeac Display Power Constraint in DEC (and fix a small typo)
svn path=/trunk/; revision=47731
2013-02-18 17:23:57 +00:00
Anders Broman 399f019522 Add more ASN1 files.
svn path=/trunk/; revision=47730
2013-02-18 06:26:09 +00:00
Jaap Keuter 0b0f6947cc Fix for bug 8321:
Feed the tap before trying to dissect the payload. This prevents a malformed 
payload from blocking the tap, resulting in incorrect RTP statistics.

svn path=/trunk/; revision=47729
2013-02-18 06:19:04 +00:00
Bill Meier 61072e1379 Revert SVN #47724, #47726 & #47727.
Some rethinking required since I failed to
 understand some of the details as to how
 proto_tree_write_fields() really works. :(

svn path=/trunk/; revision=47728
2013-02-18 05:41:13 +00:00