metze/wireshark/wip.git
10 years agoFIXUP: WIP: verification_trailer
Gregor Beck [Mon, 2 Sep 2013 08:55:44 +0000 (10:55 +0200)]
FIXUP:  WIP: verification_trailer

10 years agoFIXUP: sec_vt_command bitmask
Gregor Beck [Mon, 2 Sep 2013 08:35:53 +0000 (10:35 +0200)]
FIXUP: sec_vt_command bitmask

10 years agosec_vt_bitmask
Gregor Beck [Mon, 2 Sep 2013 08:04:57 +0000 (10:04 +0200)]
sec_vt_bitmask

10 years agoFIXUP: give names to sec_vt_command's
Gregor Beck [Fri, 30 Aug 2013 13:12:24 +0000 (15:12 +0200)]
FIXUP: give names to sec_vt_command's

10 years agoheader field for sec_vt_command_length
Gregor Beck [Fri, 30 Aug 2013 13:09:36 +0000 (15:09 +0200)]
header field for sec_vt_command_length

10 years agogive names to sec_vt_command's
Gregor Beck [Fri, 30 Aug 2013 13:02:28 +0000 (15:02 +0200)]
give names to sec_vt_command's

10 years agoadd bitmask for sec_vt_command
Gregor Beck [Fri, 30 Aug 2013 12:49:31 +0000 (14:49 +0200)]
add bitmask for sec_vt_command

10 years agoWIP: verification_trailer
Gregor Beck [Fri, 30 Aug 2013 12:01:29 +0000 (14:01 +0200)]
WIP: verification_trailer

10 years agoMove Auth padding to the right tree
Gregor Beck [Fri, 30 Aug 2013 12:00:56 +0000 (14:00 +0200)]
Move Auth padding to the right tree

10 years agoadd WERR_INVALID_STATE
Gregor Beck [Wed, 28 Aug 2013 10:35:00 +0000 (12:35 +0200)]
add WERR_INVALID_STATE

10 years agoadd WERR_TIMEOUT
Gregor Beck [Wed, 28 Aug 2013 09:22:05 +0000 (11:22 +0200)]
add WERR_TIMEOUT

10 years agopacket-smb2: pass smb2_info via private_data
Gregor Beck [Thu, 20 Sep 2012 07:21:41 +0000 (09:21 +0200)]
packet-smb2: pass smb2_info via private_data

10 years agosq FSCTL_PIPE_WAIT
Stefan Metzmacher [Fri, 3 Jan 2014 13:32:37 +0000 (14:32 +0100)]
sq FSCTL_PIPE_WAIT

10 years agosq epan/dissectors/packet-smb2.c no check_col => fsctl_pipe_wait
Stefan Metzmacher [Wed, 9 Oct 2013 09:01:49 +0000 (11:01 +0200)]
sq epan/dissectors/packet-smb2.c no check_col => fsctl_pipe_wait

10 years agoWIP: fsctl_pipe_wait
Gregor Beck [Mon, 17 Sep 2012 09:50:45 +0000 (11:50 +0200)]
WIP: fsctl_pipe_wait

10 years agoWIP: FSCTL_PIPE_WAIT
Gregor Beck [Thu, 13 Sep 2012 15:27:51 +0000 (17:27 +0200)]
WIP: FSCTL_PIPE_WAIT

10 years agoRevert "smb-direct fragmentation"
Stefan Metzmacher [Wed, 3 Oct 2012 21:02:14 +0000 (23:02 +0200)]
Revert "smb-direct fragmentation"

This reverts commit 7559f043b05f60abdec72c49bb1adb48ae2ee584.

10 years agosmb-direct fragmentation
Stefan Metzmacher [Wed, 3 Oct 2012 21:01:12 +0000 (23:01 +0200)]
smb-direct fragmentation

10 years agoMIT krb5-1.6 HACK patch
Stefan Metzmacher [Sat, 25 Jul 2009 08:23:26 +0000 (10:23 +0200)]
MIT krb5-1.6 HACK patch

