obnox/wireshark/wip.git
7 years agoUpdate documentatin for the qt build to reflect the cmake work.
jmayer [Thu, 2 Feb 2012 12:38:41 +0000 (12:38 +0000)]
Update documentatin for the qt build to reflect the cmake work.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40810 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake out-of-tree builds work.
jmayer [Thu, 2 Feb 2012 12:38:04 +0000 (12:38 +0000)]
Make out-of-tree builds work.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40809 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUpdate svn:ignore for the qtshark build case.
jmayer [Thu, 2 Feb 2012 12:05:44 +0000 (12:05 +0000)]
Update svn:ignore for the qtshark build case.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40808 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago- Move setting _U_ into config.h, because
jmayer [Thu, 2 Feb 2012 12:04:22 +0000 (12:04 +0000)]
- Move setting _U_ into config.h, because
  a) C++ has a standardized way of marking parameters as unused
  b) cmakes autoquoting magic failed when the compiler wasn't gcc
     but moc instead.
- qtshark: Don't try to compile the c source files inside ui/qt/
- qtshark: Only run moc on the files that need it.
- qtshark: It's too early to try any of the new qtshark files
  as clean.
- Make Qt detection actually work
- Add C++ to the list of languages for this project

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40807 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoInclude config.h in preparation of moving the definition
jmayer [Thu, 2 Feb 2012 11:54:33 +0000 (11:54 +0000)]
Include config.h in preparation of moving the definition
of _U_ from the compiler command line into config.h

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40806 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUpdate svn:ignore for existing qtshark build process
jmayer [Thu, 2 Feb 2012 08:55:00 +0000 (08:55 +0000)]
Update svn:ignore for existing qtshark build process

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40805 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRevert file commited by mistake.
etxrab [Thu, 2 Feb 2012 06:54:33 +0000 (06:54 +0000)]
Revert file commited by mistake.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40804 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUpdate the protocol name as per commit rev 40801.
etxrab [Thu, 2 Feb 2012 06:51:37 +0000 (06:51 +0000)]
Update the protocol name as per commit rev 40801.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40803 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUpdate the protocol name as per commit rev 40801.
etxrab [Thu, 2 Feb 2012 06:50:51 +0000 (06:50 +0000)]
Update the protocol name as per commit rev 40801.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40802 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agopacket-HI2Operations.c was sorted into the file list as if it were
jmayer [Thu, 2 Feb 2012 01:08:02 +0000 (01:08 +0000)]
packet-HI2Operations.c was sorted into the file list as if it were
spelled packet-hi2operations.c. Rename the file to represent this.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40801 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago- Add generated files and stuff from cmake build to svn:ignore
jmayer [Thu, 2 Feb 2012 01:03:50 +0000 (01:03 +0000)]
- Add generated files and stuff from cmake build to svn:ignore
- Run resulting list of ignored files through sort

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40800 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoPrepare the cmake infrastucture for eventually building
jmayer [Thu, 2 Feb 2012 00:46:02 +0000 (00:46 +0000)]
Prepare the cmake infrastucture for eventually building
wireshark and qtshark simultanously.
The "only" missing thing for this is now ui/qt/CMakeLists.txt ;)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40799 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMove m3ap from clean-asn1-dissector list to dirty-asn1-dissector list.
morriss [Wed, 1 Feb 2012 22:43:27 +0000 (22:43 +0000)]
Move m3ap from clean-asn1-dissector list to dirty-asn1-dissector list.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40798 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Windows qmake and Qt Wireshark build issues:
wmeier [Wed, 1 Feb 2012 21:47:31 +0000 (21:47 +0000)]
Fix some Windows qmake and Qt Wireshark build issues:
If 'MANIFEST_INFO_REQUIRED' not defined in config.nmake, don't do 'mt ...' for Wireshark Qt;
Add '*.pdb' to QMAKE_CLEAN;
Fix 'Unescaped backslashes are deprecated' qmake warnings;
Remove "debug" message() statements from QtShark.pro.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40797 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMove m3ap from clean-asn1-dissector list to dirty-asn1-dissector list.
morriss [Wed, 1 Feb 2012 21:42:07 +0000 (21:42 +0000)]
Move m3ap from clean-asn1-dissector list to dirty-asn1-dissector list.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40796 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix a typo
wmeier [Wed, 1 Feb 2012 21:24:08 +0000 (21:24 +0000)]
Fix a typo

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40795 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoCollect and use some SRTP information.
etxrab [Wed, 1 Feb 2012 20:33:33 +0000 (20:33 +0000)]
Collect and use some SRTP information.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40794 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSee if this makes it build cleanly.
etxrab [Wed, 1 Feb 2012 20:20:03 +0000 (20:20 +0000)]
See if this makes it build cleanly.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40793 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd M3AP to the build.
etxrab [Wed, 1 Feb 2012 19:36:57 +0000 (19:36 +0000)]
Add M3AP to the build.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40792 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd M3AP to the build.
etxrab [Wed, 1 Feb 2012 19:36:16 +0000 (19:36 +0000)]
Add M3AP to the build.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40791 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom David Wei:
etxrab [Wed, 1 Feb 2012 19:27:08 +0000 (19:27 +0000)]
From David Wei:
Add a dissector for 3GPP TS 36.444 V11.0.0 (2011-12) M3AP

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40790 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix warning: pci set but not used warning
jmayer [Wed, 1 Feb 2012 10:02:01 +0000 (10:02 +0000)]
Fix warning: pci set but not used warning

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40789 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some typos.
cmaynard [Wed, 1 Feb 2012 02:23:51 +0000 (02:23 +0000)]
Fix some typos.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40788 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some typos.
cmaynard [Wed, 1 Feb 2012 02:05:19 +0000 (02:05 +0000)]
Fix some typos.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40787 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some typos.
cmaynard [Wed, 1 Feb 2012 01:41:11 +0000 (01:41 +0000)]
Fix some typos.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40786 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoLet's make all offsets within the packet guints. (In most of the API,
guy [Tue, 31 Jan 2012 23:36:52 +0000 (23:36 +0000)]
Let's make all offsets within the packet guints.  (In most of the API,
they're signed, but that's only to handle "offset from the end" - we
should probably get rid of that and make them unsigned.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40785 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoHeuristic standard tuning:
morriss [Tue, 31 Jan 2012 23:06:27 +0000 (23:06 +0000)]
Heuristic standard tuning:
 - Handle ERR and IT messages.
 - When checking variable parameter lengths, check that we have enough data
   remaining (by adding the current offset to the retrieved length).
 - Check the lengths of several more messages.
 - When checking the length, add up the values of the parameter length macros
   to make it obvious how we came to use that value.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40784 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse PINFO_FD_NUM and PINFO_FD_VISITED
