metze/wireshark/wip.git
10 years agoFix might be used uninitialized warning
Jörg Mayer [Fri, 13 Sep 2013 17:20:39 +0000 (17:20 -0000)]
Fix might be used uninitialized warning

svn path=/trunk/; revision=52009

10 years agoReplace some emem with wmem.
Evan Huus [Fri, 13 Sep 2013 17:14:55 +0000 (17:14 -0000)]
Replace some emem with wmem.
The windows-common dissector seems to make excessive use of strbufs - I
converted them and simplified a bit, but it could probably be simplified more.

svn path=/trunk/; revision=52008

10 years agoFix warnings shown by gcc-4.8.1
Jörg Mayer [Fri, 13 Sep 2013 17:08:00 +0000 (17:08 -0000)]
Fix warnings shown by gcc-4.8.1

/home/jmayer/work/wireshark/svn/trunk/echld/common.c:134:2: error: enum conversion in initialization is invalid in C++ [-Werror=c++-compat]
  {0,NULL}
  ^
/home/jmayer/work/wireshark/svn/trunk/echld/common.c:134:2: error: (near initialization for ‘t_map[34].type’) [-Werror=c++-compat]
/home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: note: expected ‘echld_msg_type_t’ but argument is of type ‘guint32’
/home/jmayer/work/wireshark/svn/trunk/echld/common.c:253:8: error: variable ‘off’ set but not used [-Werror=unused-but-set-variable]
   long off;
        ^
cc1: all warnings being treated as errors

Still todo:

/home/jmayer/work/wireshark/svn/trunk/echld/common.c: In function ‘echld_read_frame’:
/home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: error: enum conversion when passing argument 4 of ‘cb’ is invalid in C++ [-Werror=c++-compat]
   cb( &(r->rp[sizeof(hdr_t)]), HDR_LEN(h), h->h.chld_id, HDR_TYPE(h), h->h.reqh_id, cb_data);
   ^
/home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: note: expected ‘echld_msg_type_t’ but argument is of type ‘guint32’

Whitespace fixes

svn path=/trunk/; revision=52007

10 years agoRename --build to --check-addtext/--nocheck-addtext for clarity.
Chris Maynard [Fri, 13 Sep 2013 16:52:08 +0000 (16:52 -0000)]
Rename --build to --check-addtext/--nocheck-addtext for clarity.
Add --check-addtext/--nocheck-addtext, --check-hf/--nocheck-hf and --debug to the usage output and format the usage output a little better.

svn path=/trunk/; revision=52006

10 years agoRemove useless-use-of-emem, add modelines.
Evan Huus [Fri, 13 Sep 2013 16:48:07 +0000 (16:48 -0000)]
Remove useless-use-of-emem, add modelines.

svn path=/trunk/; revision=52005

10 years agoTry to make the heuristic a bit more efficient.
Anders Broman [Fri, 13 Sep 2013 16:33:28 +0000 (16:33 -0000)]
Try to make the heuristic a bit more efficient.

svn path=/trunk/; revision=52004

10 years agoDario Lombardo via
Jörg Mayer [Fri, 13 Sep 2013 14:14:23 +0000 (14:14 -0000)]
Dario Lombardo via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147

More emem -> wmem conversion: Addresses se_malloc() calls.

svn path=/trunk/; revision=52003

10 years agoDario Lombardo <lomato@gmail.com> via
Jörg Mayer [Fri, 13 Sep 2013 10:13:19 +0000 (10:13 -0000)]
Dario Lombardo <lomato@gmail.com> via

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

Migration from emem to wmem for trivial cases (ep_alloc only).

svn path=/trunk/; revision=52002

10 years agoRemove epan.h from ftypes.h, address.h and tpg.h,
Jörg Mayer [Fri, 13 Sep 2013 09:13:09 +0000 (09:13 -0000)]
Remove epan.h from ftypes.h, address.h and tpg.h,
add it to proto.h as it contains macros that require emem.h

svn path=/trunk/; revision=52001

