osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity
50440 commits 23 branches 0 tags 1.3 GiB
Commit graph

50440 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Mann
af0819f942 Add data parameter to dissect_function_t in vsff structure. The intention here is to use it to replace some pinfo->private_data. 
I didn't realize how expansive this change would be, so committing it now before replacing the pinfo->private_data, so if something needs to be reverted, all of this is not lost.

svn path=/trunk/; revision=53213
 2013-11-10 03:20:04 +00:00
Gerald Combs
2965a6bf25 Add missing backslash. 
svn path=/trunk/; revision=53212
 2013-11-10 01:52:06 +00:00
Gerald Combs
04a7231d91 More packaging updates. 
Specify "Application" or "Installer" code signing identities as needed.
Switch back to productbuild for the package. That seems to be the
correct utility to use. Give the package an ID. Package signing is still
broken but this appears to be closer to being correct.

svn path=/trunk/; revision=53211
 2013-11-10 01:31:25 +00:00
Gerald Combs
48c5a9ae37 Bump LSMinimumSystemVersion to 10.6. 
svn path=/trunk/; revision=53210
 2013-11-10 01:25:38 +00:00
Gerald Combs
f50535856a Fix argument order. 
svn path=/trunk/; revision=53209
 2013-11-10 00:39:09 +00:00
Gerald Combs
e8106d01c9 Try switching back to codesign. 
svn path=/trunk/; revision=53208
 2013-11-10 00:24:56 +00:00
Michael Mann
a4c4ca8a75 Register openvpn over TCP and UDP under different dissector names. 
svn path=/trunk/; revision=53207
 2013-11-09 21:54:26 +00:00
Pascal Quantin
c51dcff823 Modify TCPENCAP heuristic to avoid triggering a 'packet size limited during capture' catch 
svn path=/trunk/; revision=53206
 2013-11-09 21:30:33 +00:00
Pascal Quantin
7b0c75dd3c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8966 : 
Initialize last entry of background_color array to avoid having a RGBA(0,0,0,0) transparent black

svn path=/trunk/; revision=53205
 2013-11-09 21:18:08 +00:00
Pascal Quantin
87b7c35ee4 Fix crash when displaying VoIP call flow (introduced in r52824) 
svn path=/trunk/; revision=53204
 2013-11-09 19:56:43 +00:00
Gerald Combs
9f163b787d Sign the right file. 
svn path=/trunk/; revision=53203
 2013-11-09 19:22:42 +00:00
Gerald Combs
970b0a0245 Older versions of productsign don't support "--force" or "--verbose". 
svn path=/trunk/; revision=53202
 2013-11-09 19:00:19 +00:00
Gerald Combs
c7f980342e Try to simplify package signing. 
According to the packagemaker man page, '--target 10.5' will produce a
flat package. Use it instead of pkgutil.

svn path=/trunk/; revision=53201
 2013-11-09 18:39:58 +00:00
Gerald Combs
7f3dd7b499 Fix unused and shadow variable errors. 
svn path=/trunk/; revision=53200
 2013-11-09 18:17:00 +00:00
Gerald Combs
3a21ccdeba Try to perform package signing as described at 
http://stackoverflow.com/questions/11487596/making-os-x-installer-packages-like-a-pro-xcode4-developer-id-mountain-lion-re

We *might* have to switch away from packagemaker in order to be able to
sign packages properly.

svn path=/trunk/; revision=53199
 2013-11-09 17:52:54 +00:00
Michael Mann
8081cf1d90 Add data parameter to tcp_dissect_pdus() as well as convert it to using "new" style dissectors. 
Now that "bytes consumed" can be determined, should tcp_dissect_pdus() take advantage of that?

Should tcp_dissect_pdus return length (bytes consumed)?  There are many dissectors that just call tcp_dissect_pdus() then return tvb_length(tvb).  Seems like that could all be rolled into one.

svn path=/trunk/; revision=53198
 2013-11-09 17:46:28 +00:00
Jakub Zawadzki
c9b2ee3768 include <wsutil/pint.h> only when needed. 
svn path=/trunk/; revision=53196
 2013-11-09 15:44:29 +00:00
