osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
47,962 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

245 Commits

Author SHA1 Message Date
Jörg Mayer 87ca12fcb7 Print the flag we are testing 
svn path=/trunk/; revision=51116
 2013-08-02 07:20:43 +00:00
Gerald Combs 45589bf41d TShark links with libui so we should always build it. 
svn path=/trunk/; revision=51101
 2013-08-01 23:40:06 +00:00
Jeff Morriss 2df54da6e2 Move a bunch of the crypt modules and pint.h into wsutil. 
This means wsutil now links against libcrypt.

Protect a bunch of the crypt header files from multiple inclusion.

svn path=/trunk/; revision=51100
 2013-08-01 23:34:47 +00:00
Jörg Mayer 812f308620 Use largefile detection in cmake. 
Move wiretap/file_wrapper.c back to clean sources.

svn path=/trunk/; revision=50825
 2013-07-23 09:41:35 +00:00
Jörg Mayer 681c9e7160 Looks like not every version of cmake has the same behaviour wrt 
the working directory. So hardcode the path in a case where it
didn't work for everyone.

svn path=/trunk/; revision=50817
 2013-07-23 07:41:20 +00:00
Jörg Mayer fe166ca904 Wrap clang specific tests into a clang tests instead of checking 
for APPLE.
Move 3 of the 4 tests out of this check because the improved checks
should detect them correctly now

svn path=/trunk/; revision=50789
 2013-07-22 14:45:58 +00:00
Jörg Mayer 43ef033128 Don't use the program name to identify the compiler - it won't work 
reliably in cases where the compiler is name /usr/bin/cc

Use the internal variable CMAKE_<LANG>_COMPILER_ID instead, which is
finally documented (but still called internal in the docs), see
http://www.cmake.org/cmake/help/v2.8.10/cmake.html#variable:CMAKE_LANG_COMPILER_ID


svn path=/trunk/; revision=50784
 2013-07-22 09:36:14 +00:00
Jörg Mayer 9e7b6f1a69 Try to generate an error when calling clang with an unknown compiler 
option. This behaviour changed in clang, see
https://bugzilla.mozilla.org/show_bug.cgi?id=731316

svn path=/trunk/; revision=50760
 2013-07-21 18:12:20 +00:00
Jörg Mayer df397b4f63 Enable echld builds with cmake when building with ENABLE_ECHLD=ON 
svn path=/trunk/; revision=50751
 2013-07-21 13:34:50 +00:00
Jörg Mayer f3f910a5cf Don't check for "APPLE" if what you really mean is "clang" 
svn path=/trunk/; revision=50749
 2013-07-21 12:53:51 +00:00
Jeff Morriss 0a669967fa Move merge.{h,c} into wiretap: these modules use wiretap to merge files. 
svn path=/trunk/; revision=50656
 2013-07-16 02:35:33 +00:00
Jeff Morriss 56735f8c16 Move u3.{h,c} and g711.{h,c} into wsutil. 
Project g711.h against multiple inclusion and add C++ compatibility wrapper.

svn path=/trunk/; revision=50654
 2013-07-16 02:04:55 +00:00
Jeff Morriss 2d30d5beb1 Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specific 
there and moving it avoids having to recompile the file for use in editcap
and mergecap (which don't link against libwireshark).

svn path=/trunk/; revision=50650
 2013-07-16 01:16:50 +00:00
Jeff Morriss 54bb2e7a5c Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark). 
svn path=/trunk/; revision=50598
 2013-07-15 02:48:26 +00:00
Michael Tüxen 43e20ff200 Don't use compiler options not supported by clang in XCode 4.6.3 
on Apple platforms.

svn path=/trunk/; revision=50576
 2013-07-14 12:39:25 +00:00
Jeff Morriss 4dcc156cf3 Move the print modules into epan. 
svn path=/trunk/; revision=50526
 2013-07-12 03:50:50 +00:00
Jeff Morriss 16206348d9 Move disabled_protos.{h,c} into epan. 
svn path=/trunk/; revision=50521
 2013-07-12 01:40:06 +00:00
