metze/wireshark/wip.git
10 years ago(Trivial)
Bill Meier [Thu, 12 Dec 2013 20:35:58 +0000 (20:35 -0000)]
(Trivial)
 - Remove two lines of commented out code;
 - Specify 'tab-width: 8' (not 4) in editor modelines;
 - Rework/add whitespace;

svn path=/trunk/; revision=53982

10 years agoFix Visual Studio Code Analysis warning C6287: Redundant code: the left and right...
Chris Maynard [Thu, 12 Dec 2013 20:33:30 +0000 (20:33 -0000)]
Fix Visual Studio Code Analysis warning C6287: Redundant code: the left and right sub-expressions are identical

svn path=/trunk/; revision=53981

10 years ago(Trivial);
Bill Meier [Thu, 12 Dec 2013 20:33:17 +0000 (20:33 -0000)]
(Trivial);
 - localize some vars;
 - Specify 'tab-width: 8' (not 4) in editor modelines;
 - tabs --> spaces;

svn path=/trunk/; revision=53980

10 years ago(Trivial)
Bill Meier [Thu, 12 Dec 2013 20:25:53 +0000 (20:25 -0000)]
(Trivial)
 tabs --> spaces to match editor modelines;
 Specify 'tab-width: 8' (not 4) in editor modelines;

svn path=/trunk/; revision=53979

10 years ago(Trivial)
Bill Meier [Thu, 12 Dec 2013 20:16:30 +0000 (20:16 -0000)]
(Trivial)
 - Fix indentation to match editor modelines (tabs-->spaces);
 - Rework/add some whitespace;

svn path=/trunk/; revision=53978

10 years agoremove unused dissector tables
Martin Kaiser [Thu, 12 Dec 2013 20:15:06 +0000 (20:15 -0000)]
remove unused dissector tables
http://www.wireshark.org/lists/wireshark-dev/201312/msg00137.html

svn path=/trunk/; revision=53977

10 years agocorrect the function names in order to fix compile errors
Martin Kaiser [Thu, 12 Dec 2013 20:09:40 +0000 (20:09 -0000)]
correct the function names in order to fix compile errors

svn path=/trunk/; revision=53976

10 years agoTrivial: Spaces -> tabs.
Chris Maynard [Thu, 12 Dec 2013 20:09:33 +0000 (20:09 -0000)]
Trivial: Spaces -> tabs.

svn path=/trunk/; revision=53975

10 years agoMove proto_reg_handoff...() to the file end as per convevntion;
Bill Meier [Thu, 12 Dec 2013 19:59:23 +0000 (19:59 -0000)]
Move proto_reg_handoff...() to the file end as per convevntion;
Reformat certain lines to use a consistent style;
tabs --> spaces (to match the editor modelines);
Rework some whitespace;

svn path=/trunk/; revision=53974

10 years agoFix Coverity CID 1135557: Structurally dead code, by moving the break statement to...
Chris Maynard [Thu, 12 Dec 2013 19:56:35 +0000 (19:56 -0000)]
Fix Coverity CID 1135557: Structurally dead code, by moving the break statement to the most sensible place.

svn path=/trunk/; revision=53973

10 years agoTry to fix "initializer element is not computable at load time"
Anders Broman [Thu, 12 Dec 2013 19:54:15 +0000 (19:54 -0000)]
Try to fix "initializer element is not computable at load time"

svn path=/trunk/; revision=53972

10 years ago- Forward declaration of register functions.
Anders Broman [Thu, 12 Dec 2013 19:52:14 +0000 (19:52 -0000)]
- Forward declaration of register functions.

svn path=/trunk/; revision=53971

10 years agoMove proto_reg_handoff...() to file end as per convention;
Bill Meier [Thu, 12 Dec 2013 19:48:46 +0000 (19:48 -0000)]
Move proto_reg_handoff...() to file end as per convention;
Reformat various hf[] entries;
#include params.h (not prefs.h);
'offset++' --> 'offset += 1' for consistency;
Localize some variable defintions;
Tabs --> spaces (to match editor modelines);
Rework some whitespace;

svn path=/trunk/; revision=53970

10 years agoReject the packet if info is NULL under conditions where it'll be used.
Chris Maynard [Thu, 12 Dec 2013 19:38:20 +0000 (19:38 -0000)]
Reject the packet if info is NULL under conditions where it'll be used.