Jakub Zawadzki
7b89063243 Don't include <epan/strutil.h> when not needed. 
svn path=/trunk/; revision=53194
 2013-11-09 14:58:28 +00:00
Jakub Zawadzki
0b0bbf0965 Replace STRINGIFY with glib version. 
svn path=/trunk/; revision=53193
 2013-11-09 14:37:13 +00:00
Jakub Zawadzki
3b2e519422 Remove comment (leftovers from r49444) + add missing WS_DLL_PUBLIC for adler32 
(modifing files to be commited when svn commit is already running is no good).

svn path=/trunk/; revision=53192
 2013-11-09 14:19:19 +00:00
Jakub Zawadzki
3931cfdd79 Correct include path. 
svn path=/trunk/; revision=53191
 2013-11-09 14:04:52 +00:00
Jakub Zawadzki
ca42cb3e40 Move adler32 from epan/ to wsutil/ 
The same like done for crc*

svn path=/trunk/; revision=53190
 2013-11-09 14:03:53 +00:00
Jakub Zawadzki
1899903f69 Include <epan/to_str.h> only when needed. 
svn path=/trunk/; revision=53189
 2013-11-09 13:41:10 +00:00
Jörg Mayer
0d23305cd5 cmake builds against gtk3 don't work. Those against gtk2 do. 
svn path=/trunk/; revision=53188
 2013-11-09 12:20:21 +00:00
Jakub Zawadzki
9aac55472c Put "private" to_str.c functions to to_str-int.h 
svn path=/trunk/; revision=53187
 2013-11-09 11:26:41 +00:00
Jakub Zawadzki
5aa4b848ee g_snprintf() don't return -1 from glib-1.2.3 [1] 
[1] https://developer.gnome.org/glib/2.28/glib-String-Utility-Functions.html#g-snprintf

svn path=/trunk/; revision=53186
 2013-11-09 11:23:02 +00:00
Jakub Zawadzki
ef30aee86a nstime_to_sec() and capinfos secs_nsecs() seems to be same. 
svn path=/trunk/; revision=53185
 2013-11-09 11:03:02 +00:00
Jakub Zawadzki
38edae1c71 Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec. 
After r50154 nstime_t is inside wsutil/ so wiretap don't need it's own copy. 

svn path=/trunk/; revision=53184
 2013-11-09 10:38:02 +00:00
Jakub Zawadzki
f207c70075 I have added tvb_get_bits_buf() in r37217, nobody is using it, remove. 
svn path=/trunk/; revision=53183
 2013-11-09 10:08:58 +00:00
Jakub Zawadzki
c86d38af23 Remove old (5 yrs) #if 0 code (from r25028). 
svn path=/trunk/; revision=53182
 2013-11-09 10:02:39 +00:00
Jakub Zawadzki
8be10b5662 Remove #if 0 code (introduced in r29489). 
svn path=/trunk/; revision=53181
 2013-11-09 10:00:54 +00:00
Jörg Mayer
f9b68b05e4 No need to check whether cmake_policy command exists as we require 
cmake 2.6.
Add two more policy statements to avoid warnings on current cmake systems.
CMP0020 doesn't work - no idea why.

svn path=/trunk/; revision=53180
 2013-11-09 09:36:09 +00:00
Jörg Mayer
0e61383d07 Fix a tpyo (packet-quic.) 
svn path=/trunk/; revision=53179
 2013-11-09 08:19:13 +00:00
Jakub Zawadzki
9297c9e780 Rename swar_count_bits() to ws_count_ones() 
Try to make ws_count_ones() inline function.

svn path=/trunk/; revision=53178
 2013-11-09 04:47:08 +00:00
Alexis La Goutte
3aaf560877 Add QUIC (Quick UDP Internet Connections) dissector 
See http://blog.chromium.org/2013/06/experimenting-with-quic.html

Don't yet support protocol decryption...

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

svn path=/trunk/; revision=53177
 2013-11-09 00:19:52 +00:00