Jeff Morriss 45449ce1a8 Move some more modules into epan. 
svn path=/trunk/; revision=50517
 2013-07-11 23:57:11 +00:00
Jakub Zawadzki ce81449ed9 packet dissection now takes pointer to tvb instead of guint8 data 
implement frame_tvbuff, right now almost a copy of 'real' tvb.

svn path=/trunk/; revision=50497
 2013-07-11 05:47:02 +00:00
Chris Maynard d602662b36 Add strnatcmp by Martin Pool for 'natural order' string comparisons, and make use of it in editcap and mergecap for listing encapsulation types. For example: 
Before:
    user0 - USER 0
    user1 - USER 1
    user10 - USER 10
    user11 - USER 11
    user12 - USER 12
    user13 - USER 13
    user14 - USER 14
    user15 - USER 15
    user2 - USER 2
    user3 - USER 3
    user4 - USER 4
    user5 - USER 5
    user6 - USER 6
    user7 - USER 7
    user8 - USER 8
    user9 - USER 9

After:
    user0 - USER 0
    user1 - USER 1
    user2 - USER 2
    user3 - USER 3
    user4 - USER 4
    user5 - USER 5
    user6 - USER 6
    user7 - USER 7
    user8 - USER 8
    user9 - USER 9
    user10 - USER 10
    user11 - USER 11
    user12 - USER 12
    user13 - USER 13
    user14 - USER 14
    user15 - USER 15


svn path=/trunk/; revision=50482
 2013-07-10 16:18:37 +00:00
Guy Harris b450609a55 For now, don't turn on -Wcast-align by default. There are at least some 
bugs it points out that probably mean the code won't work on machines
that require alignment (e.g., SPARC machines), but we'll turn it on once
we fix them.  (clang is fussier than GCC about this.)

svn path=/trunk/; revision=50187
 2013-06-27 10:35:06 +00:00
Jeff Morriss 500d399393 Move tap-*-common.{h,c} into ui/ since that's the home for common UI functions. 
svn path=/trunk/; revision=50165
 2013-06-26 02:12:12 +00:00
Jeff Morriss bbf6a3766e Move tempfile.{h,c} into wsutil. 
svn path=/trunk/; revision=50163
 2013-06-26 01:14:35 +00:00
Jeff Morriss 9ef2507e34 editcap no longer has to link against nstime.o, it's in libwsutil now. 
svn path=/trunk/; revision=50161
 2013-06-26 00:45:38 +00:00
Jeff Morriss a441793cba Move a couple of time-related modules into wsutil. 
A bunch of files didn't really need to include these header files so remove
the include line rather than changing it.

svn path=/trunk/; revision=50154
 2013-06-25 22:02:20 +00:00
Guy Harris 15a0d1f945 Update various warning-option lists to match what the configure script 
adds by default.

svn path=/trunk/; revision=49670
 2013-06-01 02:20:12 +00:00
Jörg Mayer 7ad85db8e1 Move -Wlogical-op to list of standard compiler flags for c-only. 
svn path=/trunk/; revision=49668
 2013-06-01 00:13:25 +00:00
Guy Harris 9f11d6cd44 capture_unix_ifnames.c is gone. 
svn path=/trunk/; revision=49490
 2013-05-22 04:17:23 +00:00
Michael Tüxen eded0ecb14 Suppress warnings when using Apple's C compiler. 
svn path=/trunk/; revision=49305
 2013-05-14 21:01:19 +00:00
Jörg Mayer 5ba458916a Move common code into UseAsn2Wrs.cmake. 
Include the new file.
Use the new file.
Add cmake support to rebuild the gsm_map dissector.

svn path=/trunk/; revision=49194
 2013-05-07 03:25:49 +00:00
Jörg Mayer 436270ffab Sort the list of packages to make it easier to check results. 
svn path=/trunk/; revision=49107
 2013-05-01 10:40:12 +00:00
Jörg Mayer 30653b7e16 - 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
 2013-05-01 09:20:59 +00:00
