Commit Graph

38230 Commits

Author SHA1 Message Date
Chris Maynard f2e8579ba3 Fix potential infinite loop introduced with r39961 and find by the buildbot. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6599
svn path=/trunk/; revision=39963
2011-11-21 02:01:59 +00:00
Chris Maynard 3c8e31e055 Fix bug 6561: IPv4 UDP/TCP Checksum incorrect if routing header present.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6561

svn path=/trunk/; revision=39961
2011-11-20 15:47:14 +00:00
Chris Maynard 1e6a19e48a Fix "'Closing File!' Dialog Hangs" bug 3046: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3046
svn path=/trunk/; revision=39959
2011-11-20 15:11:15 +00:00
Gerald Combs d1cdba1c13 [Automatic manuf, services and enterprise-numbers update for 2011-11-20]
svn path=/trunk/; revision=39958
2011-11-20 15:03:25 +00:00
Anders Broman 62866c78a0 Get rid of Warnings.
svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
Anders Broman 8fdb6af097 Remove export.
svn path=/trunk/; revision=39956
2011-11-20 10:27:26 +00:00
Anders Broman 03b2005957 See if this fixes it, why it worked on my system is anybodys guess.
svn path=/trunk/; revision=39955
2011-11-20 09:51:03 +00:00
Anders Broman 42b44648c8 Get rid of Warnings.
svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
Guy Harris 56903273cc Expand a comment.
svn path=/trunk/; revision=39953
2011-11-20 03:15:53 +00:00
Guy Harris 8f06e3af4b 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.

svn path=/trunk/; revision=39952
2011-11-19 22:57:13 +00:00
Anders Broman faea2d624c Get rid of Warnings.
svn path=/trunk/; revision=39951
2011-11-19 22:42:51 +00:00
Guy Harris 00884a10f2 Clean up indentation.
svn path=/trunk/; revision=39950
2011-11-19 20:49:15 +00:00
Guy Harris 2929c93ea2 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.

svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
Anders Broman 4b2aa811e1 Fix Warnings.
svn path=/trunk/; revision=39948
2011-11-19 17:21:35 +00:00
Anders Broman 87eafedef0 Revert 39946
svn path=/trunk/; revision=39947
2011-11-19 16:24:19 +00:00
Anders Broman 3d13938fa4 See if this fixes "warning: initializer element is not computable at load time"
svn path=/trunk/; revision=39946
2011-11-19 16:15:07 +00:00
Anders Broman b431591727 Get rod of " warning: identifier ‘class’ conflicts with C++ keyword"
svn path=/trunk/; revision=39945
2011-11-19 09:08:50 +00:00
Guy Harris 7694a8659d Fail if somebody tries to write out a packet with an unsupported
encapsulation.

svn path=/trunk/; revision=39944
2011-11-18 21:39:18 +00:00
Gerald Combs c95e2e88ce Try to preserve native line endings when we rewrite files.
svn path=/trunk/; revision=39938
2011-11-18 16:51:40 +00:00
Martin Mathieson 4ad5ff513b From Pascal Quantin:
For status Bitmap, don't show FSN in the info column twice.

svn path=/trunk/; revision=39937
2011-11-18 13:42:55 +00:00
Martin Mathieson 556a0558b9 Make it easier to see:
- bitmap entries
- MRW and MRW-ACK
- RESET and RESET-ACK
- when the Poll bit is set for data

svn path=/trunk/; revision=39936
2011-11-18 12:45:50 +00:00
Alexis La Goutte b662e6250c Ethereal => Wireshark
svn path=/trunk/; revision=39935
2011-11-18 12:41:48 +00:00
Alexis La Goutte 9eb1835a10 Regenerate GIOP dissector plugins (after change in generator !) for fix Warning found by Clang (>100 !)
svn path=/trunk/; revision=39934
2011-11-18 12:39:35 +00:00
Alexis La Goutte 9e045961d3 Fix major (> 100) Dead Store (Dead assignement/Dead increment) Warning found by Clang in IDL "generator" of GIOP Plugins
svn path=/trunk/; revision=39933
2011-11-18 12:37:33 +00:00
Alexis La Goutte 331fa3af93 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)

svn path=/trunk/; revision=39932
2011-11-18 12:34:16 +00:00
Alexis La Goutte f207b03503 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)