Apply this patch to krb5-1.6.x and build it
with a special prefix that only wireshark will use!

Then start wireshark with a script like this:

-----
metze@SERNOX:~/devel/wireshark/wireshark.git$ cat ~/bin/mxwrap.wireshark.krb5

export LD_LIBRARY_PATH="/home/metze/prefix/mit-krb5-1-6/lib/:$LD_LIBRARY_PATH"
exec /home/metze/devel/prefix/wireshark/bin/wireshark $@
gdb --args /home/metze/devel/prefix/wireshark/bin/wireshark $@
------

The LD_PRELOAD only works if the krb5 library version your system one,
then you just need to replace "libk5crypto.so", otherwise wireshark
needs to all of the custom libraries.

metze

10 years agofix for netmon 3.x captures
Stefan Metzmacher [Wed, 25 Aug 2010 05:14:40 +0000 (07:14 +0200)]
fix for netmon 3.x captures

metze

10 years agoTODO: packet-smb2: setup decryption keys for kerberos session setups
Stefan Metzmacher [Mon, 13 Aug 2012 15:51:21 +0000 (17:51 +0200)]
TODO: packet-smb2: setup decryption keys for kerberos session setups

10 years agopacket-kerberos: remember in what frame a key was learned
Stefan Metzmacher [Mon, 13 Aug 2012 12:45:58 +0000 (14:45 +0200)]
packet-kerberos: remember in what frame a key was learned

10 years agoasn1/kerberos: remember in what frame a key was learned
Stefan Metzmacher [Mon, 13 Aug 2012 06:59:22 +0000 (08:59 +0200)]
asn1/kerberos: remember in what frame a key was learned

10 years agopacket-smb: register a dissector on top of smb_direct
Stefan Metzmacher [Wed, 19 Sep 2012 18:21:49 +0000 (20:21 +0200)]
packet-smb: register a dissector on top of smb_direct

Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agopacket-smb2: register a dissector on top of smb_direct
Stefan Metzmacher [Wed, 19 Sep 2012 18:21:49 +0000 (20:21 +0200)]
packet-smb2: register a dissector on top of smb_direct

Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agopacket-iwarp-mpa: give more information if the ULPDU length doesn't match
Stefan Metzmacher [Wed, 19 Sep 2012 18:21:04 +0000 (20:21 +0200)]
packet-iwarp-mpa: give more information if the ULPDU length doesn't match

Try to dissect even it the size is not as expected.
Windows doesn't use alignment for smb-direct.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agopacket-smb-direct.c: add initial implementation
Stefan Metzmacher [Wed, 19 Sep 2012 14:21:21 +0000 (16:21 +0200)]
packet-smb-direct.c: add initial implementation

Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agopacket-iwarp-ddp-rdmap: make it possible to register "iwarp_ddp_rdmap" payload dissectors
Stefan Metzmacher [Wed, 19 Sep 2012 13:38:43 +0000 (15:38 +0200)]
packet-iwarp-ddp-rdmap: make it possible to register "iwarp_ddp_rdmap" payload dissectors

Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agoTODO needed??? packet-ntlmssp: fix possible segfault and set blob->length so the...
Stefan Metzmacher [Tue, 6 Nov 2012 09:02:59 +0000 (10:02 +0100)]
TODO needed??? packet-ntlmssp: fix possible segfault and set blob->length so the max value

10 years agoAdd a HACK patch for building a patched kerberos library
Matthieu Patou [Mon, 23 Sep 2013 06:24:24 +0000 (23:24 -0700)]
Add a HACK patch for building a patched kerberos library

Signed-off-by: Matthieu Patou <mat@matws.net>
10 years agopacket-smb2: dissect SMBDirect Buffer Descriptors
Stefan Metzmacher [Sat, 29 Sep 2012 08:35:13 +0000 (10:35 +0200)]
packet-smb2: dissect SMBDirect Buffer Descriptors

Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agopacket-smb2: fix lease epoch fields
Stefan Metzmacher [Wed, 31 Oct 2012 12:06:09 +0000 (13:06 +0100)]
packet-smb2: fix lease epoch fields

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