Jörg Mayer cd160c7af2 Our scripts do ont work with python3, so only pick up a python2 
executable.

Reported on #wireshark by McEnroe

svn path=/trunk/; revision=49102
 2013-05-01 00:53:59 +00:00
Guy Harris 2cd4b0f607 Fix suspected copy-and-pasteo. 
svn path=/trunk/; revision=49078
 2013-04-28 01:09:00 +00:00
Jörg Mayer c3d7f57f58 Add Qt5 build support with cmake. Just do cmake ... -DENABLE_QT5=ON ... 
svn path=/trunk/; revision=49042
 2013-04-25 23:04:19 +00:00
Jörg Mayer 8faa262e90 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
 2013-04-23 23:05:33 +00:00
Jörg Mayer 4f8cb5fdc3 Mimic autoconf behavior and enable -Wc++-compat by default. 
svn path=/trunk/; revision=48992
 2013-04-22 22:32:03 +00:00
Jörg Mayer 8c11433414 Revert 
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46575

User: gerald                                                                           Date: 2012/12/17 01:24 PM

Log:
 Add libui_dirty.

This is the autofoo way of solving the problem.

Implement the cmake solution (which is used in wiretap/ and other places)
which does not require building a separate lib.

svn path=/trunk/; revision=48976
 2013-04-22 19:00:29 +00:00
Jörg Mayer f8dc3aab11 Use -Wshadow in cmake builds 
svn path=/trunk/; revision=48949
 2013-04-21 08:16:07 +00:00
Balint Reczey a8f543b56b Merge asn2deb and idl2deb from official Debian package 
svn path=/trunk/; revision=48133
 2013-03-06 13:31:08 +00:00
Balint Reczey 1eb5e1d739 Revert "Make Solaris Studio hide internal shared library symbols by default" 
This reverts commit r48020.

svn path=/trunk/; revision=48022
 2013-03-02 22:27:40 +00:00
Balint Reczey 73aafe2bc4 Make Solaris Studio hide internal shared library symbols by default 
svn path=/trunk/; revision=48020
 2013-03-02 22:11:26 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define 
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
 2013-03-01 23:53:11 +00:00
Balint Reczey 45c2884f1b Export libwsutil symbols using WS_DLL_PUBLIC define 
This change replaces *.def and *.sym file usage following the
guideline at http://gcc.gnu.org/wiki/Visibility

svn path=/trunk/; revision=47938
 2013-02-28 14:09:46 +00:00
Balint Reczey d2e0724afc Add dumpabi targets to CMake builds 
Also update automake generated targets to match CMake generated ones

svn path=/trunk/; revision=47879
 2013-02-25 18:12:20 +00:00
Guy Harris ab3840049e Reflect the move of recent.c to the ui directory. 
svn path=/trunk/; revision=47439
 2013-02-02 05:25:39 +00:00
Gerald Combs 6b3308d113 Use CMAKE_VERSION for the Info.plist comment. 
svn path=/trunk/; revision=47152
 2013-01-18 16:05:29 +00:00
Gerald Combs a377c7c38d Generate Info.plist using CMake and enable it in QtShark.pro. Update the dates. 
svn path=/trunk/; revision=47143
 2013-01-18 01:37:27 +00:00
Gerald Combs 962b4f08f7 Move common time shifting code to ui/time_shift.[ch]. Change the 
shifting routines to return an error message on failure or NULL on
success.  Prettify and simplify the layout of the GTK+ time shift
dialog. Make the cancel button work as expected.

Add a time shift dialog to the Qt port. I used a Mad Lib (sentence)
layout. Hopefully that won't make translation too difficult.  For some
reason time shifts aren't immediately shown in the packet detail. This
appears to be a bug in the packet list / packet detail code.

Add warning role color definitions to tango_colors.h and use them.

svn path=/trunk/; revision=46680
 2012-12-21 17:37:57 +00:00
Michael Tüxen 2440176cab Use pcapio routines. This concludes the preperation for 
adding pcapng support.

svn path=/trunk/; revision=46673
 2012-12-21 14:34:26 +00:00