svn path=/trunk/; revision=53969

10 years agoCreate/use a number of extended value-strings;
Bill Meier [Thu, 12 Dec 2013 19:26:55 +0000 (19:26 -0000)]
Create/use a number of extended value-strings;
 Remove or comment out dups from several value-string arrays;
 Sort a number of value-string arrays;
Reformat many hf[] entries;
Remove some unneeded initializers;
Add editor-modelines;
Use consistent indentation;
Reformat whitespace.

svn path=/trunk/; revision=53968

10 years agoTrivial: Tab -> spaces.
Chris Maynard [Thu, 12 Dec 2013 19:20:30 +0000 (19:20 -0000)]
Trivial: Tab -> spaces.

svn path=/trunk/; revision=53967

10 years agoReject the packet if data is NULL under conditions where it'll be used.
Chris Maynard [Thu, 12 Dec 2013 19:10:24 +0000 (19:10 -0000)]
Reject the packet if data is NULL under conditions where it'll be used.

svn path=/trunk/; revision=53966

10 years agoReject the packet if data is NULL. For now, leave the DISSECTOR_ASSERT's since both...
Chris Maynard [Thu, 12 Dec 2013 19:04:38 +0000 (19:04 -0000)]
Reject the packet if data is NULL.  For now, leave the DISSECTOR_ASSERT's since both get_rose_ctx() and get_asn1_ctx() also check signatures.

svn path=/trunk/; revision=53965

10 years agoReject the packet if data is NULL. Remove _U_ where data is actually used. For...
Chris Maynard [Thu, 12 Dec 2013 18:10:08 +0000 (18:10 -0000)]
Reject the packet if data is NULL.  Remove _U_ where data is actually used.  For now, leave the DISSECTOR_ASSERT's since both get_rose_ctx() and get_asn1_ctx() also check signatures.

(Arguably it's the responsibility of the dissector passing this information to set the signature correctly so if there's an invalid signature, the bug is with the calling dissector and not with the one receiving the invalid signature.)

svn path=/trunk/; revision=53964

10 years ago- Forward declaration of register functions.
Anders Broman [Thu, 12 Dec 2013 17:45:22 +0000 (17:45 -0000)]
- Forward declaration of register functions.

svn path=/trunk/; revision=53963

10 years agoTry to fix "initializer element is not computable at load time"
Anders Broman [Thu, 12 Dec 2013 17:32:22 +0000 (17:32 -0000)]
Try to fix "initializer element is not computable at load time"

svn path=/trunk/; revision=53962

10 years agoRemove some TODOs that have now been addressed
Martin Mathieson [Thu, 12 Dec 2013 13:25:12 +0000 (13:25 -0000)]
Remove some TODOs that have now been addressed

svn path=/trunk/; revision=53961

10 years agoMissing from last commit - copy hfn into stored result for PDU
Martin Mathieson [Thu, 12 Dec 2013 13:23:28 +0000 (13:23 -0000)]
Missing from last commit - copy hfn into stored result for PDU

svn path=/trunk/; revision=53960

10 years agoShow other security inputs (apart from keys)
Martin Mathieson [Thu, 12 Dec 2013 11:07:53 +0000 (11:07 -0000)]
Show other security inputs (apart from keys)

svn path=/trunk/; revision=53959

10 years ago- Make local functions static.
Anders Broman [Thu, 12 Dec 2013 06:11:05 +0000 (06:11 -0000)]
- Make local functions static.
- Forward declaration of register functions.

svn path=/trunk/; revision=53958

10 years agoFix the path to dumpcap.
Gerald Combs [Thu, 12 Dec 2013 02:41:08 +0000 (02:41 -0000)]
Fix the path to dumpcap.

svn path=/trunk/; revision=53957

10 years agoRemove the checks for ../../lib. If it still exists it likely means that
Gerald Combs [Thu, 12 Dec 2013 01:46:09 +0000 (01:46 -0000)]
Remove the checks for ../../lib. If it still exists it likely means that
there's a stale LIBRARY_OUTPUT_PATH in CMakeCache.txt.

svn path=/trunk/; revision=53956

10 years agoUpdate library searches to reflect r53780.
Gerald Combs [Thu, 12 Dec 2013 01:36:44 +0000 (01:36 -0000)]
Update library searches to reflect r53780.

