Evan Huus [Tue, 7 Jan 2014 23:38:50 +0000 (23:38 -0000)]
From Michal Labedzki via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9610
USB: Dissect Application-specific Interface Class/Subclass/Protocols
svn path=/trunk/; revision=54640
Jörg Mayer [Tue, 7 Jan 2014 23:32:11 +0000 (23:32 -0000)]
Update documentation to match change in r54630:
"The capabilities for dumpcap don't need to be inheritable."
svn path=/trunk/; revision=54639
Jörg Mayer [Tue, 7 Jan 2014 23:08:42 +0000 (23:08 -0000)]
Rework compiler flag detection to be able to handle changed
order of flags
svn path=/trunk/; revision=54638
Jakub Zawadzki [Tue, 7 Jan 2014 22:55:03 +0000 (22:55 -0000)]
Remove svn:executable attribute.
svn path=/trunk/; revision=54637
Evan Huus [Tue, 7 Jan 2014 22:42:50 +0000 (22:42 -0000)]
From Michal Labedzki via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9610
USB: Update Standard Descriptor Type numbers to 3.1 Specification
svn path=/trunk/; revision=54636
Evan Huus [Tue, 7 Jan 2014 22:39:15 +0000 (22:39 -0000)]
Don't use #defines for errno values, just build the value-string directly. They
weren't used and were causing build failures due to redefinition in certain
environments.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9614
svn path=/trunk/; revision=54635
Alexis La Goutte [Tue, 7 Jan 2014 22:36:01 +0000 (22:36 -0000)]
Fix warning when use make packaging on Windows
warning: unknown variable/constant "{PROGRAM_NAME_PATH_GTK}" detected, ignoring (macro:MUI_FUNCTION_FINISHPAGE:387)
svn path=/trunk/; revision=54634
Jakub Zawadzki [Tue, 7 Jan 2014 22:17:32 +0000 (22:17 -0000)]
Fix bug #9618: Invalid utf8 causes JSON dissector assertion failure "g_utf8_validate"
Validate JSON UTF-8 characters, replace with '?' when invalid.
svn path=/trunk/; revision=54633
Jakub Zawadzki [Tue, 7 Jan 2014 21:55:49 +0000 (21:55 -0000)]
Move defines for helping with UTF-16 surrogate pairs to wsutil/unicode-utils.h
tvbuff version was moved, but with 'or' optimization from packet-json.
svn path=/trunk/; revision=54632
Guy Harris [Tue, 7 Jan 2014 21:21:20 +0000 (21:21 -0000)]
The capabilities for dumpcap don't need to be inheritable.
See
https://bugzilla.redhat.com/show_bug.cgi?id=
1022377
svn path=/trunk/; revision=54630
Jörg Mayer [Tue, 7 Jan 2014 21:09:03 +0000 (21:09 -0000)]
include config.h at the top of the file.
A used parameter was marked unused.
svn path=/trunk/; revision=54629
Jörg Mayer [Tue, 7 Jan 2014 18:36:37 +0000 (18:36 -0000)]
HAVE_PLUGINS was defined twice
svn path=/trunk/; revision=54627
Anders Broman [Tue, 7 Jan 2014 18:08:02 +0000 (18:08 -0000)]
Try to get rid of some warnings.
svn path=/trunk/; revision=54626
Anders Broman [Tue, 7 Jan 2014 17:41:06 +0000 (17:41 -0000)]
From Zoltán Lajos Kis:
OpenFlow 1.4 dissector: add missing features
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9621
svn path=/trunk/; revision=54625
Anders Broman [Tue, 7 Jan 2014 17:25:20 +0000 (17:25 -0000)]
Fix
warning: redundant redeclaration of 'zbee_get_bit_field'
warning: redundant redeclaration of 'zbee_aps_cid_names'
svn path=/trunk/; revision=54624
Stig Bjørlykke [Tue, 7 Jan 2014 14:46:17 +0000 (14:46 -0000)]
Added expired handling to FieldInfo.
This avoids using free'd pointers (which leads to crash) when
assigning FieldInfos to global variables.
svn path=/trunk/; revision=54623
Guy Harris [Mon, 6 Jan 2014 23:07:48 +0000 (23:07 -0000)]
Expand a comment.
svn path=/trunk/; revision=54622
Guy Harris [Mon, 6 Jan 2014 23:02:32 +0000 (23:02 -0000)]
In col_fill_in() and col_fill_in_error(), use col_based_on_frame_data()
to determine whether to fill in the column from frame data or not.
svn path=/trunk/; revision=54621
Martin Mathieson [Mon, 6 Jan 2014 18:18:04 +0000 (18:18 -0000)]
Call deciphering and integrity checking appropriately for
SecurityModeCommand and SecurityModeResponse.
Also show when integrity has been checked and found to be correct.
svn path=/trunk/; revision=54620
Anders Broman [Mon, 6 Jan 2014 17:28:49 +0000 (17:28 -0000)]
Try to fix warning: cast discards '__attribute__((const))' qualifier from pointer target type .
svn path=/trunk/; revision=54619
Anders Broman [Mon, 6 Jan 2014 17:25:03 +0000 (17:25 -0000)]
Try to fix warning: initializer element is not computable at load time.
svn path=/trunk/; revision=54618
Anders Broman [Mon, 6 Jan 2014 17:12:54 +0000 (17:12 -0000)]
Fix a typo.
svn path=/trunk/; revision=54617
Anders Broman [Mon, 6 Jan 2014 15:30:01 +0000 (15:30 -0000)]
Try to fix warning: initializer element is not computable at load time.
svn path=/trunk/; revision=54616
Martin Mathieson [Mon, 6 Jan 2014 11:28:20 +0000 (11:28 -0000)]
Do EEA2 deciphering in-place, from Pascal
svn path=/trunk/; revision=54615
Anders Broman [Mon, 6 Jan 2014 08:30:53 +0000 (08:30 -0000)]
Omit assignment for not used types.
svn path=/trunk/; revision=54614
Michael Mann [Mon, 6 Jan 2014 00:44:41 +0000 (00:44 -0000)]
Base dissector for fileshark functionality. Intended as the equivalent of packet-frame for capture files. This is meant as a placeholder for now, so don't take any of the fields/data as being written in stone.
svn path=/trunk/; revision=54613
Alexis La Goutte [Sun, 5 Jan 2014 18:40:07 +0000 (18:40 -0000)]
Fix indent (use 4 spaces)
svn path=/trunk/; revision=54612
Alexis La Goutte [Sun, 5 Jan 2014 18:39:58 +0000 (18:39 -0000)]
Fix indent (use 4 spaces) and add modelines and remove trailing whitespace
svn path=/trunk/; revision=54611
Alexis La Goutte [Sun, 5 Jan 2014 18:39:50 +0000 (18:39 -0000)]
Fix indent (Use tabs) and add modelines
svn path=/trunk/; revision=54610
Alexis La Goutte [Sun, 5 Jan 2014 18:39:43 +0000 (18:39 -0000)]
Fix indent (use 4 spaces)
svn path=/trunk/; revision=54609
Alexis La Goutte [Sun, 5 Jan 2014 18:39:35 +0000 (18:39 -0000)]
Fix indent (4 spaces) and add modelines
svn path=/trunk/; revision=54608
Alexis La Goutte [Sun, 5 Jan 2014 18:16:29 +0000 (18:16 -0000)]
Fix build when use PortablesAPPS
svn path=/trunk/; revision=54607
Alexis La Goutte [Sun, 5 Jan 2014 18:16:22 +0000 (18:16 -0000)]
Fix indent (use 4 spaces)
svn path=/trunk/; revision=54606
Alexis La Goutte [Sun, 5 Jan 2014 18:16:14 +0000 (18:16 -0000)]
Enhance NSIS Windows installer (Wireshark Qt support)
* Add Radiobox to choose File Association (Wireshark GTK or Qt)
* Add Checkbox to choose Wireshark Qt icon will be installed (Startup, Desktop...)
* Fix unistaller (don't remove all icons...)
* ...
svn path=/trunk/; revision=54605
Alexis La Goutte [Sun, 5 Jan 2014 17:16:03 +0000 (17:16 -0000)]
Enhance NSIS Windows installer (Wireshark Qt support)
* Add Radiobox to choose File Association (Wireshark GTK or Qt)
* Add Checkbox to choose Wireshark Qt icon will be installed (Startup, Desktop...)
* Fix unistaller (don't remove all icons...)
* ...
svn path=/trunk/; revision=54604
Gerald Combs [Sun, 5 Jan 2014 15:03:44 +0000 (15:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2014-01-05]
svn path=/trunk/; revision=54601
Evan Huus [Sun, 5 Jan 2014 14:58:07 +0000 (14:58 -0000)]
Dissect the remainder of IEC104 integrated totals, including the binary counter
reading and the various flags.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9596
svn path=/trunk/; revision=54600
Martin Kaiser [Sun, 5 Jan 2014 12:17:52 +0000 (12:17 -0000)]
use a DVB string for the event text in the short evt descriptor
svn path=/trunk/; revision=54599
Evan Huus [Sun, 5 Jan 2014 00:47:24 +0000 (00:47 -0000)]
From Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9613
Don't use "rand" as a variable name, it shadows a global in recent MacOSX
stdlib.h
svn path=/trunk/; revision=54598
Anders Broman [Sat, 4 Jan 2014 23:41:22 +0000 (23:41 -0000)]
Fix a typo.
svn path=/trunk/; revision=54597
Anders Broman [Sat, 4 Jan 2014 17:48:15 +0000 (17:48 -0000)]
Omit assignment for not used types.
svn path=/trunk/; revision=54596
Bill Meier [Sat, 4 Jan 2014 17:45:12 +0000 (17:45 -0000)]
Minor: update 'Conversation' intro to include find_or_create_conversation
svn path=/trunk/; revision=54595
Bill Meier [Sat, 4 Jan 2014 17:29:20 +0000 (17:29 -0000)]
(Trivial) explicitely --> explicitly
svn path=/trunk/; revision=54594
Anders Broman [Sat, 4 Jan 2014 12:03:02 +0000 (12:03 -0000)]
Omit assignment for not used types.
svn path=/trunk/; revision=54593
Anders Broman [Sat, 4 Jan 2014 11:54:27 +0000 (11:54 -0000)]
Omit assignment for not used types.
svn path=/trunk/; revision=54592
Anders Broman [Sat, 4 Jan 2014 11:48:40 +0000 (11:48 -0000)]
Omit assignment for not used types.
svn path=/trunk/; revision=54591
Anders Broman [Sat, 4 Jan 2014 11:40:43 +0000 (11:40 -0000)]
Remove unused function and variable.
svn path=/trunk/; revision=54590
Anders Broman [Sat, 4 Jan 2014 11:34:46 +0000 (11:34 -0000)]
Omit assignment for not used types.
svn path=/trunk/; revision=54589
Anders Broman [Sat, 4 Jan 2014 11:26:30 +0000 (11:26 -0000)]
Omit assignment for not used types.
svn path=/trunk/; revision=54588
Anders Broman [Sat, 4 Jan 2014 11:24:33 +0000 (11:24 -0000)]
Omit assignment for not used types.
svn path=/trunk/; revision=54587
Anders Broman [Sat, 4 Jan 2014 10:06:04 +0000 (10:06 -0000)]
Add the rest of the NOKIA extensions.
svn path=/trunk/; revision=54586
Gerald Combs [Sat, 4 Jan 2014 01:13:01 +0000 (01:13 -0000)]
Add tooltips for the total number of streams.
svn path=/trunk/; revision=54585
Gerald Combs [Sat, 4 Jan 2014 01:00:19 +0000 (01:00 -0000)]
Add a note and commented-out definitions for Win flex-bison.
Alex Zhondin was kind enough to create a Chocolatey package for Win
flex-bison. Unfortunately a bug in Chocolatey's shell wrapper generator
keeps us from using it for the time being.
svn path=/trunk/; revision=54584
Evan Huus [Fri, 3 Jan 2014 15:09:24 +0000 (15:09 -0000)]
Add partial dissection of IEC104 M_IT_TB_1.
For https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9596
Also add modelines.
svn path=/trunk/; revision=54583
Bill Meier [Fri, 3 Jan 2014 14:44:16 +0000 (14:44 -0000)]
For -h option: output to stdout and exit(0) as per convention;
Do some whitespace changes;
Change editor-modelines tab-width & etc to 8.
svn path=/trunk/; revision=54582
Bill Meier [Fri, 3 Jan 2014 14:30:09 +0000 (14:30 -0000)]
For '-h' option: exit(0) as per convention;
No need to build a constant string on the stack at runtime;
Fix a typo;
Do some whitespace changes;
Change tab-width & etc to 8 in editor modelines.
svn path=/trunk/; revision=54581
Anders Broman [Fri, 3 Jan 2014 13:29:48 +0000 (13:29 -0000)]
Add a few more of the NOKIA extensions.
svn path=/trunk/; revision=54580
Pascal Quantin [Fri, 3 Jan 2014 12:21:26 +0000 (12:21 -0000)]
EIA2 is now functional
svn path=/trunk/; revision=54579
Alexis La Goutte [Fri, 3 Jan 2014 10:22:10 +0000 (10:22 -0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54578
Alexis La Goutte [Fri, 3 Jan 2014 10:21:56 +0000 (10:21 -0000)]
Update NEWS and Release note
Revert part of last commit about AUTHORS-SHORT in Windows....
svn path=/trunk/; revision=54577
Anders Broman [Fri, 3 Jan 2014 09:48:53 +0000 (09:48 -0000)]
Update with the removal of the ASN1 plugin and the GNM dissector.
svn path=/trunk/; revision=54576
Evan Huus [Fri, 3 Jan 2014 06:03:28 +0000 (06:03 -0000)]
Make sure we have a dissector table before calling dissector_try_uint_new. Fixes
a null-ptr deref found while fuzzing.
svn path=/trunk/; revision=54574
Jörg Mayer [Fri, 3 Jan 2014 00:40:21 +0000 (00:40 -0000)]
Check flags that might be supported by both C and C++ still
separately.
svn path=/trunk/; revision=54573
Jörg Mayer [Fri, 3 Jan 2014 00:14:46 +0000 (00:14 -0000)]
As discussed on wireshark-dev: follow autotools to use
-Wshorten-64-to-32 for c only
svn path=/trunk/; revision=54572
Jeff Morriss [Thu, 2 Jan 2014 20:48:33 +0000 (20:48 -0000)]
Don't try to build asn1/asn1/Makefile either (see r54561).
svn path=/trunk/; revision=54571
Guy Harris [Thu, 2 Jan 2014 20:47:21 +0000 (20:47 -0000)]
No seek-read routines use the length argument, so eliminate it from
wtap_seek_read().
svn path=/trunk/; revision=54570
Alexis La Goutte [Thu, 2 Jan 2014 20:21:09 +0000 (20:21 -0000)]
It is AUTHORS-SHORT.txt in Windows
Kept comment about dev release (and change logo)
Use the some order like Wireshark GTK (Authors before Folders)
svn path=/trunk/; revision=54569
Guy Harris [Thu, 2 Jan 2014 20:17:24 +0000 (20:17 -0000)]
Don't use the length argument to the seek-read routine; no other
seek-read routine does that.
Pass the length we just filled in to buffer_assure_space() in the
seek-read routine, and use that in the memcpy() as well.
svn path=/trunk/; revision=54568
Jeff Morriss [Thu, 2 Jan 2014 19:48:26 +0000 (19:48 -0000)]
Don't try to build asn1/gnm/Makefile (see r54561).
svn path=/trunk/; revision=54567
Jeff Morriss [Thu, 2 Jan 2014 19:47:03 +0000 (19:47 -0000)]
Don't try to distribute asn1.dll since we no longer build it.
svn path=/trunk/; revision=54566
Guy Harris [Thu, 2 Jan 2014 19:39:20 +0000 (19:39 -0000)]
Don't pass the wtap * to a routine if it's not needed.
svn path=/trunk/; revision=54565
Guy Harris [Thu, 2 Jan 2014 19:33:47 +0000 (19:33 -0000)]
Fill in the struct wtap_pkthdr in the seek-read routine.
svn path=/trunk/; revision=54564
Jeff Morriss [Thu, 2 Jan 2014 19:11:06 +0000 (19:11 -0000)]
Fix wireshark-qt startup coredump under autofoo and Windows: make cmake's
VERSION_* macros integers instead of numbers (and treat them as such in
ui/qt/about_dialog.cpp).
svn path=/trunk/; revision=54563
Jeff Morriss [Thu, 2 Jan 2014 18:32:58 +0000 (18:32 -0000)]
Set SVN properties.
svn path=/trunk/; revision=54562
Anders Broman [Thu, 2 Jan 2014 18:01:33 +0000 (18:01 -0000)]
Disabling building of the gnm dissector, I don't tink it was ever used.
svn path=/trunk/; revision=54561
Jörg Mayer [Thu, 2 Jan 2014 17:59:04 +0000 (17:59 -0000)]
Actually enable building filetap library.
NEWS changed
svn path=/trunk/; revision=54560
Anders Broman [Thu, 2 Jan 2014 17:47:34 +0000 (17:47 -0000)]
Stop building and distributing the asn1 plugin. I bleleve it to be obsolete.
svn path=/trunk/; revision=54559
Anders Broman [Thu, 2 Jan 2014 17:42:02 +0000 (17:42 -0000)]
Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54558
Alexis La Goutte [Thu, 2 Jan 2014 17:04:10 +0000 (17:04 -0000)]
Add About window for Wireshark Qt
svn path=/trunk/; revision=54557
Alexis La Goutte [Thu, 2 Jan 2014 16:52:56 +0000 (16:52 -0000)]
Fix icon in top of Wireshark Qt main window
svn path=/trunk/; revision=54556
Bill Meier [Thu, 2 Jan 2014 15:41:45 +0000 (15:41 -0000)]
For getopt() arg processing:
- Use exit(0) for -h option as per convention;
For g_option...() arg processing (when USE_GOPTION is set):
- Fix bug: 'capinfos x' doesn't print any info about x;
(bug introduced in SVN #48481);
- Use stderr for error messages related to cmd-line arg parsing;
svn path=/trunk/; revision=54555
Jörg Mayer [Thu, 2 Jan 2014 15:17:14 +0000 (15:17 -0000)]
rename filetap/file_wrappers.[hc] -> filetap/ft_file_wrappers.[hc]
to avoid colliding include file names with wiretap/file_wrappers.h
svn path=/trunk/; revision=54554
Alexis La Goutte [Thu, 2 Jan 2014 11:46:58 +0000 (11:46 -0000)]
Fix indent always use tab
svn path=/trunk/; revision=54553
Anders Broman [Thu, 2 Jan 2014 11:27:10 +0000 (11:27 -0000)]
Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54552
Guy Harris [Thu, 2 Jan 2014 09:23:45 +0000 (09:23 -0000)]
Have a routine that reads and processes the record header, and use it in
both the read and seek-read routines.
Use the packet length read from the packet header when reading packets
randomly.
svn path=/trunk/; revision=54549
Guy Harris [Thu, 2 Jan 2014 02:18:04 +0000 (02:18 -0000)]
Process the packet header and data in common code, shared by the read
and seek-read routines.
svn path=/trunk/; revision=54548
Guy Harris [Thu, 2 Jan 2014 02:16:22 +0000 (02:16 -0000)]
Read the packet header in the seek-read routines as well as the read
routines.
svn path=/trunk/; revision=54547
Guy Harris [Wed, 1 Jan 2014 23:22:53 +0000 (23:22 -0000)]
If the uncompression buffers are empty, they have no data; set the count
of bytes in them to 0, as there's no data in them, and set the offset in
that buffer of the stream's current position, to 0, as we're currently
at the beginning of the file in both streams.
This fixes some tricky-to-reproduce errors (which show up only if the
ngsniffer_t structure is allocated from data that's been allocated,
written to in those variables, and freed).
#BACKPORT 1.8, 1.10
svn path=/trunk/; revision=54544
Guy Harris [Wed, 1 Jan 2014 23:19:17 +0000 (23:19 -0000)]
Back out r54523 - more work is needed on it, and some testing found an
unrelated uninitialized-data bug that I want to fix in the next commit,
and then backport.
svn path=/trunk/; revision=54543
Bill Meier [Wed, 1 Jan 2014 18:14:16 +0000 (18:14 -0000)]
Add svn:keywords property
svn path=/trunk/; revision=54542
Bill Meier [Wed, 1 Jan 2014 18:11:38 +0000 (18:11 -0000)]
Remove incorrect property 'svn:keyword'
svn path=/trunk/; revision=54541
Bill Meier [Wed, 1 Jan 2014 18:08:30 +0000 (18:08 -0000)]
Change incorrect property 'keywords' to 'svn:keywords'
svn path=/trunk/; revision=54540
Bill Meier [Wed, 1 Jan 2014 18:02:11 +0000 (18:02 -0000)]
Remove incorrect property 'svn:kywords'
svn path=/trunk/; revision=54539
Bill Meier [Wed, 1 Jan 2014 17:58:19 +0000 (17:58 -0000)]
Remove incorrect property 'eol-style'
svn path=/trunk/; revision=54538
Bill Meier [Wed, 1 Jan 2014 17:54:44 +0000 (17:54 -0000)]
Fix property name: svn:eol_style ==> svn:eol-style
svn path=/trunk/; revision=54537
Michael Mann [Wed, 1 Jan 2014 14:55:20 +0000 (14:55 -0000)]
Fix compile issue
svn path=/trunk/; revision=54536
Pascal Quantin [Wed, 1 Jan 2014 14:51:58 +0000 (14:51 -0000)]
Try to pacify OSX-10.6-x64 buildbot
svn path=/trunk/; revision=54535
Pascal Quantin [Wed, 1 Jan 2014 14:33:19 +0000 (14:33 -0000)]
Add proto_tree_add_ts_23_038_7bits_item() / tvb_get_ts_23_038_7bits_string() functions and update dissectors to use it.
Remove gsm_sms_char_7bit_unpack() / gsm_sms_chars_to_utf8() functions.
Update documentation a bit.
svn path=/trunk/; revision=54534
Pascal Quantin [Wed, 1 Jan 2014 14:29:16 +0000 (14:29 -0000)]
wimax_compact_ulmap_ie_decoder() is used outside of wimax_compact_ulmap_ie_decoder.c
svn path=/trunk/; revision=54533
Alexis La Goutte [Wed, 1 Jan 2014 14:12:38 +0000 (14:12 -0000)]
Add extern C for init_wslua (for future use in Wireshark Qt)
svn path=/trunk/; revision=54532