Commit Graph

49874 Commits

Author SHA1 Message Date
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
Bill Meier 35a7aded3e Remove some trailing whitespace....
svn path=/trunk/; revision=53161
2013-11-08 03:33:01 +00:00
Michael Mann d62f92b7f1 Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data.
Cleanup a forgotten pinfo->private_data use in the H245 dissector.

svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
Guy Harris c4e9865f0c Fix more errors.
svn path=/trunk/; revision=53159
2013-11-08 01:25:48 +00:00
Guy Harris 7a2a486ef2 Wrong function.
svn path=/trunk/; revision=53158
2013-11-08 01:24:55 +00:00
Guy Harris 9dd06cd401 Fix errors.
svn path=/trunk/; revision=53157
2013-11-08 01:23:18 +00:00
Guy Harris bf4e84aba6 For open dialogs, offer a list of sets of extensions, not of file types;
.cap, for example, doesn't refer to a particular file type - a whole
bunch of file types use .cap.

Also offer, in addition to "All Files", "All Capture Files", which
matches all the extensions we know about.

svn path=/trunk/; revision=53156
2013-11-08 01:08:42 +00:00
Jörg Mayer 28129427d4 As the code seems to be working now for two people
(both using Linux) it's time to be able to play with
the new HFI code.
Run cmake with -DHAVE_HFI_SECTION_INIT and you are good to go.

svn path=/trunk/; revision=53155
2013-11-08 00:23:32 +00:00
Jörg Mayer 9aa9d608cf With the new HFI code the compiler complains about unused element - great!
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-mint.c:205:26: error: ‘hfi_mint_control_0x0c_unknown4’ defined but not used [-Werror=unused-variable]
 static header_field_info hfi_mint_control_0x0c_unknown4 MINT_HF_INIT =
                          ^

svn path=/trunk/; revision=53154
2013-11-08 00:13:02 +00:00
Jörg Mayer 5ba977e34b The release notes update caused a new NEWS file to be built. Commit it.
Question: Should we remove the generated NEWS file from the repo?

svn path=/trunk/; revision=53153
2013-11-08 00:03:51 +00:00
Jörg Mayer 7c2c2d89f5 Fix:
cd /home/jmayer/work/wireshark/svn/build/qt-gtk3/epan && /usr/bin/cc  -DG_DISABLE_DEPRc
In file included from /home/jmayer/work/wireshark/svn/trunk/epan/packet.h:29:0,
                 from /home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-2dp:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-2dparityfec.c: In functio:
/home/jmayer/work/wireshark/svn/trunk/epan/proto.h:2128:2: error: ISO C90 forbids mixe]
  extern header_field_info __start__data_ ##proto[]; \
  ^
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-2dparityfec.c:331:4: note’
    proto_register_fields(proto_2dparityfec, hfi, array_length(hfi));
    ^
cc1: all warnings being treated as errors


svn path=/trunk/; revision=53152
2013-11-08 00:01:19 +00:00
Gerald Combs 06fdf8130d Fix the AsciiDoc description.
svn path=/trunk/; revision=53151
2013-11-07 23:43:35 +00:00
Jakub Zawadzki 1dffd1a949 GCC on amd64 align header_field_info variables to 16-bytes, this cause problems with proto_register_fields_section().
sizeof(void *) alignment should be enough, use it in HFI_INIT.

This fixes http://www.wireshark.org/lists/wireshark-dev/201311/msg00069.html

svn path=/trunk/; revision=53150
2013-11-07 23:20:06 +00:00
Jörg Mayer fa3332e8ed Remove extraction of cmake parameters from autotools files.
While it was an interesting exercise it just doesn't
work good enough to stay, i.e. it doesn't automatically
pick up changes but requires rerunning cmake instead.

svn path=/trunk/; revision=53149
2013-11-07 21:40:31 +00:00
Pascal Quantin 696194999e From Vasil Velichkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9382 :
Fix dissection of GSM MAPv3 ReportSM_DeliveryStatusRes

svn path=/trunk/; revision=53148
2013-11-07 21:08:15 +00:00
Jörg Mayer a00f13bbc3 Turn WANT_PACKET_EDITOR into an option until such a time that
it isn't a compile time option any more.

svn path=/trunk/; revision=53147
2013-11-07 20:32:41 +00:00
Jakub Zawadzki ce6ca9a05d Add infrastructure for section-initializing protocol hfis (without array).
configure implementation later.

svn path=/trunk/; revision=53146
2013-11-07 20:14:18 +00:00