obnox/wireshark/wip.git
7 years agoOn an I/O error, merge_read_packet() and merge_append_read_packet() need
guy [Mon, 21 Nov 2011 06:26:03 +0000 (06:26 +0000)]
On an I/O error, merge_read_packet() and merge_append_read_packet() need
to return a pointer to the merge_in_file_t that got the error.  Set *err
to 0 on success and an error code on an err, treat a null return as an
EOF indication, and if we don't get a null return check for a non-zero
error code and treat that as an I/O error.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39964 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix potential infinite loop introduced with r39961 and find by the buildbot. Fixes...
cmaynard [Mon, 21 Nov 2011 02:01:59 +0000 (02:01 +0000)]
Fix potential infinite loop introduced with r39961 and find by the buildbot.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6599

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39963 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix bug 6561: IPv4 UDP/TCP Checksum incorrect if routing header present.
cmaynard [Sun, 20 Nov 2011 15:47:14 +0000 (15:47 +0000)]
Fix bug 6561: IPv4 UDP/TCP Checksum incorrect if routing header present.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6561

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39961 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix "'Closing File!' Dialog Hangs" bug 3046: https://bugs.wireshark.org/bugzilla...
cmaynard [Sun, 20 Nov 2011 15:11:15 +0000 (15:11 +0000)]
Fix "'Closing File!' Dialog Hangs" bug 3046: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3046

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39959 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago[Automatic manuf, services and enterprise-numbers update for 2011-11-20]
gerald [Sun, 20 Nov 2011 15:03:25 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-11-20]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39958 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of Warnings.
etxrab [Sun, 20 Nov 2011 12:43:04 +0000 (12:43 +0000)]
Get rid of Warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39957 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRemove export.
etxrab [Sun, 20 Nov 2011 10:27:26 +0000 (10:27 +0000)]
Remove export.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39956 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSee if this fixes it, why it worked on my system is anybodys guess.
etxrab [Sun, 20 Nov 2011 09:51:03 +0000 (09:51 +0000)]
See if this fixes it, why it worked on my system is anybodys guess.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39955 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of Warnings.
etxrab [Sun, 20 Nov 2011 08:59:19 +0000 (08:59 +0000)]
Get rid of Warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39954 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoExpand a comment.
guy [Sun, 20 Nov 2011 03:15:53 +0000 (03:15 +0000)]
Expand a comment.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39953 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoThe URI parameter parser always has to advance current_offset in the
guy [Sat, 19 Nov 2011 22:57:13 +0000 (22:57 +0000)]
The URI parameter parser always has to advance current_offset in the
loop, otherwise you get stuck in an infinite loop.

(Where in RFC 3261 does it mention the use of commas in URI parameters?)

Should fix bug 6598.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39952 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of Warnings.
etxrab [Sat, 19 Nov 2011 22:42:51 +0000 (22:42 +0000)]
Get rid of Warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39951 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoClean up indentation.
guy [Sat, 19 Nov 2011 20:49:15 +0000 (20:49 +0000)]
Clean up indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39950 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoWhen reporting "sorry, *this* packet can't be written to a file of that
guy [Sat, 19 Nov 2011 20:18:01 +0000 (20:18 +0000)]
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.

When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem.  (We could show both.  We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)

file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.