svn path=/trunk/; revision=53955

10 years agoReject the packet if data is NULL.
Chris Maynard [Wed, 11 Dec 2013 23:04:09 +0000 (23:04 -0000)]
Reject the packet if data is NULL.

svn path=/trunk/; revision=53954

10 years agoReject the packet if data is NULL. Leave the DISSECTOR_ASSERT(actx != NULL) since...
Chris Maynard [Wed, 11 Dec 2013 23:03:01 +0000 (23:03 -0000)]
Reject the packet if data is NULL.  Leave the DISSECTOR_ASSERT(actx != NULL) since get_asn1_ctx() also checks the signature.

svn path=/trunk/; revision=53953

10 years agoBe more consistent with the name "Wireshark" and its two UI
Gerald Combs [Wed, 11 Dec 2013 22:29:05 +0000 (22:29 -0000)]
Be more consistent with the name "Wireshark" and its two UI
flavors. Upgrade the Qt flavor from "experimental" to "alpha".  I also
apologize in advance to all of the people who installed previous versions
of the 1.11.x packages and who will now have extra shortcuts lying around.

svn path=/trunk/; revision=53952

10 years agoFix
Jörg Mayer [Wed, 11 Dec 2013 21:51:30 +0000 (21:51 -0000)]
Fix
svn/trunk/epan/dissectors/packet-netlink-netfilter.c:164:11: error: variable ‘is_req’ set but not used [-Werror=unused-but-set-variable]
  gboolean is_req;
           ^
cc1: all warnings being treated as errors

svn path=/trunk/; revision=53951

10 years agoFix buildbot:
Jakub Zawadzki [Wed, 11 Dec 2013 21:30:23 +0000 (21:30 -0000)]
Fix buildbot:

packet-netlink-netfilter.c:94: warning: 'dissect_netlink_netfilter_queue' defined but not used

svn path=/trunk/; revision=53950

10 years agoTrivial: tabs -> spaces.
Chris Maynard [Wed, 11 Dec 2013 21:25:35 +0000 (21:25 -0000)]
Trivial: tabs -> spaces.

svn path=/trunk/; revision=53949

10 years agoNew-style dissectors return the number of bytes dissected, not TRUE/FALSE.
Chris Maynard [Wed, 11 Dec 2013 21:23:32 +0000 (21:23 -0000)]
New-style dissectors return the number of bytes dissected, not TRUE/FALSE.

svn path=/trunk/; revision=53948

10 years agofix buildbot:
Jakub Zawadzki [Wed, 11 Dec 2013 21:11:42 +0000 (21:11 -0000)]
fix buildbot:

packet-netlink-netfilter.c:93: warning: unused parameter 'tvb'

svn path=/trunk/; revision=53947

10 years agoReject the packet if data is NULL.
Chris Maynard [Wed, 11 Dec 2013 21:06:09 +0000 (21:06 -0000)]
Reject the packet if data is NULL.

svn path=/trunk/; revision=53946

10 years agoBe sure tcpinfo is not NULL before dereferencing it.
Chris Maynard [Wed, 11 Dec 2013 20:57:53 +0000 (20:57 -0000)]
Be sure tcpinfo is not NULL before dereferencing it.

svn path=/trunk/; revision=53945

10 years agoRevert part of r53874
Jakub Zawadzki [Wed, 11 Dec 2013 20:52:05 +0000 (20:52 -0000)]
Revert part of r53874

svn path=/trunk/; revision=53944

10 years agoAdd new & update netlink dissectors.
Jakub Zawadzki [Wed, 11 Dec 2013 20:48:18 +0000 (20:48 -0000)]
Add new & update netlink dissectors.

svn path=/trunk/; revision=53943

10 years ago- Make local functions static.
Anders Broman [Wed, 11 Dec 2013 20:04:37 +0000 (20:04 -0000)]
- Make local functions static.
- Forward declaration of register functions.

svn path=/trunk/; revision=53942

10 years ago- Make local functions static.
Anders Broman [Wed, 11 Dec 2013 19:46:38 +0000 (19:46 -0000)]
- Make local functions static.
- Forward declaration of register functions.

svn path=/trunk/; revision=53941

