diff options
| author | Gerald Combs <gerald@wireshark.org> | 2007-10-26 16:32:28 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2007-10-26 16:32:28 +0000 |
| commit | 8f052940279d78755869b3bd9a1d91da022975d1 (patch) | |
| tree | dd39295013303ddb2873ef04b583ab3d31c51c1b /Makefile.nmake | |
| parent | 381c1f1c9ecc1363f632540de214ef5e66a10124 (diff) | |
| download | wireshark-8f052940279d78755869b3bd9a1d91da022975d1.tar.gz wireshark-8f052940279d78755869b3bd9a1d91da022975d1.tar.bz2 wireshark-8f052940279d78755869b3bd9a1d91da022975d1.zip | |
For the Wireshark/TShark -> dumpcap signal pipe on Windows, use a named
pipe instead of stdin. Add an argument (currently the parent PID) back
to the "-Z" flag and use it to construct the pipe name. This lets us
pass the parent's stdin handle to dumpcap, which lets us capture from
stdin on Windows. Add a comment about checking for the parent process.
In capture_loop.c, remove the wait_forever argument from cap_pipe_select()
since it was always FALSE. Set the timeout under Windows to 250 ms
instead of 250000 ms.
svn path=/trunk/; revision=23279
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 0c9f126603..83751d57f2 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -274,10 +274,10 @@ randpkt.exe : $(randpkt_OBJECTS) getopt.obj mt.exe -nologo -manifest "randpkt.exe.manifest" -outputresource:randpkt.exe;1 !ENDIF -dumpcap.exe : $(LIBS_CHECK) config.h svnversion.h $(dumpcap_OBJECTS) getopt.obj inet_ntop.obj mkstemp.obj wiretap\wiretap-$(WTAP_VERSION).lib image\dumpcap.res +dumpcap.exe : $(LIBS_CHECK) config.h svnversion.h $(dumpcap_OBJECTS) getopt.obj epan/unicode-utils.obj inet_ntop.obj mkstemp.obj wiretap\wiretap-$(WTAP_VERSION).lib image\dumpcap.res @echo Linking $@ $(LINK) @<< - /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dumpcap_LIBS) $(dumpcap_OBJECTS) getopt.obj inet_ntop.obj mkstemp.obj image\dumpcap.res + /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dumpcap_LIBS) $(dumpcap_OBJECTS) getopt.obj epan/unicode-utils.obj inet_ntop.obj mkstemp.obj image\dumpcap.res << !IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" mt.exe -nologo -manifest "dumpcap.exe.manifest" -outputresource:dumpcap.exe;1 |