10 years agoExplicit inclusion of emem.h
Jörg Mayer [Fri, 13 Sep 2013 08:49:38 +0000 (08:49 -0000)]
Explicit inclusion of emem.h

svn path=/trunk/; revision=52000

10 years agoInclude emem.h
Jörg Mayer [Fri, 13 Sep 2013 08:40:51 +0000 (08:40 -0000)]
Include emem.h

svn path=/trunk/; revision=51999

10 years agoTwo more places with now explicit emem.h include
Jörg Mayer [Fri, 13 Sep 2013 08:26:15 +0000 (08:26 -0000)]
Two more places with now explicit emem.h include

svn path=/trunk/; revision=51998

10 years agoExplicitly include emem.h where it is needed
Jörg Mayer [Fri, 13 Sep 2013 08:16:50 +0000 (08:16 -0000)]
Explicitly include emem.h where it is needed

svn path=/trunk/; revision=51997

10 years agoAdd a context menu to the TCP stream graph which includes all of our
Gerald Combs [Thu, 12 Sep 2013 23:46:56 +0000 (23:46 -0000)]
Add a context menu to the TCP stream graph which includes all of our
keyboard shortcuts.

svn path=/trunk/; revision=51996

10 years agoemem -> wmem
Jörg Mayer [Thu, 12 Sep 2013 22:53:40 +0000 (22:53 -0000)]
emem -> wmem

This was the last dissector in packet-[t-z]*.c that I consider
trivial enough to work on it. The remaining ones a left to people
who intend to think while doing the conversion ;-)

svn path=/trunk/; revision=51995

10 years agoIn some cases add include emem.h
Jörg Mayer [Thu, 12 Sep 2013 22:44:08 +0000 (22:44 -0000)]
In some cases add include emem.h
In other cases emem -> wmem

svn path=/trunk/; revision=51994

10 years agoemem -> wmem
Jörg Mayer [Thu, 12 Sep 2013 22:26:43 +0000 (22:26 -0000)]
emem -> wmem

svn path=/trunk/; revision=51993

10 years agoTry different arrow glyphs.
Gerald Combs [Thu, 12 Sep 2013 22:04:37 +0000 (22:04 -0000)]
Try different arrow glyphs.

svn path=/trunk/; revision=51992

10 years agoConvert a few more dissectors to wmem
Pascal Quantin [Thu, 12 Sep 2013 22:03:31 +0000 (22:03 -0000)]
Convert a few more dissectors to wmem

svn path=/trunk/; revision=51991

10 years ago== has higher precedence than &
Jörg Mayer [Thu, 12 Sep 2013 21:53:53 +0000 (21:53 -0000)]
== has higher precedence than &
http://en.wikipedia.org/wiki/Operators_in_C_and_C++

svn path=/trunk/; revision=51990

10 years agoAdd previous/next stream navigation to the TCP stream graph dialog.
Gerald Combs [Thu, 12 Sep 2013 21:37:47 +0000 (21:37 -0000)]
Add previous/next stream navigation to the TCP stream graph dialog.

Add get_tcp_stream_count() to the TCP dissector and modify
graph_segment_list_get() to allow matching based solely on a stream.

Use text instead of icons for the mouse click behavior buttons. Remove
their PNG resources since we aren't using them any more. Fix setting the
cursor in the graph widget.

svn path=/trunk/; revision=51989

10 years agoemem -> wmem
Jörg Mayer [Thu, 12 Sep 2013 21:34:58 +0000 (21:34 -0000)]
emem -> wmem
"tshark -v" tested

svn path=/trunk/; revision=51988

10 years agodissect OCSP nonce extension
Martin Kaiser [Thu, 12 Sep 2013 21:29:50 +0000 (21:29 -0000)]
dissect OCSP nonce extension
some minor reformatting of the ASN.1 imports

svn path=/trunk/; revision=51987

10 years agomark unused parameters
Martin Kaiser [Thu, 12 Sep 2013 21:17:21 +0000 (21:17 -0000)]
mark unused parameters

