Commit graph

39641 commits

Author SHA1 Message Date
Anders Broman
b959e9cd74 On behalf of Ericsson a dissector for output from a log tool.
svn path=/trunk/; revision=41685
2012-03-20 12:32:20 +00:00
Anders Broman
456c7c2dc6 Try to make the buildbot happy.
svn path=/trunk/; revision=41684
2012-03-20 11:58:29 +00:00
Anders Broman
148c8a3a30 Write ISB:s if we have them.
svn path=/trunk/; revision=41683
2012-03-20 11:42:55 +00:00
Anders Broman
237a850f84 To be consistent with the wiretap API don't null terminate the counted strings.
svn path=/trunk/; revision=41682
2012-03-20 11:41:58 +00:00
Alexis La Goutte
fa68273f40 Add Quick Start IPv6 Option ( And shared Quick Start option between IPv4/IPv6/TCP )
svn path=/trunk/; revision=41681
2012-03-20 08:51:05 +00:00
Guy Harris
b7cfa1359d Now, isn't that swell! Leopard's dseditgroup doesn't return a failure
exit status if the group in question doesn't exist, so we can't use
dseditgroup on Leopard to check whether the access_bpf group exists.

Instead, as per Martin Williams' suggestion in bug 6526, use "dscl .
-read /groups/{group}" instead; the suggestion came from the addgroup.sh
script in

	https://developer.apple.com/library/mac/documentation/OpenSource/Conceptual/ShellScripting/ShellScripting.pdf

svn path=/trunk/; revision=41680
2012-03-20 04:06:36 +00:00
Bill Meier
c68988797d Use consistent indentation & whitespace;
Reformat some lines.

svn path=/trunk/; revision=41679
2012-03-19 21:12:45 +00:00
Jörg Mayer
31c3b1068d Small update reagarding debian builds
svn path=/trunk/; revision=41678
2012-03-19 20:49:54 +00:00
Gerald Combs
ccef7158f5 Add more SDK download URLs.
svn path=/trunk/; revision=41676
2012-03-19 17:55:22 +00:00
Jeff Morriss
c07876603f Fix crash (caused by a corrupted Diameter dictionary) reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6664 :

Add some sanity checks before adding types, vendors, commands, and AVPs.

svn path=/trunk/; revision=41675
2012-03-19 17:12:04 +00:00
Anders Broman
81bc7b28aa From Roland Knall:
Guards the calledOnce boolean, against malformed traps, using register_frame_end_routine.
Fixes openSAFETY - Malformed packets disable the dissector for the WS session

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

svn path=/trunk/; revision=41674
2012-03-19 14:33:37 +00:00
Anders Broman
012c9d729d From Martin Kaiser:
dvb-ci dissector: dissect descriptor loops by using mpeg-descriptor.

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

svn path=/trunk/; revision=41673
2012-03-19 14:12:07 +00:00
Anders Broman
5252d989d6 Update cause values and export the extended value string.
svn path=/trunk/; revision=41672
2012-03-19 12:57:21 +00:00
Anders Broman
7f9a9c62da From David wei:
Update dictionary.xml

svn path=/trunk/; revision=41671
2012-03-19 11:33:05 +00:00
Alexis La Goutte
911e82514a From Smyle6 via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6953
Dissector for Kismet drone/server protocol

From me :
* Fix Clang Warning
* Remove if(tree)

svn path=/trunk/; revision=41670
2012-03-19 09:53:20 +00:00
Guy Harris
ec2451f8f1 We don't use a GENERATED_H_FILES macro anywhere else, we use
GENERATED_HEADER_FILES; get rid of GENERATED_H_FILES in favor of
GENERATED_HEADER_FILES, and make other changes to make the Makefile.am
and Makefile.common in ui/qt more like those in ui/gtk.

svn path=/trunk/; revision=41669
2012-03-19 09:31:22 +00:00
Guy Harris
e0b738f974 Remove the generated-but-not-distributed source files on "make
distclean", as, after all, they're not part of the distribution.

svn path=/trunk/; revision=41668
2012-03-19 09:12:17 +00:00
Guy Harris
28ad4501ee Add main.cpp as an EXTRA_DIST file; for now, we don't build it as part
of the library, because, in order to do the top-level link of Wireshark
with a C++ compiler rather than a C compiler, at least one C++ source
file must be an input file - for now, we don't do that, as adding it as
a top-level source file for Wireshark causes other problems, but this at
least lets somebody do so as a temporary hack to build with auto*.

