Gerald Combs
f60e81aaac
Fix compilation under VS6 (hopefully without breaking compilation
...
anywhere else). Instead of using getaddrinfo() and getnameinfo(),
promote inet_pton.c and inet_ntop.c to the top level and use those
routines instead.
(It's 2007, for crying out loud. Why is this even an issue?)
svn path=/trunk/; revision=22075
2007-06-11 18:26:09 +00:00
Gerald Combs
a491fec183
From Mike Harvey: Support for WiMAX and the WiMAX M2M encapsulation protocol.
...
Add support for WiMAX and M2M to various makefiles and installer files. Add
basic support for M2M to randpkt.
svn path=/trunk/; revision=21945
2007-05-25 23:40:42 +00:00
Luis Ontanon
11f06217ce
Have editcap and capinfos loading the wiretap plugins.
...
epan/filesystem.c
have get_plugin_dir() calling init_plugin_dir() if necessary
epan/epan.c and epan/report_err.c
move the report_failure family into the new report_err.c file, have epan_init() calling the initializer
epan/plugins.h and epan/proto.c
do not have init_plugins() calling the proto_reg functions instead do it in init_proto()
gtk/main.c and tshark.c
init_plugin_dir() has become suprefluous
capinfos.c and editcap.c
load the wiretap plugins
Makefiles
do what's needed to build withe the above changes.
svn path=/trunk/; revision=21935
2007-05-25 17:22:32 +00:00
Gerald Combs
55d2b928c2
From Dustin Johnson:
...
- Update the wireless/AirPcap GUI code to support 802.11n as well as
some related upcoming code changes.
- Remove airpcap.h from the repository, since it exists in the AirPcap
devpack (and will be superseded Real Soon Now).
- Show the individual channel flag bits in radiotap.
Fix the 802.11n MCS set display.
This is a partial checkin, so hopefully nothing is broken.
svn path=/trunk/; revision=21831
2007-05-18 21:06:20 +00:00
Gerald Combs
253eee10e2
Update to the latest Win32 libraries.
...
svn path=/trunk/; revision=21770
2007-05-14 17:07:34 +00:00
Ulf Lamping
dd8feca514
from Gerhard Gappmeier (ascolab):
...
new dissector for OPCUA protocol
svn path=/trunk/; revision=21760
2007-05-14 13:58:54 +00:00
Ulf Lamping
6ace4fef21
fix manifest dll error
...
svn path=/trunk/; revision=21736
2007-05-09 06:35:13 +00:00
Ulf Lamping
0abc3ba979
instead of copying the MSVC 2005 manifest files around, embed them into the .exe / .dll files - this way is easier to handle while packaging and alike, and probably will solve some problems. We might want to do this for the plugins as well later.
...
svn path=/trunk/; revision=21696
2007-05-06 09:17:19 +00:00
Gerald Combs
161c7f8b8c
If MSVCR_DLL or VCREDIST_EXE are defined, add them to the zip packages.
...
Zip the entire directory instead of just the top-level contents.
svn path=/trunk/; revision=21378
2007-04-10 21:30:40 +00:00
Jeff Morriss
5a0cd55e15
Remove references to the megaco plugin from the top level Makefiles.
...
svn path=/trunk/; revision=21198
2007-03-26 01:56:51 +00:00
Anders Broman
4c92cbef0e
Use the latest GTK stuff.
...
svn path=/trunk/; revision=21122
2007-03-22 22:26:59 +00:00
Bill Meier
3b01588444
Even simpler: use 'rm -rf gtk2.tmp'
...
svn path=/trunk/; revision=21107
2007-03-22 02:51:21 +00:00
Bill Meier
001379b624
Use correct 'rm -f gtk2.tmp/*' so all files in dir get deleted
...
svn path=/trunk/; revision=21106
2007-03-22 02:44:52 +00:00
Ulf Lamping
45c8c7a843
fix MSVC warnings of / and set CFLAGS to block new warnings
...
svn path=/trunk/; revision=21098
2007-03-21 23:14:23 +00:00
Ulf Lamping
8d11a786e7
minor clean_setup target enhancements
...
svn path=/trunk/; revision=21040
2007-03-17 00:36:40 +00:00
Anders Broman
96838a7064
Use the latest GTK packages for Windows.
...
svn path=/trunk/; revision=21024
2007-03-14 07:12:55 +00:00
Ulf Lamping
cd5aae8116
instead of putting the MSC_VER_REQUIRED test into the root Makefile (which would require to change ALL makefiles - the buildbot revealed it), simply put it in the wiretap generation. As wiretap is mandatory and one of the first things to be build this doesn't even sound like a bad idea anyway ...
...
svn path=/trunk/; revision=20646
2007-01-31 05:26:41 +00:00
Ulf Lamping
5698c994ca
C preprocessor only handles integers for conditional compilation. Build MSC_VER_REQUIRED in config.nmake and compare it with _MSC_VER in config.h.win32
...
svn path=/trunk/; revision=20637
2007-01-31 02:23:06 +00:00
Ulf Lamping
e9cf850201
As discussed on the devlist:
...
A clean_setup is done first now to ensure that the target dirs don't contain old files - probably remaining from a previous setup run.
explicit removing of the gtk2 dir is no longer required therefore
svn path=/trunk/; revision=20497
2007-01-19 02:41:25 +00:00
Ulf Lamping
020e10eabb
add the user-guide as a component to the setup target
...
svn path=/trunk/; revision=20495
2007-01-19 01:10:59 +00:00
Anders Broman
ceb60b0a6d
Update to use the latest GTK packages.
...
Win32-setup.sh changed to overwrite existing folders.
svn path=/trunk/; revision=20463
2007-01-17 19:14:11 +00:00
Ulf Lamping
2b15cb0156
don't generate zlib1.dll over and over again
...
svn path=/trunk/; revision=20396
2007-01-11 22:05:59 +00:00
Ulf Lamping
a7e01a7dc8
fix some zlib build issues
...
svn path=/trunk/; revision=20382
2007-01-10 21:42:34 +00:00
Ulf Lamping
15d125cefc
add a missing dependency to the zlib1.dll, so it will be generated before wiretap
...
svn path=/trunk/; revision=20362
2007-01-10 00:35:01 +00:00
Ulf Lamping
550c897251
the makefile dependencies are just killing me ;-) Maybe this is the right way to go ...
...
svn path=/trunk/; revision=20342
2007-01-08 07:42:26 +00:00
Ulf Lamping
50750f6ecd
fix general compilation:
...
- compile wiretap unconditionally
fix .NET1.1 + PSDK compilation:
- lib.exe tool not available, build dll only (that's just enough)
- copy zlib1.dll.manifest file only if it's available, MSVC2003 doesn't generate it
svn path=/trunk/; revision=20340
2007-01-08 05:03:17 +00:00
Ulf Lamping
e456b4fcd6
if we don't have MSVC6, download (using the setup target) the zlib source package instead of the dll one, and compile it in a temp dir before continuing with wiretap
...
svn path=/trunk/; revision=20337
2007-01-08 02:40:06 +00:00
Ulf Lamping
1a25d263d6
don't spread the AirPcap DevPack files over the libs dir, unzip files into: AirPcap_Devpack_1_0_0_594
...
svn path=/trunk/; revision=20324
2007-01-05 05:23:02 +00:00
Gerald Combs
7d0118ff10
Update to the latest Win32 libs: Net-SNMP 5.4 and GNUTLS 1.6.1. Enable
...
AirPcap.
svn path=/trunk/; revision=20321
2007-01-05 01:35:23 +00:00
Ulf Lamping
59cebb950f
remove the PDB_FILE setting from config.nmake - there's no real need for this info
...
add some missing files to the clean targets
svn path=/trunk/; revision=20290
2007-01-03 05:41:11 +00:00
Ulf Lamping
0eec920b42
fix epan\crypt\crypt-md5.obj
...
svn path=/trunk/; revision=20289
2007-01-03 05:08:20 +00:00
Ulf Lamping
83072738c7
if exist, the install targets should copy pdb and manifest files along with the exe and dll ones
...
svn path=/trunk/; revision=20280
2007-01-03 00:10:57 +00:00
Gerald Combs
53689800e6
Move epan/crypt-md5.[ch] to epan/crypt. Remove
...
epan/crypt/airpdcap_md5.[ch]. Fix up whitespace.
svn path=/trunk/; revision=20277
2007-01-02 22:49:57 +00:00
Guy Harris
04ca66dfb1
Ehtereal[sic] -> Wireshark. :-)
...
Give a little more detail in the comment in the H.248 dissector about
"MEGACO" vs. "H.248".
svn path=/trunk/; revision=20262
2007-01-02 09:20:27 +00:00
Gerald Combs
bd282b4114
Move the contents of airpdcap to epan/crypt. Try to fix the current
...
distcheck failure. Move the nmake build targets for airpdcap from
epan/dissectors to epan. This will probably break the Windows build.
svn path=/trunk/; revision=20231
2006-12-28 17:22:12 +00:00
Anders Broman
0e063dc29c
Use portaudio v19.
...
svn path=/trunk/; revision=20225
2006-12-27 22:21:46 +00:00
Bill Meier
81ab78cddb
Uh Oh: Fix to properly set SH_FLAGS with 'igncr' if required as part of the nmake;
...
I violated Murphy's nth law: thou shalt test fixes in an
'out of the box' configuration *not* in one's customized configuration.
:(
svn path=/trunk/; revision=20221
2006-12-26 22:40:49 +00:00
Ulf Lamping
0d43782ae7
convert line endings (using dos2unix) of the win32_setup.sh file before using it
...
svn path=/trunk/; revision=20215
2006-12-26 12:40:37 +00:00
Gerald Combs
b90006ac6f
Update to GNUTLS 1.6.0.
...
svn path=/trunk/; revision=20204
2006-12-23 00:06:16 +00:00
Bill Meier
42d5c2906f
use 'rm -rf' so no error if directory already deleted (by 'clean_setup')
...
svn path=/trunk/; revision=20190
2006-12-22 00:38:53 +00:00
Anders Broman
686b41801c
Update to use gtk 2.10.6 and friends.
...
svn path=/trunk/; revision=20188
2006-12-21 22:15:34 +00:00
Jörg Mayer
e26860607d
Get rid of UCD SNMP support (it's not longer supported and
...
superseeded by net-snmp). Replace some_snmp by net_snmp
where appropriate.
svn path=/trunk/; revision=20071
2006-12-08 15:05:41 +00:00
Gerald Combs
8e397a2617
Don't define HAVE_AIRPDCAP if HAVE_AIRPCAP isn't defined. Fix a compiler
...
warning in the 802.11 dissector.
svn path=/trunk/; revision=20053
2006-12-06 20:29:54 +00:00
Gerald Combs
a980d04783
From Davide Schiera and Giorgio Tino: Add initial WPA/WPA2 decryption
...
support.
WEP key preferences have been overloaded to allow WPA keys. The
decryption code currently uses Windows-specific data types, but can be
converted to use glib equivalents.
Add a few text and whitespace fixups.
svn path=/trunk/; revision=20049
2006-12-05 19:24:25 +00:00
Bill Meier
bf209eec73
Use 'igncr' as needed with Bash (workaround for bug report 1162);
...
Change usage of 'nmake' to $(MAKE) /$(MAKEFLAGS) in a few places;
Add one missing /$(MAKEFLAGS);
svn path=/trunk/; revision=20034
2006-12-04 05:41:53 +00:00
Ulf Lamping
f5e8f21286
if the WIRESHARK_LIBS dir isn't already existing, create it
...
this fixes problems discussed earlier on the list with cygpath
svn path=/trunk/; revision=19934
2006-11-19 17:02:31 +00:00
Ulf Lamping
405813eb42
fix clean_setup target
...
svn path=/trunk/; revision=19933
2006-11-19 16:49:58 +00:00
Ulf Lamping
9fb143d508
add the /LARGEADDRESSAWARE to the link process of Wireshark(2) and Tshark. See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/memory/base/physical_address_extension.asp how to enable 3GB support on several Windows versions - I will update the OutOfMemory Wiki page accordingly
...
svn path=/trunk/; revision=19923
2006-11-17 22:48:21 +00:00
Anders Broman
09bd61c233
Update to use the latest gtk 2.8 glib and pango libraries.
...
Note from a mail on gtk dev list:
-rwxr-xr-x 1 tml Administ 224510 Oct 3 18:35 libpango-1.0-0.dll
-rwxr-xr-x 1 tml Administ 37952 Oct 3 18:35 libpangocairo-1.0-0.dll
-rwxr-xr-x 1 tml Administ 58749 Oct 3 18:35 libpangowin32-1.0-0.dll
(That's the relevant DLLs from the "bin" folder in Pango 1.14.5, where
the module(s) are built-in into the DLLs, so no
lib/pango/1.5.0/modules folder is needed.)
svn path=/trunk/; revision=19880
2006-11-12 22:18:50 +00:00
Ulf Lamping
e13cec2560
don't copy mibs.txt files to mibs, but to snmp\mibs
...
svn path=/trunk/; revision=19856
2006-11-07 09:36:26 +00:00
Anders Broman
261a964be1
Remove the references to acn
...
svn path=/trunk/; revision=19835
2006-11-06 20:49:47 +00:00
Ulf Lamping
826b611290
fix the GTK-WIMP paths for GTK2.8 - both source and destination paths completely changed from 2.6 to 2.8 due to the integration of Wimp into the main GTK repository
...
remove settings for GTK2.2 and 2.4 in config.nmake - as no one uses it IMHO
svn path=/trunk/; revision=19715
2006-10-27 12:06:13 +00:00
Anders Broman
c8ecc89dec
Missed a change.
...
svn path=/trunk/; revision=19696
2006-10-26 07:34:10 +00:00
Anders Broman
0880bc54d0
Preparations for using the latest GTK 2.8 files for now only gettext is updated.
...
svn path=/trunk/; revision=19695
2006-10-26 07:25:07 +00:00
Bill Meier
658fbf4314
rdm now not a plugin - don't copy dll
...
svn path=/trunk/; revision=19600
2006-10-19 03:45:34 +00:00
Gerald Combs
3208402386
If .svn/entries exists, add it as a dependency to svnversion.h.
...
svn path=/trunk/; revision=19598
2006-10-18 20:30:15 +00:00
Ulf Lamping
9f62a052a4
distclean should remove wireshark-gtk1/2 dirs completely
...
svn path=/trunk/; revision=19509
2006-10-13 00:21:47 +00:00
Bill Meier
cf20149616
If GTK1_DIR or GTK2_DIR not defined, then corresponding install-common-deps should not be invoked....
...
svn path=/trunk/; revision=19458
2006-10-09 02:07:44 +00:00
Graeme Lunt
012a218a51
Patch for clean, distclean and maintainer-clean targets for U3 packaging.
...
svn path=/trunk/; revision=19431
2006-10-04 18:08:51 +00:00
Ulf Lamping
0be3b04cb1
as noted by Anders Broman: the Win2000 version of copy don't like the /d switch
...
svn path=/trunk/; revision=19395
2006-10-02 19:07:01 +00:00
Ulf Lamping
e3883affdd
that wasn't a typo, xcopy can't rename files that way
...
svn path=/trunk/; revision=19372
2006-09-30 00:45:03 +00:00
Anders Broman
fdd6b40b4b
Fixa a typo copy -> xcopy
...
svn path=/trunk/; revision=19357
2006-09-29 05:53:47 +00:00
Gerald Combs
0678c4f7c4
Update GNUTLS to 1.5.1. This includes an updated libgcrypt, which should
...
fix bug 1096.
Switch back to fetching a date-stamped URL in win32-setup.sh. This
ensures backward compatibility with previous releases and non-updated
SVN trees.
svn path=/trunk/; revision=19339
2006-09-27 18:02:40 +00:00
Luis Ontanon
354983d30d
use luaforge's 5.1 dll to be able to link on windows. fix some mistakes
...
svn path=/trunk/; revision=19331
2006-09-27 00:45:55 +00:00
Luis Ontanon
e13832cbe3
The forgotten files!
...
svn path=/trunk/; revision=19325
2006-09-26 03:36:31 +00:00
Ulf Lamping
4c6484334c
fix a typo
...
svn path=/trunk/; revision=19303
2006-09-23 08:39:54 +00:00
Ulf Lamping
3fa7bc5f0c
change the Win32 build environment, so we can create release zip files without the need of an installer - a feature requested from time to time. When this is matured, we might want to add these zip files (of GTK1 and GTK2 versions) to the released files.
...
config.nmake contains the target INSTALL1_DIR and INSTALL2_DIR. I guess you can retain the previous behaviour by using . for both DIRs, though I never tested this...
svn path=/trunk/; revision=19302
2006-09-23 01:39:07 +00:00
Ulf Lamping
adb7fcedcf
add a packaging_u3 target
...
rename gtk2_distclean -> clean_gtk2.tmp (as that's what it's really doing)
svn path=/trunk/; revision=19295
2006-09-22 23:16:31 +00:00
Jörg Mayer
5f9300b9e2
Makefile.nmake
...
config.h.win32
- Use HAVE_LIBPORTAUDIO instead of HAVE_PORTAUDIO to make
sure we use the same var everywhere (including sources
and autofoo stuff).
- Use PORTAUDIO_API_1 everywhere
version_info.c
- Include <portaudio.h>
- Add some , and breaks when printing version infos.
svn path=/trunk/; revision=19218
2006-09-12 18:43:56 +00:00
Ulf Lamping
e8ddc809b5
fix the generation of config.h, some HAVE_... were wrong
...
svn path=/trunk/; revision=19216
2006-09-12 17:46:55 +00:00
Ulf Lamping
02b49da1b2
add a missing dependency from wiretap to the image dir, otherwise image/wiretap.res can't be generated for some targets
...
svn path=/trunk/; revision=19202
2006-09-12 08:24:01 +00:00
Ulf Lamping
b16e2c43c5
Hmmm, don't optimize too much :-)
...
also fix the clean_setup
svn path=/trunk/; revision=19199
2006-09-12 01:04:35 +00:00
Ulf Lamping
04fe34d711
various nmake related build file cleanups
...
svn path=/trunk/; revision=19198
2006-09-12 00:27:03 +00:00
Ulf Lamping
9fee393b87
tweak the nmake build so the NET-SNMP library is in fact optional (as it is in the UNIX builds)
...
svn path=/trunk/; revision=19196
2006-09-11 22:47:57 +00:00
Bill Meier
9568b76a63
minor cleanup for making codecs
...
svn path=/trunk/; revision=19184
2006-09-10 13:37:42 +00:00
Anders Broman
1129da54e8
Handle PORTAUDIO_API_1 and add clean-deps target to distclean.
...
svn path=/trunk/; revision=19159
2006-09-05 20:35:41 +00:00
Anders Broman
2a7bfe21f4
Fix a typo for rtp_player
...
svn path=/trunk/; revision=19137
2006-09-04 18:11:02 +00:00
Anders Broman
0eba6491bd
Include codecs in the all target.
...
svn path=/trunk/; revision=19123
2006-09-02 16:55:31 +00:00
Anders Broman
9ea41277f9
Fix path and name.
...
svn path=/trunk/; revision=19120
2006-09-02 14:18:47 +00:00
Guy Harris
0ec3e5661f
Move the codecs into a top-level "codecs" subdirectory; there's no
...
guarantee that all programs using the codecs will necessarily be using
GTK+.
svn path=/trunk/; revision=19117
2006-09-02 06:39:43 +00:00
Ulf Lamping
2f9fe3a928
fix a suspected typo of the portaudio commit
...
svn path=/trunk/; revision=19095
2006-08-30 22:26:34 +00:00
Anders Broman
7eac3c2879
From Alejandro Vaquero:
...
- Change the "listen_rtp" to "rtp_player"
- Change from a plugin to be part of the core
- By default it will not compile with the rtp_player. In order to
compile it is necessary to:
+ For windows: uncomment the line
"PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1" in config.nmake
+ For linux: using the "--with-portaudio=yes"
svn path=/trunk/; revision=19094
2006-08-30 21:51:31 +00:00
Guy Harris
46bcd17054
Fix cut-and-pasteo.
...
svn path=/trunk/; revision=18953
2006-08-19 00:24:40 +00:00
Gerald Combs
f9661850d1
Add support for AirPcap, an upcoming wireless product from CACE. Support
...
is disabled by default, and can be enabled by setting AIRPCAP_CONFIG
in config.nmake. The code is currently limited to Windows, but should
be adaptable to other platforms.
The official announcement won't come until next week, so you'll have to
read the source for details. :)
svn path=/trunk/; revision=18928
2006-08-16 18:01:25 +00:00
Gerald Combs
4f16b6b178
Point to the newest (1.5.0-1) GnuTLS package. Since it contains
...
libgcrypt, enable it in the Windows build.
In packet-ipsec.c:
- Remove non-constants from variable declaration initializations.
- Use ep_alloc() in a couple of places.
- Fix an off-by-one error.
- Reduce the number of SAs in the preferences from 4 to 2. 4 made the
preferences window absolutely enormous. This is probably the wrong
way to fix this.
- Fix up whitespace.
svn path=/trunk/; revision=18856
2006-08-09 02:00:05 +00:00
Ronnie Sahlberg
0238e4a076
enable kerberos for windows for the win32 build
...
svn path=/trunk/; revision=18852
2006-08-08 07:52:15 +00:00
Gerald Combs
0213f60e4b
Add GNUTLS to the Windows build.
...
In packet-ssl.c, move ssl_set_debug() up a bit so that we can debug key
file parsing.
svn path=/trunk/; revision=18850
2006-08-07 19:52:18 +00:00
Ronnie Sahlberg
02002f6ef6
if KFW is enabled, we need to temporarily copy the two required DLLs to the build directory since they are required during the build
...
svn path=/trunk/; revision=18839
2006-08-05 04:41:42 +00:00
Ronnie Sahlberg
db179bb768
config and makefile magic we need when we integrate kerberos for windows with the w32 build
...
disabled for now
svn path=/trunk/; revision=18838
2006-08-05 04:32:57 +00:00
Gerald Combs
80fdf2f263
Fix editcap compilation under Windows.
...
svn path=/trunk/; revision=18801
2006-07-27 17:59:05 +00:00
Ronnie Sahlberg
950bd73948
we dont need our own snprintf any more since we always use g_snprintf() instead.
...
svn path=/trunk/; revision=18771
2006-07-20 10:19:47 +00:00
Gerald Combs
68b631ac45
Switch to Net-SNMP 5.3.1.
...
svn path=/trunk/; revision=18744
2006-07-17 14:11:42 +00:00
Gerald Combs
6cda517c79
Update to Net-SNMP 5.3.0.1.
...
svn path=/trunk/; revision=18673
2006-07-06 19:52:48 +00:00
Gerald Combs
eb71f7fb96
Rename the main executable to "wireshark", along with more conversions:
...
ethereal.com -> wireshark.org
mailing lists and addresses
ETHEREAL -> WIRESHARK
Man pages
Automake/Autoconf names
svn path=/trunk/; revision=18271
2006-05-31 19:12:15 +00:00
Gerald Combs
8958bab6de
Tethereal/tethereal -> TShark/tshark.
...
svn path=/trunk/; revision=18268
2006-05-31 17:38:42 +00:00
Gerald Combs
b15974d094
libethereal -> libwireshark. idl2eth -> idl2wrs. There are a _lot_ of
...
changes here. It compiles OK on OS X, but hasn't been tested anywhere else.
svn path=/trunk/; revision=18260
2006-05-31 00:23:01 +00:00
Gerald Combs
1ddc8d2d45
ETHEREAL_LIBS -> WIRESHARK_LIBS
...
svn path=/trunk/; revision=18250
2006-05-30 01:26:47 +00:00
Ronnie Sahlberg
f0b33a4789
ethereal->wireshark updates
...
svn path=/trunk/; revision=18206
2006-05-22 08:14:01 +00:00
Guy Harris
aa1e053ce6
If we have pcap_breakloop(), at least on UN*X we can stop the capture
...
with a pcap_breakloop() call - we don't need to call select() before
calling pcap_dispatch().
Even if we do need to call select(), we don't need to supply it with a
timeout - it's OK if we block indefinitely, as the signal will interrupt
select().
That also means we can pass -1 as the count to pcap_dispatch(), as
pcap_breakloop() will terminate the loop in pcap_dispatch().
Use sigaction() to catch SIGUSR1, so we can make sure that the signal
handler doesn't get reset when the signal is delivered, and that system
calls don't restart when we return from the signal handler.
svn path=/trunk/; revision=18201
2006-05-21 21:32:04 +00:00
Jaap Keuter
103ad0253f
Change to address bug 933. See if this, after setup, includes the updated GTK-Wimp.
...
svn path=/trunk/; revision=18172
2006-05-16 15:49:03 +00:00