svn path=/trunk/; revision=51986

10 years agoTry to make the STUN heuristic sligtly more efficient.
Anders Broman [Thu, 12 Sep 2013 20:53:51 +0000 (20:53 -0000)]
Try to make the STUN heuristic sligtly more efficient.

svn path=/trunk/; revision=51985

10 years agoAdd missing includes
Jörg Mayer [Thu, 12 Sep 2013 20:38:07 +0000 (20:38 -0000)]
Add missing includes
Remove not needed include
emem -> wmem

svn path=/trunk/; revision=51984

10 years agoConvert a few dissectors from emem to wmem API
Pascal Quantin [Thu, 12 Sep 2013 20:37:30 +0000 (20:37 -0000)]
Convert a few dissectors from emem to wmem API

svn path=/trunk/; revision=51983

10 years agoMore dissector table name related changes (a continuation of r51904).
Chris Maynard [Thu, 12 Sep 2013 20:34:19 +0000 (20:34 -0000)]
More dissector table name related changes (a continuation of r51904).

svn path=/trunk/; revision=51982

10 years agoThe secs field of an nstime_t is a time_t, so cast to that.
Guy Harris [Thu, 12 Sep 2013 20:31:31 +0000 (20:31 -0000)]
The secs field of an nstime_t is a time_t, so cast to that.

svn path=/trunk/; revision=51981

10 years agoNote what the various ENC_TIME_ encodings are.
Guy Harris [Thu, 12 Sep 2013 20:30:55 +0000 (20:30 -0000)]
Note what the various ENC_TIME_ encodings are.

svn path=/trunk/; revision=51980

10 years agoemem -> wmem ("tshark -v" tested)
Jörg Mayer [Thu, 12 Sep 2013 20:25:51 +0000 (20:25 -0000)]
emem -> wmem ("tshark -v" tested)

svn path=/trunk/; revision=51979

10 years agoMake proto.c compile on my system (linux, 32 bit)
Jörg Mayer [Thu, 12 Sep 2013 20:07:48 +0000 (20:07 -0000)]
Make proto.c compile on my system (linux, 32 bit)

      [-Werror,-Wshorten-64-to-32]
                                time_stamp.secs = (todsecs  / 1000000) - TOD_BASETIME;
                                                ~ ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~
/home/jmayer/work/wireshark/svn/trunk/epan/proto.c:1613:44: error: implicit conversion
      loses integer precision: 'unsigned long long' to 'time_t' (aka 'long')
      [-Werror,-Wshorten-64-to-32]
                                time_stamp.secs = (todsecs  / 1000000) - TOD_BASETIME;
                                                ~ ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~

svn path=/trunk/; revision=51978

10 years agoFix UDP port range.
Anders Broman [Thu, 12 Sep 2013 18:17:41 +0000 (18:17 -0000)]
Fix UDP port range.

svn path=/trunk/; revision=51977

10 years agoRevert the TPNCP changes in r51972 until we can figure out a better way to fix
Evan Huus [Thu, 12 Sep 2013 17:32:49 +0000 (17:32 -0000)]
Revert the TPNCP changes in r51972 until we can figure out a better way to fix
it.

svn path=/trunk/; revision=51976

10 years agoAdd casts to fix mac buildbots.
Evan Huus [Thu, 12 Sep 2013 17:17:42 +0000 (17:17 -0000)]
Add casts to fix mac buildbots.

svn path=/trunk/; revision=51975

10 years agoFrom RobiOneKenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9072
Evan Huus [Thu, 12 Sep 2013 16:56:37 +0000 (16:56 -0000)]
From RobiOneKenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9072

Add support for Time-of-Day timestamp format from z/OS.

svn path=/trunk/; revision=51974

10 years agoUse wmem_new to get the automatic casts to fix the buildbot.
Evan Huus [Thu, 12 Sep 2013 16:31:30 +0000 (16:31 -0000)]
Use wmem_new to get the automatic casts to fix the buildbot.

