obnox/wireshark/wip.git
7 years agoFrom Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes
wmeier [Fri, 25 Nov 2011 22:02:25 +0000 (22:02 +0000)]
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes

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

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

7 years agoMark drep parameter as unused in the epm_dissect_tower_data function
sfisher [Fri, 25 Nov 2011 17:19:00 +0000 (17:19 +0000)]
Mark drep parameter as unused in the epm_dissect_tower_data function
since its use was removed in r40002.

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

7 years agoFrom Wido Kelling: EPM tower UUID must be interpreted always as little endian.
wmeier [Fri, 25 Nov 2011 17:02:51 +0000 (17:02 +0000)]
From Wido Kelling: EPM tower UUID must be interpreted always as little endian.

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

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

7 years agoAdd the reason for a UL ReTx (PDCCH retx grant or PHICH NACK).
martinm [Fri, 25 Nov 2011 11:19:03 +0000 (11:19 +0000)]
Add the reason for a UL ReTx (PDCCH retx grant or PHICH NACK).

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

7 years agoRemove unused code (Add in Revision 836)
alagoutte [Fri, 25 Nov 2011 10:41:11 +0000 (10:41 +0000)]
Remove unused code (Add in Revision 836)
Fix also some Clang/GCC Warning about unused variable

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

7 years agoFix H.460.18 and H.460.19 integration into H.245
kukosa [Thu, 24 Nov 2011 15:18:11 +0000 (15:18 +0000)]
Fix H.460.18 and H.460.19 integration into H.245

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

7 years agoOnly add the priority level if it is set inside valid range.
martinm [Thu, 24 Nov 2011 12:44:11 +0000 (12:44 +0000)]
Only add the priority level if it is set inside valid range.

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

7 years agoFix gcc compile error
wmeier [Thu, 24 Nov 2011 03:33:29 +0000 (03:33 +0000)]
Fix gcc compile error

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

7 years agoUse a GHashTable to store templates instead of
wmeier [Thu, 24 Nov 2011 03:20:44 +0000 (03:20 +0000)]
Use a GHashTable to store templates instead of
  using a home-grown hash table (which didn't handle collisions);
Include complete "connection info" (srcAddr,srcPort,dstAddr,dstPort) in "Template Name";
Rename various variables;
Re-indent & Re-format code.

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

7 years agoDisplay protocol ID consistently in decimal throughout. Append each IP option to...
cmaynard [Wed, 23 Nov 2011 18:33:45 +0000 (18:33 +0000)]
Display protocol ID consistently in decimal throughout.  Append each IP option to top-level Options field.  Whitespace cleanup - the majority of the dissector used 2-space indentation, so that's the format chosen.  Added modelines to match.

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

7 years agoMove some comments around to make it more boilerplate like.
jake [Tue, 22 Nov 2011 21:51:24 +0000 (21:51 +0000)]
Move some comments around to make it more boilerplate like.

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

7 years agoFix two compiler errors.
wmeier [Tue, 22 Nov 2011 20:48:49 +0000 (20:48 +0000)]
Fix two compiler errors.

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

7 years agoHandle 2 issues related to cacheing templates:
wmeier [Tue, 22 Nov 2011 20:42:25 +0000 (20:42 +0000)]
Handle 2 issues related to cacheing templates:
 - Use a (slightly) less simplistic hashing algorithm to reduce collisions;
   Note: A GHashTable which handles collisions rather than
         a home-grown hash table (which does not) needs to be implemented.
 - Don't replace an existing template in the cache when a collision occurs;

Fixes Bug #6325
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6325

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

7 years agoShow a "Capturing on ..." message similar to TShark.
guy [Tue, 22 Nov 2011 19:07:49 +0000 (19:07 +0000)]
Show a "Capturing on ..." message similar to TShark.

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

7 years agoAdd more packet highlights to the info column.
martinm [Tue, 22 Nov 2011 17:57:25 +0000 (17:57 +0000)]
Add more packet highlights to the info column.

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

7 years agoFix bugs related to Nounce IE dissection.
etxrab [Tue, 22 Nov 2011 17:44:50 +0000 (17:44 +0000)]
Fix bugs related to Nounce IE dissection.

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

7 years agoFor now, display the protocol in hexadecimal again so displaying it in decimal doesn...
cmaynard [Tue, 22 Nov 2011 15:18:20 +0000 (15:18 +0000)]
For now, display the protocol in hexadecimal again so displaying it in decimal doesn't get backported to the 1.6 and 1.4 trunks at the request of Joerg.

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

7 years agoUnconditionally install idl2wrs
rbalint [Tue, 22 Nov 2011 13:53:17 +0000 (13:53 +0000)]
Unconditionally install idl2wrs

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

7 years agohardcode /bin/sh to idl2wrs
rbalint [Tue, 22 Nov 2011 13:53:06 +0000 (13:53 +0000)]
hardcode /bin/sh to idl2wrs

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

7 years agoIf we're not running as a child process, report the interfaces on which
guy [Tue, 22 Nov 2011 10:08:26 +0000 (10:08 +0000)]
If we're not running as a child process, report the interfaces on which
we're capturing.  (We do not require a -i flag; the message could be
useful if you don't specify the interface, as it lets you know which
interface was chosen, which might not be the interface you'd think it
would be.  Yes, that's arguably a libpcap bug, which I plan to look at;
it should probably try to figure out which interfaces are "active" if
possible, and prefer those.)

Use cmdarg_err() for invalid capture filters and other capture errors.

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

7 years agoAdd initial .gitignore files
rbalint [Tue, 22 Nov 2011 00:13:12 +0000 (00:13 +0000)]
Add initial .gitignore files

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