Change-Id: I1955360adaee53846f084434c59180d715e19fcd
Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agosmb2: Lease Epoch is only 16 bit
Volker Lendecke [Tue, 28 Jan 2014 10:27:14 +0000 (11:27 +0100)]
smb2: Lease Epoch is only 16 bit

See [MS-SMB2] 2.2.14.2.12

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

Change-Id: Ia9c9c658bd5020e0dad84fc74617fed60ce7df06
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agosmb2: Fix a typo
Volker Lendecke [Tue, 28 Jan 2014 10:12:09 +0000 (11:12 +0100)]
smb2: Fix a typo

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

Change-Id: I8ebb20a48e1131fcf14ee55e5e1822a8dcd713d2
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
10 years agoRevert "In get_unicode_or_ascii_string(), check if the length is odd/even, not the...
Stefan Metzmacher [Fri, 3 Jan 2014 10:51:04 +0000 (11:51 +0100)]
Revert "In get_unicode_or_ascii_string(), check if the length is odd/even, not the offset.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778 - Volume label field ... is not displayed correctly ..."

This is wrong it breaks all sort of things. The "Volume label field"
is a special case, which can be fixed by using nopad=TRUE.

Change-Id: I3cd3f30ff0076d5e31a735391b175fd68e5fa142
Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agopacket-smb.c: real fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778
Stefan Metzmacher [Fri, 3 Jan 2014 10:50:00 +0000 (11:50 +0100)]
packet-smb.c: real fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778

Change-Id: I33308c44791b487844f23db07d152897380d7cf1
Signed-off-by: Stefan Metzmacher <metze@samba.org>
10 years agoComment out a lot more hf[] entries and related.
wmeier [Tue, 28 Jan 2014 03:09:03 +0000 (03:09 +0000)]
Comment out a lot more hf[] entries and related.
(Found by checkhf).

Note: There's quite a large amount of hf[] entries which are
      commented out. I wonder if there are "top-level" entries
      missing from the "parse-tree" arrays ?

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

10 years agoComment out unused hf[] entries and related found by checkhf.
wmeier [Tue, 28 Jan 2014 03:06:03 +0000 (03:06 +0000)]
Comment out unused hf[] entries and related found by checkhf.

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

10 years agoRe-arrange #if 0/#endif related to an hf[] entry so that checkhf doesn't complain.
wmeier [Tue, 28 Jan 2014 03:02:37 +0000 (03:02 +0000)]
Re-arrange #if 0/#endif related to an hf[] entry so that checkhf doesn't complain.

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

10 years agoFrom Marko Hrastovec via
eapache [Tue, 28 Jan 2014 00:48:23 +0000 (00:48 +0000)]
From Marko Hrastovec via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9697

Architectural support for multiple version of the same Asterix categories.
Includes implementation of CAT064 v.0.17.

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

10 years agoMake it easier to try GTK 3.6
etxrab [Mon, 27 Jan 2014 19:22:10 +0000 (19:22 +0000)]
Make it easier to try GTK 3.6

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

10 years agoConvert the quick setup chapter to AsciiDoc and start converting its
gerald [Mon, 27 Jan 2014 18:43:57 +0000 (18:43 +0000)]
Convert the quick setup chapter to AsciiDoc and start converting its
content to Git.

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

10 years agoFix hf[] entries with refs to range_string arrays
wmeier [Mon, 27 Jan 2014 18:22:39 +0000 (18:22 +0000)]
Fix hf[] entries with refs to range_string arrays
 to add missing BASE_RANGE_STRING and to use RVALS instead of VALS.

Fixes crashes in 'tshark -G values' and presumably also fixes
 crashes when used in a dissection.

Introduced in SVN #54449.

