diff -urN ethereal-0.9.13/AUTHORS ethereal-0.9.14/AUTHORS --- ethereal-0.9.13/AUTHORS 2003-06-11 18:53:38.000000000 -0500 +++ ethereal-0.9.14/AUTHORS 2003-07-22 21:05:35.000000000 -0500 @@ -47,6 +47,7 @@ Protocol activation/deactivation (Edit:protocols) Ability to mark the frames and associated features "Protocol Properties..." menu item + Ring buffer rework Miscellaneous enhancements and fixes } @@ -725,6 +726,8 @@ Various WTP fixes and enhancements WBXML/WMLC support README.win32 updates for Cygwin + UDH dissection in SMPP + WTP-over-SMPP and WSP-over-SMPP } Patrick Wolfe { @@ -848,6 +851,7 @@ LDP support for draft-martini-l2circuit-encap-mpls for Ethernet-over-MPLS Fix initialization of ett_slarp in CHDLC dissector + LDP PWE updates } Pekka Savola { @@ -1303,6 +1307,7 @@ Greg Morris { NCP - NetWare Core Protocol NDPS - Novell Distributed Print System + "Find Frame" code to search for text or binary data } Dirk Steinberg { @@ -1519,6 +1524,7 @@ Initial rsync support ACAP support DISTCC support + Jabber client-to-server protocol support } cjs 2895 { @@ -1642,7 +1648,7 @@ Yahoo Messenger YMSG protocol support } -Laurent Meyer { +Laurent Meyer { X.25 reassembly Filterable fields in COTP COTP reassembly @@ -1694,6 +1700,8 @@ Matthijs Melchior { TCP support in text2pcap + Support for automatically generating all declarations and + definitions for plugin ABI from a single file } Garth Bushell { @@ -1737,6 +1745,18 @@ Support for Common Industrial Protocol over IP } +Jeff Rizzo { + sFlow support +} + +Christoph Wiest { + Redo MEGACO dissector to more fully parse text-format messages +} + +Xuan Zhang { + eDonkey support +} + And assorted fixes and enhancements by the people listed above and by: Pavel Roskin @@ -1747,6 +1767,11 @@ Marcio Franco Kaloian Stoilov Steven Lass + Nathan Jennings + Gregory Stark + Darren Steele + + Michael Kopp Alain Magloire was kind enough to give his permission to use his version of snprintf.c. diff -urN ethereal-0.9.13/ChangeLog ethereal-0.9.14/ChangeLog --- ethereal-0.9.13/ChangeLog 2003-06-11 20:01:05.000000000 -0500 +++ ethereal-0.9.14/ChangeLog 2003-07-23 18:14:56.000000000 -0500 @@ -1,4 +1,219 @@ -$Id: ChangeLog,v 1.24 2003/06/12 01:01:05 gerald Exp $ +$Id: ChangeLog,v 1.26 2003/07/23 23:14:56 gerald Exp $ + +Overview of changes in Ethereal 0.9.14: + +* Fix the VRRP authentication field length (Guy) +* Show the ENIP 8-bit logical connection point segment type (Guy) +* Adjust the FW1 interface name length (Guy) +* Fix FIX column-setting code (Guy) +* Quake2 string buffer enhancements (Guy) +* Add tvb_get_string() and tvb_get_stringz(), and use it in a pile of + dissectors (Guy) +* Remove ADNS hardwiring from the Windows build process (Guy) +* Get rid of allocations of unused buffers in MGCP (Guy) +* Export "tvb_get_string()" and "tvb_get_stringz()" to plugins (Guy) +* Link the Gryphon plugin with glib, as it now calls "g_free()" (Guy) +* Clarify NULL tree-related text in README.developer (Guy) +* Fix the return types of the pointers to "tvb_get_string()" and + "tvb_get_stringz()" (Jason) +* Small interface list fix (Guy, Gerald) +* Link dftest with the ADNS library if needed (Guy) +* Put in a missing comma in util.c (Guy) +* Make tethereal compile without libpcap (Guy) +* Remove an unneded string length check in packet-ppp.c (Guy) +* Fix some man page typoes (Guy) +* Add some display filter range sanity checks (Guy) +* Allow the comparison of two ranges in display filters (Guy) +* "Compiled with" message enhancements (Guy) +* Fixes to get util.c to compile on Win32 (Guy) +* Add sFlow support (Jeff Rizzo) +* Make RC_VERSION comma-separated (Lars Roland, Guy) +* Don't use ADNS_DIR if it's not defined (Lars) +* Update Laurent Meyer's e-mail address (Guy) +* Tweak the PATH setting in config.nmake (Lars) +* Revamp Glib- and GTK+-related Windows build flags (Guy) +* Add a missing break statement to packet-sflow.c (Guy) +* Let iSCSI/TCP keep track of where PDU bundaries are in the TCP stream + (Ronnie) +* Handle SMB MID field reuse (Ronnie) +* Add iSCSI "Decode As..." support (Ronnie) +* Allow better Windows Glib/GTK+ library path adjustment (Lars, Guy) +* Move ADNS_DIR tests to config.nmake (Guy) +* More config.nmake fixes (Guy) +* Properly clean the rtnet directory (Lars) +* Config.nmake typo fixes and updates (Lars) +* Remove dcerpc_smb_check_long_frame() (Tim) +* Handle GTK+ 1.3 vs 2.x more cleanly (Guy) +* Some educated guesses about the structure of the QueryValue RPC (Tim) +* Handle Mac OS X "glibtool" and "glibtoolize" naming (Guy) +* Initialize di.hf_index in dissect_dcerpc_cn_rqst() (Gerald) +* Add support for draft-ietf-ipsec-udp-encaps-06.txt (Markus) +* Squelch a compiler warning in packet-dcerpc.c (Guy) +* Make the SNMP request id a filterable field (Ronnie) +* Revamp the DCE-RPC Service Response Time display code (Ronnie) +* Update ONC-RPC response time tap to use the new helper function (Ronnie) +* Make SRT columns sortable (Ronnie) +* Update SMB statistics tap to use the new SRT routines (Ronnie) +* Cosmetic fix for SRT (Ronnie) +* SRT window display fix (Guy) +* Improve iSCSI's request/response matching, other fixes (Ronnie) +* Fix the service response time functions to work with GTK2 (Lars) +* Rewrite most of the ring buffer code (Laurent) +* Cosmetic change for autogen.sh (Joerg) +* Don't print warnings about not finding glibtool (Joerg) +* Add a hidden fc.id filter field for FC (Ronnie) +* Improve FC source and destination ID handling (Ronnie) +* Update FC F_CTL decoding and filtering (Ronnie) +* Squelch some compiler warnings in packet-isakmp.c (Guy) +* Various Q.931 fixes (Tomas) +* Fix unused bit counting in asn1_bits_decode() (Matthijs) +* Fix long line printing in file.c (Tomas) +* Properly parse and label WEP key preferences (Motonori) +* Enhance Fibre Channel display and request/response matching (Ronnie) +* Properly escape the '#' character in the HAVE_GNU_ADNS definition + (Gerald) +* Dissect the ISUP "parameter compatibility" parameter (Anders Broman) +* Fix a Q.931 #define (Guy) +* Bring back a config.nmake #undef (Guy) +* Latest "config.guess" and "config.sub" from the GNU folks (Guy) +* Added new stub dissector for MS Messenger Service (Ronnie) +* Add a tap to the fibre channel dissector (Ronnie) +* Add Fibre Channel SRT statistics (Ronnie) +* Echo packet dissector (Laurent) +* Remove unneeded length checks from etherpeek.c (Guy) +* In a SRVLOC SA Advertisement, fetch the scope list length before using it + (Guy) +* Revamp DCERPC opnum value_strings creation (Tim) +* Update SCCP ISNI parameter field display (Jeff Morriss) +* Don't use a bitmask for the ISUP CIC filter (Anders) +* More config.nmake tweaking (Guy) +* Make the definition of "fc32_to_str()" match its prototype (Guy) +* SMPP and UCP value_string fixes (Tom Uijldert) +* Decoding of MS Messenger SendMessage function (Ronnie) +* Get rid of an unused AFP value_string table (Didier) +* Fix the register.c make rule (Didier) +* Allow WBXML 1.0 dissection, remove an unsued value_string (Biot) +* Limit the Info column size (Ian Schorr) +* LANalyzer fixes and updates (Guy) +* Various fixes and cleanups in tethereal.c (Lionel Ains) +* Fix a cut-and-paste error in Vines (Guy) +* Add .gdb_history to .cvsignore (Guy) +* Shuffle value_strings around in the FC code (Guy) +* Get rid of a value_string table that's not used in packet-fcswils.c (Guy) +* UDH dissection in SMPP message (Olivier) +* WTP and WSP dissection over SMPP (no reassembly) (Olivier) +* WSP status code rendering in Info column (Olivier) +* String handling fixes in DCE-RPC NT (Guy) +* Report the message type for RADIUS accounting status messages and + accounting messages (Adam Sulmicki) +* Redo the MEGACO dissector to more fully parse text-format messages + (Christoph Weist) +* Fix interface list memory handling bugs (Nathan Jennings, Guy) +* Fix connection checking in follow.c (Gregory Stark) +* Improve H.245 TransportAddress display (Ronnie) +* Add a PER field display toggle to H.245 (Ronnie) +* Decode GeneralStrings in H.245 (Ronnie) +* H.245 field display fix (Ronnie) +* Fixed a bug in M2UA's DATA 1 and DATA 2 parameter handling (Michael) +* Mark a variable as unused in proto.c (Guy) +* Improve NDIS type recognition in NetXRay (Guy) +* Fix reused message IDs in SMPP (Olivier) +* Add Jabber client-to-server protocol support (Brad) +* Fetch the MMSE delivery time from the correct offset (Darren Steele) +* README.developer typo fix (Brad) +* Add PWE updates to LDP (Aamer Akhter) +* Fix the signedness of ntp.precision (Gilbert) +* Remove ascendwrap from ascend.l (Guy) +* Fix some unused parameter and function warnings in Kerberos and RSYNC + (Tim) +* Fix p_rem_proto_data() in frame_data.[ch] (Tim) +* Remove unneded unused variable markings in packet-kerberos.c (Guy) +* Q.2931 fixes and updates (Guy) +* Put in stuff to dissect the body of a Q.931 cause IE (Guy) +* Update boolean dissection in H.245 (Ronnie) +* Improve H.245 bitmap decoding (Ronnie) +* Improve H.245 sequence extension decoding (Ronnie) +* Completely rewrite the H.245 dissector, and split out PER routines into + a separate module (Ronnie, Lars) +* -dlopen fixes for configure.in (Joerg, Dirk Mueller) +* Fix the MEGACO top-level protocol tree (Guy) +* Correctly define a WSP value string (Guy) +* Lots of SCSI fixes (Guy) +* Script to unit-test ftype functions via dfilters passed to tethereal + (Gilbert) +* Dissect AODV and AODV6 extensions the same way (Guy) +* Fix #defines in packet-isis-snp.c (Guy) +* Use "sna_rh_eri_truth[]" for the Exception Response Indicator field (Guy) +* Fix X11 arc definition (Guy) +* Removed duplicate definitions of flags_set_truth in IP and DIAMETER (Tim) +* Zebra message and value_string fixes (Guy) +* FC R_CTL display improvements (Guy) +* Use "fcencap_proto_vals[]" for the FC protocol field (Guy) +* GTP mobility management context and security type display improvements + (Guy) +* Fix an SLS display bug in MTP3 (Michael) +* Add more entries to the SMB query/set path/file info value_strings (Tim) +* Support for CIFS UNIX extensions as documented in the CIFS TR 1.0, + Appendix D (Tim) +* Fix a "g_string_append()" call in util.c (smhuang) +* Add a routine "dissect_ipv6_options()" and use it in several dissectors + (Guy) +* Put relevant field offset, lengths and other info back in packet-mip6.h + (Guy) +* Fix misdissection of spoolss enumprinterdataex replies (Tim) +* Fix the decoding of SAMR SIDs and Attributes (Richard) +* Several Info column updates for LDAP (Tim) +* Removed unused local variable in packet-dcerpc-samr.c (Tim) +* Add some entries for Cisco VSA for SSG Communication via Radius Packets + (Michael Kopp) +* Clean out the correct hash table in packet-tcp.c (Guy) +* Fix an unused variable warning in packet-rtnet.c (Tim) +* Move all DCERPC authentication/encryption dissection code from + packet-dcerpc.c to the dissector that handles the particular + authentication flavour (Tim) +* Squelch a (potentially-valid) compiler warning in packet-dcerpc.c (Guy) +* Properly comment stub routines in packet-msproxy.c (Guy) +* Add eDonkey support (Xuan Zhang) +* Add the KRB5 User-to-user OID to packet-spnego.c (Richard) +* Put in a note about RPC call heuristics (Guy) +* Generate all declarations and definitions for plugin ABI from a single + file (Matthijs) +* Update SNA exception response indicator display (Guy) +* Fix "Secure Channel" capitalization in packet-dcerpc-netlogon.c (Guy) +* NETLOGON Secure Channel update (Guy) +* NTLMSSP protection level update (Guy) +* Alter_context updates for DCERPC (Guy) +* Add a request/result comment to packet-ldap.c (Guy) +* Various GTK2 fixes (Olivier) +* Fix header inclusion in plugin_api_list.c (Guy) +* Get rid of an unneeded null handle check in packet-vendor.c (Guy) +* Get rid of a no-longer-used table in packet-vines.c (Guy) +* Various SSL fixes and tweaks (Guy) +* Fix logic in set_plist_sel_browse in main.c (Olivier) +* Fix packet list bug (Debian bug #199763) (Olivier) +* Disable threads by default with gtk2 (Olivier) +* Fix a couple of distcheck failures (Gerald) +* Use "ncp_nds_verb_vals" for the NDS Verb item (Guy) +* Fixes for make-reg-dotc.py (Uwe) +* Include the authentication padding in the DCERPC stub data when + decrypting it (Devin) +* Add some missing entries to "ncp_nds_verb_vals[]" (Guy) +* Use "val_to_str()" to translate NDS verb numbers to strings (Guy) +* Fixes and updates for packet-brdwlk.c (Guy) +* Add two preferences to control ADNS (Gerald) +* Fix a bug in RPC where the RCP_DUP items where not always added to the + tree (Ronnie) +* Fix a "make distcheck" failure (Gerald) +* Updates to support linking against Glib 2.2 plus GTK+ 1.3 on Windows + (Lars) +* Code to support searches for text or raw binary data in a frame in Find + Frame (Greg Morris) +* Give a more detailed message when WSAStartup fails (Guy) +* Remove duplicate Makefile targets and circular rules (Gerald) +* Update the FAQ (Joerg) +* Update the manuf file (Joerg) +* Correctly handle IGMP v1 membership reports (Joerg) + Overview of changes in Ethereal 0.9.13: diff -urN ethereal-0.9.13/FAQ ethereal-0.9.14/FAQ --- ethereal-0.9.13/FAQ 2003-06-11 18:53:38.000000000 -0500 +++ ethereal-0.9.14/FAQ 2003-07-23 17:33:25.000000000 -0500 @@ -63,7 +63,7 @@ see from or to the machine I'm trying to monitor. 5.2 I can't see any TCP packets other than packets to and from my - machine, even though another sniffer on the network sees those + machine, even though another analyzer on the network sees those packets. 5.3 I'm only seeing ARP packets when I try to capture traffic. @@ -87,63 +87,67 @@ 5.10 When I run Ethereal on Solaris 8, it dies with a Bus Error when I start it. - 5.11 When I try to run Ethereal, it complains about + 5.11 When I run Ethereal on Windows NT, it dies with a Dr. Watson + error, reporting an "Integer division by zero" exception, when I start + it. + + 5.12 When I try to run Ethereal, it complains about sprint_realloc_objid being undefined. - 5.12 I'm running Ethereal on Linux; why do my time stamps have only + 5.13 I'm running Ethereal on Linux; why do my time stamps have only 100ms resolution, rather than 1us resolution? - 5.13 I'm capturing packets on {Windows 95, Windows 98, Windows Me}; + 5.14 I'm capturing packets on {Windows 95, Windows 98, Windows Me}; why are the time stamps on packets wrong? - 5.14 When I try to run Ethereal on Windows, it fails to run because it + 5.15 When I try to run Ethereal on Windows, it fails to run because it can't find packet.dll. - 5.15 I'm running Ethereal on Windows; why does some network interface + 5.16 I'm running Ethereal on Windows; why does some network interface on my machine not show up in the list of interfaces in the "Interface:" field in the dialog box popped up by "Capture->Start", and/or why does Ethereal give me an error if I try to capture on that interface? - 5.16 I'm running on a UNIX-flavored OS; why does some network + 5.17 I'm running on a UNIX-flavored OS; why does some network interface on my machine not show up in the list of interfaces in the "Interface:" field in the dialog box popped up by "Capture->Start", and/or why does Ethereal give me an error if I try to capture on that interface? - 5.17 I'm running Ethereal on Windows NT/2000/XP/Server; my machine has + 5.18 I'm running Ethereal on Windows NT/2000/XP/Server; my machine has a PPP (dial-up POTS, ISDN, etc.) interface, and it shows up in the "Interface" item in the "Capture Options" dialog box. Why can no packets be sent on or received from that network while I'm trying to capture traffic on that interface? - 5.18 I'm running Ethereal on Windows 95/98/Me, on a machine with more + 5.19 I'm running Ethereal on Windows 95/98/Me, on a machine with more than one network adapter of the same type; Ethereal shows all of those adapters with the same name, but I can't use any of those adapters other than the first one. - 5.19 I'm running Ethereal on Windows, and I'm not seeing any traffic + 5.20 I'm running Ethereal on Windows, and I'm not seeing any traffic being sent by the machine running Ethereal. - 5.20 I'm trying to capture traffic but I'm not seeing any. + 5.21 I'm trying to capture traffic but I'm not seeing any. - 5.21 I have an XXX network card on my machine; if I try to capture on + 5.22 I have an XXX network card on my machine; if I try to capture on it, my machine crashes or resets itself. - 5.22 My machine crashes or resets itself when I select "Start" from + 5.23 My machine crashes or resets itself when I select "Start" from the "Capture" menu or select "Preferences" from the "Edit" menu. - 5.23 Does Ethereal work on Windows ME? + 5.24 Does Ethereal work on Windows ME? - 5.24 Does Ethereal work on Windows XP? + 5.25 Does Ethereal work on Windows XP? - 5.25 Why doesn't Ethereal correctly identify RTP packets? It shows + 5.26 Why doesn't Ethereal correctly identify RTP packets? It shows them only as UDP. - 5.26 Why doesn't Ethereal show Yahoo Messenger packets in captures + 5.27 Why doesn't Ethereal show Yahoo Messenger packets in captures that contain Yahoo Messenger traffic? - 5.27 Why do I get the error + 5.28 Why do I get the error Gdk-ERROR **: Palettized display (256-colour) mode not supported on Windows. @@ -151,22 +155,22 @@ when I try to run Ethereal on Windows? - 5.28 When I capture on Windows in promiscuous mode, I can see packets + 5.29 When I capture on Windows in promiscuous mode, I can see packets other than those sent to or from my machine; however, those packets show up with a "Short Frame" indication, unlike packets to or from my machine. What should I do to arrange that I see those packets in their entirety? - 5.29 How can I capture raw 802.11 packets, including non-data + 5.30 How can I capture raw 802.11 packets, including non-data (management, beacon) packets? - 5.30 How can I capture packets with CRC errors? + 5.31 How can I capture packets with CRC errors? - 5.31 How can I capture entire frames, including the FCS? + 5.32 How can I capture entire frames, including the FCS? - 5.32 Ethereal hangs after I stop a capture. + 5.33 Ethereal hangs after I stop a capture. - 5.33 How can I search for, or filter, packets that have a particular + 5.34 How can I search for, or filter, packets that have a particular string anywhere in them? GENERAL QUESTIONS @@ -178,7 +182,7 @@ Q 1.2: What protocols are currently supported? - A: There are currently 381 supported protocols and media, listed + A: There are currently 385 supported protocols and media, listed below. Descriptions can be found in the ethereal(1) man page. 802.1q Virtual LAN @@ -270,11 +274,13 @@ Datagram Delivery Protocol Diameter Protocol Distance Vector Multicast Routing Protocol + Distcc Distributed Compiler Distributed Checksum Clearinghouse Prototocl Domain Name Service Dynamic DNS Tools Protocol Encapsulating Security Payload Enhanced Interior Gateway Routing Protocol + EtherNet/IP (Industrial Protocol) Ethernet Ethernet over IP Extensible Authentication Protocol @@ -383,6 +389,7 @@ Microsoft Server Service Microsoft Service Control Microsoft Spool Subsystem + Microsoft Task Scheduler Service Microsoft Telephony API Service Microsoft Windows Browser Protocol Microsoft Windows Lanman Remote API Protocol @@ -423,6 +430,7 @@ Open Shortest Path First OpenBSD Encapsulating device OpenBSD Packet Filter log file + OpenBSD Packet Filter log file, pre 3.4 PC NFS PPP Bandwidth Allocation Control Protocol PPP Bandwidth Allocation Protocol @@ -645,7 +653,7 @@ Ethernet was named after the "luminiferous ether" which was once thought to carry electromagnetic radiation. Taking that into consideration, Ethereal seemed like an appropriate name for an - Ethernet sniffer. + Ethernet analyzer. DOWNLOADING ETHEREAL Q 2.1: I downloaded the Win32 installer, but when I try to run it, I @@ -776,7 +784,7 @@ may exist for other "auto-sensing" or "dual-speed" hubs. Some switches have the ability to replicate all traffic on all ports - to a single port so that you can plug your sniffer into that single + to a single port so that you can plug your analyzer into that single port to sniff all traffic. You would have to check the documentation for the switch to see if this is possible and, if so, to see how to do this. See, for example: @@ -851,7 +859,7 @@ promiscuous mode. Q 5.2: I can't see any TCP packets other than packets to and from my - machine, even though another sniffer on the network sees those + machine, even though another analyzer on the network sees those packets. A: You're probably not seeing any packets other than unicast packets @@ -1024,7 +1032,15 @@ Similar problems may exist with older versions of GTK+ for earlier versions of Solaris. - Q 5.11: When I try to run Ethereal, it complains about + Q 5.11: When I run Ethereal on Windows NT, it dies with a Dr. Watson + error, reporting an "Integer division by zero" exception, when I start + it. + + A: In at least some case, this appears to be due to using the default + VGA driver; if that's not the correct driver for your video card, try + running the correct driver for your video card. + + Q 5.12: When I try to run Ethereal, it complains about sprint_realloc_objid being undefined. A: Ethereal can only be linked with version 4.2.2 or later of UCD @@ -1034,7 +1050,7 @@ the older version, and fails. You will have to replace that version of UCD SNMP with version 4.2.2 or a later version. - Q 5.12: I'm running Ethereal on Linux; why do my time stamps have only + Q 5.13: I'm running Ethereal on Linux; why do my time stamps have only 100ms resolution, rather than 1us resolution? A: Ethereal gets time stamps from libpcap/WinPcap, and libpcap/WinPcap @@ -1060,13 +1076,13 @@ have to run a standard kernel from kernel.org in order to get high-resolution time stamps. - Q 5.13: I'm capturing packets on {Windows 95, Windows 98, Windows Me}; + Q 5.14: I'm capturing packets on {Windows 95, Windows 98, Windows Me}; why are the time stamps on packets wrong? A: This is due to a bug in WinPcap. The bug should be fixed in WinPcap 3.0. - Q 5.14: When I try to run Ethereal on Windows, it fails to run because + Q 5.15: When I try to run Ethereal on Windows, it fails to run because it can't find packet.dll. A: In older versions of Ethereal, there were two binary distributions @@ -1083,7 +1099,7 @@ Web site, the local mirror of the WinPcap Web site, or the Wiretapped.net mirror of the WinPcap site. - Q 5.15: I'm running Ethereal on Windows; why does some network + Q 5.16: I'm running Ethereal on Windows; why does some network interface on my machine not show up in the list of interfaces in the "Interface:" field in the dialog box popped up by "Capture->Start", and/or why does Ethereal give me an error if I try to capture on that @@ -1099,10 +1115,10 @@ If you are running on Windows 95/98/Me, or if you are running on Windows NT 4.0/2000/XP/Server and have administrator privileges or a - WinPcap program has been run with those privileges since the machine - rebooted, then note that Ethereal relies on the WinPcap library, on - the WinPcap device driver, and on the facilities that come with the OS - on which it's running in order to do captures. + WinPcap-based program has been run with those privileges since the + machine rebooted, then note that Ethereal relies on the WinPcap + library, on the WinPcap device driver, and on the facilities that come + with the OS on which it's running in order to do captures. Therefore, if the OS, the WinPcap library, or the WinPcap driver don't support capturing on a particular network interface device, Ethereal @@ -1122,13 +1138,13 @@ * On Windows 95, 98, or Me, sometimes more than one interface will be given the same name; if that is the case, you will only be able to capture on one of those interfaces - it's not clear to which - one the name, when used in a WinPcap application, will refer. For - example, if you have a PPP serial interface and a VPN interface, - they might show up with the same name, for example "ppp-mac", and - if you try to capture on "ppp-mac", it might not capture on the - interface you're currently using. In that case, you might, for - example, have to remove the VPN interface from the system in order - to capture on the PPP serial interface. + one the name, when used in a WinPcap-based application, will + refer. For example, if you have a PPP serial interface and a VPN + interface, they might show up with the same name, for example + "ppp-mac", and if you try to capture on "ppp-mac", it might not + capture on the interface you're currently using. In that case, you + might, for example, have to remove the VPN interface from the + system in order to capture on the PPP serial interface. * WinPcap doesn't support PPP WAN interfaces on Windows NT/2000/XP/Server, so Ethereal cannot capture packets on those devices when running on Windows NT/2000/XP/Server. Regular dial-up @@ -1193,7 +1209,7 @@ above, and also indicate that the problem occurs with WinDump, not just with Ethereal. - Q 5.16: I'm running on a UNIX-flavored OS; why does some network + Q 5.17: I'm running on a UNIX-flavored OS; why does some network interface on my machine not show up in the list of interfaces in the "Interface:" field in the dialog box popped up by "Capture->Start", and/or why does Ethereal give me an error if I try to capture on that @@ -1277,7 +1293,7 @@ above, and also indicate that the problem occurs with tcpdump not just with Ethereal. - Q 5.17: I'm running Ethereal on Windows NT/2000/XP/Server; my machine + Q 5.18: I'm running Ethereal on Windows NT/2000/XP/Server; my machine has a PPP (dial-up POTS, ISDN, etc.) interface, and it shows up in the "Interface" item in the "Capture Options" dialog box. Why can no packets be sent on or received from that network while I'm trying to @@ -1291,7 +1307,7 @@ Preferences" dialog box, but this may mean that outgoing packets, or incoming packets, won't be seen in the capture. - Q 5.18: I'm running Ethereal on Windows 95/98/Me, on a machine with + Q 5.19: I'm running Ethereal on Windows 95/98/Me, on a machine with more than one network adapter of the same type; Ethereal shows all of those adapters with the same name, but I can't use any of those adapters other than the first one. @@ -1302,7 +1318,7 @@ capture only on the first such interface; Ethereal is a libpcap/WinPcap-based application. - Q 5.19: I'm running Ethereal on Windows, and I'm not seeing any + Q 5.20: I'm running Ethereal on Windows, and I'm not seeing any traffic being sent by the machine running Ethereal. A: If you are running some form of VPN client software, it might be @@ -1313,7 +1329,7 @@ outgoing packets; unfortunately, neither we nor the WinPcap developers know any way to make WinPcap and the VPN software work well together. - Q 5.20: I'm trying to capture traffic but I'm not seeing any. + Q 5.21: I'm trying to capture traffic but I'm not seeing any. A: Is the machine running Ethereal sending out any traffic on the network interface on which you're capturing, or receiving any traffic @@ -1329,7 +1345,7 @@ Otherwise, on Windows, see the response to this question and, on a UNIX-flavored OS, see the response to this question. - Q 5.21: I have an XXX network card on my machine; if I try to capture + Q 5.22: I have an XXX network card on my machine; if I try to capture on it, my machine crashes or resets itself. A: This is almost certainly a problem with one or more of: @@ -1347,7 +1363,7 @@ Linux distribution, report the problem to whoever produces the distribution). - Q 5.22: My machine crashes or resets itself when I select "Start" from + Q 5.23: My machine crashes or resets itself when I select "Start" from the "Capture" menu or select "Preferences" from the "Edit" menu. A: Both of those operations cause Ethereal to try to build a list of @@ -1356,20 +1372,20 @@ or, for Windows, WinPcap bug that causes the system to crash when this happens; see the previous question. - Q 5.23: Does Ethereal work on Windows ME? + Q 5.24: Does Ethereal work on Windows ME? A: Yes, but if you want to capture packets, you will need to install the latest version of WinPcap, as 2.02 and earlier versions of WinPcap didn't support Windows ME. You should also install the latest version of Ethereal as well. - Q 5.24: Does Ethereal work on Windows XP? + Q 5.25: Does Ethereal work on Windows XP? A: Yes, but if you want to capture packets, you will need to install the latest version of WinPcap, as 2.2 and earlier versions of WinPcap didn't support Windows XP. - Q 5.25: Why doesn't Ethereal correctly identify RTP packets? It shows + Q 5.26: Why doesn't Ethereal correctly identify RTP packets? It shows them only as UDP. A: Ethereal can identify a UDP datagram as containing a packet of a @@ -1402,7 +1418,7 @@ both the source and destination ports of the packet should be dissected as some particular protocol. - Q 5.26: Why doesn't Ethereal show Yahoo Messenger packets in captures + Q 5.27: Why doesn't Ethereal show Yahoo Messenger packets in captures that contain Yahoo Messenger traffic? A: Ethereal only recognizes as Yahoo Messenger traffic packets to or @@ -1412,7 +1428,7 @@ Messenger packets (even if the TCP segment also contains the beginning of another Yahoo Messenger packet). - Q 5.27: Why do I get the error + Q 5.28: Why do I get the error Gdk-ERROR **: Palettized display (256-colour) mode not supported on Windows. @@ -1427,7 +1443,7 @@ to a display mode with more colors; if it doesn't support more than 256 colors, you will be unable to run Ethereal. - Q 5.28: When I capture on Windows in promiscuous mode, I can see + Q 5.29: When I capture on Windows in promiscuous mode, I can see packets other than those sent to or from my machine; however, those packets show up with a "Short Frame" indication, unlike packets to or from my machine. What should I do to arrange that I see those packets @@ -1437,7 +1453,7 @@ running on the network interface on which you're capturing; turn it off on that interface. - Q 5.29: How can I capture raw 802.11 packets, including non-data + Q 5.30: How can I capture raw 802.11 packets, including non-data (management, beacon) packets? A: That would require that your 802.11 interface run in the mode @@ -1568,7 +1584,7 @@ On platforms that don't allow Ethereal to capture raw 802.11 packets, the 802.11 network will appear like an Ethernet to Ethereal. - Q 5.30: How can I capture packets with CRC errors? + Q 5.31: How can I capture packets with CRC errors? A: Ethereal can capture only the packets that the packet capture library - libpcap on UNIX-flavored OSes, and the WinPcap port to @@ -1585,7 +1601,7 @@ libpcap and the packet capture program you're using are necessary to support capturing those packets. - Q 5.31: How can I capture entire frames, including the FCS? + Q 5.32: How can I capture entire frames, including the FCS? A: Ethereal can't capture any data that the packet capture library - libpcap on UNIX-flavored OSes, and the WinPcap port to Windows of @@ -1605,7 +1621,7 @@ not support capturing the FCS of a frame on Ethernet, and probably do not support it on most other link-layer types. - Q 5.32: Ethereal hangs after I stop a capture. + Q 5.33: Ethereal hangs after I stop a capture. A: The most likely reason for this is that Ethereal is trying to look up an IP address in the capture to convert it to a name (so that, for @@ -1675,7 +1691,7 @@ contains sensitive information (e.g., passwords), then please do not send it. - Q 5.33: How can I search for, or filter, packets that have a + Q 5.34: How can I search for, or filter, packets that have a particular string anywhere in them? A: Currently, you can't. @@ -1697,4 +1713,4 @@ list. For corrections/additions/suggestions for this page, please send email to: ethereal-web[AT]ethereal.com - Last modified: Sun, May 25 2003. + Last modified: Sat, July 19 2003. diff -urN ethereal-0.9.13/FAQ.include ethereal-0.9.14/FAQ.include --- ethereal-0.9.13/FAQ.include 2003-06-11 18:53:38.000000000 -0500 +++ ethereal-0.9.14/FAQ.include 2003-07-23 17:33:25.000000000 -0500 @@ -64,7 +64,7 @@ " see from or to the machine I'm trying to monitor.\n" "\n" " 5.2 I can't see any TCP packets other than packets to and from my\n" -" machine, even though another sniffer on the network sees those\n" +" machine, even though another analyzer on the network sees those\n" " packets.\n" "\n" " 5.3 I'm only seeing ARP packets when I try to capture traffic.\n" @@ -88,63 +88,67 @@ " 5.10 When I run Ethereal on Solaris 8, it dies with a Bus Error when I\n" " start it.\n" "\n" -" 5.11 When I try to run Ethereal, it complains about\n" +" 5.11 When I run Ethereal on Windows NT, it dies with a Dr. Watson\n" +" error, reporting an \"Integer division by zero\" exception, when I start\n" +" it.\n" +"\n" +" 5.12 When I try to run Ethereal, it complains about\n" " sprint_realloc_objid being undefined.\n" "\n" -" 5.12 I'm running Ethereal on Linux; why do my time stamps have only\n" +" 5.13 I'm running Ethereal on Linux; why do my time stamps have only\n" " 100ms resolution, rather than 1us resolution?\n" "\n" -" 5.13 I'm capturing packets on {Windows 95, Windows 98, Windows Me};\n" +" 5.14 I'm capturing packets on {Windows 95, Windows 98, Windows Me};\n" " why are the time stamps on packets wrong? \n" "\n" -" 5.14 When I try to run Ethereal on Windows, it fails to run because it\n" +" 5.15 When I try to run Ethereal on Windows, it fails to run because it\n" " can't find packet.dll.\n" "\n" -" 5.15 I'm running Ethereal on Windows; why does some network interface\n" +" 5.16 I'm running Ethereal on Windows; why does some network interface\n" " on my machine not show up in the list of interfaces in the\n" " \"Interface:\" field in the dialog box popped up by \"Capture->Start\",\n" " and/or why does Ethereal give me an error if I try to capture on that\n" " interface? \n" "\n" -" 5.16 I'm running on a UNIX-flavored OS; why does some network\n" +" 5.17 I'm running on a UNIX-flavored OS; why does some network\n" " interface on my machine not show up in the list of interfaces in the\n" " \"Interface:\" field in the dialog box popped up by \"Capture->Start\",\n" " and/or why does Ethereal give me an error if I try to capture on that\n" " interface? \n" "\n" -" 5.17 I'm running Ethereal on Windows NT/2000/XP/Server; my machine has\n" +" 5.18 I'm running Ethereal on Windows NT/2000/XP/Server; my machine has\n" " a PPP (dial-up POTS, ISDN, etc.) interface, and it shows up in the\n" " \"Interface\" item in the \"Capture Options\" dialog box. Why can no\n" " packets be sent on or received from that network while I'm trying to\n" " capture traffic on that interface?\n" "\n" -" 5.18 I'm running Ethereal on Windows 95/98/Me, on a machine with more\n" +" 5.19 I'm running Ethereal on Windows 95/98/Me, on a machine with more\n" " than one network adapter of the same type; Ethereal shows all of those\n" " adapters with the same name, but I can't use any of those adapters\n" " other than the first one.\n" "\n" -" 5.19 I'm running Ethereal on Windows, and I'm not seeing any traffic\n" +" 5.20 I'm running Ethereal on Windows, and I'm not seeing any traffic\n" " being sent by the machine running Ethereal.\n" "\n" -" 5.20 I'm trying to capture traffic but I'm not seeing any.\n" +" 5.21 I'm trying to capture traffic but I'm not seeing any.\n" "\n" -" 5.21 I have an XXX network card on my machine; if I try to capture on\n" +" 5.22 I have an XXX network card on my machine; if I try to capture on\n" " it, my machine crashes or resets itself. \n" "\n" -" 5.22 My machine crashes or resets itself when I select \"Start\" from\n" +" 5.23 My machine crashes or resets itself when I select \"Start\" from\n" " the \"Capture\" menu or select \"Preferences\" from the \"Edit\" menu. \n" "\n" -" 5.23 Does Ethereal work on Windows ME? \n" +" 5.24 Does Ethereal work on Windows ME? \n" "\n" -" 5.24 Does Ethereal work on Windows XP? \n" +" 5.25 Does Ethereal work on Windows XP? \n" "\n" -" 5.25 Why doesn't Ethereal correctly identify RTP packets? It shows\n" +" 5.26 Why doesn't Ethereal correctly identify RTP packets? It shows\n" " them only as UDP.\n" "\n" -" 5.26 Why doesn't Ethereal show Yahoo Messenger packets in captures\n" +" 5.27 Why doesn't Ethereal show Yahoo Messenger packets in captures\n" " that contain Yahoo Messenger traffic?\n" "\n" -" 5.27 Why do I get the error \n" +" 5.28 Why do I get the error \n" "\n" " Gdk-ERROR **: Palettized display (256-colour) mode not supported on\n" " Windows.\n" @@ -152,22 +156,22 @@ "\n" " when I try to run Ethereal on Windows?\n" "\n" -" 5.28 When I capture on Windows in promiscuous mode, I can see packets\n" +" 5.29 When I capture on Windows in promiscuous mode, I can see packets\n" " other than those sent to or from my machine; however, those packets\n" " show up with a \"Short Frame\" indication, unlike packets to or from my\n" " machine. What should I do to arrange that I see those packets in their\n" " entirety? \n" "\n" -" 5.29 How can I capture raw 802.11 packets, including non-data\n" +" 5.30 How can I capture raw 802.11 packets, including non-data\n" " (management, beacon) packets? \n" "\n" -" 5.30 How can I capture packets with CRC errors? \n" +" 5.31 How can I capture packets with CRC errors? \n" "\n" -" 5.31 How can I capture entire frames, including the FCS? \n" +" 5.32 How can I capture entire frames, including the FCS? \n" "\n" -" 5.32 Ethereal hangs after I stop a capture. \n" +" 5.33 Ethereal hangs after I stop a capture. \n" "\n" -" 5.33 How can I search for, or filter, packets that have a particular\n" +" 5.34 How can I search for, or filter, packets that have a particular\n" " string anywhere in them? \n" "\n" " GENERAL QUESTIONS \n" @@ -179,7 +183,7 @@ "\n" " Q 1.2: What protocols are currently supported?\n" "\n" -" A: There are currently 381 supported protocols and media, listed\n" +" A: There are currently 385 supported protocols and media, listed\n" " below. Descriptions can be found in the ethereal(1) man page.\n" "\n" " 802.1q Virtual LAN\n" @@ -271,11 +275,13 @@ " Datagram Delivery Protocol\n" " Diameter Protocol\n" " Distance Vector Multicast Routing Protocol\n" +" Distcc Distributed Compiler\n" " Distributed Checksum Clearinghouse Prototocl\n" " Domain Name Service\n" " Dynamic DNS Tools Protocol\n" " Encapsulating Security Payload\n" " Enhanced Interior Gateway Routing Protocol\n" +" EtherNet/IP (Industrial Protocol)\n" " Ethernet\n" " Ethernet over IP\n" " Extensible Authentication Protocol\n" @@ -384,6 +390,7 @@ " Microsoft Server Service\n" " Microsoft Service Control\n" " Microsoft Spool Subsystem\n" +" Microsoft Task Scheduler Service\n" " Microsoft Telephony API Service\n" " Microsoft Windows Browser Protocol\n" " Microsoft Windows Lanman Remote API Protocol\n" @@ -392,6 +399,8 @@ " Mobile IP\n" " Mobile IPv6\n" " Modbus/TCP\n" +, + " Mount Service\n" " MultiProtocol Label Switching Header\n" " Multicast Router DISCovery protocol\n" @@ -399,8 +408,6 @@ " MySQL Protocol\n" " NFSACL\n" " NFSAUTH\n" -, - " NIS+\n" " NIS+ Callback\n" " NSPI\n" @@ -426,6 +433,7 @@ " Open Shortest Path First\n" " OpenBSD Encapsulating device\n" " OpenBSD Packet Filter log file\n" +" OpenBSD Packet Filter log file, pre 3.4\n" " PC NFS\n" " PPP Bandwidth Allocation Control Protocol\n" " PPP Bandwidth Allocation Protocol\n" @@ -648,7 +656,7 @@ " Ethernet was named after the \"luminiferous ether\" which was once\n" " thought to carry electromagnetic radiation. Taking that into\n" " consideration, Ethereal seemed like an appropriate name for an\n" -" Ethernet sniffer.\n" +" Ethernet analyzer.\n" "\n" " DOWNLOADING ETHEREAL \n" " Q 2.1: I downloaded the Win32 installer, but when I try to run it, I\n" @@ -779,7 +787,7 @@ " may exist for other \"auto-sensing\" or \"dual-speed\" hubs.\n" "\n" " Some switches have the ability to replicate all traffic on all ports\n" -" to a single port so that you can plug your sniffer into that single\n" +" to a single port so that you can plug your analyzer into that single\n" " port to sniff all traffic. You would have to check the documentation\n" " for the switch to see if this is possible and, if so, to see how to do\n" " this. See, for example:\n" @@ -793,6 +801,8 @@ "\n" " Note also that many firewall/NAT boxes have a switch built into them;\n" " this includes many of the \"cable/DSL router\" boxes. If you have a box\n" +, + " of that sort, that has a switch with some number of Ethernet ports\n" " into which you plug machines on your network, and another Ethernet\n" " port used to connect to a cable or DSL modem, you can, at least, sniff\n" @@ -801,8 +811,6 @@ " Ethernet port on the modem, and the machine on which you're running\n" " Ethereal into a hub (make sure it's not a switching hub, and that, if\n" " it's a dual-speed hub, all three of those ports are running at the\n" -, - " same speed.\n" "\n" " If your machine is not plugged into a switched network or a dual-speed\n" @@ -856,7 +864,7 @@ " promiscuous mode.\n" "\n" " Q 5.2: I can't see any TCP packets other than packets to and from my\n" -" machine, even though another sniffer on the network sees those\n" +" machine, even though another analyzer on the network sees those\n" " packets.\n" "\n" " A: You're probably not seeing any packets other than unicast packets\n" @@ -1029,7 +1037,15 @@ " Similar problems may exist with older versions of GTK+ for earlier\n" " versions of Solaris.\n" "\n" -" Q 5.11: When I try to run Ethereal, it complains about\n" +" Q 5.11: When I run Ethereal on Windows NT, it dies with a Dr. Watson\n" +" error, reporting an \"Integer division by zero\" exception, when I start\n" +" it.\n" +"\n" +" A: In at least some case, this appears to be due to using the default\n" +" VGA driver; if that's not the correct driver for your video card, try\n" +" running the correct driver for your video card.\n" +"\n" +" Q 5.12: When I try to run Ethereal, it complains about\n" " sprint_realloc_objid being undefined.\n" "\n" " A: Ethereal can only be linked with version 4.2.2 or later of UCD\n" @@ -1039,7 +1055,7 @@ " the older version, and fails. You will have to replace that version of\n" " UCD SNMP with version 4.2.2 or a later version.\n" "\n" -" Q 5.12: I'm running Ethereal on Linux; why do my time stamps have only\n" +" Q 5.13: I'm running Ethereal on Linux; why do my time stamps have only\n" " 100ms resolution, rather than 1us resolution?\n" "\n" " A: Ethereal gets time stamps from libpcap/WinPcap, and libpcap/WinPcap\n" @@ -1065,13 +1081,13 @@ " have to run a standard kernel from kernel.org in order to get\n" " high-resolution time stamps.\n" "\n" -" Q 5.13: I'm capturing packets on {Windows 95, Windows 98, Windows Me};\n" +" Q 5.14: I'm capturing packets on {Windows 95, Windows 98, Windows Me};\n" " why are the time stamps on packets wrong? \n" "\n" " A: This is due to a bug in WinPcap. The bug should be fixed in WinPcap\n" " 3.0.\n" "\n" -" Q 5.14: When I try to run Ethereal on Windows, it fails to run because\n" +" Q 5.15: When I try to run Ethereal on Windows, it fails to run because\n" " it can't find packet.dll.\n" "\n" " A: In older versions of Ethereal, there were two binary distributions\n" @@ -1088,7 +1104,7 @@ " Web site, the local mirror of the WinPcap Web site, or the\n" " Wiretapped.net mirror of the WinPcap site.\n" "\n" -" Q 5.15: I'm running Ethereal on Windows; why does some network\n" +" Q 5.16: I'm running Ethereal on Windows; why does some network\n" " interface on my machine not show up in the list of interfaces in the\n" " \"Interface:\" field in the dialog box popped up by \"Capture->Start\",\n" " and/or why does Ethereal give me an error if I try to capture on that\n" @@ -1104,10 +1120,10 @@ "\n" " If you are running on Windows 95/98/Me, or if you are running on\n" " Windows NT 4.0/2000/XP/Server and have administrator privileges or a\n" -" WinPcap program has been run with those privileges since the machine\n" -" rebooted, then note that Ethereal relies on the WinPcap library, on\n" -" the WinPcap device driver, and on the facilities that come with the OS\n" -" on which it's running in order to do captures.\n" +" WinPcap-based program has been run with those privileges since the\n" +" machine rebooted, then note that Ethereal relies on the WinPcap\n" +" library, on the WinPcap device driver, and on the facilities that come\n" +" with the OS on which it's running in order to do captures.\n" "\n" " Therefore, if the OS, the WinPcap library, or the WinPcap driver don't\n" " support capturing on a particular network interface device, Ethereal\n" @@ -1127,13 +1143,13 @@ " * On Windows 95, 98, or Me, sometimes more than one interface will\n" " be given the same name; if that is the case, you will only be able\n" " to capture on one of those interfaces - it's not clear to which\n" -" one the name, when used in a WinPcap application, will refer. For\n" -" example, if you have a PPP serial interface and a VPN interface,\n" -" they might show up with the same name, for example \"ppp-mac\", and\n" -" if you try to capture on \"ppp-mac\", it might not capture on the\n" -" interface you're currently using. In that case, you might, for\n" -" example, have to remove the VPN interface from the system in order\n" -" to capture on the PPP serial interface.\n" +" one the name, when used in a WinPcap-based application, will\n" +" refer. For example, if you have a PPP serial interface and a VPN\n" +" interface, they might show up with the same name, for example\n" +" \"ppp-mac\", and if you try to capture on \"ppp-mac\", it might not\n" +" capture on the interface you're currently using. In that case, you\n" +" might, for example, have to remove the VPN interface from the\n" +" system in order to capture on the PPP serial interface.\n" " * WinPcap doesn't support PPP WAN interfaces on Windows\n" " NT/2000/XP/Server, so Ethereal cannot capture packets on those\n" " devices when running on Windows NT/2000/XP/Server. Regular dial-up\n" @@ -1187,6 +1203,8 @@ " Wiretapped.net mirror of that FAQ, to see if your problem is mentioned\n" " there. If not, then see the WinPcap support page (or the local mirror\n" " of that page) - check the \"Submitting bugs\" section.\n" +, + "\n" " You may also want to ask the ethereal-users@ethereal.com and the\n" " winpcap-users@winpcap.polito.it mailing lists to see if anybody\n" @@ -1198,13 +1216,11 @@ " above, and also indicate that the problem occurs with WinDump, not\n" " just with Ethereal.\n" "\n" -" Q 5.16: I'm running on a UNIX-flavored OS; why does some network\n" +" Q 5.17: I'm running on a UNIX-flavored OS; why does some network\n" " interface on my machine not show up in the list of interfaces in the\n" " \"Interface:\" field in the dialog box popped up by \"Capture->Start\",\n" " and/or why does Ethereal give me an error if I try to capture on that\n" " interface? \n" -, - "\n" " A: You may need to run Ethereal from an account with sufficient\n" " privileges to capture packets, such as the super-user account. Only\n" @@ -1284,7 +1300,7 @@ " above, and also indicate that the problem occurs with tcpdump not just\n" " with Ethereal.\n" "\n" -" Q 5.17: I'm running Ethereal on Windows NT/2000/XP/Server; my machine\n" +" Q 5.18: I'm running Ethereal on Windows NT/2000/XP/Server; my machine\n" " has a PPP (dial-up POTS, ISDN, etc.) interface, and it shows up in the\n" " \"Interface\" item in the \"Capture Options\" dialog box. Why can no\n" " packets be sent on or received from that network while I'm trying to\n" @@ -1298,7 +1314,7 @@ " Preferences\" dialog box, but this may mean that outgoing packets, or\n" " incoming packets, won't be seen in the capture.\n" "\n" -" Q 5.18: I'm running Ethereal on Windows 95/98/Me, on a machine with\n" +" Q 5.19: I'm running Ethereal on Windows 95/98/Me, on a machine with\n" " more than one network adapter of the same type; Ethereal shows all of\n" " those adapters with the same name, but I can't use any of those\n" " adapters other than the first one.\n" @@ -1309,7 +1325,7 @@ " capture only on the first such interface; Ethereal is a\n" " libpcap/WinPcap-based application.\n" "\n" -" Q 5.19: I'm running Ethereal on Windows, and I'm not seeing any\n" +" Q 5.20: I'm running Ethereal on Windows, and I'm not seeing any\n" " traffic being sent by the machine running Ethereal.\n" "\n" " A: If you are running some form of VPN client software, it might be\n" @@ -1320,7 +1336,7 @@ " outgoing packets; unfortunately, neither we nor the WinPcap developers\n" " know any way to make WinPcap and the VPN software work well together.\n" "\n" -" Q 5.20: I'm trying to capture traffic but I'm not seeing any.\n" +" Q 5.21: I'm trying to capture traffic but I'm not seeing any.\n" "\n" " A: Is the machine running Ethereal sending out any traffic on the\n" " network interface on which you're capturing, or receiving any traffic\n" @@ -1336,7 +1352,7 @@ " Otherwise, on Windows, see the response to this question and, on a\n" " UNIX-flavored OS, see the response to this question.\n" "\n" -" Q 5.21: I have an XXX network card on my machine; if I try to capture\n" +" Q 5.22: I have an XXX network card on my machine; if I try to capture\n" " on it, my machine crashes or resets itself. \n" "\n" " A: This is almost certainly a problem with one or more of:\n" @@ -1354,7 +1370,7 @@ " Linux distribution, report the problem to whoever produces the\n" " distribution).\n" "\n" -" Q 5.22: My machine crashes or resets itself when I select \"Start\" from\n" +" Q 5.23: My machine crashes or resets itself when I select \"Start\" from\n" " the \"Capture\" menu or select \"Preferences\" from the \"Edit\" menu. \n" "\n" " A: Both of those operations cause Ethereal to try to build a list of\n" @@ -1363,20 +1379,20 @@ " or, for Windows, WinPcap bug that causes the system to crash when this\n" " happens; see the previous question.\n" "\n" -" Q 5.23: Does Ethereal work on Windows ME? \n" +" Q 5.24: Does Ethereal work on Windows ME? \n" "\n" " A: Yes, but if you want to capture packets, you will need to install\n" " the latest version of WinPcap, as 2.02 and earlier versions of WinPcap\n" " didn't support Windows ME. You should also install the latest version\n" " of Ethereal as well.\n" "\n" -" Q 5.24: Does Ethereal work on Windows XP? \n" +" Q 5.25: Does Ethereal work on Windows XP? \n" "\n" " A: Yes, but if you want to capture packets, you will need to install\n" " the latest version of WinPcap, as 2.2 and earlier versions of WinPcap\n" " didn't support Windows XP.\n" "\n" -" Q 5.25: Why doesn't Ethereal correctly identify RTP packets? It shows\n" +" Q 5.26: Why doesn't Ethereal correctly identify RTP packets? It shows\n" " them only as UDP.\n" "\n" " A: Ethereal can identify a UDP datagram as containing a packet of a\n" @@ -1409,7 +1425,7 @@ " both the source and destination ports of the packet should be\n" " dissected as some particular protocol.\n" "\n" -" Q 5.26: Why doesn't Ethereal show Yahoo Messenger packets in captures\n" +" Q 5.27: Why doesn't Ethereal show Yahoo Messenger packets in captures\n" " that contain Yahoo Messenger traffic?\n" "\n" " A: Ethereal only recognizes as Yahoo Messenger traffic packets to or\n" @@ -1419,7 +1435,7 @@ " Messenger packets (even if the TCP segment also contains the beginning\n" " of another Yahoo Messenger packet).\n" "\n" -" Q 5.27: Why do I get the error \n" +" Q 5.28: Why do I get the error \n" "\n" " Gdk-ERROR **: Palettized display (256-colour) mode not supported on\n" " Windows.\n" @@ -1434,7 +1450,7 @@ " to a display mode with more colors; if it doesn't support more than\n" " 256 colors, you will be unable to run Ethereal.\n" "\n" -" Q 5.28: When I capture on Windows in promiscuous mode, I can see\n" +" Q 5.29: When I capture on Windows in promiscuous mode, I can see\n" " packets other than those sent to or from my machine; however, those\n" " packets show up with a \"Short Frame\" indication, unlike packets to or\n" " from my machine. What should I do to arrange that I see those packets\n" @@ -1444,7 +1460,7 @@ " running on the network interface on which you're capturing; turn it\n" " off on that interface.\n" "\n" -" Q 5.29: How can I capture raw 802.11 packets, including non-data\n" +" Q 5.30: How can I capture raw 802.11 packets, including non-data\n" " (management, beacon) packets? \n" "\n" " A: That would require that your 802.11 interface run in the mode\n" @@ -1575,7 +1591,7 @@ " On platforms that don't allow Ethereal to capture raw 802.11 packets,\n" " the 802.11 network will appear like an Ethernet to Ethereal.\n" "\n" -" Q 5.30: How can I capture packets with CRC errors? \n" +" Q 5.31: How can I capture packets with CRC errors? \n" "\n" " A: Ethereal can capture only the packets that the packet capture\n" " library - libpcap on UNIX-flavored OSes, and the WinPcap port to\n" @@ -1589,10 +1605,12 @@ " programs that capture raw packets, such as tcpdump - cannot capture\n" " those packets. You will have to determine whether your OS can be so\n" " configured, configure it if possible, and make whatever changes to\n" +, + " libpcap and the packet capture program you're using are necessary to\n" " support capturing those packets.\n" "\n" -" Q 5.31: How can I capture entire frames, including the FCS? \n" +" Q 5.32: How can I capture entire frames, including the FCS? \n" "\n" " A: Ethereal can't capture any data that the packet capture library -\n" " libpcap on UNIX-flavored OSes, and the WinPcap port to Windows of\n" @@ -1605,8 +1623,6 @@ " FCS of a frame as part of the frame, or can be configured to supply\n" " the FCS of a frame as part of the frame, Ethereal - and other programs\n" " that capture raw packets, such as tcpdump - cannot capture the FCS of\n" -, - " a frame. You will have to determine whether your OS can be so\n" " configured, configure it if possible, and make whatever changes to\n" " libpcap and the packet capture program you're using are necessary to\n" @@ -1614,7 +1630,7 @@ " not support capturing the FCS of a frame on Ethernet, and probably do\n" " not support it on most other link-layer types.\n" "\n" -" Q 5.32: Ethereal hangs after I stop a capture. \n" +" Q 5.33: Ethereal hangs after I stop a capture. \n" "\n" " A: The most likely reason for this is that Ethereal is trying to look\n" " up an IP address in the capture to convert it to a name (so that, for\n" @@ -1684,7 +1700,7 @@ " contains sensitive information (e.g., passwords), then please do not\n" " send it.\n" "\n" -" Q 5.33: How can I search for, or filter, packets that have a\n" +" Q 5.34: How can I search for, or filter, packets that have a\n" " particular string anywhere in them? \n" "\n" " A: Currently, you can't.\n" @@ -1706,7 +1722,7 @@ " list. \n" " For corrections/additions/suggestions for this page, please send email\n" " to: ethereal-web[AT]ethereal.com\n" -" Last modified: Sun, May 25 2003.\n" +" Last modified: Sat, July 19 2003.\n" }; #define FAQ_PARTS 5 -#define FAQ_SIZE 77302 +#define FAQ_SIZE 78005 diff -urN ethereal-0.9.13/Makefile.am ethereal-0.9.14/Makefile.am --- ethereal-0.9.13/Makefile.am 2003-06-11 18:53:38.000000000 -0500 +++ ethereal-0.9.14/Makefile.am 2003-07-19 17:33:54.000000000 -0500 @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.589 2003/06/11 22:36:17 guy Exp $ +# $Id: Makefile.am,v 1.602 2003/07/19 22:33:54 gerald Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs @@ -142,6 +142,7 @@ packet-dcerpc-lsa.c \ packet-dcerpc-lsa-ds.c \ packet-dcerpc-mapi.c \ + packet-dcerpc-messenger.c \ packet-dcerpc-mgmt.c \ packet-dcerpc-ndr.c \ packet-dcerpc-netlogon.c \ @@ -182,6 +183,8 @@ packet-dvmrp.c \ packet-eap.c \ packet-eapol.c \ + packet-echo.c \ + packet-edonkey.c \ packet-eigrp.c \ packet-enc.c \ packet-enip.c \ @@ -213,6 +216,7 @@ packet-gtp.c \ packet-gvrp.c \ packet-h1.c \ + packet-h245.c \ packet-h261.c \ packet-hclnfsd.c \ packet-hpext.c \ @@ -235,6 +239,7 @@ packet-ipmi.c \ packet-ipp.c \ packet-ipsec.c \ + packet-ipsec-udp.c \ packet-ipv6.c \ packet-ipx.c \ packet-ipxwan.c \ @@ -251,6 +256,7 @@ packet-isns.c \ packet-isup.c \ packet-iua.c \ + packet-jabber.c \ packet-kadm5.c \ packet-kerberos.c \ packet-klm.c \ @@ -307,6 +313,7 @@ packet-osi-options.c \ packet-ospf.c \ packet-pcnfsd.c \ + packet-per.c \ packet-pflog.c \ packet-pgm.c \ packet-pim.c \ @@ -352,6 +359,7 @@ packet-sctp.c \ packet-sdlc.c \ packet-sdp.c \ + packet-sflow.c \ packet-sip.c \ packet-skinny.c \ packet-slimp3.c \ @@ -566,6 +574,7 @@ packet-diameter-defs.h \ packet-dns.h \ packet-dvmrp.h \ + packet-edonkey.h \ packet-esis.h \ packet-eth.h \ packet-fc.h \ @@ -616,12 +625,12 @@ packet-nfs.h \ packet-nisplus.h \ packet-nlm.h \ - packet-ntlmssp.h \ packet-ntp.h \ packet-null.h \ packet-osi-options.h \ packet-osi.h \ packet-pcnfsd.h \ + packet-per.h \ packet-pflog.h \ packet-pim.h \ packet-portmap.h \ @@ -708,6 +717,7 @@ greproto.h \ in_cksum.c \ in_cksum.h \ + ip_opts.h \ ipproto.c \ ipproto.h \ llcsaps.h \ @@ -948,7 +958,7 @@ register.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc @if test -n $(PYTHON); then \ echo Making register.c with python ; \ - $(PYTHON) make-reg-dotc.py . $(DISSECTOR_SRC) ; \ + $(PYTHON) $(srcdir)/make-reg-dotc.py $(srcdir) $(DISSECTOR_SRC) ; \ else \ echo Making register.c with shell script ; \ $(srcdir)/make-reg-dotc register.c $(srcdir) \ @@ -1010,7 +1020,7 @@ @SNMP_LIBS@ @SSL_LIBS@ \ $(plugin_ldadd) \ @GLIB_LIBS@ -lm \ - @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ + @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ dftest_LDFLAGS = -export-dynamic diff -urN ethereal-0.9.13/Makefile.in ethereal-0.9.14/Makefile.in --- ethereal-0.9.13/Makefile.in 2003-06-11 20:07:05.000000000 -0500 +++ ethereal-0.9.14/Makefile.in 2003-07-23 17:37:28.000000000 -0500 @@ -17,7 +17,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.589 2003/06/11 22:36:17 guy Exp $ +# $Id: Makefile.am,v 1.602 2003/07/19 22:33:54 gerald Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs @@ -289,6 +289,7 @@ packet-dcerpc-lsa.c \ packet-dcerpc-lsa-ds.c \ packet-dcerpc-mapi.c \ + packet-dcerpc-messenger.c \ packet-dcerpc-mgmt.c \ packet-dcerpc-ndr.c \ packet-dcerpc-netlogon.c \ @@ -329,6 +330,8 @@ packet-dvmrp.c \ packet-eap.c \ packet-eapol.c \ + packet-echo.c \ + packet-edonkey.c \ packet-eigrp.c \ packet-enc.c \ packet-enip.c \ @@ -360,6 +363,7 @@ packet-gtp.c \ packet-gvrp.c \ packet-h1.c \ + packet-h245.c \ packet-h261.c \ packet-hclnfsd.c \ packet-hpext.c \ @@ -382,6 +386,7 @@ packet-ipmi.c \ packet-ipp.c \ packet-ipsec.c \ + packet-ipsec-udp.c \ packet-ipv6.c \ packet-ipx.c \ packet-ipxwan.c \ @@ -398,6 +403,7 @@ packet-isns.c \ packet-isup.c \ packet-iua.c \ + packet-jabber.c \ packet-kadm5.c \ packet-kerberos.c \ packet-klm.c \ @@ -454,6 +460,7 @@ packet-osi-options.c \ packet-ospf.c \ packet-pcnfsd.c \ + packet-per.c \ packet-pflog.c \ packet-pgm.c \ packet-pim.c \ @@ -499,6 +506,7 @@ packet-sctp.c \ packet-sdlc.c \ packet-sdp.c \ + packet-sflow.c \ packet-sip.c \ packet-skinny.c \ packet-slimp3.c \ @@ -706,6 +714,7 @@ packet-diameter-defs.h \ packet-dns.h \ packet-dvmrp.h \ + packet-edonkey.h \ packet-esis.h \ packet-eth.h \ packet-fc.h \ @@ -756,12 +765,12 @@ packet-nfs.h \ packet-nisplus.h \ packet-nlm.h \ - packet-ntlmssp.h \ packet-ntp.h \ packet-null.h \ packet-osi-options.h \ packet-osi.h \ packet-pcnfsd.h \ + packet-per.h \ packet-pflog.h \ packet-pim.h \ packet-portmap.h \ @@ -849,6 +858,7 @@ greproto.h \ in_cksum.c \ in_cksum.h \ + ip_opts.h \ ipproto.c \ ipproto.h \ llcsaps.h \ @@ -1087,7 +1097,7 @@ @SNMP_LIBS@ @SSL_LIBS@ \ $(plugin_ldadd) \ @GLIB_LIBS@ -lm \ - @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ + @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ dftest_LDFLAGS = -export-dynamic @@ -1297,10 +1307,11 @@ packet-dcerpc-ftserver.$(OBJEXT) \ packet-dcerpc-krb5rpc.$(OBJEXT) packet-dcerpc-lsa.$(OBJEXT) \ packet-dcerpc-lsa-ds.$(OBJEXT) packet-dcerpc-mapi.$(OBJEXT) \ - packet-dcerpc-mgmt.$(OBJEXT) packet-dcerpc-ndr.$(OBJEXT) \ - packet-dcerpc-netlogon.$(OBJEXT) packet-dcerpc-nspi.$(OBJEXT) \ - packet-dcerpc-oxid.$(OBJEXT) packet-dcerpc-reg.$(OBJEXT) \ - packet-dcerpc-remact.$(OBJEXT) packet-dcerpc-rep_proc.$(OBJEXT) \ + packet-dcerpc-messenger.$(OBJEXT) packet-dcerpc-mgmt.$(OBJEXT) \ + packet-dcerpc-ndr.$(OBJEXT) packet-dcerpc-netlogon.$(OBJEXT) \ + packet-dcerpc-nspi.$(OBJEXT) packet-dcerpc-oxid.$(OBJEXT) \ + packet-dcerpc-reg.$(OBJEXT) packet-dcerpc-remact.$(OBJEXT) \ + packet-dcerpc-rep_proc.$(OBJEXT) \ packet-dcerpc-roverride.$(OBJEXT) packet-dcerpc-rpriv.$(OBJEXT) \ packet-dcerpc-rs_acct.$(OBJEXT) packet-dcerpc-rs_attr.$(OBJEXT) \ packet-dcerpc-rs_misc.$(OBJEXT) packet-dcerpc-rs_pgo.$(OBJEXT) \ @@ -1319,7 +1330,8 @@ packet-diameter.$(OBJEXT) packet-distcc.$(OBJEXT) \ packet-dlsw.$(OBJEXT) packet-dns.$(OBJEXT) packet-dsi.$(OBJEXT) \ packet-dvmrp.$(OBJEXT) packet-eap.$(OBJEXT) \ - packet-eapol.$(OBJEXT) packet-eigrp.$(OBJEXT) \ + packet-eapol.$(OBJEXT) packet-echo.$(OBJEXT) \ + packet-edonkey.$(OBJEXT) packet-eigrp.$(OBJEXT) \ packet-enc.$(OBJEXT) packet-enip.$(OBJEXT) \ packet-esis.$(OBJEXT) packet-eth.$(OBJEXT) \ packet-etherip.$(OBJEXT) packet-ethertype.$(OBJEXT) \ @@ -1334,24 +1346,26 @@ packet-gmrp.$(OBJEXT) packet-gnutella.$(OBJEXT) \ packet-gre.$(OBJEXT) packet-gssapi.$(OBJEXT) \ packet-gtp.$(OBJEXT) packet-gvrp.$(OBJEXT) packet-h1.$(OBJEXT) \ - packet-h261.$(OBJEXT) packet-hclnfsd.$(OBJEXT) \ - packet-hpext.$(OBJEXT) packet-hsrp.$(OBJEXT) \ - packet-http.$(OBJEXT) packet-hyperscsi.$(OBJEXT) \ - packet-iapp.$(OBJEXT) packet-ib.$(OBJEXT) packet-icap.$(OBJEXT) \ + packet-h245.$(OBJEXT) packet-h261.$(OBJEXT) \ + packet-hclnfsd.$(OBJEXT) packet-hpext.$(OBJEXT) \ + packet-hsrp.$(OBJEXT) packet-http.$(OBJEXT) \ + packet-hyperscsi.$(OBJEXT) packet-iapp.$(OBJEXT) \ + packet-ib.$(OBJEXT) packet-icap.$(OBJEXT) \ packet-icmpv6.$(OBJEXT) packet-icp.$(OBJEXT) \ packet-icq.$(OBJEXT) packet-ieee80211.$(OBJEXT) \ packet-ieee8023.$(OBJEXT) packet-igmp.$(OBJEXT) \ packet-igrp.$(OBJEXT) packet-imap.$(OBJEXT) packet-ip.$(OBJEXT) \ packet-ipfc.$(OBJEXT) packet-ipmi.$(OBJEXT) \ packet-ipp.$(OBJEXT) packet-ipsec.$(OBJEXT) \ - packet-ipv6.$(OBJEXT) packet-ipx.$(OBJEXT) \ - packet-ipxwan.$(OBJEXT) packet-irc.$(OBJEXT) \ - packet-isakmp.$(OBJEXT) packet-iscsi.$(OBJEXT) \ - packet-isdn.$(OBJEXT) packet-isis.$(OBJEXT) \ - packet-isis-clv.$(OBJEXT) packet-isis-hello.$(OBJEXT) \ - packet-isis-lsp.$(OBJEXT) packet-isis-snp.$(OBJEXT) \ - packet-isl.$(OBJEXT) packet-isns.$(OBJEXT) \ - packet-isup.$(OBJEXT) packet-iua.$(OBJEXT) \ + packet-ipsec-udp.$(OBJEXT) packet-ipv6.$(OBJEXT) \ + packet-ipx.$(OBJEXT) packet-ipxwan.$(OBJEXT) \ + packet-irc.$(OBJEXT) packet-isakmp.$(OBJEXT) \ + packet-iscsi.$(OBJEXT) packet-isdn.$(OBJEXT) \ + packet-isis.$(OBJEXT) packet-isis-clv.$(OBJEXT) \ + packet-isis-hello.$(OBJEXT) packet-isis-lsp.$(OBJEXT) \ + packet-isis-snp.$(OBJEXT) packet-isl.$(OBJEXT) \ + packet-isns.$(OBJEXT) packet-isup.$(OBJEXT) \ + packet-iua.$(OBJEXT) packet-jabber.$(OBJEXT) \ packet-kadm5.$(OBJEXT) packet-kerberos.$(OBJEXT) \ packet-klm.$(OBJEXT) packet-l2tp.$(OBJEXT) \ packet-lapb.$(OBJEXT) packet-lapbether.$(OBJEXT) \ @@ -1378,8 +1392,9 @@ packet-nntp.$(OBJEXT) packet-ntlmssp.$(OBJEXT) \ packet-ntp.$(OBJEXT) packet-null.$(OBJEXT) packet-osi.$(OBJEXT) \ packet-osi-options.$(OBJEXT) packet-ospf.$(OBJEXT) \ - packet-pcnfsd.$(OBJEXT) packet-pflog.$(OBJEXT) \ - packet-pgm.$(OBJEXT) packet-pim.$(OBJEXT) packet-pop.$(OBJEXT) \ + packet-pcnfsd.$(OBJEXT) packet-per.$(OBJEXT) \ + packet-pflog.$(OBJEXT) packet-pgm.$(OBJEXT) \ + packet-pim.$(OBJEXT) packet-pop.$(OBJEXT) \ packet-portmap.$(OBJEXT) packet-ppp.$(OBJEXT) \ packet-pppoe.$(OBJEXT) packet-pptp.$(OBJEXT) \ packet-prism.$(OBJEXT) packet-q2931.$(OBJEXT) \ @@ -1399,7 +1414,8 @@ packet-sadmind.$(OBJEXT) packet-sap.$(OBJEXT) \ packet-sccp.$(OBJEXT) packet-sccpmg.$(OBJEXT) \ packet-scsi.$(OBJEXT) packet-sctp.$(OBJEXT) \ - packet-sdlc.$(OBJEXT) packet-sdp.$(OBJEXT) packet-sip.$(OBJEXT) \ + packet-sdlc.$(OBJEXT) packet-sdp.$(OBJEXT) \ + packet-sflow.$(OBJEXT) packet-sip.$(OBJEXT) \ packet-skinny.$(OBJEXT) packet-slimp3.$(OBJEXT) \ packet-sll.$(OBJEXT) packet-slowprotocols.$(OBJEXT) \ packet-smb.$(OBJEXT) packet-smb-browse.$(OBJEXT) \ @@ -1546,6 +1562,7 @@ @AMDEP_TRUE@ ./$(DEPDIR)/packet-dcerpc-lsa-ds.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-dcerpc-lsa.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-dcerpc-mapi.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/packet-dcerpc-messenger.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-dcerpc-mgmt.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-dcerpc-ndr.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-dcerpc-netlogon.Po \ @@ -1587,6 +1604,8 @@ @AMDEP_TRUE@ ./$(DEPDIR)/packet-dvmrp.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-eap.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-eapol.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/packet-echo.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/packet-edonkey.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-eigrp.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-enc.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-enip.Po \ @@ -1614,6 +1633,7 @@ @AMDEP_TRUE@ ./$(DEPDIR)/packet-gssapi.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-gtp.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-gvrp.Po ./$(DEPDIR)/packet-h1.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/packet-h245.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-h261.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-hclnfsd.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-hpext.Po \ @@ -1632,6 +1652,7 @@ @AMDEP_TRUE@ ./$(DEPDIR)/packet-ipfc.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-ipmi.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-ipp.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/packet-ipsec-udp.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-ipsec.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-ipv6.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-ipx.Po \ @@ -1649,6 +1670,7 @@ @AMDEP_TRUE@ ./$(DEPDIR)/packet-isns.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-isup.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-iua.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/packet-jabber.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-kadm5.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-kerberos.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-klm.Po \ @@ -1703,6 +1725,7 @@ @AMDEP_TRUE@ ./$(DEPDIR)/packet-osi.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-ospf.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-pcnfsd.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/packet-per.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-pflog.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-pgm.Po ./$(DEPDIR)/packet-pim.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-pop.Po \ @@ -1743,7 +1766,9 @@ @AMDEP_TRUE@ ./$(DEPDIR)/packet-scsi.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-sctp.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-sdlc.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/packet-sdp.Po ./$(DEPDIR)/packet-sip.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/packet-sdp.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/packet-sflow.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/packet-sip.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-skinny.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-slimp3.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/packet-sll.Po \ @@ -2053,6 +2078,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-dcerpc-lsa-ds.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-dcerpc-lsa.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-dcerpc-mapi.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-dcerpc-messenger.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-dcerpc-mgmt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-dcerpc-ndr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-dcerpc-netlogon.Po@am__quote@ @@ -2095,6 +2121,8 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-dvmrp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-eap.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-eapol.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-echo.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-edonkey.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-eigrp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-enc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-enip.Po@am__quote@ @@ -2126,6 +2154,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-gtp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-gvrp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-h1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-h245.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-h261.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-hclnfsd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-hpext.Po@am__quote@ @@ -2147,6 +2176,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-ipfc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-ipmi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-ipp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-ipsec-udp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-ipsec.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-ipv6.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-ipx.Po@am__quote@ @@ -2164,6 +2194,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-isns.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-isup.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-iua.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-jabber.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-kadm5.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-kerberos.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-klm.Po@am__quote@ @@ -2220,6 +2251,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-osi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-ospf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-pcnfsd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-per.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-pflog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-pgm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-pim.Po@am__quote@ @@ -2265,6 +2297,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-sctp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-sdlc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-sdp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-sflow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-sip.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-skinny.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet-slimp3.Po@am__quote@ @@ -2828,7 +2861,7 @@ register.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc @if test -n $(PYTHON); then \ echo Making register.c with python ; \ - $(PYTHON) make-reg-dotc.py . $(DISSECTOR_SRC) ; \ + $(PYTHON) $(srcdir)/make-reg-dotc.py $(srcdir) $(DISSECTOR_SRC) ; \ else \ echo Making register.c with shell script ; \ $(srcdir)/make-reg-dotc register.c $(srcdir) \ diff -urN ethereal-0.9.13/Makefile.nmake ethereal-0.9.14/Makefile.nmake --- ethereal-0.9.13/Makefile.nmake 2003-06-11 18:53:38.000000000 -0500 +++ ethereal-0.9.14/Makefile.nmake 2003-07-19 09:48:55.000000000 -0500 @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.306 2003/06/11 22:36:17 guy Exp $ +# $Id: Makefile.nmake,v 1.319 2003/07/16 21:13:48 guy Exp $ include config.nmake include @@ -13,12 +13,10 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) -CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) /I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule \ - /I$(GTK_DIR) /I. /Iwiretap /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ +CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GTK_CFLAGS) /I. /Iwiretap \ /I$(ZLIB_DIR) /I$(PCAP_DIR)\include \ /I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \ - /I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32 \ - -D_U_="" + $(ADNS_CFLAGS) -D_U_="" CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL @@ -85,6 +83,7 @@ packet-dcerpc-lsa.c \ packet-dcerpc-lsa-ds.c \ packet-dcerpc-mapi.c \ + packet-dcerpc-messenger.c \ packet-dcerpc-mgmt.c \ packet-dcerpc-ndr.c \ packet-dcerpc-netlogon.c \ @@ -125,6 +124,8 @@ packet-dvmrp.c \ packet-eap.c \ packet-eapol.c \ + packet-echo.c \ + packet-edonkey.c \ packet-eigrp.c \ packet-enc.c \ packet-enip.c \ @@ -156,6 +157,7 @@ packet-gtp.c \ packet-gvrp.c \ packet-h1.c \ + packet-h245.c \ packet-h261.c \ packet-hclnfsd.c \ packet-hpext.c \ @@ -178,6 +180,7 @@ packet-ipmi.c \ packet-ipp.c \ packet-ipsec.c \ + packet-ipsec-udp.c \ packet-ipv6.c \ packet-ipx.c \ packet-ipxwan.c \ @@ -194,6 +197,7 @@ packet-isns.c \ packet-isup.c \ packet-iua.c \ + packet-jabber.c \ packet-kadm5.c \ packet-kerberos.c \ packet-klm.c \ @@ -250,6 +254,7 @@ packet-osi-options.c \ packet-ospf.c \ packet-pcnfsd.c \ + packet-per.c \ packet-pflog.c \ packet-pgm.c \ packet-pim.c \ @@ -295,6 +300,7 @@ packet-sctp.c \ packet-sdlc.c \ packet-sdp.c \ + packet-sflow.c \ packet-sip.c \ packet-skinny.c \ packet-slimp3.c \ @@ -449,13 +455,8 @@ 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 \ -!IFDEF ADNS_DIR - $(ADNS_DIR)\adns_win32\lib\adns_dll.lib \ -!ENDIF + $(GTK_LIBS) \ + $(ADNS_LIBS) \ $(NET_SNMP_DIR)\win32\lib\libsnmp.lib # $(PCAP_DIR)\lib\wpcap.lib @@ -463,33 +464,27 @@ 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 \ -!IFDEF ADNS_DIR - $(ADNS_DIR)\adns_win32\lib\adns_dll.lib \ -!ENDIF + $(GLIB_LIBS) \ + $(ADNS_LIBS) \ $(NET_SNMP_DIR)\win32\lib\libsnmp.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 + $(GLIB_LIBS) mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ - $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ - $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib + $(GLIB_LIBS) dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib epan\ethereal.lib \ epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \ wsock32.lib user32.lib \ wiretap\wiretap-$(WTAP_VERSION).lib \ - $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ - $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib + $(GLIB_LIBS) randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ user32.lib \ - $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \ + $(GLIB_LIBS) \ $(NET_SNMP_DIR)\win32\lib\libsnmp.lib EXECUTABLES=ethereal.exe tethereal.exe editcap.exe mergecap.exe text2pcap.exe @@ -542,8 +537,8 @@ /OUT:randpkt.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(randpkt_LIBS) $(randpkt_OBJECTS) << -config.h : config.h.win32 - sed -e s/@VERSION@/$(VERSION)/ < config.h.win32 > $@ +config.h : config.h.win32 config.nmake + sed -e s/@VERSION@/$(VERSION)/ -e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" < config.h.win32 > $@ ps.c : rdps.exe print.ps rdps print.ps ps.c diff -urN ethereal-0.9.13/NEWS ethereal-0.9.14/NEWS --- ethereal-0.9.13/NEWS 2003-06-11 20:01:05.000000000 -0500 +++ ethereal-0.9.14/NEWS 2003-07-23 18:14:57.000000000 -0500 @@ -1,6 +1,43 @@ -$Id: NEWS,v 1.130 2003/06/12 01:01:05 gerald Exp $ +$Id: NEWS,v 1.132 2003/07/23 23:14:57 gerald Exp $ -== June ?, 2003 +== July 23, 2003 + +Ethereal 0.9.14 has been released. + +New and updated features + + The ringbuffer code has been (nearly) completely rewritten. It now + supports an unlimited number of files. + + Ethereal now supports searching for arbitrary text and binary data in + frames. + + Service response time statistics have been enhanced. + + Tethereal, the text-mode version of Ethereal, can now be compiled + without capture support. + + +New protocols + + Echo, eDonkey, Jabber, MS Messenger, sFlow + + +Updated protocols + + AODV, AODV6, Boardwalk, DCE-RPC, ENIP, Fibre Channel, FIX, FW1, H.245, + IGMP, IPsec, IS-IS, iSCSI, ISUP, LDAP, LDP, M2UA, MEGACO, MTP3, NDS, + NETLOGON, NTLMSSP, NTP, Q.2931, Q.931, SAMR, SCCP, SCSI, SMB, SMPP, SNA, + SNMP, SPNEGO, SPOOLSS, SRVLOC, UCP, Vines, VRRP, WBXML, WEP, WSP, WTP, + X11, Zebra + + +Updated capture file support + + LANalyzer, NetXRay, + + +== June 11, 2003 Ethereal 0.9.13 has been released. diff -urN ethereal-0.9.13/asn1.c ethereal-0.9.14/asn1.c --- ethereal-0.9.13/asn1.c 2003-05-11 10:06:33.000000000 -0500 +++ ethereal-0.9.14/asn1.c 2003-06-28 11:07:56.000000000 -0500 @@ -1,7 +1,7 @@ /* asn1.c * Routines for ASN.1 BER dissection * - * $Id: asn1.c,v 1.19 2003/05/10 02:00:41 guy Exp $ + * $Id: asn1.c,v 1.20 2003/06/24 06:05:47 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -607,6 +607,7 @@ int eoc; guchar *ptr; + eoc = asn1->offset + enc_len; *bits = NULL; ret = asn1_octet_decode (asn1, unused); if (ret != ASN1_ERR_NOERROR) @@ -634,7 +635,6 @@ *bits = g_malloc (1); } - eoc = asn1->offset + enc_len; ptr = *bits; while (asn1->offset < eoc) { ret = asn1_octet_decode (asn1, (guchar *)ptr++); diff -urN ethereal-0.9.13/autogen.sh ethereal-0.9.14/autogen.sh --- ethereal-0.9.13/autogen.sh 2003-02-16 15:13:37.000000000 -0600 +++ ethereal-0.9.14/autogen.sh 2003-06-28 11:07:56.000000000 -0500 @@ -2,7 +2,7 @@ # # Run this to generate all the initial makefiles. # -# $Id: autogen.sh,v 1.23 2003/02/15 03:17:17 jmayer Exp $ +# $Id: autogen.sh,v 1.26 2003/06/22 22:50:40 jmayer Exp $ DIE=true PROJECT="Ethereal" @@ -51,8 +51,23 @@ esac -LTVER=`libtool --version | grep ' libtool)' | \ -sed 's/.*) \([0-9][0-9.]*\) .*/\1/' ` +# +# Apple's Developer Tools have a "libtool" that has nothing to do with +# the GNU libtool; they call the latter "glibtool". They also call +# libtoolize "glibtoolize". +# +# Check for "glibtool" first. +# +LTVER=`glibtool --version 2>/dev/null | grep ' libtool)' | \ + sed 's/.*) \([0-9][0-9.]*\) .*/\1/'` +if test -z "$LTVER" +then + LTVER=`libtool --version | grep ' libtool)' | \ + sed 's/.*) \([0-9][0-9.]*\) .*/\1/' ` + LIBTOOLIZE=libtoolize +else + LIBTOOLIZE=glibtoolize +fi case "$LTVER" in 0* | 1\.[0-2] | 1\.[0-2][a-z]* | \ 1\.3\.[0-2] | 1\.3\.[0-2][a-z]* ) @@ -77,16 +92,13 @@ # mv config.guess config.guess.save-libtool mv config.sub config.sub.save-libtool -libtoolize --copy --force || exit 1 +LTARGS=" --copy --force" +echo $LIBTOOLIZE $LTARGS +$LIBTOOLIZE $LTARGS || exit 1 rm -f config.guess config.sub mv config.guess.save-libtool config.guess mv config.sub.save-libtool config.sub -#if test -z "$*"; then -# echo "Running ./configure with no arguments. If you wish to pass any," -# echo "please specify them on the $0 command line." -#fi - if glib-config --version >/dev/null 2>&1 ; then rm -f aclocal-missing/glib.m4 else diff -urN ethereal-0.9.13/capture.c ethereal-0.9.14/capture.c --- ethereal-0.9.13/capture.c 2003-05-17 11:32:58.000000000 -0500 +++ ethereal-0.9.14/capture.c 2003-07-23 17:33:25.000000000 -0500 @@ -1,7 +1,7 @@ /* capture.c * Routines for packet capture windows * - * $Id: capture.c,v 1.207 2003/05/15 13:33:53 deniel Exp $ + * $Id: capture.c,v 1.208 2003/07/23 05:01:15 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -1398,8 +1398,8 @@ #define N_COUNTS (sizeof counts / sizeof counts[0]) #ifdef _WIN32 - WORD wVersionRequested; - WSADATA wsaData; + WORD wVersionRequested; + WSADATA wsaData; #else static const char ppamsg[] = "can't find PPA for "; char *libpcap_warn; @@ -1420,12 +1420,45 @@ /* Initialize Windows Socket if we are in a WIN32 OS This needs to be done before querying the interface for network/netmask */ #ifdef _WIN32 - wVersionRequested = MAKEWORD( 1, 1 ); - err = WSAStartup( wVersionRequested, &wsaData ); - if (err!=0) { - snprintf(errmsg, sizeof errmsg, - "Couldn't initialize Windows Sockets."); - pch=NULL; + /* XXX - do we really require 1.1 or earlier? + Are there any versions that support only 2.0 or higher? */ + wVersionRequested = MAKEWORD(1, 1); + err = WSAStartup(wVersionRequested, &wsaData); + if (err != 0) { + switch (err) { + + case WSASYSNOTREADY: + snprintf(errmsg, sizeof errmsg, + "Couldn't initialize Windows Sockets: Network system not ready for network communication"); + break; + + case WSAVERNOTSUPPORTED: + snprintf(errmsg, sizeof errmsg, + "Couldn't initialize Windows Sockets: Windows Sockets version %u.%u not supported", + LOBYTE(wVersionRequested), HIBYTE(wVersionRequested)); + break; + + case WSAEINPROGRESS: + snprintf(errmsg, sizeof errmsg, + "Couldn't initialize Windows Sockets: Blocking operation is in progress"); + break; + + case WSAEPROCLIM: + snprintf(errmsg, sizeof errmsg, + "Couldn't initialize Windows Sockets: Limit on the number of tasks supported by this WinSock implementation has been reached"); + break; + + case WSAEFAULT: + snprintf(errmsg, sizeof errmsg, + "Couldn't initialize Windows Sockets: Bad pointer passed to WSAStartup"); + break; + + default: + snprintf(errmsg, sizeof errmsg, + "Couldn't initialize Windows Sockets: error %d", err); + break; + } + pch = NULL; goto error; } #endif diff -urN ethereal-0.9.13/cfile.h ethereal-0.9.14/cfile.h --- ethereal-0.9.13/cfile.h 2002-09-06 18:14:04.000000000 -0500 +++ ethereal-0.9.14/cfile.h 2003-07-22 21:05:35.000000000 -0500 @@ -1,7 +1,7 @@ /* cfile.h * capture_file definition & GUI-independent manipulation * - * $Id: cfile.h,v 1.1 2002/09/06 23:14:04 sahlberg Exp $ + * $Id: cfile.h,v 1.2 2003/07/22 23:08:47 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -65,6 +65,9 @@ #endif gchar *sfilter; /* Search filter string */ gboolean sbackward; /* TRUE if search is backward, FALSE if forward */ + gboolean hex; /* TRUE is Hex search is being performed */ + gboolean ascii; /* TRUE is ASCII search is being performed */ + char *ftype; /* Find Frame String Type */ union wtap_pseudo_header pseudo_header; /* Packet pseudo_header */ guint8 pd[WTAP_MAX_PACKET_SIZE]; /* Packet data */ GMemChunk *plist_chunk; /* Memory chunk for frame_data structures */ diff -urN ethereal-0.9.13/config.guess ethereal-0.9.14/config.guess --- ethereal-0.9.13/config.guess 2001-12-09 09:16:38.000000000 -0600 +++ ethereal-0.9.14/config.guess 2003-06-28 11:07:56.000000000 -0500 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2001-11-26' +timestamp='2003-06-17' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,7 +24,7 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner . +# Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -88,30 +88,42 @@ exit 1 fi +trap 'exit 1' 1 2 15 -dummy=dummy-$$ -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. -# CC_FOR_BUILD -- compiler used by this script. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int dummy(){}" > $dummy.c ; - for c in cc gcc c89 ; do - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; - if test $? = 0 ; then +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -135,23 +147,23 @@ # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. - # Determine the machine/vendor (is the vendor relevant). - case "${UNAME_MACHINE}" in - amiga) machine=m68k-unknown ;; - arm32) machine=arm-unknown ;; - atari*) machine=m68k-atari ;; - sun3*) machine=m68k-sun ;; - mac68k) machine=m68k-apple ;; - macppc) machine=powerpc-apple ;; - hp3[0-9][05]) machine=m68k-hp ;; - ibmrt|romp-ibm) machine=romp-ibm ;; - sparc*) machine=`uname -p`-unknown ;; - *) machine=${UNAME_MACHINE}-unknown ;; + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. - case "${UNAME_MACHINE}" in - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null @@ -168,7 +180,18 @@ ;; esac # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. @@ -217,65 +240,52 @@ if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` fi + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - eval $set_cc_for_build - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - esac - fi - rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; + Alpha*:OpenVMS:*:*) + echo alpha-hp-vms + exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -291,6 +301,9 @@ *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; @@ -311,6 +324,13 @@ NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7 && exit 0 ;; + esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; @@ -339,7 +359,7 @@ echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) @@ -417,15 +437,20 @@ exit (-1); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy \ - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit 0 ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit 0 ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; @@ -498,8 +523,7 @@ exit(0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -508,7 +532,7 @@ fi exit 0 ;; *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else @@ -597,11 +621,21 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) @@ -635,8 +669,7 @@ exit (0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -682,9 +715,6 @@ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit 0 ;; - CRAY*X-MP:*:*:*) - echo xmp-cray-unicos - exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; @@ -697,18 +727,15 @@ CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY-2:*:*:*) - echo cray2-cray-unicos - exit 0 ;; + *:UNICOS/mp:*:*) + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` @@ -724,8 +751,19 @@ *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; - *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) + # Determine whether the default compiler uses glibc. + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #if __GLIBC__ >= 2 + LIBC=gnu + #else + LIBC= + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -736,11 +774,17 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit 0 ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? - echo i386-pc-interix + echo i586-pc-interix exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin @@ -760,17 +804,52 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux + echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) - case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in - big) echo mips-unknown-linux-gnu && exit 0 ;; - little) echo mipsel-unknown-linux-gnu && exit 0 ;; - esac + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu @@ -806,6 +885,9 @@ s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -819,7 +901,8 @@ # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. - ld_supported_targets=`cd /; ld --help 2>&1 \ + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// @@ -831,7 +914,7 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 ;; @@ -843,32 +926,28 @@ esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build - cat >$dummy.c < -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __ELF__ -# ifdef __GLIBC__ -# if __GLIBC__ >= 2 - printf ("%s-pc-linux-gnu\n", argv[1]); -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -#else - printf ("%s-pc-linux-gnuaout\n", argv[1]); -#endif - return 0; -} + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #ifdef __INTEL_COMPILER + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) @@ -885,6 +964,23 @@ # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -906,22 +1002,19 @@ UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -945,9 +1038,15 @@ # "miniframe" echo m68010-convergent-sysv exit 0 ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit 0 ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -964,9 +1063,6 @@ mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1038,6 +1134,9 @@ SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} exit 0 ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit 0 ;; @@ -1045,18 +1144,24 @@ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} + case `uname -p` in + *86) UNAME_PROCESSOR=i686 ;; + powerpc) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo `uname -p`-${UNAME_MACHINE}-nto-qnx + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*) + NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1079,11 +1184,6 @@ fi echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 exit 0 ;; @@ -1102,11 +1202,8 @@ *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; esac @@ -1228,8 +1325,7 @@ } EOF -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 -rm -f $dummy.c $dummy +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. diff -urN ethereal-0.9.13/config.h.win32 ethereal-0.9.14/config.h.win32 --- ethereal-0.9.13/config.h.win32 2003-06-02 18:50:05.000000000 -0500 +++ ethereal-0.9.14/config.h.win32 2003-06-13 18:32:59.000000000 -0500 @@ -1,4 +1,4 @@ -/* $Id: config.h.win32,v 1.39 2003/06/02 18:40:00 gerald Exp $ */ +/* $Id: config.h.win32,v 1.40 2003/06/12 09:45:42 guy Exp $ */ /* config.h.win32 Generated manually. :-) */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -110,7 +110,7 @@ #define HAVE_LIBZ 1 /* Define to use GNU ADNS library */ -#define HAVE_GNU_ADNS 1 +@HAVE_GNU_ADNS@ #define ADNS_JGAA_WIN32 1 #ifndef WIN32 diff -urN ethereal-0.9.13/config.nmake ethereal-0.9.14/config.nmake --- ethereal-0.9.13/config.nmake 2003-06-09 20:47:33.000000000 -0500 +++ ethereal-0.9.14/config.nmake 2003-07-22 21:06:24.000000000 -0500 @@ -1,17 +1,50 @@ -# $Id: config.nmake,v 1.40 2003/06/10 01:47:33 gerald Exp $ +# $Id: config.nmake,v 1.54 2003/07/23 02:06:24 gerald Exp $ -VERSION=0.9.13 -RC_VERSION=0.9.13 +VERSION=0.9.14 +# +# This should be comma-separated, not dot-separated, as per Graham +# Bloice's message in +# +# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html +# +# "The RC_VERSION variable in config.nmake should be comma separated. +# This allows the resources to be built correctly and the version +# number to be correctly displayed in the explorer properties dialog +# for the executables, and XP's tooltip, rather than 0.0.0.0." +# +RC_VERSION=0,9,14 WTAP_VERSION=0.0 GTK_VERSION=1.3 GLIB_VERSION=1.3 +# +# This presumes that GLib 1.3 developer's packages put header files and +# libraries directly in a "glib" directory and GTK+ 1.3 packages put +# header files and libraries directly in a "gtk+" directory, while GLib +# 2.x developer's packages put header files in an "include\glib-{version}" +# directory and libraries in a "lib\glib-{version}" directory, and GTK+ +# 2.x developer's packages put header files in an "include\gtk-{version}" +# directory and libraries in a "lib\gtk-{version}" directory. +# +# If the version of a developer's package is 1.3, set the appropriate +# _DIR variable to the "glib" or "gtk+" directory; if it's 2.x, set it +# to the directory in which the "include" and "lib" directories reside. +# GLIB_DIR=C:\ethereal-win32-libs\glib GTK_DIR=C:\ethereal-win32-libs\gtk+ + ZLIB_DIR=C:\ethereal-win32-libs\zlib-1.1.3 PCAP_DIR=C:\ethereal-win32-libs\WPdpack NET_SNMP_DIR=C:\ethereal-win32-libs\net-snmp-5.0.6 + +# +# If you have GNU ADNS, set this to the pathname of the directory in +# which the GNU ADNS .lib file is stored. +# +# If you don't have GNU ADNS, comment this line out, so that ADNS_DIR +# isn't defined. +# ADNS_DIR=C:\ethereal-win32-libs\adns-1.0-win32-01 COMMON_FILES_GNU=c:\program files\common files\gnu @@ -23,7 +56,7 @@ PDB_FILE=vc*.pdb # Set path if you need to find some binary -PATH=c:\cygnus\cygwin-b20\H-i586-cygwin32\bin;c:\python22;c:\ethereal\wiretap;c:\program files\common files\gnu;$(PATH) +PATH=c:\cygnus\cygwin-b20\H-i586-cygwin32\bin;c:\python22;c:\ethereal\wiretap;$(COMMON_FILES_GNU);$(PATH) SH=bash PERL=perl @@ -38,3 +71,50 @@ # To build the installer MAKENSIS="C:/program files/nsis/makensis.exe" + +# +# You should not have to change anything below this comment. +# If you do, it's a deficiency in the Makefile.nmake files; +# either tell ethereal-dev@ethereal.com about it, including +# details of why you had to change it, or fix config.nmake +# and any Makefile.nmake files that need to be changed, and +# send us the patches, along with details of why the change +# was necessary. +# +!IF "$(GLIB_VERSION)" == "1.3" +GLIB_CFLAGS=/I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule +GLIB_LIBS=$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ + $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib +!ELSE +GLIB_CFLAGS=/I$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \ + /I$(GLIB_DIR)\lib\glib-$(GLIB_VERSION)\include +GLIB_LIBS=$(GLIB_DIR)\lib\glib-$(GLIB_VERSION).lib \ + $(GLIB_DIR)\lib\gmodule-$(GLIB_VERSION).lib \ + $(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib +!ENDIF +!IF "$(GTK_VERSION)" == "1.3" +GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR) /I$(GTK_DIR)\gdk +GTK_LIBS=$(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \ + $(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \ + $(GLIB_LIBS) +!ELSE +GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-$(GTK_VERSION) \ + /I$(GTK_DIR)\lib\gtk-$(GTK_VERSION)\include \ + /I$(GTK_DIR)\include\atk-1.0 \ + /I$(GTK_DIR)\include\pango-1.0 +GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-$(GTK_VERSION).lib \ + $(GTK_DIR)\lib\gdk-win32-$(GTK_VERSION).lib \ + $(GTK_DIR)\lib\pango-1.0.lib \ + $(GLIB_LIBS) +!ENDIF + +!IFDEF ADNS_DIR +ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32 +ADNS_LIBS=$(ADNS_DIR)\adns_win32\lib\adns_dll.lib +# Nmake uses carets to escape special characters +ADNS_CONFIG=^#define HAVE_GNU_ADNS 1 +!else +ADNS_CFLAGS= +ADNS_LIBS= +ADNS_CONFIG= +!ENDIF diff -urN ethereal-0.9.13/config.sub ethereal-0.9.14/config.sub --- ethereal-0.9.13/config.sub 2001-12-07 18:07:27.000000000 -0600 +++ ethereal-0.9.14/config.sub 2003-06-28 11:07:57.000000000 -0500 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2001-12-03' +timestamp='2003-06-17' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -118,7 +118,7 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) + nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -227,28 +227,41 @@ 1750a | 580 \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | c4x | clipper \ - | d10v | d30v | dsp16xx \ - | fr30 \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ + | ip2k \ | m32r | m68000 | m68k | m88k | mcore \ - | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el | mips64vr4300 \ - | mips64vr4300el | mips64vr5000 | mips64vr5000el \ - | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ - | mipsisa32 \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | msp430 \ | ns16k | ns32k \ - | openrisc \ + | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[34] | sh[34]eb | shbe | shle \ - | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ | strongarm \ - | tahoe | thumb | tic80 | tron \ + | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ | x86 | xscale | xstormy16 | xtensa \ @@ -278,38 +291,54 @@ 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alphapca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armv*-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c54x-* \ - | clipper-* | cray2-* | cydra-* \ - | d10v-* | d30v-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | fx80-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* \ | m32r-* \ - | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ - | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ - | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ - | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | msp430-* \ + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \ - | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ | xtensa-* \ | ymp-* \ | z8k-*) @@ -344,6 +373,9 @@ basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -375,6 +407,10 @@ basic_machine=ns32k-sequent os=-dynix ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -395,16 +431,8 @@ basic_machine=c38-convex os=-bsd ;; - cray | ymp) - basic_machine=ymp-cray - os=-unicos - ;; - cray2) - basic_machine=cray2-cray - os=-unicos - ;; - [cjt]90) - basic_machine=${basic_machine}-cray + cray | j90) + basic_machine=j90-cray os=-unicos ;; crds | unos) @@ -419,6 +447,14 @@ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -599,14 +635,6 @@ basic_machine=m68k-atari os=-mint ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -621,6 +649,10 @@ basic_machine=m68k-rom68k os=-coff ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; msdos) basic_machine=i386-pc os=-msdos @@ -693,6 +725,10 @@ np1) basic_machine=np1-gould ;; + nv1) + basic_machine=nv1-cray + os=-unicosmp + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -700,6 +736,10 @@ basic_machine=hppa1.1-oki os=-proelf ;; + or32 | or32-*) + basic_machine=or32-unknown + os=-coff + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -722,49 +762,55 @@ pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; - pentiumpro | p6 | 6x86 | athlon) + pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; + pentium4) + basic_machine=i786-pc + ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown - ;; + ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown - ;; + ;; ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ;; @@ -795,6 +841,16 @@ basic_machine=a29k-amd os=-udi ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -802,6 +858,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh64) + basic_machine=sh64-unknown + ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks @@ -869,19 +928,35 @@ os=-dynix ;; t3e) - basic_machine=t3e-cray + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; @@ -906,8 +981,8 @@ os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -928,17 +1003,13 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt + xps | xps100) + basic_machine=xps100-honeywell ;; - xmp) - basic_machine=xmp-cray + ymp) + basic_machine=ymp-cray os=-unicos ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim @@ -959,13 +1030,6 @@ op60c) basic_machine=hppa1.1-oki ;; - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi - ;; romp) basic_machine=romp-ibm ;; @@ -985,13 +1049,16 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; + sh64) + basic_machine=sh64-unknown + ;; sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -1006,10 +1073,6 @@ pmac | pmac-mpw) basic_machine=powerpc-apple ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; @@ -1072,10 +1135,12 @@ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus*) + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1087,8 +1152,10 @@ ;; esac ;; + -nto-qnx*) + ;; -nto*) - os=-nto-qnx + os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ @@ -1136,8 +1203,11 @@ -ctix* | -uts*) os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 ;; -nsk*) os=-nsk @@ -1176,8 +1246,14 @@ -xenix) os=-xenix ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos ;; -none) ;; @@ -1210,10 +1286,14 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; - pdp11-*) + pdp11-*) os=-none ;; *-dec | vax-*) @@ -1240,6 +1320,9 @@ mips*-*) os=-elf ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -1303,19 +1386,19 @@ *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) @@ -1387,7 +1470,7 @@ -ptx*) vendor=sequent ;; - -vxsim* | -vxworks*) + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) diff -urN ethereal-0.9.13/configure ethereal-0.9.14/configure --- ethereal-0.9.13/configure 2003-06-11 20:07:08.000000000 -0500 +++ ethereal-0.9.14/configure 2003-07-23 17:37:31.000000000 -0500 @@ -1017,7 +1017,7 @@ --enable-usr-local look for headers and libs in /usr/local tree. default=yes --enable-ethereal build GTK+-based ethereal. default=yes --enable-gtk2 build Glib2/Gtk2+-based (t)ethereal. default=no - --enable-threads use threads in ethereal. default=yes + --enable-threads use threads in ethereal. default=no --disable-gtktest do not try to compile and run a test GTK+ program --disable-gtktest Do not try to compile and run a test GTK program --disable-glibtest do not try to compile and run a test GLIB program @@ -1805,7 +1805,7 @@ # Define the identity of the package. PACKAGE=ethereal - VERSION=0.9.13 + VERSION=0.9.14 cat >>confdefs.h <<_ACEOF @@ -3199,6 +3199,7 @@ enable_static=no fi; + # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -4475,7 +4476,7 @@ fi -enable_dlopen=no +enable_dlopen=yes enable_win32_dll=no # Check whether --enable-libtool-lock or --disable-libtool-lock