svn path=/trunk/; revision=39931
2011-11-18 10:30:46 +00:00
Guy Harris 680b3d3a86 Make sure pcap-ng supports a particular encapsulation type before
trying to write out an interface description block for an interface with
that type.

svn path=/trunk/; revision=39930
2011-11-18 07:13:33 +00:00
Anders Broman 1b7b2dd067 Use tvb_bcd_dig_to_ep_str().
svn path=/trunk/; revision=39929
2011-11-18 07:01:10 +00:00
Gerald Combs d7bb2160f6 Use the source directory argument.
svn path=/trunk/; revision=39926
2011-11-18 01:35:58 +00:00
Gerald Combs 873e0bdd71 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.

svn path=/trunk/; revision=39923
2011-11-18 01:17:31 +00:00
Chris Maynard f20ad40ea9 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)?


svn path=/trunk/; revision=39922
2011-11-18 01:08:20 +00:00
Gerald Combs f6603bc947 Don't clobber release information in configure.in.
svn path=/trunk/; revision=39921
2011-11-18 00:33:14 +00:00
Bill Meier f52525e40c Use extended value strings.
svn path=/trunk/; revision=39918
2011-11-17 21:58:09 +00:00
Bill Meier 9f328a08d3 Remove some unneeded #includes;
Move proto_reg_handoff...() to the end of the file as per convention;
Do some whitespace cleanup.

svn path=/trunk/; revision=39916
2011-11-17 20:51:07 +00:00
Guy Harris 9b9bd6d27b Add checks to make sure we don't overflow the maximum 32-bit file
offset.

svn path=/trunk/; revision=39915
2011-11-17 20:17:36 +00:00
Gerald Combs a8cc73a4e5 Update some comments.
svn path=/trunk/; revision=39913
2011-11-17 20:09:07 +00:00
Anders Broman 9518cb7c7c Add a dissector table for National operation codes.
svn path=/trunk/; revision=39912
2011-11-17 20:05:03 +00:00
Anders Broman 71039b37c6 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

svn path=/trunk/; revision=39911
2011-11-17 20:03:36 +00:00
Gerald Combs 2aaa91c3fb 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.

svn path=/trunk/; revision=39910
2011-11-17 19:41:36 +00:00
Bill Meier eeaf3993ad (Trivial) remove an extra blank line.
svn path=/trunk/; revision=39909
2011-11-17 17:36:29 +00:00
Gerald Combs b17a3c7c75 Make sure we terminate WiresharkCurrentVersion so we won't have to
reapply r39907.

svn path=/trunk/; revision=39908
2011-11-17 17:15:51 +00:00
Chris Maynard 192af9e872 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
svn path=/trunk/; revision=39907
2011-11-17 17:12:42 +00:00
Martin Mathieson 4eaa48f8db Make it easier to see RLIST details.
svn path=/trunk/; revision=39906
2011-11-17 16:47:22 +00:00
Bill Meier 365ca9c805 Undo some incorrect (but benign) FALSE->ENC_BIG_ENDIAN conversions done in SVN 37080.
svn path=/trunk/; revision=39905
2011-11-17 16:42:18 +00:00
Chris Maynard 0ef4ff0ce7 Add missing copyright and license.
svn path=/trunk/; revision=39904
2011-11-17 16:21:54 +00:00
Chris Maynard e550884d5e distribute -> redistribute.
svn path=/trunk/; revision=39903
2011-11-17 16:10:02 +00:00
Chris Maynard a71316964f 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.
svn path=/trunk/; revision=39902
2011-11-17 15:57:44 +00:00
Martin Mathieson 67d0be7973 Show meaning of special length indication values in the LI root.
svn path=/trunk/; revision=39901
2011-11-17 12:08:50 +00:00
Guy Harris e4658ced93 Rename pletonll() to reflect what it actually does, namely convert a
host-byte-order 64-bit integral quantity to little-endian byte order.

svn path=/trunk/; revision=39900
2011-11-17 09:24:15 +00:00
Guy Harris 31f61b75b2 A new macro needed by the WTAP_ENCAP_PER_PACKET support for writing
NetMon files.

svn path=/trunk/; revision=39899
2011-11-17 09:04:54 +00:00