svn path=/trunk/; revision=51973

10 years agoemem -> wmem
Jörg Mayer [Thu, 12 Sep 2013 16:15:54 +0000 (16:15 -0000)]
emem -> wmem

svn path=/trunk/; revision=51972

10 years agoemem -> wmem
Jörg Mayer [Thu, 12 Sep 2013 15:29:55 +0000 (15:29 -0000)]
emem -> wmem

svn path=/trunk/; revision=51971

10 years agoConvert from emem to wmem.
Jörg Mayer [Thu, 12 Sep 2013 15:07:22 +0000 (15:07 -0000)]
Convert from emem to wmem.
Trivial whitespace fix in packet-tftp.c while at it.

svn path=/trunk/; revision=51970

10 years agoWhen profiling we are more interested in real-world performance than memory
Evan Huus [Thu, 12 Sep 2013 13:45:04 +0000 (13:45 -0000)]
When profiling we are more interested in real-world performance than memory
errors, so we want to use the "fast" allocators rather than the ones that are
friendly to memcheck.

svn path=/trunk/; revision=51969

10 years agoMore wmem.
Evan Huus [Thu, 12 Sep 2013 12:37:27 +0000 (12:37 -0000)]
More wmem.

svn path=/trunk/; revision=51968

10 years agoConvert a few more dissectors to wmem.
Evan Huus [Thu, 12 Sep 2013 12:25:17 +0000 (12:25 -0000)]
Convert a few more dissectors to wmem.

svn path=/trunk/; revision=51967

10 years agoUse epan-scope memory for OIDs, cleaning up another ~100KB of valgrind
Evan Huus [Thu, 12 Sep 2013 12:16:15 +0000 (12:16 -0000)]
Use epan-scope memory for OIDs, cleaning up another ~100KB of valgrind
complaints.

svn path=/trunk/; revision=51966

10 years agoFrom Robert G. Jakabosky via bug 5575:
Stig Bjørlykke [Thu, 12 Sep 2013 11:34:13 +0000 (11:34 -0000)]
From Robert G. Jakabosky via bug 5575:
Fix module registration.  Must use lua_call() when calling luaopen_*()

svn path=/trunk/; revision=51965

10 years agoNeed to specify the particular FT_UINTn type.
Guy Harris [Thu, 12 Sep 2013 04:10:47 +0000 (04:10 -0000)]
Need to specify the particular FT_UINTn type.

svn path=/trunk/; revision=51964

10 years agoGive various files RCS IDs.
Guy Harris [Thu, 12 Sep 2013 03:41:22 +0000 (03:41 -0000)]
Give various files RCS IDs.

svn path=/trunk/; revision=51963

10 years agoFix the types of some multi-bit bitfields - they're not Booleans. Give
Guy Harris [Thu, 12 Sep 2013 03:36:36 +0000 (03:36 -0000)]
Fix the types of some multi-bit bitfields - they're not Booleans.  Give
some of them real names (presumably they were copied-and-pasted without
editing).

Thanks and a tip of the Hatlo hat to checkAPI.pl for catching this.

svn path=/trunk/; revision=51962

10 years agoMake sure qmake links with zlib on Windows.
Gerald Combs [Thu, 12 Sep 2013 00:03:47 +0000 (00:03 -0000)]
Make sure qmake links with zlib on Windows.

svn path=/trunk/; revision=51961

10 years agoRename frame relay NLPID dissector table from "fr.ietf" to "fr.nlpid".
Chris Maynard [Wed, 11 Sep 2013 21:55:00 +0000 (21:55 -0000)]
Rename frame relay NLPID dissector table from "fr.ietf" to "fr.nlpid".

svn path=/trunk/; revision=51960

10 years agoTest the return value of tvb_reported_length_remaining() as > 0 rather than != 0...
Chris Maynard [Wed, 11 Sep 2013 21:44:13 +0000 (21:44 -0000)]
Test the return value of tvb_reported_length_remaining() as > 0 rather than != 0.  While in these cases, I don't see any actual bugs due to other protections, I don't think it hurts to make this change and should help avoid others from copying/pasting this code elsewhere, where similar protections may not be in place.