7 years agoDon't hardcode 'python' for asn2wrs
rbalint [Tue, 22 Nov 2011 00:11:56 +0000 (00:11 +0000)]
Don't hardcode 'python' for asn2wrs

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

7 years agoGet rid of Warnings.
etxrab [Mon, 21 Nov 2011 20:08:11 +0000 (20:08 +0000)]
Get rid of Warnings.

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

7 years agoTypo
etxrab [Mon, 21 Nov 2011 20:06:26 +0000 (20:06 +0000)]
Typo

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

7 years agoGet rid of Warnings.
etxrab [Mon, 21 Nov 2011 20:04:45 +0000 (20:04 +0000)]
Get rid of Warnings.

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

7 years agoGet rid of Warnings.
etxrab [Mon, 21 Nov 2011 18:21:59 +0000 (18:21 +0000)]
Get rid of Warnings.

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

7 years agoFrom Vincent Helfre:
etxrab [Mon, 21 Nov 2011 18:16:19 +0000 (18:16 +0000)]
From Vincent Helfre:
added the display of intermediate value used to decode ARFCN in
range 1024/256 format.
So now the W(n) values can be displayed and localised in the tvb buffer.
The code was reworked a little to use the get_bit functions.

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

7 years agoFrom Claudio: header value always computed twice
wmeier [Mon, 21 Nov 2011 17:58:47 +0000 (17:58 +0000)]
From Claudio: header value always computed twice

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

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

7 years agoAn SDNV length > 8 is also not dissectable. Should fix bug 6601.
guy [Mon, 21 Nov 2011 17:49:27 +0000 (17:49 +0000)]
An SDNV length > 8 is also not dissectable.  Should fix bug 6601.

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

7 years ago'dissect_ImageLZ_JPEG()' is apparently not used; #if 0 the code for now.
wmeier [Mon, 21 Nov 2011 17:05:17 +0000 (17:05 +0000)]
'dissect_ImageLZ_JPEG()' is apparently not used; #if 0 the code for now.

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

7 years agoFrom Yaniv Kaul: Some enhancements, some fixes, to the Spice dissector:
wmeier [Mon, 21 Nov 2011 16:43:01 +0000 (16:43 +0000)]
From Yaniv Kaul: Some enhancements, some fixes, to the Spice dissector:
- SASL authentication support - improved (and correct) state machine.
- indention, tab fixes
- macro to fetch PDU, simplifying the code (and improving its readability)
- properly show the length of agent messages and align them under the right tree.

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

From me: Fix some indentation & remove some trailing whitespace.

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

7 years agoAdd the system frame number (SFN) to the context fields logged along with LTE MAC...
martinm [Mon, 21 Nov 2011 16:18:33 +0000 (16:18 +0000)]
Add the system frame number (SFN) to the context fields logged along with LTE MAC frames.

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

7 years agoLinking against GTK3 stoped working because only libgtk3 was linked
jmayer [Mon, 21 Nov 2011 15:39:25 +0000 (15:39 +0000)]
Linking against GTK3 stoped working because only libgtk3 was linked
against and no libs that gtk3 depended on. Fix this.

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

7 years agoMore warnings "set but not used" fixed
jmayer [Mon, 21 Nov 2011 15:03:17 +0000 (15:03 +0000)]
More warnings "set but not used" fixed

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

7 years agoMove generated dissctors that are causing problems to DIRTY.
jmayer [Mon, 21 Nov 2011 13:52:35 +0000 (13:52 +0000)]
Move generated dissctors that are causing problems to DIRTY.

packet-x11.c: hundreds of:

/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/x11-extension-implementation.h: In function ‘xselinuxGetClientContext’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/x11-extension-implementation.h:27994:9: warning: variable ‘f_resource’ set but not used [-Wunused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/x11-extension-implementation.h: In function ‘xselinuxGetClientContext_Reply’:

dissectors/packet-dcerpc-mapi.c: set but not used
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_Release_req’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8592:14: warning: variable ‘tree’ set but not used [-Wunused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_Release_repl’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8617:14: warning: variable ‘tree’ set but not used [-Wunused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_RecipSMTP’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8848:14: warning: variable ‘tree’ set but not used [-Wunused-but-set-variable]

dissecots/packet-dcerpc-drsuapi.c: set but not used
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-drsuapi.c: In function ‘drsuapi_dissect_DsGetNCChangesCtr7’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-drsuapi.c:2920:17: warning: variable ‘tree’ set but not used [-Wunused-but-set-variable]

Btw.: Does it really make sense to use an extra CMakefile for the dcerpc/ dir?
      I'd rather the the idl2wrs.c in tools/ and the generatorstuff in epan/CMake

More files with the same problem.

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

7 years agoAnother case of written to only variable.
jmayer [Mon, 21 Nov 2011 12:13:36 +0000 (12:13 +0000)]
Another case of written to only variable.

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

7 years agonew_offset was was written to but never read.
jmayer [Mon, 21 Nov 2011 12:11:35 +0000 (12:11 +0000)]
new_offset was was written to but never read.

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

7 years agoMove a generated file into file lists that do not treat warnings
jmayer [Mon, 21 Nov 2011 12:08:10 +0000 (12:08 +0000)]
Move a generated file into file lists that do not treat warnings
as errors:

/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_Release_req’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8592:14: error: variable ‘tree’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_Release_repl’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8617:14: error: variable ‘tree’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_RecipSMTP’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8848:14: error: variable ‘tree’ set but not used [-Werror=unused-but-set-variable]

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

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