svn path=/trunk/; revision=41667
2012-03-19 07:32:45 +00:00
Guy Harris
c2f03d39f3 Don't distribute the output of various Qt preprocessing tools. We don't
want to require the machines used to build the distribution tarballs to
have those tools installed or to require the build process to run them,
and I think if you have enough stuff installed to build Qt applications
at all you'll have those tools installed (the reason why the result of
{F}lex and YACC/BYACC/Bison are distributed with tarballs is to let
somebody who wants to or needs to build from unmodified source do so
with as few tools required as possible).

svn path=/trunk/; revision=41666
2012-03-19 07:30:38 +00:00
Guy Harris
73ca54d870 Said hack didn't work.
svn path=/trunk/; revision=41665
2012-03-19 07:24:14 +00:00
Guy Harris
df5f0bd622 Another generated file.
svn path=/trunk/; revision=41662
2012-03-19 07:08:15 +00:00
Guy Harris
813ba676a4 Get rid of blank line at the end.
svn path=/trunk/; revision=41660
2012-03-19 06:31:37 +00:00
Guy Harris
a04472a839 Sort the EXTRA_DIST list.
svn path=/trunk/; revision=41659
2012-03-19 06:31:13 +00:00
Guy Harris
1ff3d8477f Call the UI library in the Qt directory libqtui, not libui, to match the
UI library in the GTK+ directory.

List the moc-generated and rcc-generated files as generated files.

Add main_window.ui as an EXTRA_DIST file.  Sort the EXTRA_DIST list.

svn path=/trunk/; revision=41658
2012-03-19 06:29:41 +00:00
Jeff Morriss
406e66d3bf Fix a typo or two
svn path=/trunk/; revision=41657
2012-03-19 02:04:47 +00:00
Jeff Morriss
a94c84d34f Add a new environment variable (WIRESHARK_ABORT_ON_OUT_OF_MEMORY) that
prevents OutOfMemory exceptions from being thrown.  This makes it easier
to debug such conditions.

Set this variable in test-fuzzed-cap.sh but not in fuzz-test.sh; it's nice
to see the friendly out-of-memory error message in the bug reports the
latter script generates.

svn path=/trunk/; revision=41656
2012-03-19 02:00:42 +00:00
Jeff Morriss
13e113bd44 Until someone creates a .vcproj file for QT, don't try to distribute it.
svn path=/trunk/; revision=41655
2012-03-19 01:47:53 +00:00
Jeff Morriss
90df1a9d94 Set eol-style to native (just to make these files readable on *NIX).
svn path=/trunk/; revision=41654
2012-03-19 01:46:24 +00:00
Jeff Morriss
38d8b62758 Add ui/qt/doxygen.cfg.in (copied from ui/gtk, replacing gtk strings with qt). The doxygen stuff doesn't work, but at least we'll be able to build the source tarball.
svn path=/trunk/; revision=41653
2012-03-19 01:15:26 +00:00
Jeff Morriss
e88f821bc3 Fix path to doxygen_global.cfg
svn path=/trunk/; revision=41652
2012-03-19 01:10:19 +00:00
Bill Meier
cb122a30ce From Harald Welte: patch adding the missing hf[] entries ...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6355#c11

svn path=/trunk/; revision=41651
2012-03-18 23:57:20 +00:00
Guy Harris
07adfa88bd Remove ui/qt/main.cpp from the list of source files for Wireshark, for
now.

svn path=/trunk/; revision=41650
2012-03-18 23:52:04 +00:00
Guy Harris
16b1d14f30 Take the source files out of uiqt_DATA.
svn path=/trunk/; revision=41649
2012-03-18 23:49:44 +00:00
Guy Harris
2605c887ca Add in the Makefile_custom.common file.
svn path=/trunk/; revision=41648
2012-03-18 23:39:23 +00:00
Guy Harris
994d2b544e Add automake support for Qt - use --with-qt as a configure script
argument.