(I suspect that ' convert_proto_tree_add_text.pl' may need some work
 to handle range_strings).

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

10 years agoFix: value string specified as a BASE_VAL64_STRING in
wmeier [Mon, 27 Jan 2014 17:20:44 +0000 (17:20 +0000)]
Fix: value string specified as a BASE_VAL64_STRING in
 an hf[] entry but defined as a 'value_string' intead of
 as a 'val64_string'.

Caused 'tshark -G values' to crash
 (and presumably would also cause a crash when the value-string
  is referenced in a dissection):

Introduced in svn #54728

(Note: There's still another 'tshark -G values' crash to to found & fixed)

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

10 years ago(Trivial) Fix spellling in a comment.
wmeier [Mon, 27 Jan 2014 14:33:54 +0000 (14:33 +0000)]
(Trivial) Fix spellling in a comment.

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

10 years agoFrom Pavel Moravec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9612
eapache [Mon, 27 Jan 2014 13:42:34 +0000 (13:42 +0000)]
From Pavel Moravec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9612

Fix possibly-uninitialized variable caught by valgrind fuzzing in AMQP.

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

10 years agoAdd missing cast.
eapache [Mon, 27 Jan 2014 13:12:59 +0000 (13:12 +0000)]
Add missing cast.

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

10 years agoRevert part of previous change
martinm [Mon, 27 Jan 2014 12:54:34 +0000 (12:54 +0000)]
Revert part of previous change

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

10 years agoSend news of SecurityModeFailure to PDCP dissector, which will attempt to roll back...
martinm [Mon, 27 Jan 2014 12:06:46 +0000 (12:06 +0000)]
Send news of SecurityModeFailure to PDCP dissector, which will attempt to roll back to previous setting

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

10 years agoDo not handle BER bitstring as ASCII string, because this will fail
stig [Mon, 27 Jan 2014 09:57:24 +0000 (09:57 +0000)]
Do not handle BER bitstring as ASCII string, because this will fail
when the first bit is set.

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

10 years agoAdd back the fix from revision 54693.
stig [Mon, 27 Jan 2014 09:55:46 +0000 (09:55 +0000)]
Add back the fix from revision 54693.

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

10 years agoAdded back x509af_get_last_algorithm_id() removed in revision 54647 to
stig [Mon, 27 Jan 2014 09:02:06 +0000 (09:02 +0000)]
Added back x509af_get_last_algorithm_id() removed in revision 54647 to
restore usage in cms and pkcs12.  They never got a valid value in
actx->external.direct_reference because they use another actx in this case.

This will add back the global variable in x509af, but this is needed
until we manage to pass the value in another way.

See comments in bug 9573.

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

10 years agoTry to fix the path selector argument.
gerald [Mon, 27 Jan 2014 05:26:38 +0000 (05:26 +0000)]
Try to fix the path selector argument.

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

10 years agoFix a section name conflict.
gerald [Mon, 27 Jan 2014 05:10:34 +0000 (05:10 +0000)]
Fix a section name conflict.

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

10 years agoRestore an inadvertently deleted file.
gerald [Mon, 27 Jan 2014 04:34:25 +0000 (04:34 +0000)]
Restore an inadvertently deleted file.

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

10 years agoMigrate the build environment introduction to AsciiDoc.
gerald [Mon, 27 Jan 2014 04:20:44 +0000 (04:20 +0000)]
Migrate the build environment introduction to AsciiDoc.

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

10 years agoConvert the preface to AsciiDoc with minor edits.
gerald [Mon, 27 Jan 2014 03:08:01 +0000 (03:08 +0000)]
Convert the preface to AsciiDoc with minor edits.

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

10 years agoGPLv2 -> GPLv2+
jmayer [Sun, 26 Jan 2014 22:21:28 +0000 (22:21 +0000)]
GPLv2 -> GPLv2+

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

10 years agolupdate / lrelease ui/qt/Qtshark.pro
alagoutte [Sun, 26 Jan 2014 18:24:56 +0000 (18:24 +0000)]
lupdate / lrelease ui/qt/Qtshark.pro

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

10 years agoFix indent (Use 4spaces) and modelines info
alagoutte [Sun, 26 Jan 2014 18:24:45 +0000 (18:24 +0000)]
Fix indent (Use 4spaces) and modelines info

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

10 years agoDrop support of Visual Studio 2005
alagoutte [Sun, 26 Jan 2014 12:56:32 +0000 (12:56 +0000)]
Drop support of Visual Studio 2005

* Remove _MSC_VER < 1500 check
* Cleanup config.nmake

See http://www.wireshark.org/lists/wireshark-dev/201305/msg00159.html

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

10 years agoFix indent (Use 4 spaces) and add modelines
alagoutte [Sun, 26 Jan 2014 12:56:16 +0000 (12:56 +0000)]
Fix indent (Use 4 spaces) and add modelines

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

10 years agoFix encoding arg for RSVP dissector (with fix-encodings-args tools
alagoutte [Sun, 26 Jan 2014 12:55:59 +0000 (12:55 +0000)]
Fix encoding arg for RSVP dissector (with fix-encodings-args tools

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

10 years ago(Trivial) update a comment
wmeier [Sat, 25 Jan 2014 18:44:29 +0000 (18:44 +0000)]
(Trivial) update a comment

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

10 years agoTABs -> spaces
martink [Sat, 25 Jan 2014 14:38:51 +0000 (14:38 +0000)]
TABs -> spaces
add editor modelines

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

10 years agoBASE_NONE -> STR_ASCII
martink [Sat, 25 Jan 2014 14:29:45 +0000 (14:29 +0000)]
BASE_NONE -> STR_ASCII

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

10 years agothe sametime dissector stores the result of tvb_get_string() into hf
martink [Sat, 25 Jan 2014 14:27:49 +0000 (14:27 +0000)]
the sametime dissector stores the result of tvb_get_string() into hf
 variables that can handle only 7bit ascii strings
replace this with tvb_get_string_enc()

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

10 years agoComment out the "diff" section for now. We'll have to update it for "git
gerald [Sat, 25 Jan 2014 03:27:22 +0000 (03:27 +0000)]
Comment out the "diff" section for now. We'll have to update it for "git
diff" at some point.

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

10 years agoUncomment anchors.
gerald [Sat, 25 Jan 2014 02:26:12 +0000 (02:26 +0000)]
Uncomment anchors.

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

10 years agoFix Windows build.
gerald [Sat, 25 Jan 2014 01:49:57 +0000 (01:49 +0000)]
Fix Windows build.

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

10 years agoFix xpath selector. Clean up whitespace.
gerald [Sat, 25 Jan 2014 01:09:28 +0000 (01:09 +0000)]
Fix xpath selector. Clean up whitespace.

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

10 years agoMigrate more SVN content to Git+Gerrit.
gerald [Sat, 25 Jan 2014 01:01:04 +0000 (01:01 +0000)]
Migrate more SVN content to Git+Gerrit.

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

10 years agoMigrate some of the SVN-specific content to Git.
gerald [Sat, 25 Jan 2014 00:17:46 +0000 (00:17 +0000)]
Migrate some of the SVN-specific content to Git.

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

10 years agoTry to get CMake to build the Developer Guide again. I don't have
gerald [Sat, 25 Jan 2014 00:17:19 +0000 (00:17 +0000)]
Try to get CMake to build the Developer Guide again. I don't have
dblatex installed so the release notes fail to build but the WSDG
targets appear to work.

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

10 years agoThe wimax plugin primarily uses tvb_get_ptr buffer accesses instead of the
eapache [Fri, 24 Jan 2014 20:48:55 +0000 (20:48 +0000)]
The wimax plugin primarily uses tvb_get_ptr buffer accesses instead of the
safe accessor functions, and it's all done via scary bit-twiddling macros to
boot.

Create the macros TVB_NIB_WORD and TVB_NIB_NIBBLE that (should) behave just
like the raw-pointer NIB_WORD and NIB_NIBBLE macros, except using the safe tvb
functions instead.

Replace two instances with the safe versions, which fixes an out-of-bounds
access caught by my valgrind fuzzer. If this doesn't break anything then we
should probably do a wholesale replacement at some point, but I'm not feeling
that adventurous at the moment.

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

10 years agoMark a few function parameters as unused....
wmeier [Fri, 24 Jan 2014 20:24:02 +0000 (20:24 +0000)]
Mark a few function parameters as unused....

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

10 years agoRework and simplify the code to follow the principle of "dissect as
wmeier [Fri, 24 Jan 2014 20:19:06 +0000 (20:19 +0000)]
Rework and simplify the code to follow the principle of "dissect as
 much as possible" rather than dissecting nothing if the length of a
 set of fields (e.g., a "command") seems wrong or if an exception
 occurs fetching data before previous fields have been displayed.
In general: just fetch/dissect from start to end: If there is missing
   data, a Wireshark exception will eventually occur;

Add lwm subtrees under the lwm protocol tree (*not* as protocols
 under the top (outermost) tree.

Fix a bug which caused an exception to be reported as:
 "[Packet size limited during capture: LwMesh truncated]"
 rather than as the correct: "[Malformed...]"

col_...() and expert...() functions shouldn't be called under 'if(tree)';

Register the heuristic dissector using "IEEE802154_PROTOABBREV_WPAN"
 (like certain other dissectors) rather than using "wpan";

missmatch --> mismatch

Fix some long lines.

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

10 years agoAdd packet-mbim.h to Makefile.common
pascal [Fri, 24 Jan 2014 20:08:22 +0000 (20:08 +0000)]
Add packet-mbim.h to Makefile.common

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

10 years agoMake "all" the default target again.
gerald [Fri, 24 Jan 2014 19:50:43 +0000 (19:50 +0000)]
Make "all" the default target again.

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

10 years agoFix AsciiDoc WSDG build on Windows.
gerald [Fri, 24 Jan 2014 19:12:59 +0000 (19:12 +0000)]
Fix AsciiDoc WSDG build on Windows.

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

10 years agoStart migrating the Developer's Guide to AsciiDoc. So far only one
gerald [Fri, 24 Jan 2014 18:55:27 +0000 (18:55 +0000)]
Start migrating the Developer's Guide to AsciiDoc. So far only one
chapter (WSDG_chapter_sources) has been converted.

Conversion was done using the script in
https://code.wireshark.org/review/#/c/9/ along with manual cleanup.
Changes are mostly limited formatting.

It's helpful to have a copy of the pre-conversion guide for comparison.
I've placed a chunked copy online at
http://www.wireshark.org/~gerald/wsdg_html_2014_01/ .

Tested under Autotools. Nmake and CMake will likely break. I'll take a
look shortly. If only we had documention adding a feature branch to
Gerrit and using it to test different platforms...

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

10 years agoAdd ability to register new UUID and CIDs
pascal [Fri, 24 Jan 2014 18:53:06 +0000 (18:53 +0000)]
Add ability to register new UUID and CIDs

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

10 years agoRemove some old obsolete text in the proto_tree_add_text() description.
wmeier [Fri, 24 Jan 2014 17:19:25 +0000 (17:19 +0000)]
Remove some old obsolete text in the proto_tree_add_text() description.

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

10 years agoFix dissection of 8PSK Power Capability IE
pascal [Fri, 24 Jan 2014 16:33:31 +0000 (16:33 +0000)]
Fix dissection of 8PSK Power Capability IE

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

10 years agoGive valgrind fuzzing a bit more time. Otherwise we have some large (~80MB)
eapache [Fri, 24 Jan 2014 15:52:28 +0000 (15:52 +0000)]
Give valgrind fuzzing a bit more time. Otherwise we have some large (~80MB)
captures in the menagerie which time out even under normal circumstances.

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

10 years agoCheck for a zero offset in the "get status" reply *before* adding the
guy [Fri, 24 Jan 2014 07:55:03 +0000 (07:55 +0000)]
Check for a zero offset in the "get status" reply *before* adding the
offset in the tvbuff of the beginning of the packet to it.  Otherwise,
it will never be zero, and the tests will always think the field pointed
to by the offset is present.

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

10 years agoLooks like the asciidoc stuff is wip and breaks cmake builds.
jmayer [Fri, 24 Jan 2014 06:42:49 +0000 (06:42 +0000)]
Looks like the asciidoc stuff is wip and breaks cmake builds.
Comment it out for now.

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

10 years agoPrepare for conversion of Guide chapters to AsciiDoc.
gerald [Fri, 24 Jan 2014 01:10:10 +0000 (01:10 +0000)]
Prepare for conversion of Guide chapters to AsciiDoc.

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

10 years agocountry and language are ISO-8859-1
martink [Thu, 23 Jan 2014 22:20:35 +0000 (22:20 +0000)]
country and language are ISO-8859-1

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

10 years agomake the menu string filterable
martink [Thu, 23 Jan 2014 22:19:52 +0000 (22:19 +0000)]
make the menu string filterable

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

10 years agothe menu string is a DVB string
martink [Thu, 23 Jan 2014 22:18:41 +0000 (22:18 +0000)]
the menu string is a DVB string

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

10 years agoFrom me for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9519 RSVP dissector...
alagoutte [Thu, 23 Jan 2014 20:31:20 +0000 (20:31 +0000)]
From me for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9519 RSVP dissector does not decode Session Object (1) C-type (13) message

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

10 years agoRemove Update.c (and nio-ie5.[ch])
alagoutte [Thu, 23 Jan 2014 20:01:51 +0000 (20:01 +0000)]
Remove Update.c (and nio-ie5.[ch])

Never use... and replace by (Win)Sparkle

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

10 years agoGiven that we allow the 'outfile file' to be stdout, then presumably all
wmeier [Thu, 23 Jan 2014 15:11:00 +0000 (15:11 +0000)]
Given that we allow the 'outfile file' to be stdout, then presumably all
 text messages (including informational) should go to stderr.

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

10 years agoprintf(...) --> fprintf(stderr,...) (in a commented out line of code)
wmeier [Thu, 23 Jan 2014 14:39:29 +0000 (14:39 +0000)]
printf(...) --> fprintf(stderr,...)  (in a commented out line of code)

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

10 years agoRemove duplicate #include.
eapache [Thu, 23 Jan 2014 13:39:39 +0000 (13:39 +0000)]
Remove duplicate #include.

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

10 years agoPlease GCC 4.3.2 that complains about a wrong 'variable may be used uninitialized...
pascal [Thu, 23 Jan 2014 07:57:20 +0000 (07:57 +0000)]
Please GCC 4.3.2 that complains about a wrong 'variable may be used uninitialized in this function' error

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

10 years agoUse tvb_get_string_enc() rather than tvb_get_string().
guy [Thu, 23 Jan 2014 02:46:56 +0000 (02:46 +0000)]
Use tvb_get_string_enc() rather than tvb_get_string().

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

10 years agoUse tvb_get_string_enc() rather than tvb_get_string(). RFC 5352 says,
guy [Thu, 23 Jan 2014 02:37:43 +0000 (02:37 +0000)]
Use tvb_get_string_enc() rather than tvb_get_string().  RFC 5352 says,
in section 6.1 "Registration.Request Primitive":

The Pool Handle parameter contains a NULL terminated ASCII
string of fixed length.

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

10 years agoUse tvb_get_string_enc() rather than tvb_get_string().
guy [Thu, 23 Jan 2014 02:30:00 +0000 (02:30 +0000)]
Use tvb_get_string_enc() rather than tvb_get_string().

Update URL of spec.

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