svn path=/trunk/; revision=51959

10 years agoChange the name of the Cisco HDLC dissector table from chdlctype to chdlc.protocol...
Chris Maynard [Wed, 11 Sep 2013 21:37:58 +0000 (21:37 -0000)]
Change the name of the Cisco HDLC dissector table from chdlctype to chdlc.protocol and change the UI name to match.  It is by far much more common to name the tables after the field than to pick another name.

svn path=/trunk/; revision=51958

10 years agoMark a couple of parameters as unused.
Jeff Morriss [Wed, 11 Sep 2013 21:06:34 +0000 (21:06 -0000)]
Mark a couple of parameters as unused.

Fix up indentation in many places while getting rid of tabs.

svn path=/trunk/; revision=51957

10 years ago- Introduce a dissector table for Vendor AVP:s
Anders Broman [Wed, 11 Sep 2013 20:26:42 +0000 (20:26 -0000)]
- Introduce a dissector table for Vendor AVP:s
- Dissect some of Cable Labs AVP:s.

svn path=/trunk/; revision=51956

10 years agoDefine NOMINMAX for the entire Qt build.
Gerald Combs [Wed, 11 Sep 2013 19:59:22 +0000 (19:59 -0000)]
Define NOMINMAX for the entire Qt build.

svn path=/trunk/; revision=51955

10 years agoremove unused variable, mark unused parameter
Martin Kaiser [Wed, 11 Sep 2013 19:49:16 +0000 (19:49 -0000)]
remove unused variable, mark unused parameter

svn path=/trunk/; revision=51954

10 years agoGet rid of some users the addrinfo_list.
Anders Broman [Wed, 11 Sep 2013 19:22:24 +0000 (19:22 -0000)]
Get rid of some users the addrinfo_list.

svn path=/trunk/; revision=51953

10 years agoInstead of prepending "LLC " to the UI table name, just modify the table name.
Chris Maynard [Wed, 11 Sep 2013 18:06:29 +0000 (18:06 -0000)]
Instead of prepending "LLC " to the UI table name, just modify the table name.

svn path=/trunk/; revision=51952

10 years agoMove a lot of includes from follow_stream_dialog.h to
Gerald Combs [Wed, 11 Sep 2013 17:39:49 +0000 (17:39 -0000)]
Move a lot of includes from follow_stream_dialog.h to
follow_stream_dialog.cpp. Remove the ones that we don't use. Use
QMessageBox in place of simple_dialog.

Move IP6OPT_HOME_ADDRESS and related definitions to packet-ipv6.c. It
looks like we only use it there and it conflicts with WinPcap.

Mark some items unused.

svn path=/trunk/; revision=51951

10 years agoAdd a link to IANA's Assigned Internet Protocol Numbers page.
Chris Maynard [Wed, 11 Sep 2013 17:31:24 +0000 (17:31 -0000)]
Add a link to IANA's Assigned Internet Protocol Numbers page.

svn path=/trunk/; revision=51950

10 years agoMake sure we can link on Windows.
Gerald Combs [Wed, 11 Sep 2013 16:18:17 +0000 (16:18 -0000)]
Make sure we can link on Windows.

svn path=/trunk/; revision=51949

10 years agoFrom Tommy Wu:
Anders Broman [Wed, 11 Sep 2013 04:56:44 +0000 (04:56 -0000)]
From Tommy Wu:
Update-Reason should be an integer.

svn path=/trunk/; revision=51948

10 years agoUse the correct GnuTLS include directory.
Gerald Combs [Tue, 10 Sep 2013 22:25:41 +0000 (22:25 -0000)]
Use the correct GnuTLS include directory.

svn path=/trunk/; revision=51947

10 years agoUpdate User Guide
Pascal Quantin [Tue, 10 Sep 2013 22:19:24 +0000 (22:19 -0000)]
Update User Guide

