Commit Graph

1060 Commits

Author SHA1 Message Date
Gerald Combs 423669df7d Back out r33088 for now.
svn path=/trunk/; revision=33102
2010-06-05 00:29:31 +00:00
Gerald Combs f6b2458924 From Matt Poduska via bug 1957 (with minor changes):
New dissector (plugin) to support decode of the EPCglobal Low-Level Reader
protocol (see llrp.org for more information). This dissector has passed fuzz
testing.

svn path=/trunk/; revision=33088
2010-06-04 18:45:02 +00:00
Guy Harris 61e40b5c52 Wireshark requires routines from libm, such as ceil(), so link with it;
we shouldn't rely on getting it pulled in by other shared libraries, as

	1) there's no guarantee that the other shared libraries we use
	   are linked with it or will continue to be linked with it;

	2) there's no guarantee that we're even linking dynamically;

	3) it fails on Fedora 13 as part of a change to catch programs
	   that implicitly (or explicitly) assume, in their build
	   procedures, that they'll get libraries linked in as a result
	   of linking with other libraries.

svn path=/trunk/; revision=33028
2010-05-31 19:37:26 +00:00
Jeff Morriss 47e2d75820 Move some code (including the optional objects) into libwsutil
svn path=/trunk/; revision=33012
2010-05-28 20:19:55 +00:00
Jaap Keuter 876187e1db Add CPackConfig.txt to the tarball.
svn path=/trunk/; revision=32859
2010-05-18 06:03:05 +00:00
Jeff Morriss 63142aa9e1 Add CMakeOptions.txt to the source distribution
svn path=/trunk/; revision=32837
2010-05-17 02:43:15 +00:00
Jeff Morriss 54082c6ed0 Add Cmake stuff to the source distribution so more people can try it out.
svn path=/trunk/; revision=32807
2010-05-14 16:27:03 +00:00
Jeff Morriss ff78e6ad11 Fix a typo in a comment
svn path=/trunk/; revision=32580
2010-04-27 18:08:03 +00:00
Gerald Combs 6cd62e9e65 Rename README.win32 to README.windows and add a 64-bit download link.
Add tools/textify.sh, which makes a Notepad-clickable copy of a text
file. Use it for COPYING, NEWS, README, README.windows, and help/*.txt.

Remove tools/unix2dos.pl and use Cygwin's u2d instead.

svn path=/trunk/; revision=32440
2010-04-09 21:42:51 +00:00
Gerald Combs 1426281ebd Add --enable-setcap-install and --with-dumpcap-group.
svn path=/trunk/; revision=32421
2010-04-08 00:02:29 +00:00
Anders Broman ed3838ac13 From KATAOKA Toshihiro:
Diameter Mobile IPv6 is not decoded.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4597
(I added some more IANA updates as well).

svn path=/trunk/; revision=32235
2010-03-18 21:29:58 +00:00
Uwe Girlich c4d29dfd99 This adds a new dissector plugin: INTERLINK. This protocol is used in
(real and simulated) BMW cars for all kinds of gadget communication.
My plugin only dissects the high level infrastructure and not any particular
messages. It uses a heuristic dissector to detect INTERLINK packets.

svn path=/trunk/; revision=32202
2010-03-16 06:58:25 +00:00
Jeff Morriss e6b0f7cdfd Use automake to build things in docbook/ .
This at least gets the docbook source distributed, as requested in:

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

Still to do:
	1) get out-of-source-tree builds working
	2) automatically check that everything is distributed with distcheck
	   (requires (1) but it may also require building the docbook
	   directory as part of "make all")
	3) (optional) use automake rules to actually build the stuff (currently
	   Makefile.am is basically some automake stuff wrapped around standard
	   Makefile rules. Could this done better?)

svn path=/trunk/; revision=31858
2010-02-10 22:12:22 +00:00
Stig Bjørlykke 229d8368bc Set correct locale in make-version.pl instead of in Makefiles.
Added back add_custom_command for svnversion.h.
Removed unnecessary text2pcap_CLEAN_FILES.
Fix indent for ps.c command.

svn path=/trunk/; revision=31525
2010-01-14 15:43:33 +00:00
Bill Meier bb1873f343 Fix 'make rpm-package' so it works again ...
Specifically: configure.in was changed in SVN 31068
 to "Switch to .tar.bz2 for the "dist" target since
 that's what most people download".

So: This patch has the required additional changes.


svn path=/trunk/; revision=31481
2010-01-10 19:24:26 +00:00
Stig Bjørlykke bb7a92016d Added osx-install target, to copy Wireshark.app to /Applications
svn path=/trunk/; revision=31403
2010-01-01 20:33:28 +00:00
Gerald Combs 7c276becfd Add SHA1, RMD160, and MD5 hashes to capinfos.
svn path=/trunk/; revision=31191
2009-12-07 23:18:12 +00:00
Gerald Combs 9f1ea1c66a Add and remove doc icons from the distribution.
svn path=/trunk/; revision=31007
2009-11-18 21:37:34 +00:00
Anders Broman b16fab6435 From Alejandro Vaquero:
Add RTP player to "RTP Stream Analysis" and makeover of VoIP flow
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4240

svn path=/trunk/; revision=30967
2009-11-15 20:13:08 +00:00
Gerald Combs 9495754ee8 Add a USB network icon.
svn path=/trunk/; revision=30941
2009-11-12 18:10:34 +00:00
Gerald Combs 3d40778d1b Move the contents of image/expert_*.h to gtk/expert_indicators.h. Add
pixbuf versions of the wired, wireless, and bluetooth interface icons to
gtk/network_icons.h. In the interface list use the new icons in all
their alpha-channel-infested glory. Add Makefile targets for rebuilding
the pixbuf files.

svn path=/trunk/; revision=30922
2009-11-10 18:02:05 +00:00
Gerald Combs d54eea534e Add a convenience routine to convert pixbuf data generated by
gdk-pixbuf-csource to a GtkImage. Use it to load the expert indicator
images. Add prettier indicator images. The "chat" indicator is more blue
in order to differentiate it from the "none" indicator; make the chat
text background more blue to match.

svn path=/trunk/; revision=30825
2009-11-04 21:16:38 +00:00
Kovarththanan Rajaratnam 1b2498d074 Move make-tapreg-dotc to tools/make-tapreg-dotc
svn path=/trunk/; revision=30284
2009-10-04 08:10:54 +00:00
Kovarththanan Rajaratnam f8a47b5459 Add rdps.py to EXTRA_DIST in tools/Makefile.am instead
svn path=/trunk/; revision=30282
2009-10-04 07:57:35 +00:00
Kovarththanan Rajaratnam ac8f637590 Move rdps.py to tools/rdps.py
svn path=/trunk/; revision=30281
2009-10-04 07:50:36 +00:00
Kovarththanan Rajaratnam 974849a9a0 Remove strcasecmp. We use g_ascii_strcasecmp exclusively
svn path=/trunk/; revision=29643
2009-08-31 19:47:50 +00:00
Bill Meier e10eb5770c Revised packaging for the Radius directory:
include new Radius dictionary files & etc.

svn path=/trunk/; revision=29043
2009-07-09 20:31:22 +00:00
Jaap Keuter c556ce7ee0 Add missing packaging file (according to Debian Policy Manual).
svn path=/trunk/; revision=29007
2009-07-08 05:20:30 +00:00
Gerald Combs 72a20c1695 Pull mkstemp() into tempfile.c. That's the only place we use it now, and
it's arguably the only place we _should_ use it. Add create_tempdir() to
tempfile.c and use it to create a temp directory for IP maps. This
should fix bug 3530.

(This still doesn't work on IE 8 / Vista here. IE gives an access denied
error in OpenLayers.js, but this is a separate issue).

svn path=/trunk/; revision=28920
2009-07-02 17:20:27 +00:00
Anders Broman 6a5ea97ff6 From Sebastien Decugis:
Add Missing Diameter EAP support.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3600

svn path=/trunk/; revision=28849
2009-06-26 05:48:03 +00:00
Jeff Morriss c47eeae22b Move the generated documentation (man pages, AUTHORS-SHORT-FORMAT, and
AUTHORS-SHORT) into doc/.  This cleans up the top-level Makefile.am (no more
need to have rules for each man page in both files) and solves the
parallel-build problem described in:

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

svn path=/trunk/; revision=28784
2009-06-21 12:47:48 +00:00
Stig Bjørlykke 91d45f96d3 Fix a typo in PYTHON_DIR.
svn path=/trunk/; revision=28568
2009-06-01 17:42:30 +00:00
Stig Bjørlykke 9a372f685d From Kovarththanan Rajaratnam's patch in bug 3500:
Added info about python version.

svn path=/trunk/; revision=28543
2009-05-31 16:05:13 +00:00
Sebastien Tandel 52cc5fb1e8 python binding for wireshark (first commit)
* ability to write dissectors with python for wireshark.
        documentation (http://wiki.wireshark.org/Python)


svn path=/trunk/; revision=28529
2009-05-29 21:10:40 +00:00
Gerald Combs a41b956b32 Add the FIX build files to the distribution.
svn path=/trunk/; revision=28479
2009-05-26 00:51:33 +00:00
Anders Broman 83d1303053 From Naoyoshi Ueda:
Radius dissector enhancement to support WiMAX vendor specific attributes.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3176

svn path=/trunk/; revision=27937
2009-04-02 19:05:52 +00:00
Gerald Combs cf7fb3ea9c Port rdps from C to Python. This makes it easier to cross-compile
Wireshark on Windows. The GNU toolchain changes have not been tested.

svn path=/trunk/; revision=27704
2009-03-11 22:12:05 +00:00
Jaap Keuter 23461c4382 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27506
2009-02-22 12:01:19 +00:00
Jaap Keuter 9da243b13c Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27505
2009-02-22 11:43:37 +00:00
Jaap Keuter 4683efcfe2 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27504
2009-02-22 11:25:16 +00:00
Jaap Keuter 80863f9568 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27503
2009-02-22 11:10:29 +00:00
Jaap Keuter 9fb248f1c0 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27502
2009-02-22 10:52:05 +00:00
Jaap Keuter 03bbd18a0b Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27501
2009-02-22 10:29:14 +00:00
Jaap Keuter eb77f8a35e Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27500
2009-02-22 10:04:39 +00:00
Jaap Keuter 1948ad3985 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27499
2009-02-22 09:41:05 +00:00
Jaap Keuter b171a36a4f Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27498
2009-02-22 09:24:27 +00:00
Jaap Keuter 56a1139bc0 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27497
2009-02-22 09:09:27 +00:00
Jaap Keuter 663f835c1e Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27496
2009-02-22 00:04:14 +00:00
Jaap Keuter 47f31f3f91 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27495
2009-02-21 22:22:16 +00:00
Jaap Keuter 715fd1d169 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27492
2009-02-21 20:22:40 +00:00
Ulf Lamping 974a0d94a7 add a (Windows only) bluetooth network interface icon
svn path=/trunk/; revision=27447
2009-02-13 21:35:41 +00:00
Jörg Mayer 7ce88833eb Package the newly added network_virtual_16.xpm
svn path=/trunk/; revision=27435
2009-02-12 01:29:05 +00:00
Ulf Lamping f8e5b17dbd add support for a simple GeoIP based IP Location Map, more details will follow on the dev-list
svn path=/trunk/; revision=27433
2009-02-11 20:25:17 +00:00
Jörg Mayer 1bf5b4ffbf The new icon files were missing from the distribution list.
svn path=/trunk/; revision=27360
2009-02-03 08:50:11 +00:00
Jörg Mayer 5667e75a50 Get rid of FAQ file completely: It's still available as help/faq.txt
svn path=/trunk/; revision=27359
2009-02-03 08:49:03 +00:00
Michael Tüxen fb9e53c635 Do not include dev stuff not ready for prime time yet.
svn path=/trunk/; revision=27256
2009-01-17 18:48:43 +00:00
Michael Tüxen 8ab2055892 Get rid of trailing whitespace.
svn path=/trunk/; revision=27255
2009-01-17 17:39:48 +00:00
Anders Broman 9d69607e0d Add the idl dir to distro (third try).
svn path=/trunk/; revision=27248
2009-01-16 18:10:21 +00:00
Anders Broman 42cccf3e3c Add the idl dir to distro (second try).
svn path=/trunk/; revision=27246
2009-01-16 17:30:23 +00:00
Anders Broman c53b519345 Add the idl dir to distro.
svn path=/trunk/; revision=27242
2009-01-16 07:10:05 +00:00
Tomas Kukosa b32079575b fix non-Windows dumpcap linking, it uses version_info which requires GnuTLS libs
svn path=/trunk/; revision=27197
2009-01-08 15:06:09 +00:00
Jörg Mayer 9781112aaa Bugfix: "make rpm-package" would fail if help/faq.txt didn't exist already.
The reason was that FAQ incorrectly depended on help/faq.txt. Correct
  dependency is, that both files depend only on the generator.

svn path=/trunk/; revision=27080
2008-12-22 12:28:27 +00:00
Stig Bjørlykke adf9b77ac1 From Didier Gautheron (bug 3121):
User srcdir in Makefiles for faq.py.

svn path=/trunk/; revision=26996
2008-12-14 23:56:51 +00:00
Gerald Combs 8a1109396a Update faq.py to generate a full HTML document by default. Pull in a typo
fix from FAQ. Update the makefiles to build help/faq.txt and FAQ. Remove
help/faq.txt and FAQ from the repository, since they're automatically
generated now. Remove the make-faq script.

svn path=/trunk/; revision=26980
2008-12-13 00:58:43 +00:00
Stig Bjørlykke 2de0812f1d From Alexis La Goutte (bug 3104):
Add Aruba dictionary.

svn path=/trunk/; revision=26945
2008-12-09 13:57:55 +00:00
Anders Broman 41671d662e From Marc Moussali:
Make it easier to add custom plugins.

svn path=/trunk/; revision=26627
2008-10-30 19:45:40 +00:00
Gerald Combs 11e406d6bf Make the vgcore glob a little less restrictive.
svn path=/trunk/; revision=26548
2008-10-25 03:52:40 +00:00
Gerald Combs 4a0dad5d7f aclocal-fallback/glib.m4 and aclocal-fallback/gtk.m4 are no longer part of
the distribution.

svn path=/trunk/; revision=26513
2008-10-22 15:16:13 +00:00
Jeff Morriss c08a1f420e Turn on -Werror for the top level targets, excluding text2pcap (which includes some generated code).
svn path=/trunk/; revision=26245
2008-09-21 14:59:05 +00:00
Jeff Morriss dcca906f30 http://www.gnu.org/software/libtool/manual/libtool.html#Inter_002dlibrary-dependencies
says:

"However, most shared library systems are restricted in that they only allow a
single level of dependencies. In these systems, programs may depend on shared
libraries, but shared libraries may not depend on other shared libraries."

So reverse the top-level Makefile.am change of rev 26218.  That is: link the
executables against libwsutil again.

This hopefully will fix:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1677#c23

svn path=/trunk/; revision=26227
2008-09-18 13:31:14 +00:00
Jeff Morriss 98fd7b71df Link libwireshark and wiretap against libwsutil. That was the original intent
of adding libwsutil but somehow I missed it/got it wrong.  This should solve
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1677#c18

Also remove the _DEPENDENCIES lines in epan and wiretap (as was done in the
top-level Makefile in rev 25930) so that automake will automatically figure out
the dependencies for us.

Since the those 2 libraries now link against libwsutil, don't make every
executable link against the library.  (If this works I think we can
significantly trim the list of libraries the executables link against and just
let the libraries pull in what they need--which is, apparently, the point of
the --as-needed flag: http://www.gentoo.org/proj/en/qa/asneeded.xml ).

svn path=/trunk/; revision=26218
2008-09-16 19:24:25 +00:00
Guy Harris d7304a880b Include a missing Diameter dictionary file.
svn path=/trunk/; revision=26167
2008-09-09 03:23:13 +00:00
Stig Bjørlykke 2e3039d7e8 Added image/libwsutil.rc.in to EXTRA_DIST
svn path=/trunk/; revision=25998
2008-08-13 10:34:59 +00:00
Stig Bjørlykke 8c66299585 Remove an obsolete slash.
svn path=/trunk/; revision=25971
2008-08-09 16:17:19 +00:00
Gerald Combs 9fbab46ad4 Add support for c-ares to the GNU toolchain.
svn path=/trunk/; revision=25955
2008-08-08 00:04:38 +00:00
Luis Ontanon 99331d7b99 Remove obsolete "example_snmp_users_file"
svn path=/trunk/; revision=25936
2008-08-05 20:39:31 +00:00
Jeff Morriss f695f6f531 There's no need to have _DEPENDENCIES variables (which have only a very limited
subset of the real dependencies as specified in the _LDADD variables) for
Wireshark, tshark, and the rest of the programs: by specifying the
_DEPENDENCIES variable we just prevent automake from doing its job and
automatically figuring out the dependencies for us.

This should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2765

svn path=/trunk/; revision=25930
2008-08-05 14:51:34 +00:00
Jeff Morriss 86e10880c9 Remove iconv/libiconv checks from *NIX builds: GLIB-2 provides iconv replacements.
svn path=/trunk/; revision=25765
2008-07-18 12:11:08 +00:00
Guy Harris 6b1c9b4948 Push EXTRA_DIST entries into the lowest-level Makefile.am available.
svn path=/trunk/; revision=25661
2008-07-02 07:12:42 +00:00
Guy Harris e937ed67bb Put the EXTRA_DIST items for the doc directory in doc/Makefile.am (which
doesn't need to be one of those items).

svn path=/trunk/; revision=25660
2008-07-02 05:08:43 +00:00
Guy Harris 6995b0b392 Combine the cd and the make on one lien for the checkapi rules;
otherwise, the cd runs independently of the make, and the make runs in
the current directory and thus runs another "make checkapi" (forkbomb
los!).

svn path=/trunk/; revision=25657
2008-07-02 01:53:29 +00:00
Guy Harris a04774395f Add Makefile.common files for epan/dfilter and epan/ftypes.
Add checkapi rules to Makefile.am files.

svn path=/trunk/; revision=25656
2008-07-02 01:44:30 +00:00
Guy Harris b5fc663751 libwireshark.def is in the EXTRA_DIST in epan/Makefile.am; we don't need
it in our EXTRA_DIST.

svn path=/trunk/; revision=25654
2008-07-02 01:40:51 +00:00
Stig Bjørlykke 673a730de3 Added a new make target, osx-app, to build only the app and not the dmg.
This is usefull when using the app locally.

svn path=/trunk/; revision=25646
2008-07-01 13:39:09 +00:00
Jeff Morriss 83f9ecf96f Move privileges.c and unicode-utils.c from epan to wsutil (so things like
capinfos and dumpcap don't need to depend on libwireshark nor directly pull
in those modules).  Because capinfos and editcap were only being linked with
privileges.c if we had plugins, this allows those programs to be linked when
someone is compiling --without-plugins.

svn path=/trunk/; revision=25640
2008-06-30 17:16:29 +00:00
Gerald Combs 495ddc2830 Make it obvious that this is a development version. Fix a makefile
dependency on the splash images.

svn path=/trunk/; revision=25594
2008-06-24 22:53:52 +00:00
Jeff Morriss 7eca9942fd Fix *NIX builds where we need our own inet_pton.c or inet_ntop.c . This should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2607
svn path=/trunk/; revision=25579
2008-06-24 17:57:44 +00:00
Guy Harris d1acd0ac9a Fix list of files in the debian directory.
svn path=/trunk/; revision=25448
2008-06-13 05:54:22 +00:00
Jeff Morriss 58459d3fba Create a new "Wireshark utility" library and move the mpeg-audio stuff from
wiretap to this new libwsutil.  This solves
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1677 by making libwireshark
no longer depend on libwiretap.

svn path=/trunk/; revision=25330
2008-05-20 21:51:01 +00:00
Jaap Keuter cacee64927 From Hans-Peter Bock:
Attached to this post you find a patch for integration into wireshark that adds
a dissector for SERCOS III, ethertype 0x88cd.

svn path=/trunk/; revision=25270
2008-05-10 14:44:32 +00:00
Stig Bjørlykke 3931473bb8 Add adns_dll.dep and adns_dll.rc to the tarball, as requested by Sake
and indicated by Anders.

svn path=/trunk/; revision=25183
2008-04-27 10:54:25 +00:00
Ulf Lamping be75f6fa16 remove the copied xpm stock icon files from SVN and use the "GTK built in" stock icons
this will also prevent us from showing different stock icons for "our" xpm stock icons and the "system defaults". GTK (for Windows?) changed the icon theme somewhere around V2.10 (or later?) and/or the user might use a different icon theme, so this isn't an esoteric case ;-)

svn path=/trunk/; revision=25075
2008-04-16 09:54:55 +00:00
Jörg Mayer 8ff2e54cb0 Fix "make distcheck"
Reorder some files to alphabetical order

Fix "make rpm-package" for out-of-tree builds

svn path=/trunk/; revision=25032
2008-04-14 23:29:54 +00:00
Ulf Lamping e7fde0351e add stock icons for expert info and flow graph
svn path=/trunk/; revision=25012
2008-04-14 02:09:54 +00:00
Stig Bjørlykke 3de66e38ec Renamed image/win32-file-dlg.rc to image/file_dlg_win32.rc
svn path=/trunk/; revision=24988
2008-04-13 16:21:22 +00:00
Ulf Lamping 579e6e586e remove the deleted stock items from the distribution list (missed some not mentioned in the mail)
svn path=/trunk/; revision=24804
2008-04-06 21:24:50 +00:00
Ulf Lamping 7318d58727 remove the deleted stock items from the distribution list
svn path=/trunk/; revision=24802
2008-04-06 16:24:04 +00:00
Stephen Fisher 2b1a1e2b98 Fix bug #2405: build debian-package broken: misspelled variable in Makefile.am
svn path=/trunk/; revision=24768
2008-04-04 06:24:10 +00:00
Jeff Morriss b59322ecc1 Don't link plugins against libwireshark: any program that loads the dissector
plugins should already be linked against libwireshark.

Don't link capinfos and editcap against libwireshark: they only needed to be
because the plugins were linked against libwireshark (see rev 24123 and the
ensuing discussion on -dev).

capinfos and editcap: don't complain if plugins fail to load: dissector
plugins should fail to load because they need libwireshark.  I am assuming
here that wiretap plugins don't need libwireshark (I've never seen such a
plugin but LEGO's code and comments suggest this is the case).

(The goal of this checkin is to stop linking capinfos and editcap against
libwireshark while still allowing wiretap plugins.  Since we don't have any
such plugins in the tree I do somewhat doubt the need for all this but I don't
want to be the one to remove the functionality.)

svn path=/trunk/; revision=24650
2008-03-16 00:58:15 +00:00
Gerald Combs 46bcad885a Check in the OS X packaging patch from bug 2341, since I've had
confirmation that the OS X package works on at least one system
other than my laptop.

svn path=/trunk/; revision=24640
2008-03-15 18:31:52 +00:00