Commit Graph

39614 Commits

Author SHA1 Message Date
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
Alexis La Goutte c604cb5fa9 Remove dissect_ipv6_options function (unused from Revision 16302...)
svn path=/trunk/; revision=41624
2012-03-16 21:01:32 +00:00
Alexis La Goutte 7d66c568b2 Fix some Gui Text not translate and update french translation
svn path=/trunk/; revision=41623
2012-03-16 18:54:01 +00:00
Alexis La Goutte ffff694f2b Add *Tilde file to .gitignore
svn path=/trunk/; revision=41622
2012-03-16 18:51:46 +00:00
Gerald Combs 98080036b6 Capitalize "Wireshark" in various package names.
svn path=/trunk/; revision=41621
2012-03-16 17:36:40 +00:00
Alexis La Goutte 54192cbe7d Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=41618
2012-03-16 16:36:23 +00:00
Alexis La Goutte 68852899b0 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=41617
2012-03-16 16:35:55 +00:00
Bill Meier d18d7413f9 Update comments about tvbuff.
svn path=/trunk/; revision=41615
2012-03-16 15:43:56 +00:00
Bill Meier 744e6efd2f Use NULL instead of essentially duplicate text for one hf[] blurb;
Do some reformatting and do indentation & whitespace cleanup.

svn path=/trunk/; revision=41614
2012-03-16 15:33:12 +00:00
Michael Tüxen cf952db147 From Irene Ruengeler: Add check for reading strings from the
preferences to make sure it is printable. This avoids a crash
when reading a corrupted preferences file.

svn path=/trunk/; revision=41613
2012-03-16 15:09:54 +00:00
Bill Meier abf79b900b Fix some of the incorrect hf[] FT_BOOLEAN 'display' and 'bitmask' fields;
(Additional instances requiring feedback from the dissector author have
 been marked with XXX).
For 'hf_om2k_aop' use a bitmask in the hf[] entry rather than shifting & etc
 in the proto_tree_add_uint() call.
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6792  Comment #8.

svn path=/trunk/; revision=41612
2012-03-16 14:16:20 +00:00
Jeff Morriss 1108df5539 Make it possible to run capinfos and editcap from this script.
svn path=/trunk/; revision=41611
2012-03-16 14:12:01 +00:00
Jeff Morriss fb46cda196 When we're in a for(i=0,[...]) loop, don't reuse (and thus reset) 'i' in another for(i=0,[...]) loop. This fixes the capinfos double-free crashes that the fuzz bot has been experiencing.
svn path=/trunk/; revision=41610
2012-03-16 14:07:22 +00:00
Anders Broman 96e944c8ef Show instance_id.
svn path=/trunk/; revision=41609
2012-03-16 14:03:47 +00:00
Jeff Morriss ae27b278ab From Martin Kaiser: remove a set-but-unused variable
svn path=/trunk/; revision=41608
2012-03-16 13:33:09 +00:00
Jeff Morriss 78f7795a54 Make a function static
svn path=/trunk/; revision=41607
2012-03-16 13:31:36 +00:00
Jeff Morriss 0c8b0a9f3d Make several functions static; remove trailing commas and white space.
svn path=/trunk/; revision=41606
2012-03-16 13:30:12 +00:00
Jeff Morriss 255c803c61 Make most of the functions in here static
svn path=/trunk/; revision=41605
2012-03-16 13:24:15 +00:00
Jeff Morriss 53c44185bf Terminate a value_string. Remove a couple of trailing commas.
svn path=/trunk/; revision=41604
2012-03-16 13:19:16 +00:00
Anders Broman 45785bc056 Fix typo.
svn path=/trunk/; revision=41603
2012-03-16 12:46:54 +00:00
Anders Broman 21e9cc64d6 Fix a typo
svn path=/trunk/; revision=41602
2012-03-16 12:43:44 +00:00
Anders Broman a4e856ba9b Error: the name for field "Initial Resource Locator Type " ("eiss.aid.irl.type") has trailing space in packet-eiss.c
Error: the name for field "Initial Resource Locator Length " ("eiss.aid.irl.length") has trailing space in packet-eiss.c
Error: the name for field "Initial Resource Locator String " ("eiss.aid.irl.string") has trailing space in packet-eiss.c

svn path=/trunk/; revision=41601
2012-03-16 12:43:12 +00:00
Anders Broman affd39940f From Guy Martin:
Add packet-mpeg-pmt, packet-mpeg-ca and mpeg-descriptors.

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

svn path=/trunk/; revision=41600
2012-03-16 12:25:06 +00:00
Anders Broman 0422304fbc From Weston Schmidt:
Add EISS dissector support.

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

svn path=/trunk/; revision=41599
2012-03-16 12:02:56 +00:00
Anders Broman dcaddfba2c Upadte a value string.
svn path=/trunk/; revision=41598
2012-03-16 11:51:32 +00:00
Anders Broman e4403efbdb From Guy Martin:
Fix a few bugs in packet-mp2t

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

svn path=/trunk/; revision=41597
2012-03-16 11:51:00 +00:00
Guy Harris 931acaff3e Fix some comments and some indentation.
svn path=/trunk/; revision=41596
2012-03-16 08:02:35 +00:00
Guy Harris f31c9b8967 Add some more -D flags to CPPFLAGS rather than CFLAGS, and add some
flags that aren't -D or -I flags to CXXFLAGS as well as CFLAGS.

svn path=/trunk/; revision=41595
2012-03-16 08:02:04 +00:00