Jakub Zawadzki
e6944e68b9 Try to split ws_ctz() from hfinfo_bitshift(). 
svn path=/trunk/; revision=53176
 2013-11-08 22:01:12 +00:00
Jakub Zawadzki
7e312c9bbc Convert: vlan, sll, rip to NEW_PROTO_TREE_API 
svn path=/trunk/; revision=53175
 2013-11-08 21:38:32 +00:00
Jakub Zawadzki
b3a4b56ae9 Use escape_string*() functions in ftype-string. 
Found in attachment #11961, by Didier Gautheron

svn path=/trunk/; revision=53174
 2013-11-08 20:09:54 +00:00
Guy Harris
ad0a9f4b66 Indentation tweaks. 
svn path=/trunk/; revision=53173
 2013-11-08 19:38:28 +00:00
Bill Meier
5a0809c718 (Trivial) whitespace cleanup (mostly trailing whitespace). 
svn path=/trunk/; revision=53172
 2013-11-08 17:17:57 +00:00
Martin Mathieson
6159e98cd3 Didn't need to include wtap.h again 
svn path=/trunk/; revision=53171
 2013-11-08 17:15:43 +00:00
Martin Mathieson
0c590a950a Fix up function names: type -> type_subtype 
svn path=/trunk/; revision=53170
 2013-11-08 17:12:31 +00:00
Alexis La Goutte
8f1ba43e89 Add reference to qttools5-dev in README.qt documentation 
There is following error message with cmake :

CMake Warning at CMakeLists.txt:490 (find_package):
  By not providing "FindQt5LinguistTools.cmake" in CMAKE_MODULE_PATH this
  project has asked CMake to find a package configuration file provided by
  "Qt5LinguistTools", but CMake did not find one.

  Could not find a package configuration file provided by "Qt5LinguistTools"
  with any of the following names:

    Qt5LinguistToolsConfig.cmake
    qt5linguisttools-config.cmake

  Add the installation prefix of "Qt5LinguistTools" to CMAKE_PREFIX_PATH or
  set "Qt5LinguistTools_DIR" to a directory containing one of the above
  files.  If "Qt5LinguistTools" provides a separate development package or
  SDK, be sure it has been installed.

CMake Error at ui/qt/CMakeLists.txt:205 (QT5_ADD_TRANSLATION):
  Unknown CMake command "QT5_ADD_TRANSLATION".

svn path=/trunk/; revision=53169
 2013-11-08 16:35:42 +00:00
Jörg Mayer
a3d422f906 The experimental code in echld/ also got broken by the wtap 
file types commit. Make this compile again as well.
Trivial whitespace cleanup while in those files.

svn path=/trunk/; revision=53168
 2013-11-08 11:50:57 +00:00
Jörg Mayer
609cd8cf67 Looks like r53166 was not compile tested. Now k12text.l compiles again. 
svn path=/trunk/; revision=53167
 2013-11-08 11:42:57 +00:00
Guy Harris
853da2eb9b The "file types" we have are actually combinations of types and 
subtypes, e.g. Network Monitor version 1 and Network Monitor version 2
are separate "file types", even though they both come from Network
Monitor.

Rename various functions, #defines, and variables appropriately.

svn path=/trunk/; revision=53166
 2013-11-08 09:53:01 +00:00
Guy Harris
5cec175b07 Another one. 
svn path=/trunk/; revision=53165
 2013-11-08 09:11:54 +00:00
Guy Harris
011ee99394 What matters is the encapsulation type, not the file type, so just test 
for WTAP_ENCAP_BER, not for WTAP_FILE_BER.

svn path=/trunk/; revision=53164
 2013-11-08 09:10:36 +00:00
Anders Broman
88d0e909a2 From Katrina Zhang: 
Add/fix RFSP dissection.

svn path=/trunk/; revision=53163
 2013-11-08 05:58:13 +00:00
Anders Broman
fd429a6ed3 From Katrina Zhang: 
3GPP AVP updates.

svn path=/trunk/; revision=53162
 2013-11-08 05:57:00 +00:00