10 years agoFrom Michael Lum via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9550 :
Pascal Quantin [Wed, 11 Dec 2013 18:47:15 +0000 (18:47 -0000)]
From Michael Lum via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9550 :
GSM SMS UDH EMS control expects 4 octets instead of 3 with OPTIONAL 4th

svn path=/trunk/; revision=53940

10 years agoRemove _U_ from dissect_openwire_tcp()'s data parameter; technically it is used since...
Chris Maynard [Wed, 11 Dec 2013 17:08:23 +0000 (17:08 -0000)]
Remove _U_ from dissect_openwire_tcp()'s data parameter; technically it is used since it is passed to tcp_dissect_pdus(), even though dissect_openwire() doesn't actually use it.

svn path=/trunk/; revision=53939

10 years agoImprove tshark command-line error help. Fixes https://bugs.wireshark.org/bugzilla...
Chris Maynard [Wed, 11 Dec 2013 16:52:40 +0000 (16:52 -0000)]
Improve tshark command-line error help.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9548 and adds addtional help, better formatting, sorting and some minimal documentation of the -u option to the tshark man page.

svn path=/trunk/; revision=53938

10 years agoTrivial: Fix typo.
Chris Maynard [Wed, 11 Dec 2013 15:20:29 +0000 (15:20 -0000)]
Trivial: Fix typo.

svn path=/trunk/; revision=53937

10 years agoUpdate .gitignore
Alexis La Goutte [Wed, 11 Dec 2013 13:14:08 +0000 (13:14 -0000)]
Update .gitignore

wireshark-tap-register* is used by gtk and Qt

svn path=/trunk/; revision=53936

10 years agoFix (-W)unused-const-variable error found by Clang
Alexis La Goutte [Wed, 11 Dec 2013 13:14:00 +0000 (13:14 -0000)]
Fix (-W)unused-const-variable error found by Clang

svn path=/trunk/; revision=53935

10 years agoFix an out of bounds access found by ASAN and reported by Alexis:
Pascal Quantin [Wed, 11 Dec 2013 12:54:10 +0000 (12:54 -0000)]
Fix an out of bounds access found by ASAN and reported by Alexis:

==21553==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fffbc0b2a5e at pc 0x7fe8684147a3 bp 0x7fffbc0b2950 sp 0x7fffbc0b2948
READ of size 2 at 0x7fffbc0b2a5e thread T0
    #0 0x7fe8684147a2 in dissect_schedule_message /home/alagoutte/wireshark-clang/epan/dissectors/packet-gsm_cbch.c:309
    #1 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512
    #2 0x7fe867eda42c in call_dissector_only /home/alagoutte/wireshark-clang/epan/packet.c:2139
    #3 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512
    #4 0x7fe867ed735b in dissector_try_uint_new /home/alagoutte/wireshark-clang/epan/packet.c:1030
    #5 0x7fe868a3ebd4 in decode_udp_ports /home/alagoutte/wireshark-clang/epan/dissectors/packet-udp.c:411
    #6 0x7fe868a41886 in dissect /home/alagoutte/wireshark-clang/epan/dissectors/packet-udp.c:747
    #7 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512
    #8 0x7fe867ed6d03 in dissector_try_uint_new /home/alagoutte/wireshark-clang/epan/packet.c:1030
    #9 0x7fe8684eaa1f in dissect_ip /home/alagoutte/wireshark-clang/epan/dissectors/packet-ip.c:2401
    #10 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512
    #11 0x7fe867ed735b in dissector_try_uint_new /home/alagoutte/wireshark-clang/epan/packet.c:1030
    #12 0x7fe868333e98 in dissect_ethertype /home/alagoutte/wireshark-clang/epan/dissectors/packet-ethertype.c:305
    #13 0x7fe867ed707d in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:508
    #14 0x7fe867eda42c in call_dissector_only /home/alagoutte/wireshark-clang/epan/packet.c:2139
    #15 0x7fe8683328ad in dissect_eth_common /home/alagoutte/wireshark-clang/epan/dissectors/packet-eth.c:472
    #16 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512
    #17 0x7fe867ed735b in dissector_try_uint_new /home/alagoutte/wireshark-clang/epan/packet.c:1030
    #18 0x7fe868382460 in dissect_frame /home/alagoutte/wireshark-clang/epan/dissectors/packet-frame.c:485
    #19 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512
    #20 0x7fe867eda42c in call_dissector_only /home/alagoutte/wireshark-clang/epan/packet.c:2139
    #21 0x7fe867ed5baf in call_dissector /home/alagoutte/wireshark-clang/epan/packet.c:2169
    #22 0x7fe867eb6388 in epan_dissect_run_with_taps /home/alagoutte/wireshark-clang/epan/epan.c:329
    #23 0x4a0ef9 in process_packet /home/alagoutte/wireshark-clang/tshark.c:3434
    #24 0x49c985 in load_cap_file /home/alagoutte/wireshark-clang/tshark.c:3237
    #25 0x7fe860e8ede4 in __libc_start_main /build/buildd/eglibc-2.17/csu/libc-start.c:260
    #26 0x48586c in _start ??:?

