metze/wireshark/wip.git
11 years agoProfiles → Global Profiles.
Gerald Combs [Wed, 1 May 2013 22:13:51 +0000 (22:13 -0000)]
Profiles → Global Profiles.

svn path=/trunk/; revision=49124

11 years agoInstall and uninstall our global profiles.
Gerald Combs [Wed, 1 May 2013 22:06:49 +0000 (22:06 -0000)]
Install and uninstall our global profiles.

svn path=/trunk/; revision=49123

11 years agoInstall the new global profiles and add them to the distribution.
Gerald Combs [Wed, 1 May 2013 21:53:57 +0000 (21:53 -0000)]
Install the new global profiles and add them to the distribution.

svn path=/trunk/; revision=49122

11 years agoMake the python scripts work on systems where python is a link
Jörg Mayer [Wed, 1 May 2013 21:50:44 +0000 (21:50 -0000)]
Make the python scripts work on systems where python is a link
to python3: explicitely call the python2 binary.

svn path=/trunk/; revision=49121

11 years agoFix warning.
Guy Harris [Wed, 1 May 2013 21:15:47 +0000 (21:15 -0000)]
Fix warning.

svn path=/trunk/; revision=49118

11 years agoRemove some global variables in favor of private_data member of asn1_ctx_t. Bug...
Michael Mann [Wed, 1 May 2013 20:54:31 +0000 (20:54 -0000)]
Remove some global variables in favor of private_data member of asn1_ctx_t.  Bug 7060 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7060).  This should (mostly) passify the bug, but it appears like this could be done with a lot more ASN.1 dissectors.

svn path=/trunk/; revision=49117

11 years agoAdd a "profiles" directory. Add a Bluetooth global profile with the
Gerald Combs [Wed, 1 May 2013 20:31:50 +0000 (20:31 -0000)]
Add a "profiles" directory. Add a Bluetooth global profile with the
current default+Bluetooth colors and a Classic global profile with the
old 1.8 colors. Remove the Bluetooth rules from the default profile.

svn path=/trunk/; revision=49116

11 years agoWhitespace fixes: Indented lines should not start with
Jörg Mayer [Wed, 1 May 2013 19:51:46 +0000 (19:51 -0000)]
Whitespace fixes: Indented lines should not start with
spaces followed by tabs.

svn path=/trunk/; revision=49115