svn path=/trunk/; revision=41647
2012-03-18 23:35:53 +00:00
Bill Meier
f79a5f32b7 Fix a checkAPIs error: Blurb matches field name.
svn path=/trunk/; revision=41646
2012-03-18 22:52:28 +00:00
Bill Meier
2df5dc3d53 From Reinhard Speyerer: Fix several misspellings/typos in Wireshark
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6967

svn path=/trunk/; revision=41645
2012-03-18 22:24:24 +00:00
Bill Meier
a7041cacb0 From Bill Schiller: New dissector for the HART/IP protocol
I'm contributing a new dissector for the HART/IP protocol.  This
protocol is specified by the HART Conformance Foundation (HCF).  It is
a standard protocol used in the process control industry.  It
essential wraps the multip-drop serial HART packets in TCP or UDP
packets.  The standard has been approved by the HCF and has been
assigned UDP/TCP port 5094 by IANA.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6961
--This line, and those below,
will be ignored--

M    AUTHORS
M    epan/CMakeLists.txt
M    epan/dissectors/Makefile.common
AM   epan/dissectors/packet-hartip.c
M    ui/gtk/main_menubar.c

svn path=/trunk/; revision=41644
2012-03-18 19:51:39 +00:00
Gerald Combs
86daf87e18 [Automatic manuf, services and enterprise-numbers update for 2012-03-18]
svn path=/trunk/; revision=41641
2012-03-18 19:10:29 +00:00
Bill Meier
ddecd24d5b Use a value_string_ext to reference a value_string array;
Use consistent indentation;
Reformat some lines.

svn path=/trunk/; revision=41640
2012-03-18 14:58:38 +00:00
Jeff Morriss
4906ffcdfe Fix the infinite-loop fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6962 :
Repeat r41359 in another location:

Don't try to display tone entries if there are none (but there is length for
them).  Could/should be an expert_info.

Also fix a typo: Nomber->Number.

svn path=/trunk/; revision=41639
2012-03-18 14:05:45 +00:00
Jeff Morriss
c49205ed0f Fix one of the dissector assertions in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6962 :
Don't use a proto_item as the tree in proto_tree_add_text().  (There's code
here to hang a subtree off the item but it's commented out.)

svn path=/trunk/; revision=41638
2012-03-18 14:00:02 +00:00
Jeff Morriss
9ce0b54c8f Fix one of the dissector assertions in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6962 :
tidlist is registered as a FT_UINT16 so don't add an array of 16-bit entities
(tids) using it.  Instead add each TID individually.

svn path=/trunk/; revision=41637
2012-03-18 13:57:30 +00:00
Alexis La Goutte
d033740bc7 Fix typo (wrong proto_item is used... when there is PAD1 Option)
svn path=/trunk/; revision=41636
2012-03-18 11:54:23 +00:00
Alexis La Goutte
52594e8d9b From Francesco Fondelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6966
MPLS-TP Protection State Coordination (PSC) Protocol, RFC 6378

svn path=/trunk/; revision=41635
2012-03-18 11:41:18 +00:00
Jeff Morriss
7bc574b776 From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6963 :
Conversation address generation during processing of endpoint descriptors
is not being done in a manner consistent with that of general USB
packet dissection. I am not aware of any observable manifestation of this
bug.

svn path=/trunk/; revision=41634
2012-03-17 23:46:39 +00:00
Guy Harris
1222542112 Mark the computed-from-the-MCS-field data rate as generated, and make it
cover the entire MCS field, in the hopes of avoiding the need to ask
questions such as

	http://ask.wireshark.org/questions/9461

svn path=/trunk/; revision=41633
2012-03-17 21:46:43 +00:00
Guy Harris
6c500f66f8 Fix indentation.
svn path=/trunk/; revision=41627
2012-03-17 08:46:20 +00:00
Jeff Morriss
f9dc23f352 Clean up from what appears to have been 4-space tabs.
Clean up indentation.

Leave only one statement on each line.

svn path=/trunk/; revision=41626
2012-03-17 03:47:16 +00:00
Jeff Morriss
5f555e2821 Fix the infinite-loop fuzz failure reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6949 :

Don't use a guint8 for() loop index when the end of the loop value is stored
in a guint: the loop index may never reach the end-of-loop value.

Also remove a shadow'd variable.

svn path=/trunk/; revision=41625
2012-03-17 02:41:02 +00:00