Address 0x7fffbc0b2a5e is located in stack of thread T0 at offset 126 in frame
    #0 0x7fe86841353f in dissect_cbch /home/alagoutte/wireshark-clang/epan/dissectors/packet-gsm_cbch.c:345

  This frame has 2 object(s):
    [32, 80) 'new_slots.i'
    [128, 224) 'other_slots.i' <== Memory access at offset 126 underflows this variable
HINT: this may be a false positive if your program uses some custom stack unwind mechanism or swapcontext
      (longjmp and C++ exceptions *are* supported)
SUMMARY: AddressSanitizer: stack-buffer-overflow ??:0 ??

svn path=/trunk/; revision=53934

10 years agoRemove an unused variable
Martin Mathieson [Wed, 11 Dec 2013 11:15:35 +0000 (11:15 -0000)]
Remove an unused variable

svn path=/trunk/; revision=53933

10 years agoConvert to new-style dissector, change crcStatusValid to a gboolean, and rework DRX...
Martin Mathieson [Wed, 11 Dec 2013 11:03:29 +0000 (11:03 -0000)]
Convert to new-style dissector, change crcStatusValid to a gboolean, and rework DRX timers (again)

svn path=/trunk/; revision=53932

10 years ago#if 0 unused function.
Anders Broman [Wed, 11 Dec 2013 06:29:17 +0000 (06:29 -0000)]
#if 0 unused function.

svn path=/trunk/; revision=53931

10 years ago- Forward declaration of register functions.
Anders Broman [Wed, 11 Dec 2013 06:10:45 +0000 (06:10 -0000)]
- Forward declaration of register functions.

svn path=/trunk/; revision=53930