11 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8622 :
Jeff Morriss [Wed, 1 May 2013 19:42:28 +0000 (19:42 -0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8622 :

hsrp2.md5_auth_data is added to the tree with a length of 16 so declare it as
FT_BYTES instead of FT_UINT32 (using the latter causes an assertion in
trunk-1.8 and an expert info in trunk and trunk-1.10).

svn path=/trunk/; revision=49114

11 years agoDiederik de Groot <dkgroot@talon.nl>
Jörg Mayer [Wed, 1 May 2013 19:16:02 +0000 (19:16 -0000)]
Diederik de Groot <dkgroot@talon.nl>

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

Further enhancements to packet-skinny.c, change cast. filters
to skinny. filters.
While I'm not sure whether that this is really correct, we don't
have any sample capture to verify whether the old solution really
worked. At least that way checkfiltername.pl doesn't complain
any more ;-)

Me: Tiny whitespace fixes.

svn path=/trunk/; revision=49113

11 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8618 :
Jeff Morriss [Wed, 1 May 2013 14:19:10 +0000 (14:19 -0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8618 :

Allow port 0 in RSA Key List.

(This has been broken since r36875.)

svn path=/trunk/; revision=49111

11 years agoRemove cmake/modules/FindPYTHON.cmake from the source distribution.
Jeff Morriss [Wed, 1 May 2013 13:22:25 +0000 (13:22 -0000)]
Remove cmake/modules/FindPYTHON.cmake from the source distribution.

svn path=/trunk/; revision=49109

11 years agoSort the list of packages to make it easier to check results.
Jörg Mayer [Wed, 1 May 2013 10:40:12 +0000 (10:40 -0000)]
Sort the list of packages to make it easier to check results.

svn path=/trunk/; revision=49107

11 years agoPrint the version of the include files that will be used.
Jörg Mayer [Wed, 1 May 2013 10:34:15 +0000 (10:34 -0000)]
Print the version of the include files that will be used.

svn path=/trunk/; revision=49106

11 years ago- Fix logic for finding packages with differing Find-name
Jörg Mayer [Wed, 1 May 2013 09:20:59 +0000 (09:20 -0000)]
- Fix logic for finding packages with differing Find-name
  and returned variable-names:
  Old: Provide the var name and adapt the find-name
  New: Provide the find-name and adapt the var name
  This allows for different packages with the same var name.
  This chage effects Qt4 and PythonInterp.
- Replace self created FindPYTHON with cmake provided
  FindPythonLibs.

svn path=/trunk/; revision=49105

11 years agoMake C12.22 work over UDP.
Anders Broman [Wed, 1 May 2013 08:34:40 +0000 (08:34 -0000)]
Make C12.22 work over UDP.

svn path=/trunk/; revision=49104

11 years agoRemove singly-linked list from the wmem TODO list. Now that it has append
Evan Huus [Wed, 1 May 2013 01:09:57 +0000 (01:09 -0000)]
Remove singly-linked list from the wmem TODO list. Now that it has append
all of the really important stuff is there, and emem doesn't provide it at all
so it's not blocking migration.

svn path=/trunk/; revision=49103

11 years agoOur scripts do ont work with python3, so only pick up a python2
Jörg Mayer [Wed, 1 May 2013 00:53:59 +0000 (00:53 -0000)]
Our scripts do ont work with python3, so only pick up a python2
executable.

Reported on #wireshark by McEnroe

svn path=/trunk/; revision=49102

11 years agoFollow-up to r49055 as noted on
Evan Huus [Tue, 30 Apr 2013 23:19:47 +0000 (23:19 -0000)]
Follow-up to r49055 as noted on
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7359

The BER integer dissection routines take an hf_id, but that can be -1.
Only fetch the type (to check signedness) if hf_id >= 0, as otherwise this
causes a dissector bug. Default to signed if given no hf_id - I don't know
whether this should be unsigned or not, but the old behaviour was that
everything was signed so it's not a regression at least.

svn path=/trunk/; revision=49101

11 years agoAdd Diederik de Groot to the AUTHORS list
Jörg Mayer [Tue, 30 Apr 2013 22:06:33 +0000 (22:06 -0000)]
Add Diederik de Groot to the AUTHORS list

svn path=/trunk/; revision=49100

11 years agoDiederik de Groot <dkgroot@talon.nl>
Jörg Mayer [Tue, 30 Apr 2013 21:53:39 +0000 (21:53 -0000)]
Diederik de Groot <dkgroot@talon.nl>
via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8616

Update Skinny Dissection Code (CM7.1 + / SPCP Message)

Me:
- Remove some trailing whitespace
- Numerically sort deviceTypes and replace older values with new ones
- Reenable the return FALSE statement in the heuristics - it works for me.

svn path=/trunk/; revision=49099

11 years agoAdd 'dtds' and 'fix' directories to the checklicense whitelist, they don't
Evan Huus [Tue, 30 Apr 2013 01:34:19 +0000 (01:34 -0000)]
Add 'dtds' and 'fix' directories to the checklicense whitelist, they don't
appear to be things we have licensing power over (IANAL).

svn path=/trunk/; revision=49095

11 years agoIn part from Raúl Pérez Clavero via https://bugs.wireshark.org/bugzilla/show_bug...
Evan Huus [Tue, 30 Apr 2013 01:23:10 +0000 (01:23 -0000)]
In part from Raúl Pérez Clavero via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8275

Implement wmem_slist_append().

svn path=/trunk/; revision=49094

11 years agoConvert 'Old GFID' and 'New GFID' to FT_GUID type.
Michael Mann [Tue, 30 Apr 2013 00:55:18 +0000 (00:55 -0000)]
Convert 'Old GFID' and 'New GFID' to FT_GUID type.

From Niels de Vos, Bug 8612 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8612)

svn path=/trunk/; revision=49093

11 years agoA few more doxygen fix-ups.
Evan Huus [Tue, 30 Apr 2013 00:55:03 +0000 (00:55 -0000)]
A few more doxygen fix-ups.

svn path=/trunk/; revision=49092

11 years agoMove the contents of wsar_html/core to wsar_html. Create tag files for
Gerald Combs [Tue, 30 Apr 2013 00:27:02 +0000 (00:27 -0000)]
Move the contents of wsar_html/core to wsar_html. Create tag files for
core, epan, and ui, and link them to each other to varying degrees. This
seems to be the best way to organize our documentation. The alternative
is to switch to a single doxygen.cfg and manually add files to different
groups or sections.

Add a wireshark.dox file which contains markup for the main page. Add
.dox and .txt to svnadd. Clean up our tag files. Force wsar_html to
rebuild each time.

svn path=/trunk/; revision=49091

11 years agoState that we don't support U3 any more.
Gerald Combs [Mon, 29 Apr 2013 23:08:31 +0000 (23:08 -0000)]
State that we don't support U3 any more.

svn path=/trunk/; revision=49090

11 years agoDarken and saturate the "trouble" backgrounds a bit.
Gerald Combs [Mon, 29 Apr 2013 17:13:24 +0000 (17:13 -0000)]
Darken and saturate the "trouble" backgrounds a bit.

svn path=/trunk/; revision=49084

11 years agoSpecify to CppCheck that Wireshark code is C89, not the default C11.
Evan Huus [Sun, 28 Apr 2013 23:30:29 +0000 (23:30 -0000)]
Specify to CppCheck that Wireshark code is C89, not the default C11.

svn path=/trunk/; revision=49083

11 years ago[Automatic manuf, services and enterprise-numbers update for 2013-04-28]
Gerald Combs [Sun, 28 Apr 2013 14:03:34 +0000 (14:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-04-28]

svn path=/trunk/; revision=49079

11 years agoFix suspected copy-and-pasteo.
Guy Harris [Sun, 28 Apr 2013 01:09:00 +0000 (01:09 -0000)]
Fix suspected copy-and-pasteo.

svn path=/trunk/; revision=49078

11 years agoAdd CppCheck to the list of things to run before submitting code for review.
Evan Huus [Sat, 27 Apr 2013 23:11:06 +0000 (23:11 -0000)]
Add CppCheck to the list of things to run before submitting code for review.

svn path=/trunk/; revision=49077

11 years agoSilence a false-positive warning from older GCCs:
Evan Huus [Sat, 27 Apr 2013 15:00:52 +0000 (15:00 -0000)]
Silence a false-positive warning from older GCCs:
    'acetype4' may be used uninitialized in this function

svn path=/trunk/; revision=49076

11 years agoWhen fuzzing with valgrind and running without -T, run with -v so that the
Evan Huus [Sat, 27 Apr 2013 14:03:45 +0000 (14:03 -0000)]
When fuzzing with valgrind and running without -T, run with -v so that the
argument string is non-empty. Perhaps this will fix the fuzz-bot which fails
to run with the empty argument string...

svn path=/trunk/; revision=49075

11 years agoFrom Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8605
Evan Huus [Sat, 27 Apr 2013 13:59:46 +0000 (13:59 -0000)]
From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8605

Numerous improvements to NFS ACL/ACE dissection. For a complete list see
comment #11 of the bug.

From me:
- fix an infinite loop caught by fuzzing
- fix an out-of-bounds memory access caught by valgrind
- add missing {0,NULL} terminator to value_string array

svn path=/trunk/; revision=49074

11 years agoremove unnecessary if (tree) checks
Martin Kaiser [Sat, 27 Apr 2013 13:06:28 +0000 (13:06 -0000)]
remove unnecessary if (tree) checks
I hope this prevents bugs like the one fixed in r48917

svn path=/trunk/; revision=49073

11 years agofree the linkname allocated by g_strdup()
Martin Kaiser [Sat, 27 Apr 2013 12:35:30 +0000 (12:35 -0000)]
free the linkname allocated by g_strdup()
set linkname to unknown for interfaces without a linkname (e.g.  pipes)
remove "this should not happen" warnings

svn path=/trunk/; revision=49072

11 years agowhen a named pipe is added to the interfaces list, it has no linktype
Martin Kaiser [Sat, 27 Apr 2013 09:55:46 +0000 (09:55 -0000)]
when a named pipe is added to the interfaces list, it has no linktype
this triggered the g_assert(linktype) in create_and_fill_model()

the assert is not necessary as both gtk_list_store_set() and g_free()
can handle NULL parameters

remove the assert and add set linktype to "unknown" if the interface
has no linktype

svn path=/trunk/; revision=49071

11 years agoFix a comment (the "it worked but didn't pop up a window" conclusion
Guy Harris [Sat, 27 Apr 2013 03:51:40 +0000 (03:51 -0000)]
Fix a comment (the "it worked but didn't pop up a window" conclusion
came from a bad test).

svn path=/trunk/; revision=49070

11 years agoUpdate comments.
Guy Harris [Sat, 27 Apr 2013 02:57:16 +0000 (02:57 -0000)]
Update comments.

svn path=/trunk/; revision=49069

11 years agoWmem string-buffer improvements:
Evan Huus [Fri, 26 Apr 2013 21:30:24 +0000 (21:30 -0000)]
Wmem string-buffer improvements:
- better tests
- fix a bug caught by the better tests
- implement append_c and append_unichar, with tests

Wmem string-buffers now have feature parity with their emem equivalents, so
remove them from the TODO list.

svn path=/trunk/; revision=49060

11 years agoUpdate the capture start, stop, and restart icons and development badge
Gerald Combs [Fri, 26 Apr 2013 21:10:35 +0000 (21:10 -0000)]
Update the capture start, stop, and restart icons and development badge
with enhanced versions from Elliott.

Switch the interface configuration icon to the "gear" version. This
matches the gear in the capture icon.

svn path=/trunk/; revision=49059

11 years agoSet svn:mime-type
Jeff Morriss [Fri, 26 Apr 2013 20:30:04 +0000 (20:30 -0000)]
Set svn:mime-type

svn path=/trunk/; revision=49057

11 years agoTry to determine the repository URL automatically.
Gerald Combs [Fri, 26 Apr 2013 19:50:43 +0000 (19:50 -0000)]
Try to determine the repository URL automatically.

svn path=/trunk/; revision=49056

11 years agoFrom me: only sign-extend BER integers if the field is actually signed
Evan Huus [Fri, 26 Apr 2013 19:23:36 +0000 (19:23 -0000)]
From me: only sign-extend BER integers if the field is actually signed

From Guy: override two fields in the GOOSE ASN.1 dissector to be unsigned

Together these fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8250

svn path=/trunk/; revision=49055

11 years agoFix a whole bunch of doxygen warnings, mostly typos or renamed parameters.
Evan Huus [Fri, 26 Apr 2013 18:28:21 +0000 (18:28 -0000)]
Fix a whole bunch of doxygen warnings, mostly typos or renamed parameters.

svn path=/trunk/; revision=49053

11 years agoBuildbot (via Twisted) sets a restrictive umask. Unset it before we run
Gerald Combs [Fri, 26 Apr 2013 18:23:05 +0000 (18:23 -0000)]
Buildbot (via Twisted) sets a restrictive umask. Unset it before we run
Doxygen.

svn path=/trunk/; revision=49052

11 years agoAdd some Doxygen checks.
Gerald Combs [Fri, 26 Apr 2013 17:49:00 +0000 (17:49 -0000)]
Add some Doxygen checks.

svn path=/trunk/; revision=49051

11 years agoSet svn:eol-style and svn:keywords
Jeff Morriss [Fri, 26 Apr 2013 15:28:30 +0000 (15:28 -0000)]
Set svn:eol-style and svn:keywords

svn path=/trunk/; revision=49049

11 years agoFix up indentation
Jeff Morriss [Fri, 26 Apr 2013 13:53:53 +0000 (13:53 -0000)]
Fix up indentation

svn path=/trunk/; revision=49048

11 years agoWork around a bug in a Microsoft security fix.
Guy Harris [Fri, 26 Apr 2013 04:42:20 +0000 (04:42 -0000)]
Work around a bug in a Microsoft security fix.

svn path=/trunk/; revision=49046

11 years agoGet rid of leftover debugging variable.
Guy Harris [Fri, 26 Apr 2013 01:01:32 +0000 (01:01 -0000)]
Get rid of leftover debugging variable.

svn path=/trunk/; revision=49045

11 years agoCheck, for each of the standard handles, whether they need to be
Guy Harris [Fri, 26 Apr 2013 00:50:21 +0000 (00:50 -0000)]
Check, for each of the standard handles, whether they need to be
redirected to a console.  Only if at least one of them needs to be
redirected to we create a console, and don't redirect them if they don't
need to be redirected.

This makes redirection of the standard output of, for example,
"wireshark -D" work; we don't redirect it out from under the shell.

svn path=/trunk/; revision=49044

11 years agoUpdate the main, epan, and ui Doxygen configuration files. Change the
Gerald Combs [Fri, 26 Apr 2013 00:07:42 +0000 (00:07 -0000)]
Update the main, epan, and ui Doxygen configuration files. Change the
output directory to wsar_html (Wireshark API Reference HTML) to match
the Docbook naming convention. In each doxygen.cfg.in move the
doxygen_global.cfg to the top of the file so that our local definitions
don't get clobbered. Add makefile targets for wsar_html and wsar-zip.

svn path=/trunk/; revision=49043

11 years agoAdd Qt5 build support with cmake. Just do cmake ... -DENABLE_QT5=ON ...
Jörg Mayer [Thu, 25 Apr 2013 23:04:19 +0000 (23:04 -0000)]
Add Qt5 build support with cmake. Just do cmake ... -DENABLE_QT5=ON ...

svn path=/trunk/; revision=49042

11 years agoAnnotate wmem functions for better compiler warnings and optimization.
Evan Huus [Thu, 25 Apr 2013 22:54:36 +0000 (22:54 -0000)]
Annotate wmem functions for better compiler warnings and optimization.

svn path=/trunk/; revision=49041

11 years agoSummarize the API listing in the wmem README. Doxygen in the header files will
Evan Huus [Thu, 25 Apr 2013 22:29:48 +0000 (22:29 -0000)]
Summarize the API listing in the wmem README. Doxygen in the header files will
be much easier to keep in sync with the actual code.

svn path=/trunk/; revision=49040

11 years agoFix a warning: sparkline_delegate.h does not contain a Q_OBJECT
Jörg Mayer [Thu, 25 Apr 2013 22:11:40 +0000 (22:11 -0000)]
Fix a warning: sparkline_delegate.h does not contain a Q_OBJECT

svn path=/trunk/; revision=49039

11 years agoAdd GTK3_DEFINITIONS to the compiler flag when building with gtk3
Jörg Mayer [Thu, 25 Apr 2013 21:35:54 +0000 (21:35 -0000)]
Add GTK3_DEFINITIONS to the compiler flag when building with gtk3

svn path=/trunk/; revision=49038

11 years agoGenerating the realease notes is not yet done.
Jörg Mayer [Thu, 25 Apr 2013 21:34:22 +0000 (21:34 -0000)]
Generating the realease notes is not yet done.

svn path=/trunk/; revision=49037

11 years agoUpdate QtShark.pro for Qt5, hopefully without breaking Qt4. Enable the
Gerald Combs [Thu, 25 Apr 2013 21:08:56 +0000 (21:08 -0000)]
Update QtShark.pro for Qt5, hopefully without breaking Qt4. Enable the
startup blur on OS X for Qt >= 5.

svn path=/trunk/; revision=49036

11 years agoFlag as malformed expert info if we see padding subheaders at start and
Martin Mathieson [Thu, 25 Apr 2013 21:07:32 +0000 (21:07 -0000)]
Flag as malformed expert info if we see padding subheaders at start and
end of subheader list.

svn path=/trunk/; revision=49035

11 years agoFrom Mathias Guettler
Martin Kaiser [Thu, 25 Apr 2013 20:54:56 +0000 (20:54 -0000)]
From Mathias Guettler
correct value for "ATN Systems Management No Preference"

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

svn path=/trunk/; revision=49034

11 years agoAdd an AVP.
Anders Broman [Thu, 25 Apr 2013 17:21:34 +0000 (17:21 -0000)]
Add an AVP.

svn path=/trunk/; revision=49033

11 years agoEnhance dissection of feedback
Pascal Quantin [Thu, 25 Apr 2013 15:21:48 +0000 (15:21 -0000)]
Enhance dissection of feedback

svn path=/trunk/; revision=49032

11 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8611
Evan Huus [Thu, 25 Apr 2013 13:57:02 +0000 (13:57 -0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8611

svn path=/trunk/; revision=49030

11 years agoNote the removal of the left-handed settings and how to get the
Jörg Mayer [Thu, 25 Apr 2013 08:15:22 +0000 (08:15 -0000)]
Note the removal of the left-handed settings and how to get the
behavior back via gtk-settings.

svn path=/trunk/; revision=49026

11 years agoSend the output of the -D and -L options to the standard output rather
Guy Harris [Thu, 25 Apr 2013 05:47:11 +0000 (05:47 -0000)]
Send the output of the -D and -L options to the standard output rather
than the standard error.

In Wireshark on Windows, create a console before doing so and destroy it
before exiting.  Don't do that in TShark or dumpcap, as those are
console-mode programs on Windows.

This should fix bug 8609 and still allow "wireshark -D" and "wireshark
-L" to work when the standard output isn't redirected.

svn path=/trunk/; revision=49025

11 years agoTry to please the OSX buildbots
Pascal Quantin [Thu, 25 Apr 2013 05:24:07 +0000 (05:24 -0000)]
Try to please the OSX buildbots

svn path=/trunk/; revision=49024

11 years agoConvert a few proto_tree_add_text to proto_tree_add_items. The dissector was origina...
Michael Mann [Wed, 24 Apr 2013 23:20:24 +0000 (23:20 -0000)]
Convert a few proto_tree_add_text to proto_tree_add_items.  The dissector was originally under the 50% mark that checkAPIs.pl like, but subsequent patches pushed it over the limit, so I thought I'd knock it back down.

svn path=/trunk/; revision=49023

11 years agoconvert some proto_tree_add_texts into expert_add_info_format. Didn't quite make...
Michael Mann [Wed, 24 Apr 2013 23:17:44 +0000 (23:17 -0000)]
convert some proto_tree_add_texts into expert_add_info_format.  Didn't quite make checkAPIs.pl happy, but given the nature of the dissector (mostly raw text), I'm not sure it can hit the 50% ratio.

svn path=/trunk/; revision=49022

11 years agoAdd a few IP filterable fields to make checkAPIs.pl happy. It appears that "enumerat...
Michael Mann [Wed, 24 Apr 2013 23:15:38 +0000 (23:15 -0000)]
Add a few IP filterable fields to make checkAPIs.pl happy.  It appears that "enumerated filter fields" are necessary, but that allows them to shirk the check* tools to possibly find unused hfs.

svn path=/trunk/; revision=49021

11 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8610 :
Pascal Quantin [Wed, 24 Apr 2013 21:25:30 +0000 (21:25 -0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8610 :
Ensure that tap is called after full dissection, even in case of exception

svn path=/trunk/; revision=49019

11 years agoAdd China Telecom AVP:s to Windows installer
Pascal Quantin [Wed, 24 Apr 2013 18:04:33 +0000 (18:04 -0000)]
Add China Telecom AVP:s to Windows installer

svn path=/trunk/; revision=49018

11 years agoAdd a basic file for China Telecom AVP:s.
Anders Broman [Wed, 24 Apr 2013 16:51:57 +0000 (16:51 -0000)]
Add a basic file for China Telecom AVP:s.

svn path=/trunk/; revision=49017

11 years agoFix format string typo causing
Evan Huus [Wed, 24 Apr 2013 14:05:30 +0000 (14:05 -0000)]
Fix format string typo causing
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8607

svn path=/trunk/; revision=49015

11 years agodumpabi: This would create the directories in the sourcedir instead
Jörg Mayer [Wed, 24 Apr 2013 12:57:56 +0000 (12:57 -0000)]
dumpabi: This would create the directories in the sourcedir instead
  of the binary dir. Fixed that.
  NOTE: It fails with and without this patch for out of tree builds:

jmayer@egg:~/work/wireshark/svn/build/qt-gtk3> make dumpabi
[  1%] Built target wsutil
[  1%] Generating libwsutil.abi.tar.gz
ERROR: can't find modules
cp: cannot stat `abi_dumps/libwsutil/libwsutil_*': No such file or directory
make[3]: *** [wsutil/libwsutil.abi.tar.gz] Error 1
make[2]: *** [wsutil/CMakeFiles/dumpabi-libwsutil.dir/all] Error 2
make[1]: *** [CMakeFiles/dumpabi.dir/rule] Error 2
make: *** [dumpabi] Error 2
jmayer@egg:~/work/wireshark/svn/build/qt-gtk3>

svn path=/trunk/; revision=49014

11 years agoThe porting guide for Qt5 requires that Q_OS_ be used instead
Jörg Mayer [Wed, 24 Apr 2013 11:07:25 +0000 (11:07 -0000)]
The porting guide for Qt5 requires that Q_OS_ be used instead
of Q_WS_ in Qt4 projects
See:
http://qt-project.org/doc/qt-5.0/qtdoc/portingguide.html

svn path=/trunk/; revision=49013

11 years agoAdd truncate function to wmem strbuf.
Evan Huus [Wed, 24 Apr 2013 00:11:57 +0000 (00:11 -0000)]
Add truncate function to wmem strbuf.

svn path=/trunk/; revision=49010

11 years agoNow that the test suite is done and most of the common functions are
Evan Huus [Wed, 24 Apr 2013 00:01:45 +0000 (00:01 -0000)]
Now that the test suite is done and most of the common functions are
implemented, start replacing emem with wmem in dissectors.

Also remove emem.h include from a few files that didn't actually need it.

More to come once in hopefully large batches once I figure out the
appropriate regexes.

svn path=/trunk/; revision=49009

11 years agoRevert commits
Jörg Mayer [Tue, 23 Apr 2013 23:09:34 +0000 (23:09 -0000)]
Revert commits

------------------------------------------------------------------------
r47064 | cmaynard | 2013-01-14 16:39:38 +0100 (Mo, 14 Jan 2013) | 2 lines

packet-ncp2222.c -> dissectors/packet-ncp2222.c

------------------------------------------------------------------------
r47078 | gerald | 2013-01-14 21:05:24 +0100 (Mo, 14 Jan 2013) | 2 lines

Put packet-ncp2222.c in epan/dissectors. This matches Makefile.am's behavior.

------------------------------------------------------------------------

The first commit tried to make cmake behavior mimic autofoo behavior while
it should be the other way round: out of tree builds fail with packet-ncp2222.c
generation with autofoo.

The second commit just fixed the first one.

svn path=/trunk/; revision=49008

11 years agoStub cmake support for generating the asn1 dissectors.
Jörg Mayer [Tue, 23 Apr 2013 23:05:33 +0000 (23:05 -0000)]
Stub cmake support for generating the asn1 dissectors.
It doesn't do anything yet, it is just to make svn status
readable again.

svn path=/trunk/; revision=49007

11 years agoAdd a quick check for a first printable character to avoid a more expensive
Martin Mathieson [Tue, 23 Apr 2013 22:44:23 +0000 (22:44 -0000)]
Add a quick check for a first printable character to avoid a more expensive
check of the whole first line. This gets called a lot as a heuristic
dissector.

svn path=/trunk/; revision=49006

11 years agoTurn some preferences on by default. Won't affect info column.
Martin Mathieson [Tue, 23 Apr 2013 22:33:53 +0000 (22:33 -0000)]
Turn some preferences on by default. Won't affect info column.

svn path=/trunk/; revision=49005

11 years agoAdd two tools useful for package maintainers:
Gerald Combs [Tue, 23 Apr 2013 19:21:18 +0000 (19:21 -0000)]
Add two tools useful for package maintainers:

backport-rev attempts to merge a revision from the trunk in the current
directory (presumably one of the release branches).

gen-bugnote fetches a bug title from bugs.wireshark.org and formats it
for inclusion in the release notes.

svn path=/trunk/; revision=49004

11 years agooops, missed a linebreak
Martin Kaiser [Tue, 23 Apr 2013 18:53:07 +0000 (18:53 -0000)]
oops, missed a linebreak

svn path=/trunk/; revision=49003

11 years agoFrom Mathias Guettler
Martin Kaiser [Tue, 23 Apr 2013 18:46:08 +0000 (18:46 -0000)]
From Mathias Guettler
dissector for ISO 10747 Inter Domain Routing Protocol
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8562

from me:
check for negative return value of tvb_reported_length_remaining()
remove unused hf entries
add modelines
don't initialise variables unless it's necessary
make idrp a new-style dissector

svn path=/trunk/; revision=49002

11 years agoInstall QtShark by default.
Gerald Combs [Tue, 23 Apr 2013 18:32:11 +0000 (18:32 -0000)]
Install QtShark by default.

svn path=/trunk/; revision=49001

11 years agoAdd a link to the latest CRT redistributables.
Gerald Combs [Tue, 23 Apr 2013 17:40:27 +0000 (17:40 -0000)]
Add a link to the latest CRT redistributables.

svn path=/trunk/; revision=49000

11 years agoreformat, add editor modelines
Martin Kaiser [Tue, 23 Apr 2013 17:19:51 +0000 (17:19 -0000)]
reformat, add editor modelines

svn path=/trunk/; revision=48998

11 years agoAdd curr_layer_num which can be used to keep track of multiple occurances of the...
Anders Broman [Tue, 23 Apr 2013 17:17:56 +0000 (17:17 -0000)]
Add curr_layer_num which can be used to keep track of multiple occurances of the same protocol in a frame.

svn path=/trunk/; revision=48997

11 years agonlpid.h requires value_string.h
Martin Kaiser [Tue, 23 Apr 2013 16:59:09 +0000 (16:59 -0000)]
nlpid.h requires value_string.h

svn path=/trunk/; revision=48996

11 years agoRestore a lost hf def.
Anders Broman [Tue, 23 Apr 2013 16:59:07 +0000 (16:59 -0000)]
Restore a lost hf def.

svn path=/trunk/; revision=48995

11 years agoWhen calling IP and Ipv6 dissectors, they may reduce the new tvb we pass in.
Martin Mathieson [Tue, 23 Apr 2013 02:55:44 +0000 (02:55 -0000)]
When calling IP and Ipv6 dissectors, they may reduce the new tvb we pass in.
MPLS needs to similarly shrink its own tvb so its caller can tell that
there were bytes left over (e.g. ethernet trailer).

svn path=/trunk/; revision=48994

11 years agotiny whitespace change
Jörg Mayer [Mon, 22 Apr 2013 23:04:22 +0000 (23:04 -0000)]
tiny whitespace change

svn path=/trunk/; revision=48993

11 years agoMimic autoconf behavior and enable -Wc++-compat by default.
Jörg Mayer [Mon, 22 Apr 2013 22:32:03 +0000 (22:32 -0000)]
Mimic autoconf behavior and enable -Wc++-compat by default.

svn path=/trunk/; revision=48992

11 years agoAdd a section to the wmem README about testing.
Evan Huus [Mon, 22 Apr 2013 21:29:57 +0000 (21:29 -0000)]
Add a section to the wmem README about testing.

svn path=/trunk/; revision=48990

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 22 Apr 2013 21:26:24 +0000 (21:26 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=48989

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 22 Apr 2013 21:26:09 +0000 (21:26 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=48988

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 22 Apr 2013 21:25:59 +0000 (21:25 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=48987