morriss [Tue, 31 Jan 2012 20:40:29 +0000 (20:40 +0000)]
Use PINFO_FD_NUM and PINFO_FD_VISITED

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40783 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoImprove heuristic standard detection:
morriss [Tue, 31 Jan 2012 04:02:08 +0000 (04:02 +0000)]
Improve heuristic standard detection:
 - Make sccp_called_calling_looks_valid() static.
 - Reject GT-routed Class-2 (it's not used).
 - Handle UDTS.
 - Handle optional pointer on several messages.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40782 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoCompile .cpp files with CXXFLAGS the same as CFLAGS used for compiling .c files.
wmeier [Mon, 30 Jan 2012 23:55:34 +0000 (23:55 +0000)]
Compile .cpp files with CXXFLAGS the same as CFLAGS used for compiling .c files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40781 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoHeuristic standard tuning:
morriss [Mon, 30 Jan 2012 23:15:07 +0000 (23:15 +0000)]
Heuristic standard tuning:
 - Reject all Class-3 messages (it's never used)
 - Group Class-2 and Class-1 messages closer together
 - Some code cleanup (use macros where we have them)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40780 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRework optional generation of .sbr & .bsc files.
wmeier [Mon, 30 Jan 2012 22:57:09 +0000 (22:57 +0000)]
Rework optional generation of .sbr & .bsc files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40779 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRemove an unused parameter.
etxrab [Mon, 30 Jan 2012 20:03:29 +0000 (20:03 +0000)]
Remove an unused parameter.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40778 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoReformat a section.
etxrab [Mon, 30 Jan 2012 19:54:39 +0000 (19:54 +0000)]
Reformat a section.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40777 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTry to determine MTP3 Standard heuristically, original code
etxrab [Mon, 30 Jan 2012 19:47:35 +0000 (19:47 +0000)]
Try to determine MTP3 Standard heuristically, original code
from Jeff Morris refactored a bit by me.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40776 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMinor updates to debug output.
etxrab [Mon, 30 Jan 2012 19:42:21 +0000 (19:42 +0000)]
Minor updates to debug output.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40775 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Andreas Heise:
etxrab [Mon, 30 Jan 2012 19:41:29 +0000 (19:41 +0000)]
From Andreas Heise:
Remove a debug line.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40774 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRevert 40772: the abort() needs to be pushed higher (into packet.c?) so
morriss [Mon, 30 Jan 2012 19:23:25 +0000 (19:23 +0000)]
Revert 40772: the abort() needs to be pushed higher (into packet.c?) so
checkapi remains happy; thus far my attempts at that aren't working.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40773 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoIf WIRESHARK_ABORT_ON_DISSECTOR_BUG is set, abort() out if we happened to
morriss [Mon, 30 Jan 2012 17:51:22 +0000 (17:51 +0000)]
If WIRESHARK_ABORT_ON_DISSECTOR_BUG is set, abort() out if we happened to
catch a DissectorError exception.

(I found this useful when debugging a "More than 1000000 items in the tree"
DissectorError.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40772 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix infinite loop reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id...
morriss [Mon, 30 Jan 2012 17:39:15 +0000 (17:39 +0000)]
Fix infinite loop reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6778 :

SDP_CRYPTO: Give up (and display an expert info) if we don't find the colon
separating the key-method and the key-info.

Reindent this area of code a bit.

Remove tabs in some places for consistency.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40771 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoNo need to set new save icon if equal to previous icon.
stig [Mon, 30 Jan 2012 13:51:04 +0000 (13:51 +0000)]
No need to set new save icon if equal to previous icon.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40770 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDisable the save-as button in the toolbar if we cannot save-as,
stig [Mon, 30 Jan 2012 13:05:27 +0000 (13:05 +0000)]
Disable the save-as button in the toolbar if we cannot save-as,
because this will assert.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40769 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRework Windows Wireshark Qt build configuration a bit:
wmeier [Mon, 30 Jan 2012 04:37:12 +0000 (04:37 +0000)]
Rework Windows Wireshark Qt build configuration a bit:
1. Compile and link with (almost exactly) the same options as used
   when building Windows Wireshark Gtk.
   The options used allow debugging of the exe using Visual Studio exactly
   as is done for Wireshark Gtk.
   Essentially: configure the "release" version to compile and link with
   symbols.  (See ui\qt\QtShark for the details).

2. Update QtShark.pro to create a Makefile only for 1 version of Wireshark Qt
   which is linked against the "release" Qt libraries.
   (IOW: don't create a "debug" Makefile).

3. Remove unused variable assignments from config.pri.
   (They can be added back if needed in the future).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40768 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago(Trivial) use same "Directory Separator" for dependency and target.
wmeier [Mon, 30 Jan 2012 00:57:44 +0000 (00:57 +0000)]
(Trivial) use same "Directory Separator" for dependency and target.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40767 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix QtShark compile error.
wmeier [Mon, 30 Jan 2012 00:44:11 +0000 (00:44 +0000)]
Fix QtShark compile error.
(Quoting can be tricky ...)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40766 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoPart of "Build Browse Information File per default" from
etxrab [Sun, 29 Jan 2012 21:56:35 +0000 (21:56 +0000)]
Part of "Build Browse Information File per default" from
Kovarththanan Rajaratnam applied.

It's still not the default but easier to make it so.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3480

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40765 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd dummy application for Ericsson Sy
etxrab [Sun, 29 Jan 2012 20:55:21 +0000 (20:55 +0000)]
Add dummy application for Ericsson Sy

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40764 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd *.sbr files to the clean target.
etxrab [Sun, 29 Jan 2012 20:33:58 +0000 (20:33 +0000)]
Add *.sbr files to the clean target.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40763 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd *.sbr files to the clean target.
etxrab [Sun, 29 Jan 2012 20:21:30 +0000 (20:21 +0000)]
Add *.sbr files to the clean target.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40762 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd *.sbr files to the clean target.
etxrab [Sun, 29 Jan 2012 20:03:39 +0000 (20:03 +0000)]
Add *.sbr files to the clean target.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40761 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some typos.
cmaynard [Sun, 29 Jan 2012 15:51:21 +0000 (15:51 +0000)]
Fix some typos.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40759 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago[Automatic manuf, services and enterprise-numbers update for 2012-01-29]
gerald [Sun, 29 Jan 2012 15:03:23 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-01-29]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40757 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDon't register ett_ssl_keyex_params twice.
tuexen [Sat, 28 Jan 2012 22:22:01 +0000 (22:22 +0000)]
Don't register ett_ssl_keyex_params twice.
This bug was introduced in
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=40748

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40756 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Tyson Key:
etxrab [Sat, 28 Jan 2012 17:19:25 +0000 (17:19 +0000)]
From Tyson Key:
Update the CCID dissector's filter/handler names.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6752

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40755 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Tom Brezinski:
etxrab [Sat, 28 Jan 2012 17:10:50 +0000 (17:10 +0000)]
From Tom Brezinski:
includes radio data from the capture.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40754 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Claudio:
etxrab [Sat, 28 Jan 2012 17:04:48 +0000 (17:04 +0000)]
From Claudio:
linear white space (LWS) not ignored after HTTP header field content.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40753 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Andreas Heise:
etxrab [Sat, 28 Jan 2012 16:48:06 +0000 (16:48 +0000)]
From Andreas Heise:
option ssl_ignore_mac_failed.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40752 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Tobias Witek:
etxrab [Sat, 28 Jan 2012 16:37:50 +0000 (16:37 +0000)]
From Tobias Witek:
Add support for a new dissector (MTP2) to the 'meta' dissector.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40751 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Tobias Witek:
etxrab [Sat, 28 Jan 2012 16:34:22 +0000 (16:34 +0000)]
From Tobias Witek:
Allow dissectors to indicate that an ATM AAL5 frame contains SSCOP.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40750 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Michal Labedzki:
etxrab [Sat, 28 Jan 2012 16:24:12 +0000 (16:24 +0000)]
From Michal Labedzki:

Fix:Wrong bluetooth PSM detected when parse the L2CAP packet.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40749 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Michael:
etxrab [Sat, 28 Jan 2012 15:50:59 +0000 (15:50 +0000)]
From Michael:
Enhance SSL Key Exchange dissection.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40748 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Martin Kaiser:
etxrab [Sat, 28 Jan 2012 15:13:28 +0000 (15:13 +0000)]
From Martin Kaiser:
Unused variable in rtp_analysis.c

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40747 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd CMakeCache.txt, CPackSourceConfig.cmake and CPackConfig.cmake to svn:ignore ...
alagoutte [Sat, 28 Jan 2012 11:24:37 +0000 (11:24 +0000)]
Add CMakeCache.txt, CPackSourceConfig.cmake and CPackConfig.cmake to svn:ignore (when build with Cmake)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40746 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd the Qt files to the tarball.
etxrab [Sat, 28 Jan 2012 09:18:26 +0000 (09:18 +0000)]
Add the Qt files to the tarball.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40745 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd CMakeFiles and cmake_install.cmake to svn:ignore (when build with Cmake)
alagoutte [Sat, 28 Jan 2012 03:22:34 +0000 (03:22 +0000)]
Add CMakeFiles and cmake_install.cmake to svn:ignore (when build with Cmake)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40744 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoWell, we *did* go to a widget that invokes callback to get the text for
guy [Sat, 28 Jan 2012 02:21:03 +0000 (02:21 +0000)]
Well, we *did* go to a widget that invokes callback to get the text for
the columns, so we *can* clean up the exporting of col_set_fmt_time() by
not exporting it any more.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40743 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6712 :
morriss [Fri, 27 Jan 2012 22:59:25 +0000 (22:59 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6712 :

Since SMPP knows the time zone of its (absolute) times and since we don't
have access to a mktime() routine that doesn't take into account the local
time zone (and since I don't think repeatedly setting the TZ environment
variable is a healthy choice):

1) subtract the 'timezone' (or '_timezone' on Windows) back out after calling
   mktime()
2) then adjust the time to take into the protocol-specified time zone
3) and (finally) display the time in UTC (since we don't have the
   infrastructure to display it in the protocol-specified time zone).

(I *think* (1) is portable: POSIX says that variable should exist...)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40742 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix
alagoutte [Fri, 27 Jan 2012 16:49:54 +0000 (16:49 +0000)]
Fix
main_window.cpp: In function ‘QStringList build_file_open_type_list()’:
main_window.cpp:249:50: error: cannot call constructor ‘QString::QString’ directly [-fpermissive]
main_window.cpp:249:50: error:   for a function-style cast, remove the redundant ‘::QString’ [-fpermissive]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40741 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSince we know the version of WinPcap we're compiling against, go ahead and display...
cmaynard [Fri, 27 Jan 2012 03:41:20 +0000 (03:41 +0000)]
Since we know the version of WinPcap we're compiling against, go ahead and display it instead of displaying "version unknown".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40740 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoPer https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6765#c3, don't display "...
cmaynard [Fri, 27 Jan 2012 03:00:47 +0000 (03:00 +0000)]
Per https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6765#c3, don't display "(version unknown)" anymore.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40739 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Mike Morrin:
etxrab [Thu, 26 Jan 2012 23:13:31 +0000 (23:13 +0000)]
From Mike Morrin:
The gsmtap patch related to
Add dissectors for GSM and UMTS Cell Broadcast protocols.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40738 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd a format string and remove a couple of unused variables.
gerald [Thu, 26 Jan 2012 22:14:19 +0000 (22:14 +0000)]
Add a format string and remove a couple of unused variables.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40737 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agomake-dissector-reg.py doesn't always open its cache file.
gerald [Thu, 26 Jan 2012 21:38:53 +0000 (21:38 +0000)]
make-dissector-reg.py doesn't always open its cache file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40736 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Mike Morrin:
etxrab [Thu, 26 Jan 2012 19:51:48 +0000 (19:51 +0000)]
From Mike Morrin:
Add dissectors for GSM and UMTS Cell Broadcast protocols.
( - the patch for gsmtap )

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40735 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoApply changes from the "2to3" conversion utility. Print cache information.
gerald [Thu, 26 Jan 2012 19:38:27 +0000 (19:38 +0000)]
Apply changes from the "2to3" conversion utility. Print cache information.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40734 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoOh dear, had that test the wrong way around...
martinm [Thu, 26 Jan 2012 19:25:08 +0000 (19:25 +0000)]
Oh dear, had that test the wrong way around...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40733 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDissect the crypto attribute.
etxrab [Thu, 26 Jan 2012 17:52:13 +0000 (17:52 +0000)]
Dissect the crypto attribute.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40732 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd an 3gpp xml entry.
etxrab [Thu, 26 Jan 2012 17:51:19 +0000 (17:51 +0000)]
Add an 3gpp xml entry.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40731 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix memory leaks involving tvb_get_stringz() by replacing it with tvb_get_ephemeral_s...
cmaynard [Thu, 26 Jan 2012 15:51:05 +0000 (15:51 +0000)]
Fix memory leaks involving tvb_get_stringz() by replacing it with tvb_get_ephemeral_stringz().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40730 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoWhen telling RLC whether a frame is a retx, use direct setting if set
martinm [Thu, 26 Jan 2012 15:19:32 +0000 (15:19 +0000)]
When telling RLC whether a frame is a retx, use direct setting if set
for DL.
Also, check limits during subheader loop.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40729 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix Coverity CID 1371: UNINIT.
cmaynard [Thu, 26 Jan 2012 15:11:20 +0000 (15:11 +0000)]
Fix Coverity CID 1371: UNINIT.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40728 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix usage of g_ascii_strdown() and g_ascii_strup() - they do *not*
guy [Wed, 25 Jan 2012 23:03:33 +0000 (23:03 +0000)]
Fix usage of g_ascii_strdown() and g_ascii_strup() - they do *not*
modify the string in place, they return a g_mallocated modified version
of the string passed into them.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40727 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTry to make the buildbots happy.
tuexen [Wed, 25 Jan 2012 20:26:34 +0000 (20:26 +0000)]
Try to make the buildbots happy.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40726 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoActually, you only have monitor mode support if you have pcap_create() -
guy [Wed, 25 Jan 2012 19:40:22 +0000 (19:40 +0000)]
Actually, you only have monitor mode support if you have pcap_create() -
without pcap_create() and pcap_activate() you don't have any API to turn
it on.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40725 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoThe proper scope / spec name for OS X is "macx".
gerald [Wed, 25 Jan 2012 18:06:25 +0000 (18:06 +0000)]
The proper scope / spec name for OS X is "macx".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40724 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix error when building QtShark:
wmeier [Wed, 25 Jan 2012 18:03:50 +0000 (18:03 +0000)]
Fix error when building QtShark:

...\capture_opts.h(94) : error C2461: 'remote_host' : constructor syntax missing formal parameters

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40723 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdded billyjeans [AT] gmail.com to the authors list. (No known real name.)
cmaynard [Wed, 25 Jan 2012 17:10:57 +0000 (17:10 +0000)]
Added billyjeans [AT] gmail.com to the authors list.  (No known real name.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40722 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom billyjeans [AT] gmail.com via bug 6184: "S1AP dissector COL_INFO should display...
cmaynard [Wed, 25 Jan 2012 17:05:22 +0000 (17:05 +0000)]
From billyjeans [AT] gmail.com via bug 6184: "S1AP dissector COL_INFO should display different message status?", with changes from me to use col_append_str() and comma-separate the strings instead of using col_append_fstr() and pipe-separate them.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40721 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse a bitwise & when checking with a mask.
tuexen [Wed, 25 Jan 2012 16:45:22 +0000 (16:45 +0000)]
Use a bitwise & when checking with a mask.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40720 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRemove redundant ().
tuexen [Wed, 25 Jan 2012 16:43:04 +0000 (16:43 +0000)]
Remove redundant ().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40719 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAddress warnings reported by Bill.
tuexen [Wed, 25 Jan 2012 16:32:51 +0000 (16:32 +0000)]
Address warnings reported by Bill.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40718 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agomonitor_mode_enabled is only available on WIN32 or if we HAVE_PCAP_CREATE.
morriss [Wed, 25 Jan 2012 14:29:09 +0000 (14:29 +0000)]
monitor_mode_enabled is only available on WIN32 or if we HAVE_PCAP_CREATE.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40717 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago'error' is only used when we HAVE_LIBPCAP so only define it when that is the case.
morriss [Wed, 25 Jan 2012 14:26:09 +0000 (14:26 +0000)]
'error' is only used when we HAVE_LIBPCAP so only define it when that is the case.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40716 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoThird try. This time pipes and stdin are supported and the
tuexen [Wed, 25 Jan 2012 13:04:32 +0000 (13:04 +0000)]
Third try. This time pipes and stdin are supported and the
test scripts are passed.

Use a global list containing all interfaces and only change
properties of the entries when changes are made in the GUI.
Do not misuse the list of interfaces specified on the command
line anymore.

This patch does not provide any new functionality, it just
provides the base for future extensions like removing
remote interface, mulitple airpcap devices and multiple
pipes.

This patch was provided by Irene Ruengeler.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40715 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse sizeof(buff) as length argument when calling g_snprintf().
martinm [Wed, 25 Jan 2012 04:01:33 +0000 (04:01 +0000)]
Use sizeof(buff) as length argument when calling g_snprintf().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40714 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDelete a TODO comment (now that there is an equivalent tshark tap).
martinm [Wed, 25 Jan 2012 04:00:25 +0000 (04:00 +0000)]
Delete a TODO comment (now that there is an equivalent tshark tap).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40713 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTidy up comments / deleted commented-out code.
martinm [Wed, 25 Jan 2012 03:40:07 +0000 (03:40 +0000)]
Tidy up comments / deleted commented-out code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40712 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix a couple of cut-n-pasteos.
morriss [Wed, 25 Jan 2012 01:24:25 +0000 (01:24 +0000)]
Fix a couple of cut-n-pasteos.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40711 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoPut back an "explicit" for now. I'm not sure it's necessary but Qt
gerald [Wed, 25 Jan 2012 01:16:36 +0000 (01:16 +0000)]
Put back an "explicit" for now. I'm not sure it's necessary but Qt
Creator put it there as I recall.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40710 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd a comment discussing what it will take to have native file dialogs
gerald [Wed, 25 Jan 2012 01:13:04 +0000 (01:13 +0000)]
Add a comment discussing what it will take to have native file dialogs
on Windows and OS X.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40709 f5534014-38df-0310-8fa8-9805f1628bb7