Clean up indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39949 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix Warnings.
etxrab [Sat, 19 Nov 2011 17:21:35 +0000 (17:21 +0000)]
Fix Warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39948 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRevert 39946
etxrab [Sat, 19 Nov 2011 16:24:19 +0000 (16:24 +0000)]
Revert 39946

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39947 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSee if this fixes "warning: initializer element is not computable at load time"
etxrab [Sat, 19 Nov 2011 16:15:07 +0000 (16:15 +0000)]
See if this fixes "warning: initializer element is not computable at load time"

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39946 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rod of " warning: identifier ‘class’ conflicts with C++ keyword"
etxrab [Sat, 19 Nov 2011 09:08:50 +0000 (09:08 +0000)]
Get rod of " warning: identifier ‘class’ conflicts with C++ keyword"

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39945 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFail if somebody tries to write out a packet with an unsupported
guy [Fri, 18 Nov 2011 21:39:18 +0000 (21:39 +0000)]
Fail if somebody tries to write out a packet with an unsupported
encapsulation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39944 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTry to preserve native line endings when we rewrite files.
gerald [Fri, 18 Nov 2011 16:51:40 +0000 (16:51 +0000)]
Try to preserve native line endings when we rewrite files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39938 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Pascal Quantin:
martinm [Fri, 18 Nov 2011 13:42:55 +0000 (13:42 +0000)]
From Pascal Quantin:
For status Bitmap, don't show FSN in the info column twice.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39937 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake it easier to see:
martinm [Fri, 18 Nov 2011 12:45:50 +0000 (12:45 +0000)]
Make it easier to see:
- bitmap entries
- MRW and MRW-ACK
- RESET and RESET-ACK
- when the Poll bit is set for data

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39936 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoEthereal => Wireshark
alagoutte [Fri, 18 Nov 2011 12:41:48 +0000 (12:41 +0000)]
Ethereal => Wireshark

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39935 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRegenerate GIOP dissector plugins (after change in generator !) for fix Warning found...
alagoutte [Fri, 18 Nov 2011 12:39:35 +0000 (12:39 +0000)]
Regenerate GIOP dissector plugins (after change in generator !) for fix Warning found by Clang (>100 !)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39934 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix major (> 100) Dead Store (Dead assignement/Dead increment) Warning found by Clang...
alagoutte [Fri, 18 Nov 2011 12:37:33 +0000 (12:37 +0000)]
Fix major (> 100) Dead Store (Dead assignement/Dead increment) Warning found by Clang in IDL "generator" of GIOP Plugins

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39933 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRegenerate GIOP dissector plugins (after change in generator !) with following commma...
alagoutte [Fri, 18 Nov 2011 12:34:16 +0000 (12:34 +0000)]
Regenerate GIOP dissector plugins (after change in generator !) with following commmands :
:~/wireshark/tools$ ../idl2wrs ../idl/cosnaming.idl > ../plugins/giop/packet-cosnaming.c
:~/wireshark/tools$ ../idl2wrs ../idl/coseventcomm.idl > ../plugins/giop/packet-coseventcomm.c
:~/wireshark/tools$ ../idl2wrs ../idl/parlay/Parlay.idl > ../plugins/giop/packet-parlay.c
:~/wireshark/tools$ ../idl2wrs ../idl/tango.idl > ../plugins/giop/packet-tango.c

For packet-cosnaming.c, only some white return change
For packet-parley.c, lot of change but only the functions is not in the same order...?! (Order change in 17911)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39932 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSome modification in generated GIOP dissector plugins in not include in "generator...
alagoutte [Fri, 18 Nov 2011 10:30:46 +0000 (10:30 +0000)]
Some modification in generated GIOP dissector plugins in not include in "generator" (wireshark_gen.py)
* Remove some uneeded #includes (Revision 32419)
* Don't guard col_set_str (COL_PROTOCOL) with col_check (Revision 29340)
* Add missing #pragma warning disable, now using _MSC_VER (Revision 21222, 21227, 21240)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39931 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake sure pcap-ng supports a particular encapsulation type before
guy [Fri, 18 Nov 2011 07:13:33 +0000 (07:13 +0000)]
Make sure pcap-ng supports a particular encapsulation type before
trying to write out an interface description block for an interface with
that type.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39930 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse tvb_bcd_dig_to_ep_str().
etxrab [Fri, 18 Nov 2011 07:01:10 +0000 (07:01 +0000)]
Use tvb_bcd_dig_to_ep_str().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39929 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse the source directory argument.
gerald [Fri, 18 Nov 2011 01:35:58 +0000 (01:35 +0000)]
Use the source directory argument.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39926 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMaybe it's not a good idea to modify configure.in or config.nmake during
gerald [Fri, 18 Nov 2011 01:17:31 +0000 (01:17 +0000)]
Maybe it's not a good idea to modify configure.in or config.nmake during
compilation. Add a "--set-svn" option which only affects svnversion.h and
make it the default behavior.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39923 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAppend a path-separator to the plugins directory so xcopy doesn't get confused as...
cmaynard [Fri, 18 Nov 2011 01:08:20 +0000 (01:08 +0000)]
Append a path-separator to the plugins directory so xcopy doesn't get confused as to whether it's copying each plugin to a file or a directory.  I.e., hopefully to avoid this situation:

Does wireshark-gtk2\plugins\1.7.1-SVN-39918 specify a file name
or directory name on the target
(F = file, D = directory)?

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39922 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDon't clobber release information in configure.in.
gerald [Fri, 18 Nov 2011 00:33:14 +0000 (00:33 +0000)]
Don't clobber release information in configure.in.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39921 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse extended value strings.
wmeier [Thu, 17 Nov 2011 21:58:09 +0000 (21:58 +0000)]
Use extended value strings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39918 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRemove some unneeded #includes;
wmeier [Thu, 17 Nov 2011 20:51:07 +0000 (20:51 +0000)]
Remove some unneeded #includes;
Move proto_reg_handoff...() to the end of the file as per convention;
Do some whitespace cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39916 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd checks to make sure we don't overflow the maximum 32-bit file
guy [Thu, 17 Nov 2011 20:17:36 +0000 (20:17 +0000)]
Add checks to make sure we don't overflow the maximum 32-bit file
offset.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39915 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUpdate some comments.
gerald [Thu, 17 Nov 2011 20:09:07 +0000 (20:09 +0000)]
Update some comments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39913 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd a dissector table for National operation codes.
etxrab [Thu, 17 Nov 2011 20:05:03 +0000 (20:05 +0000)]
Add a dissector table for National operation codes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39912 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix "With the current changes NAS messages with the "null ciphering algorithm" EEA0...
etxrab [Thu, 17 Nov 2011 20:03:36 +0000 (20:03 +0000)]
Fix "With the current changes NAS messages with the "null ciphering algorithm" EEA0 are not handled."

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39911 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Pascal Quantin via bug 6593:
gerald [Thu, 17 Nov 2011 19:41:36 +0000 (19:41 +0000)]
From Pascal Quantin via bug 6593:

With Subversion 1.7, the working copy metada storage as changed (see
http://subversion.apache.org/docs/release-notes/1.7.html#wc-ng for details).
As a consequence, the file .svn/entries is no more updated and under Windows
the svnversion.h is no more regenerated (unless explicitely removed).
The attached patch fixes this issue so as to also check the .svn/wc.db file
date in the makefile rule.

Note that wc.db file must be checked before entries file as an upgrade of an
existing repository from subversion 1.6 to 1.7 leave an old entries file around
(that is no more updated).

In Makefile.am file, the svnversion.h file generation seems to be
systematically forced. So I guess Linux/Mac boxes are not impacted.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39910 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago(Trivial) remove an extra blank line.
wmeier [Thu, 17 Nov 2011 17:36:29 +0000 (17:36 +0000)]
(Trivial) remove an extra blank line.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39909 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake sure we terminate WiresharkCurrentVersion so we won't have to
gerald [Thu, 17 Nov 2011 17:15:51 +0000 (17:15 +0000)]
Make sure we terminate WiresharkCurrentVersion so we won't have to
reapply r39907.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39908 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTerminate WiresharkCurrentVersion to keep the buildbots happy. Also, since some...
cmaynard [Thu, 17 Nov 2011 17:12:42 +0000 (17:12 +0000)]
Terminate WiresharkCurrentVersion to keep the buildbots happy.  Also, since some changes were already committed to change the "Save As" behavior, add a blurb about it.  Unfortunately this was not mentioned for 1.7.0.  See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6192

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39907 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake it easier to see RLIST details.
martinm [Thu, 17 Nov 2011 16:47:22 +0000 (16:47 +0000)]
Make it easier to see RLIST details.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39906 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUndo some incorrect (but benign) FALSE->ENC_BIG_ENDIAN conversions done in SVN 37080.
wmeier [Thu, 17 Nov 2011 16:42:18 +0000 (16:42 +0000)]
Undo some incorrect (but benign) FALSE->ENC_BIG_ENDIAN conversions done in SVN 37080.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39905 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd missing copyright and license.
cmaynard [Thu, 17 Nov 2011 16:21:54 +0000 (16:21 +0000)]
Add missing copyright and license.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39904 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agodistribute -> redistribute.
cmaynard [Thu, 17 Nov 2011 16:10:02 +0000 (16:10 +0000)]
distribute -> redistribute.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39903 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix crash caused by trying to apply a field of type BASE_CUSTOM as a column. Fixes...
cmaynard [Thu, 17 Nov 2011 15:57:44 +0000 (15:57 +0000)]
Fix crash caused by trying to apply a field of type BASE_CUSTOM as a column.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6503.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39902 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoShow meaning of special length indication values in the LI root.
martinm [Thu, 17 Nov 2011 12:08:50 +0000 (12:08 +0000)]
Show meaning of special length indication values in the LI root.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39901 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRename pletonll() to reflect what it actually does, namely convert a
guy [Thu, 17 Nov 2011 09:24:15 +0000 (09:24 +0000)]
Rename pletonll() to reflect what it actually does, namely convert a
host-byte-order 64-bit integral quantity to little-endian byte order.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39900 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoA new macro needed by the WTAP_ENCAP_PER_PACKET support for writing
guy [Thu, 17 Nov 2011 09:04:54 +0000 (09:04 +0000)]
A new macro needed by the WTAP_ENCAP_PER_PACKET support for writing
NetMon files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39899 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd support for writing WTAP_ENCAP_PER_PACKET files; they are written
guy [Thu, 17 Nov 2011 09:03:09 +0000 (09:03 +0000)]
Add support for writing WTAP_ENCAP_PER_PACKET files; they are written
out in version 2.1 of the file format (the minimum version to support
that).

Change some data types to avoid having file offsets that are before the
beginning of the file.

Clean up some other data types and some comments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39898 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd a missing IE number.
etxrab [Thu, 17 Nov 2011 06:46:34 +0000 (06:46 +0000)]
Add a missing IE number.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39897 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoReturn *some* error if we end up trying to seek before the beginning of
guy [Thu, 17 Nov 2011 06:36:32 +0000 (06:36 +0000)]
Return *some* error if we end up trying to seek before the beginning of
the file, so you don't get weird random errors.  EINVAL is as good as
anything.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39896 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoPut back the check for dates that can be represented in DOS format the
guy [Thu, 17 Nov 2011 02:29:26 +0000 (02:29 +0000)]
Put back the check for dates that can be represented in DOS format the
way it was *supposed* to be done, rather than backwards.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39895 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRevert part of r39883 to avoid dereferencing a NULL pointer. Thanks Clang.
cmaynard [Thu, 17 Nov 2011 02:17:57 +0000 (02:17 +0000)]
Revert part of r39883 to avoid dereferencing a NULL pointer.  Thanks Clang.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39894 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDon't clobber release information for now.
gerald [Thu, 17 Nov 2011 01:37:14 +0000 (01:37 +0000)]
Don't clobber release information for now.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39893 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoCreate/update svnversion.h unless we're only running with --get-*.
gerald [Thu, 17 Nov 2011 00:48:21 +0000 (00:48 +0000)]
Create/update svnversion.h unless we're only running with --get-*.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39892 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd an SVN_REVISION variable to config.nmake. This can be used to
gerald [Thu, 17 Nov 2011 00:19:03 +0000 (00:19 +0000)]
Add an SVN_REVISION variable to config.nmake. This can be used to
retrieve our SVN revision in releases.

Use make-version.pl to set all version information. Be more explicit
about the tasks it performs:

  - Fetching the SVN revision which corresponds to our code. The
    revision can be fetched via "svn info", "git svn info", SubWCRev",
    config.nmake, or by prodding .svn.

  - Setting the version numbers (the "major.minor.micro" triplet).

  - Setting the release information (revision/build number, local build
    identifier)

Remove the "is_release" configuration option and dist-hook target.

When run with a "--set-*" option or no options make sure we leave a
valid svnversion.h behind.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39891 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAvoid using "POINT" as it causes compiler errors on some systems. Add modelines...
cmaynard [Wed, 16 Nov 2011 21:27:30 +0000 (21:27 +0000)]
Avoid using "POINT" as it causes compiler errors on some systems.  Add modelines that match the current file's format.  This dissector is now ready to be spiceistributed.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39890 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDon't assign the return value of proto_tree_add_item to a variable if it isn't going...
cmaynard [Wed, 16 Nov 2011 20:18:51 +0000 (20:18 +0000)]
Don't assign the return value of proto_tree_add_item to a variable if it isn't going to be used.  Fixes Coverity CID 1327.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39889 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMove FI_RESET_FLAG and PROTO_ITEM_SET_VISIBLE macros to proto.h and fix the FI_RESET_...
cmaynard [Wed, 16 Nov 2011 20:09:49 +0000 (20:09 +0000)]
Move FI_RESET_FLAG and PROTO_ITEM_SET_VISIBLE macros to proto.h and fix the FI_RESET_FLAG macro, being sure to use the 1's complement operator, '~', instead of the logical negation operator, '!'. (Fixes Coverity CID 1326).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39888 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDissect national Opcode.
etxrab [Wed, 16 Nov 2011 19:52:00 +0000 (19:52 +0000)]
Dissect national Opcode.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39887 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSupport nanosecond-resolution time for NetMon 2.x format (it's only
guy [Wed, 16 Nov 2011 17:54:44 +0000 (17:54 +0000)]
Support nanosecond-resolution time for NetMon 2.x format (it's only
100-nanosecond resolution, but that's still better than microsecond
resolution).

For NetMon 1.x format, only claim to support millisecond resolution, as
that's all you get.

Fix handling of negative time deltas in NetMon 2.x format.

When writing a NetMon file, trim the time of the first packet to
millisecond precision to get the capture start time, so that the start
time written to the file (which has millisecond precision) is the same
as the start time used to calculate the deltas written to the packet
headers.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39886 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoOK, this should do it.
guy [Wed, 16 Nov 2011 17:13:37 +0000 (17:13 +0000)]
OK, this should do it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39885 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix build on Windows.
guy [Wed, 16 Nov 2011 17:12:47 +0000 (17:12 +0000)]
Fix build on Windows.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39884 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAnother place where we have to protect against MSVC's time-conversion
guy [Wed, 16 Nov 2011 17:08:00 +0000 (17:08 +0000)]
Another place where we have to protect against MSVC's time-conversion
routines blowing up if handed a too-large time_t.

While we're at it, also check for dates that can't be represented in DOS
format (pre-1980 dates).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39883 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAnother place where we have to protect against MSVC's time-conversion
guy [Wed, 16 Nov 2011 16:48:02 +0000 (16:48 +0000)]
Another place where we have to protect against MSVC's time-conversion
routines blowing up if handed a too-large time_t.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39882 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoShow more sequence numbers in info column, and in root nodes.
martinm [Wed, 16 Nov 2011 16:32:40 +0000 (16:32 +0000)]
Show more sequence numbers in info column, and in root nodes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39881 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix handling of empty OpenType at the end of PDU
kukosa [Wed, 16 Nov 2011 08:55:02 +0000 (08:55 +0000)]
Fix handling of empty OpenType at the end of PDU

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39880 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago- Resorted the IEs in numerical order for easier comparison with the list of constants.
etxrab [Wed, 16 Nov 2011 05:54:44 +0000 (05:54 +0000)]
- Resorted the IEs in numerical order for easier comparison with the list of constants.
- Added two missing IEs

Solves LPPa embedded payloads not shown within LCS-AP
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6478

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39879 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoHandle ctime() and localtime() returning NULL and localtime() on Windows
guy [Wed, 16 Nov 2011 03:13:02 +0000 (03:13 +0000)]
Handle ctime() and localtime() returning NULL and localtime() on Windows
blowing up when handed a bad value.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39878 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of unnecessary assignment (the code below it always assigns a
guy [Wed, 16 Nov 2011 02:43:58 +0000 (02:43 +0000)]
Get rid of unnecessary assignment (the code below it always assigns a
value to the variable).  Praise be to Clang Cat.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39877 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDon't set variables if we don't look at them later. All praise Clang
guy [Wed, 16 Nov 2011 02:18:30 +0000 (02:18 +0000)]
Don't set variables if we don't look at them later.  All praise Clang
Cat.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39876 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd Jakob Hirsch; Fix bad formatting which screwed up AUTHORS display.
wmeier [Wed, 16 Nov 2011 02:13:56 +0000 (02:13 +0000)]
Add Jakob Hirsch; Fix bad formatting which screwed up AUTHORS display.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39875 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoCleanup & reformatting: whitespace & long-lines.
wmeier [Wed, 16 Nov 2011 01:59:15 +0000 (01:59 +0000)]
Cleanup & reformatting: whitespace & long-lines.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39874 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoThou shalt not use proto_tree_add_string() with an FT_BYTES field.
guy [Wed, 16 Nov 2011 01:56:58 +0000 (01:56 +0000)]
Thou shalt not use proto_tree_add_string() with an FT_BYTES field.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39873 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDelete pointless orig_offset variable, initialize speech_data_len[], use tvb_reported...
cmaynard [Wed, 16 Nov 2011 01:37:32 +0000 (01:37 +0000)]
Delete pointless orig_offset variable, initialize speech_data_len[], use tvb_reported_length() instead of tvb_length(), and protect against a possible buffer overflow.  This should fix the Clang warning, "packet-evrc.c:364:41: warning: The right operand of '>=' is a garbage value", among other things.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39872 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix indentation.
guy [Wed, 16 Nov 2011 01:25:49 +0000 (01:25 +0000)]
Fix indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39871 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agotvb_[reported_]length_remaining can return -1
wmeier [Tue, 15 Nov 2011 21:22:01 +0000 (21:22 +0000)]
tvb_[reported_]length_remaining can return -1

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39870 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRemove unneeded #include
wmeier [Tue, 15 Nov 2011 21:07:37 +0000 (21:07 +0000)]
Remove unneeded #include

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39869 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago(Trivial) Reformat some long lines & do some whitespace cleanup.
wmeier [Tue, 15 Nov 2011 20:49:40 +0000 (20:49 +0000)]
(Trivial) Reformat some long lines & do some whitespace cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39868 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoCheck the return value of dissect_sip_name_addr_or_addr_spec()
etxrab [Tue, 15 Nov 2011 20:14:51 +0000 (20:14 +0000)]
Check the return value of dissect_sip_name_addr_or_addr_spec()
Should fix the recent fuzz failures.
Thanks Chris for isolating the offending packet.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39867 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSquelch a warning. (This code probably needs a review; we really need a
guy [Tue, 15 Nov 2011 19:44:24 +0000 (19:44 +0000)]
Squelch a warning.  (This code probably needs a review; we really need a
better general framework for parsing text-based protocols.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39866 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRename channel_type enums to avoid possible naming conflicts.
cmaynard [Tue, 15 Nov 2011 19:37:16 +0000 (19:37 +0000)]
Rename channel_type enums to avoid possible naming conflicts.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39865 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMore indentation cleanup.
guy [Tue, 15 Nov 2011 19:35:13 +0000 (19:35 +0000)]
More indentation cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39864 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoClean up indentation.
guy [Tue, 15 Nov 2011 19:33:14 +0000 (19:33 +0000)]
Clean up indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39863 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agopacket-sip.c:1469: warning: unused variable 'contact_param_end_offset'
etxrab [Tue, 15 Nov 2011 19:25:17 +0000 (19:25 +0000)]
packet-sip.c:1469: warning: unused variable 'contact_param_end_offset'

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39862 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRestore dissection of contact parameters.
etxrab [Tue, 15 Nov 2011 19:03:39 +0000 (19:03 +0000)]
Restore dissection of contact parameters.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39861 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRemove unneeded #includes;
wmeier [Tue, 15 Nov 2011 19:00:08 +0000 (19:00 +0000)]
Remove unneeded #includes;
Move proto_reg_handoff...() to the end of the file as per convention.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39860 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMove proto_reg_handoff...() to the end of the file as per convention;
wmeier [Tue, 15 Nov 2011 18:31:11 +0000 (18:31 +0000)]
Move proto_reg_handoff...() to the end of the file as per convention;
Do other minor reformatting and cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39859 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd svn:executable to props
wmeier [Tue, 15 Nov 2011 17:44:14 +0000 (17:44 +0000)]
Add svn:executable to props

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39858 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSet svn:mime-type to image/png
wmeier [Tue, 15 Nov 2011 17:41:41 +0000 (17:41 +0000)]
Set svn:mime-type to image/png

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39857 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSet svn:mime-type to image/png
wmeier [Tue, 15 Nov 2011 17:33:59 +0000 (17:33 +0000)]
Set svn:mime-type to image/png

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39856 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSet svn:mime-type to image/png
wmeier [Tue, 15 Nov 2011 17:29:27 +0000 (17:29 +0000)]
Set svn:mime-type to image/png

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39855 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSet svn:mime-type to image/png
wmeier [Tue, 15 Nov 2011 17:26:04 +0000 (17:26 +0000)]
Set svn:mime-type to image/png

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39854 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSet svn:mime-type to image/png
wmeier [Tue, 15 Nov 2011 17:18:21 +0000 (17:18 +0000)]
Set svn:mime-type to image/png

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39853 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAppend important details from LI and SURI trees to root item.
martinm [Tue, 15 Nov 2011 15:36:39 +0000 (15:36 +0000)]
Append important details from LI and SURI trees to root item.
Show some SNs in the info column.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39852 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some props
wmeier [Tue, 15 Nov 2011 15:28:20 +0000 (15:28 +0000)]
Fix some props

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39851 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some svn properties
wmeier [Tue, 15 Nov 2011 15:16:37 +0000 (15:16 +0000)]
Fix some svn properties

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39850 f5534014-38df-0310-8fa8-9805f1628bb7