10 years agoPass the correct uuid when recursing (the other one is a temporary var that may
Evan Huus [Tue, 10 Dec 2013 23:23:26 +0000 (23:23 -0000)]
Pass the correct uuid when recursing (the other one is a temporary var that may
not be initialized).

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

svn path=/trunk/; revision=53929

10 years agoFrom Deon van der Westhuysen via bug 9537:
Gerald Combs [Tue, 10 Dec 2013 22:38:35 +0000 (22:38 -0000)]
From Deon van der Westhuysen via bug 9537:

----
The qt version of wireshark (stats_tree_dialog.cpp) by default expands
all nodes within a stats_tree (see for example the "Statistics" > "IP
Statistics" > "IP Destinations" stats_tree; you need this patch
installed before the item is added to the stats menu:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9528). This
behaviour is fine for small trees but becomes counter productive in
trees with many items or levels.

This patch changes the qt ui to act like the gtk ui: the first level of
nodes are expanded by default while deeper levels are collapsed.
----

From me: "Expand all" makes sense for a small number of items. Do so if
we have less than 100.

svn path=/trunk/; revision=53928

10 years agouse large positve values for illegal DVB-SI string encodings
Martin Kaiser [Tue, 10 Dec 2013 22:08:07 +0000 (22:08 -0000)]
use large positve values for illegal DVB-SI string encodings

interpret encoding fields as UINT32 so that the displayed value matches
the actual bytes in the packet

svn path=/trunk/; revision=53927

10 years agoTrivial: The file name is prefs_capture.c, not capture_prefs.c
Chris Maynard [Tue, 10 Dec 2013 22:06:22 +0000 (22:06 -0000)]
Trivial: The file name is prefs_capture.c, not capture_prefs.c

svn path=/trunk/; revision=53926

10 years agouse the new SI string routines in DVB-CI
Martin Kaiser [Tue, 10 Dec 2013 22:05:54 +0000 (22:05 -0000)]
use the new SI string routines in DVB-CI

svn path=/trunk/; revision=53925

10 years agoReject the packet if data is NULL.
Chris Maynard [Tue, 10 Dec 2013 22:04:30 +0000 (22:04 -0000)]
Reject the packet if data is NULL.

svn path=/trunk/; revision=53924

10 years agoWhere appropriate, reject the packet entirely or at least protect against data being...
Chris Maynard [Tue, 10 Dec 2013 22:04:00 +0000 (22:04 -0000)]
Where appropriate, reject the packet entirely or at least protect against data being NULL.

svn path=/trunk/; revision=53923

10 years agoReject packets if data (and usb_trans_info) are NULL. Also, new-syle dissectors...
Chris Maynard [Tue, 10 Dec 2013 22:01:55 +0000 (22:01 -0000)]
Reject packets if data (and usb_trans_info) are NULL.  Also, new-syle dissectors return the number of bytes dissected, not TRUE/FALSE.

svn path=/trunk/; revision=53922

10 years agoTrival: spaces -> tab.
Chris Maynard [Tue, 10 Dec 2013 21:56:48 +0000 (21:56 -0000)]
Trival: spaces -> tab.

svn path=/trunk/; revision=53921

10 years agoQComboBox::setCurrentText() exits in Qt3 and Qt5 but not Qt4.
Gerald Combs [Tue, 10 Dec 2013 21:44:12 +0000 (21:44 -0000)]
QComboBox::setCurrentText() exits in Qt3 and Qt5 but not Qt4.

svn path=/trunk/; revision=53920

10 years agoAdd a missing semicolon.
Gerald Combs [Tue, 10 Dec 2013 21:43:14 +0000 (21:43 -0000)]
Add a missing semicolon.

svn path=/trunk/; revision=53919

10 years ago- Forward declaration of register functions.
Anders Broman [Tue, 10 Dec 2013 21:30:13 +0000 (21:30 -0000)]
- Forward declaration of register functions.

svn path=/trunk/; revision=53918

10 years agoFix prototypes.
Gerald Combs [Tue, 10 Dec 2013 21:27:09 +0000 (21:27 -0000)]
Fix prototypes.

svn path=/trunk/; revision=53917

10 years agoRemove _U_ from dissect_usb_com_bulk()'s data parameter; it is used.
Chris Maynard [Tue, 10 Dec 2013 21:12:52 +0000 (21:12 -0000)]
Remove _U_ from dissect_usb_com_bulk()'s data parameter; it is used.

svn path=/trunk/; revision=53916

10 years agoAdd "Decode As" to the packet list and protocol tree context menus.
Gerald Combs [Tue, 10 Dec 2013 21:07:26 +0000 (21:07 -0000)]
Add "Decode As" to the packet list and protocol tree context menus.
Automatically add a new item if "Decode As" is triggered from the
context menus.

svn path=/trunk/; revision=53915

10 years agoReject the packet if data is NULL.
Chris Maynard [Tue, 10 Dec 2013 20:49:11 +0000 (20:49 -0000)]
Reject the packet if data is NULL.

svn path=/trunk/; revision=53914

10 years agoRemove config.h includes from proto.h and tap.h.
Gerald Combs [Tue, 10 Dec 2013 20:23:33 +0000 (20:23 -0000)]
Remove config.h includes from proto.h and tap.h.

svn path=/trunk/; revision=53913

10 years agoFix compilation on Windows.
Gerald Combs [Tue, 10 Dec 2013 20:00:02 +0000 (20:00 -0000)]
Fix compilation on Windows.

svn path=/trunk/; revision=53912

10 years ago- Forward declaration of register functions.
Anders Broman [Tue, 10 Dec 2013 19:50:20 +0000 (19:50 -0000)]
- Forward declaration of register functions.

svn path=/trunk/; revision=53911

10 years agoGet the "Decode As" dialog working, albeit with a few warts. It differs
Gerald Combs [Tue, 10 Dec 2013 19:23:26 +0000 (19:23 -0000)]
Get the "Decode As" dialog working, albeit with a few warts. It differs
from the GTK flavor in two major ways:

- The "Decode As" and "User Specified Decodes" dialog have been unified.
- You can modify the decode as behavior at any time, not just when you
  have a packet selected.

Revert part of 53498 so that we can move items marked

/*** THE FOLLOWING SHOULD NOT BE USED BY ANY DISSECTORS!!! ***/

from epan/decode_as.h to ui/decode_as_utils.h.

Move "save" code from decode_as_dlg.c to decode_as_utils.c as well.

In packet-dcerpc.c don't register a table named "ethertype". We might
want to add checks for duplicate table names.

To do:
- Add support for ranges?
- Either add support for DCERPC or make DCERPC use a regular dissector
  table.
- Fix string selectors (i.e. BER).

svn path=/trunk/; revision=53910

10 years agoFix epan building with undefined HAVE_PLUGINS
Jakub Zawadzki [Tue, 10 Dec 2013 19:13:09 +0000 (19:13 -0000)]
Fix epan building with undefined HAVE_PLUGINS

+ guard prototypes with HAVE_PLUGINS in .h files to get errors before linking.

svn path=/trunk/; revision=53909

10 years ago- Forward declaration of register functions.
Anders Broman [Tue, 10 Dec 2013 17:41:57 +0000 (17:41 -0000)]
- Forward declaration of register functions.

svn path=/trunk/; revision=53908

10 years agoAdd uat preferences to SCTP (QT only).
Irene Rüngeler [Tue, 10 Dec 2013 15:39:16 +0000 (15:39 -0000)]
Add uat preferences to SCTP (QT only).

svn path=/trunk/; revision=53907

10 years agoUse PT_TXTMOD_NONE for columns that should not be editable.
Irene Rüngeler [Tue, 10 Dec 2013 15:33:07 +0000 (15:33 -0000)]
Use PT_TXTMOD_NONE for columns that should not be editable.

svn path=/trunk/; revision=53906

10 years agoIn dissect_ldss_transfer(), reject the packet if data is NULL. Fix some typos.
Chris Maynard [Tue, 10 Dec 2013 15:31:29 +0000 (15:31 -0000)]
In dissect_ldss_transfer(), reject the packet if data is NULL.  Fix some typos.

svn path=/trunk/; revision=53905

10 years agoDo not show uat preferences if not registered for the gui.
Irene Rüngeler [Tue, 10 Dec 2013 15:29:43 +0000 (15:29 -0000)]
Do not show uat preferences if not registered for the gui.

svn path=/trunk/; revision=53904

10 years agoRemoved debug output.
Stig Bjørlykke [Tue, 10 Dec 2013 14:43:15 +0000 (14:43 -0000)]
Removed debug output.

svn path=/trunk/; revision=53903

10 years agocomment out unused functions
Martin Kaiser [Tue, 10 Dec 2013 10:52:29 +0000 (10:52 -0000)]
comment out unused functions

fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9538
reported by Yaniv Kaul

svn path=/trunk/; revision=53902

10 years ago- Forward declaration of register functions.
Anders Broman [Tue, 10 Dec 2013 06:01:16 +0000 (06:01 -0000)]
- Forward declaration of register functions.

svn path=/trunk/; revision=53901

10 years agoRemove _U_ from dissect_wol's and dissect_wolheur's data argument; they both pass...
Chris Maynard [Tue, 10 Dec 2013 03:56:51 +0000 (03:56 -0000)]
Remove _U_ from dissect_wol's and dissect_wolheur's data argument; they both pass it to dissect_wol_pdu, which doesn't actually use it, but technically they do.

svn path=/trunk/; revision=53900

10 years agoReject the packet if data is NULL.
Chris Maynard [Tue, 10 Dec 2013 03:33:50 +0000 (03:33 -0000)]
Reject the packet if data is NULL.

svn path=/trunk/; revision=53899

10 years agoReject the packet if data is NULL.
Chris Maynard [Tue, 10 Dec 2013 03:25:04 +0000 (03:25 -0000)]
Reject the packet if data is NULL.

svn path=/trunk/; revision=53898

10 years agoRemove _U_ from dissect_carp's data argument; it's passed to test_carp_packet(),...
Chris Maynard [Tue, 10 Dec 2013 03:11:34 +0000 (03:11 -0000)]
Remove _U_ from dissect_carp's data argument; it's passed to test_carp_packet(), which doesn't actually use it, but dissect_carp technically does.

svn path=/trunk/; revision=53897

10 years agoReject the packet if data is NULL. For now, leave the DISSECTOR_ASSERT(rose_ctx_tmp...
Chris Maynard [Mon, 9 Dec 2013 22:38:42 +0000 (22:38 -0000)]
Reject the packet if data is NULL.  For now, leave the DISSECTOR_ASSERT(rose_ctx_tmp) since get_rose_ctx() also checks the signature, which might be invalid even if data is not NULL.

svn path=/trunk/; revision=53896

10 years agoReject the packet if data is NULL without doing anything else.
Chris Maynard [Mon, 9 Dec 2013 22:23:44 +0000 (22:23 -0000)]
Reject the packet if data is NULL without doing anything else.

Note: We *might* want to do _something_ but that _something_ should be well-defined and consistent across all dissectors.  Previously, some dissectors called proto_tree_add_text() to add some error message text to the tree, while others called DISSECTOR_ASSERT().

svn path=/trunk/; revision=53895

10 years agoMinor whitespace changes and to keep the GNU-syle indentation scheme consistent.
Chris Maynard [Mon, 9 Dec 2013 21:33:54 +0000 (21:33 -0000)]
Minor whitespace changes and to keep the GNU-syle indentation scheme consistent.

svn path=/trunk/; revision=53894

10 years agoReject the packet if data is NULL.
Chris Maynard [Mon, 9 Dec 2013 21:20:52 +0000 (21:20 -0000)]
Reject the packet if data is NULL.

svn path=/trunk/; revision=53893

10 years agoignore empty texts
Martin Kaiser [Mon, 9 Dec 2013 21:14:45 +0000 (21:14 -0000)]
ignore empty texts

svn path=/trunk/; revision=53892

10 years agouse the DVB-SI string hadling for the short event descriptor
Martin Kaiser [Mon, 9 Dec 2013 21:06:58 +0000 (21:06 -0000)]
use the DVB-SI string hadling for the short event descriptor

svn path=/trunk/; revision=53891

10 years agoadd editor modelines
Martin Kaiser [Mon, 9 Dec 2013 20:58:57 +0000 (20:58 -0000)]
add editor modelines

svn path=/trunk/; revision=53890

10 years agoReject the packet if data is NULL.
Chris Maynard [Mon, 9 Dec 2013 20:55:49 +0000 (20:55 -0000)]
Reject the packet if data is NULL.

svn path=/trunk/; revision=53889

10 years agoTABs -> spaces
Martin Kaiser [Mon, 9 Dec 2013 20:52:39 +0000 (20:52 -0000)]
TABs -> spaces
add editor modelines

svn path=/trunk/; revision=53888

10 years agoFrom packet-ua, pass a pointer to direction rather than direction itself. In packet...
Chris Maynard [Mon, 9 Dec 2013 20:51:32 +0000 (20:51 -0000)]
From packet-ua, pass a pointer to direction rather than direction itself.  In packet-ua3g, reject the packet if data is NULL.

svn path=/trunk/; revision=53887

10 years agoFrom Jakub
Martin Kaiser [Mon, 9 Dec 2013 20:46:27 +0000 (20:46 -0000)]
From Jakub
support DVB-SI character tables (EN 300 468) in a generic way

From me
move things to charsets.c/.h
distinguish between single and multi byte encoding for some tables
(so that the highlighted bytes match the displayed value)
no character table byte -> length 0, use default table

svn path=/trunk/; revision=53886

10 years agoFix warnings
Jakub Zawadzki [Mon, 9 Dec 2013 20:15:47 +0000 (20:15 -0000)]
Fix warnings

svn path=/trunk/; revision=53885

10 years agofix compilation without GNUTLS and libgcrypt
Martin Kaiser [Mon, 9 Dec 2013 17:51:48 +0000 (17:51 -0000)]
fix compilation without GNUTLS and libgcrypt

move from_hex_char() and from_hex() outside ifdef gnutls
add dummy ssl_generate_pre_master_secret()

this should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9529

svn path=/trunk/; revision=53884

10 years agoReject the packet if data is NULL.
Chris Maynard [Mon, 9 Dec 2013 16:32:15 +0000 (16:32 -0000)]
Reject the packet if data is NULL.

svn path=/trunk/; revision=53883