diff --git a/Makefile.nmake b/Makefile.nmake index d80e50ccc8..68b9b72123 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,9 +1,10 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.88 2001/03/22 23:54:44 gram Exp $ +# $Id: Makefile.nmake,v 1.89 2001/03/23 02:05:22 gram Exp $ include config.nmake +include ############### no need to modify below this line ######### @@ -12,12 +13,14 @@ LINK= link LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) -CFLAGS=/MT -DHAVE_CONFIG_H $(LOCAL_CFLAGS) /I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule \ +CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) /I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule \ /I$(GTK_DIR) /Iepan /Iwiretap /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ /I$(PCAP_DIR)/include +CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL + {$S}.c{$O}.obj:: - $(CC) $(CFLAGS) -Fd$O\ -c $< + $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $< DISSECTOR_SOURCES = \ packet-aarp.c \ @@ -221,27 +224,30 @@ dftest_OBJECTS = \ dftest.obj EXTRA_OBJECTS = \ - snprintf.obj \ - strerror.obj \ +# snprintf.obj \ +# strerror.obj \ mkstemp.obj -ethereal_LIBS= wiretap\libwtap.lib gtk\libui.lib epan\ethereal.lib \ +ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ + gtk\libui.lib epan\ethereal.lib \ epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \ wsock32.lib user32.lib \ $(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \ $(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \ $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \ - $(PCAP_DIR)\lib\libpcap.lib + $(PCAP_DIR)\lib\wpcap.lib -tethereal_LIBS= wiretap\libwtap.lib epan\ethereal.lib \ +tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ + epan\ethereal.lib \ epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \ wsock32.lib user32.lib \ $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \ - $(PCAP_DIR)\lib\libpcap.lib + $(PCAP_DIR)\lib\wpcap.lib -editcap_LIBS= wiretap\libwtap.lib wsock32.lib user32.lib \ +editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ + wsock32.lib user32.lib \ $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib @@ -250,7 +256,7 @@ dftest_LIBS= epan\ethereal.lib \ wsock32.lib user32.lib \ $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \ - $(PCAP_DIR)\lib\libpcap.lib + $(PCAP_DIR)\lib\wpcap.lib EXECUTABLES=ethereal.exe tethereal.exe editcap.exe @@ -258,27 +264,27 @@ RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res all: tools wiretap gtk epan $(EXECUTABLES) $(RESOURCES) -ethereal.exe : config.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res wiretap\libwtap.lib gtk\libui.lib plugins +ethereal.exe : config.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk\libui.lib plugins @echo Linking $@ $(LINK) @<< - /OUT:ethereal.exe $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res + /OUT:ethereal.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res << -tethereal.exe : config.h $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res wiretap\libwtap.lib plugins +tethereal.exe : config.h $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res wiretap\wiretap-$(WTAP_VERSION).lib plugins @echo Linking $@ $(LINK) @<< - /OUT:tethereal.exe $(LDFLAGS) /SUBSYSTEM:console $(tethereal_LIBS) $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res + /OUT:tethereal.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(tethereal_LIBS) $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res << -editcap.exe : config.h editcap.obj getopt.obj wiretap\libwtap.lib image\editcap.res +editcap.exe : config.h editcap.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res @echo Linking $@ $(LINK) @<< - /OUT:editcap.exe $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj $(editcap_LIBS) image\editcap.res + /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj $(editcap_LIBS) image\editcap.res << dftest.exe : $(dftest_OBJECTS) $(EXTRA_OBJECTS) $(LINK) @<< - /OUT:dftest.exe $(LDFLAGS) /SUBSYSTEM:console $(dftest_LIBS) $(dftest_OBJECTS) $(EXTRA_OBJECTS) + /OUT:dftest.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dftest_LIBS) $(dftest_OBJECTS) $(EXTRA_OBJECTS) << config.h : config.h.win32 diff --git a/README.win32 b/README.win32 index 20e27d602e..8b0b9d2bbd 100644 --- a/README.win32 +++ b/README.win32 @@ -1,4 +1,4 @@ -$Id: README.win32,v 1.19 2001/03/05 22:53:36 gram Exp $ +$Id: README.win32,v 1.20 2001/03/23 02:05:22 gram Exp $ Running Ethereal, Tethereal, and Editcap on Win32 ================================================= @@ -55,7 +55,7 @@ Remember, if using the the Win32 Binary distribution, available from there are two separate packages, one with non-capturing tools, and one with capturing tools. Install the appropriate package. The -capturing version requires WinPcap, the non-capturing version does not. +capturing version requires WinPcap 2.1, the non-capturing version does not. In order to capture with Win32, you need to install the NDIS packet capture driver for your particular Win32 OS; drivers for Windows @@ -65,7 +65,7 @@ WinPcap home page: http://netgroup-serv.polito.it/winpcap/ If Ethereal is not capturing packets, you can test your WinPcap -installatino by installing WinDump (TCPdump for Windows) ported by the +installation by installing WinDump (TCPdump for Windows) ported by the same folks who make WinPcap. It's at: http://netgroup-serv.polito.it/windump/ @@ -120,6 +120,7 @@ Source Output Tool ------ ------ ---- dfilter-scanner.l *.c Flex wiretap/ascend-scanner.l *.c Flex +wiretap/ascend-grammar.y *.c,*.h Bison/Yacc ncp2222.py packet-ncp2222.c Python make-reg-dotc, packet*.c register.c Bash diff --git a/config.nmake b/config.nmake index de93d53480..ff815dc019 100644 --- a/config.nmake +++ b/config.nmake @@ -1,6 +1,7 @@ -# $Id: config.nmake,v 1.8 2001/03/09 03:43:56 gram Exp $ +# $Id: config.nmake,v 1.9 2001/03/23 02:05:22 gram Exp $ VERSION=0.8.16 +WTAP_VERSION=0.0 GTK_VERSION=1.3 GLIB_VERSION=1.3 @@ -13,6 +14,7 @@ PCAP_DIR=F:\gram\win32tools\WPdpack LOCAL_CFLAGS=-Zi LOCAL_LDFLAGS=/DEBUG + # Set path if you need to find some binary #PATH=t:\w32-ix86\cygnus\cygwin-b20\H-i586-cygwin32\bin;$(PATH) diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 3ebd008538..fa12cf2f9d 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -2,11 +2,13 @@ include ..\config.nmake ############### no need to modify below this line ######### -CFLAGS=/MT /DHAVE_CONFIG_H /I. /I.. /I../wiretap \ +CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap \ /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ /I$(PCAP_DIR)\include $(LOCAL_CFLAGS) +CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL + # For use when making ethereal.dll libethereal_LIBS = \ wsock32.lib user32.lib \ @@ -14,9 +16,10 @@ libethereal_LIBS = \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib {$S}.c{$O}.obj:: - $(CC) $(CFLAGS) -Fd$O\ -c $< + $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $< -OBJECTS=bitswap.obj \ +OBJECTS=atalk-utils.obj \ + bitswap.obj \ conversation.obj \ epan.obj \ except.obj \ @@ -29,6 +32,7 @@ OBJECTS=bitswap.obj \ plugins.obj \ proto.obj \ resolv.obj \ + sna-utils.obj \ strutil.obj \ tvbuff.obj \ diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake index cb4f7586b8..99f069e4df 100644 --- a/epan/dfilter/Makefile.nmake +++ b/epan/dfilter/Makefile.nmake @@ -4,14 +4,15 @@ include ..\..\config.nmake LEMON=..\..\tools\lemon -CFLAGS=/MT /DHAVE_CONFIG_H /I. /I.. /I..\.. /I$(LEMON) \ +CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I..\.. /I$(LEMON) \ /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)\gmodule \ /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ /I$(PCAP_DIR)\include $(LOCAL_CFLAGS) +CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL {$S}.c{$O}.obj:: - $(CC) $(CFLAGS) -Fd$O\ -c $< + $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $< OBJECTS = \ diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake index 0f24034546..37490b44c6 100644 --- a/epan/ftypes/Makefile.nmake +++ b/epan/ftypes/Makefile.nmake @@ -2,14 +2,15 @@ include ..\..\config.nmake ############### no need to modify below this line ######### -CFLAGS=/MT /DHAVE_CONFIG_H /I. /I.. /I../.. \ +CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../.. \ /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ /I$(PCAP_DIR)\include $(LOCAL_CFLAGS) +CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL {$S}.c{$O}.obj:: - $(CC) $(CFLAGS) -Fd$O\ -c $< + $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $< OBJECTS = \ diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake index dfbbb83527..cf7fabf8e9 100644 --- a/gtk/Makefile.nmake +++ b/gtk/Makefile.nmake @@ -2,13 +2,15 @@ include ..\config.nmake ############### no need to modify below this line ######### -CFLAGS=/MT /DHAVE_CONFIG_H /I.. /I../epan /I../wiretap \ +CFLAGS=-DHAVE_CONFIG_H /I.. /I../epan /I../wiretap \ /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ /I$(PCAP_DIR)\include $(LOCAL_CFLAGS) +CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL + {$S}.c{$O}.obj:: - $(CC) $(CFLAGS) -Fd$O\ -c $< + $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $< # gtkclist.obj is not in here because it is gtk+-1.2 code, # while the DLL for GTK+ on windows is gtk+-1.3, and there's diff --git a/wiretap/.cvsignore b/wiretap/.cvsignore index 00f6f225a9..68d64b38f3 100644 --- a/wiretap/.cvsignore +++ b/wiretap/.cvsignore @@ -16,3 +16,5 @@ config.cache *.obj *.lib *.pdb +*.dll +*.exp diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index 18b43d219d..7eb25c52b5 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -1,15 +1,19 @@ # -# $Id: Makefile.nmake,v 1.16 2001/02/22 22:03:31 guy Exp $ +# $Id: Makefile.nmake,v 1.17 2001/03/23 02:05:29 gram Exp $ # include ..\config.nmake +include ############### no need to modify below this line ######### -CFLAGS=/MT /DHAVE_CONFIG_H /I$(GLIB_DIR) $(LOCAL_CFLAGS) +CFLAGS=-DHAVE_CONFIG_H /I$(GLIB_DIR) $(LOCAL_CFLAGS) + +CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL + {$S}.c{$O}.obj:: - $(CC) $(CFLAGS) -Fd$O\ -c $< + $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $< OBJECTS=ascend-grammar.obj \ ascend-scanner.obj \ @@ -33,8 +37,23 @@ OBJECTS=ascend-grammar.obj \ toshiba.obj \ wtap.obj -libwtap.lib : config.h $(OBJECTS) - lib /out:libwtap.lib $(OBJECTS) + +wiretap_LIBS = \ + $(GLIB_DIR)\glib-$(GLIB_VERSION).lib + +all: wiretap-$(WTAP_VERSION).dll + +wiretap-$(WTAP_VERSION).lib: wiretap-$(WTAP_VERSION).dll +wiretap-$(WTAP_VERSION).exp: wiretap-$(WTAP_VERSION).dll + +wiretap-$(WTAP_VERSION).dll : $(OBJECTS) wtap.def + $(link) $(dlllflags) $(conlibsdll) \ + $(LOCAL_LDFLAGS) \ + /DEF:wtap.def /OUT:wiretap-$(WTAP_VERSION).dll \ + /IMPLIB:wiretap-$(WTAP_VERSION).lib \ + $(OBJECTS) $(wiretap_LIBS) + +$(OBJECTS): config.h ascend-grammar.c ascend-grammar.h : ascend-grammar.y $(YACC) $(YACC_OPTS) -d -p ascend ascend-grammar.y -o ascend-grammar.c @@ -49,4 +68,7 @@ config.h : config.h.win32 copy config.h.win32 $@ clean : - rm -f $(OBJECTS) libwtap.lib ascend-grammar.c ascend-grammar.h ascend-scanner.c + rm -f $(OBJECTS) ascend-grammar.c ascend-grammar.h ascend-scanner.c \ + wiretap-$(WTAP_VERSION).lib \ + wiretap-$(WTAP_VERSION).exp \ + wiretap-$(WTAP_VERSION).dll diff --git a/wiretap/wtap.def b/wiretap/wtap.def new file mode 100644 index 0000000000..3fe6afdd7c --- /dev/null +++ b/wiretap/wtap.def @@ -0,0 +1,31 @@ +EXPORTS +wtap_buf_ptr +wtap_close +wtap_def_seek_read +wtap_dump +wtap_dump_can_open +wtap_dump_can_write_encap +wtap_dump_close +wtap_dump_fdopen +wtap_dump_file +wtap_dump_open +wtap_encap_short_string +wtap_encap_string +wtap_fd +wtap_file +wtap_file_encap +wtap_file_type +wtap_file_type_short_string +wtap_file_type_string +wtap_loop +wtap_open_offline +wtap_pcap_encap_to_wtap_encap +wtap_phdr +wtap_pseudoheader +wtap_read +wtap_seek_read +wtap_sequential_close +wtap_short_string_to_encap +wtap_short_string_to_file_type +wtap_snapshot_length +wtap_strerror