svn path=/trunk/; revision=51946

10 years agoAdd a hack to allow builds to succeed on 64-bit systems.
Gerald Combs [Tue, 10 Sep 2013 22:01:42 +0000 (22:01 -0000)]
Add a hack to allow builds to succeed on 64-bit systems.

svn path=/trunk/; revision=51945

10 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9116 :
Pascal Quantin [Tue, 10 Sep 2013 21:43:51 +0000 (21:43 -0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9116 :
README.stats_tree shows the wrong function parameters for stats_tree_register

svn path=/trunk/; revision=51944

10 years agoHomebrew installs gettext (including libintl, which GLib requires) in
Gerald Combs [Tue, 10 Sep 2013 21:24:52 +0000 (21:24 -0000)]
Homebrew installs gettext (including libintl, which GLib requires) in
/usr/local/opt/gettext. Tell CMake to update our include and library
paths accordingly.

svn path=/trunk/; revision=51943

10 years agoFrom Philippe Rosenfeld via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9126 :
Pascal Quantin [Tue, 10 Sep 2013 21:18:28 +0000 (21:18 -0000)]
From Philippe Rosenfeld via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9126 :
Fix the value of 'SEND_TO_UE' in the DIAMETER Gx dictionary for Packet-Filter-Usage AVP

svn path=/trunk/; revision=51942

10 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9128 :
Pascal Quantin [Tue, 10 Sep 2013 19:37:13 +0000 (19:37 -0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9128 :
ZigBee ZCL epoch is January 1, 2000

svn path=/trunk/; revision=51939

10 years agoproto_tree -> proto_item
Martin Kaiser [Tue, 10 Sep 2013 17:55:31 +0000 (17:55 -0000)]
proto_tree -> proto_item

svn path=/trunk/; revision=51936

10 years agoAdd newlines to the AsciiDoc output.
Gerald Combs [Tue, 10 Sep 2013 15:39:05 +0000 (15:39 -0000)]
Add newlines to the AsciiDoc output.

svn path=/trunk/; revision=51930

10 years agoremove unnecessary if (tree)
Martin Kaiser [Tue, 10 Sep 2013 15:01:52 +0000 (15:01 -0000)]
remove unnecessary if (tree)
no need for tvb_ensure_bytes_exist()
replace += 1;; with ++;

svn path=/trunk/; revision=51929

10 years agoEnable Lua ldap, smb and smb2 taps
Stig Bjørlykke [Tue, 10 Sep 2013 11:18:41 +0000 (11:18 -0000)]
Enable Lua ldap, smb and smb2 taps

svn path=/trunk/; revision=51928

10 years agoMake compare-abis.sh work with versions having multiple digits in version number
Balint Reczey [Tue, 10 Sep 2013 11:10:00 +0000 (11:10 -0000)]
Make compare-abis.sh work with versions having multiple digits in version number

svn path=/trunk/; revision=51927

10 years agoAdded TreeItem prepend_text().
Stig Bjørlykke [Tue, 10 Sep 2013 10:35:30 +0000 (10:35 -0000)]
Added TreeItem prepend_text().

svn path=/trunk/; revision=51924

10 years agoUse -m32, instead, as per Michael Tuexen's suggestion.
Guy Harris [Tue, 10 Sep 2013 10:28:30 +0000 (10:28 -0000)]
Use -m32, instead, as per Michael Tuexen's suggestion.

svn path=/trunk/; revision=51923

10 years agoFixed some NSTime error texts.
Stig Bjørlykke [Tue, 10 Sep 2013 10:27:47 +0000 (10:27 -0000)]
Fixed some NSTime error texts.

svn path=/trunk/; revision=51922

10 years agoWhen building for 10.4 or 10.5, force 32-bit x86 on x86 and 32-bit PPC
Guy Harris [Tue, 10 Sep 2013 10:24:00 +0000 (10:24 -0000)]
When building for 10.4 or 10.5, force 32-bit x86 on x86 and 32-bit PPC
on PPC.

svn path=/trunk/; revision=51921

10 years agoFixed FieldInfo documentation.
Stig Bjørlykke [Tue, 10 Sep 2013 10:07:40 +0000 (10:07 -0000)]
Fixed FieldInfo documentation.

svn path=/trunk/; revision=51920

10 years agoFrom Selvamegala:
Anders Broman [Tue, 10 Sep 2013 06:32:41 +0000 (06:32 -0000)]
From Selvamegala:

GTS starting slot in the Beacon frame is not parsed correctly. As per the Spec, in the 3byte gts descriptor value bit 0- 15  refers Device Short address bit 16-19 – Starting slot bit 20-23 – GTS length.

(I Dug out the onliner from the attached file)

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

svn path=/trunk/; revision=51919

10 years agoFreom Dennis:
Anders Broman [Tue, 10 Sep 2013 06:06:55 +0000 (06:06 -0000)]
Freom Dennis:

As I looked into the implementation in epan/dissectors/packet-ieee802a.c, there's a bug in the dissect_ieee802a(). After OUI and PID is parsed, it looks for the customized sub-dissector_table by
oui_info = (oui_info_t *)g_hash_table_lookup(oui_info_table, GUINT_TO_POINTER(oui))
The problem is that the oui is defined as an array (guint8 oui[3]), whose value contains the 3-byte customized OUI. However, here GUINT_TO_POINTER(oui) converts the local array oui's address to the hash table key, instead of the value. That cause the search in the hash table to fail, because the ieee802_add_oui() use the OUI value as the key.

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

svn path=/trunk/; revision=51918

10 years agoChange the default preference on how to dissect dunneled data to GTP_TPDU_AS_TPDU.
Anders Broman [Tue, 10 Sep 2013 05:47:28 +0000 (05:47 -0000)]
Change the default preference on how to dissect dunneled data to GTP_TPDU_AS_TPDU.

svn path=/trunk/; revision=51917

10 years agoFrom: Michal Labedzki <michal.labedzki@tieto.com>
Anders Broman [Tue, 10 Sep 2013 05:43:17 +0000 (05:43 -0000)]
From: Michal Labedzki <michal.labedzki@tieto.com>

Subject: [PATCH] NFC: PN532: Implement half of PN532 specification

Implement TG_* and RF_* commands/responses.
Also decode "status" field in all commands.
Update USB CCID to decode "escaped" payload.

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

svn path=/trunk/; revision=51916

10 years agoIt's such fun to have four count 'em four different build systems
Guy Harris [Tue, 10 Sep 2013 01:18:09 +0000 (01:18 -0000)]
It's such fun to have four count 'em four different build systems
(autotools, CMake, nmake, qmake).  Throw something at qmake in the hopes
of letting it use GnuTLS in the "follow SSL stream" code.

svn path=/trunk/; revision=51915

10 years agoRestart the splash timer *after* the paint has completed, so that in situations
Evan Huus [Tue, 10 Sep 2013 01:08:07 +0000 (01:08 -0000)]
Restart the splash timer *after* the paint has completed, so that in situations
when the paint takes a long time (for very large windows, or on older machines)
that doesn't cause every single event to paint (which slows the whole thing to
a crawl). Drop the splash timer to 15ms, since we're no longer counting paints
this seems like a more appropriate value. The old value of 50ms would causing
the splash to only paint once or twice during startup.

svn path=/trunk/; revision=51914

10 years agoExplicitly refer to ui/follow.h, as we do with other header files from
Guy Harris [Tue, 10 Sep 2013 00:15:15 +0000 (00:15 -0000)]
Explicitly refer to ui/follow.h, as we do with other header files from
the ui directory, so see if that fixes the build issues.

svn path=/trunk/; revision=51913

10 years agoGet rid of a whole bunch of things that are supposed to be included by
Guy Harris [Mon, 9 Sep 2013 23:33:51 +0000 (23:33 -0000)]
Get rid of a whole bunch of things that are supposed to be included by
source files rather than header files in most if not all cases.

svn path=/trunk/; revision=51908

10 years agoMore dissector table UI name changes (a continuation of r51904).
Chris Maynard [Mon, 9 Sep 2013 22:30:40 +0000 (22:30 -0000)]
More dissector table UI name changes (a continuation of r51904).

svn path=/trunk/; revision=51907

10 years ago"uni", in "unistd.h", stands for "Unix". Only include it if we have it,
Guy Harris [Mon, 9 Sep 2013 22:21:36 +0000 (22:21 -0000)]
"uni", in "unistd.h", stands for "Unix".  Only include it if we have it,
which we don't on Windows.

svn path=/trunk/; revision=51905

10 years agoChange some internal dissector table UI names so it's clear which protocol they perta...
Chris Maynard [Mon, 9 Sep 2013 21:55:57 +0000 (21:55 -0000)]
Change some internal dissector table UI names so it's clear which protocol they pertain to and it's easier to find in the list.

svn path=/trunk/; revision=51904

10 years agoReturn ByteArray as "value" for FieldInfo's with type FT_NONE (which has data).
Stig Bjørlykke [Mon, 9 Sep 2013 21:42:49 +0000 (21:42 -0000)]
Return ByteArray as "value" for FieldInfo's with type FT_NONE (which has data).

This fixes bug 5201.

svn path=/trunk/; revision=51903

10 years agoAdd svn:mime-type property to follow_stream_dialog.ui
Pascal Quantin [Mon, 9 Sep 2013 21:32:45 +0000 (21:32 -0000)]
Add svn:mime-type property to follow_stream_dialog.ui

svn path=/trunk/; revision=51902

10 years agoReplace the simpler chop example with a more detailed example.
Chris Maynard [Mon, 9 Sep 2013 21:32:03 +0000 (21:32 -0000)]
Replace the simpler chop example with a more detailed example.

svn path=/trunk/; revision=51901

10 years agoSet *.ts files' mime type to be XML; set svn properties on tools/pre-commit.
Jeff Morriss [Mon, 9 Sep 2013 21:24:54 +0000 (21:24 -0000)]
Set *.ts files' mime type to be XML; set svn properties on tools/pre-commit.

svn path=/trunk/; revision=51900

10 years agoInitialize all tvb values in FieldInfo_get_range.
Stig Bjørlykke [Mon, 9 Sep 2013 21:20:26 +0000 (21:20 -0000)]
Initialize all tvb values in FieldInfo_get_range.

This fixes bug 5200.

svn path=/trunk/; revision=51899

10 years agoBut we *do* have to include <zlib.h> here.
Guy Harris [Mon, 9 Sep 2013 21:12:49 +0000 (21:12 -0000)]
But we *do* have to include <zlib.h> here.

svn path=/trunk/; revision=51898

10 years agoAnother "this depends on a ui_XXX.h" required to force the ui_XXX.h to
Guy Harris [Mon, 9 Sep 2013 21:09:03 +0000 (21:09 -0000)]
Another "this depends on a ui_XXX.h" required to force the ui_XXX.h to
be built.

svn path=/trunk/; revision=51897

10 years agoWith the change from r51895, revert r51894.
Chris Maynard [Mon, 9 Sep 2013 21:09:00 +0000 (21:09 -0000)]
With the change from r51895, revert r51894.

svn path=/trunk/; revision=51896

10 years agoCleanup follow.h a bit:
Pascal Quantin [Mon, 9 Sep 2013 21:04:41 +0000 (21:04 -0000)]
Cleanup follow.h a bit:
- no need to include zlib.h
- sgetline() function is not used outside of follow.c

svn path=/trunk/; revision=51895

10 years agoAdd $(ZLIB_CFLAGS) to the GENERATED_CFLAGS list to fix compile error.
Chris Maynard [Mon, 9 Sep 2013 21:02:07 +0000 (21:02 -0000)]
Add $(ZLIB_CFLAGS) to the GENERATED_CFLAGS list to fix compile error.

svn path=/trunk/; revision=51894