aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-07-18 00:24:25 +0000
committerGuy Harris <guy@alum.mit.edu>2004-07-18 00:24:25 +0000
commit8a8b8834500043ea4f7d818aafa2b1edb353563a (patch)
treeb927867e72fe395b5060acacc1f9e827b3e430cd
parent16c252d77519048fbea9fee2e00f5ea66d534953 (diff)
Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. svn path=/trunk/; revision=11400
-rw-r--r--Ethereal.desktop2
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.common2
-rw-r--r--Makefile.nmake2
-rw-r--r--NEWS2
-rw-r--r--README2
-rw-r--r--README.aix2
-rw-r--r--README.bsd2
-rw-r--r--README.hpux2
-rw-r--r--README.irix2
-rw-r--r--README.linux2
-rw-r--r--README.macos2
-rw-r--r--README.tru642
-rw-r--r--README.vmware2
-rw-r--r--README.win322
-rw-r--r--TODO2
-rw-r--r--acinclude.m42
-rwxr-xr-xaclocal-flags2
-rw-r--r--adler32.c2
-rw-r--r--adler32.h2
-rw-r--r--afn.c2
-rw-r--r--afn.h2
-rw-r--r--aftypes.h2
-rw-r--r--alert_box.c2
-rw-r--r--alert_box.h2
-rw-r--r--arcnet_pids.h2
-rw-r--r--asn1.c2
-rw-r--r--asn1.h2
-rw-r--r--asn1/h235/h235.cnf2
-rw-r--r--asn1/h235/packet-h235-template.c2
-rw-r--r--asn1/h235/packet-h235-template.h2
-rwxr-xr-xautogen.sh2
-rw-r--r--bridged_pids.h2
-rw-r--r--capture-wpcap.c2
-rw-r--r--capture-wpcap.h2
-rw-r--r--capture.c2
-rw-r--r--capture.h2
-rw-r--r--capture_stop_conditions.c2
-rw-r--r--capture_stop_conditions.h2
-rw-r--r--cfile.c2
-rw-r--r--cfile.h2
-rw-r--r--chdlctypes.h2
-rw-r--r--cleanbld.bat2
-rw-r--r--color.h2
-rw-r--r--column.c2
-rw-r--r--column.h2
-rw-r--r--conditions.c2
-rw-r--r--conditions.h2
-rw-r--r--config.h.win322
-rw-r--r--config.nmake2
-rw-r--r--configure.in2
-rw-r--r--crc16.c2
-rw-r--r--crc16.h2
-rw-r--r--crc32.c2
-rw-r--r--crc32.h2
-rw-r--r--crypt-des.c2
-rw-r--r--crypt-des.h2
-rw-r--r--crypt-md4.c2
-rw-r--r--crypt-md4.h2
-rw-r--r--crypt-md5.c2
-rw-r--r--crypt-md5.h2
-rw-r--r--crypt-rc4.c2
-rw-r--r--crypt-rc4.h2
-rw-r--r--dftest.c2
-rw-r--r--disabled_protos.c2
-rw-r--r--disabled_protos.h2
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/Makefile.nmake2
-rw-r--r--doc/README.capture2
-rw-r--r--doc/README.design2
-rw-r--r--doc/README.developer8
-rw-r--r--doc/README.idl2eth2
-rw-r--r--doc/README.plugins2
-rw-r--r--doc/README.regression2
-rw-r--r--doc/README.tapping2
-rw-r--r--doc/README.tvbuff2
-rw-r--r--doc/README.xml-output2
-rwxr-xr-xdoc/dfilter2pod.pl2
-rw-r--r--doc/eproto2sgml2
-rw-r--r--doc/randpkt.txt2
-rw-r--r--editcap.c2
-rw-r--r--epan/Makefile.am2
-rw-r--r--epan/Makefile.common2
-rw-r--r--epan/Makefile.nmake2
-rw-r--r--epan/README2
-rw-r--r--epan/addr_and_mask.c2
-rw-r--r--epan/addr_and_mask.h2
-rw-r--r--epan/atalk-utils.c2
-rw-r--r--epan/atalk-utils.h2
-rw-r--r--epan/bitswap.c2
-rw-r--r--epan/bitswap.h2
-rw-r--r--epan/circuit.c2
-rw-r--r--epan/circuit.h2
-rw-r--r--epan/column-utils.c2
-rw-r--r--epan/column-utils.h2
-rw-r--r--epan/column_info.h2
-rw-r--r--epan/conversation.c2
-rw-r--r--epan/conversation.h2
-rw-r--r--epan/dfilter/Makefile.am2
-rw-r--r--epan/dfilter/Makefile.nmake2
-rwxr-xr-xepan/dfilter/README.dfilter214
-rw-r--r--epan/dfilter/dfilter-int.h2
-rw-r--r--epan/dfilter/dfilter.c2
-rw-r--r--epan/dfilter/dfilter.h2
-rw-r--r--epan/dfilter/dfvm.c2
-rw-r--r--epan/dfilter/dfvm.h2
-rw-r--r--epan/dfilter/drange.c2
-rw-r--r--epan/dfilter/drange.h2
-rw-r--r--epan/dfilter/gencode.c2
-rw-r--r--epan/dfilter/glib-util.c2
-rw-r--r--epan/dfilter/glib-util.h2
-rw-r--r--epan/dfilter/grammar.lemon2
-rw-r--r--epan/dfilter/scanner.l2
-rw-r--r--epan/dfilter/semcheck.c2
-rw-r--r--epan/dfilter/semcheck.h2
-rw-r--r--epan/dfilter/sttype-integer.c2
-rw-r--r--epan/dfilter/sttype-pointer.c2
-rw-r--r--epan/dfilter/sttype-range.c2
-rw-r--r--epan/dfilter/sttype-range.h2
-rw-r--r--epan/dfilter/sttype-string.c2
-rw-r--r--epan/dfilter/sttype-test.c2
-rw-r--r--epan/dfilter/sttype-test.h2
-rw-r--r--epan/dfilter/syntax-tree.c2
-rw-r--r--epan/dfilter/syntax-tree.h2
-rw-r--r--epan/epan.c2
-rw-r--r--epan/epan.h2
-rw-r--r--epan/epan_dissect.h2
-rw-r--r--epan/except.c4
-rw-r--r--epan/except.h2
-rw-r--r--epan/filesystem.c2
-rw-r--r--epan/filesystem.h2
-rw-r--r--epan/frame_data.c2
-rw-r--r--epan/frame_data.h2
-rw-r--r--epan/ftypes/Makefile.am2
-rw-r--r--epan/ftypes/Makefile.nmake2
-rw-r--r--epan/ftypes/ftype-bytes.c2
-rw-r--r--epan/ftypes/ftype-double.c2
-rw-r--r--epan/ftypes/ftype-integer.c2
-rw-r--r--epan/ftypes/ftype-ipv4.c2
-rw-r--r--epan/ftypes/ftype-none.c2
-rwxr-xr-xepan/ftypes/ftype-pcre.c2
-rw-r--r--epan/ftypes/ftype-string.c2
-rw-r--r--epan/ftypes/ftype-time.c2
-rw-r--r--epan/ftypes/ftype-tvbuff.c2
-rw-r--r--epan/ftypes/ftypes-int.h2
-rw-r--r--epan/ftypes/ftypes.c2
-rw-r--r--epan/ftypes/ftypes.h2
-rw-r--r--epan/gdebug.h2
-rw-r--r--epan/inet_aton.h2
-rw-r--r--epan/inet_ntop.c2
-rw-r--r--epan/inet_pton.c2
-rw-r--r--epan/inet_v6defs.h2
-rw-r--r--epan/int-64bit.c2
-rw-r--r--epan/int-64bit.h2
-rw-r--r--epan/ipv4.c2
-rw-r--r--epan/ipv4.h2
-rw-r--r--epan/ipv6-utils.h2
-rw-r--r--epan/nstime.h2
-rw-r--r--epan/osi-utils.c2
-rw-r--r--epan/osi-utils.h2
-rw-r--r--epan/packet.c2
-rw-r--r--epan/packet.h2
-rw-r--r--epan/packet_info.h2
-rw-r--r--epan/pint.h2
-rw-r--r--epan/plugins.c2
-rw-r--r--epan/plugins.h2
-rw-r--r--epan/proto.c2
-rw-r--r--epan/proto.h2
-rw-r--r--epan/report_err.h2
-rw-r--r--epan/resolv.c2
-rw-r--r--epan/resolv.h2
-rw-r--r--epan/slab.h2
-rw-r--r--epan/sna-utils.c2
-rw-r--r--epan/sna-utils.h2
-rw-r--r--epan/strutil.c2
-rw-r--r--epan/strutil.h2
-rwxr-xr-xepan/timestamp.c2
-rw-r--r--epan/timestamp.h2
-rw-r--r--epan/to_str.c2
-rw-r--r--epan/to_str.h2
-rw-r--r--epan/tvbtest.c2
-rw-r--r--epan/tvbuff.c2
-rw-r--r--epan/tvbuff.h2
-rw-r--r--epan/value_string.c2
-rw-r--r--epan/value_string.h2
-rw-r--r--ethereal_be.py2
-rw-r--r--ethereal_gen.py2
-rw-r--r--etypes.h2
-rw-r--r--file.c2
-rw-r--r--file.h2
-rw-r--r--filters.c2
-rw-r--r--filters.h2
-rw-r--r--follow.c2
-rw-r--r--follow.h2
-rw-r--r--format-oid.h2
-rw-r--r--g711.c2
-rw-r--r--g711.h2
-rw-r--r--getopt.c2
-rw-r--r--globals.h2
-rw-r--r--greproto.h2
-rw-r--r--gtk/Makefile.am2
-rw-r--r--gtk/Makefile.common2
-rw-r--r--gtk/Makefile.nmake2
-rw-r--r--gtk/about_dlg.c2
-rw-r--r--gtk/about_dlg.h2
-rw-r--r--gtk/ansi_a_stat.c2
-rw-r--r--gtk/ansi_map_stat.c2
-rw-r--r--gtk/bootp_stat.c2
-rw-r--r--gtk/capture_combo_utils.c2
-rw-r--r--gtk/capture_combo_utils.h2
-rw-r--r--gtk/capture_dlg.c3430
-rw-r--r--gtk/capture_dlg.h134
-rw-r--r--gtk/capture_if_dlg.c972
-rw-r--r--gtk/capture_info_dlg.c2
-rw-r--r--gtk/capture_prefs.c2
-rw-r--r--gtk/capture_prefs.h2
-rw-r--r--gtk/color_dlg.c2
-rw-r--r--gtk/color_dlg.h2
-rw-r--r--gtk/color_filters.c2
-rw-r--r--gtk/color_filters.h2
-rw-r--r--gtk/color_utils.c2
-rw-r--r--gtk/color_utils.h2
-rw-r--r--gtk/colors.c2
-rw-r--r--gtk/colors.h2
-rw-r--r--gtk/column_prefs.c2
-rw-r--r--gtk/column_prefs.h2
-rw-r--r--gtk/compat_macros.h2
-rw-r--r--gtk/dcerpc_stat.c2
-rw-r--r--gtk/decode_as_dlg.c2
-rw-r--r--gtk/decode_as_dlg.h2
-rw-r--r--gtk/dfilter_expr_dlg.c2
-rw-r--r--gtk/dfilter_expr_dlg.h2
-rw-r--r--gtk/dlg_utils.c2
-rw-r--r--gtk/dlg_utils.h2
-rw-r--r--gtk/endpoint_talkers_eth.c2
-rw-r--r--gtk/endpoint_talkers_fc.c2
-rw-r--r--gtk/endpoint_talkers_fddi.c2
-rw-r--r--gtk/endpoint_talkers_ip.c2
-rw-r--r--gtk/endpoint_talkers_ipx.c2
-rw-r--r--gtk/endpoint_talkers_table.c2
-rw-r--r--gtk/endpoint_talkers_table.h2
-rw-r--r--gtk/endpoint_talkers_tcpip.c2
-rw-r--r--gtk/endpoint_talkers_tr.c2
-rw-r--r--gtk/endpoint_talkers_udpip.c2
-rw-r--r--gtk/ethclist.c2
-rw-r--r--gtk/ethclist.h2
-rw-r--r--gtk/fc_stat.c2
-rw-r--r--gtk/file_dlg.c2
-rw-r--r--gtk/file_dlg.h2
-rw-r--r--gtk/filter_prefs.c2
-rw-r--r--gtk/filter_prefs.h2
-rw-r--r--gtk/find_dlg.c2
-rw-r--r--gtk/find_dlg.h2
-rw-r--r--gtk/follow_dlg.c2
-rw-r--r--gtk/follow_dlg.h2
-rw-r--r--gtk/font_utils.c2
-rw-r--r--gtk/font_utils.h2
-rw-r--r--gtk/goto_dlg.c2
-rw-r--r--gtk/goto_dlg.h2
-rw-r--r--gtk/gsm_a_stat.c2
-rw-r--r--gtk/gsm_map_stat.c2
-rw-r--r--gtk/gsm_map_stat.h2
-rw-r--r--gtk/gsm_map_summary.c2
-rw-r--r--gtk/gtk_stat_util.c2
-rw-r--r--gtk/gtk_stat_util.h2
-rw-r--r--gtk/gtkglobals.h2
-rw-r--r--gtk/gui_prefs.c2
-rw-r--r--gtk/gui_prefs.h2
-rw-r--r--gtk/h225_counter.c2
-rw-r--r--gtk/h225_ras_srt.c2
-rw-r--r--gtk/help_dlg.c2
-rw-r--r--gtk/help_dlg.h2
-rw-r--r--gtk/hostlist_eth.c2
-rw-r--r--gtk/hostlist_fc.c2
-rw-r--r--gtk/hostlist_fddi.c2
-rw-r--r--gtk/hostlist_ip.c2
-rw-r--r--gtk/hostlist_ipx.c2
-rw-r--r--gtk/hostlist_table.c2
-rw-r--r--gtk/hostlist_table.h2
-rw-r--r--gtk/hostlist_tcpip.c2
-rw-r--r--gtk/hostlist_tr.c2
-rw-r--r--gtk/hostlist_udpip.c2
-rw-r--r--gtk/http_stat.c2
-rw-r--r--gtk/io_stat.c2
-rw-r--r--gtk/isprint.h2
-rw-r--r--gtk/isup_stat.c2
-rw-r--r--gtk/keys.h2
-rw-r--r--gtk/layout_prefs.c2
-rw-r--r--gtk/layout_prefs.h2
-rw-r--r--gtk/ldap_stat.c2
-rw-r--r--gtk/main.c2
-rw-r--r--gtk/main.h2
-rw-r--r--gtk/menu.c3656
-rw-r--r--gtk/menu.h2
-rw-r--r--gtk/mgcp_stat.c2
-rw-r--r--gtk/mtp3_stat.c2
-rw-r--r--gtk/mtp3_stat.h2
-rw-r--r--gtk/mtp3_summary.c2
-rw-r--r--gtk/nameres_prefs.c2
-rw-r--r--gtk/nameres_prefs.h2
-rw-r--r--gtk/packet_list.c2
-rw-r--r--gtk/packet_list.h2
-rw-r--r--gtk/packet_win.c2
-rw-r--r--gtk/packet_win.h2
-rw-r--r--gtk/plugins_dlg.c2
-rw-r--r--gtk/prefs_dlg.c2
-rw-r--r--gtk/prefs_dlg.h2
-rw-r--r--gtk/print_dlg.c2
-rw-r--r--gtk/print_mswin.c2
-rw-r--r--gtk/print_mswin.h2
-rw-r--r--gtk/print_prefs.c2
-rw-r--r--gtk/print_prefs.h2
-rw-r--r--gtk/progress_dlg.c2
-rw-r--r--gtk/proto_dlg.c2
-rw-r--r--gtk/proto_dlg.h2
-rw-r--r--gtk/proto_draw.c2
-rw-r--r--gtk/proto_draw.h2
-rw-r--r--gtk/proto_hier_stats_dlg.c2
-rw-r--r--gtk/proto_hier_stats_dlg.h2
-rw-r--r--gtk/range_utils.c2
-rw-r--r--gtk/range_utils.h2
-rw-r--r--gtk/recent.c2
-rw-r--r--gtk/recent.h2
-rw-r--r--gtk/rpc_progs.c2
-rw-r--r--gtk/rpc_stat.c2
-rw-r--r--gtk/rtp_analysis.c2
-rw-r--r--gtk/rtp_analysis.h2
-rw-r--r--gtk/rtp_stream.c2
-rw-r--r--gtk/rtp_stream.h2
-rw-r--r--gtk/rtp_stream_dlg.c2
-rw-r--r--gtk/rtp_stream_dlg.h2
-rw-r--r--gtk/sat.h2
-rw-r--r--gtk/service_response_time_table.c2
-rw-r--r--gtk/service_response_time_table.h2
-rw-r--r--gtk/simple_dialog.c2
-rw-r--r--gtk/sip_stat.c2
-rw-r--r--gtk/smb_stat.c2
-rw-r--r--gtk/stream_prefs.c2
-rw-r--r--gtk/stream_prefs.h2
-rw-r--r--gtk/summary_dlg.c2
-rw-r--r--gtk/summary_dlg.h2
-rw-r--r--gtk/supported_protos_dlg.c2
-rw-r--r--gtk/supported_protos_dlg.h2
-rw-r--r--gtk/tap_dfilter_dlg.c2
-rw-r--r--gtk/tap_dfilter_dlg.h2
-rw-r--r--gtk/tap_menu.h2
-rw-r--r--gtk/tcp_graph.c2
-rw-r--r--gtk/text_page.c2
-rw-r--r--gtk/text_page.h2
-rw-r--r--gtk/toolbar.c2
-rw-r--r--gtk/toolbar.h2
-rw-r--r--gtk/ui_util.c2
-rw-r--r--gtk/ui_util.h2
-rw-r--r--gtk/webbrowser.h2
-rw-r--r--gtk/wsp_stat.c2
-rwxr-xr-xh225-persistentdata.c2
-rwxr-xr-xh225-persistentdata.h2
-rw-r--r--help/Makefile.am2
-rw-r--r--help/Makefile.nmake2
-rw-r--r--iax2_codec_type.h2
-rw-r--r--idl2eth.sh2
-rw-r--r--image/Makefile.nmake2
-rw-r--r--in_cksum.c2
-rw-r--r--in_cksum.h2
-rw-r--r--ip_opts.h2
-rw-r--r--ipproto.c2
-rw-r--r--ipproto.h2
-rw-r--r--isprint.h2
-rw-r--r--lapd_sapi.h2
-rw-r--r--llcsaps.h2
-rwxr-xr-xmake-authors-short.pl2
-rwxr-xr-xmake-faq2
-rwxr-xr-xmake-manuf2
-rwxr-xr-xmake-reg-dotc2
-rwxr-xr-xmake-reg-dotc.py2
-rwxr-xr-xmake-tapreg-dotc2
-rwxr-xr-xmake-version.pl2
-rw-r--r--manuf4
-rw-r--r--manuf.tmpl2
-rw-r--r--menu.h2
-rw-r--r--merge.c2
-rw-r--r--merge.h2
-rw-r--r--mergecap.c2
-rw-r--r--mkcap.c2
-rwxr-xr-xncp2222.py2
-rw-r--r--nlpid.h2
-rw-r--r--oui.h2
-rw-r--r--packaging/nsis/Makefile.nmake2
-rw-r--r--packet-3g-a11.c2
-rw-r--r--packet-aarp.c2
-rw-r--r--packet-acap.c2
-rw-r--r--packet-acse.c2
-rw-r--r--packet-acse.h2
-rw-r--r--packet-afp.c2
-rw-r--r--packet-afp.h2
-rw-r--r--packet-afs-defs.h2
-rw-r--r--packet-afs-macros.h2
-rw-r--r--packet-afs-register-info.h2
-rw-r--r--packet-afs.c2
-rw-r--r--packet-afs.h2
-rw-r--r--packet-aim-admin.c2
-rw-r--r--packet-aim-adverts.c2
-rw-r--r--packet-aim-bos.c2
-rw-r--r--packet-aim-buddylist.c2
-rw-r--r--packet-aim-chat.c2
-rw-r--r--packet-aim-chatnav.c2
-rw-r--r--packet-aim-directory.c2
-rw-r--r--packet-aim-generic.c2
-rw-r--r--packet-aim-icq.c2
-rw-r--r--packet-aim-invitation.c2
-rw-r--r--packet-aim-location.c2
-rw-r--r--packet-aim-messaging.c2
-rw-r--r--packet-aim-oft.c2
-rw-r--r--packet-aim-popup.c2
-rw-r--r--packet-aim-signon.c2
-rw-r--r--packet-aim-ssi.c2
-rw-r--r--packet-aim-stats.c2
-rw-r--r--packet-aim-translate.c2
-rw-r--r--packet-aim-userlookup.c2
-rw-r--r--packet-aim.c2
-rw-r--r--packet-aim.h2
-rw-r--r--packet-ajp13.c2
-rw-r--r--packet-alcap.c2
-rw-r--r--packet-ans.c2
-rw-r--r--packet-ansi_637.c2
-rw-r--r--packet-ansi_683.c2
-rw-r--r--packet-ansi_801.c2
-rw-r--r--packet-ansi_a.c2
-rw-r--r--packet-ansi_a.h2
-rw-r--r--packet-ansi_map.c2
-rw-r--r--packet-ansi_map.h2
-rw-r--r--packet-aodv.c2
-rw-r--r--packet-ap1394.c2
-rw-r--r--packet-ap1394.h2
-rw-r--r--packet-arcnet.c2
-rw-r--r--packet-arcnet.h2
-rw-r--r--packet-arp.c2
-rw-r--r--packet-arp.h2
-rw-r--r--packet-asap.c2
-rw-r--r--packet-ascend.c2
-rw-r--r--packet-asf.c2
-rw-r--r--packet-atalk.c2
-rw-r--r--packet-atalk.h2
-rw-r--r--packet-atm.c2
-rw-r--r--packet-atm.h2
-rw-r--r--packet-auto_rp.c2
-rw-r--r--packet-bacapp.c2
-rw-r--r--packet-bacnet.c2
-rw-r--r--packet-beep.c2
-rw-r--r--packet-ber.c2
-rw-r--r--packet-ber.h2
-rw-r--r--packet-bfd.c2
-rw-r--r--packet-bgp.c2
-rw-r--r--packet-bgp.h2
-rw-r--r--packet-bofl.c2
-rw-r--r--packet-bootp.c2
-rw-r--r--packet-bootparams.c2
-rw-r--r--packet-bootparams.h2
-rw-r--r--packet-bpdu.c2
-rw-r--r--packet-brdwlk.c2
-rw-r--r--packet-bssap.c2
-rw-r--r--packet-bssap.h2
-rw-r--r--packet-bssgp.c2
-rw-r--r--packet-bvlc.c2
-rw-r--r--packet-cast.c2
-rw-r--r--packet-ccsds.c2
-rw-r--r--packet-cdp.c2
-rw-r--r--packet-cgmp.c2
-rw-r--r--packet-chdlc.c2
-rw-r--r--packet-chdlc.h2
-rw-r--r--packet-cisco-oui.c2
-rw-r--r--packet-clearcase.c2
-rw-r--r--packet-clearcase.h2
-rw-r--r--packet-clip.c2
-rw-r--r--packet-clip.h2
-rw-r--r--packet-clnp.c2
-rw-r--r--packet-cops.c2
-rw-r--r--packet-cosine.c2
-rw-r--r--packet-cpfi.c2
-rw-r--r--packet-cpha.c2
-rw-r--r--packet-cups.c2
-rw-r--r--packet-data.c2
-rw-r--r--packet-data.h2
-rw-r--r--packet-dccp.c2
-rw-r--r--packet-dccp.h2
-rw-r--r--packet-dcerpc-afs4int.c2
-rw-r--r--packet-dcerpc-atsvc.c2
-rw-r--r--packet-dcerpc-atsvc.h2
-rw-r--r--packet-dcerpc-bossvr.c2
-rw-r--r--packet-dcerpc-browser.c2
-rw-r--r--packet-dcerpc-browser.h2
-rw-r--r--packet-dcerpc-budb.c2
-rw-r--r--packet-dcerpc-butc.c2
-rw-r--r--packet-dcerpc-cds_clerkserver.c2
-rw-r--r--packet-dcerpc-cds_solicit.c2
-rw-r--r--packet-dcerpc-conv.c2
-rw-r--r--packet-dcerpc-cprpc_server.c2
-rw-r--r--packet-dcerpc-dce122.c2
-rw-r--r--packet-dcerpc-dce122.h2
-rw-r--r--packet-dcerpc-dcom.h2
-rw-r--r--packet-dcerpc-dfs.c2
-rw-r--r--packet-dcerpc-dfs.h2
-rw-r--r--packet-dcerpc-dnsserver.c2
-rw-r--r--packet-dcerpc-dnsserver.h2
-rw-r--r--packet-dcerpc-drsuapi.c2
-rw-r--r--packet-dcerpc-drsuapi.h2
-rw-r--r--packet-dcerpc-dtsprovider.c2
-rw-r--r--packet-dcerpc-dtsstime_req.c2
-rwxr-xr-xpacket-dcerpc-efs.c1396
-rwxr-xr-xpacket-dcerpc-efs.h92
-rw-r--r--packet-dcerpc-epm.c2
-rw-r--r--packet-dcerpc-epm4.c2
-rw-r--r--packet-dcerpc-eventlog.c2
-rw-r--r--packet-dcerpc-eventlog.h2
-rw-r--r--packet-dcerpc-fldb.c2
-rw-r--r--packet-dcerpc-frsapi.c2
-rw-r--r--packet-dcerpc-frsapi.h2
-rw-r--r--packet-dcerpc-frsrpc.c2
-rw-r--r--packet-dcerpc-frsrpc.h2
-rw-r--r--packet-dcerpc-ftserver.c2
-rw-r--r--packet-dcerpc-icl_rpc.c2
-rw-r--r--packet-dcerpc-initshutdown.c2
-rw-r--r--packet-dcerpc-initshutdown.h2
-rw-r--r--packet-dcerpc-krb5rpc.c2
-rwxr-xr-xpacket-dcerpc-llb.c2
-rw-r--r--packet-dcerpc-lsa-ds.c2
-rw-r--r--packet-dcerpc-lsa.c2
-rw-r--r--packet-dcerpc-lsa.h2
-rw-r--r--packet-dcerpc-mapi.c2
-rw-r--r--packet-dcerpc-mapi.h2
-rw-r--r--packet-dcerpc-messenger.c2
-rw-r--r--packet-dcerpc-mgmt.c2
-rw-r--r--packet-dcerpc-ndr.c2
-rw-r--r--packet-dcerpc-netlogon.c2
-rw-r--r--packet-dcerpc-netlogon.h2
-rw-r--r--packet-dcerpc-nspi.c2
-rw-r--r--packet-dcerpc-nt.c2
-rw-r--r--packet-dcerpc-nt.h2
-rw-r--r--packet-dcerpc-oxid.c2
-rwxr-xr-xpacket-dcerpc-rdaclif.c2
-rw-r--r--packet-dcerpc-reg.c2
-rw-r--r--packet-dcerpc-reg.h2
-rw-r--r--packet-dcerpc-remact.c2
-rw-r--r--packet-dcerpc-rep_proc.c2
-rw-r--r--packet-dcerpc-roverride.c2
-rw-r--r--packet-dcerpc-rpriv.c2
-rw-r--r--packet-dcerpc-rs_acct.c2
-rw-r--r--packet-dcerpc-rs_attr.c2
-rwxr-xr-xpacket-dcerpc-rs_attr_schema.c2
-rw-r--r--packet-dcerpc-rs_bind.c2
-rw-r--r--packet-dcerpc-rs_misc.c2
-rw-r--r--packet-dcerpc-rs_pgo.c2
-rw-r--r--packet-dcerpc-rs_plcy.c2
-rw-r--r--packet-dcerpc-rs_prop_acct.c2
-rwxr-xr-xpacket-dcerpc-rs_prop_acl.c2
-rwxr-xr-xpacket-dcerpc-rs_prop_attr.c2
-rwxr-xr-xpacket-dcerpc-rs_prop_pgo.c2
-rwxr-xr-xpacket-dcerpc-rs_prop_plcy.c2
-rwxr-xr-xpacket-dcerpc-rs_pwd_mgmt.c2
-rw-r--r--packet-dcerpc-rs_repadm.c2
-rw-r--r--packet-dcerpc-rs_replist.c2
-rwxr-xr-xpacket-dcerpc-rs_repmgr.c2
-rw-r--r--packet-dcerpc-rs_unix.c2
-rw-r--r--packet-dcerpc-rsec_login.c2
-rw-r--r--packet-dcerpc-samr.c2
-rw-r--r--packet-dcerpc-samr.h2
-rw-r--r--packet-dcerpc-secidmap.c2
-rw-r--r--packet-dcerpc-spoolss.c2
-rw-r--r--packet-dcerpc-spoolss.h2
-rw-r--r--packet-dcerpc-srvsvc.c2
-rw-r--r--packet-dcerpc-srvsvc.h2
-rw-r--r--packet-dcerpc-svcctl.c2
-rw-r--r--packet-dcerpc-svcctl.h2
-rw-r--r--packet-dcerpc-tapi.c2
-rw-r--r--packet-dcerpc-tapi.h2
-rw-r--r--packet-dcerpc-tkn4int.c2
-rw-r--r--packet-dcerpc-trksvr.c2
-rw-r--r--packet-dcerpc-ubikdisk.c2
-rw-r--r--packet-dcerpc-ubikvote.c2
-rw-r--r--packet-dcerpc-update.c2
-rw-r--r--packet-dcerpc-wkssvc.c2
-rw-r--r--packet-dcerpc-wkssvc.h2
-rw-r--r--packet-dcerpc.c2
-rw-r--r--packet-dcerpc.h2
-rw-r--r--packet-dcm.c2
-rw-r--r--packet-ddtp.c2
-rw-r--r--packet-ddtp.h2
-rw-r--r--packet-dec-bpdu.c2
-rw-r--r--packet-dhcpv6.c2
-rw-r--r--packet-diameter-defs.h2
-rw-r--r--packet-diameter.c2
-rw-r--r--packet-diffserv-mpls-common.c2
-rw-r--r--packet-diffserv-mpls-common.h2
-rw-r--r--packet-distcc.c2
-rw-r--r--packet-dlsw.c2
-rw-r--r--packet-dnp.c2
-rw-r--r--packet-dns.c2
-rw-r--r--packet-dns.h2
-rw-r--r--packet-dsi.c2
-rw-r--r--packet-dvmrp.c2
-rw-r--r--packet-dvmrp.h2
-rw-r--r--packet-e164.c2
-rw-r--r--packet-e164.h2
-rw-r--r--packet-eap.c2
-rw-r--r--packet-eapol.c2
-rw-r--r--packet-echo.c2
-rw-r--r--packet-edonkey.c2
-rw-r--r--packet-edonkey.h2
-rw-r--r--packet-eigrp.c2
-rw-r--r--packet-enc.c2
-rw-r--r--packet-enip.c2
-rw-r--r--packet-enrp.c2
-rw-r--r--packet-esis.c2
-rw-r--r--packet-esis.h2
-rw-r--r--packet-eth.c2
-rw-r--r--packet-eth.h2
-rw-r--r--packet-etherip.c2
-rw-r--r--packet-ethertype.c2
-rw-r--r--packet-fc.c2
-rw-r--r--packet-fc.h2
-rw-r--r--packet-fcbls.h2
-rw-r--r--packet-fcct.c2
-rw-r--r--packet-fcct.h2
-rw-r--r--packet-fcdns.c2
-rw-r--r--packet-fcdns.h2
-rw-r--r--packet-fcels.c2
-rw-r--r--packet-fcels.h2
-rw-r--r--packet-fcfcs.c2
-rw-r--r--packet-fcfcs.h2
-rw-r--r--packet-fcfzs.c2
-rw-r--r--packet-fcfzs.h2
-rw-r--r--packet-fcip.c2
-rw-r--r--packet-fclctl.c2
-rw-r--r--packet-fclctl.h2
-rw-r--r--packet-fcp.c2
-rw-r--r--packet-fcp.h2
-rw-r--r--packet-fcsb3.c2
-rwxr-xr-xpacket-fcsb3.h2
-rwxr-xr-xpacket-fcsp.c2
-rwxr-xr-xpacket-fcsp.h2
-rw-r--r--packet-fcswils.c2
-rw-r--r--packet-fcswils.h2
-rw-r--r--packet-fddi.c2
-rw-r--r--packet-fddi.h2
-rw-r--r--packet-fix.c2
-rw-r--r--packet-fr.c2
-rw-r--r--packet-frame.c2
-rw-r--r--packet-frame.h2
-rw-r--r--packet-ftam.c2
-rw-r--r--packet-ftam.h2
-rw-r--r--packet-ftp.c2
-rw-r--r--packet-fw1.c2
-rw-r--r--packet-gift.c2
-rw-r--r--packet-giop.c2
-rw-r--r--packet-giop.h2
-rw-r--r--packet-gmrp.c2
-rw-r--r--packet-gnutella.c2
-rw-r--r--packet-gnutella.h2
-rw-r--r--packet-gprs-llc.c2
-rw-r--r--packet-gprs-ns.c2
-rw-r--r--packet-gre.c2
-rw-r--r--packet-gsm_a.c2
-rw-r--r--packet-gsm_a.h2
-rw-r--r--packet-gsm_map.c2
-rw-r--r--packet-gsm_map.h2
-rw-r--r--packet-gsm_sms.c2
-rw-r--r--packet-gsm_sms.h2
-rwxr-xr-xpacket-gsm_sms_ud.c2
-rw-r--r--packet-gsm_ss.c2
-rw-r--r--packet-gsm_ss.h2
-rw-r--r--packet-gssapi.c2
-rw-r--r--packet-gssapi.h2
-rw-r--r--packet-gtp.c2
-rw-r--r--packet-gtp.h2
-rw-r--r--packet-gvrp.c2
-rw-r--r--packet-h1.c2
-rw-r--r--packet-h225.c2
-rw-r--r--packet-h225.h2
-rw-r--r--packet-h235.c2
-rw-r--r--packet-h235.h2
-rw-r--r--packet-h245.c2
-rw-r--r--packet-h245.h2
-rw-r--r--packet-h261.c2
-rw-r--r--packet-h263.c2
-rw-r--r--packet-h450.c2
-rw-r--r--packet-hclnfsd.c2
-rw-r--r--packet-hclnfsd.h2
-rw-r--r--packet-hpext.c2
-rw-r--r--packet-hpext.h2
-rw-r--r--packet-hsrp.c2
-rw-r--r--packet-http.c2
-rw-r--r--packet-http.h2
-rw-r--r--packet-hyperscsi.c2
-rw-r--r--packet-iapp.c2
-rw-r--r--packet-iax2.c2
-rw-r--r--packet-iax2.h2
-rw-r--r--packet-ib.c2
-rw-r--r--packet-icap.c2
-rw-r--r--packet-icmpv6.c2
-rw-r--r--packet-icp.c2
-rw-r--r--packet-icq.c2
-rw-r--r--packet-ieee80211.c2
-rw-r--r--packet-ieee80211.h2
-rw-r--r--packet-ieee8023.c2
-rw-r--r--packet-ieee8023.h2
-rw-r--r--packet-igap.c2
-rw-r--r--packet-igap.h2
-rw-r--r--packet-igmp.c2
-rw-r--r--packet-igmp.h2
-rw-r--r--packet-igrp.c2
-rwxr-xr-xpacket-image-gif.c2
-rw-r--r--packet-image-jfif.c2
-rw-r--r--packet-imap.c2
-rw-r--r--packet-ip.c2
-rw-r--r--packet-ip.h2
-rw-r--r--packet-ipdc.c2
-rw-r--r--packet-ipdc.h2
-rw-r--r--packet-ipfc.c2
-rw-r--r--packet-ipfc.h2
-rw-r--r--packet-ipmi.c2
-rw-r--r--packet-ipp.c2
-rw-r--r--packet-ipsec-udp.c2
-rw-r--r--packet-ipsec.c2
-rw-r--r--packet-ipsec.h2
-rw-r--r--packet-ipv6.c2
-rw-r--r--packet-ipv6.h2
-rw-r--r--packet-ipvs-syncd.c2
-rw-r--r--packet-ipx.c2
-rw-r--r--packet-ipx.h2
-rw-r--r--packet-ipxwan.c2
-rw-r--r--packet-irc.c2
-rw-r--r--packet-isakmp.c2
-rw-r--r--packet-iscsi.c2
-rw-r--r--packet-isdn.c2
-rw-r--r--packet-isis-clv.c2
-rw-r--r--packet-isis-clv.h2
-rw-r--r--packet-isis-hello.c2
-rw-r--r--packet-isis-hello.h2
-rw-r--r--packet-isis-lsp.c2
-rw-r--r--packet-isis-lsp.h2
-rw-r--r--packet-isis-snp.c2
-rw-r--r--packet-isis-snp.h2
-rw-r--r--packet-isis.c2
-rw-r--r--packet-isis.h2
-rw-r--r--packet-isl.c2
-rw-r--r--packet-isl.h2
-rw-r--r--packet-ismp.c2
-rw-r--r--packet-isns.c2
-rw-r--r--packet-isup.c2
-rw-r--r--packet-isup.h2
-rw-r--r--packet-iua.c2
-rw-r--r--packet-jabber.c2
-rw-r--r--packet-kadm5.c2
-rw-r--r--packet-kerberos.c2
-rw-r--r--packet-kerberos.h2
-rw-r--r--packet-klm.c2
-rw-r--r--packet-klm.h2
-rw-r--r--packet-kpasswd.c2
-rw-r--r--packet-l2tp.c2
-rw-r--r--packet-lapb.c2
-rw-r--r--packet-lapbether.c2
-rw-r--r--packet-lapd.c2
-rw-r--r--packet-laplink.c2
-rw-r--r--packet-ldap.c2
-rw-r--r--packet-ldap.h2
-rw-r--r--packet-ldp.c2
-rw-r--r--packet-ldp.h2
-rw-r--r--packet-llc.c2
-rw-r--r--packet-llc.h2
-rw-r--r--packet-lmi.c2
-rw-r--r--packet-lmp.c2
-rw-r--r--packet-lpd.c2
-rw-r--r--packet-lwapp.c2
-rw-r--r--packet-m2pa.c2
-rw-r--r--packet-m2tp.c2
-rw-r--r--packet-m2ua.c2
-rw-r--r--packet-m3ua.c2
-rw-r--r--packet-mbtcp.c2
-rw-r--r--packet-mdshdr.c2
-rwxr-xr-xpacket-media.c2
-rw-r--r--packet-mip.c2
-rw-r--r--packet-mip6.c2
-rw-r--r--packet-mip6.h2
-rw-r--r--packet-mmse.c2
-rw-r--r--packet-mount.c2
-rw-r--r--packet-mount.h2
-rw-r--r--packet-mpeg1.c2
-rw-r--r--packet-mpls-echo.c2
-rw-r--r--packet-mpls.c2
-rw-r--r--packet-mq-pcf.c2
-rw-r--r--packet-mq.c2
-rw-r--r--packet-mq.h2
-rw-r--r--packet-mrdisc.c2
-rw-r--r--packet-mrdisc.h2
-rw-r--r--packet-msdp.c2
-rw-r--r--packet-msn-messenger.c2
-rw-r--r--packet-msnip.c2
-rw-r--r--packet-msnip.h2
-rw-r--r--packet-msproxy.c2
-rw-r--r--packet-mtp2.c2
-rw-r--r--packet-mtp3.c2
-rw-r--r--packet-mtp3.h2
-rw-r--r--packet-mtp3mg.c2
-rwxr-xr-xpacket-multipart.c2
-rw-r--r--packet-mysql.c2
-rw-r--r--packet-nbipx.c2
-rw-r--r--packet-nbns.c2
-rw-r--r--packet-ncp-int.h2
-rw-r--r--packet-ncp-nmas.c2
-rw-r--r--packet-ncp-nmas.h2
-rw-r--r--packet-ncp.c2
-rw-r--r--packet-ncp2222.inc2
-rw-r--r--packet-ndmp.c2
-rw-r--r--packet-ndps.c2
-rw-r--r--packet-ndps.h2
-rw-r--r--packet-netbios.c2
-rw-r--r--packet-netbios.h2
-rw-r--r--packet-netflow.c2
-rw-r--r--packet-nfs.c2
-rw-r--r--packet-nfs.h2
-rw-r--r--packet-nfsacl.c2
-rw-r--r--packet-nfsauth.c2
-rw-r--r--packet-nisplus.c2
-rw-r--r--packet-nisplus.h2
-rw-r--r--packet-nlm.c2
-rw-r--r--packet-nlm.h2
-rw-r--r--packet-nlsp.c2
-rw-r--r--packet-nntp.c2
-rw-r--r--packet-nt-oui.c2
-rw-r--r--packet-nt-sonmp.c2
-rw-r--r--packet-nt-tpcp.c2
-rw-r--r--packet-ntlmssp.c2
-rw-r--r--packet-ntp.c2
-rw-r--r--packet-ntp.h2
-rw-r--r--packet-null.c2
-rw-r--r--packet-null.h2
-rw-r--r--packet-olsr.c2
-rw-r--r--packet-osi-options.c2
-rw-r--r--packet-osi-options.h2
-rw-r--r--packet-osi.c2
-rw-r--r--packet-osi.h2
-rw-r--r--packet-ospf.c2
-rw-r--r--packet-pcnfsd.c2
-rw-r--r--packet-pcnfsd.h2
-rw-r--r--packet-per.c2
-rw-r--r--packet-per.h2
-rw-r--r--packet-pflog.c2
-rw-r--r--packet-pflog.h2
-rw-r--r--packet-pgm.c2
-rw-r--r--packet-pim.c2
-rw-r--r--packet-pim.h2
-rw-r--r--packet-pktc.c2
-rw-r--r--packet-pktc.h2
-rw-r--r--packet-pop.c2
-rw-r--r--packet-portmap.c2
-rw-r--r--packet-portmap.h2
-rw-r--r--packet-postgresql.c2
-rw-r--r--packet-ppp.c2
-rw-r--r--packet-ppp.h2
-rw-r--r--packet-pppoe.c2
-rw-r--r--packet-pptp.c2
-rw-r--r--packet-pres.c2
-rw-r--r--packet-pres.h2
-rw-r--r--packet-prism.c2
-rw-r--r--packet-prism.h2
-rw-r--r--packet-q2931.c2
-rw-r--r--packet-q931.c2
-rw-r--r--packet-q931.h2
-rw-r--r--packet-q933.c2
-rw-r--r--packet-qllc.c2
-rw-r--r--packet-quake.c2
-rw-r--r--packet-quake2.c2
-rw-r--r--packet-quake3.c2
-rw-r--r--packet-quakeworld.c2
-rw-r--r--packet-radiotap.c2
-rw-r--r--packet-radiotap.h2
-rw-r--r--packet-radius.c2
-rw-r--r--packet-ranap.c2
-rw-r--r--packet-raw.c2
-rw-r--r--packet-raw.h2
-rw-r--r--packet-rip.c2
-rw-r--r--packet-ripng.c2
-rw-r--r--packet-ripng.h2
-rw-r--r--packet-rlogin.c2
-rw-r--r--packet-rmcp.c2
-rw-r--r--packet-rmi.c2
-rw-r--r--packet-rmi.h2
-rw-r--r--packet-rmp.c2
-rw-r--r--packet-rpc.c2
-rw-r--r--packet-rpc.h2
-rw-r--r--packet-rpl.c2
-rw-r--r--packet-rquota.c2
-rw-r--r--packet-rquota.h2
-rw-r--r--packet-rsh.c2
-rw-r--r--packet-rstat.c2
-rw-r--r--packet-rsvp.c2
-rw-r--r--packet-rsvp.h2
-rw-r--r--packet-rsync.c2
-rw-r--r--packet-rtcp.c2
-rw-r--r--packet-rtcp.h2
-rw-r--r--packet-rtp-events.c2
-rw-r--r--packet-rtp-events.h2
-rw-r--r--packet-rtp.c2
-rw-r--r--packet-rtp.h2
-rw-r--r--packet-rtps.c2
-rw-r--r--packet-rtps.h2
-rw-r--r--packet-rtsp.c2
-rw-r--r--packet-rwall.c2
-rw-r--r--packet-rwall.h2
-rw-r--r--packet-rx.c2
-rw-r--r--packet-rx.h2
-rw-r--r--packet-sadmind.c2
-rw-r--r--packet-sap.c2
-rw-r--r--packet-sccp.c2
-rwxr-xr-xpacket-sccpmg.c2
-rw-r--r--packet-scsi.c2
-rw-r--r--packet-scsi.h2
-rw-r--r--packet-sctp.c2
-rw-r--r--packet-sctp.h2
-rw-r--r--packet-sdlc.c2
-rw-r--r--packet-sdp.c2
-rw-r--r--packet-sebek.c2
-rw-r--r--packet-ses.c2
-rw-r--r--packet-ses.h2
-rw-r--r--packet-sflow.c2
-rw-r--r--packet-sigcomp.c2
-rw-r--r--packet-sip.c2
-rwxr-xr-xpacket-sip.h2
-rw-r--r--packet-sipfrag.c2
-rw-r--r--packet-skinny.c2
-rw-r--r--packet-slimp3.c2
-rw-r--r--packet-sll.c2
-rw-r--r--packet-sll.h2
-rw-r--r--packet-slowprotocols.c2
-rw-r--r--packet-slsk.c2
-rw-r--r--packet-smb-browse.c2
-rw-r--r--packet-smb-browse.h2
-rw-r--r--packet-smb-common.c2
-rw-r--r--packet-smb-common.h2
-rw-r--r--packet-smb-logon.c2
-rw-r--r--packet-smb-mailslot.c2
-rw-r--r--packet-smb-mailslot.h2
-rw-r--r--packet-smb-pipe.c2
-rw-r--r--packet-smb-pipe.h2
-rw-r--r--packet-smb-sidsnooping.c2
-rw-r--r--packet-smb-sidsnooping.h2
-rw-r--r--packet-smb.c2
-rw-r--r--packet-smpp.c2
-rw-r--r--packet-smtp.c2
-rw-r--r--packet-sna.c2
-rw-r--r--packet-sna.h2
-rw-r--r--packet-snaeth.c2
-rw-r--r--packet-sndcp.c2
-rw-r--r--packet-snmp.c2
-rw-r--r--packet-snmp.h2
-rw-r--r--packet-socks.c2
-rw-r--r--packet-spnego.c2
-rw-r--r--packet-spray.c2
-rw-r--r--packet-spray.h2
-rw-r--r--packet-srvloc.c2
-rw-r--r--packet-sscop.c2
-rw-r--r--packet-ssh.c2
-rw-r--r--packet-ssl.c2
-rw-r--r--packet-stat-notify.c2
-rw-r--r--packet-stat-notify.h2
-rw-r--r--packet-stat.c2
-rw-r--r--packet-stat.h2
-rw-r--r--packet-stun.c2
-rw-r--r--packet-sua.c2
-rw-r--r--packet-symantec.c2
-rw-r--r--packet-syslog.c2
-rw-r--r--packet-t38.c2
-rw-r--r--packet-tacacs.c2
-rw-r--r--packet-tacacs.h2
-rw-r--r--packet-tcap.c2
-rw-r--r--packet-tcap.h2
-rw-r--r--packet-tcp.c2
-rw-r--r--packet-tcp.h2
-rw-r--r--packet-tds.c2
-rw-r--r--packet-teimanagement.c2
-rw-r--r--packet-telnet.c2
-rw-r--r--packet-teredo.c2
-rw-r--r--packet-text-media.c2
-rw-r--r--packet-tftp.c2
-rw-r--r--packet-time.c2
-rw-r--r--packet-tns.c2
-rw-r--r--packet-tns.h2
-rw-r--r--packet-tpkt.c2
-rw-r--r--packet-tpkt.h2
-rw-r--r--packet-tr.c2
-rw-r--r--packet-tr.h2
-rw-r--r--packet-trmac.c2
-rw-r--r--packet-tsp.c2
-rw-r--r--packet-tuxedo.c2
-rw-r--r--packet-tzsp.c2
-rw-r--r--packet-ucp.c2
-rw-r--r--packet-udp.c2
-rw-r--r--packet-udp.h2
-rw-r--r--packet-v120.c2
-rw-r--r--packet-vines.c2
-rw-r--r--packet-vines.h2
-rw-r--r--packet-vj.c2
-rw-r--r--packet-vlan.c2
-rw-r--r--packet-vlan.h2
-rw-r--r--packet-vrrp.c2
-rw-r--r--packet-vtp.c2
-rw-r--r--packet-wap.c2
-rw-r--r--packet-wap.h2
-rw-r--r--packet-wbxml.c2
-rw-r--r--packet-wccp.c2
-rw-r--r--packet-wccp.h2
-rw-r--r--packet-wcp.c2
-rw-r--r--packet-wfleet-hdlc.c2
-rw-r--r--packet-who.c2
-rw-r--r--packet-wlancap.c2
-rw-r--r--packet-wlancap.h2
-rw-r--r--packet-wsp.c2
-rw-r--r--packet-wsp.h2
-rw-r--r--packet-wtls.c2
-rw-r--r--packet-wtls.h2
-rw-r--r--packet-wtp.c2
-rw-r--r--packet-wtp.h2
-rw-r--r--packet-x11-keysym.h2
-rw-r--r--packet-x11-keysymdef.h2
-rw-r--r--packet-x11.c2
-rw-r--r--packet-x25.c2
-rw-r--r--packet-x29.c2
-rw-r--r--packet-xdmcp.c2
-rw-r--r--packet-xot.c2
-rw-r--r--packet-xyplex.c2
-rw-r--r--packet-yhoo.c2
-rw-r--r--packet-ymsg.c2
-rw-r--r--packet-ypbind.c2
-rw-r--r--packet-ypbind.h2
-rw-r--r--packet-yppasswd.c2
-rw-r--r--packet-yppasswd.h2
-rw-r--r--packet-ypserv.c2
-rw-r--r--packet-ypserv.h2
-rw-r--r--packet-ypxfr.c2
-rw-r--r--packet-ypxfr.h2
-rw-r--r--packet-zebra.c2
-rw-r--r--pcap-util-int.h2
-rw-r--r--pcap-util-unix.c2
-rw-r--r--pcap-util.c820
-rw-r--r--pcap-util.h214
-rw-r--r--plugins/Makefile.am2
-rw-r--r--plugins/Makefile.nmake2
-rw-r--r--plugins/acn/ChangeLog2
-rw-r--r--plugins/acn/Makefile.am2
-rw-r--r--plugins/acn/Makefile.nmake2
-rw-r--r--plugins/acn/packet-acn.c2
-rw-r--r--plugins/artnet/ChangeLog2
-rw-r--r--plugins/artnet/Makefile.am2
-rw-r--r--plugins/artnet/Makefile.nmake2
-rw-r--r--plugins/artnet/packet-artnet.c2
-rw-r--r--plugins/asn1/Makefile.am2
-rw-r--r--plugins/asn1/Makefile.nmake2
-rw-r--r--plugins/asn1/packet-asn1.c2
-rw-r--r--plugins/ciscosm/Makefile.am2
-rw-r--r--plugins/ciscosm/Makefile.nmake2
-rw-r--r--plugins/ciscosm/packet-sm.c2
-rw-r--r--plugins/docsis/Makefile.am2
-rw-r--r--plugins/docsis/Makefile.nmake2
-rw-r--r--plugins/docsis/packet-bpkmattr.c2
-rw-r--r--plugins/docsis/packet-bpkmreq.c2
-rw-r--r--plugins/docsis/packet-bpkmrsp.c2
-rw-r--r--plugins/docsis/packet-docsis.c2
-rw-r--r--plugins/docsis/packet-docsis.h2
-rw-r--r--plugins/docsis/packet-dsaack.c2
-rw-r--r--plugins/docsis/packet-dsareq.c2
-rw-r--r--plugins/docsis/packet-dsarsp.c2
-rw-r--r--plugins/docsis/packet-dscack.c2
-rw-r--r--plugins/docsis/packet-dscreq.c2
-rw-r--r--plugins/docsis/packet-dscrsp.c2
-rw-r--r--plugins/docsis/packet-dsdreq.c2
-rw-r--r--plugins/docsis/packet-dsdrsp.c2
-rw-r--r--plugins/docsis/packet-intrngreq.c2
-rw-r--r--plugins/docsis/packet-macmgmt.c2
-rw-r--r--plugins/docsis/packet-map.c2
-rw-r--r--plugins/docsis/packet-regack.c2
-rw-r--r--plugins/docsis/packet-regreq.c2
-rw-r--r--plugins/docsis/packet-regrsp.c2
-rw-r--r--plugins/docsis/packet-rngreq.c2
-rw-r--r--plugins/docsis/packet-rngrsp.c2
-rw-r--r--plugins/docsis/packet-tlv.c2
-rw-r--r--plugins/docsis/packet-tlv.h2
-rw-r--r--plugins/docsis/packet-type29ucd.c2
-rw-r--r--plugins/docsis/packet-uccreq.c2
-rw-r--r--plugins/docsis/packet-uccrsp.c2
-rw-r--r--plugins/docsis/packet-ucd.c2
-rw-r--r--plugins/docsis/packet-vendor.c2
-rw-r--r--plugins/enttec/ChangeLog2
-rw-r--r--plugins/enttec/Makefile.am2
-rw-r--r--plugins/enttec/Makefile.nmake2
-rw-r--r--plugins/enttec/packet-enttec.c2
-rw-r--r--plugins/giop/Makefile.am2
-rw-r--r--plugins/giop/Makefile.nmake2
-rw-r--r--plugins/gryphon/Makefile.am2
-rw-r--r--plugins/gryphon/Makefile.nmake2
-rw-r--r--plugins/gryphon/packet-gryphon.c2
-rw-r--r--plugins/gryphon/packet-gryphon.h2
-rw-r--r--plugins/irda/Makefile.am2
-rw-r--r--plugins/irda/Makefile.nmake2
-rw-r--r--plugins/irda/irda-appl.h2
-rw-r--r--plugins/irda/packet-ircomm.c2
-rw-r--r--plugins/irda/packet-irda.c2
-rw-r--r--plugins/lwres/Makefile.am2
-rw-r--r--plugins/lwres/Makefile.nmake2
-rw-r--r--plugins/lwres/packet-lwres.c2
-rw-r--r--plugins/megaco/Makefile.am2
-rw-r--r--plugins/megaco/Makefile.nmake2
-rw-r--r--plugins/megaco/packet-megaco.c2
-rw-r--r--plugins/mgcp/Makefile.am2
-rw-r--r--plugins/mgcp/Makefile.nmake2
-rw-r--r--plugins/mgcp/packet-mgcp.c2
-rwxr-xr-xplugins/mgcp/packet-mgcp.h2
-rw-r--r--plugins/pcli/Makefile.am2
-rw-r--r--plugins/pcli/Makefile.nmake2
-rw-r--r--plugins/pcli/packet-pcli.c2
-rw-r--r--plugins/plugin_api.c2
-rw-r--r--plugins/plugin_api.h2
-rw-r--r--plugins/plugin_api_decls.h2
-rw-r--r--plugins/plugin_api_defs.h2
-rw-r--r--plugins/plugin_api_list.c2
-rw-r--r--plugins/plugin_gen.py2
-rw-r--r--plugins/plugin_table.h2
-rw-r--r--plugins/rdm/Makefile.am2
-rw-r--r--plugins/rdm/Makefile.nmake2
-rw-r--r--plugins/rdm/packet-rdm.c2
-rw-r--r--plugins/rlm/Makefile.am2
-rw-r--r--plugins/rlm/Makefile.nmake2
-rw-r--r--plugins/rlm/packet-rlm.c2
-rw-r--r--plugins/rtnet/Makefile.am2
-rw-r--r--plugins/rtnet/Makefile.nmake2
-rw-r--r--plugins/rtnet/packet-rtnet.c2
-rw-r--r--plugins/rudp/Makefile.am2
-rw-r--r--plugins/rudp/Makefile.nmake2
-rw-r--r--plugins/rudp/packet-rudp.c2
-rw-r--r--plugins/v5ua/Makefile.am2
-rw-r--r--plugins/v5ua/Makefile.nmake2
-rw-r--r--ppptypes.h2
-rw-r--r--prefs-int.h2
-rw-r--r--prefs.c2
-rw-r--r--prefs.h2
-rw-r--r--print.c2
-rw-r--r--print.h2
-rw-r--r--process-x11-fields.pl2
-rw-r--r--progress_dlg.h2
-rw-r--r--proto_hier_stats.c2
-rw-r--r--proto_hier_stats.h2
-rw-r--r--ps.h2
-rw-r--r--ptvcursor.c2
-rw-r--r--ptvcursor.h2
-rw-r--r--randpkt.c2
-rw-r--r--range.c2
-rw-r--r--range.h2
-rw-r--r--rdps.c2
-rw-r--r--reassemble.c2
-rw-r--r--reassemble.h2
-rw-r--r--register.h2
-rw-r--r--req_resp_hdrs.c2
-rw-r--r--req_resp_hdrs.h2
-rw-r--r--ringbuffer.c2
-rw-r--r--ringbuffer.h2
-rw-r--r--rpc_defrag.h2
-rw-r--r--rtp_pt.h2
-rw-r--r--sctpppids.h2
-rw-r--r--simple_dialog.h2
-rw-r--r--smb.h2
-rw-r--r--snprintf-imp.h2
-rw-r--r--snprintf.c2
-rw-r--r--snprintf.h2
-rw-r--r--statusbar.h2
-rw-r--r--strerror.c2
-rw-r--r--strerror.h2
-rw-r--r--strptime.h2
-rw-r--r--summary.c2
-rw-r--r--summary.h2
-rw-r--r--t35.c2
-rw-r--r--t35.h2
-rw-r--r--tap-ansi_astat.c2
-rw-r--r--tap-bootpstat.c2
-rw-r--r--tap-dcerpcstat.c2
-rw-r--r--tap-gsm_astat.c2
-rw-r--r--tap-h225counter.c2
-rwxr-xr-xtap-h225rassrt.c2
-rw-r--r--tap-httpstat.c2
-rw-r--r--tap-iostat.c2
-rw-r--r--tap-iousers.c2
-rw-r--r--tap-mgcpstat.c2
-rw-r--r--tap-protocolinfo.c2
-rw-r--r--tap-protohierstat.c2
-rw-r--r--tap-rpcprogs.c2
-rw-r--r--tap-rpcstat.c2
-rw-r--r--tap-sipstat.c2
-rw-r--r--tap-smbsids.c2
-rw-r--r--tap-smbstat.c2
-rw-r--r--tap-wspstat.c2
-rw-r--r--tap.c2
-rw-r--r--tap.h2
-rw-r--r--tap_dfilter_dlg.h2
-rw-r--r--tethereal.c2
-rw-r--r--text2pcap-scanner.l2
-rw-r--r--text2pcap.c2
-rw-r--r--text2pcap.h2
-rw-r--r--timestats.c2
-rw-r--r--timestats.h2
-rw-r--r--tools/Makefile.am2
-rwxr-xr-xtools/Makefile.nmake2
-rw-r--r--tools/asn2eth.py2
-rwxr-xr-xtools/cvsdiff-fix.py2
-rwxr-xr-xtools/dfilter-test.py2
-rw-r--r--tools/lemon/Makefile.am2
-rw-r--r--tools/lemon/Makefile.nmake2
-rw-r--r--tools/lemon/README2
-rw-r--r--tools/lemon/cppmagic.h2
-rw-r--r--tools/lemon/lemon.c2
-rw-r--r--tools/lemon/lemonflex-head.inc2
-rw-r--r--tools/lemon/lemonflex-tail.inc2
-rw-r--r--ui_util.h2
-rw-r--r--util.c2
-rw-r--r--util.h2
-rw-r--r--version_info.c2
-rw-r--r--version_info.h2
-rw-r--r--wiretap/5views.c2
-rw-r--r--wiretap/5views.h2
-rw-r--r--wiretap/Makefile.am2
-rw-r--r--wiretap/Makefile.nmake2
-rw-r--r--wiretap/README2
-rw-r--r--wiretap/README.developer2
-rw-r--r--wiretap/acinclude.m42
-rw-r--r--wiretap/airopeek9.c2
-rw-r--r--wiretap/airopeek9.h2
-rw-r--r--wiretap/ascend-grammar.y2
-rw-r--r--wiretap/ascend-int.h2
-rw-r--r--wiretap/ascend-scanner.l2
-rw-r--r--wiretap/ascend.c2
-rw-r--r--wiretap/ascend.h2
-rw-r--r--wiretap/atm.c2
-rw-r--r--wiretap/atm.h2
-rw-r--r--wiretap/buffer.c2
-rw-r--r--wiretap/buffer.h2
-rw-r--r--wiretap/config.h.win322
-rw-r--r--wiretap/configure.in2
-rw-r--r--wiretap/cosine.c2
-rw-r--r--wiretap/cosine.h2
-rw-r--r--wiretap/csids.c2
-rw-r--r--wiretap/csids.h2
-rw-r--r--wiretap/dbs-etherwatch.c2
-rw-r--r--wiretap/dbs-etherwatch.h2
-rw-r--r--wiretap/erf.c2
-rw-r--r--wiretap/erf.h2
-rw-r--r--wiretap/etherpeek.c2
-rw-r--r--wiretap/etherpeek.h2
-rw-r--r--wiretap/eyesdn.c2
-rw-r--r--wiretap/eyesdn.h2
-rw-r--r--wiretap/file_access.c2
-rw-r--r--wiretap/file_wrappers.c2
-rw-r--r--wiretap/file_wrappers.h2
-rw-r--r--wiretap/hcidump.c2
-rw-r--r--wiretap/hcidump.h2
-rw-r--r--wiretap/i4b_trace.h2
-rw-r--r--wiretap/i4btrace.c2
-rw-r--r--wiretap/i4btrace.h2
-rw-r--r--wiretap/iptrace.c2
-rw-r--r--wiretap/iptrace.h2
-rw-r--r--wiretap/lanalyzer.c2
-rw-r--r--wiretap/lanalyzer.h2
-rw-r--r--wiretap/libpcap.c2
-rw-r--r--wiretap/libpcap.h2
-rw-r--r--wiretap/netmon.c2
-rw-r--r--wiretap/netmon.h2
-rw-r--r--wiretap/nettl.c2
-rw-r--r--wiretap/nettl.h2
-rw-r--r--wiretap/network_instruments.c2
-rw-r--r--wiretap/network_instruments.h2
-rw-r--r--wiretap/netxray.c2
-rw-r--r--wiretap/netxray.h2
-rw-r--r--wiretap/ngsniffer.c2
-rw-r--r--wiretap/ngsniffer.h2
-rw-r--r--wiretap/pppdump.c2
-rw-r--r--wiretap/pppdump.h2
-rw-r--r--wiretap/radcom.c2
-rw-r--r--wiretap/radcom.h2
-rw-r--r--wiretap/snoop.c2
-rw-r--r--wiretap/snoop.h2
-rw-r--r--wiretap/toshiba.c2
-rw-r--r--wiretap/toshiba.h2
-rw-r--r--wiretap/visual.c2
-rw-r--r--wiretap/visual.h2
-rw-r--r--wiretap/vms.c2
-rw-r--r--wiretap/vms.h2
-rw-r--r--wiretap/wtap-capture.h2
-rw-r--r--wiretap/wtap-int.h2
-rw-r--r--wiretap/wtap.c2
-rw-r--r--wiretap/wtap.def64
-rw-r--r--wiretap/wtap.h2
-rw-r--r--wka.tmpl2
-rw-r--r--x11-fields2
-rw-r--r--x264_prt_id.h2
-rw-r--r--xdlc.c2
-rw-r--r--xdlc.h2
-rw-r--r--xmlstub.c2
1303 files changed, 6794 insertions, 6794 deletions
diff --git a/Ethereal.desktop b/Ethereal.desktop
index 19315d3499..9ee810b045 100644
--- a/Ethereal.desktop
+++ b/Ethereal.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-# $Id: Ethereal.desktop,v 1.3 2004/02/20 13:50:06 jmayer Exp $
+# $Id$
Name=Ethereal
Type=Application
TryExec=ethereal
diff --git a/Makefile.am b/Makefile.am
index be2e106b21..1dc6b42192 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
-# $Id: Makefile.am,v 1.738 2004/06/29 03:04:02 gerald Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/Makefile.common b/Makefile.common
index 0ccb1a9e49..9c6c9f1a2e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -3,7 +3,7 @@
# a) common to both files and
# b) portable between both files
#
-# $Id: Makefile.common,v 1.53 2004/07/13 05:29:22 guy Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/Makefile.nmake b/Makefile.nmake
index 1c84796759..dd94a0926c 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -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.426 2004/07/13 19:30:02 gerald Exp $
+# $Id$
include config.nmake
include <win32.mak>
diff --git a/NEWS b/NEWS
index beded3dd43..e57d032bed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.156 2004/07/07 22:20:42 gerald Exp $
+$Id$
== July 7, 2004
diff --git a/README b/README
index 35704711d2..4616c620cd 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.66 2004/02/11 20:30:27 guy Exp $
+$Id$
General Information
------- -----------
diff --git a/README.aix b/README.aix
index fe9f8ee4a5..d48f49eb4f 100644
--- a/README.aix
+++ b/README.aix
@@ -1,4 +1,4 @@
-$Id: README.aix,v 1.6 2002/10/08 07:30:08 guy Exp $
+$Id$
libpcap 0.7.1 and later appear to work on AIX when using AIX's native
BPF; that appears to work better than DLPI does. Note that you may have
diff --git a/README.bsd b/README.bsd
index 47c4e05074..c8098e10bb 100644
--- a/README.bsd
+++ b/README.bsd
@@ -1,4 +1,4 @@
-$Id: README.bsd,v 1.2 2002/04/24 23:19:38 guy Exp $
+$Id$
In order to capture packets (with Ethereal/Tethereal, tcpdump, or any
other packet capture program) on a BSD system, your kernel must have
diff --git a/README.hpux b/README.hpux
index 263f6bf848..c0ac6cae9d 100644
--- a/README.hpux
+++ b/README.hpux
@@ -1,4 +1,4 @@
-$Id: README.hpux,v 1.19 2002/06/29 04:38:31 guy Exp $
+$Id$
Contents:
diff --git a/README.irix b/README.irix
index cbd4cd190c..07ef2a0c02 100644
--- a/README.irix
+++ b/README.irix
@@ -1,4 +1,4 @@
-$Id: README.irix,v 1.4 2001/01/10 09:54:44 guy Exp $
+$Id$
1. Some problems seen by one person who tried to build Ethereal on IRIX;
your mileage may vary.
diff --git a/README.linux b/README.linux
index adc952e61a..b683a1c8a6 100644
--- a/README.linux
+++ b/README.linux
@@ -1,4 +1,4 @@
-$Id: README.linux,v 1.8 2003/12/03 07:46:34 guy Exp $
+$Id$
In order to capture packets (with Ethereal/Tethereal, tcpdump, or any
other libpcap-based packet capture program) on a Linux system, the
diff --git a/README.macos b/README.macos
index 072760461b..c5ed137d67 100644
--- a/README.macos
+++ b/README.macos
@@ -1,4 +1,4 @@
-$Id: README.macos,v 1.9 2004/07/03 21:46:59 tuexen Exp $
+$Id$
This file tries to help building Ethereal for Mac OS X (Ethereal does
not work on earlier versions of Mac OS).
diff --git a/README.tru64 b/README.tru64
index 2f3524ac86..eeea5ffa3f 100644
--- a/README.tru64
+++ b/README.tru64
@@ -1,4 +1,4 @@
-$Id: README.tru64,v 1.3 2001/01/24 06:50:16 guy Exp $
+$Id$
The following instructions are applicable to Tru64 UNIX
(formerly Digital UNIX (formerly DEC OSF/1)) version 4.0, and
diff --git a/README.vmware b/README.vmware
index 617f368c8b..8f5b882f49 100644
--- a/README.vmware
+++ b/README.vmware
@@ -1,4 +1,4 @@
-$Id: README.vmware,v 1.2 2000/01/21 19:19:23 gram Exp $
+$Id$
If you are a registered user of VMware on Linux, you can contact their
support staff via e-mail and ask for a libpcap patch which will allow
diff --git a/README.win32 b/README.win32
index 6fd13a0089..8300f6de7a 100644
--- a/README.win32
+++ b/README.win32
@@ -1,4 +1,4 @@
-$Id: README.win32,v 1.71 2004/06/14 22:38:57 ulfl Exp $
+$Id$
Installing Ethereal, Tethereal, and Editcap on Win32
====================================================
diff --git a/TODO b/TODO
index 4800e54a7d..dd6643cad2 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.17 2004/04/25 22:25:52 jmayer Exp $
+$Id$
Things to do:
=============
diff --git a/acinclude.m4 b/acinclude.m4
index 69b2b8ce3f..efbca17769 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2,7 +2,7 @@ dnl Macros that test for specific features.
dnl This file is part of the Autoconf packaging for Ethereal.
dnl Copyright (C) 1998-2000 by Gerald Combs.
dnl
-dnl $Id: acinclude.m4,v 1.79 2004/06/29 07:59:12 guy Exp $
+dnl $Id$
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
diff --git a/aclocal-flags b/aclocal-flags
index ca21fd4d9b..3de5290449 100755
--- a/aclocal-flags
+++ b/aclocal-flags
@@ -21,7 +21,7 @@
# "aclocal" will look in that directory twice, and get well and truly
# confused, reporting a ton of duplicate macro definitions.)
#
-# $Id: aclocal-flags,v 1.9 2004/07/03 21:35:30 tuexen Exp $
+# $Id$
#
#
diff --git a/adler32.c b/adler32.c
index 77a27be24e..df9db65d43 100644
--- a/adler32.c
+++ b/adler32.c
@@ -3,7 +3,7 @@
* 2003 Tomas Kukosa
* Based on code from RFC 1950 (Chapter 9. Appendix: Sample code)
*
- * $Id: adler32.c,v 1.2 2003/10/02 22:44:18 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/adler32.h b/adler32.h
index f0912bc433..4e0f051f4c 100644
--- a/adler32.h
+++ b/adler32.h
@@ -2,7 +2,7 @@
* Compute the Adler32 checksum (RFC 1950)
* 2003 Tomas Kukosa
*
- * $Id: adler32.h,v 1.2 2003/10/02 22:44:19 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/afn.c b/afn.c
index 403b255a01..a245f3ba74 100644
--- a/afn.c
+++ b/afn.c
@@ -1,7 +1,7 @@
/* afn.c
* RFC 1700 address family numbers
*
- * $Id: afn.c,v 1.4 2002/08/28 21:00:05 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/afn.h b/afn.h
index c1c8338b9d..d621c44821 100644
--- a/afn.h
+++ b/afn.h
@@ -1,7 +1,7 @@
/* afn.h
* RFC 1700 address family numbers
*
- * $Id: afn.h,v 1.3 2002/08/28 21:00:05 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/aftypes.h b/aftypes.h
index 6c43295458..a0efad1a5c 100644
--- a/aftypes.h
+++ b/aftypes.h
@@ -1,7 +1,7 @@
/* aftypes.h
* AF_ values on various flavors of BSD
*
- * $Id: aftypes.h,v 1.3 2002/08/28 21:00:05 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/alert_box.c b/alert_box.c
index 03cc03f555..6c3dba26c3 100644
--- a/alert_box.c
+++ b/alert_box.c
@@ -2,7 +2,7 @@
* Routines to put up various "standard" alert boxes used in multiple
* places
*
- * $Id: alert_box.c,v 1.7 2004/05/09 10:03:36 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/alert_box.h b/alert_box.h
index fbe4b1c463..0cac35bd71 100644
--- a/alert_box.h
+++ b/alert_box.h
@@ -2,7 +2,7 @@
* Routines to put up various "standard" alert boxes used in multiple
* places
*
- * $Id: alert_box.h,v 1.5 2004/04/16 23:16:28 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/arcnet_pids.h b/arcnet_pids.h
index fc77f70584..59b815f29d 100644
--- a/arcnet_pids.h
+++ b/arcnet_pids.h
@@ -2,7 +2,7 @@
* ARCNET protocol ID values
* Copyright 2001-2002, Peter Fales <ethereal@fales-lorenz.net>
*
- * $Id: arcnet_pids.h,v 1.4 2003/01/23 09:54:54 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1.c b/asn1.c
index 6fad37d4ea..ce734b7ef0 100644
--- a/asn1.c
+++ b/asn1.c
@@ -1,7 +1,7 @@
/* asn1.c
* Routines for ASN.1 BER dissection
*
- * $Id: asn1.c,v 1.23 2003/11/09 22:57:52 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1.h b/asn1.h
index 87c23c60e8..5d751ff7fd 100644
--- a/asn1.h
+++ b/asn1.h
@@ -1,7 +1,7 @@
/* asn1.h
* Definitions for ASN.1 BER dissection
*
- * $Id: asn1.h,v 1.15 2003/11/09 22:57:52 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/h235/h235.cnf b/asn1/h235/h235.cnf
index d591161047..88abce10d9 100644
--- a/asn1/h235/h235.cnf
+++ b/asn1/h235/h235.cnf
@@ -2,7 +2,7 @@
# H235-SECURITY-MESSAGES conformation file
# 2004 Tomas Kukosa
-# $Id: h235.cnf,v 1.4 2004/06/24 21:50:04 sahlberg Exp $
+# $Id$
#.EXPORTS
diff --git a/asn1/h235/packet-h235-template.c b/asn1/h235/packet-h235-template.c
index 2cd3c58dda..b3ab237b12 100644
--- a/asn1/h235/packet-h235-template.c
+++ b/asn1/h235/packet-h235-template.c
@@ -2,7 +2,7 @@
* Routines for H.235 packet dissection
* 2004 Tomas Kukosa
*
- * $Id: packet-h235-template.c,v 1.3 2004/06/04 11:30:35 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/h235/packet-h235-template.h b/asn1/h235/packet-h235-template.h
index b0881cc41f..4dbee63285 100644
--- a/asn1/h235/packet-h235-template.h
+++ b/asn1/h235/packet-h235-template.h
@@ -2,7 +2,7 @@
* Routines for H.235 packet dissection
* 2004 Tomas Kukosa
*
- * $Id: packet-h235-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/autogen.sh b/autogen.sh
index 217dd49350..529aa10a2b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
#
# Run this to generate all the initial makefiles.
#
-# $Id: autogen.sh,v 1.36 2004/05/26 10:41:14 jmayer Exp $
+# $Id$
DIE=true
PROJECT="Ethereal"
diff --git a/bridged_pids.h b/bridged_pids.h
index db675c864a..4a1c8751ae 100644
--- a/bridged_pids.h
+++ b/bridged_pids.h
@@ -2,7 +2,7 @@
* Definitions of protocol IDs for the 00-80-C2 OUI, used for
* bridging various networks over ATM (RFC 2684) or Frame Relay (RFC 2427).
*
- * $Id: bridged_pids.h,v 1.2 2002/08/28 21:00:05 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/capture-wpcap.c b/capture-wpcap.c
index 50e86fb92f..ad9d7f28dc 100644
--- a/capture-wpcap.c
+++ b/capture-wpcap.c
@@ -3,7 +3,7 @@
* time, so that we only need one Ethereal binary and one Tethereal binary
* for Windows, regardless of whether WinPcap is installed or not.
*
- * $Id: capture-wpcap.c,v 1.10 2004/06/12 07:47:12 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/capture-wpcap.h b/capture-wpcap.h
index 66e3da2dd6..d53f22b3d2 100644
--- a/capture-wpcap.h
+++ b/capture-wpcap.h
@@ -1,6 +1,6 @@
/* capture-wpcap.h
*
- * $Id: capture-wpcap.h,v 1.2 2002/08/28 21:00:05 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/capture.c b/capture.c
index d1f42929f2..7e02ee3b9c 100644
--- a/capture.c
+++ b/capture.c
@@ -1,7 +1,7 @@
/* capture.c
* Routines for packet capture windows
*
- * $Id: capture.c,v 1.254 2004/06/30 06:58:56 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/capture.h b/capture.h
index afaed06219..0ebede639b 100644
--- a/capture.h
+++ b/capture.h
@@ -1,7 +1,7 @@
/* capture.h
* Definitions for packet capture windows
*
- * $Id: capture.h,v 1.48 2004/07/06 19:16:03 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/capture_stop_conditions.c b/capture_stop_conditions.c
index 1b1adff53c..1eb7a443cd 100644
--- a/capture_stop_conditions.c
+++ b/capture_stop_conditions.c
@@ -1,7 +1,7 @@
/* capture_stop_conditions.c
* Implementation for 'stop condition handler'.
*
- * $Id: capture_stop_conditions.c,v 1.4 2002/08/28 21:00:05 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/capture_stop_conditions.h b/capture_stop_conditions.h
index c5e8dcfb83..1dc1a49758 100644
--- a/capture_stop_conditions.h
+++ b/capture_stop_conditions.h
@@ -1,7 +1,7 @@
/* capture_stop_conditions.h
* Implementation for 'stop condition handler'.
*
- * $Id: capture_stop_conditions.h,v 1.2 2002/08/28 21:00:05 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/cfile.c b/cfile.c
index b5b62e8ad1..475906408d 100644
--- a/cfile.c
+++ b/cfile.c
@@ -2,7 +2,7 @@
* capture_file GUI-independent manipulation
* Vassilii Khachaturov <vassilii@tarunz.org>
*
- * $Id: cfile.c,v 1.1 2002/09/06 23:14:04 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/cfile.h b/cfile.h
index 0b9802e644..bcb5938e96 100644
--- a/cfile.h
+++ b/cfile.h
@@ -1,7 +1,7 @@
/* cfile.h
* capture_file definition & GUI-independent manipulation
*
- * $Id: cfile.h,v 1.10 2004/04/15 23:28:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/chdlctypes.h b/chdlctypes.h
index 5acf292fac..4237cfe4ca 100644
--- a/chdlctypes.h
+++ b/chdlctypes.h
@@ -1,7 +1,7 @@
/* chdlctypes.h
* Defines Cisco HDLC packet types that aren't just Ethernet types
*
- * $Id: chdlctypes.h,v 1.1 2003/01/11 10:16:22 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/cleanbld.bat b/cleanbld.bat
index d4a558f8e3..c7e57b3574 100644
--- a/cleanbld.bat
+++ b/cleanbld.bat
@@ -2,7 +2,7 @@ echo off
rem cleanbld.bat
rem Script to clean up from a build on another platform
rem
-rem $Id: cleanbld.bat,v 1.3 2003/04/07 18:43:03 guy Exp $
+rem $Id$
rem
rem Ethereal - Network traffic analyzer
rem By Gerald Combs <gerald@ethereal.com>
diff --git a/color.h b/color.h
index 4c99dde9d8..bbc04bd388 100644
--- a/color.h
+++ b/color.h
@@ -1,7 +1,7 @@
/* color.h
* Definitions for "toolkit-independent" colors
*
- * $Id: color.h,v 1.5 2004/01/09 20:19:34 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/column.c b/column.c
index e0674a292f..b17cfcd7c0 100644
--- a/column.c
+++ b/column.c
@@ -1,7 +1,7 @@
/* column.c
* Routines for handling column preferences
*
- * $Id: column.c,v 1.48 2004/07/05 09:29:04 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/column.h b/column.h
index 3bd17aab71..ecb9fc0bf5 100644
--- a/column.h
+++ b/column.h
@@ -1,7 +1,7 @@
/* column.h
* Definitions for column handling routines
*
- * $Id: column.h,v 1.10 2003/12/09 06:48:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/conditions.c b/conditions.c
index 9ff2aa6a01..f894312dba 100644
--- a/conditions.c
+++ b/conditions.c
@@ -1,7 +1,7 @@
/* conditions.c
* Implementation for condition handler.
*
- * $Id: conditions.c,v 1.6 2004/01/18 16:20:09 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/conditions.h b/conditions.h
index 7254f4c98f..7fbcdf7546 100644
--- a/conditions.h
+++ b/conditions.h
@@ -1,7 +1,7 @@
/* conditions.h
* Header for condition handler.
*
- * $Id: conditions.h,v 1.2 2002/08/28 21:00:06 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/config.h.win32 b/config.h.win32
index 514d0648e3..49b178bfe5 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,4 +1,4 @@
-/* $Id: config.h.win32,v 1.47 2004/06/20 09:31:48 ulfl Exp $ */
+/* $Id$ */
/* config.h.win32 Generated manually. :-) */
/* config.h. Generated automatically by configure. */
/* config.h.in. Generated automatically from configure.in by autoheader. */
diff --git a/config.nmake b/config.nmake
index ecc4732b9a..becc02a7d9 100644
--- a/config.nmake
+++ b/config.nmake
@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.96 2004/07/13 18:19:59 gerald Exp $
+# $Id$
VERSION=0.10.5
#
diff --git a/configure.in b/configure.in
index c51f4f6c9a..a712bf4b76 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.274 2004/07/06 16:29:18 gerald Exp $
+# $Id$
#
AC_INIT(etypes.h)
diff --git a/crc16.c b/crc16.c
index bfaa42f9ad..5a4a7c4dd8 100644
--- a/crc16.c
+++ b/crc16.c
@@ -3,7 +3,7 @@
*
* 2004 Richard van der Hoff <richardv@mxtelecom.com>
*
- * $Id: crc16.c,v 1.2 2004/06/26 09:45:27 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@xxxxxxxxxxxx>
diff --git a/crc16.h b/crc16.h
index 237974e18b..19dc0d71ab 100644
--- a/crc16.h
+++ b/crc16.h
@@ -3,7 +3,7 @@
*
* 2004 Richard van der Hoff <richardv@mxtelecom.com>
*
- * $Id: crc16.h,v 1.1 2004/06/25 06:31:46 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@xxxxxxxxxxxx>
diff --git a/crc32.c b/crc32.c
index 0b46682933..0bee8bed50 100644
--- a/crc32.c
+++ b/crc32.c
@@ -1,7 +1,7 @@
/* crc32.c
* CRC-32 routine
*
- * $Id: crc32.c,v 1.4 2004/06/26 09:48:11 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/crc32.h b/crc32.h
index 17d5ca99a1..697b594996 100644
--- a/crc32.h
+++ b/crc32.h
@@ -1,7 +1,7 @@
/* crc32.h
* Declaration of CRC-32 routine and table
*
- * $Id: crc32.h,v 1.4 2004/06/26 09:48:11 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/crypt-des.c b/crypt-des.c
index f39e821579..5fc1c65274 100644
--- a/crypt-des.c
+++ b/crypt-des.c
@@ -6,7 +6,7 @@
Copyright (C) Andrew Tridgell 1998
- $Id: crypt-des.c,v 1.1 2002/12/31 08:05:29 guy Exp $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/crypt-des.h b/crypt-des.h
index 8f799be2d6..aa91cc6a4f 100644
--- a/crypt-des.h
+++ b/crypt-des.h
@@ -6,7 +6,7 @@
Copyright (C) Andrew Tridgell 1998
- $Id: crypt-des.h,v 1.1 2002/12/31 08:05:29 guy Exp $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/crypt-md4.c b/crypt-md4.c
index 6044b25a34..6fc10bab62 100644
--- a/crypt-md4.c
+++ b/crypt-md4.c
@@ -3,7 +3,7 @@
a implementation of MD4 designed for use in the SMB authentication protocol
Copyright (C) Andrew Tridgell 1997-1998.
- $Id: crypt-md4.c,v 1.2 2002/12/03 15:21:28 gerald Exp $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/crypt-md4.h b/crypt-md4.h
index 2fd554d29e..17b251d1da 100644
--- a/crypt-md4.h
+++ b/crypt-md4.h
@@ -3,7 +3,7 @@
a implementation of MD4 designed for use in the SMB authentication protocol
Copyright (C) Andrew Tridgell 1997-1998.
- $Id: crypt-md4.h,v 1.1 2002/12/03 00:37:27 guy Exp $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/crypt-md5.c b/crypt-md5.c
index 720ed9494a..a94d8a589b 100644
--- a/crypt-md5.c
+++ b/crypt-md5.c
@@ -21,7 +21,7 @@
ghost@aladdin.com
*/
-/* $Id: crypt-md5.c,v 1.2 2002/12/17 22:14:54 oabad Exp $ */
+/* $Id$ */
/*
Independent implementation of MD5 (RFC 1321).
diff --git a/crypt-md5.h b/crypt-md5.h
index c8275c284b..5eb6d6c469 100644
--- a/crypt-md5.h
+++ b/crypt-md5.h
@@ -21,7 +21,7 @@
ghost@aladdin.com
*/
-/* $Id: crypt-md5.h,v 1.1 2002/12/17 16:06:54 gerald Exp $ */
+/* $Id$ */
/*
Independent implementation of MD5 (RFC 1321).
diff --git a/crypt-rc4.c b/crypt-rc4.c
index 2ea651a6d8..79b40cb756 100644
--- a/crypt-rc4.c
+++ b/crypt-rc4.c
@@ -6,7 +6,7 @@
Copyright (C) Andrew Tridgell 1998
- $Id: crypt-rc4.c,v 1.2 2002/12/11 19:31:02 guy Exp $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/crypt-rc4.h b/crypt-rc4.h
index b76ecbb71b..37c1903eea 100644
--- a/crypt-rc4.h
+++ b/crypt-rc4.h
@@ -6,7 +6,7 @@
Copyright (C) Andrew Tridgell 1998
- $Id: crypt-rc4.h,v 1.2 2002/12/11 19:31:02 guy Exp $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/dftest.c b/dftest.c
index f28a808b6c..6c24fb5d16 100644
--- a/dftest.c
+++ b/dftest.c
@@ -1,6 +1,6 @@
/* dftest.c.c
*
- * $Id: dftest.c,v 1.11 2004/04/17 01:05:00 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/disabled_protos.c b/disabled_protos.c
index 11b45de9f6..e50adab9ef 100644
--- a/disabled_protos.c
+++ b/disabled_protos.c
@@ -1,7 +1,7 @@
/* disabled_protos.c
* Code for reading and writing the disabled protocols file.
*
- * $Id: disabled_protos.c,v 1.4 2004/01/03 18:40:07 sharpe Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/disabled_protos.h b/disabled_protos.h
index edb77c6cae..47ef105a3a 100644
--- a/disabled_protos.h
+++ b/disabled_protos.h
@@ -1,7 +1,7 @@
/* disabled_protos.h
* Declarations of routines for reading and writing the disabled protocols file.
*
- * $Id: disabled_protos.h,v 1.2 2004/01/03 18:40:07 sharpe Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8fe6267dea..9a14b99132 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal documentation
#
-# $Id: Makefile.am,v 1.26 2004/06/27 17:56:15 gerald Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake
index d342eeafab..ccae10f06e 100644
--- a/doc/Makefile.nmake
+++ b/doc/Makefile.nmake
@@ -1,7 +1,7 @@
# Makefile.nmake
# Nmake file for Ethereal documentation
#
-# $Id: Makefile.nmake,v 1.16 2004/05/22 17:14:32 ulfl Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/doc/README.capture b/doc/README.capture
index 354225d1d8..bb213a2df5 100644
--- a/doc/README.capture
+++ b/doc/README.capture
@@ -1,4 +1,4 @@
-$Id: README.capture,v 1.3 2004/02/02 23:55:41 ulfl Exp $
+$Id$
This document is an attempt, to bring some light to the things done, when
packet capturing is performed. There might be things missing, and others
diff --git a/doc/README.design b/doc/README.design
index d793c4fada..94705b6797 100644
--- a/doc/README.design
+++ b/doc/README.design
@@ -1,4 +1,4 @@
-$Id: README.design,v 1.1 2000/11/14 18:05:27 gram Exp $
+$Id$
Unfortunately, the closest thing to a design document is the
"README.developer" document in the "doc" directory of the Ethereal
diff --git a/doc/README.developer b/doc/README.developer
index 275cab86aa..35fc8e823b 100644
--- a/doc/README.developer
+++ b/doc/README.developer
@@ -1,4 +1,4 @@
-$Id: README.developer,v 1.98 2004/07/08 21:16:04 guy Exp $
+$Id$
This file is a HOWTO for Ethereal developers. It describes how to start coding
a Ethereal protocol dissector and the use some of the important functions and
@@ -373,12 +373,12 @@ code inside
is needed only if you are using the "snprintf()" function.
-The "$Id: README.developer,v 1.98 2004/07/08 21:16:04 guy Exp $"
+The "$Id$"
in the comment will be updated by CVS when the file is
checked in; it will allow the RCS "ident" command to report which
version of the file is currently checked out.
-When creating a new file, it is fine to just write "$Id: README.developer,v 1.98 2004/07/08 21:16:04 guy Exp $" as RCS will
+When creating a new file, it is fine to just write "$Id$" as RCS will
automatically fill in the identifier at the time the file will be added to the
CVS repository (checked in).
@@ -387,7 +387,7 @@ CVS repository (checked in).
* Routines for PROTONAME dissection
* Copyright 2000, YOUR_NAME <YOUR_EMAIL_ADDRESS>
*
- * $Id: README.developer,v 1.98 2004/07/08 21:16:04 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/doc/README.idl2eth b/doc/README.idl2eth
index afb35e295f..b116dbdc89 100644
--- a/doc/README.idl2eth
+++ b/doc/README.idl2eth
@@ -1,4 +1,4 @@
-$Id: README.idl2eth,v 1.2 2001/06/19 20:10:51 guy Exp $
+$Id$
Copyright (C) 2001 Frank Singleton <frank.singleton@ericsson.com>
diff --git a/doc/README.plugins b/doc/README.plugins
index e29e2b44bb..2fbc865c1b 100644
--- a/doc/README.plugins
+++ b/doc/README.plugins
@@ -1,4 +1,4 @@
-$Id: README.plugins,v 1.13 2004/07/03 21:50:05 tuexen Exp $
+$Id$
Plugins
diff --git a/doc/README.regression b/doc/README.regression
index 0a1f945edd..04f06bc0ab 100644
--- a/doc/README.regression
+++ b/doc/README.regression
@@ -1,7 +1,7 @@
#
# Ethereal/Tethereal Regression Testing
#
-# $Id: README.regression,v 1.3 2000/05/16 06:23:05 gram Exp $
+# $Id$
#
# This is a sample Makefile for regression testing of the
# Ethereal engine. These tests use that uses 'tethereal -V' to analyze all
diff --git a/doc/README.tapping b/doc/README.tapping
index d2117252db..182967ea53 100644
--- a/doc/README.tapping
+++ b/doc/README.tapping
@@ -1,4 +1,4 @@
-$Id: README.tapping,v 1.6 2003/11/29 12:34:33 jmayer Exp $
+$Id$
The TAP system in ethereal is a powerful and flexible mechanism to get event
driven notification on packets matching certain protocols and/or filters.
diff --git a/doc/README.tvbuff b/doc/README.tvbuff
index 249488b9f1..5cce7fb925 100644
--- a/doc/README.tvbuff
+++ b/doc/README.tvbuff
@@ -1,4 +1,4 @@
-$Id: README.tvbuff,v 1.7 2004/06/23 15:15:28 gram Exp $
+$Id$
TVBUFFs and Exceptions
diff --git a/doc/README.xml-output b/doc/README.xml-output
index bbf008c990..154b3940ab 100644
--- a/doc/README.xml-output
+++ b/doc/README.xml-output
@@ -1,6 +1,6 @@
Protocol Dissection in XML Format
=================================
-$Id: README.xml-output,v 1.3 2004/04/30 07:56:33 ulfl Exp $
+$Id$
Copyright (c) 2003 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/doc/dfilter2pod.pl b/doc/dfilter2pod.pl
index 4e080bdd14..cd97a3d0bb 100755
--- a/doc/dfilter2pod.pl
+++ b/doc/dfilter2pod.pl
@@ -9,7 +9,7 @@
# will be replaced by the pod-formatted glossary
# STDOUT is the output
#
-# $Id: dfilter2pod.pl,v 1.5 2004/04/28 17:50:02 obiot Exp $
+# $Id$
%ftenum_names = (
'FT_NONE', 'No value',
diff --git a/doc/eproto2sgml b/doc/eproto2sgml
index e81fe8eb8a..0c25a757b4 100644
--- a/doc/eproto2sgml
+++ b/doc/eproto2sgml
@@ -8,7 +8,7 @@
# will be replaced by the pod-formatted glossary
# STDOUT is the output
#
-# $Id: eproto2sgml,v 1.2 2001/04/19 23:17:30 guy Exp $
+# $Id$
# Read all the data into memory
while (<STDIN>) {
diff --git a/doc/randpkt.txt b/doc/randpkt.txt
index d2eb412db1..ce428f5e07 100644
--- a/doc/randpkt.txt
+++ b/doc/randpkt.txt
@@ -1,6 +1,6 @@
Random Packet Generator
-----------------------
-$Id: randpkt.txt,v 1.3 1999/09/17 04:38:23 gram Exp $
+$Id$
randpkt is a small utility creates a libpcap trace file full of random packets.
You can control the number of packets, the maximum size of each packet,
diff --git a/editcap.c b/editcap.c
index 9c5bd0e883..d6be0135fa 100644
--- a/editcap.c
+++ b/editcap.c
@@ -1,7 +1,7 @@
/* Edit capture files. We can delete records, adjust timestamps, or
* simply convert from one format to another format.
*
- * $Id: editcap.c,v 1.31 2004/02/23 05:44:34 sharpe Exp $
+ * $Id$
*
* Originally written by Richard Sharpe.
* Improved by Guy Harris.
diff --git a/epan/Makefile.am b/epan/Makefile.am
index fee59599e0..acee84de01 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -2,7 +2,7 @@
# Automake file for the EPAN library
# (Ethereal Protocol ANalyzer Library)
#
-# $Id: Makefile.am,v 1.53 2004/06/25 07:10:53 jmayer Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 068d329e78..2e2c50532e 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -3,7 +3,7 @@
# a) common to both files and
# b) portable between both files
#
-# $Id: Makefile.common,v 1.34 2004/07/13 05:29:23 guy Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 565f4d8088..f76e3018f5 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -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.46 2004/07/07 16:23:12 ulfl Exp $
+# $Id$
include ..\config.nmake
include <win32.mak>
diff --git a/epan/README b/epan/README
index 99ed791b9e..91f9e765e9 100644
--- a/epan/README
+++ b/epan/README
@@ -1,3 +1,3 @@
-$Id: README,v 1.1 2000/10/16 23:17:39 guy Exp $
+$Id$
XXX - put something here
diff --git a/epan/addr_and_mask.c b/epan/addr_and_mask.c
index 73cd0b015b..2e3eaf2588 100644
--- a/epan/addr_and_mask.c
+++ b/epan/addr_and_mask.c
@@ -2,7 +2,7 @@
* Routines to fetch IPv4 and IPv6 addresses from a tvbuff and then mask
* out bits other than those covered by a prefix length
*
- * $Id: addr_and_mask.c,v 1.1 2004/03/06 03:25:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/addr_and_mask.h b/epan/addr_and_mask.h
index c05f335370..30e54bd70e 100644
--- a/epan/addr_and_mask.h
+++ b/epan/addr_and_mask.h
@@ -2,7 +2,7 @@
* Declarations of routines to fetch IPv4 and IPv6 addresses from a tvbuff
* and then mask out bits other than those covered by a prefix length
*
- * $Id: addr_and_mask.h,v 1.1 2004/03/06 03:25:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/atalk-utils.c b/epan/atalk-utils.c
index c91ecc1f82..07a6471526 100644
--- a/epan/atalk-utils.c
+++ b/epan/atalk-utils.c
@@ -1,7 +1,7 @@
/* atalk-utils.c
* Routines for Appletalk utilities (DDP, currently).
*
- * $Id: atalk-utils.c,v 1.4 2003/08/26 01:00:29 guy Exp $
+ * $Id$
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
diff --git a/epan/atalk-utils.h b/epan/atalk-utils.h
index a6179f6ecc..74f5df263d 100644
--- a/epan/atalk-utils.h
+++ b/epan/atalk-utils.h
@@ -1,7 +1,7 @@
/* atalk-utils.h
* Definitions for Appletalk utilities (DDP, currently).
*
- * $Id: atalk-utils.h,v 1.4 2003/08/26 01:00:29 guy Exp $
+ * $Id$
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/epan/bitswap.c b/epan/bitswap.c
index 42a18914cf..8871292b3e 100644
--- a/epan/bitswap.c
+++ b/epan/bitswap.c
@@ -1,7 +1,7 @@
/* bitswap.c
* Table of bit-swapped values of bytes
*
- * $Id: bitswap.c,v 1.2 2002/08/28 20:40:44 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/bitswap.h b/epan/bitswap.h
index 7042779aae..57aef9c773 100644
--- a/epan/bitswap.h
+++ b/epan/bitswap.h
@@ -1,7 +1,7 @@
/* bitswap.h
* Macro to bitswap a byte by looking it up in a table
*
- * $Id: bitswap.h,v 1.2 2002/08/28 20:40:44 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/circuit.c b/epan/circuit.c
index 64fc6f9a0f..f4fb47ee85 100644
--- a/epan/circuit.c
+++ b/epan/circuit.c
@@ -1,7 +1,7 @@
/* circuit.c
* Routines for building lists of packets that are part of a "circuit"
*
- * $Id: circuit.c,v 1.8 2004/01/09 01:02:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/circuit.h b/epan/circuit.h
index 75577927bb..e273a0002c 100644
--- a/epan/circuit.h
+++ b/epan/circuit.h
@@ -1,7 +1,7 @@
/* circuit.h
* Routines for building lists of packets that are part of a "circuit"
*
- * $Id: circuit.h,v 1.5 2002/11/28 08:25:59 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/column-utils.c b/epan/column-utils.c
index 8f2e5de6f4..959cb64d9b 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -1,7 +1,7 @@
/* column-utils.c
* Routines for column utilities.
*
- * $Id: column-utils.c,v 1.48 2004/04/02 09:04:12 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/column-utils.h b/epan/column-utils.h
index 426862714a..770be8d39b 100644
--- a/epan/column-utils.h
+++ b/epan/column-utils.h
@@ -1,7 +1,7 @@
/* column-utils.h
* Definitions for column utility structures and routines
*
- * $Id: column-utils.h,v 1.12 2004/02/05 23:57:15 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/column_info.h b/epan/column_info.h
index 6556ad3d7b..85eff842e0 100644
--- a/epan/column_info.h
+++ b/epan/column_info.h
@@ -1,7 +1,7 @@
/* column.h
* Definitions for column structures and routines
*
- * $Id: column_info.h,v 1.13 2004/07/05 09:29:06 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/conversation.c b/epan/conversation.c
index 96ec73999a..dc1f7a9e97 100644
--- a/epan/conversation.c
+++ b/epan/conversation.c
@@ -1,7 +1,7 @@
/* conversation.c
* Routines for building lists of packets that are part of a "conversation"
*
- * $Id: conversation.c,v 1.25 2004/07/06 19:01:31 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/conversation.h b/epan/conversation.h
index fedb5d5ffe..b148d9aaa9 100644
--- a/epan/conversation.h
+++ b/epan/conversation.h
@@ -1,7 +1,7 @@
/* conversation.h
* Routines for building lists of packets that are part of a "conversation"
*
- * $Id: conversation.h,v 1.11 2004/07/06 19:01:32 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 13567f10f4..dae7fe7a78 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -1,6 +1,6 @@
# Makefile.am
#
-# $Id: Makefile.am,v 1.11 2004/03/24 21:27:44 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index 5e0f6bcdef..21038114aa 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -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.14 2004/06/26 02:16:16 guy Exp $
+# $Id$
include ..\..\config.nmake
diff --git a/epan/dfilter/README.dfilter b/epan/dfilter/README.dfilter
index fc45380dff..4c2cb69cf9 100755
--- a/epan/dfilter/README.dfilter
+++ b/epan/dfilter/README.dfilter
@@ -1,107 +1,107 @@
-$Id: README.dfilter,v 1.2 2004/05/08 11:40:29 obiot Exp $
-
-How does the display filter logic work?
-=======================================
-
-scanner.l looks at the display filter string and finds reserved words,
-punctuation, etc. This information gets passed to the parser produced by
-grammar.lemon. The grammar's job is to create a syntax-tree out of the
-information provided by the scanner. The syntax tree organizes the
-information from the scanner into something that is grammatical in the
-dfilter language.
-
-The routines in semcheck.c then check the semantics of the syntax tree, and do
-any modifications necessary to the syntax tree to make the dfilter work....
-things like converting val_strings to integers, etc.
-
-Then gencode.c converts the syntax tree into a list of "dfvm" (display filter
-virtual machine) instructions. These dfvm instructions are what runs the
-display filter engine.
-
-Example: add an 'in' display filter operation
-=============================================
-
-This example has been discussed on ethereal-dev in April 2004. It illustrates
-how a more complex operation can be added to the display filter language.
-
-Question:
-
- If I want to add an 'in' display filter operation, I need to define
- several things. This can happen in different ways. For instance,
- every value from the "in" value collection will result in a test.
- There are 2 options here, either a test for a single value:
-
- (x in {a b c})
-
- or a test for a value in a given range:
-
- (x in {a ... z})
-
- or even a combination of both. The former example can be reduced to:
-
- ((x == a) or (x == b) or (x == c))
-
- while the latter can be reduced to
-
- ((x >= MIN(a, z)) and (x <= MAX(a, z)))
-
- I understand that I can replace "x in {" with the following steps:
- first store x in the "in" test buffer, then add "(" to the display
- filter expression internally.
-
- Similarly I can replace the closing brace "}" with the following steps:
- release x from the "in" test buffer and then add ")" to the display
- filter expression internally.
-
- How could I do this?
-
-Answer:
-
- This could be done in grammar.lemon. The grammar would produce syntax
- tree nodes, combining them with "or", when it is given tokens that
- represent the "in" syntax.
-
- It could also be done later in the process, maybe in semcheck.c. But
- if you can do it earlier, in grammar.lemon, then you shouldn't have to
- worry about modifying anything in semcheck.c, as the syntax tree that
- is passed to semcheck.c won't contain any new type of operators... just
- lots of nodes combined with "or".
-
-How to add an operator FOO to the display filter language?
-==========================================================
-
-Go to ethereal/epan/dfilter/
-
-Edit grammar.lemon and add the operator. Add the operator FOO and the test logic (defining TEST_OP_FOO).
-
-Edit scanner.l and add the operator name(s) hence defining TOKEN_TEST_FOO. Also update the simple() or add the new operand's code.
-
-Edit sttype-test.h and add the TEST_OP_FOO to the list of test operations.
-
-Edit sttype-test.c and add TEST_OP_FOO to the num_operands() method.
-
-Edit gencode.c, add TEST_OP_FOO in the gen_test() method by defining ANY_FOO.
-
-Edit dfvm.h and add ANY_FOO to the enum dfvm_opcode_t structure.
-
-Edit dfvm.c and add ANY_FOO to dfvm_dump() (for the dftest display filter test binary), to dfvm_apply() hence defining the methods fvalue_foo().
-
-Edit semcheck.c and look at the check_relation_XXX() methods if they still apply to the foo operator; if not, amend the code. Start from the check_test() method to discover the logic.
-
-Go to ethereal/epan/ftypes/
-
-Edit ftypes.h and declare the fvalue_foo(), ftype_can_foo() and fvalue_foo() methods. Add the cmp_foo() method to the struct _ftype_t.
-
-This is the first time that a make in ethereal/epan/dfilter/ can succeed. If it fails, then some code in the previously edited files must be corrected.
-
-Edit ftypes.c and define the fvalue_foo() method with its associated logic. Define also the ftype_can_foo() and fvalue_foo() methods.
-
-Edit all ftype-*.c files and add the required fvalue_foo() methods.
-
-This is the point where you should be able to compile without errors in ethereal/epan/ftypes/. If not, first fix the errors.
-
-Go to ethereal/epan/ and run make. If this one succeeds, then we're almost done as no errors should occur here.
-
-Go to ethereal/ and run make. One thing to do is make dftest and see if you can construct valid display filters with your new operator. Or you may want to move directly to the generation of ethereal.
-
-Look also at ethereal/gtk/dfilter_expr_dlg.c and edit the display filter expression generator.
+$Id$
+
+How does the display filter logic work?
+=======================================
+
+scanner.l looks at the display filter string and finds reserved words,
+punctuation, etc. This information gets passed to the parser produced by
+grammar.lemon. The grammar's job is to create a syntax-tree out of the
+information provided by the scanner. The syntax tree organizes the
+information from the scanner into something that is grammatical in the
+dfilter language.
+
+The routines in semcheck.c then check the semantics of the syntax tree, and do
+any modifications necessary to the syntax tree to make the dfilter work....
+things like converting val_strings to integers, etc.
+
+Then gencode.c converts the syntax tree into a list of "dfvm" (display filter
+virtual machine) instructions. These dfvm instructions are what runs the
+display filter engine.
+
+Example: add an 'in' display filter operation
+=============================================
+
+This example has been discussed on ethereal-dev in April 2004. It illustrates
+how a more complex operation can be added to the display filter language.
+
+Question:
+
+ If I want to add an 'in' display filter operation, I need to define
+ several things. This can happen in different ways. For instance,
+ every value from the "in" value collection will result in a test.
+ There are 2 options here, either a test for a single value:
+
+ (x in {a b c})
+
+ or a test for a value in a given range:
+
+ (x in {a ... z})
+
+ or even a combination of both. The former example can be reduced to:
+
+ ((x == a) or (x == b) or (x == c))
+
+ while the latter can be reduced to
+
+ ((x >= MIN(a, z)) and (x <= MAX(a, z)))
+
+ I understand that I can replace "x in {" with the following steps:
+ first store x in the "in" test buffer, then add "(" to the display
+ filter expression internally.
+
+ Similarly I can replace the closing brace "}" with the following steps:
+ release x from the "in" test buffer and then add ")" to the display
+ filter expression internally.
+
+ How could I do this?
+
+Answer:
+
+ This could be done in grammar.lemon. The grammar would produce syntax
+ tree nodes, combining them with "or", when it is given tokens that
+ represent the "in" syntax.
+
+ It could also be done later in the process, maybe in semcheck.c. But
+ if you can do it earlier, in grammar.lemon, then you shouldn't have to
+ worry about modifying anything in semcheck.c, as the syntax tree that
+ is passed to semcheck.c won't contain any new type of operators... just
+ lots of nodes combined with "or".
+
+How to add an operator FOO to the display filter language?
+==========================================================
+
+Go to ethereal/epan/dfilter/
+
+Edit grammar.lemon and add the operator. Add the operator FOO and the test logic (defining TEST_OP_FOO).
+
+Edit scanner.l and add the operator name(s) hence defining TOKEN_TEST_FOO. Also update the simple() or add the new operand's code.
+
+Edit sttype-test.h and add the TEST_OP_FOO to the list of test operations.
+
+Edit sttype-test.c and add TEST_OP_FOO to the num_operands() method.
+
+Edit gencode.c, add TEST_OP_FOO in the gen_test() method by defining ANY_FOO.
+
+Edit dfvm.h and add ANY_FOO to the enum dfvm_opcode_t structure.
+
+Edit dfvm.c and add ANY_FOO to dfvm_dump() (for the dftest display filter test binary), to dfvm_apply() hence defining the methods fvalue_foo().
+
+Edit semcheck.c and look at the check_relation_XXX() methods if they still apply to the foo operator; if not, amend the code. Start from the check_test() method to discover the logic.
+
+Go to ethereal/epan/ftypes/
+
+Edit ftypes.h and declare the fvalue_foo(), ftype_can_foo() and fvalue_foo() methods. Add the cmp_foo() method to the struct _ftype_t.
+
+This is the first time that a make in ethereal/epan/dfilter/ can succeed. If it fails, then some code in the previously edited files must be corrected.
+
+Edit ftypes.c and define the fvalue_foo() method with its associated logic. Define also the ftype_can_foo() and fvalue_foo() methods.
+
+Edit all ftype-*.c files and add the required fvalue_foo() methods.
+
+This is the point where you should be able to compile without errors in ethereal/epan/ftypes/. If not, first fix the errors.
+
+Go to ethereal/epan/ and run make. If this one succeeds, then we're almost done as no errors should occur here.
+
+Go to ethereal/ and run make. One thing to do is make dftest and see if you can construct valid display filters with your new operator. Or you may want to move directly to the generation of ethereal.
+
+Look also at ethereal/gtk/dfilter_expr_dlg.c and edit the display filter expression generator.
diff --git a/epan/dfilter/dfilter-int.h b/epan/dfilter/dfilter-int.h
index 51e3a4b530..00a03d07f5 100644
--- a/epan/dfilter/dfilter-int.h
+++ b/epan/dfilter/dfilter-int.h
@@ -1,5 +1,5 @@
/*
- * $Id: dfilter-int.h,v 1.9 2004/06/15 10:38:14 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c
index 35efd9a8fb..08a4b55a66 100644
--- a/epan/dfilter/dfilter.c
+++ b/epan/dfilter/dfilter.c
@@ -1,5 +1,5 @@
/*
- * $Id: dfilter.c,v 1.18 2004/06/16 07:33:46 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/dfilter/dfilter.h b/epan/dfilter/dfilter.h
index 764876223b..f2f16d783f 100644
--- a/epan/dfilter/dfilter.h
+++ b/epan/dfilter/dfilter.h
@@ -1,5 +1,5 @@
/*
- * $Id: dfilter.h,v 1.9 2004/05/09 10:03:40 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/dfilter/dfvm.c b/epan/dfilter/dfvm.c
index 8d4b9fa6f6..ee99069603 100644
--- a/epan/dfilter/dfvm.c
+++ b/epan/dfilter/dfvm.c
@@ -1,5 +1,5 @@
/*
- * $Id: dfvm.c,v 1.15 2004/02/27 12:00:30 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/dfilter/dfvm.h b/epan/dfilter/dfvm.h
index 16292b03ce..862bb0a313 100644
--- a/epan/dfilter/dfvm.h
+++ b/epan/dfilter/dfvm.h
@@ -1,5 +1,5 @@
/*
- * $Id: dfvm.h,v 1.11 2004/02/27 12:00:30 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/dfilter/drange.c b/epan/dfilter/drange.c
index 7e03790434..5a374ea786 100644
--- a/epan/dfilter/drange.c
+++ b/epan/dfilter/drange.c
@@ -1,7 +1,7 @@
/* drange.c
* Routines for providing general range support to the dfilter library
*
- * $Id: drange.c,v 1.4 2002/08/28 20:40:55 jmayer Exp $
+ * $Id$
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
*
diff --git a/epan/dfilter/drange.h b/epan/dfilter/drange.h
index a0d1f3bf4c..6a139681fc 100644
--- a/epan/dfilter/drange.h
+++ b/epan/dfilter/drange.h
@@ -1,7 +1,7 @@
/* drange.h
* Routines for providing general range support to the dfilter library
*
- * $Id: drange.h,v 1.4 2004/01/18 15:34:23 jmayer Exp $
+ * $Id$
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
*
diff --git a/epan/dfilter/gencode.c b/epan/dfilter/gencode.c
index 281d676cc6..1c56896311 100644
--- a/epan/dfilter/gencode.c
+++ b/epan/dfilter/gencode.c
@@ -1,5 +1,5 @@
/*
- * $Id: gencode.c,v 1.13 2004/02/27 12:00:30 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/dfilter/glib-util.c b/epan/dfilter/glib-util.c
index 880e91eb29..6e2e5f8f25 100644
--- a/epan/dfilter/glib-util.c
+++ b/epan/dfilter/glib-util.c
@@ -1,4 +1,4 @@
-/* $Id: glib-util.c,v 1.2 2002/08/28 20:40:55 jmayer Exp $ */
+/* $Id$ */
#include <string.h>
#include <glib.h>
diff --git a/epan/dfilter/glib-util.h b/epan/dfilter/glib-util.h
index 90a81f7eed..1460bdee1c 100644
--- a/epan/dfilter/glib-util.h
+++ b/epan/dfilter/glib-util.h
@@ -1,4 +1,4 @@
-/* $Id: glib-util.h,v 1.1 2001/02/01 20:21:18 gram Exp $ */
+/* $Id$ */
char*
g_substrdup(const char *s, int start, int len);
diff --git a/epan/dfilter/grammar.lemon b/epan/dfilter/grammar.lemon
index 76bab3c851..c9d66fba2b 100644
--- a/epan/dfilter/grammar.lemon
+++ b/epan/dfilter/grammar.lemon
@@ -1,4 +1,4 @@
-/* $Id: grammar.lemon,v 1.10 2004/06/03 07:36:24 guy Exp $ */
+/* $Id$ */
%include {
#ifdef HAVE_CONFIG_H
diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l
index e4fdaca5c6..10d3f19b28 100644
--- a/epan/dfilter/scanner.l
+++ b/epan/dfilter/scanner.l
@@ -1,6 +1,6 @@
%{
/*
- * $Id: scanner.l,v 1.20 2004/06/03 07:36:24 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c
index 20e933e5a9..8672e07906 100644
--- a/epan/dfilter/semcheck.c
+++ b/epan/dfilter/semcheck.c
@@ -1,5 +1,5 @@
/*
- * $Id: semcheck.c,v 1.28 2004/06/15 10:16:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/dfilter/semcheck.h b/epan/dfilter/semcheck.h
index ddd44a89b4..fec5d80e96 100644
--- a/epan/dfilter/semcheck.h
+++ b/epan/dfilter/semcheck.h
@@ -1,5 +1,5 @@
/*
- * $Id: semcheck.h,v 1.3 2002/08/28 20:40:56 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/dfilter/sttype-integer.c b/epan/dfilter/sttype-integer.c
index f046b65cfd..c8765dac0f 100644
--- a/epan/dfilter/sttype-integer.c
+++ b/epan/dfilter/sttype-integer.c
@@ -1,5 +1,5 @@
/*
- * $Id: sttype-integer.c,v 1.2 2002/08/28 20:40:56 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/dfilter/sttype-pointer.c b/epan/dfilter/sttype-pointer.c
index aaaa0dd9d4..3879fdae14 100644
--- a/epan/dfilter/sttype-pointer.c
+++ b/epan/dfilter/sttype-pointer.c
@@ -1,5 +1,5 @@
/*
- * $Id: sttype-pointer.c,v 1.3 2002/08/28 20:40:56 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/dfilter/sttype-range.c b/epan/dfilter/sttype-range.c
index a87c3e99b7..c1be33af6c 100644
--- a/epan/dfilter/sttype-range.c
+++ b/epan/dfilter/sttype-range.c
@@ -1,5 +1,5 @@
/*
- * $Id: sttype-range.c,v 1.5 2002/08/28 20:40:56 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/dfilter/sttype-range.h b/epan/dfilter/sttype-range.h
index 3b11fd6543..b4fc480148 100644
--- a/epan/dfilter/sttype-range.h
+++ b/epan/dfilter/sttype-range.h
@@ -1,5 +1,5 @@
/*
- * $Id: sttype-range.h,v 1.4 2002/08/28 20:40:56 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/dfilter/sttype-string.c b/epan/dfilter/sttype-string.c
index 160fce82d7..bc92d8ae8b 100644
--- a/epan/dfilter/sttype-string.c
+++ b/epan/dfilter/sttype-string.c
@@ -1,5 +1,5 @@
/*
- * $Id: sttype-string.c,v 1.4 2003/07/25 03:44:01 gram Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/dfilter/sttype-test.c b/epan/dfilter/sttype-test.c
index 930cf1121c..9a0408efaf 100644
--- a/epan/dfilter/sttype-test.c
+++ b/epan/dfilter/sttype-test.c
@@ -1,5 +1,5 @@
/*
- * $Id: sttype-test.c,v 1.6 2004/02/27 12:00:31 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/dfilter/sttype-test.h b/epan/dfilter/sttype-test.h
index 1814b8c236..ad615f0a4d 100644
--- a/epan/dfilter/sttype-test.h
+++ b/epan/dfilter/sttype-test.h
@@ -1,5 +1,5 @@
/*
- * $Id: sttype-test.h,v 1.6 2004/02/27 12:00:31 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/dfilter/syntax-tree.c b/epan/dfilter/syntax-tree.c
index 53c9b31259..00dae06dd5 100644
--- a/epan/dfilter/syntax-tree.c
+++ b/epan/dfilter/syntax-tree.c
@@ -1,5 +1,5 @@
/*
- * $Id: syntax-tree.c,v 1.6 2004/06/03 07:36:25 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/dfilter/syntax-tree.h b/epan/dfilter/syntax-tree.h
index 121e32e6f3..15c8d18745 100644
--- a/epan/dfilter/syntax-tree.h
+++ b/epan/dfilter/syntax-tree.h
@@ -1,5 +1,5 @@
/*
- * $Id: syntax-tree.h,v 1.6 2004/06/03 07:36:25 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/epan.c b/epan/epan.c
index 68e425d120..29c3661ca7 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -1,6 +1,6 @@
/* epan.h
*
- * $Id: epan.c,v 1.25 2004/04/16 23:16:28 guy Exp $
+ * $Id$
*
* Ethereal Protocol Analyzer Library
*/
diff --git a/epan/epan.h b/epan/epan.h
index 829baa4e47..990259380c 100644
--- a/epan/epan.h
+++ b/epan/epan.h
@@ -1,6 +1,6 @@
/* epan.h
*
- * $Id: epan.h,v 1.17 2004/04/16 23:16:28 guy Exp $
+ * $Id$
*
* Ethereal Protocol Analyzer Library
*
diff --git a/epan/epan_dissect.h b/epan/epan_dissect.h
index 09c809ce66..160c4b4c4b 100644
--- a/epan/epan_dissect.h
+++ b/epan/epan_dissect.h
@@ -1,6 +1,6 @@
/* epan_dissect.h
*
- * $Id: epan_dissect.h,v 1.2 2002/08/28 20:40:44 jmayer Exp $
+ * $Id$
*
* Ethereal Protocol Analyzer Library
*
diff --git a/epan/except.c b/epan/except.c
index 9f4bd69cf0..3073b7372d 100644
--- a/epan/except.c
+++ b/epan/except.c
@@ -13,7 +13,7 @@
* This source code may be translated into executable form and incorporated
* into proprietary software; there is no requirement for such software to
* contain a copyright notice related to this source.
- * $Id: except.c,v 1.3 2002/08/28 20:40:44 jmayer Exp $
+ * $Id$
* $Name: $
*/
@@ -27,7 +27,7 @@
#define XCEPT_BUFFER_SIZE 1024
#ifdef KAZLIB_RCSID
-static const char rcsid[] = "$Id: except.c,v 1.3 2002/08/28 20:40:44 jmayer Exp $";
+static const char rcsid[] = "$Id$";
#endif
#define group except_group
diff --git a/epan/except.h b/epan/except.h
index 3687252730..459555d210 100644
--- a/epan/except.h
+++ b/epan/except.h
@@ -14,7 +14,7 @@
* into proprietary software; there is no requirement for such software to
* contain a copyright notice related to this source.
*
- * $Id: except.h,v 1.4 2002/08/28 20:40:44 jmayer Exp $
+ * $Id$
* $Name: $
*/
diff --git a/epan/filesystem.c b/epan/filesystem.c
index 2de5a75f51..0966e95ce7 100644
--- a/epan/filesystem.c
+++ b/epan/filesystem.c
@@ -1,7 +1,7 @@
/* filesystem.c
* Filesystem utility routines
*
- * $Id: filesystem.c,v 1.29 2004/01/24 02:01:43 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/filesystem.h b/epan/filesystem.h
index e0d7295a5a..85834d342e 100644
--- a/epan/filesystem.h
+++ b/epan/filesystem.h
@@ -1,7 +1,7 @@
/* filesystem.h
* Filesystem utility definitions
*
- * $Id: filesystem.h,v 1.17 2004/01/24 02:01:43 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/frame_data.c b/epan/frame_data.c
index c1053181a8..092c9642e0 100644
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -1,7 +1,7 @@
/* frame_data.c
* Routines for packet disassembly
*
- * $Id: frame_data.c,v 1.5 2003/07/08 05:29:42 tpot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/frame_data.h b/epan/frame_data.h
index d45a820c3b..7582ad216a 100644
--- a/epan/frame_data.h
+++ b/epan/frame_data.h
@@ -1,7 +1,7 @@
/* frame_data.h
* Definitions for frame_data structures and routines
*
- * $Id: frame_data.h,v 1.13 2004/01/31 04:10:05 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am
index fc6965fe21..2c6893beb5 100644
--- a/epan/ftypes/Makefile.am
+++ b/epan/ftypes/Makefile.am
@@ -1,6 +1,6 @@
# Makefile.am
#
-# $Id: Makefile.am,v 1.8 2004/04/14 18:42:19 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake
index 5f45c4586f..e64f9695e8 100644
--- a/epan/ftypes/Makefile.nmake
+++ b/epan/ftypes/Makefile.nmake
@@ -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.10 2004/06/26 02:16:16 guy Exp $
+# $Id$
include ..\..\config.nmake
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c
index b1dddb073c..a2ac8a1de2 100644
--- a/epan/ftypes/ftype-bytes.c
+++ b/epan/ftypes/ftype-bytes.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-bytes.c,v 1.26 2004/06/06 14:29:07 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/ftypes/ftype-double.c b/epan/ftypes/ftype-double.c
index 7275ac9bee..5c60941d2e 100644
--- a/epan/ftypes/ftype-double.c
+++ b/epan/ftypes/ftype-double.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-double.c,v 1.13 2004/02/27 12:00:31 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index 7990915aa7..a807a08064 100644
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-integer.c,v 1.17 2004/02/27 12:00:31 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/ftypes/ftype-ipv4.c b/epan/ftypes/ftype-ipv4.c
index 3c44aeaaa3..027fa81fcf 100644
--- a/epan/ftypes/ftype-ipv4.c
+++ b/epan/ftypes/ftype-ipv4.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-ipv4.c,v 1.16 2004/02/27 12:00:32 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/ftypes/ftype-none.c b/epan/ftypes/ftype-none.c
index 5230a2a1f3..61e23937c7 100644
--- a/epan/ftypes/ftype-none.c
+++ b/epan/ftypes/ftype-none.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-none.c,v 1.9 2004/02/27 12:00:32 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/ftypes/ftype-pcre.c b/epan/ftypes/ftype-pcre.c
index f658672c03..dea1f04ec5 100755
--- a/epan/ftypes/ftype-pcre.c
+++ b/epan/ftypes/ftype-pcre.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-pcre.c,v 1.3 2004/02/27 12:00:32 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c
index 1b757f447c..fcbc0b4daa 100644
--- a/epan/ftypes/ftype-string.c
+++ b/epan/ftypes/ftype-string.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-string.c,v 1.23 2004/05/09 08:25:52 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c
index 0616fdeec3..9f6c6c177b 100644
--- a/epan/ftypes/ftype-time.c
+++ b/epan/ftypes/ftype-time.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-time.c,v 1.23 2004/02/27 12:00:32 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/ftypes/ftype-tvbuff.c b/epan/ftypes/ftype-tvbuff.c
index 8206f75024..7ee00a6365 100644
--- a/epan/ftypes/ftype-tvbuff.c
+++ b/epan/ftypes/ftype-tvbuff.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-tvbuff.c,v 1.18 2004/02/27 12:00:32 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/ftypes/ftypes-int.h b/epan/ftypes/ftypes-int.h
index f5c464f9a8..3f0411c7f0 100644
--- a/epan/ftypes/ftypes-int.h
+++ b/epan/ftypes/ftypes-int.h
@@ -1,5 +1,5 @@
/*
- * $Id: ftypes-int.h,v 1.12 2003/12/10 21:12:02 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/ftypes/ftypes.c b/epan/ftypes/ftypes.c
index 211d33accf..ca0ea446ec 100644
--- a/epan/ftypes/ftypes.c
+++ b/epan/ftypes/ftypes.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftypes.c,v 1.26 2004/07/04 02:29:43 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h
index 6796920790..93050f4f78 100644
--- a/epan/ftypes/ftypes.h
+++ b/epan/ftypes/ftypes.h
@@ -1,7 +1,7 @@
/* ftypes.h
* Definitions for field types
*
- * $Id: ftypes.h,v 1.35 2004/07/04 02:29:43 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/gdebug.h b/epan/gdebug.h
index 676b931411..fee2d64d37 100644
--- a/epan/gdebug.h
+++ b/epan/gdebug.h
@@ -2,7 +2,7 @@
*
* Useful macro for use during development.
*
- * $Id: gdebug.h,v 1.3 2002/08/28 20:40:44 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/inet_aton.h b/epan/inet_aton.h
index 41a8826625..deb7008c99 100644
--- a/epan/inet_aton.h
+++ b/epan/inet_aton.h
@@ -1,6 +1,6 @@
/* inet_aton.h
*
- * $Id: inet_aton.h,v 1.2 2002/08/28 20:40:44 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/inet_ntop.c b/epan/inet_ntop.c
index a746a480f1..65b4db3a44 100644
--- a/epan/inet_ntop.c
+++ b/epan/inet_ntop.c
@@ -20,7 +20,7 @@
#endif
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: inet_ntop.c,v 1.7 2002/10/29 00:28:10 guy Exp $";
+static char rcsid[] = "$Id$";
#endif /* LIBC_SCCS and not lint */
#ifdef HAVE_SYS_PARAM_H
diff --git a/epan/inet_pton.c b/epan/inet_pton.c
index 99426e5178..eb52c31c7c 100644
--- a/epan/inet_pton.c
+++ b/epan/inet_pton.c
@@ -20,7 +20,7 @@
#endif
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: inet_pton.c,v 1.5 2002/10/29 00:28:10 guy Exp $";
+static char rcsid[] = "$Id$";
#endif /* LIBC_SCCS and not lint */
#ifdef HAVE_SYS_PARAM_H
diff --git a/epan/inet_v6defs.h b/epan/inet_v6defs.h
index 2510605e7c..1fe7f14223 100644
--- a/epan/inet_v6defs.h
+++ b/epan/inet_v6defs.h
@@ -1,6 +1,6 @@
/* inet_v6defs.h
*
- * $Id: inet_v6defs.h,v 1.3 2003/02/28 05:09:50 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/int-64bit.c b/epan/int-64bit.c
index 70d14858fe..060003d841 100644
--- a/epan/int-64bit.c
+++ b/epan/int-64bit.c
@@ -2,7 +2,7 @@
* Routines for handling of 64-bit integers
* 2001 Ronnie Sahlberg
*
- * $Id: int-64bit.c,v 1.3 2002/08/28 20:40:44 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/int-64bit.h b/epan/int-64bit.h
index 40f65fb6f0..bd15a37720 100644
--- a/epan/int-64bit.h
+++ b/epan/int-64bit.h
@@ -1,7 +1,7 @@
/* int-64bit.h
* Handling of 64-bit integers
*
- * $Id: int-64bit.h,v 1.2 2002/08/28 20:40:44 jmayer Exp $
+ * $Id$
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/epan/ipv4.c b/epan/ipv4.c
index 45de381d20..7dfae9761b 100644
--- a/epan/ipv4.c
+++ b/epan/ipv4.c
@@ -5,7 +5,7 @@
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: ipv4.c,v 1.7 2004/02/01 02:35:29 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/ipv4.h b/epan/ipv4.h
index 6b7e135998..4a63db6142 100644
--- a/epan/ipv4.h
+++ b/epan/ipv4.h
@@ -5,7 +5,7 @@
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: ipv4.h,v 1.5 2003/07/31 04:18:00 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/ipv6-utils.h b/epan/ipv6-utils.h
index 0cdeff9e1b..129bd58e96 100644
--- a/epan/ipv6-utils.h
+++ b/epan/ipv6-utils.h
@@ -1,7 +1,7 @@
/* ipv6-utils.h
* Definitions for IPv6 packet disassembly
*
- * $Id: ipv6-utils.h,v 1.2 2002/08/28 20:40:44 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/nstime.h b/epan/nstime.h
index 2cadd521d1..188b96b450 100644
--- a/epan/nstime.h
+++ b/epan/nstime.h
@@ -1,7 +1,7 @@
/* nstime.h
* Definition of data structure to hold time values with nanosecond resolution
*
- * $Id: nstime.h,v 1.2 2002/08/28 20:40:44 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/osi-utils.c b/epan/osi-utils.c
index d62b2fac9e..1f1c3f339f 100644
--- a/epan/osi-utils.c
+++ b/epan/osi-utils.c
@@ -2,7 +2,7 @@
* Routines for ISO/OSI network and transport protocol packet disassembly
* Main entrance point and common functions
*
- * $Id: osi-utils.c,v 1.14 2003/11/20 19:05:40 guy Exp $
+ * $Id$
* Laurent Deniel <laurent.deniel@free.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
diff --git a/epan/osi-utils.h b/epan/osi-utils.h
index 198c3e4821..bfdd30bba5 100644
--- a/epan/osi-utils.h
+++ b/epan/osi-utils.h
@@ -1,6 +1,6 @@
/* osi-utils.h
*
- * $Id: osi-utils.h,v 1.5 2003/08/26 01:00:29 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/packet.c b/epan/packet.c
index 7f3ddaf343..cbe03dbee6 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -1,7 +1,7 @@
/* packet.c
* Routines for packet disassembly
*
- * $Id: packet.c,v 1.104 2004/04/23 19:47:11 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/packet.h b/epan/packet.h
index 3476744e3a..6d52783431 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -1,7 +1,7 @@
/* packet.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet.h,v 1.74 2004/06/19 00:07:23 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/packet_info.h b/epan/packet_info.h
index d0f4321342..e0557e9c77 100644
--- a/epan/packet_info.h
+++ b/epan/packet_info.h
@@ -1,7 +1,7 @@
/* packet_info.h
* Definitions for packet info structures and routines
*
- * $Id: packet_info.h,v 1.41 2004/06/25 06:31:47 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/pint.h b/epan/pint.h
index 353ad31f48..8e1f5e05f3 100644
--- a/epan/pint.h
+++ b/epan/pint.h
@@ -2,7 +2,7 @@
* Definitions for extracting and translating integers safely and portably
* via pointers.
*
- * $Id: pint.h,v 1.8 2003/07/29 20:50:39 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/plugins.c b/epan/plugins.c
index de32b7ba99..588895eff5 100644
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -1,7 +1,7 @@
/* plugins.c
* plugin routines
*
- * $Id: plugins.c,v 1.85 2004/06/30 08:21:57 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/plugins.h b/epan/plugins.h
index 864b9fdf06..e314f45f0c 100644
--- a/epan/plugins.h
+++ b/epan/plugins.h
@@ -1,7 +1,7 @@
/* plugins.h
* definitions for plugins structures
*
- * $Id: plugins.h,v 1.11 2004/05/20 13:48:25 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/proto.c b/epan/proto.c
index 1cc57e6f6c..5ba424ed58 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -1,7 +1,7 @@
/* proto.c
* Routines for protocol tree
*
- * $Id: proto.c,v 1.136 2004/07/09 21:52:03 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/proto.h b/epan/proto.h
index 2cacd6139c..28ac125db5 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -1,7 +1,7 @@
/* proto.h
* Definitions for protocol display
*
- * $Id: proto.h,v 1.68 2004/05/15 00:52:02 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/report_err.h b/epan/report_err.h
index d2659ac1f5..f3440bb141 100644
--- a/epan/report_err.h
+++ b/epan/report_err.h
@@ -2,7 +2,7 @@
* Declarations of routines for dissectors to use to report errors to
* the user (e.g., problems with preference settings)
*
- * $Id: report_err.h,v 1.2 2004/04/16 23:16:28 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/resolv.c b/epan/resolv.c
index 72f0cbbb20..7d7acbbb51 100644
--- a/epan/resolv.c
+++ b/epan/resolv.c
@@ -1,7 +1,7 @@
/* resolv.c
* Routines for network object lookup
*
- * $Id: resolv.c,v 1.44 2004/06/25 07:00:54 jmayer Exp $
+ * $Id$
*
* Laurent Deniel <laurent.deniel@free.fr>
*
diff --git a/epan/resolv.h b/epan/resolv.h
index 8d5c810111..65ad162a3b 100644
--- a/epan/resolv.h
+++ b/epan/resolv.h
@@ -1,7 +1,7 @@
/* resolv.h
* Definitions for network object lookup
*
- * $Id: resolv.h,v 1.18 2004/06/25 07:00:54 jmayer Exp $
+ * $Id$
*
* Laurent Deniel <laurent.deniel@free.fr>
*
diff --git a/epan/slab.h b/epan/slab.h
index a2182eb3e1..aecb20c7e2 100644
--- a/epan/slab.h
+++ b/epan/slab.h
@@ -1,7 +1,7 @@
/* slab.h
* Definitions for very simple slab handling
*
- * $Id: slab.h,v 1.4 2004/07/04 02:29:43 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/sna-utils.c b/epan/sna-utils.c
index 2c12ea272f..d9a4b93898 100644
--- a/epan/sna-utils.c
+++ b/epan/sna-utils.c
@@ -2,7 +2,7 @@
* Routines for SNA
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: sna-utils.c,v 1.5 2003/08/26 01:00:30 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/sna-utils.h b/epan/sna-utils.h
index 281ea62b00..d8125edb28 100644
--- a/epan/sna-utils.h
+++ b/epan/sna-utils.h
@@ -1,7 +1,7 @@
/* sna-utils.h
* Definitions for SNA dissection.
*
- * $Id: sna-utils.h,v 1.4 2003/08/26 01:00:30 guy Exp $
+ * $Id$
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/epan/strutil.c b/epan/strutil.c
index b2b72457b7..b9f068f406 100644
--- a/epan/strutil.c
+++ b/epan/strutil.c
@@ -1,7 +1,7 @@
/* strutil.c
* String utility routines
*
- * $Id: strutil.c,v 1.21 2004/06/06 14:29:07 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/strutil.h b/epan/strutil.h
index 4f4e8bcca9..17136f3d72 100644
--- a/epan/strutil.h
+++ b/epan/strutil.h
@@ -1,7 +1,7 @@
/* strutil.h
* String utility definitions
*
- * $Id: strutil.h,v 1.16 2004/06/06 14:29:07 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/timestamp.c b/epan/timestamp.c
index 8be46ef9c0..d948fda3d5 100755
--- a/epan/timestamp.c
+++ b/epan/timestamp.c
@@ -1,7 +1,7 @@
/* timestamp.c
* Routines for timestamp type setting.
*
- * $Id: timestamp.c,v 1.2 2004/03/20 08:32:03 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/timestamp.h b/epan/timestamp.h
index 60bbd8d3e5..706fba4ce9 100644
--- a/epan/timestamp.h
+++ b/epan/timestamp.h
@@ -1,7 +1,7 @@
/* timestamp.h
* Defines for packet timestamps
*
- * $Id: timestamp.h,v 1.5 2004/03/18 19:04:32 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/to_str.c b/epan/to_str.c
index 8de4d93775..cd8597c8b6 100644
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -1,7 +1,7 @@
/* to_str.c
* Routines for utilities to convert various other types to strings.
*
- * $Id: to_str.c,v 1.45 2004/06/16 23:09:43 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/to_str.h b/epan/to_str.h
index bf71418871..56e1460d67 100644
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -1,7 +1,7 @@
/* to_str.h
* Definitions for utilities to convert various other types to strings.
*
- * $Id: to_str.h,v 1.22 2004/01/10 12:50:19 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/epan/tvbtest.c b/epan/tvbtest.c
index 0d0e104d6d..80e624cc58 100644
--- a/epan/tvbtest.c
+++ b/epan/tvbtest.c
@@ -2,7 +2,7 @@
*
* tvbtest : tvbtest.o tvbuff.o except.o
*
- * $Id: tvbtest.c,v 1.3 2002/08/28 20:40:45 jmayer Exp $
+ * $Id$
*
* Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
*
diff --git a/epan/tvbuff.c b/epan/tvbuff.c
index 43536e36db..c28176f928 100644
--- a/epan/tvbuff.c
+++ b/epan/tvbuff.c
@@ -9,7 +9,7 @@
* the data of a backing tvbuff, or can be a composite of
* other tvbuffs.
*
- * $Id: tvbuff.c,v 1.65 2004/05/10 22:14:07 obiot Exp $
+ * $Id$
*
* Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
*
diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index 7fff54d325..d286ae64f0 100644
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -9,7 +9,7 @@
* the data of a backing tvbuff, or can be a composite of
* other tvbuffs.
*
- * $Id: tvbuff.h,v 1.42 2004/05/05 06:55:09 obiot Exp $
+ * $Id$
*
* Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
*
diff --git a/epan/value_string.c b/epan/value_string.c
index f5c1cbe5a3..9aa5858a66 100644
--- a/epan/value_string.c
+++ b/epan/value_string.c
@@ -1,7 +1,7 @@
/* value_string.c
* Routines for value_strings
*
- * $Id: value_string.c,v 1.5 2003/12/01 23:41:44 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/epan/value_string.h b/epan/value_string.h
index c2680d4c75..85fe2c1c22 100644
--- a/epan/value_string.h
+++ b/epan/value_string.h
@@ -1,7 +1,7 @@
/* value_string.h
* Definitions for value_string structures and routines
*
- * $Id: value_string.h,v 1.6 2004/05/07 11:34:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/ethereal_be.py b/ethereal_be.py
index 4863137ef3..6a30a40d60 100644
--- a/ethereal_be.py
+++ b/ethereal_be.py
@@ -1,6 +1,6 @@
# -*- python -*-
#
-# $Id: ethereal_be.py,v 1.6 2001/11/19 22:58:49 guy Exp $
+# $Id$
#
# File : ethereal_be.py
#
diff --git a/ethereal_gen.py b/ethereal_gen.py
index 78bd1fca28..2dacf1eaf4 100644
--- a/ethereal_gen.py
+++ b/ethereal_gen.py
@@ -1,6 +1,6 @@
# -*- python -*-
#
-# $Id: ethereal_gen.py,v 1.29 2004/02/20 13:51:30 jmayer Exp $
+# $Id$
#
# ethereal_gen.py (part of idl2eth)
#
diff --git a/etypes.h b/etypes.h
index ce5032498e..45f1856020 100644
--- a/etypes.h
+++ b/etypes.h
@@ -1,7 +1,7 @@
/* etypes.h
* Defines ethernet packet types, similar to tcpdump's ethertype.h
*
- * $Id: etypes.h,v 1.39 2004/04/07 06:04:22 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/file.c b/file.c
index 24f46b8100..6983ff11d1 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
/* file.c
* File I/O routines
*
- * $Id: file.c,v 1.389 2004/07/08 11:07:29 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/file.h b/file.h
index f7743a84a1..c161fcc590 100644
--- a/file.h
+++ b/file.h
@@ -1,7 +1,7 @@
/* file.h
* Definitions for file structures and routines
*
- * $Id: file.h,v 1.119 2004/07/08 10:36:26 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/filters.c b/filters.c
index aa58bcad4c..2a695f1956 100644
--- a/filters.c
+++ b/filters.c
@@ -1,7 +1,7 @@
/* filters.c
* Code for reading and writing the filters file.
*
- * $Id: filters.c,v 1.16 2003/12/04 00:45:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/filters.h b/filters.h
index cbea1b9c56..d059c8cc80 100644
--- a/filters.h
+++ b/filters.h
@@ -1,7 +1,7 @@
/* filters.c
* Declarations of routines for reading and writing the filters file.
*
- * $Id: filters.h,v 1.4 2003/12/04 00:45:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/follow.c b/follow.c
index 10dd121e60..19e14303b2 100644
--- a/follow.c
+++ b/follow.c
@@ -1,6 +1,6 @@
/* follow.c
*
- * $Id: follow.c,v 1.34 2004/01/23 01:42:45 jmayer Exp $
+ * $Id$
*
* Copyright 1998 Mike Hall <mlh@io.com>
*
diff --git a/follow.h b/follow.h
index 3510bb2d8c..013519d43e 100644
--- a/follow.h
+++ b/follow.h
@@ -1,6 +1,6 @@
/* follow.h
*
- * $Id: follow.h,v 1.15 2004/05/09 10:03:37 guy Exp $
+ * $Id$
*
* Copyright 1998 Mike Hall <mlh@io.com>
*
diff --git a/format-oid.h b/format-oid.h
index ce6f79d2f4..07c33cb231 100644
--- a/format-oid.h
+++ b/format-oid.h
@@ -1,7 +1,7 @@
/* format-oid.h
* Declare routine for formatting OIDs
*
- * $Id: format-oid.h,v 1.3 2003/09/08 19:40:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/g711.c b/g711.c
index 8d0b419898..7fddaed43a 100644
--- a/g711.c
+++ b/g711.c
@@ -1,5 +1,5 @@
/*
- * $Id: g711.c,v 1.3 2003/03/10 19:58:47 guy Exp $
+ * $Id$
*
* This source code is a product of Sun Microsystems, Inc. and is provided
* for unrestricted use. Users may copy or modify this source code without
diff --git a/g711.h b/g711.h
index 958c314d2a..84ac202e7a 100644
--- a/g711.h
+++ b/g711.h
@@ -3,7 +3,7 @@
*
* Definitions for routines for u-law, A-law and linear PCM conversions
*
- * $Id: g711.h,v 1.2 2003/03/06 21:57:17 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/getopt.c b/getopt.c
index 241ed1328a..3f7390672a 100644
--- a/getopt.c
+++ b/getopt.c
@@ -1,6 +1,6 @@
/* Getopt for GNU.
- $Id: getopt.c,v 1.4 2002/08/28 21:00:06 jmayer Exp $
+ $Id$
NOTE: getopt is now part of the C library, so if you don't know what
"Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
diff --git a/globals.h b/globals.h
index fcf5d15860..dabc2ae263 100644
--- a/globals.h
+++ b/globals.h
@@ -1,7 +1,7 @@
/* globals.h
* Global defines, etc.
*
- * $Id: globals.h,v 1.34 2004/06/01 17:37:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/greproto.h b/greproto.h
index 01150ae3a9..367751bed5 100644
--- a/greproto.h
+++ b/greproto.h
@@ -10,7 +10,7 @@
* definition for them; when this file is empty, get rid of all includes
* of it, and get rid of it.
*
- * $Id: greproto.h,v 1.3 2002/08/28 21:00:06 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8f2b6e2cc5..928f53b43a 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for the GTK interface routines for Ethereal
#
-# $Id: Makefile.am,v 1.107 2004/07/09 23:02:37 guy Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 6b92a0b343..58d776b670 100644
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -3,7 +3,7 @@
# a) common to both files and
# b) portable between both files
#
-# $Id: Makefile.common,v 1.16 2004/06/21 17:25:19 ulfl Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 7856f18de0..eca004a5b7 100644
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -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.79 2004/07/07 16:23:13 ulfl Exp $
+# $Id$
include ..\config.nmake
diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c
index 4c99412519..a98b37279a 100644
--- a/gtk/about_dlg.c
+++ b/gtk/about_dlg.c
@@ -1,6 +1,6 @@
/* about_dlg.c
*
- * $Id: about_dlg.c,v 1.23 2004/07/07 07:01:37 guy Exp $
+ * $Id$
*
* Ulf Lamping <ulf.lamping@web.de>
*
diff --git a/gtk/about_dlg.h b/gtk/about_dlg.h
index 9955c21f18..28a4bfbe1f 100644
--- a/gtk/about_dlg.h
+++ b/gtk/about_dlg.h
@@ -1,7 +1,7 @@
/* about_dlg.h
* Declarations of routines for the "About" dialog
*
- * $Id: about_dlg.h,v 1.6 2004/07/04 12:15:41 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c
index 8ba09badd3..68d9e90e16 100644
--- a/gtk/ansi_a_stat.c
+++ b/gtk/ansi_a_stat.c
@@ -5,7 +5,7 @@
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: ansi_a_stat.c,v 1.18 2004/05/23 23:24:05 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c
index e51993044d..6b334ccdfc 100644
--- a/gtk/ansi_map_stat.c
+++ b/gtk/ansi_map_stat.c
@@ -5,7 +5,7 @@
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: ansi_map_stat.c,v 1.23 2004/05/26 11:37:36 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c
index cf313cc562..6af60e1b8f 100644
--- a/gtk/bootp_stat.c
+++ b/gtk/bootp_stat.c
@@ -1,7 +1,7 @@
/* bootp_stat.c
* boop_stat 2003 Jean-Michel FAYARD
*
- * $Id: bootp_stat.c,v 1.27 2004/05/23 23:24:05 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/capture_combo_utils.c b/gtk/capture_combo_utils.c
index 881130baeb..a49cb9bba3 100644
--- a/gtk/capture_combo_utils.c
+++ b/gtk/capture_combo_utils.c
@@ -1,7 +1,7 @@
/* capture_combo_utils.c
* Utilities for combo box of interface names
*
- * $Id: capture_combo_utils.c,v 1.4 2003/12/21 12:17:58 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/capture_combo_utils.h b/gtk/capture_combo_utils.h
index 337db59861..d87ceead1f 100644
--- a/gtk/capture_combo_utils.h
+++ b/gtk/capture_combo_utils.h
@@ -1,7 +1,7 @@
/* capture_combo_utils.c
* Declarations of tilities for combo box of interface names
*
- * $Id: capture_combo_utils.h,v 1.2 2004/06/01 20:28:04 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 9c42786c99..4b9f3a335e 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -1,1715 +1,1715 @@
-/* capture_dlg.c
- * Routines for packet capture windows
- *
- * $Id: capture_dlg.c,v 1.138 2004/07/13 07:15:43 guy Exp $
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_LIBPCAP
-
-#include <pcap.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include <epan/packet.h>
-#include "capture.h"
-#include "globals.h"
-#include <epan/resolv.h>
-#include "main.h"
-#include "ui_util.h"
-#include "capture_dlg.h"
-#include "filter_prefs.h"
-#include "simple_dialog.h"
-#include "dlg_utils.h"
-#include "pcap-util.h"
-#include "capture_combo_utils.h"
-#include "prefs.h"
-#include "ringbuffer.h"
-#include <epan/filesystem.h>
-#include "compat_macros.h"
-#include "file_dlg.h"
-#include "help_dlg.h"
-#include "gtkglobals.h"
-
-#ifdef _WIN32
-#include "capture-wpcap.h"
-#endif
-
-/* Capture callback data keys */
-#define E_CAP_IFACE_KEY "cap_iface"
-#define E_CAP_IFACE_IP_KEY "cap_iface_ip"
-#define E_CAP_SNAP_CB_KEY "cap_snap_cb"
-#define E_CAP_LT_OM_KEY "cap_lt_om"
-#define E_CAP_LT_OM_LABEL_KEY "cap_lt_om_label"
-#ifdef _WIN32
-#define E_CAP_BUFFER_SIZE_SB_KEY "cap_buffer_size_sb"
-#endif
-#define E_CAP_SNAP_SB_KEY "cap_snap_sb"
-#define E_CAP_PROMISC_KEY "cap_promisc"
-#define E_CAP_FILT_KEY "cap_filter_te"
-#define E_CAP_FILE_TE_KEY "cap_file_te"
-#define E_CAP_MULTI_FILES_ON_CB_KEY "cap_multi_files_on_cb"
-#define E_CAP_RING_FILESIZE_CB_KEY "cap_ring_filesize_cb"
-#define E_CAP_RING_FILESIZE_SB_KEY "cap_ring_filesize_sb"
-#define E_CAP_RING_FILESIZE_OM_KEY "cap_ring_filesize_om"
-#define E_CAP_FILE_DURATION_CB_KEY "cap_file_duration_cb"
-#define E_CAP_FILE_DURATION_SB_KEY "cap_file_duration_sb"
-#define E_CAP_FILE_DURATION_OM_KEY "cap_file_duration_om"
-#define E_CAP_RING_NBF_CB_KEY "cap_ring_nbf_cb"
-#define E_CAP_RING_NBF_SB_KEY "cap_ring_nbf_sb"
-#define E_CAP_RING_NBF_LB_KEY "cap_ring_nbf_lb"
-#define E_CAP_STOP_FILES_CB_KEY "cap_stop_files_cb"
-#define E_CAP_STOP_FILES_SB_KEY "cap_stop_files_sb"
-#define E_CAP_STOP_FILES_LB_KEY "cap_stop_files_lb"
-#define E_CAP_SYNC_KEY "cap_sync"
-#define E_CAP_AUTO_SCROLL_KEY "cap_auto_scroll"
-#define E_CAP_HIDE_INFO_KEY "cap_hide_info"
-#define E_CAP_STOP_PACKETS_CB_KEY "cap_stop_packets_cb"
-#define E_CAP_STOP_PACKETS_SB_KEY "cap_stop_packets_sb"
-#define E_CAP_STOP_PACKETS_LB_KEY "cap_stop_packets_lb"
-#define E_CAP_STOP_FILESIZE_CB_KEY "cap_stop_filesize_cb"
-#define E_CAP_STOP_FILESIZE_SB_KEY "cap_stop_filesize_sb"
-#define E_CAP_STOP_FILESIZE_OM_KEY "cap_stop_filesize_om"
-#define E_CAP_STOP_DURATION_CB_KEY "cap_stop_duration_cb"
-#define E_CAP_STOP_DURATION_SB_KEY "cap_stop_duration_sb"
-#define E_CAP_STOP_DURATION_OM_KEY "cap_stop_duration_om"
-#define E_CAP_M_RESOLVE_KEY "cap_m_resolve"
-#define E_CAP_N_RESOLVE_KEY "cap_n_resolve"
-#define E_CAP_T_RESOLVE_KEY "cap_t_resolve"
-
-#define E_CAP_OM_LT_VALUE_KEY "cap_om_lt_value"
-
-static void
-capture_prep_file_cb(GtkWidget *file_bt, GtkWidget *file_te);
-
-static void
-select_link_type_cb(GtkWidget *w, gpointer data);
-
-static void
-capture_prep_adjust_sensitivity(GtkWidget *tb, gpointer parent_w);
-
-static void
-capture_prep_ok_cb(GtkWidget *ok_bt, gpointer parent_w);
-
-static void
-capture_prep_destroy_cb(GtkWidget *win, gpointer user_data);
-
-static void
-capture_prep_interface_changed_cb(GtkWidget *entry, gpointer parent_w);
-
-void
-capture_stop_cb(GtkWidget *w _U_, gpointer d _U_)
-{
- capture_stop();
-}
-
-/*
- * Given text that contains an interface name possibly prefixed by an
- * interface description, extract the interface name.
- */
-static char *
-get_if_name(char *if_text)
-{
- char *if_name;
-
-#ifdef WIN32
- /*
- * We cannot assume that the interface name doesn't contain a space;
- * some names on Windows OT do.
- *
- * We also can't assume it begins with "\Device\", either, as, on
- * Windows OT, WinPcap doesn't put "\Device\" in front of the name.
- *
- * As I remember, we can't assume that the interface description
- * doesn't contain a colon, either; I think some do.
- *
- * We can probably assume that the interface *name* doesn't contain
- * a colon, however; if any interface name does contain a colon on
- * Windows, it'll be time to just get rid of the damn interface
- * descriptions in the drop-down list, have just the names in the
- * drop-down list, and have a "Browse..." button to browse for interfaces,
- * with names, descriptions, IP addresses, blah blah blah available when
- * possible.
- *
- * So we search backwards for a colon. If we don't find it, just
- * return the entire string; otherwise, skip the colon and any blanks
- * after it, and return that string.
- */
- if_name = if_text + strlen(if_text);
- for (;;) {
- if (if_name == if_text) {
- /* We're at the beginning of the string; return it. */
- break;
- }
- if_name--;
- if (*if_name == ':') {
- /*
- * We've found a colon.
- * Unfortunately, a colon is used in the string "rpcap://",
- * which is used in case of a remote capture.
- * So we'll check to make sure the colon isn't followed by "//";
- * it'll be followed by a blank if it separates the description
- * and the interface name. (We don't wire in "rpcap", in case we
- * support other protocols in the same syntax.)
- */
- if (strncmp(if_name, "://", 3) != 0) {
- /*
- * OK, we've found a colon not followed by "//". Skip blanks
- * following it.
- */
- if_name++;
- while (*if_name == ' ')
- if_name++;
- break;
- }
- }
- /* Keep looking for a colon not followed by "//". */
- }
-#else
- /*
- * There's a space between the interface description and name, and
- * the interface name shouldn't have a space in it (it doesn't, on
- * UNIX systems); look backwards in the string for a space.
- *
- * (An interface name might, however, contain a colon in it, which
- * is why we don't use the colon search on UNIX.)
- */
- if_name = strrchr(if_text, ' ');
- if (if_name == NULL) {
- if_name = if_text;
- } else {
- if_name++;
- }
-#endif
- return if_name;
-}
-
-/*
- * Keep a static pointer to the current "Capture Options" window, if
- * any, so that if somebody tries to do "Capture:Start" while there's
- * already a "Capture Options" window up, we just pop up the existing
- * one, rather than creating a new one.
- */
-static GtkWidget *cap_open_w;
-
-
-/* From tcptraceroute, convert a numeric IP address to a string */
-/* XXX - this functionality is already somewhere in our code */
-#define IPTOSBUFFERS 12
-char *iptos(u_long in)
-{
- static char output[IPTOSBUFFERS][3*4+3+1];
- static short which;
- u_char *p;
-
- p = (u_char *)&in;
- which = (which + 1 == IPTOSBUFFERS ? 0 : which + 1);
- sprintf(output[which], "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
- return output[which];
-}
-
-
-static void
-set_link_type_list(GtkWidget *linktype_om, GtkWidget *entry)
-{
- gchar *entry_text;
- gchar *if_text;
- gchar *if_name;
- GList *if_list;
- GList *if_entry;
- if_info_t *if_info;
- GList *lt_list;
- int err;
- char err_buf[PCAP_ERRBUF_SIZE];
- GtkWidget *lt_menu, *lt_menu_item;
- GList *lt_entry;
- data_link_info_t *data_link_info;
- gchar *linktype_menu_label;
- guint num_supported_link_types;
- GtkWidget *linktype_lb = OBJECT_GET_DATA(linktype_om, E_CAP_LT_OM_LABEL_KEY);
- GtkWidget *if_ip_lb;
- GString *ip_str = g_string_new("IP address: ");
- int ips = 0;
- GSList *curr_ip;
-
- lt_menu = gtk_menu_new();
- entry_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
- if_text = g_strstrip(entry_text);
- if_name = get_if_name(if_text);
-
- /*
- * If the interface name is in the list of known interfaces, get
- * its list of link-layer types and set the option menu to display it.
- *
- * If it's not, don't bother - the user might be in the middle of
- * editing the list, or it might be a remote device in which case
- * getting the list could take an arbitrarily-long period of time.
- * The list currently won't contain any remote devices (as
- * "pcap_findalldevs()" doesn't know about remote devices, and neither
- * does the code we use if "pcap_findalldevs()" isn't available), but
- * should contain all the local devices on which you can capture.
- */
- lt_list = NULL;
- if (*if_name != '\0') {
- /*
- * Try to get the list of known interfaces.
- */
- if_list = get_interface_list(&err, err_buf);
- if (if_list != NULL) {
- /*
- * We have the list - check it.
- */
- for (if_entry = if_list; if_entry != NULL;
- if_entry = g_list_next(if_entry)) {
- if_info = if_entry->data;
- if (strcmp(if_info->name, if_name) == 0) {
- /*
- * It's in the list.
- * Get the list of link-layer types for it.
- */
- lt_list = get_pcap_linktype_list(if_name, err_buf);
-
- /* create string of list of IP addresses of this interface */
- for( ; curr_ip = g_slist_nth(if_info->ip_addr, ips); ips++) {
- if (ips != 0) {
- g_string_append(ip_str, ", ");
- }
-
- g_string_append(ip_str, iptos(*((guint32 *)curr_ip->data)));
- }
-
- if(if_info->loopback) {
- g_string_append(ip_str, " (loopback)");
- }
- }
- }
- free_interface_list(if_list);
- }
- }
- g_free(entry_text);
- num_supported_link_types = 0;
- for (lt_entry = lt_list; lt_entry != NULL; lt_entry = g_list_next(lt_entry)) {
- data_link_info = lt_entry->data;
- if (data_link_info->description != NULL) {
- lt_menu_item = gtk_menu_item_new_with_label(data_link_info->description);
- OBJECT_SET_DATA(lt_menu_item, E_CAP_LT_OM_KEY, linktype_om);
- SIGNAL_CONNECT(lt_menu_item, "activate", select_link_type_cb,
- GINT_TO_POINTER(data_link_info->dlt));
- num_supported_link_types++;
- } else {
- /* Not supported - tell them about it but don't let them select it. */
- linktype_menu_label = g_strdup_printf("%s (not supported)",
- data_link_info->name);
- lt_menu_item = gtk_menu_item_new_with_label(linktype_menu_label);
- g_free(linktype_menu_label);
- gtk_widget_set_sensitive(lt_menu_item, FALSE);
- }
- gtk_menu_append(GTK_MENU(lt_menu), lt_menu_item);
- }
- if (lt_list != NULL)
- free_pcap_linktype_list(lt_list);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(linktype_om), lt_menu);
- gtk_widget_set_sensitive(linktype_lb, num_supported_link_types >= 2);
- gtk_widget_set_sensitive(linktype_om, num_supported_link_types >= 2);
-
- if_ip_lb = OBJECT_GET_DATA(linktype_om, E_CAP_IFACE_KEY);
- if(ips == 0) {
- g_string_append(ip_str, "unknown");
- }
- gtk_label_set_text(GTK_LABEL(if_ip_lb), ip_str->str);
- g_string_free(ip_str, TRUE);
-}
-
-
-#define TIME_UNIT_SECOND 0
-#define TIME_UNIT_MINUTE 1
-#define TIME_UNIT_HOUR 2
-#define TIME_UNIT_DAY 3
-#define MAX_TIME_UNITS 4
-static char *time_unit_name[MAX_TIME_UNITS] = {
- "second(s)",
- "minute(s)",
- "hour(s)",
- "day(s)",
-};
-
-static GtkWidget *time_unit_option_menu_new(guint32 value) {
- GtkWidget *unit_om, *menu, *menu_item;
- int i;
-
- unit_om=gtk_option_menu_new();
- menu=gtk_menu_new();
- for(i=0;i<MAX_TIME_UNITS;i++){
- menu_item=gtk_menu_item_new_with_label(time_unit_name[i]);
- OBJECT_SET_DATA(menu_item, "time_unit", GINT_TO_POINTER(i));
- gtk_menu_append(GTK_MENU(menu), menu_item);
- }
-
- /* the selected menu item can't be changed, once the option_menu
- is created, so set the matching menu item now */
- /* days */
- if(value >= 60 * 60 * 24) {
- gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_DAY);
- } else {
- /* hours */
- if(value >= 60 * 60) {
- gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_HOUR);
- } else {
- /* minutes */
- if(value >= 60) {
- gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_MINUTE);
- } else {
- /* seconds */
- gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_SECOND);
- }
- }
- }
-
- gtk_option_menu_set_menu(GTK_OPTION_MENU(unit_om), menu);
-
- return unit_om;
-}
-
-static guint32 time_unit_option_menu_convert_value(
-guint32 value)
-{
- /* days */
- if(value >= 60 * 60 * 24) {
- return value / (60 * 60 * 24);
- }
-
- /* hours */
- if(value >= 60 * 60) {
- return value / (60 * 60);
- }
-
- /* minutes */
- if(value >= 60) {
- return value / 60;
- }
-
- /* seconds */
- return value;
-}
-
-static guint32 time_unit_option_menu_get_value(
-GtkWidget *unit_om,
-guint32 value)
-{
- GtkWidget *menu, *menu_item;
- int unit;
-
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(unit_om));
- menu_item = gtk_menu_get_active(GTK_MENU(menu));
- unit = GPOINTER_TO_INT(OBJECT_GET_DATA(menu_item, "time_unit"));
-
-
- switch(unit) {
- case(TIME_UNIT_SECOND):
- return value;
- break;
- case(TIME_UNIT_MINUTE):
- return value * 60;
- break;
- case(TIME_UNIT_HOUR):
- return value * 60 * 60;
- break;
- case(TIME_UNIT_DAY):
- return value * 60 * 60 * 24;
- break;
- default:
- g_assert_not_reached();
- return 0;
- }
-}
-
-
-#define SIZE_UNIT_BYTES 0
-#define SIZE_UNIT_KILOBYTES 1
-#define SIZE_UNIT_MEGABYTES 2
-#define SIZE_UNIT_GIGABYTES 3
-#define MAX_SIZE_UNITS 4
-static char *size_unit_name[MAX_SIZE_UNITS] = {
- "byte(s)",
- "kilobyte(s)",
- "megabyte(s)",
- "gigabyte(s)",
-};
-
-static GtkWidget *size_unit_option_menu_new(guint32 value) {
- GtkWidget *unit_om, *menu, *menu_item;
- int i;
-
- unit_om=gtk_option_menu_new();
- menu=gtk_menu_new();
- for(i=0;i<MAX_SIZE_UNITS;i++){
- menu_item=gtk_menu_item_new_with_label(size_unit_name[i]);
- OBJECT_SET_DATA(menu_item, "size_unit", GINT_TO_POINTER(i));
- gtk_menu_append(GTK_MENU(menu), menu_item);
- }
-
- /* the selected menu item can't be changed, once the option_menu
- is created, so set the matching menu item now */
- /* gigabytes */
- if(value >= 1024 * 1024 * 1024) {
- gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_GIGABYTES);
- } else {
- /* megabytes */
- if(value >= 1024 * 1024) {
- gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_MEGABYTES);
- } else {
- /* kilobytes */
- if(value >= 1024) {
- gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_KILOBYTES);
- } else {
- /* bytes */
- gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_BYTES);
- }
- }
- }
-
- gtk_option_menu_set_menu(GTK_OPTION_MENU(unit_om), menu);
-
- return unit_om;
-}
-
-static guint32 size_unit_option_menu_set_value(
-guint32 value)
-{
- /* gigabytes */
- if(value >= 1024 * 1024 * 1024) {
- return value / (1024 * 1024 * 1024);
- }
-
- /* megabytes */
- if(value >= 1024 * 1024) {
- return value / (1024 * 1024);
- }
-
- /* kilobytes */
- if(value >= 1024) {
- return value / 1024;
- }
-
- /* bytes */
- return value;
-}
-
-static guint32 size_unit_option_menu_convert_value(
-GtkWidget *unit_om,
-guint32 value)
-{
- GtkWidget *menu, *menu_item;
- int unit;
-
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(unit_om));
- menu_item = gtk_menu_get_active(GTK_MENU(menu));
- unit = GPOINTER_TO_INT(OBJECT_GET_DATA(menu_item, "size_unit"));
-
-
- switch(unit) {
- case(SIZE_UNIT_BYTES):
- return value;
- break;
- case(SIZE_UNIT_KILOBYTES):
- if(value > G_MAXINT / 1024) {
- return 0;
- } else {
- return value * 1024;
- }
- break;
- case(SIZE_UNIT_MEGABYTES):
- if(value > G_MAXINT / (1024 * 1024)) {
- return 0;
- } else {
- return value * 1024 * 1024;
- }
- break;
- case(SIZE_UNIT_GIGABYTES):
- if(value > G_MAXINT / (1024 * 1024 * 1024)) {
- return 0;
- } else {
- return value * 1024 * 1024 * 1024;
- }
- break;
- default:
- g_assert_not_reached();
- return 0;
- }
-}
-
-
-void
-capture_prep(void)
-{
- GtkWidget *main_vb,
- *main_hb, *left_vb, *right_vb,
-
- *capture_fr, *capture_vb,
- *if_hb, *if_cb, *if_lb,
- *if_ip_hb, *if_ip_lb,
- *linktype_hb, *linktype_lb, *linktype_om,
- *snap_hb, *snap_cb, *snap_sb, *snap_lb,
- *promisc_cb,
- *filter_hb, *filter_bt, *filter_te,
-
- *file_fr, *file_vb,
- *file_hb, *file_bt, *file_lb, *file_te,
- *multi_tb, *multi_files_on_cb,
- *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_om,
- *file_duration_cb, *file_duration_sb, *file_duration_om,
- *ringbuffer_nbf_cb, *ringbuffer_nbf_sb, *ringbuffer_nbf_lb,
- *stop_files_cb, *stop_files_sb, *stop_files_lb,
-
- *limit_fr, *limit_vb, *limit_tb,
- *stop_packets_cb, *stop_packets_sb, *stop_packets_lb,
- *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_om,
- *stop_duration_cb, *stop_duration_sb, *stop_duration_om,
-
- *display_fr, *display_vb,
- *sync_cb, *auto_scroll_cb, *hide_info_cb,
-
- *resolv_fr, *resolv_vb,
- *m_resolv_cb, *n_resolv_cb, *t_resolv_cb,
- *bbox, *ok_bt, *cancel_bt,
- *help_bt;
-#if GTK_MAJOR_VERSION < 2
- GtkAccelGroup *accel_group;
-#endif
- GtkTooltips *tooltips;
- GtkAdjustment *snap_adj, *ringbuffer_nbf_adj,
- *stop_packets_adj, *stop_filesize_adj, *stop_duration_adj, *stop_files_adj, *ring_filesize_adj, *file_duration_adj;
- GList *if_list, *combo_list;
- int err;
- int row;
- char err_str[PCAP_ERRBUF_SIZE];
- gchar *cant_get_if_list_errstr;
-#ifdef _WIN32
- GtkAdjustment *buffer_size_adj;
- GtkWidget *buffer_size_lb, *buffer_size_sb;
-#endif
- guint32 value;
-
- if (cap_open_w != NULL) {
- /* There's already a "Capture Options" dialog box; reactivate it. */
- reactivate_window(cap_open_w);
- return;
- }
-
-#ifdef _WIN32
- /* Is WPcap loaded? */
- if (!has_wpcap) {
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
- "Unable to load WinPcap (wpcap.dll); Ethereal will not be able\n"
- "to capture packets.\n\n"
- "In order to capture packets, WinPcap must be installed; see\n"
- "\n"
- " http://winpcap.polito.it/\n"
- "\n"
- "or the mirror at\n"
- "\n"
- " http://winpcap.mirror.ethereal.com/\n"
- "\n"
- "or the mirror at\n"
- "\n"
- " http://www.mirrors.wiretapped.net/security/packet-capture/winpcap/\n"
- "\n"
- "for a downloadable version of WinPcap and for instructions\n"
- "on how to install WinPcap.");
- return;
- }
-#endif
-
- if_list = get_interface_list(&err, err_str);
- if (if_list == NULL && err == CANT_GET_INTERFACE_LIST) {
- cant_get_if_list_errstr = cant_get_if_list_error_message(err_str);
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s",
- cant_get_if_list_errstr);
- g_free(cant_get_if_list_errstr);
- }
-
- cap_open_w = dlg_window_new("Ethereal: Capture Options");
-
- tooltips = gtk_tooltips_new();
-
-#if GTK_MAJOR_VERSION < 2
- /* Accelerator group for the accelerators (or, as they're called in
- Windows and, I think, in Motif, "mnemonics"; Alt+<key> is a mnemonic,
- Ctrl+<key> is an accelerator). */
- accel_group = gtk_accel_group_new();
- gtk_window_add_accel_group(GTK_WINDOW(cap_open_w), accel_group);
-#endif
-
- main_vb = gtk_vbox_new(FALSE, 0);
- gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
- gtk_container_add(GTK_CONTAINER(cap_open_w), main_vb);
-
- /* Capture-related options frame */
- capture_fr = gtk_frame_new("Capture");
- gtk_container_add(GTK_CONTAINER(main_vb), capture_fr);
-
- capture_vb = gtk_vbox_new(FALSE, 3);
- gtk_container_border_width(GTK_CONTAINER(capture_vb), 5);
- gtk_container_add(GTK_CONTAINER(capture_fr), capture_vb);
-
- /* Interface row */
- if_hb = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(capture_vb), if_hb);
-
- if_lb = gtk_label_new("Interface:");
- gtk_box_pack_start(GTK_BOX(if_hb), if_lb, FALSE, FALSE, 6);
-
- if_cb = gtk_combo_new();
- combo_list = build_capture_combo_list(if_list, TRUE);
- if (combo_list != NULL)
- gtk_combo_set_popdown_strings(GTK_COMBO(if_cb), combo_list);
- if (cfile.iface == NULL && prefs.capture_device != NULL) {
- /* No interface was specified on the command line or in a previous
- capture, but there is one specified in the preferences file;
- make the one from the preferences file the default */
- cfile.iface = g_strdup(prefs.capture_device);
- }
- if (cfile.iface != NULL)
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), cfile.iface);
- else if (combo_list != NULL) {
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry),
- (char *)combo_list->data);
- }
- free_capture_combo_list(combo_list);
- free_interface_list(if_list);
- gtk_tooltips_set_tip(tooltips, GTK_COMBO(if_cb)->entry,
- "Choose which interface (network card) will be used to capture packets from. "
- "Be sure to select the correct one, as it's a common mistake to select the wrong interface.", NULL);
- gtk_box_pack_start(GTK_BOX(if_hb), if_cb, TRUE, TRUE, 6);
-
- if_ip_hb = gtk_hbox_new(FALSE, 3);
- gtk_box_pack_start(GTK_BOX(capture_vb), if_ip_hb, FALSE, FALSE, 0);
-
- if_ip_lb = gtk_label_new("");
- gtk_box_pack_start(GTK_BOX(if_ip_hb), if_ip_lb, FALSE, FALSE, 6);
-
- /* Linktype row */
- linktype_hb = gtk_hbox_new(FALSE, 3);
- gtk_box_pack_start(GTK_BOX(capture_vb), linktype_hb, FALSE, FALSE, 0);
-
- linktype_lb = gtk_label_new("Link-layer header type:");
- gtk_box_pack_start(GTK_BOX(linktype_hb), linktype_lb, FALSE, FALSE, 6);
-
- linktype_om = gtk_option_menu_new();
- OBJECT_SET_DATA(linktype_om, E_CAP_LT_OM_LABEL_KEY, linktype_lb);
- /* Default to "use the default" */
- OBJECT_SET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY, GINT_TO_POINTER(-1));
- OBJECT_SET_DATA(linktype_om, E_CAP_IFACE_KEY, if_ip_lb);
- set_link_type_list(linktype_om, GTK_COMBO(if_cb)->entry);
- /*
- * XXX - in some cases, this is "multiple link-layer header types", e.g.
- * some 802.11 interfaces on FreeBSD 5.2 and later, where you can request
- * fake Ethernet, 802.11, or 802.11-plus-radio-information headers.
- *
- * In other cases, it's "multiple link-layer types", e.g., with recent
- * versions of libpcap, a DAG card on an "HDLC" WAN, where you can
- * request Cisco HDLC or PPP depending on what type of traffic is going
- * over the WAN, or an Ethernet interface, where you can request Ethernet
- * or DOCSIS, the latter being for some Cisco cable modem equipment that
- * can be configured to send raw DOCSIS frames over an Ethernet inside
- * Ethernet low-level framing, for traffic capture purposes.
- *
- * We leave it as "multiple link-layer types" for now.
- */
- gtk_tooltips_set_tip(tooltips, linktype_om,
- "The selected interface supports multiple link-layer types; select the desired one.", NULL);
- gtk_box_pack_start (GTK_BOX(linktype_hb), linktype_om, FALSE, FALSE, 0);
- SIGNAL_CONNECT(GTK_ENTRY(GTK_COMBO(if_cb)->entry), "changed",
- capture_prep_interface_changed_cb, linktype_om);
-
-#ifdef _WIN32
- buffer_size_lb = gtk_label_new("Buffer size:");
- gtk_box_pack_start (GTK_BOX(linktype_hb), buffer_size_lb, FALSE, FALSE, 0);
-
- buffer_size_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat) capture_opts.buffer_size,
- 1, 65535, 1.0, 10.0, 0.0);
- buffer_size_sb = gtk_spin_button_new (buffer_size_adj, 0, 0);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON (buffer_size_sb), (gfloat) capture_opts.buffer_size);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (buffer_size_sb), TRUE);
- WIDGET_SET_SIZE(buffer_size_sb, 80, -1);
- gtk_tooltips_set_tip(tooltips, buffer_size_sb,
- "The memory buffer size used while capturing. If you notice packet drops, you can try to increase this size.", NULL);
- gtk_box_pack_start (GTK_BOX(linktype_hb), buffer_size_sb, FALSE, FALSE, 0);
-
- buffer_size_lb = gtk_label_new("megabyte(s)");
- gtk_box_pack_start (GTK_BOX(linktype_hb), buffer_size_lb, FALSE, FALSE, 0);
-#endif
-
- /* Promiscuous mode row */
- promisc_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
- "Capture packets in _promiscuous mode", accel_group);
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(promisc_cb),
- capture_opts.promisc_mode);
- gtk_tooltips_set_tip(tooltips, promisc_cb,
- "Usually a network card will only capture the traffic sent to its own network address. "
- "If you want to capture all traffic that the network card can \"see\", mark this option. "
- "See the FAQ for some more details of capturing packets from a switched network.", NULL);
- gtk_container_add(GTK_CONTAINER(capture_vb), promisc_cb);
-
- /* Capture length row */
- snap_hb = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(capture_vb), snap_hb);
-
- snap_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("_Limit each packet to", accel_group);
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(snap_cb),
- capture_opts.has_snaplen);
- SIGNAL_CONNECT(snap_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
- gtk_tooltips_set_tip(tooltips, snap_cb,
- "Limit the maximum number of bytes to be captured from each packet. This size includes the "
- "link-layer header and all subsequent headers. ", NULL);
- gtk_box_pack_start(GTK_BOX(snap_hb), snap_cb, FALSE, FALSE, 0);
-
- snap_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat) capture_opts.snaplen,
- MIN_PACKET_SIZE, WTAP_MAX_PACKET_SIZE, 1.0, 10.0, 0.0);
- snap_sb = gtk_spin_button_new (snap_adj, 0, 0);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (snap_sb), TRUE);
- WIDGET_SET_SIZE(snap_sb, 80, -1);
- gtk_box_pack_start (GTK_BOX(snap_hb), snap_sb, FALSE, FALSE, 0);
-
- snap_lb = gtk_label_new("bytes");
- gtk_misc_set_alignment(GTK_MISC(snap_lb), 0, 0.5);
- gtk_box_pack_start(GTK_BOX(snap_hb), snap_lb, FALSE, FALSE, 0);
-
- /* Filter row */
- filter_hb = gtk_hbox_new(FALSE, 3);
- gtk_box_pack_start(GTK_BOX(capture_vb), filter_hb, FALSE, FALSE, 0);
-
- filter_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_CAPTURE_FILTER_ENTRY);
- SIGNAL_CONNECT(filter_bt, "clicked", capture_filter_construct_cb, NULL);
- SIGNAL_CONNECT(filter_bt, "destroy", filter_button_destroy_cb, NULL);
- gtk_tooltips_set_tip(tooltips, filter_bt,
- "Select a capture filter to reduce the amount of packets to be captured. "
- "See \"Capture Filters\" in the online help for further information how to use it.",
- NULL);
- gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, FALSE, 3);
-
- filter_te = gtk_entry_new();
- if (cfile.cfilter) gtk_entry_set_text(GTK_ENTRY(filter_te), cfile.cfilter);
- OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_te);
- gtk_tooltips_set_tip(tooltips, filter_te,
- "Enter a capture filter to reduce the amount of packets to be captured. "
- "See \"Capture Filters\" in the online help for further information how to use it.",
- NULL);
- gtk_box_pack_start(GTK_BOX(filter_hb), filter_te, TRUE, TRUE, 3);
-
- main_hb = gtk_hbox_new(FALSE, 5);
- gtk_container_border_width(GTK_CONTAINER(main_hb), 0);
- gtk_container_add(GTK_CONTAINER(main_vb), main_hb);
-
- left_vb = gtk_vbox_new(FALSE, 0);
- gtk_container_border_width(GTK_CONTAINER(left_vb), 0);
- gtk_box_pack_start(GTK_BOX(main_hb), left_vb, TRUE, TRUE, 0);
-
- right_vb = gtk_vbox_new(FALSE, 0);
- gtk_container_border_width(GTK_CONTAINER(right_vb), 0);
- gtk_box_pack_start(GTK_BOX(main_hb), right_vb, FALSE, FALSE, 0);
-
-
- /* Capture file-related options frame */
- file_fr = gtk_frame_new("Capture File(s)");
- gtk_container_add(GTK_CONTAINER(left_vb), file_fr);
-
- file_vb = gtk_vbox_new(FALSE, 3);
- gtk_container_border_width(GTK_CONTAINER(file_vb), 5);
- gtk_container_add(GTK_CONTAINER(file_fr), file_vb);
-
- /* File row */
- file_hb = gtk_hbox_new(FALSE, 3);
- gtk_box_pack_start(GTK_BOX(file_vb), file_hb, FALSE, FALSE, 0);
-
- file_lb = gtk_label_new("File:");
- gtk_box_pack_start(GTK_BOX(file_hb), file_lb, FALSE, FALSE, 3);
-
- file_te = gtk_entry_new();
- gtk_tooltips_set_tip(tooltips, file_te,
- "Enter the file name to which captured data will be written. "
- "If you don't enter something here, a temporary file will be used.",
- NULL);
- gtk_box_pack_start(GTK_BOX(file_hb), file_te, TRUE, TRUE, 3);
-
- file_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_BROWSE);
- gtk_tooltips_set_tip(tooltips, file_bt,
- "Select a file to which captured data will be written, "
- "instead of entering the file name directly. ",
- NULL);
- gtk_box_pack_start(GTK_BOX(file_hb), file_bt, FALSE, FALSE, 3);
-
- SIGNAL_CONNECT(file_bt, "clicked", capture_prep_file_cb, file_te);
-
- /* multiple files table */
- multi_tb = gtk_table_new(5, 3, FALSE);
- gtk_table_set_row_spacings(GTK_TABLE(multi_tb), 1);
- gtk_table_set_col_spacings(GTK_TABLE(multi_tb), 3);
- gtk_box_pack_start(GTK_BOX(file_vb), multi_tb, FALSE, FALSE, 0);
- row = 0;
-
- /* multiple files row */
- multi_files_on_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Use _multiple files", accel_group);
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(multi_files_on_cb),
- capture_opts.multi_files_on);
- SIGNAL_CONNECT(multi_files_on_cb, "toggled", capture_prep_adjust_sensitivity,
- cap_open_w);
- gtk_tooltips_set_tip(tooltips, multi_files_on_cb,
- "Instead of using a single capture file, multiple files will be created. "
- "The generated file names will contain an incrementing number and the start time of the capture.", NULL);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), multi_files_on_cb, 0, 1, row, row+1);
- row++;
-
- /* Ring buffer filesize row */
- ring_filesize_cb = gtk_check_button_new_with_label("Next file every");
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ring_filesize_cb),
- capture_opts.has_autostop_filesize);
- SIGNAL_CONNECT(ring_filesize_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
- gtk_tooltips_set_tip(tooltips, ring_filesize_cb,
- "If the selected file size is exceeded, capturing switches to the next file.",
- NULL);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), ring_filesize_cb, 0, 1, row, row+1);
-
- ring_filesize_adj = (GtkAdjustment *) gtk_adjustment_new(0.0,
- 1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
- ring_filesize_sb = gtk_spin_button_new (ring_filesize_adj, 0, 0);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (ring_filesize_sb), TRUE);
- WIDGET_SET_SIZE(ring_filesize_sb, 80, -1);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), ring_filesize_sb, 1, 2, row, row+1);
-
- ring_filesize_om = size_unit_option_menu_new(capture_opts.autostop_filesize);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), ring_filesize_om, 2, 3, row, row+1);
-
- value = size_unit_option_menu_set_value(capture_opts.autostop_filesize);
- gtk_adjustment_set_value(ring_filesize_adj, (gfloat) value);
-
- row++;
-
- /* Ring buffer duration row */
- file_duration_cb = gtk_check_button_new_with_label("Next file every");
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(file_duration_cb),
- capture_opts.has_file_duration);
- SIGNAL_CONNECT(file_duration_cb, "toggled",
- capture_prep_adjust_sensitivity, cap_open_w);
- gtk_tooltips_set_tip(tooltips, file_duration_cb,
- "If the selected duration is exceeded, capturing switches to the next file.",
- NULL);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), file_duration_cb, 0, 1, row, row+1);
-
- file_duration_adj = (GtkAdjustment *)gtk_adjustment_new(0.0,
- 1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
- file_duration_sb = gtk_spin_button_new (file_duration_adj, 0, 0);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (file_duration_sb), TRUE);
- WIDGET_SET_SIZE(file_duration_sb, 80, -1);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), file_duration_sb, 1, 2, row, row+1);
-
- file_duration_om = time_unit_option_menu_new(capture_opts.file_duration);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), file_duration_om, 2, 3, row, row+1);
-
- value = time_unit_option_menu_convert_value(capture_opts.file_duration);
- gtk_adjustment_set_value(file_duration_adj, (gfloat) value);
- row++;
-
- /* Ring buffer files row */
- ringbuffer_nbf_cb = gtk_check_button_new_with_label("Ring buffer with");
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb),
- capture_opts.has_ring_num_files);
- SIGNAL_CONNECT(ringbuffer_nbf_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
- gtk_tooltips_set_tip(tooltips, ringbuffer_nbf_cb,
- "After capturing has switched to the next file and the given number of files has exceeded, "
- "the oldest file will be removed.",
- NULL);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), ringbuffer_nbf_cb, 0, 1, row, row+1);
-
- ringbuffer_nbf_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat) capture_opts.ring_num_files,
- 2/*RINGBUFFER_MIN_NUM_FILES*/, RINGBUFFER_MAX_NUM_FILES, 1.0, 10.0, 0.0);
- ringbuffer_nbf_sb = gtk_spin_button_new (ringbuffer_nbf_adj, 0, 0);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (ringbuffer_nbf_sb), TRUE);
- WIDGET_SET_SIZE(ringbuffer_nbf_sb, 80, -1);
- SIGNAL_CONNECT(ringbuffer_nbf_sb, "changed", capture_prep_adjust_sensitivity, cap_open_w);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), ringbuffer_nbf_sb, 1, 2, row, row+1);
-
- ringbuffer_nbf_lb = gtk_label_new("files");
- gtk_misc_set_alignment(GTK_MISC(ringbuffer_nbf_lb), 0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), ringbuffer_nbf_lb, 2, 3, row, row+1);
- row++;
-
- /* Files row */
- stop_files_cb = gtk_check_button_new_with_label("Stop capture after");
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_files_cb),
- capture_opts.has_autostop_files);
- SIGNAL_CONNECT(stop_files_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
- gtk_tooltips_set_tip(tooltips, stop_files_cb,
- "Stop capturing after the given number of \"file switches\" have been done.", NULL);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), stop_files_cb, 0, 1, row, row+1);
-
- stop_files_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat)capture_opts.autostop_files,
- 1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
- stop_files_sb = gtk_spin_button_new (stop_files_adj, 0, 0);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_files_sb), TRUE);
- WIDGET_SET_SIZE(stop_files_sb, 80, -1);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), stop_files_sb, 1, 2, row, row+1);
-
- stop_files_lb = gtk_label_new("file(s)");
- gtk_misc_set_alignment(GTK_MISC(stop_files_lb), 0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(multi_tb), stop_files_lb, 2, 3, row, row+1);
- row++;
-
- /* Capture limits frame */
- limit_fr = gtk_frame_new("Stop Capture ...");
- gtk_container_add(GTK_CONTAINER(left_vb), limit_fr);
-
- limit_vb = gtk_vbox_new(FALSE, 3);
- gtk_container_border_width(GTK_CONTAINER(limit_vb), 5);
- gtk_container_add(GTK_CONTAINER(limit_fr), limit_vb);
-
- /* limits table */
- limit_tb = gtk_table_new(3, 3, FALSE);
- gtk_table_set_row_spacings(GTK_TABLE(limit_tb), 1);
- gtk_table_set_col_spacings(GTK_TABLE(limit_tb), 3);
- gtk_box_pack_start(GTK_BOX(limit_vb), limit_tb, FALSE, FALSE, 0);
- row = 0;
-
- /* Packet count row */
- stop_packets_cb = gtk_check_button_new_with_label("... after");
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_packets_cb),
- capture_opts.has_autostop_packets);
- SIGNAL_CONNECT(stop_packets_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
- gtk_tooltips_set_tip(tooltips, stop_packets_cb,
- "Stop capturing after the given number of packets have been captured.", NULL);
- gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_packets_cb, 0, 1, row, row+1);
-
- stop_packets_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat)capture_opts.autostop_packets,
- 1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
- stop_packets_sb = gtk_spin_button_new (stop_packets_adj, 0, 0);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_packets_sb), TRUE);
- WIDGET_SET_SIZE(stop_packets_sb, 80, -1);
- gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_packets_sb, 1, 2, row, row+1);
-
- stop_packets_lb = gtk_label_new("packet(s)");
- gtk_misc_set_alignment(GTK_MISC(stop_packets_lb), 0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_packets_lb, 2, 3, row, row+1);
- row++;
-
- /* Filesize row */
- stop_filesize_cb = gtk_check_button_new_with_label("... after");
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_filesize_cb),
- capture_opts.has_autostop_filesize);
- SIGNAL_CONNECT(stop_filesize_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
- gtk_tooltips_set_tip(tooltips, stop_filesize_cb,
- "Stop capturing after the given amount of capture data has been captured.", NULL);
- gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_filesize_cb, 0, 1, row, row+1);
-
- stop_filesize_adj = (GtkAdjustment *) gtk_adjustment_new(0.0,
- 1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
- stop_filesize_sb = gtk_spin_button_new (stop_filesize_adj, 0, 0);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_filesize_sb), TRUE);
- WIDGET_SET_SIZE(stop_filesize_sb, 80, -1);
- gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_filesize_sb, 1, 2, row, row+1);
-
- stop_filesize_om = size_unit_option_menu_new(capture_opts.autostop_filesize);
- gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_filesize_om, 2, 3, row, row+1);
-
- value = size_unit_option_menu_set_value(capture_opts.autostop_filesize);
- gtk_adjustment_set_value(stop_filesize_adj, (gfloat) value);
-
- row++;
-
- /* Duration row */
- stop_duration_cb = gtk_check_button_new_with_label("... after");
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_duration_cb),
- capture_opts.has_autostop_duration);
- SIGNAL_CONNECT(stop_duration_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
- gtk_tooltips_set_tip(tooltips, stop_duration_cb,
- "Stop capturing after the given time is exceeded.", NULL);
- gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_duration_cb, 0, 1, row, row+1);
-
- stop_duration_adj = (GtkAdjustment *) gtk_adjustment_new(0.0,
- 1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
- stop_duration_sb = gtk_spin_button_new (stop_duration_adj, 0, 0);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_duration_sb), TRUE);
- WIDGET_SET_SIZE(stop_duration_sb, 80, -1);
- gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_duration_sb, 1, 2, row, row+1);
-
- stop_duration_om = time_unit_option_menu_new(capture_opts.autostop_duration);
- gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_duration_om, 2, 3, row, row+1);
-
- value = time_unit_option_menu_convert_value(capture_opts.autostop_duration);
- gtk_adjustment_set_value(stop_duration_adj, (gfloat) value);
- row++;
-
- /* Display-related options frame */
- display_fr = gtk_frame_new("Display Options");
- gtk_container_add(GTK_CONTAINER(right_vb), display_fr);
-
- display_vb = gtk_vbox_new(FALSE, 0);
- gtk_container_border_width(GTK_CONTAINER(display_vb), 5);
- gtk_container_add(GTK_CONTAINER(display_fr), display_vb);
-
- /* "Update display in real time" row */
- sync_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
- "_Update list of packets in real time", accel_group);
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sync_cb),
- capture_opts.sync_mode);
- SIGNAL_CONNECT(sync_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
- gtk_tooltips_set_tip(tooltips, sync_cb,
- "Using this option will show the captured packets immediately on the main screen. "
- "Please note: this will slow down capturing, so increased packet drops might appear.", NULL);
- gtk_container_add(GTK_CONTAINER(display_vb), sync_cb);
-
- /* "Auto-scroll live update" row */
- auto_scroll_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
- "_Automatic scrolling in live capture", accel_group);
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(auto_scroll_cb), auto_scroll_live);
- gtk_tooltips_set_tip(tooltips, auto_scroll_cb,
- "This will scroll the \"Packet List\" automatically to the latest captured packet, "
- "when the \"Update List of packets in real time\" option is used.", NULL);
- gtk_container_add(GTK_CONTAINER(display_vb), auto_scroll_cb);
-
- /* "Hide capture info" row */
- hide_info_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
- "_Hide capture info dialog", accel_group);
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(hide_info_cb), !capture_opts.show_info);
- gtk_tooltips_set_tip(tooltips, hide_info_cb,
- "Hide the capture info dialog while capturing.", NULL);
- gtk_container_add(GTK_CONTAINER(display_vb), hide_info_cb);
-
- /* Name Resolution frame */
- resolv_fr = gtk_frame_new("Name Resolution");
- gtk_container_add(GTK_CONTAINER(right_vb), resolv_fr);
-
- resolv_vb = gtk_vbox_new(FALSE, 0);
- gtk_container_border_width(GTK_CONTAINER(resolv_vb), 5);
- gtk_container_add(GTK_CONTAINER(resolv_fr), resolv_vb);
-
- m_resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
- "Enable _MAC name resolution", accel_group);
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(m_resolv_cb),
- g_resolv_flags & RESOLV_MAC);
- gtk_tooltips_set_tip(tooltips, m_resolv_cb,
- "Perform MAC layer name resolution while capturing.", NULL);
- gtk_container_add(GTK_CONTAINER(resolv_vb), m_resolv_cb);
-
- n_resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
- "Enable _network name resolution", accel_group);
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(n_resolv_cb),
- g_resolv_flags & RESOLV_NETWORK);
- gtk_tooltips_set_tip(tooltips, n_resolv_cb,
- "Perform network layer name resolution while capturing.", NULL);
- gtk_container_add(GTK_CONTAINER(resolv_vb), n_resolv_cb);
-
- t_resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
- "Enable _transport name resolution", accel_group);
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(t_resolv_cb),
- g_resolv_flags & RESOLV_TRANSPORT);
- gtk_tooltips_set_tip(tooltips, t_resolv_cb,
- "Perform transport layer name resolution while capturing.", NULL);
- gtk_container_add(GTK_CONTAINER(resolv_vb), t_resolv_cb);
-
- /* Button row: OK and cancel buttons */
- bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
- gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
-
- ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_OK);
- SIGNAL_CONNECT(ok_bt, "clicked", capture_prep_ok_cb, cap_open_w);
- gtk_tooltips_set_tip(tooltips, ok_bt,
- "Start the capture process.", NULL);
-
- cancel_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
- gtk_tooltips_set_tip(tooltips, cancel_bt,
- "Cancel and exit dialog.", NULL);
- window_set_cancel_button(cap_open_w, cancel_bt, window_cancel_button_cb);
-
- help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
- gtk_tooltips_set_tip(tooltips, help_bt,
- "Show help about capturing.", NULL);
- SIGNAL_CONNECT(help_bt, "clicked", help_topic_cb, "Capturing");
-
- gtk_widget_grab_default(ok_bt);
-
- /* Attach pointers to needed widgets to the capture prefs window/object */
- OBJECT_SET_DATA(cap_open_w, E_CAP_IFACE_KEY, if_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_SNAP_CB_KEY, snap_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_SNAP_SB_KEY, snap_sb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_LT_OM_KEY, linktype_om);
-#ifdef _WIN32
- OBJECT_SET_DATA(cap_open_w, E_CAP_BUFFER_SIZE_SB_KEY, buffer_size_sb);
-#endif
- OBJECT_SET_DATA(cap_open_w, E_CAP_PROMISC_KEY, promisc_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_FILT_KEY, filter_te);
- OBJECT_SET_DATA(cap_open_w, E_CAP_FILE_TE_KEY, file_te);
- OBJECT_SET_DATA(cap_open_w, E_CAP_MULTI_FILES_ON_CB_KEY, multi_files_on_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_RING_NBF_CB_KEY, ringbuffer_nbf_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_RING_NBF_SB_KEY, ringbuffer_nbf_sb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_RING_NBF_LB_KEY, ringbuffer_nbf_lb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_RING_FILESIZE_CB_KEY, ring_filesize_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_RING_FILESIZE_SB_KEY, ring_filesize_sb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_RING_FILESIZE_OM_KEY, ring_filesize_om);
- OBJECT_SET_DATA(cap_open_w, E_CAP_FILE_DURATION_CB_KEY, file_duration_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_FILE_DURATION_SB_KEY, file_duration_sb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_FILE_DURATION_OM_KEY, file_duration_om);
- OBJECT_SET_DATA(cap_open_w, E_CAP_SYNC_KEY, sync_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_AUTO_SCROLL_KEY, auto_scroll_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_HIDE_INFO_KEY, hide_info_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_PACKETS_CB_KEY, stop_packets_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_PACKETS_SB_KEY, stop_packets_sb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_PACKETS_LB_KEY, stop_packets_lb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILESIZE_CB_KEY, stop_filesize_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILESIZE_SB_KEY, stop_filesize_sb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILESIZE_OM_KEY, stop_filesize_om);
- OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_DURATION_CB_KEY, stop_duration_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_DURATION_SB_KEY, stop_duration_sb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_DURATION_OM_KEY, stop_duration_om);
- OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILES_CB_KEY, stop_files_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILES_SB_KEY, stop_files_sb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILES_LB_KEY, stop_files_lb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_M_RESOLVE_KEY, m_resolv_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_N_RESOLVE_KEY, n_resolv_cb);
- OBJECT_SET_DATA(cap_open_w, E_CAP_T_RESOLVE_KEY, t_resolv_cb);
-
- /* Set the sensitivity of various widgets as per the settings of other
- widgets. */
- capture_prep_adjust_sensitivity(NULL, cap_open_w);
-
- /* Catch the "activate" signal on the text
- entries, so that if the user types Return there, we act as if the
- "OK" button had been selected, as happens if Return is typed if some
- widget that *doesn't* handle the Return key has the input focus. */
- dlg_set_activate(GTK_COMBO(if_cb)->entry, ok_bt);
- dlg_set_activate(filter_te, ok_bt);
- dlg_set_activate(file_te, ok_bt);
-
- /* XXX - why does not
-
- gtk_widget_grab_focus(if_cb);
-
- give the initial focus to the "Interface" combo box?
-
- Or should I phrase that as "why does GTK+ continually frustrate
- attempts to make GUIs driveable from the keyboard?" We have to
- go catch the activate signal on every single GtkEntry widget
- (rather than having widgets whose activate signal is *not*
- caught not catch the Return keystroke, so that it passes on,
- ultimately, to the window, which can activate the default
- widget, i.e. the "OK" button); we have to catch the "key_press_event"
- signal and have the handler check for ESC, so that we can have ESC
- activate the "Cancel" button; in order to support Alt+<key> mnemonics
- for buttons and the like, we may have to construct an accelerator
- group by hand and set up the accelerators by hand (if that even
- works - I've not tried it yet); we have to do a "gtk_widget_grab_focus()"
- to keep some container widget from getting the initial focus, so that
- you don't have to tab into the first widget in order to start typing
- in it; and it now appears that you simply *can't* make a combo box
- get the initial focus, at least not in the obvious fashion. Sigh.... */
-
- SIGNAL_CONNECT(cap_open_w, "delete_event", window_delete_event_cb, NULL);
- SIGNAL_CONNECT(cap_open_w, "destroy", capture_prep_destroy_cb, NULL);
-
- gtk_widget_show_all(cap_open_w);
- window_present(cap_open_w);
-}
-
-static void
-capture_prep_answered_cb(gpointer dialog _U_, gint btn, gpointer data)
-{
- switch(btn) {
- case(ESD_BTN_SAVE):
- /* save file first */
- file_save_as_cmd(after_save_capture_dialog, data);
- break;
- case(ESD_BTN_DONT_SAVE):
- capture_prep();
- break;
- case(ESD_BTN_CANCEL):
- break;
- default:
- g_assert_not_reached();
- }
-}
-
-void
-capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
-{
- gpointer dialog;
-
- if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
- /* user didn't saved his current file, ask him */
- dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_SAVE_DONTSAVE_CANCEL,
- PRIMARY_TEXT_START "Save capture file before starting a new capture?" PRIMARY_TEXT_END "\n\n"
- "If you start a new capture without saving, your current capture data will\nbe discarded.");
- simple_dialog_set_cb(dialog, capture_prep_answered_cb, NULL);
- } else {
- /* unchanged file, just capture a new one */
- capture_prep();
- }
-}
-
-static void
-select_link_type_cb(GtkWidget *w, gpointer data)
-{
- int new_linktype = GPOINTER_TO_INT(data);
- GtkWidget *linktype_om = OBJECT_GET_DATA(w, E_CAP_LT_OM_KEY);
- int old_linktype = GPOINTER_TO_INT(OBJECT_GET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY));
-
- if (old_linktype != new_linktype)
- OBJECT_SET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY, GINT_TO_POINTER(new_linktype));
-}
-
-static void
-capture_prep_file_cb(GtkWidget *file_bt, GtkWidget *file_te)
-{
- file_selection_browse(file_bt, file_te, "Ethereal: Specify a Capture File", FILE_SELECTION_OPEN);
-}
-
-
-static void
-capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) {
- GtkWidget *if_cb, *snap_cb, *snap_sb, *promisc_cb, *filter_te,
- *file_te, *multi_files_on_cb, *ringbuffer_nbf_sb, *ringbuffer_nbf_cb,
- *linktype_om, *sync_cb, *auto_scroll_cb, *hide_info_cb,
- *stop_packets_cb, *stop_packets_sb,
- *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_om,
- *stop_duration_cb, *stop_duration_sb, *stop_duration_om,
- *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_om,
- *file_duration_cb, *file_duration_sb, *file_duration_om,
- *stop_files_cb, *stop_files_sb,
- *m_resolv_cb, *n_resolv_cb, *t_resolv_cb;
-#ifdef _WIN32
- GtkWidget *buffer_size_sb;
-#endif
- gchar *entry_text;
- gchar *if_text;
- gchar *if_name;
- const gchar *filter_text;
- gchar *save_file;
- const gchar *g_save_file;
- gchar *cf_name;
- gchar *dirname;
- gint32 tmp;
-
- if_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_IFACE_KEY);
- snap_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SNAP_CB_KEY);
- snap_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SNAP_SB_KEY);
- linktype_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_LT_OM_KEY);
-#ifdef _WIN32
- buffer_size_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_BUFFER_SIZE_SB_KEY);
-#endif
- promisc_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_PROMISC_KEY);
- filter_te = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILT_KEY);
- file_te = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_TE_KEY);
- multi_files_on_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_MULTI_FILES_ON_CB_KEY);
- ringbuffer_nbf_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_CB_KEY);
- ringbuffer_nbf_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_SB_KEY);
- ring_filesize_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_CB_KEY);
- ring_filesize_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_SB_KEY);
- ring_filesize_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_OM_KEY);
- file_duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_CB_KEY);
- file_duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_SB_KEY);
- file_duration_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_OM_KEY);
- sync_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SYNC_KEY);
- auto_scroll_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_AUTO_SCROLL_KEY);
- hide_info_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_HIDE_INFO_KEY);
- stop_packets_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_CB_KEY);
- stop_packets_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_SB_KEY);
- stop_filesize_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_CB_KEY);
- stop_filesize_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_SB_KEY);
- stop_filesize_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_OM_KEY);
- stop_duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_CB_KEY);
- stop_duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_SB_KEY);
- stop_duration_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_OM_KEY);
- stop_files_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_CB_KEY);
- stop_files_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_SB_KEY);
- m_resolv_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_M_RESOLVE_KEY);
- n_resolv_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_N_RESOLVE_KEY);
- t_resolv_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_T_RESOLVE_KEY);
-
- entry_text =
- g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry)));
- if_text = g_strstrip(entry_text);
- if_name = get_if_name(if_text);
- if (*if_name == '\0') {
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
- "You didn't specify an interface on which to capture packets.");
- g_free(entry_text);
- return;
- }
- if (cfile.iface)
- g_free(cfile.iface);
- cfile.iface = g_strdup(if_name);
- g_free(entry_text);
-
- capture_opts.linktype =
- GPOINTER_TO_INT(OBJECT_GET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY));
-
-#ifdef _WIN32
- capture_opts.buffer_size =
- gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(buffer_size_sb));
-#endif
-
- capture_opts.has_snaplen =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(snap_cb));
- if (capture_opts.has_snaplen) {
- capture_opts.snaplen =
- gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(snap_sb));
- if (capture_opts.snaplen < 1)
- capture_opts.snaplen = WTAP_MAX_PACKET_SIZE;
- else if (capture_opts.snaplen < MIN_PACKET_SIZE)
- capture_opts.snaplen = MIN_PACKET_SIZE;
- }
-
- capture_opts.promisc_mode =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(promisc_cb));
-
- /* XXX - don't try to get clever and set "cfile.filter" to NULL if the
- filter string is empty, as an indication that we don't have a filter
- and thus don't have to set a filter when capturing - the version of
- libpcap in Red Hat Linux 6.1, and versions based on later patches
- in that series, don't bind the AF_PACKET socket to an interface
- until a filter is set, which means they aren't bound at all if
- no filter is set, which means no packets arrive as input on that
- socket, which means Ethereal never sees any packets. */
- filter_text = gtk_entry_get_text(GTK_ENTRY(filter_te));
- if (cfile.cfilter)
- g_free(cfile.cfilter);
- g_assert(filter_text != NULL);
- cfile.cfilter = g_strdup(filter_text);
-
- g_save_file = gtk_entry_get_text(GTK_ENTRY(file_te));
- if (g_save_file && g_save_file[0]) {
- /* User specified a file to which the capture should be written. */
- save_file = g_strdup(g_save_file);
- /* Save the directory name for future file dialogs. */
- cf_name = g_strdup(g_save_file);
- dirname = get_dirname(cf_name); /* Overwrites cf_name */
- set_last_open_dir(dirname);
- g_free(cf_name);
- } else {
- /* User didn't specify a file; save to a temporary file. */
- save_file = NULL;
- }
-
- capture_opts.has_autostop_packets =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_packets_cb));
- if (capture_opts.has_autostop_packets)
- capture_opts.autostop_packets =
- gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(stop_packets_sb));
-
- capture_opts.has_autostop_duration =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_duration_cb));
- if (capture_opts.has_autostop_duration) {
- capture_opts.autostop_duration =
- gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(stop_duration_sb));
- capture_opts.autostop_duration =
- time_unit_option_menu_get_value(stop_duration_om, capture_opts.autostop_duration);
- }
-
- capture_opts.sync_mode =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sync_cb));
-
- auto_scroll_live =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auto_scroll_cb));
-
- capture_opts.show_info =
- !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(hide_info_cb));
-
- g_resolv_flags |= g_resolv_flags & RESOLV_CONCURRENT;
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_resolv_cb)))
- g_resolv_flags |= RESOLV_MAC;
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(n_resolv_cb)))
- g_resolv_flags |= RESOLV_NETWORK;
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(t_resolv_cb)))
- g_resolv_flags |= RESOLV_TRANSPORT;
-
- capture_opts.has_ring_num_files =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb));
-
- capture_opts.ring_num_files =
- gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(ringbuffer_nbf_sb));
- if (capture_opts.ring_num_files > RINGBUFFER_MAX_NUM_FILES)
- capture_opts.ring_num_files = RINGBUFFER_MAX_NUM_FILES;
-#if RINGBUFFER_MIN_NUM_FILES > 0
- else if (capture_opts.ring_num_files < RINGBUFFER_MIN_NUM_FILES)
- capture_opts.ring_num_files = RINGBUFFER_MIN_NUM_FILES;
-#endif
-
- capture_opts.multi_files_on =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(multi_files_on_cb));
-
- if(capture_opts.sync_mode)
- capture_opts.multi_files_on = FALSE;
-
- if (capture_opts.multi_files_on) {
- capture_opts.has_autostop_filesize =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_filesize_cb));
- if (capture_opts.has_autostop_filesize) {
- tmp = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(ring_filesize_sb));
- tmp = size_unit_option_menu_convert_value(ring_filesize_om, tmp);
- if(tmp != 0) {
- capture_opts.autostop_filesize = tmp;
- } else {
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
- PRIMARY_TEXT_START "Multiple files: Requested filesize too large!\n\n" PRIMARY_TEXT_END
- "The setting \"Next file every x byte(s)\" can't be greater than %u bytes (2GB).", G_MAXINT);
- return;
- }
- }
-
- /* test if the settings are ok for a ringbuffer */
- if (save_file == NULL) {
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
- PRIMARY_TEXT_START "Multiple files: No capture file name given!\n\n" PRIMARY_TEXT_END
- "You must specify a filename if you want to use multiple files.");
- return;
- } else if (!capture_opts.has_autostop_filesize) {
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
- PRIMARY_TEXT_START "Multiple files: No file limit given!\n\n" PRIMARY_TEXT_END
- "You must specify a file size at which is switched to the next capture file\n"
- "if you want to use multiple files.");
- g_free(save_file);
- return;
- }
- } else {
- capture_opts.has_autostop_filesize =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_filesize_cb));
- if (capture_opts.has_autostop_filesize) {
- tmp = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(stop_filesize_sb));
- tmp = size_unit_option_menu_convert_value(stop_filesize_om, tmp);
- if(tmp != 0) {
- capture_opts.autostop_filesize = tmp;
- } else {
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
- PRIMARY_TEXT_START "Stop Capture: Requested filesize too large!\n\n" PRIMARY_TEXT_END
- "The setting \"... after x byte(s)\" can't be greater than %u bytes (2GB).", G_MAXINT);
- return;
- }
- }
- }
-
- capture_opts.has_file_duration =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(file_duration_cb));
- if (capture_opts.has_file_duration) {
- capture_opts.file_duration =
- gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(file_duration_sb));
- capture_opts.file_duration =
- time_unit_option_menu_get_value(file_duration_om, capture_opts.file_duration);
- }
-
- capture_opts.has_autostop_files =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_files_cb));
- if (capture_opts.has_autostop_files)
- capture_opts.autostop_files =
- gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(stop_files_sb));
-
- window_destroy(GTK_WIDGET(parent_w));
-
- do_capture(save_file);
- if (save_file != NULL)
- g_free(save_file);
-}
-
-static void
-capture_prep_destroy_cb(GtkWidget *win, gpointer user_data _U_)
-{
- GtkWidget *fs;
-
- /* Is there a file selection dialog associated with this
- Capture Options dialog? */
- fs = OBJECT_GET_DATA(win, E_FILE_SEL_DIALOG_PTR_KEY);
-
- if (fs != NULL) {
- /* Yes. Destroy it. */
- window_destroy(fs);
- }
-
- /* Note that we no longer have a "Capture Options" dialog box. */
- cap_open_w = NULL;
-}
-
-static void
-capture_prep_interface_changed_cb(GtkWidget *entry, gpointer argp)
-{
- GtkWidget *linktype_om = argp;
-
- set_link_type_list(linktype_om, entry);
-}
-
-/*
- * Adjust the sensitivity of various widgets as per the current setting
- * of other widgets.
- */
-static void
-capture_prep_adjust_sensitivity(GtkWidget *tb _U_, gpointer parent_w)
-{
- GtkWidget *if_cb,
- *snap_cb, *snap_sb,
- *multi_files_on_cb, *ringbuffer_nbf_cb, *ringbuffer_nbf_sb, *ringbuffer_nbf_lb,
- *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_om,
- *file_duration_cb, *file_duration_sb, *file_duration_om,
- *sync_cb, *auto_scroll_cb, *hide_info_cb,
- *stop_packets_cb, *stop_packets_sb, *stop_packets_lb,
- *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_om,
- *stop_duration_cb, *stop_duration_sb, *stop_duration_om,
- *stop_files_cb, *stop_files_sb, *stop_files_lb;
-
-
- if_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_IFACE_KEY);
- snap_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SNAP_CB_KEY);
- snap_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SNAP_SB_KEY);
- multi_files_on_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_MULTI_FILES_ON_CB_KEY);
- ringbuffer_nbf_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_CB_KEY);
- ringbuffer_nbf_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_SB_KEY);
- ringbuffer_nbf_lb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_LB_KEY);
- ring_filesize_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_CB_KEY);
- ring_filesize_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_SB_KEY);
- ring_filesize_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_OM_KEY);
- file_duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_CB_KEY);
- file_duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_SB_KEY);
- file_duration_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_OM_KEY);
- sync_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SYNC_KEY);
- auto_scroll_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_AUTO_SCROLL_KEY);
- hide_info_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_HIDE_INFO_KEY);
- stop_packets_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_CB_KEY);
- stop_packets_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_SB_KEY);
- stop_packets_lb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_LB_KEY);
- stop_filesize_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_CB_KEY);
- stop_filesize_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_SB_KEY);
- stop_filesize_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_OM_KEY);
- stop_duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_CB_KEY);
- stop_duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_SB_KEY);
- stop_duration_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_OM_KEY);
- stop_files_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_CB_KEY);
- stop_files_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_SB_KEY);
- stop_files_lb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_LB_KEY);
-
- /* The snapshot length spinbox is sensitive if the "Limit each packet
- to" checkbox is on. */
- gtk_widget_set_sensitive(GTK_WIDGET(snap_sb),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(snap_cb)));
-
-
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sync_cb))) {
- /* "Update list of packets in real time" captures enabled; we don't
- support ring buffer mode for those captures, so turn ring buffer
- mode off if it's on, and make its toggle button, and the spin
- button for the number of ring buffer files (and the spin button's
- label), insensitive. */
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(multi_files_on_cb), FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(multi_files_on_cb), FALSE);
-
- /* Auto-scroll mode is meaningful only in "Update list of packets
- in real time" captures, so make its toggle button sensitive. */
- gtk_widget_set_sensitive(GTK_WIDGET(auto_scroll_cb), TRUE);
-
- gtk_widget_set_sensitive(GTK_WIDGET(hide_info_cb), TRUE);
- } else {
- /* "Update list of packets in real time" captures disabled; that
- means ring buffer mode is OK, so make its toggle button
- sensitive. */
- gtk_widget_set_sensitive(GTK_WIDGET(multi_files_on_cb), TRUE);
-
- /* Auto-scroll mode is meaningful only in "Update list of packets
- in real time" captures, so make its toggle button insensitive. */
- gtk_widget_set_sensitive(GTK_WIDGET(auto_scroll_cb), FALSE);
-
- gtk_widget_set_sensitive(GTK_WIDGET(hide_info_cb), FALSE);
- }
-
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(multi_files_on_cb))) {
- /* Ring buffer mode enabled. */
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ring_filesize_cb), TRUE);
-
- gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_cb), TRUE);
- gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_sb),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb)));
- gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_lb),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb)));
-
- /* The ring filesize spinbox is sensitive if the "Next capture file
- after N kilobytes" checkbox is on. */
- gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_cb), TRUE);
- gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_sb),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_filesize_cb)));
- gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_om),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_filesize_cb)));
-
- /* The ring duration spinbox is sensitive if the "Next capture file
- after N seconds" checkbox is on. */
- gtk_widget_set_sensitive(GTK_WIDGET(file_duration_cb), TRUE);
- gtk_widget_set_sensitive(GTK_WIDGET(file_duration_sb),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(file_duration_cb)));
- gtk_widget_set_sensitive(GTK_WIDGET(file_duration_om),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(file_duration_cb)));
-
- gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_cb), FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_sb), FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_om), FALSE);
-
- gtk_widget_set_sensitive(GTK_WIDGET(stop_files_cb), TRUE);
- gtk_widget_set_sensitive(GTK_WIDGET(stop_files_sb),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_files_cb)));
- gtk_widget_set_sensitive(GTK_WIDGET(stop_files_lb),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_files_cb)));
- } else {
- /* Ring buffer mode disabled. */
- gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_cb), FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_sb), FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_lb), FALSE);
-
- gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_cb), FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_sb),FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_om),FALSE);
-
- gtk_widget_set_sensitive(GTK_WIDGET(file_duration_cb), FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(file_duration_sb),FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(file_duration_om),FALSE);
-
- /* The maximum file size spinbox is sensitive if the "Stop capture
- after N kilobytes" checkbox is on. */
- gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_cb), TRUE);
- gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_sb),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_filesize_cb)));
- gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_om),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_filesize_cb)));
-
- gtk_widget_set_sensitive(GTK_WIDGET(stop_files_cb), FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(stop_files_sb), FALSE);
- gtk_widget_set_sensitive(GTK_WIDGET(stop_files_lb), FALSE);
- }
-
- /* The maximum packet count spinbox is sensitive if the "Stop capture
- after N packets" checkbox is on. */
- gtk_widget_set_sensitive(GTK_WIDGET(stop_packets_sb),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_packets_cb)));
- gtk_widget_set_sensitive(GTK_WIDGET(stop_packets_lb),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_packets_cb)));
-
- /* The capture duration spinbox is sensitive if the "Stop capture
- after N seconds" checkbox is on. */
- gtk_widget_set_sensitive(GTK_WIDGET(stop_duration_sb),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_duration_cb)));
- gtk_widget_set_sensitive(GTK_WIDGET(stop_duration_om),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_duration_cb)));
-}
-
-#endif /* HAVE_LIBPCAP */
+/* capture_dlg.c
+ * Routines for packet capture windows
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_LIBPCAP
+
+#include <pcap.h>
+#include <string.h>
+#include <gtk/gtk.h>
+
+#include <epan/packet.h>
+#include "capture.h"
+#include "globals.h"
+#include <epan/resolv.h>
+#include "main.h"
+#include "ui_util.h"
+#include "capture_dlg.h"
+#include "filter_prefs.h"
+#include "simple_dialog.h"
+#include "dlg_utils.h"
+#include "pcap-util.h"
+#include "capture_combo_utils.h"
+#include "prefs.h"
+#include "ringbuffer.h"
+#include <epan/filesystem.h>
+#include "compat_macros.h"
+#include "file_dlg.h"
+#include "help_dlg.h"
+#include "gtkglobals.h"
+
+#ifdef _WIN32
+#include "capture-wpcap.h"
+#endif
+
+/* Capture callback data keys */
+#define E_CAP_IFACE_KEY "cap_iface"
+#define E_CAP_IFACE_IP_KEY "cap_iface_ip"
+#define E_CAP_SNAP_CB_KEY "cap_snap_cb"
+#define E_CAP_LT_OM_KEY "cap_lt_om"
+#define E_CAP_LT_OM_LABEL_KEY "cap_lt_om_label"
+#ifdef _WIN32
+#define E_CAP_BUFFER_SIZE_SB_KEY "cap_buffer_size_sb"
+#endif
+#define E_CAP_SNAP_SB_KEY "cap_snap_sb"
+#define E_CAP_PROMISC_KEY "cap_promisc"
+#define E_CAP_FILT_KEY "cap_filter_te"
+#define E_CAP_FILE_TE_KEY "cap_file_te"
+#define E_CAP_MULTI_FILES_ON_CB_KEY "cap_multi_files_on_cb"
+#define E_CAP_RING_FILESIZE_CB_KEY "cap_ring_filesize_cb"
+#define E_CAP_RING_FILESIZE_SB_KEY "cap_ring_filesize_sb"
+#define E_CAP_RING_FILESIZE_OM_KEY "cap_ring_filesize_om"
+#define E_CAP_FILE_DURATION_CB_KEY "cap_file_duration_cb"
+#define E_CAP_FILE_DURATION_SB_KEY "cap_file_duration_sb"
+#define E_CAP_FILE_DURATION_OM_KEY "cap_file_duration_om"
+#define E_CAP_RING_NBF_CB_KEY "cap_ring_nbf_cb"
+#define E_CAP_RING_NBF_SB_KEY "cap_ring_nbf_sb"
+#define E_CAP_RING_NBF_LB_KEY "cap_ring_nbf_lb"
+#define E_CAP_STOP_FILES_CB_KEY "cap_stop_files_cb"
+#define E_CAP_STOP_FILES_SB_KEY "cap_stop_files_sb"
+#define E_CAP_STOP_FILES_LB_KEY "cap_stop_files_lb"
+#define E_CAP_SYNC_KEY "cap_sync"
+#define E_CAP_AUTO_SCROLL_KEY "cap_auto_scroll"
+#define E_CAP_HIDE_INFO_KEY "cap_hide_info"
+#define E_CAP_STOP_PACKETS_CB_KEY "cap_stop_packets_cb"
+#define E_CAP_STOP_PACKETS_SB_KEY "cap_stop_packets_sb"
+#define E_CAP_STOP_PACKETS_LB_KEY "cap_stop_packets_lb"
+#define E_CAP_STOP_FILESIZE_CB_KEY "cap_stop_filesize_cb"
+#define E_CAP_STOP_FILESIZE_SB_KEY "cap_stop_filesize_sb"
+#define E_CAP_STOP_FILESIZE_OM_KEY "cap_stop_filesize_om"
+#define E_CAP_STOP_DURATION_CB_KEY "cap_stop_duration_cb"
+#define E_CAP_STOP_DURATION_SB_KEY "cap_stop_duration_sb"
+#define E_CAP_STOP_DURATION_OM_KEY "cap_stop_duration_om"
+#define E_CAP_M_RESOLVE_KEY "cap_m_resolve"
+#define E_CAP_N_RESOLVE_KEY "cap_n_resolve"
+#define E_CAP_T_RESOLVE_KEY "cap_t_resolve"
+
+#define E_CAP_OM_LT_VALUE_KEY "cap_om_lt_value"
+
+static void
+capture_prep_file_cb(GtkWidget *file_bt, GtkWidget *file_te);
+
+static void
+select_link_type_cb(GtkWidget *w, gpointer data);
+
+static void
+capture_prep_adjust_sensitivity(GtkWidget *tb, gpointer parent_w);
+
+static void
+capture_prep_ok_cb(GtkWidget *ok_bt, gpointer parent_w);
+
+static void
+capture_prep_destroy_cb(GtkWidget *win, gpointer user_data);
+
+static void
+capture_prep_interface_changed_cb(GtkWidget *entry, gpointer parent_w);
+
+void
+capture_stop_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+ capture_stop();
+}
+
+/*
+ * Given text that contains an interface name possibly prefixed by an
+ * interface description, extract the interface name.
+ */
+static char *
+get_if_name(char *if_text)
+{
+ char *if_name;
+
+#ifdef WIN32
+ /*
+ * We cannot assume that the interface name doesn't contain a space;
+ * some names on Windows OT do.
+ *
+ * We also can't assume it begins with "\Device\", either, as, on
+ * Windows OT, WinPcap doesn't put "\Device\" in front of the name.
+ *
+ * As I remember, we can't assume that the interface description
+ * doesn't contain a colon, either; I think some do.
+ *
+ * We can probably assume that the interface *name* doesn't contain
+ * a colon, however; if any interface name does contain a colon on
+ * Windows, it'll be time to just get rid of the damn interface
+ * descriptions in the drop-down list, have just the names in the
+ * drop-down list, and have a "Browse..." button to browse for interfaces,
+ * with names, descriptions, IP addresses, blah blah blah available when
+ * possible.
+ *
+ * So we search backwards for a colon. If we don't find it, just
+ * return the entire string; otherwise, skip the colon and any blanks
+ * after it, and return that string.
+ */
+ if_name = if_text + strlen(if_text);
+ for (;;) {
+ if (if_name == if_text) {
+ /* We're at the beginning of the string; return it. */
+ break;
+ }
+ if_name--;
+ if (*if_name == ':') {
+ /*
+ * We've found a colon.
+ * Unfortunately, a colon is used in the string "rpcap://",
+ * which is used in case of a remote capture.
+ * So we'll check to make sure the colon isn't followed by "//";
+ * it'll be followed by a blank if it separates the description
+ * and the interface name. (We don't wire in "rpcap", in case we
+ * support other protocols in the same syntax.)
+ */
+ if (strncmp(if_name, "://", 3) != 0) {
+ /*
+ * OK, we've found a colon not followed by "//". Skip blanks
+ * following it.
+ */
+ if_name++;
+ while (*if_name == ' ')
+ if_name++;
+ break;
+ }
+ }
+ /* Keep looking for a colon not followed by "//". */
+ }
+#else
+ /*
+ * There's a space between the interface description and name, and
+ * the interface name shouldn't have a space in it (it doesn't, on
+ * UNIX systems); look backwards in the string for a space.
+ *
+ * (An interface name might, however, contain a colon in it, which
+ * is why we don't use the colon search on UNIX.)
+ */
+ if_name = strrchr(if_text, ' ');
+ if (if_name == NULL) {
+ if_name = if_text;
+ } else {
+ if_name++;
+ }
+#endif
+ return if_name;
+}
+
+/*
+ * Keep a static pointer to the current "Capture Options" window, if
+ * any, so that if somebody tries to do "Capture:Start" while there's
+ * already a "Capture Options" window up, we just pop up the existing
+ * one, rather than creating a new one.
+ */
+static GtkWidget *cap_open_w;
+
+
+/* From tcptraceroute, convert a numeric IP address to a string */
+/* XXX - this functionality is already somewhere in our code */
+#define IPTOSBUFFERS 12
+char *iptos(u_long in)
+{
+ static char output[IPTOSBUFFERS][3*4+3+1];
+ static short which;
+ u_char *p;
+
+ p = (u_char *)&in;
+ which = (which + 1 == IPTOSBUFFERS ? 0 : which + 1);
+ sprintf(output[which], "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
+ return output[which];
+}
+
+
+static void
+set_link_type_list(GtkWidget *linktype_om, GtkWidget *entry)
+{
+ gchar *entry_text;
+ gchar *if_text;
+ gchar *if_name;
+ GList *if_list;
+ GList *if_entry;
+ if_info_t *if_info;
+ GList *lt_list;
+ int err;
+ char err_buf[PCAP_ERRBUF_SIZE];
+ GtkWidget *lt_menu, *lt_menu_item;
+ GList *lt_entry;
+ data_link_info_t *data_link_info;
+ gchar *linktype_menu_label;
+ guint num_supported_link_types;
+ GtkWidget *linktype_lb = OBJECT_GET_DATA(linktype_om, E_CAP_LT_OM_LABEL_KEY);
+ GtkWidget *if_ip_lb;
+ GString *ip_str = g_string_new("IP address: ");
+ int ips = 0;
+ GSList *curr_ip;
+
+ lt_menu = gtk_menu_new();
+ entry_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
+ if_text = g_strstrip(entry_text);
+ if_name = get_if_name(if_text);
+
+ /*
+ * If the interface name is in the list of known interfaces, get
+ * its list of link-layer types and set the option menu to display it.
+ *
+ * If it's not, don't bother - the user might be in the middle of
+ * editing the list, or it might be a remote device in which case
+ * getting the list could take an arbitrarily-long period of time.
+ * The list currently won't contain any remote devices (as
+ * "pcap_findalldevs()" doesn't know about remote devices, and neither
+ * does the code we use if "pcap_findalldevs()" isn't available), but
+ * should contain all the local devices on which you can capture.
+ */
+ lt_list = NULL;
+ if (*if_name != '\0') {
+ /*
+ * Try to get the list of known interfaces.
+ */
+ if_list = get_interface_list(&err, err_buf);
+ if (if_list != NULL) {
+ /*
+ * We have the list - check it.
+ */
+ for (if_entry = if_list; if_entry != NULL;
+ if_entry = g_list_next(if_entry)) {
+ if_info = if_entry->data;
+ if (strcmp(if_info->name, if_name) == 0) {
+ /*
+ * It's in the list.
+ * Get the list of link-layer types for it.
+ */
+ lt_list = get_pcap_linktype_list(if_name, err_buf);
+
+ /* create string of list of IP addresses of this interface */
+ for( ; curr_ip = g_slist_nth(if_info->ip_addr, ips); ips++) {
+ if (ips != 0) {
+ g_string_append(ip_str, ", ");
+ }
+
+ g_string_append(ip_str, iptos(*((guint32 *)curr_ip->data)));
+ }
+
+ if(if_info->loopback) {
+ g_string_append(ip_str, " (loopback)");
+ }
+ }
+ }
+ free_interface_list(if_list);
+ }
+ }
+ g_free(entry_text);
+ num_supported_link_types = 0;
+ for (lt_entry = lt_list; lt_entry != NULL; lt_entry = g_list_next(lt_entry)) {
+ data_link_info = lt_entry->data;
+ if (data_link_info->description != NULL) {
+ lt_menu_item = gtk_menu_item_new_with_label(data_link_info->description);
+ OBJECT_SET_DATA(lt_menu_item, E_CAP_LT_OM_KEY, linktype_om);
+ SIGNAL_CONNECT(lt_menu_item, "activate", select_link_type_cb,
+ GINT_TO_POINTER(data_link_info->dlt));
+ num_supported_link_types++;
+ } else {
+ /* Not supported - tell them about it but don't let them select it. */
+ linktype_menu_label = g_strdup_printf("%s (not supported)",
+ data_link_info->name);
+ lt_menu_item = gtk_menu_item_new_with_label(linktype_menu_label);
+ g_free(linktype_menu_label);
+ gtk_widget_set_sensitive(lt_menu_item, FALSE);
+ }
+ gtk_menu_append(GTK_MENU(lt_menu), lt_menu_item);
+ }
+ if (lt_list != NULL)
+ free_pcap_linktype_list(lt_list);
+ gtk_option_menu_set_menu(GTK_OPTION_MENU(linktype_om), lt_menu);
+ gtk_widget_set_sensitive(linktype_lb, num_supported_link_types >= 2);
+ gtk_widget_set_sensitive(linktype_om, num_supported_link_types >= 2);
+
+ if_ip_lb = OBJECT_GET_DATA(linktype_om, E_CAP_IFACE_KEY);
+ if(ips == 0) {
+ g_string_append(ip_str, "unknown");
+ }
+ gtk_label_set_text(GTK_LABEL(if_ip_lb), ip_str->str);
+ g_string_free(ip_str, TRUE);
+}
+
+
+#define TIME_UNIT_SECOND 0
+#define TIME_UNIT_MINUTE 1
+#define TIME_UNIT_HOUR 2
+#define TIME_UNIT_DAY 3
+#define MAX_TIME_UNITS 4
+static char *time_unit_name[MAX_TIME_UNITS] = {
+ "second(s)",
+ "minute(s)",
+ "hour(s)",
+ "day(s)",
+};
+
+static GtkWidget *time_unit_option_menu_new(guint32 value) {
+ GtkWidget *unit_om, *menu, *menu_item;
+ int i;
+
+ unit_om=gtk_option_menu_new();
+ menu=gtk_menu_new();
+ for(i=0;i<MAX_TIME_UNITS;i++){
+ menu_item=gtk_menu_item_new_with_label(time_unit_name[i]);
+ OBJECT_SET_DATA(menu_item, "time_unit", GINT_TO_POINTER(i));
+ gtk_menu_append(GTK_MENU(menu), menu_item);
+ }
+
+ /* the selected menu item can't be changed, once the option_menu
+ is created, so set the matching menu item now */
+ /* days */
+ if(value >= 60 * 60 * 24) {
+ gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_DAY);
+ } else {
+ /* hours */
+ if(value >= 60 * 60) {
+ gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_HOUR);
+ } else {
+ /* minutes */
+ if(value >= 60) {
+ gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_MINUTE);
+ } else {
+ /* seconds */
+ gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_SECOND);
+ }
+ }
+ }
+
+ gtk_option_menu_set_menu(GTK_OPTION_MENU(unit_om), menu);
+
+ return unit_om;
+}
+
+static guint32 time_unit_option_menu_convert_value(
+guint32 value)
+{
+ /* days */
+ if(value >= 60 * 60 * 24) {
+ return value / (60 * 60 * 24);
+ }
+
+ /* hours */
+ if(value >= 60 * 60) {
+ return value / (60 * 60);
+ }
+
+ /* minutes */
+ if(value >= 60) {
+ return value / 60;
+ }
+
+ /* seconds */
+ return value;
+}
+
+static guint32 time_unit_option_menu_get_value(
+GtkWidget *unit_om,
+guint32 value)
+{
+ GtkWidget *menu, *menu_item;
+ int unit;
+
+ menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(unit_om));
+ menu_item = gtk_menu_get_active(GTK_MENU(menu));
+ unit = GPOINTER_TO_INT(OBJECT_GET_DATA(menu_item, "time_unit"));
+
+
+ switch(unit) {
+ case(TIME_UNIT_SECOND):
+ return value;
+ break;
+ case(TIME_UNIT_MINUTE):
+ return value * 60;
+ break;
+ case(TIME_UNIT_HOUR):
+ return value * 60 * 60;
+ break;
+ case(TIME_UNIT_DAY):
+ return value * 60 * 60 * 24;
+ break;
+ default:
+ g_assert_not_reached();
+ return 0;
+ }
+}
+
+
+#define SIZE_UNIT_BYTES 0
+#define SIZE_UNIT_KILOBYTES 1
+#define SIZE_UNIT_MEGABYTES 2
+#define SIZE_UNIT_GIGABYTES 3
+#define MAX_SIZE_UNITS 4
+static char *size_unit_name[MAX_SIZE_UNITS] = {
+ "byte(s)",
+ "kilobyte(s)",
+ "megabyte(s)",
+ "gigabyte(s)",
+};
+
+static GtkWidget *size_unit_option_menu_new(guint32 value) {
+ GtkWidget *unit_om, *menu, *menu_item;
+ int i;
+
+ unit_om=gtk_option_menu_new();
+ menu=gtk_menu_new();
+ for(i=0;i<MAX_SIZE_UNITS;i++){
+ menu_item=gtk_menu_item_new_with_label(size_unit_name[i]);
+ OBJECT_SET_DATA(menu_item, "size_unit", GINT_TO_POINTER(i));
+ gtk_menu_append(GTK_MENU(menu), menu_item);
+ }
+
+ /* the selected menu item can't be changed, once the option_menu
+ is created, so set the matching menu item now */
+ /* gigabytes */
+ if(value >= 1024 * 1024 * 1024) {
+ gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_GIGABYTES);
+ } else {
+ /* megabytes */
+ if(value >= 1024 * 1024) {
+ gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_MEGABYTES);
+ } else {
+ /* kilobytes */
+ if(value >= 1024) {
+ gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_KILOBYTES);
+ } else {
+ /* bytes */
+ gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_BYTES);
+ }
+ }
+ }
+
+ gtk_option_menu_set_menu(GTK_OPTION_MENU(unit_om), menu);
+
+ return unit_om;
+}
+
+static guint32 size_unit_option_menu_set_value(
+guint32 value)
+{
+ /* gigabytes */
+ if(value >= 1024 * 1024 * 1024) {
+ return value / (1024 * 1024 * 1024);
+ }
+
+ /* megabytes */
+ if(value >= 1024 * 1024) {
+ return value / (1024 * 1024);
+ }
+
+ /* kilobytes */
+ if(value >= 1024) {
+ return value / 1024;
+ }
+
+ /* bytes */
+ return value;
+}
+
+static guint32 size_unit_option_menu_convert_value(
+GtkWidget *unit_om,
+guint32 value)
+{
+ GtkWidget *menu, *menu_item;
+ int unit;
+
+ menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(unit_om));
+ menu_item = gtk_menu_get_active(GTK_MENU(menu));
+ unit = GPOINTER_TO_INT(OBJECT_GET_DATA(menu_item, "size_unit"));
+
+
+ switch(unit) {
+ case(SIZE_UNIT_BYTES):
+ return value;
+ break;
+ case(SIZE_UNIT_KILOBYTES):
+ if(value > G_MAXINT / 1024) {
+ return 0;
+ } else {
+ return value * 1024;
+ }
+ break;
+ case(SIZE_UNIT_MEGABYTES):
+ if(value > G_MAXINT / (1024 * 1024)) {
+ return 0;
+ } else {
+ return value * 1024 * 1024;
+ }
+ break;
+ case(SIZE_UNIT_GIGABYTES):
+ if(value > G_MAXINT / (1024 * 1024 * 1024)) {
+ return 0;
+ } else {
+ return value * 1024 * 1024 * 1024;
+ }
+ break;
+ default:
+ g_assert_not_reached();
+ return 0;
+ }
+}
+
+
+void
+capture_prep(void)
+{
+ GtkWidget *main_vb,
+ *main_hb, *left_vb, *right_vb,
+
+ *capture_fr, *capture_vb,
+ *if_hb, *if_cb, *if_lb,
+ *if_ip_hb, *if_ip_lb,
+ *linktype_hb, *linktype_lb, *linktype_om,
+ *snap_hb, *snap_cb, *snap_sb, *snap_lb,
+ *promisc_cb,
+ *filter_hb, *filter_bt, *filter_te,
+
+ *file_fr, *file_vb,
+ *file_hb, *file_bt, *file_lb, *file_te,
+ *multi_tb, *multi_files_on_cb,
+ *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_om,
+ *file_duration_cb, *file_duration_sb, *file_duration_om,
+ *ringbuffer_nbf_cb, *ringbuffer_nbf_sb, *ringbuffer_nbf_lb,
+ *stop_files_cb, *stop_files_sb, *stop_files_lb,
+
+ *limit_fr, *limit_vb, *limit_tb,
+ *stop_packets_cb, *stop_packets_sb, *stop_packets_lb,
+ *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_om,
+ *stop_duration_cb, *stop_duration_sb, *stop_duration_om,
+
+ *display_fr, *display_vb,
+ *sync_cb, *auto_scroll_cb, *hide_info_cb,
+
+ *resolv_fr, *resolv_vb,
+ *m_resolv_cb, *n_resolv_cb, *t_resolv_cb,
+ *bbox, *ok_bt, *cancel_bt,
+ *help_bt;
+#if GTK_MAJOR_VERSION < 2
+ GtkAccelGroup *accel_group;
+#endif
+ GtkTooltips *tooltips;
+ GtkAdjustment *snap_adj, *ringbuffer_nbf_adj,
+ *stop_packets_adj, *stop_filesize_adj, *stop_duration_adj, *stop_files_adj, *ring_filesize_adj, *file_duration_adj;
+ GList *if_list, *combo_list;
+ int err;
+ int row;
+ char err_str[PCAP_ERRBUF_SIZE];
+ gchar *cant_get_if_list_errstr;
+#ifdef _WIN32
+ GtkAdjustment *buffer_size_adj;
+ GtkWidget *buffer_size_lb, *buffer_size_sb;
+#endif
+ guint32 value;
+
+ if (cap_open_w != NULL) {
+ /* There's already a "Capture Options" dialog box; reactivate it. */
+ reactivate_window(cap_open_w);
+ return;
+ }
+
+#ifdef _WIN32
+ /* Is WPcap loaded? */
+ if (!has_wpcap) {
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Unable to load WinPcap (wpcap.dll); Ethereal will not be able\n"
+ "to capture packets.\n\n"
+ "In order to capture packets, WinPcap must be installed; see\n"
+ "\n"
+ " http://winpcap.polito.it/\n"
+ "\n"
+ "or the mirror at\n"
+ "\n"
+ " http://winpcap.mirror.ethereal.com/\n"
+ "\n"
+ "or the mirror at\n"
+ "\n"
+ " http://www.mirrors.wiretapped.net/security/packet-capture/winpcap/\n"
+ "\n"
+ "for a downloadable version of WinPcap and for instructions\n"
+ "on how to install WinPcap.");
+ return;
+ }
+#endif
+
+ if_list = get_interface_list(&err, err_str);
+ if (if_list == NULL && err == CANT_GET_INTERFACE_LIST) {
+ cant_get_if_list_errstr = cant_get_if_list_error_message(err_str);
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s",
+ cant_get_if_list_errstr);
+ g_free(cant_get_if_list_errstr);
+ }
+
+ cap_open_w = dlg_window_new("Ethereal: Capture Options");
+
+ tooltips = gtk_tooltips_new();
+
+#if GTK_MAJOR_VERSION < 2
+ /* Accelerator group for the accelerators (or, as they're called in
+ Windows and, I think, in Motif, "mnemonics"; Alt+<key> is a mnemonic,
+ Ctrl+<key> is an accelerator). */
+ accel_group = gtk_accel_group_new();
+ gtk_window_add_accel_group(GTK_WINDOW(cap_open_w), accel_group);
+#endif
+
+ main_vb = gtk_vbox_new(FALSE, 0);
+ gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
+ gtk_container_add(GTK_CONTAINER(cap_open_w), main_vb);
+
+ /* Capture-related options frame */
+ capture_fr = gtk_frame_new("Capture");
+ gtk_container_add(GTK_CONTAINER(main_vb), capture_fr);
+
+ capture_vb = gtk_vbox_new(FALSE, 3);
+ gtk_container_border_width(GTK_CONTAINER(capture_vb), 5);
+ gtk_container_add(GTK_CONTAINER(capture_fr), capture_vb);
+
+ /* Interface row */
+ if_hb = gtk_hbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(capture_vb), if_hb);
+
+ if_lb = gtk_label_new("Interface:");
+ gtk_box_pack_start(GTK_BOX(if_hb), if_lb, FALSE, FALSE, 6);
+
+ if_cb = gtk_combo_new();
+ combo_list = build_capture_combo_list(if_list, TRUE);
+ if (combo_list != NULL)
+ gtk_combo_set_popdown_strings(GTK_COMBO(if_cb), combo_list);
+ if (cfile.iface == NULL && prefs.capture_device != NULL) {
+ /* No interface was specified on the command line or in a previous
+ capture, but there is one specified in the preferences file;
+ make the one from the preferences file the default */
+ cfile.iface = g_strdup(prefs.capture_device);
+ }
+ if (cfile.iface != NULL)
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), cfile.iface);
+ else if (combo_list != NULL) {
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry),
+ (char *)combo_list->data);
+ }
+ free_capture_combo_list(combo_list);
+ free_interface_list(if_list);
+ gtk_tooltips_set_tip(tooltips, GTK_COMBO(if_cb)->entry,
+ "Choose which interface (network card) will be used to capture packets from. "
+ "Be sure to select the correct one, as it's a common mistake to select the wrong interface.", NULL);
+ gtk_box_pack_start(GTK_BOX(if_hb), if_cb, TRUE, TRUE, 6);
+
+ if_ip_hb = gtk_hbox_new(FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(capture_vb), if_ip_hb, FALSE, FALSE, 0);
+
+ if_ip_lb = gtk_label_new("");
+ gtk_box_pack_start(GTK_BOX(if_ip_hb), if_ip_lb, FALSE, FALSE, 6);
+
+ /* Linktype row */
+ linktype_hb = gtk_hbox_new(FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(capture_vb), linktype_hb, FALSE, FALSE, 0);
+
+ linktype_lb = gtk_label_new("Link-layer header type:");
+ gtk_box_pack_start(GTK_BOX(linktype_hb), linktype_lb, FALSE, FALSE, 6);
+
+ linktype_om = gtk_option_menu_new();
+ OBJECT_SET_DATA(linktype_om, E_CAP_LT_OM_LABEL_KEY, linktype_lb);
+ /* Default to "use the default" */
+ OBJECT_SET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY, GINT_TO_POINTER(-1));
+ OBJECT_SET_DATA(linktype_om, E_CAP_IFACE_KEY, if_ip_lb);
+ set_link_type_list(linktype_om, GTK_COMBO(if_cb)->entry);
+ /*
+ * XXX - in some cases, this is "multiple link-layer header types", e.g.
+ * some 802.11 interfaces on FreeBSD 5.2 and later, where you can request
+ * fake Ethernet, 802.11, or 802.11-plus-radio-information headers.
+ *
+ * In other cases, it's "multiple link-layer types", e.g., with recent
+ * versions of libpcap, a DAG card on an "HDLC" WAN, where you can
+ * request Cisco HDLC or PPP depending on what type of traffic is going
+ * over the WAN, or an Ethernet interface, where you can request Ethernet
+ * or DOCSIS, the latter being for some Cisco cable modem equipment that
+ * can be configured to send raw DOCSIS frames over an Ethernet inside
+ * Ethernet low-level framing, for traffic capture purposes.
+ *
+ * We leave it as "multiple link-layer types" for now.
+ */
+ gtk_tooltips_set_tip(tooltips, linktype_om,
+ "The selected interface supports multiple link-layer types; select the desired one.", NULL);
+ gtk_box_pack_start (GTK_BOX(linktype_hb), linktype_om, FALSE, FALSE, 0);
+ SIGNAL_CONNECT(GTK_ENTRY(GTK_COMBO(if_cb)->entry), "changed",
+ capture_prep_interface_changed_cb, linktype_om);
+
+#ifdef _WIN32
+ buffer_size_lb = gtk_label_new("Buffer size:");
+ gtk_box_pack_start (GTK_BOX(linktype_hb), buffer_size_lb, FALSE, FALSE, 0);
+
+ buffer_size_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat) capture_opts.buffer_size,
+ 1, 65535, 1.0, 10.0, 0.0);
+ buffer_size_sb = gtk_spin_button_new (buffer_size_adj, 0, 0);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON (buffer_size_sb), (gfloat) capture_opts.buffer_size);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (buffer_size_sb), TRUE);
+ WIDGET_SET_SIZE(buffer_size_sb, 80, -1);
+ gtk_tooltips_set_tip(tooltips, buffer_size_sb,
+ "The memory buffer size used while capturing. If you notice packet drops, you can try to increase this size.", NULL);
+ gtk_box_pack_start (GTK_BOX(linktype_hb), buffer_size_sb, FALSE, FALSE, 0);
+
+ buffer_size_lb = gtk_label_new("megabyte(s)");
+ gtk_box_pack_start (GTK_BOX(linktype_hb), buffer_size_lb, FALSE, FALSE, 0);
+#endif
+
+ /* Promiscuous mode row */
+ promisc_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
+ "Capture packets in _promiscuous mode", accel_group);
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(promisc_cb),
+ capture_opts.promisc_mode);
+ gtk_tooltips_set_tip(tooltips, promisc_cb,
+ "Usually a network card will only capture the traffic sent to its own network address. "
+ "If you want to capture all traffic that the network card can \"see\", mark this option. "
+ "See the FAQ for some more details of capturing packets from a switched network.", NULL);
+ gtk_container_add(GTK_CONTAINER(capture_vb), promisc_cb);
+
+ /* Capture length row */
+ snap_hb = gtk_hbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(capture_vb), snap_hb);
+
+ snap_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("_Limit each packet to", accel_group);
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(snap_cb),
+ capture_opts.has_snaplen);
+ SIGNAL_CONNECT(snap_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+ gtk_tooltips_set_tip(tooltips, snap_cb,
+ "Limit the maximum number of bytes to be captured from each packet. This size includes the "
+ "link-layer header and all subsequent headers. ", NULL);
+ gtk_box_pack_start(GTK_BOX(snap_hb), snap_cb, FALSE, FALSE, 0);
+
+ snap_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat) capture_opts.snaplen,
+ MIN_PACKET_SIZE, WTAP_MAX_PACKET_SIZE, 1.0, 10.0, 0.0);
+ snap_sb = gtk_spin_button_new (snap_adj, 0, 0);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (snap_sb), TRUE);
+ WIDGET_SET_SIZE(snap_sb, 80, -1);
+ gtk_box_pack_start (GTK_BOX(snap_hb), snap_sb, FALSE, FALSE, 0);
+
+ snap_lb = gtk_label_new("bytes");
+ gtk_misc_set_alignment(GTK_MISC(snap_lb), 0, 0.5);
+ gtk_box_pack_start(GTK_BOX(snap_hb), snap_lb, FALSE, FALSE, 0);
+
+ /* Filter row */
+ filter_hb = gtk_hbox_new(FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(capture_vb), filter_hb, FALSE, FALSE, 0);
+
+ filter_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_CAPTURE_FILTER_ENTRY);
+ SIGNAL_CONNECT(filter_bt, "clicked", capture_filter_construct_cb, NULL);
+ SIGNAL_CONNECT(filter_bt, "destroy", filter_button_destroy_cb, NULL);
+ gtk_tooltips_set_tip(tooltips, filter_bt,
+ "Select a capture filter to reduce the amount of packets to be captured. "
+ "See \"Capture Filters\" in the online help for further information how to use it.",
+ NULL);
+ gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, FALSE, 3);
+
+ filter_te = gtk_entry_new();
+ if (cfile.cfilter) gtk_entry_set_text(GTK_ENTRY(filter_te), cfile.cfilter);
+ OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_te);
+ gtk_tooltips_set_tip(tooltips, filter_te,
+ "Enter a capture filter to reduce the amount of packets to be captured. "
+ "See \"Capture Filters\" in the online help for further information how to use it.",
+ NULL);
+ gtk_box_pack_start(GTK_BOX(filter_hb), filter_te, TRUE, TRUE, 3);
+
+ main_hb = gtk_hbox_new(FALSE, 5);
+ gtk_container_border_width(GTK_CONTAINER(main_hb), 0);
+ gtk_container_add(GTK_CONTAINER(main_vb), main_hb);
+
+ left_vb = gtk_vbox_new(FALSE, 0);
+ gtk_container_border_width(GTK_CONTAINER(left_vb), 0);
+ gtk_box_pack_start(GTK_BOX(main_hb), left_vb, TRUE, TRUE, 0);
+
+ right_vb = gtk_vbox_new(FALSE, 0);
+ gtk_container_border_width(GTK_CONTAINER(right_vb), 0);
+ gtk_box_pack_start(GTK_BOX(main_hb), right_vb, FALSE, FALSE, 0);
+
+
+ /* Capture file-related options frame */
+ file_fr = gtk_frame_new("Capture File(s)");
+ gtk_container_add(GTK_CONTAINER(left_vb), file_fr);
+
+ file_vb = gtk_vbox_new(FALSE, 3);
+ gtk_container_border_width(GTK_CONTAINER(file_vb), 5);
+ gtk_container_add(GTK_CONTAINER(file_fr), file_vb);
+
+ /* File row */
+ file_hb = gtk_hbox_new(FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(file_vb), file_hb, FALSE, FALSE, 0);
+
+ file_lb = gtk_label_new("File:");
+ gtk_box_pack_start(GTK_BOX(file_hb), file_lb, FALSE, FALSE, 3);
+
+ file_te = gtk_entry_new();
+ gtk_tooltips_set_tip(tooltips, file_te,
+ "Enter the file name to which captured data will be written. "
+ "If you don't enter something here, a temporary file will be used.",
+ NULL);
+ gtk_box_pack_start(GTK_BOX(file_hb), file_te, TRUE, TRUE, 3);
+
+ file_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_BROWSE);
+ gtk_tooltips_set_tip(tooltips, file_bt,
+ "Select a file to which captured data will be written, "
+ "instead of entering the file name directly. ",
+ NULL);
+ gtk_box_pack_start(GTK_BOX(file_hb), file_bt, FALSE, FALSE, 3);
+
+ SIGNAL_CONNECT(file_bt, "clicked", capture_prep_file_cb, file_te);
+
+ /* multiple files table */
+ multi_tb = gtk_table_new(5, 3, FALSE);
+ gtk_table_set_row_spacings(GTK_TABLE(multi_tb), 1);
+ gtk_table_set_col_spacings(GTK_TABLE(multi_tb), 3);
+ gtk_box_pack_start(GTK_BOX(file_vb), multi_tb, FALSE, FALSE, 0);
+ row = 0;
+
+ /* multiple files row */
+ multi_files_on_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Use _multiple files", accel_group);
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(multi_files_on_cb),
+ capture_opts.multi_files_on);
+ SIGNAL_CONNECT(multi_files_on_cb, "toggled", capture_prep_adjust_sensitivity,
+ cap_open_w);
+ gtk_tooltips_set_tip(tooltips, multi_files_on_cb,
+ "Instead of using a single capture file, multiple files will be created. "
+ "The generated file names will contain an incrementing number and the start time of the capture.", NULL);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), multi_files_on_cb, 0, 1, row, row+1);
+ row++;
+
+ /* Ring buffer filesize row */
+ ring_filesize_cb = gtk_check_button_new_with_label("Next file every");
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ring_filesize_cb),
+ capture_opts.has_autostop_filesize);
+ SIGNAL_CONNECT(ring_filesize_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+ gtk_tooltips_set_tip(tooltips, ring_filesize_cb,
+ "If the selected file size is exceeded, capturing switches to the next file.",
+ NULL);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), ring_filesize_cb, 0, 1, row, row+1);
+
+ ring_filesize_adj = (GtkAdjustment *) gtk_adjustment_new(0.0,
+ 1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
+ ring_filesize_sb = gtk_spin_button_new (ring_filesize_adj, 0, 0);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (ring_filesize_sb), TRUE);
+ WIDGET_SET_SIZE(ring_filesize_sb, 80, -1);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), ring_filesize_sb, 1, 2, row, row+1);
+
+ ring_filesize_om = size_unit_option_menu_new(capture_opts.autostop_filesize);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), ring_filesize_om, 2, 3, row, row+1);
+
+ value = size_unit_option_menu_set_value(capture_opts.autostop_filesize);
+ gtk_adjustment_set_value(ring_filesize_adj, (gfloat) value);
+
+ row++;
+
+ /* Ring buffer duration row */
+ file_duration_cb = gtk_check_button_new_with_label("Next file every");
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(file_duration_cb),
+ capture_opts.has_file_duration);
+ SIGNAL_CONNECT(file_duration_cb, "toggled",
+ capture_prep_adjust_sensitivity, cap_open_w);
+ gtk_tooltips_set_tip(tooltips, file_duration_cb,
+ "If the selected duration is exceeded, capturing switches to the next file.",
+ NULL);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), file_duration_cb, 0, 1, row, row+1);
+
+ file_duration_adj = (GtkAdjustment *)gtk_adjustment_new(0.0,
+ 1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
+ file_duration_sb = gtk_spin_button_new (file_duration_adj, 0, 0);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (file_duration_sb), TRUE);
+ WIDGET_SET_SIZE(file_duration_sb, 80, -1);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), file_duration_sb, 1, 2, row, row+1);
+
+ file_duration_om = time_unit_option_menu_new(capture_opts.file_duration);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), file_duration_om, 2, 3, row, row+1);
+
+ value = time_unit_option_menu_convert_value(capture_opts.file_duration);
+ gtk_adjustment_set_value(file_duration_adj, (gfloat) value);
+ row++;
+
+ /* Ring buffer files row */
+ ringbuffer_nbf_cb = gtk_check_button_new_with_label("Ring buffer with");
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb),
+ capture_opts.has_ring_num_files);
+ SIGNAL_CONNECT(ringbuffer_nbf_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+ gtk_tooltips_set_tip(tooltips, ringbuffer_nbf_cb,
+ "After capturing has switched to the next file and the given number of files has exceeded, "
+ "the oldest file will be removed.",
+ NULL);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), ringbuffer_nbf_cb, 0, 1, row, row+1);
+
+ ringbuffer_nbf_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat) capture_opts.ring_num_files,
+ 2/*RINGBUFFER_MIN_NUM_FILES*/, RINGBUFFER_MAX_NUM_FILES, 1.0, 10.0, 0.0);
+ ringbuffer_nbf_sb = gtk_spin_button_new (ringbuffer_nbf_adj, 0, 0);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (ringbuffer_nbf_sb), TRUE);
+ WIDGET_SET_SIZE(ringbuffer_nbf_sb, 80, -1);
+ SIGNAL_CONNECT(ringbuffer_nbf_sb, "changed", capture_prep_adjust_sensitivity, cap_open_w);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), ringbuffer_nbf_sb, 1, 2, row, row+1);
+
+ ringbuffer_nbf_lb = gtk_label_new("files");
+ gtk_misc_set_alignment(GTK_MISC(ringbuffer_nbf_lb), 0, 0.5);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), ringbuffer_nbf_lb, 2, 3, row, row+1);
+ row++;
+
+ /* Files row */
+ stop_files_cb = gtk_check_button_new_with_label("Stop capture after");
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_files_cb),
+ capture_opts.has_autostop_files);
+ SIGNAL_CONNECT(stop_files_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+ gtk_tooltips_set_tip(tooltips, stop_files_cb,
+ "Stop capturing after the given number of \"file switches\" have been done.", NULL);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), stop_files_cb, 0, 1, row, row+1);
+
+ stop_files_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat)capture_opts.autostop_files,
+ 1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
+ stop_files_sb = gtk_spin_button_new (stop_files_adj, 0, 0);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_files_sb), TRUE);
+ WIDGET_SET_SIZE(stop_files_sb, 80, -1);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), stop_files_sb, 1, 2, row, row+1);
+
+ stop_files_lb = gtk_label_new("file(s)");
+ gtk_misc_set_alignment(GTK_MISC(stop_files_lb), 0, 0.5);
+ gtk_table_attach_defaults(GTK_TABLE(multi_tb), stop_files_lb, 2, 3, row, row+1);
+ row++;
+
+ /* Capture limits frame */
+ limit_fr = gtk_frame_new("Stop Capture ...");
+ gtk_container_add(GTK_CONTAINER(left_vb), limit_fr);
+
+ limit_vb = gtk_vbox_new(FALSE, 3);
+ gtk_container_border_width(GTK_CONTAINER(limit_vb), 5);
+ gtk_container_add(GTK_CONTAINER(limit_fr), limit_vb);
+
+ /* limits table */
+ limit_tb = gtk_table_new(3, 3, FALSE);
+ gtk_table_set_row_spacings(GTK_TABLE(limit_tb), 1);
+ gtk_table_set_col_spacings(GTK_TABLE(limit_tb), 3);
+ gtk_box_pack_start(GTK_BOX(limit_vb), limit_tb, FALSE, FALSE, 0);
+ row = 0;
+
+ /* Packet count row */
+ stop_packets_cb = gtk_check_button_new_with_label("... after");
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_packets_cb),
+ capture_opts.has_autostop_packets);
+ SIGNAL_CONNECT(stop_packets_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+ gtk_tooltips_set_tip(tooltips, stop_packets_cb,
+ "Stop capturing after the given number of packets have been captured.", NULL);
+ gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_packets_cb, 0, 1, row, row+1);
+
+ stop_packets_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat)capture_opts.autostop_packets,
+ 1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
+ stop_packets_sb = gtk_spin_button_new (stop_packets_adj, 0, 0);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_packets_sb), TRUE);
+ WIDGET_SET_SIZE(stop_packets_sb, 80, -1);
+ gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_packets_sb, 1, 2, row, row+1);
+
+ stop_packets_lb = gtk_label_new("packet(s)");
+ gtk_misc_set_alignment(GTK_MISC(stop_packets_lb), 0, 0.5);
+ gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_packets_lb, 2, 3, row, row+1);
+ row++;
+
+ /* Filesize row */
+ stop_filesize_cb = gtk_check_button_new_with_label("... after");
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_filesize_cb),
+ capture_opts.has_autostop_filesize);
+ SIGNAL_CONNECT(stop_filesize_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+ gtk_tooltips_set_tip(tooltips, stop_filesize_cb,
+ "Stop capturing after the given amount of capture data has been captured.", NULL);
+ gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_filesize_cb, 0, 1, row, row+1);
+
+ stop_filesize_adj = (GtkAdjustment *) gtk_adjustment_new(0.0,
+ 1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
+ stop_filesize_sb = gtk_spin_button_new (stop_filesize_adj, 0, 0);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_filesize_sb), TRUE);
+ WIDGET_SET_SIZE(stop_filesize_sb, 80, -1);
+ gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_filesize_sb, 1, 2, row, row+1);
+
+ stop_filesize_om = size_unit_option_menu_new(capture_opts.autostop_filesize);
+ gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_filesize_om, 2, 3, row, row+1);
+
+ value = size_unit_option_menu_set_value(capture_opts.autostop_filesize);
+ gtk_adjustment_set_value(stop_filesize_adj, (gfloat) value);
+
+ row++;
+
+ /* Duration row */
+ stop_duration_cb = gtk_check_button_new_with_label("... after");
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_duration_cb),
+ capture_opts.has_autostop_duration);
+ SIGNAL_CONNECT(stop_duration_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+ gtk_tooltips_set_tip(tooltips, stop_duration_cb,
+ "Stop capturing after the given time is exceeded.", NULL);
+ gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_duration_cb, 0, 1, row, row+1);
+
+ stop_duration_adj = (GtkAdjustment *) gtk_adjustment_new(0.0,
+ 1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
+ stop_duration_sb = gtk_spin_button_new (stop_duration_adj, 0, 0);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_duration_sb), TRUE);
+ WIDGET_SET_SIZE(stop_duration_sb, 80, -1);
+ gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_duration_sb, 1, 2, row, row+1);
+
+ stop_duration_om = time_unit_option_menu_new(capture_opts.autostop_duration);
+ gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_duration_om, 2, 3, row, row+1);
+
+ value = time_unit_option_menu_convert_value(capture_opts.autostop_duration);
+ gtk_adjustment_set_value(stop_duration_adj, (gfloat) value);
+ row++;
+
+ /* Display-related options frame */
+ display_fr = gtk_frame_new("Display Options");
+ gtk_container_add(GTK_CONTAINER(right_vb), display_fr);
+
+ display_vb = gtk_vbox_new(FALSE, 0);
+ gtk_container_border_width(GTK_CONTAINER(display_vb), 5);
+ gtk_container_add(GTK_CONTAINER(display_fr), display_vb);
+
+ /* "Update display in real time" row */
+ sync_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
+ "_Update list of packets in real time", accel_group);
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sync_cb),
+ capture_opts.sync_mode);
+ SIGNAL_CONNECT(sync_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+ gtk_tooltips_set_tip(tooltips, sync_cb,
+ "Using this option will show the captured packets immediately on the main screen. "
+ "Please note: this will slow down capturing, so increased packet drops might appear.", NULL);
+ gtk_container_add(GTK_CONTAINER(display_vb), sync_cb);
+
+ /* "Auto-scroll live update" row */
+ auto_scroll_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
+ "_Automatic scrolling in live capture", accel_group);
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(auto_scroll_cb), auto_scroll_live);
+ gtk_tooltips_set_tip(tooltips, auto_scroll_cb,
+ "This will scroll the \"Packet List\" automatically to the latest captured packet, "
+ "when the \"Update List of packets in real time\" option is used.", NULL);
+ gtk_container_add(GTK_CONTAINER(display_vb), auto_scroll_cb);
+
+ /* "Hide capture info" row */
+ hide_info_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
+ "_Hide capture info dialog", accel_group);
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(hide_info_cb), !capture_opts.show_info);
+ gtk_tooltips_set_tip(tooltips, hide_info_cb,
+ "Hide the capture info dialog while capturing.", NULL);
+ gtk_container_add(GTK_CONTAINER(display_vb), hide_info_cb);
+
+ /* Name Resolution frame */
+ resolv_fr = gtk_frame_new("Name Resolution");
+ gtk_container_add(GTK_CONTAINER(right_vb), resolv_fr);
+
+ resolv_vb = gtk_vbox_new(FALSE, 0);
+ gtk_container_border_width(GTK_CONTAINER(resolv_vb), 5);
+ gtk_container_add(GTK_CONTAINER(resolv_fr), resolv_vb);
+
+ m_resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
+ "Enable _MAC name resolution", accel_group);
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(m_resolv_cb),
+ g_resolv_flags & RESOLV_MAC);
+ gtk_tooltips_set_tip(tooltips, m_resolv_cb,
+ "Perform MAC layer name resolution while capturing.", NULL);
+ gtk_container_add(GTK_CONTAINER(resolv_vb), m_resolv_cb);
+
+ n_resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
+ "Enable _network name resolution", accel_group);
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(n_resolv_cb),
+ g_resolv_flags & RESOLV_NETWORK);
+ gtk_tooltips_set_tip(tooltips, n_resolv_cb,
+ "Perform network layer name resolution while capturing.", NULL);
+ gtk_container_add(GTK_CONTAINER(resolv_vb), n_resolv_cb);
+
+ t_resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
+ "Enable _transport name resolution", accel_group);
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(t_resolv_cb),
+ g_resolv_flags & RESOLV_TRANSPORT);
+ gtk_tooltips_set_tip(tooltips, t_resolv_cb,
+ "Perform transport layer name resolution while capturing.", NULL);
+ gtk_container_add(GTK_CONTAINER(resolv_vb), t_resolv_cb);
+
+ /* Button row: OK and cancel buttons */
+ bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
+ gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
+
+ ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_OK);
+ SIGNAL_CONNECT(ok_bt, "clicked", capture_prep_ok_cb, cap_open_w);
+ gtk_tooltips_set_tip(tooltips, ok_bt,
+ "Start the capture process.", NULL);
+
+ cancel_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
+ gtk_tooltips_set_tip(tooltips, cancel_bt,
+ "Cancel and exit dialog.", NULL);
+ window_set_cancel_button(cap_open_w, cancel_bt, window_cancel_button_cb);
+
+ help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
+ gtk_tooltips_set_tip(tooltips, help_bt,
+ "Show help about capturing.", NULL);
+ SIGNAL_CONNECT(help_bt, "clicked", help_topic_cb, "Capturing");
+
+ gtk_widget_grab_default(ok_bt);
+
+ /* Attach pointers to needed widgets to the capture prefs window/object */
+ OBJECT_SET_DATA(cap_open_w, E_CAP_IFACE_KEY, if_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_SNAP_CB_KEY, snap_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_SNAP_SB_KEY, snap_sb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_LT_OM_KEY, linktype_om);
+#ifdef _WIN32
+ OBJECT_SET_DATA(cap_open_w, E_CAP_BUFFER_SIZE_SB_KEY, buffer_size_sb);
+#endif
+ OBJECT_SET_DATA(cap_open_w, E_CAP_PROMISC_KEY, promisc_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_FILT_KEY, filter_te);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_FILE_TE_KEY, file_te);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_MULTI_FILES_ON_CB_KEY, multi_files_on_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_RING_NBF_CB_KEY, ringbuffer_nbf_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_RING_NBF_SB_KEY, ringbuffer_nbf_sb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_RING_NBF_LB_KEY, ringbuffer_nbf_lb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_RING_FILESIZE_CB_KEY, ring_filesize_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_RING_FILESIZE_SB_KEY, ring_filesize_sb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_RING_FILESIZE_OM_KEY, ring_filesize_om);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_FILE_DURATION_CB_KEY, file_duration_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_FILE_DURATION_SB_KEY, file_duration_sb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_FILE_DURATION_OM_KEY, file_duration_om);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_SYNC_KEY, sync_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_AUTO_SCROLL_KEY, auto_scroll_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_HIDE_INFO_KEY, hide_info_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_PACKETS_CB_KEY, stop_packets_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_PACKETS_SB_KEY, stop_packets_sb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_PACKETS_LB_KEY, stop_packets_lb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILESIZE_CB_KEY, stop_filesize_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILESIZE_SB_KEY, stop_filesize_sb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILESIZE_OM_KEY, stop_filesize_om);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_DURATION_CB_KEY, stop_duration_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_DURATION_SB_KEY, stop_duration_sb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_DURATION_OM_KEY, stop_duration_om);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILES_CB_KEY, stop_files_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILES_SB_KEY, stop_files_sb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILES_LB_KEY, stop_files_lb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_M_RESOLVE_KEY, m_resolv_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_N_RESOLVE_KEY, n_resolv_cb);
+ OBJECT_SET_DATA(cap_open_w, E_CAP_T_RESOLVE_KEY, t_resolv_cb);
+
+ /* Set the sensitivity of various widgets as per the settings of other
+ widgets. */
+ capture_prep_adjust_sensitivity(NULL, cap_open_w);
+
+ /* Catch the "activate" signal on the text
+ entries, so that if the user types Return there, we act as if the
+ "OK" button had been selected, as happens if Return is typed if some
+ widget that *doesn't* handle the Return key has the input focus. */
+ dlg_set_activate(GTK_COMBO(if_cb)->entry, ok_bt);
+ dlg_set_activate(filter_te, ok_bt);
+ dlg_set_activate(file_te, ok_bt);
+
+ /* XXX - why does not
+
+ gtk_widget_grab_focus(if_cb);
+
+ give the initial focus to the "Interface" combo box?
+
+ Or should I phrase that as "why does GTK+ continually frustrate
+ attempts to make GUIs driveable from the keyboard?" We have to
+ go catch the activate signal on every single GtkEntry widget
+ (rather than having widgets whose activate signal is *not*
+ caught not catch the Return keystroke, so that it passes on,
+ ultimately, to the window, which can activate the default
+ widget, i.e. the "OK" button); we have to catch the "key_press_event"
+ signal and have the handler check for ESC, so that we can have ESC
+ activate the "Cancel" button; in order to support Alt+<key> mnemonics
+ for buttons and the like, we may have to construct an accelerator
+ group by hand and set up the accelerators by hand (if that even
+ works - I've not tried it yet); we have to do a "gtk_widget_grab_focus()"
+ to keep some container widget from getting the initial focus, so that
+ you don't have to tab into the first widget in order to start typing
+ in it; and it now appears that you simply *can't* make a combo box
+ get the initial focus, at least not in the obvious fashion. Sigh.... */
+
+ SIGNAL_CONNECT(cap_open_w, "delete_event", window_delete_event_cb, NULL);
+ SIGNAL_CONNECT(cap_open_w, "destroy", capture_prep_destroy_cb, NULL);
+
+ gtk_widget_show_all(cap_open_w);
+ window_present(cap_open_w);
+}
+
+static void
+capture_prep_answered_cb(gpointer dialog _U_, gint btn, gpointer data)
+{
+ switch(btn) {
+ case(ESD_BTN_SAVE):
+ /* save file first */
+ file_save_as_cmd(after_save_capture_dialog, data);
+ break;
+ case(ESD_BTN_DONT_SAVE):
+ capture_prep();
+ break;
+ case(ESD_BTN_CANCEL):
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
+
+void
+capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+ gpointer dialog;
+
+ if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
+ /* user didn't saved his current file, ask him */
+ dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_SAVE_DONTSAVE_CANCEL,
+ PRIMARY_TEXT_START "Save capture file before starting a new capture?" PRIMARY_TEXT_END "\n\n"
+ "If you start a new capture without saving, your current capture data will\nbe discarded.");
+ simple_dialog_set_cb(dialog, capture_prep_answered_cb, NULL);
+ } else {
+ /* unchanged file, just capture a new one */
+ capture_prep();
+ }
+}
+
+static void
+select_link_type_cb(GtkWidget *w, gpointer data)
+{
+ int new_linktype = GPOINTER_TO_INT(data);
+ GtkWidget *linktype_om = OBJECT_GET_DATA(w, E_CAP_LT_OM_KEY);
+ int old_linktype = GPOINTER_TO_INT(OBJECT_GET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY));
+
+ if (old_linktype != new_linktype)
+ OBJECT_SET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY, GINT_TO_POINTER(new_linktype));
+}
+
+static void
+capture_prep_file_cb(GtkWidget *file_bt, GtkWidget *file_te)
+{
+ file_selection_browse(file_bt, file_te, "Ethereal: Specify a Capture File", FILE_SELECTION_OPEN);
+}
+
+
+static void
+capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) {
+ GtkWidget *if_cb, *snap_cb, *snap_sb, *promisc_cb, *filter_te,
+ *file_te, *multi_files_on_cb, *ringbuffer_nbf_sb, *ringbuffer_nbf_cb,
+ *linktype_om, *sync_cb, *auto_scroll_cb, *hide_info_cb,
+ *stop_packets_cb, *stop_packets_sb,
+ *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_om,
+ *stop_duration_cb, *stop_duration_sb, *stop_duration_om,
+ *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_om,
+ *file_duration_cb, *file_duration_sb, *file_duration_om,
+ *stop_files_cb, *stop_files_sb,
+ *m_resolv_cb, *n_resolv_cb, *t_resolv_cb;
+#ifdef _WIN32
+ GtkWidget *buffer_size_sb;
+#endif
+ gchar *entry_text;
+ gchar *if_text;
+ gchar *if_name;
+ const gchar *filter_text;
+ gchar *save_file;
+ const gchar *g_save_file;
+ gchar *cf_name;
+ gchar *dirname;
+ gint32 tmp;
+
+ if_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_IFACE_KEY);
+ snap_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SNAP_CB_KEY);
+ snap_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SNAP_SB_KEY);
+ linktype_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_LT_OM_KEY);
+#ifdef _WIN32
+ buffer_size_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_BUFFER_SIZE_SB_KEY);
+#endif
+ promisc_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_PROMISC_KEY);
+ filter_te = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILT_KEY);
+ file_te = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_TE_KEY);
+ multi_files_on_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_MULTI_FILES_ON_CB_KEY);
+ ringbuffer_nbf_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_CB_KEY);
+ ringbuffer_nbf_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_SB_KEY);
+ ring_filesize_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_CB_KEY);
+ ring_filesize_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_SB_KEY);
+ ring_filesize_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_OM_KEY);
+ file_duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_CB_KEY);
+ file_duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_SB_KEY);
+ file_duration_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_OM_KEY);
+ sync_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SYNC_KEY);
+ auto_scroll_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_AUTO_SCROLL_KEY);
+ hide_info_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_HIDE_INFO_KEY);
+ stop_packets_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_CB_KEY);
+ stop_packets_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_SB_KEY);
+ stop_filesize_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_CB_KEY);
+ stop_filesize_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_SB_KEY);
+ stop_filesize_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_OM_KEY);
+ stop_duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_CB_KEY);
+ stop_duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_SB_KEY);
+ stop_duration_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_OM_KEY);
+ stop_files_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_CB_KEY);
+ stop_files_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_SB_KEY);
+ m_resolv_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_M_RESOLVE_KEY);
+ n_resolv_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_N_RESOLVE_KEY);
+ t_resolv_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_T_RESOLVE_KEY);
+
+ entry_text =
+ g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry)));
+ if_text = g_strstrip(entry_text);
+ if_name = get_if_name(if_text);
+ if (*if_name == '\0') {
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "You didn't specify an interface on which to capture packets.");
+ g_free(entry_text);
+ return;
+ }
+ if (cfile.iface)
+ g_free(cfile.iface);
+ cfile.iface = g_strdup(if_name);
+ g_free(entry_text);
+
+ capture_opts.linktype =
+ GPOINTER_TO_INT(OBJECT_GET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY));
+
+#ifdef _WIN32
+ capture_opts.buffer_size =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(buffer_size_sb));
+#endif
+
+ capture_opts.has_snaplen =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(snap_cb));
+ if (capture_opts.has_snaplen) {
+ capture_opts.snaplen =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(snap_sb));
+ if (capture_opts.snaplen < 1)
+ capture_opts.snaplen = WTAP_MAX_PACKET_SIZE;
+ else if (capture_opts.snaplen < MIN_PACKET_SIZE)
+ capture_opts.snaplen = MIN_PACKET_SIZE;
+ }
+
+ capture_opts.promisc_mode =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(promisc_cb));
+
+ /* XXX - don't try to get clever and set "cfile.filter" to NULL if the
+ filter string is empty, as an indication that we don't have a filter
+ and thus don't have to set a filter when capturing - the version of
+ libpcap in Red Hat Linux 6.1, and versions based on later patches
+ in that series, don't bind the AF_PACKET socket to an interface
+ until a filter is set, which means they aren't bound at all if
+ no filter is set, which means no packets arrive as input on that
+ socket, which means Ethereal never sees any packets. */
+ filter_text = gtk_entry_get_text(GTK_ENTRY(filter_te));
+ if (cfile.cfilter)
+ g_free(cfile.cfilter);
+ g_assert(filter_text != NULL);
+ cfile.cfilter = g_strdup(filter_text);
+
+ g_save_file = gtk_entry_get_text(GTK_ENTRY(file_te));
+ if (g_save_file && g_save_file[0]) {
+ /* User specified a file to which the capture should be written. */
+ save_file = g_strdup(g_save_file);
+ /* Save the directory name for future file dialogs. */
+ cf_name = g_strdup(g_save_file);
+ dirname = get_dirname(cf_name); /* Overwrites cf_name */
+ set_last_open_dir(dirname);
+ g_free(cf_name);
+ } else {
+ /* User didn't specify a file; save to a temporary file. */
+ save_file = NULL;
+ }
+
+ capture_opts.has_autostop_packets =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_packets_cb));
+ if (capture_opts.has_autostop_packets)
+ capture_opts.autostop_packets =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(stop_packets_sb));
+
+ capture_opts.has_autostop_duration =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_duration_cb));
+ if (capture_opts.has_autostop_duration) {
+ capture_opts.autostop_duration =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(stop_duration_sb));
+ capture_opts.autostop_duration =
+ time_unit_option_menu_get_value(stop_duration_om, capture_opts.autostop_duration);
+ }
+
+ capture_opts.sync_mode =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sync_cb));
+
+ auto_scroll_live =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auto_scroll_cb));
+
+ capture_opts.show_info =
+ !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(hide_info_cb));
+
+ g_resolv_flags |= g_resolv_flags & RESOLV_CONCURRENT;
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_resolv_cb)))
+ g_resolv_flags |= RESOLV_MAC;
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(n_resolv_cb)))
+ g_resolv_flags |= RESOLV_NETWORK;
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(t_resolv_cb)))
+ g_resolv_flags |= RESOLV_TRANSPORT;
+
+ capture_opts.has_ring_num_files =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb));
+
+ capture_opts.ring_num_files =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(ringbuffer_nbf_sb));
+ if (capture_opts.ring_num_files > RINGBUFFER_MAX_NUM_FILES)
+ capture_opts.ring_num_files = RINGBUFFER_MAX_NUM_FILES;
+#if RINGBUFFER_MIN_NUM_FILES > 0
+ else if (capture_opts.ring_num_files < RINGBUFFER_MIN_NUM_FILES)
+ capture_opts.ring_num_files = RINGBUFFER_MIN_NUM_FILES;
+#endif
+
+ capture_opts.multi_files_on =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(multi_files_on_cb));
+
+ if(capture_opts.sync_mode)
+ capture_opts.multi_files_on = FALSE;
+
+ if (capture_opts.multi_files_on) {
+ capture_opts.has_autostop_filesize =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_filesize_cb));
+ if (capture_opts.has_autostop_filesize) {
+ tmp = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(ring_filesize_sb));
+ tmp = size_unit_option_menu_convert_value(ring_filesize_om, tmp);
+ if(tmp != 0) {
+ capture_opts.autostop_filesize = tmp;
+ } else {
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ PRIMARY_TEXT_START "Multiple files: Requested filesize too large!\n\n" PRIMARY_TEXT_END
+ "The setting \"Next file every x byte(s)\" can't be greater than %u bytes (2GB).", G_MAXINT);
+ return;
+ }
+ }
+
+ /* test if the settings are ok for a ringbuffer */
+ if (save_file == NULL) {
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ PRIMARY_TEXT_START "Multiple files: No capture file name given!\n\n" PRIMARY_TEXT_END
+ "You must specify a filename if you want to use multiple files.");
+ return;
+ } else if (!capture_opts.has_autostop_filesize) {
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ PRIMARY_TEXT_START "Multiple files: No file limit given!\n\n" PRIMARY_TEXT_END
+ "You must specify a file size at which is switched to the next capture file\n"
+ "if you want to use multiple files.");
+ g_free(save_file);
+ return;
+ }
+ } else {
+ capture_opts.has_autostop_filesize =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_filesize_cb));
+ if (capture_opts.has_autostop_filesize) {
+ tmp = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(stop_filesize_sb));
+ tmp = size_unit_option_menu_convert_value(stop_filesize_om, tmp);
+ if(tmp != 0) {
+ capture_opts.autostop_filesize = tmp;
+ } else {
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ PRIMARY_TEXT_START "Stop Capture: Requested filesize too large!\n\n" PRIMARY_TEXT_END
+ "The setting \"... after x byte(s)\" can't be greater than %u bytes (2GB).", G_MAXINT);
+ return;
+ }
+ }
+ }
+
+ capture_opts.has_file_duration =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(file_duration_cb));
+ if (capture_opts.has_file_duration) {
+ capture_opts.file_duration =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(file_duration_sb));
+ capture_opts.file_duration =
+ time_unit_option_menu_get_value(file_duration_om, capture_opts.file_duration);
+ }
+
+ capture_opts.has_autostop_files =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_files_cb));
+ if (capture_opts.has_autostop_files)
+ capture_opts.autostop_files =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(stop_files_sb));
+
+ window_destroy(GTK_WIDGET(parent_w));
+
+ do_capture(save_file);
+ if (save_file != NULL)
+ g_free(save_file);
+}
+
+static void
+capture_prep_destroy_cb(GtkWidget *win, gpointer user_data _U_)
+{
+ GtkWidget *fs;
+
+ /* Is there a file selection dialog associated with this
+ Capture Options dialog? */
+ fs = OBJECT_GET_DATA(win, E_FILE_SEL_DIALOG_PTR_KEY);
+
+ if (fs != NULL) {
+ /* Yes. Destroy it. */
+ window_destroy(fs);
+ }
+
+ /* Note that we no longer have a "Capture Options" dialog box. */
+ cap_open_w = NULL;
+}
+
+static void
+capture_prep_interface_changed_cb(GtkWidget *entry, gpointer argp)
+{
+ GtkWidget *linktype_om = argp;
+
+ set_link_type_list(linktype_om, entry);
+}
+
+/*
+ * Adjust the sensitivity of various widgets as per the current setting
+ * of other widgets.
+ */
+static void
+capture_prep_adjust_sensitivity(GtkWidget *tb _U_, gpointer parent_w)
+{
+ GtkWidget *if_cb,
+ *snap_cb, *snap_sb,
+ *multi_files_on_cb, *ringbuffer_nbf_cb, *ringbuffer_nbf_sb, *ringbuffer_nbf_lb,
+ *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_om,
+ *file_duration_cb, *file_duration_sb, *file_duration_om,
+ *sync_cb, *auto_scroll_cb, *hide_info_cb,
+ *stop_packets_cb, *stop_packets_sb, *stop_packets_lb,
+ *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_om,
+ *stop_duration_cb, *stop_duration_sb, *stop_duration_om,
+ *stop_files_cb, *stop_files_sb, *stop_files_lb;
+
+
+ if_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_IFACE_KEY);
+ snap_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SNAP_CB_KEY);
+ snap_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SNAP_SB_KEY);
+ multi_files_on_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_MULTI_FILES_ON_CB_KEY);
+ ringbuffer_nbf_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_CB_KEY);
+ ringbuffer_nbf_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_SB_KEY);
+ ringbuffer_nbf_lb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_LB_KEY);
+ ring_filesize_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_CB_KEY);
+ ring_filesize_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_SB_KEY);
+ ring_filesize_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_OM_KEY);
+ file_duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_CB_KEY);
+ file_duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_SB_KEY);
+ file_duration_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_OM_KEY);
+ sync_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SYNC_KEY);
+ auto_scroll_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_AUTO_SCROLL_KEY);
+ hide_info_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_HIDE_INFO_KEY);
+ stop_packets_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_CB_KEY);
+ stop_packets_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_SB_KEY);
+ stop_packets_lb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_LB_KEY);
+ stop_filesize_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_CB_KEY);
+ stop_filesize_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_SB_KEY);
+ stop_filesize_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_OM_KEY);
+ stop_duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_CB_KEY);
+ stop_duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_SB_KEY);
+ stop_duration_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_OM_KEY);
+ stop_files_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_CB_KEY);
+ stop_files_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_SB_KEY);
+ stop_files_lb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_LB_KEY);
+
+ /* The snapshot length spinbox is sensitive if the "Limit each packet
+ to" checkbox is on. */
+ gtk_widget_set_sensitive(GTK_WIDGET(snap_sb),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(snap_cb)));
+
+
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sync_cb))) {
+ /* "Update list of packets in real time" captures enabled; we don't
+ support ring buffer mode for those captures, so turn ring buffer
+ mode off if it's on, and make its toggle button, and the spin
+ button for the number of ring buffer files (and the spin button's
+ label), insensitive. */
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(multi_files_on_cb), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(multi_files_on_cb), FALSE);
+
+ /* Auto-scroll mode is meaningful only in "Update list of packets
+ in real time" captures, so make its toggle button sensitive. */
+ gtk_widget_set_sensitive(GTK_WIDGET(auto_scroll_cb), TRUE);
+
+ gtk_widget_set_sensitive(GTK_WIDGET(hide_info_cb), TRUE);
+ } else {
+ /* "Update list of packets in real time" captures disabled; that
+ means ring buffer mode is OK, so make its toggle button
+ sensitive. */
+ gtk_widget_set_sensitive(GTK_WIDGET(multi_files_on_cb), TRUE);
+
+ /* Auto-scroll mode is meaningful only in "Update list of packets
+ in real time" captures, so make its toggle button insensitive. */
+ gtk_widget_set_sensitive(GTK_WIDGET(auto_scroll_cb), FALSE);
+
+ gtk_widget_set_sensitive(GTK_WIDGET(hide_info_cb), FALSE);
+ }
+
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(multi_files_on_cb))) {
+ /* Ring buffer mode enabled. */
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ring_filesize_cb), TRUE);
+
+ gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_cb), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_sb),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb)));
+ gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_lb),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb)));
+
+ /* The ring filesize spinbox is sensitive if the "Next capture file
+ after N kilobytes" checkbox is on. */
+ gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_cb), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_sb),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_filesize_cb)));
+ gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_om),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_filesize_cb)));
+
+ /* The ring duration spinbox is sensitive if the "Next capture file
+ after N seconds" checkbox is on. */
+ gtk_widget_set_sensitive(GTK_WIDGET(file_duration_cb), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(file_duration_sb),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(file_duration_cb)));
+ gtk_widget_set_sensitive(GTK_WIDGET(file_duration_om),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(file_duration_cb)));
+
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_cb), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_sb), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_om), FALSE);
+
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_files_cb), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_files_sb),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_files_cb)));
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_files_lb),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_files_cb)));
+ } else {
+ /* Ring buffer mode disabled. */
+ gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_cb), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_sb), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_lb), FALSE);
+
+ gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_cb), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_sb),FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_om),FALSE);
+
+ gtk_widget_set_sensitive(GTK_WIDGET(file_duration_cb), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(file_duration_sb),FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(file_duration_om),FALSE);
+
+ /* The maximum file size spinbox is sensitive if the "Stop capture
+ after N kilobytes" checkbox is on. */
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_cb), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_sb),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_filesize_cb)));
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_om),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_filesize_cb)));
+
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_files_cb), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_files_sb), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_files_lb), FALSE);
+ }
+
+ /* The maximum packet count spinbox is sensitive if the "Stop capture
+ after N packets" checkbox is on. */
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_packets_sb),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_packets_cb)));
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_packets_lb),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_packets_cb)));
+
+ /* The capture duration spinbox is sensitive if the "Stop capture
+ after N seconds" checkbox is on. */
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_duration_sb),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_duration_cb)));
+ gtk_widget_set_sensitive(GTK_WIDGET(stop_duration_om),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_duration_cb)));
+}
+
+#endif /* HAVE_LIBPCAP */
diff --git a/gtk/capture_dlg.h b/gtk/capture_dlg.h
index c6df90775b..74407a8b72 100644
--- a/gtk/capture_dlg.h
+++ b/gtk/capture_dlg.h
@@ -1,67 +1,67 @@
-/* capture_dlg.h
- * Definitions for packet capture windows
- *
- * $Id: capture_dlg.h,v 1.6 2004/06/04 20:05:30 ulfl Exp $
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
- * Copyright 1998 Gerald Combs
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __CAPTURE_DLG_H__
-#define __CAPTURE_DLG_H__
-
-/** @file
- * "Capture Options" dialog box.
- * @ingroup dialog_group
- */
-
-/** User requested the "Capture Options" dialog box by menu or toolbar.
- *
- * @param widget parent widget (unused)
- * @param data unused
- */
-void capture_prep_cb(GtkWidget *widget, gpointer data);
-
-/** User requested capture stop by menu or toolbar.
- *
- * @param widget parent widget (unused)
- * @param data unused
- */
-void capture_stop_cb(GtkWidget *widget, gpointer data);
-
-/** Create the "Capture Options" dialog box.
- */
-void capture_prep(void);
-
-/** User requested the "Capture Interfaces" dialog box by menu or toolbar.
- *
- * @param widget parent widget (unused)
- * @param data unused
- */
-void
-capture_if_cb(GtkWidget *widget, gpointer data);
-
-/** User requested the "Capture Interfaces" dialog box by menu or toolbar.
- *
- * @param capture_in_progress capture is in progress
- */
-void
-set_capture_if_dialog_for_capture_in_progress(gboolean capture_in_progress);
-
-#endif /* capture.h */
+/* capture_dlg.h
+ * Definitions for packet capture windows
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __CAPTURE_DLG_H__
+#define __CAPTURE_DLG_H__
+
+/** @file
+ * "Capture Options" dialog box.
+ * @ingroup dialog_group
+ */
+
+/** User requested the "Capture Options" dialog box by menu or toolbar.
+ *
+ * @param widget parent widget (unused)
+ * @param data unused
+ */
+void capture_prep_cb(GtkWidget *widget, gpointer data);
+
+/** User requested capture stop by menu or toolbar.
+ *
+ * @param widget parent widget (unused)
+ * @param data unused
+ */
+void capture_stop_cb(GtkWidget *widget, gpointer data);
+
+/** Create the "Capture Options" dialog box.
+ */
+void capture_prep(void);
+
+/** User requested the "Capture Interfaces" dialog box by menu or toolbar.
+ *
+ * @param widget parent widget (unused)
+ * @param data unused
+ */
+void
+capture_if_cb(GtkWidget *widget, gpointer data);
+
+/** User requested the "Capture Interfaces" dialog box by menu or toolbar.
+ *
+ * @param capture_in_progress capture is in progress
+ */
+void
+set_capture_if_dialog_for_capture_in_progress(gboolean capture_in_progress);
+
+#endif /* capture.h */
diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index f4d7eb21ae..7e0847d119 100644
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.c
@@ -1,486 +1,486 @@
-/* capture_if_dlg.c
- * Routines for the capture interface dialog
- *
- * $Id: capture_if_dlg.c,v 1.254 2004/06/30 06:58:56 guy Exp $
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/* With MSVC and a libethereal.dll this file needs to import some variables
- in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */
-/*#define _NEED_VAR_IMPORT_*/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_LIBPCAP
-
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
-
-#include <pcap.h>
-
-#include <gtk/gtk.h>
-
-#include "globals.h"
-#include "pcap-util.h"
-
-#ifdef _WIN32
-#include "capture-wpcap.h"
-#endif
-
-#include "compat_macros.h"
-#include "simple_dialog.h"
-#include "capture_dlg.h"
-
-#include "ui_util.h"
-#include "dlg_utils.h"
-
-#include "wtap.h"
-#include "capture.h"
-
-
-extern char *iptos(u_long in);
-
-extern gboolean is_capture_in_progress(void);
-
-/*
- * Keep a static pointer to the current "Capture Interfaces" window, if
- * any, so that if somebody tries to do "Capture:Start" while there's
- * already a "Capture Interfaces" window up, we just pop up the existing
- * one, rather than creating a new one.
- */
-static GtkWidget *cap_if_w;
-
-GList *if_data = NULL;
-
-guint timer_id;
-
-GtkWidget *stop_bt;
-
-GList *if_list;
-
-/*
- * Timeout, in milliseconds, for reads from the stream of captured packets.
- */
-#define CAP_READ_TIMEOUT 250
-
-
-/* the "runtime" data of one interface */
-typedef struct if_dlg_data_s {
- pcap_t *pch;
- GtkWidget *device_lb;
- GtkWidget *descr_lb;
- GtkWidget *ip_lb;
- GtkWidget *curr_lb;
- GtkWidget *last_lb;
- GtkWidget *capture_bt;
- GtkWidget *prepare_bt;
- guint32 last_packets;
- gchar *device;
-} if_dlg_data_t;
-
-void update_if(if_dlg_data_t *if_dlg_data);
-
-
-/* start capture button was pressed */
-static void
-capture_do_cb(GtkWidget *capture_bt _U_, gpointer if_data)
-{
- if_dlg_data_t *if_dlg_data = if_data;
-
- if (cfile.iface)
- g_free(cfile.iface);
-
- cfile.iface = g_strdup(if_dlg_data->device);
-
- do_capture(NULL /* save_file */);
-}
-
-
-/* prepare capture button was pressed */
-static void
-capture_prepare_cb(GtkWidget *prepare_bt _U_, gpointer if_data)
-{
- if_dlg_data_t *if_dlg_data = if_data;
-
- if (cfile.iface)
- g_free(cfile.iface);
-
- cfile.iface = g_strdup(if_dlg_data->device);
-
- capture_prep_cb(NULL, NULL);
-}
-
-
-/* open a single interface */
-void
-open_if(gchar *name, if_dlg_data_t *if_dlg_data)
-{
- gchar open_err_str[PCAP_ERRBUF_SIZE];
-
- if_dlg_data->pch = pcap_open_live(name,
- WTAP_MAX_PACKET_SIZE,
- capture_opts.promisc_mode, CAP_READ_TIMEOUT,
- open_err_str);
-
- if (if_dlg_data->pch != NULL) {
- update_if(if_dlg_data);
- } else {
- printf("open_if: %s\n", open_err_str);
- gtk_label_set_text(GTK_LABEL(if_dlg_data->curr_lb), "error");
- gtk_label_set_text(GTK_LABEL(if_dlg_data->last_lb), "error");
- }
-}
-
-/* update a single interface */
-void
-update_if(if_dlg_data_t *if_dlg_data)
-{
- struct pcap_stat stats;
- gchar *str;
- guint diff;
-
-
- /* pcap_stats() stats values differ on libpcap and winpcap!
- * libpcap: returns the number of packets since pcap_open_live
- * winpcap: returns the number of packets since the last pcap_stats call
- */
- if (if_dlg_data->pch) {
- if(pcap_stats(if_dlg_data->pch, &stats) >= 0) {
-#if WIN32
- diff = stats.ps_recv - if_dlg_data->last_packets;
- if_dlg_data->last_packets = stats.ps_recv;
-#else
- diff = stats.ps_recv;
- if_dlg_data->last_packets = stats.ps_recv + if_dlg_data->last_packets;
-#endif
-
- str = g_strdup_printf("%u", if_dlg_data->last_packets);
- gtk_label_set_text(GTK_LABEL(if_dlg_data->curr_lb), str);
- g_free(str);
- str = g_strdup_printf("%u", diff);
- gtk_label_set_text(GTK_LABEL(if_dlg_data->last_lb), str);
- g_free(str);
-
- gtk_widget_set_sensitive(if_dlg_data->curr_lb, diff);
- gtk_widget_set_sensitive(if_dlg_data->last_lb, diff);
- } else {
- gtk_label_set_text(GTK_LABEL(if_dlg_data->curr_lb), "error");
- gtk_label_set_text(GTK_LABEL(if_dlg_data->last_lb), "error");
- }
- }
-}
-
-
-/* close a single interface */
-void
-close_if(if_dlg_data_t *if_dlg_data)
-{
- if(if_dlg_data->pch)
- pcap_close(if_dlg_data->pch);
-}
-
-
-
-/* update all interfaces */
-gboolean
-update_all(gpointer data)
-{
- GList *curr;
- int ifs;
-
-
- if(!cap_if_w) {
- return FALSE;
- }
-
- for(ifs = 0; (curr = g_list_nth(data, ifs)); ifs++) {
- update_if(curr->data);
- }
-
- return TRUE;
-}
-
-
-/* a live capture has started or stopped */
-void
-set_capture_if_dialog_for_capture_in_progress(gboolean capture_in_progress)
-{
- GList *curr;
- int ifs;
-
- if(cap_if_w) {
- gtk_widget_set_sensitive(stop_bt, capture_in_progress);
-
- for(ifs = 0; (curr = g_list_nth(if_data, ifs)); ifs++) {
- if_dlg_data_t *if_dlg_data = curr->data;
-
- gtk_widget_set_sensitive(if_dlg_data->capture_bt, !capture_in_progress);
- gtk_widget_set_sensitive(if_dlg_data->prepare_bt, !capture_in_progress);
- }
- }
-}
-
-
-/* the window was closed, cleanup things */
-static void
-capture_if_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
-{
- GList *curr;
- int ifs;
-
- gtk_timeout_remove(timer_id);
-
- for(ifs = 0; (curr = g_list_nth(if_data, ifs)); ifs++) {
- if_dlg_data_t *if_dlg_data = curr->data;
-
- close_if(if_dlg_data);
- g_free(curr->data);
- }
-
- if_data = NULL;
-
- free_interface_list(if_list);
-
- /* Note that we no longer have a "Capture Options" dialog box. */
- cap_if_w = NULL;
-}
-
-
-/* start getting capture stats from all interfaces */
-void
-capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
-{
- GtkWidget *main_vb, *bbox, *close_bt;
-
- GtkWidget *if_tb;
- GtkWidget *if_lb;
-#if GTK_MAJOR_VERSION < 2
- GtkAccelGroup *accel_group;
-#endif
- GtkTooltips *tooltips;
- int err;
- char err_str[PCAP_ERRBUF_SIZE];
- gchar *cant_get_if_list_errstr;
- int row;
- if_dlg_data_t *if_dlg_data;
- int ifs;
- GList *curr;
- if_info_t *if_info;
- GSList *curr_ip;
- guint32 ip_addr;
- GString *if_tool_str = g_string_new("");
- gchar *tmp_str;
-
-
- if (cap_if_w != NULL) {
- /* There's already a "Capture Interfaces" dialog box; reactivate it. */
- reactivate_window(cap_if_w);
- return;
- }
-
-#ifdef _WIN32
- /* Is WPcap loaded? */
- if (!has_wpcap) {
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
- "Unable to load WinPcap (wpcap.dll); Ethereal will not be able\n"
- "to capture packets.\n\n"
- "In order to capture packets, WinPcap must be installed; see\n"
- "\n"
- " http://winpcap.polito.it/\n"
- "\n"
- "or the mirror at\n"
- "\n"
- " http://winpcap.mirror.ethereal.com/\n"
- "\n"
- "or the mirror at\n"
- "\n"
- " http://www.mirrors.wiretapped.net/security/packet-capture/winpcap/\n"
- "\n"
- "for a downloadable version of WinPcap and for instructions\n"
- "on how to install WinPcap.");
- return;
- }
-#endif
-
- if_list = get_interface_list(&err, err_str);
- if (if_list == NULL && err == CANT_GET_INTERFACE_LIST) {
- cant_get_if_list_errstr = cant_get_if_list_error_message(err_str);
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s",
- cant_get_if_list_errstr);
- g_free(cant_get_if_list_errstr);
- return;
- }
-
- cap_if_w = window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: Capture Interfaces");
-
- tooltips = gtk_tooltips_new();
-
-#if GTK_MAJOR_VERSION < 2
- /* Accelerator group for the accelerators (or, as they're called in
- Windows and, I think, in Motif, "mnemonics"; Alt+<key> is a mnemonic,
- Ctrl+<key> is an accelerator). */
- accel_group = gtk_accel_group_new();
- gtk_window_add_accel_group(GTK_WINDOW(cap_if_w), accel_group);
-#endif
-
- main_vb = gtk_vbox_new(FALSE, 0);
- gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
- gtk_container_add(GTK_CONTAINER(cap_if_w), main_vb);
-
-
- if_tb = gtk_table_new(6,1, FALSE);
- gtk_table_set_row_spacings(GTK_TABLE(if_tb), 3);
- gtk_table_set_col_spacings(GTK_TABLE(if_tb), 3);
- gtk_container_add(GTK_CONTAINER(main_vb), if_tb);
-
- row = 0;
-
-#ifndef WIN32
- if_lb = gtk_label_new("Device");
- gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 0, 1, row, row+1);
-#endif
-
- if_lb = gtk_label_new("Description");
- gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 1, 2, row, row+1);
-
- if_lb = gtk_label_new(" IP ");
- gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 2, 3, row, row+1);
-
- if_lb = gtk_label_new("Packets");
- gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 3, 4, row, row+1);
-
- if_lb = gtk_label_new(" Packets/s ");
- gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 4, 5, row, row+1);
-
- stop_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_STOP);
- gtk_tooltips_set_tip(tooltips, stop_bt,
- "Stop a running capture.", NULL);
- gtk_table_attach_defaults(GTK_TABLE(if_tb), stop_bt, 5, 7, row, row+1);
- SIGNAL_CONNECT(stop_bt, "clicked", capture_stop_cb, NULL);
-
- row++;
-
- for(ifs = 0; (curr = g_list_nth(if_list, ifs)); ifs++) {
- g_string_assign(if_tool_str, "");
- if_info = curr->data;
- if_dlg_data = g_malloc0(sizeof(if_dlg_data_t));
-
- /* device name */
- if_dlg_data->device_lb = gtk_label_new(if_info->name);
- if_dlg_data->device = if_info->name;
-#ifndef WIN32
- gtk_misc_set_alignment(GTK_MISC(if_dlg_data->device_lb), 0.0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->device_lb, 0, 1, row, row+1);
-#endif
- g_string_append(if_tool_str, "Device: ");
- g_string_append(if_tool_str, if_info->name);
- g_string_append(if_tool_str, "\n");
-
- /* description */
- if_dlg_data->descr_lb = gtk_label_new(if_info->description);
- gtk_misc_set_alignment(GTK_MISC(if_dlg_data->descr_lb), 0.0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->descr_lb, 1, 2, row, row+1);
-
- g_string_append(if_tool_str, "Description: ");
- g_string_append(if_tool_str, if_info->description);
- g_string_append(if_tool_str, "\n");
-
- /* IP address */
- /* only one IP address will be shown */
- g_string_append(if_tool_str, "IP: ");
- curr_ip = g_slist_nth(if_info->ip_addr, 0);
- if(curr_ip) {
- ip_addr = *((guint32 *)curr_ip->data);
- if_dlg_data->ip_lb = gtk_label_new(iptos(ip_addr));
- g_string_append(if_tool_str, iptos(ip_addr));
- } else {
- ip_addr = 0;
- if_dlg_data->ip_lb = gtk_label_new("unknown");
- g_string_append(if_tool_str, "unknown");
- }
- gtk_widget_set_sensitive(if_dlg_data->ip_lb, ip_addr);
- gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->ip_lb, 2, 3, row, row+1);
- g_string_append(if_tool_str, "\n");
-
- /* packets */
- if_dlg_data->curr_lb = gtk_label_new("-");
- gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->curr_lb, 3, 4, row, row+1);
-
- /* packets/s */
- if_dlg_data->last_lb = gtk_label_new("-");
- gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->last_lb, 4, 5, row, row+1);
-
- /* capture button */
- if_dlg_data->capture_bt = gtk_button_new_with_label("Capture");
- SIGNAL_CONNECT(if_dlg_data->capture_bt, "clicked", capture_do_cb, if_dlg_data);
- tmp_str = g_strdup_printf("Immediately start a capture from this interface:\n\n%s", if_tool_str->str);
- gtk_tooltips_set_tip(tooltips, if_dlg_data->capture_bt,
- tmp_str, NULL);
- g_free(tmp_str);
- gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->capture_bt, 5, 6, row, row+1);
-
- /* prepare button */
- if_dlg_data->prepare_bt = gtk_button_new_with_label("Prepare");
- SIGNAL_CONNECT(if_dlg_data->prepare_bt, "clicked", capture_prepare_cb, if_dlg_data);
- gtk_tooltips_set_tip(tooltips, if_dlg_data->prepare_bt,
- "Open the capture options dialog with this interface selected.", NULL);
- gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->prepare_bt, 6, 7, row, row+1);
-
- open_if(if_info->name, if_dlg_data);
-
- if_data = g_list_append(if_data, if_dlg_data);
-
- row++;
- }
-
- g_string_free(if_tool_str, TRUE);
-
- /* Button row: close button */
- bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
- gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
-
- close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
- window_set_cancel_button(cap_if_w, close_bt, window_cancel_button_cb);
- gtk_tooltips_set_tip(tooltips, close_bt, "Close this window.", NULL);
-
- gtk_widget_grab_default(close_bt);
-
- SIGNAL_CONNECT(cap_if_w, "delete_event", window_delete_event_cb, NULL);
- SIGNAL_CONNECT(cap_if_w, "destroy", capture_if_destroy_cb, NULL);
-
- gtk_widget_show_all(cap_if_w);
- window_present(cap_if_w);
-
- set_capture_if_dialog_for_capture_in_progress(is_capture_in_progress());
-
- /* update the interface list every 1000ms */
- timer_id = gtk_timeout_add(1000, update_all, if_data);
-}
-
-
-#endif /* HAVE_LIBPCAP */
+/* capture_if_dlg.c
+ * Routines for the capture interface dialog
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* With MSVC and a libethereal.dll this file needs to import some variables
+ in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */
+/*#define _NEED_VAR_IMPORT_*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_LIBPCAP
+
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
+
+
+#include <pcap.h>
+
+#include <gtk/gtk.h>
+
+#include "globals.h"
+#include "pcap-util.h"
+
+#ifdef _WIN32
+#include "capture-wpcap.h"
+#endif
+
+#include "compat_macros.h"
+#include "simple_dialog.h"
+#include "capture_dlg.h"
+
+#include "ui_util.h"
+#include "dlg_utils.h"
+
+#include "wtap.h"
+#include "capture.h"
+
+
+extern char *iptos(u_long in);
+
+extern gboolean is_capture_in_progress(void);
+
+/*
+ * Keep a static pointer to the current "Capture Interfaces" window, if
+ * any, so that if somebody tries to do "Capture:Start" while there's
+ * already a "Capture Interfaces" window up, we just pop up the existing
+ * one, rather than creating a new one.
+ */
+static GtkWidget *cap_if_w;
+
+GList *if_data = NULL;
+
+guint timer_id;
+
+GtkWidget *stop_bt;
+
+GList *if_list;
+
+/*
+ * Timeout, in milliseconds, for reads from the stream of captured packets.
+ */
+#define CAP_READ_TIMEOUT 250
+
+
+/* the "runtime" data of one interface */
+typedef struct if_dlg_data_s {
+ pcap_t *pch;
+ GtkWidget *device_lb;
+ GtkWidget *descr_lb;
+ GtkWidget *ip_lb;
+ GtkWidget *curr_lb;
+ GtkWidget *last_lb;
+ GtkWidget *capture_bt;
+ GtkWidget *prepare_bt;
+ guint32 last_packets;
+ gchar *device;
+} if_dlg_data_t;
+
+void update_if(if_dlg_data_t *if_dlg_data);
+
+
+/* start capture button was pressed */
+static void
+capture_do_cb(GtkWidget *capture_bt _U_, gpointer if_data)
+{
+ if_dlg_data_t *if_dlg_data = if_data;
+
+ if (cfile.iface)
+ g_free(cfile.iface);
+
+ cfile.iface = g_strdup(if_dlg_data->device);
+
+ do_capture(NULL /* save_file */);
+}
+
+
+/* prepare capture button was pressed */
+static void
+capture_prepare_cb(GtkWidget *prepare_bt _U_, gpointer if_data)
+{
+ if_dlg_data_t *if_dlg_data = if_data;
+
+ if (cfile.iface)
+ g_free(cfile.iface);
+
+ cfile.iface = g_strdup(if_dlg_data->device);
+
+ capture_prep_cb(NULL, NULL);
+}
+
+
+/* open a single interface */
+void
+open_if(gchar *name, if_dlg_data_t *if_dlg_data)
+{
+ gchar open_err_str[PCAP_ERRBUF_SIZE];
+
+ if_dlg_data->pch = pcap_open_live(name,
+ WTAP_MAX_PACKET_SIZE,
+ capture_opts.promisc_mode, CAP_READ_TIMEOUT,
+ open_err_str);
+
+ if (if_dlg_data->pch != NULL) {
+ update_if(if_dlg_data);
+ } else {
+ printf("open_if: %s\n", open_err_str);
+ gtk_label_set_text(GTK_LABEL(if_dlg_data->curr_lb), "error");
+ gtk_label_set_text(GTK_LABEL(if_dlg_data->last_lb), "error");
+ }
+}
+
+/* update a single interface */
+void
+update_if(if_dlg_data_t *if_dlg_data)
+{
+ struct pcap_stat stats;
+ gchar *str;
+ guint diff;
+
+
+ /* pcap_stats() stats values differ on libpcap and winpcap!
+ * libpcap: returns the number of packets since pcap_open_live
+ * winpcap: returns the number of packets since the last pcap_stats call
+ */
+ if (if_dlg_data->pch) {
+ if(pcap_stats(if_dlg_data->pch, &stats) >= 0) {
+#if WIN32
+ diff = stats.ps_recv - if_dlg_data->last_packets;
+ if_dlg_data->last_packets = stats.ps_recv;
+#else
+ diff = stats.ps_recv;
+ if_dlg_data->last_packets = stats.ps_recv + if_dlg_data->last_packets;
+#endif
+
+ str = g_strdup_printf("%u", if_dlg_data->last_packets);
+ gtk_label_set_text(GTK_LABEL(if_dlg_data->curr_lb), str);
+ g_free(str);
+ str = g_strdup_printf("%u", diff);
+ gtk_label_set_text(GTK_LABEL(if_dlg_data->last_lb), str);
+ g_free(str);
+
+ gtk_widget_set_sensitive(if_dlg_data->curr_lb, diff);
+ gtk_widget_set_sensitive(if_dlg_data->last_lb, diff);
+ } else {
+ gtk_label_set_text(GTK_LABEL(if_dlg_data->curr_lb), "error");
+ gtk_label_set_text(GTK_LABEL(if_dlg_data->last_lb), "error");
+ }
+ }
+}
+
+
+/* close a single interface */
+void
+close_if(if_dlg_data_t *if_dlg_data)
+{
+ if(if_dlg_data->pch)
+ pcap_close(if_dlg_data->pch);
+}
+
+
+
+/* update all interfaces */
+gboolean
+update_all(gpointer data)
+{
+ GList *curr;
+ int ifs;
+
+
+ if(!cap_if_w) {
+ return FALSE;
+ }
+
+ for(ifs = 0; (curr = g_list_nth(data, ifs)); ifs++) {
+ update_if(curr->data);
+ }
+
+ return TRUE;
+}
+
+
+/* a live capture has started or stopped */
+void
+set_capture_if_dialog_for_capture_in_progress(gboolean capture_in_progress)
+{
+ GList *curr;
+ int ifs;
+
+ if(cap_if_w) {
+ gtk_widget_set_sensitive(stop_bt, capture_in_progress);
+
+ for(ifs = 0; (curr = g_list_nth(if_data, ifs)); ifs++) {
+ if_dlg_data_t *if_dlg_data = curr->data;
+
+ gtk_widget_set_sensitive(if_dlg_data->capture_bt, !capture_in_progress);
+ gtk_widget_set_sensitive(if_dlg_data->prepare_bt, !capture_in_progress);
+ }
+ }
+}
+
+
+/* the window was closed, cleanup things */
+static void
+capture_if_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
+{
+ GList *curr;
+ int ifs;
+
+ gtk_timeout_remove(timer_id);
+
+ for(ifs = 0; (curr = g_list_nth(if_data, ifs)); ifs++) {
+ if_dlg_data_t *if_dlg_data = curr->data;
+
+ close_if(if_dlg_data);
+ g_free(curr->data);
+ }
+
+ if_data = NULL;
+
+ free_interface_list(if_list);
+
+ /* Note that we no longer have a "Capture Options" dialog box. */
+ cap_if_w = NULL;
+}
+
+
+/* start getting capture stats from all interfaces */
+void
+capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+ GtkWidget *main_vb, *bbox, *close_bt;
+
+ GtkWidget *if_tb;
+ GtkWidget *if_lb;
+#if GTK_MAJOR_VERSION < 2
+ GtkAccelGroup *accel_group;
+#endif
+ GtkTooltips *tooltips;
+ int err;
+ char err_str[PCAP_ERRBUF_SIZE];
+ gchar *cant_get_if_list_errstr;
+ int row;
+ if_dlg_data_t *if_dlg_data;
+ int ifs;
+ GList *curr;
+ if_info_t *if_info;
+ GSList *curr_ip;
+ guint32 ip_addr;
+ GString *if_tool_str = g_string_new("");
+ gchar *tmp_str;
+
+
+ if (cap_if_w != NULL) {
+ /* There's already a "Capture Interfaces" dialog box; reactivate it. */
+ reactivate_window(cap_if_w);
+ return;
+ }
+
+#ifdef _WIN32
+ /* Is WPcap loaded? */
+ if (!has_wpcap) {
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Unable to load WinPcap (wpcap.dll); Ethereal will not be able\n"
+ "to capture packets.\n\n"
+ "In order to capture packets, WinPcap must be installed; see\n"
+ "\n"
+ " http://winpcap.polito.it/\n"
+ "\n"
+ "or the mirror at\n"
+ "\n"
+ " http://winpcap.mirror.ethereal.com/\n"
+ "\n"
+ "or the mirror at\n"
+ "\n"
+ " http://www.mirrors.wiretapped.net/security/packet-capture/winpcap/\n"
+ "\n"
+ "for a downloadable version of WinPcap and for instructions\n"
+ "on how to install WinPcap.");
+ return;
+ }
+#endif
+
+ if_list = get_interface_list(&err, err_str);
+ if (if_list == NULL && err == CANT_GET_INTERFACE_LIST) {
+ cant_get_if_list_errstr = cant_get_if_list_error_message(err_str);
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s",
+ cant_get_if_list_errstr);
+ g_free(cant_get_if_list_errstr);
+ return;
+ }
+
+ cap_if_w = window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: Capture Interfaces");
+
+ tooltips = gtk_tooltips_new();
+
+#if GTK_MAJOR_VERSION < 2
+ /* Accelerator group for the accelerators (or, as they're called in
+ Windows and, I think, in Motif, "mnemonics"; Alt+<key> is a mnemonic,
+ Ctrl+<key> is an accelerator). */
+ accel_group = gtk_accel_group_new();
+ gtk_window_add_accel_group(GTK_WINDOW(cap_if_w), accel_group);
+#endif
+
+ main_vb = gtk_vbox_new(FALSE, 0);
+ gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
+ gtk_container_add(GTK_CONTAINER(cap_if_w), main_vb);
+
+
+ if_tb = gtk_table_new(6,1, FALSE);
+ gtk_table_set_row_spacings(GTK_TABLE(if_tb), 3);
+ gtk_table_set_col_spacings(GTK_TABLE(if_tb), 3);
+ gtk_container_add(GTK_CONTAINER(main_vb), if_tb);
+
+ row = 0;
+
+#ifndef WIN32
+ if_lb = gtk_label_new("Device");
+ gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 0, 1, row, row+1);
+#endif
+
+ if_lb = gtk_label_new("Description");
+ gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 1, 2, row, row+1);
+
+ if_lb = gtk_label_new(" IP ");
+ gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 2, 3, row, row+1);
+
+ if_lb = gtk_label_new("Packets");
+ gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 3, 4, row, row+1);
+
+ if_lb = gtk_label_new(" Packets/s ");
+ gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 4, 5, row, row+1);
+
+ stop_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_STOP);
+ gtk_tooltips_set_tip(tooltips, stop_bt,
+ "Stop a running capture.", NULL);
+ gtk_table_attach_defaults(GTK_TABLE(if_tb), stop_bt, 5, 7, row, row+1);
+ SIGNAL_CONNECT(stop_bt, "clicked", capture_stop_cb, NULL);
+
+ row++;
+
+ for(ifs = 0; (curr = g_list_nth(if_list, ifs)); ifs++) {
+ g_string_assign(if_tool_str, "");
+ if_info = curr->data;
+ if_dlg_data = g_malloc0(sizeof(if_dlg_data_t));
+
+ /* device name */
+ if_dlg_data->device_lb = gtk_label_new(if_info->name);
+ if_dlg_data->device = if_info->name;
+#ifndef WIN32
+ gtk_misc_set_alignment(GTK_MISC(if_dlg_data->device_lb), 0.0, 0.5);
+ gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->device_lb, 0, 1, row, row+1);
+#endif
+ g_string_append(if_tool_str, "Device: ");
+ g_string_append(if_tool_str, if_info->name);
+ g_string_append(if_tool_str, "\n");
+
+ /* description */
+ if_dlg_data->descr_lb = gtk_label_new(if_info->description);
+ gtk_misc_set_alignment(GTK_MISC(if_dlg_data->descr_lb), 0.0, 0.5);
+ gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->descr_lb, 1, 2, row, row+1);
+
+ g_string_append(if_tool_str, "Description: ");
+ g_string_append(if_tool_str, if_info->description);
+ g_string_append(if_tool_str, "\n");
+
+ /* IP address */
+ /* only one IP address will be shown */
+ g_string_append(if_tool_str, "IP: ");
+ curr_ip = g_slist_nth(if_info->ip_addr, 0);
+ if(curr_ip) {
+ ip_addr = *((guint32 *)curr_ip->data);
+ if_dlg_data->ip_lb = gtk_label_new(iptos(ip_addr));
+ g_string_append(if_tool_str, iptos(ip_addr));
+ } else {
+ ip_addr = 0;
+ if_dlg_data->ip_lb = gtk_label_new("unknown");
+ g_string_append(if_tool_str, "unknown");
+ }
+ gtk_widget_set_sensitive(if_dlg_data->ip_lb, ip_addr);
+ gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->ip_lb, 2, 3, row, row+1);
+ g_string_append(if_tool_str, "\n");
+
+ /* packets */
+ if_dlg_data->curr_lb = gtk_label_new("-");
+ gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->curr_lb, 3, 4, row, row+1);
+
+ /* packets/s */
+ if_dlg_data->last_lb = gtk_label_new("-");
+ gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->last_lb, 4, 5, row, row+1);
+
+ /* capture button */
+ if_dlg_data->capture_bt = gtk_button_new_with_label("Capture");
+ SIGNAL_CONNECT(if_dlg_data->capture_bt, "clicked", capture_do_cb, if_dlg_data);
+ tmp_str = g_strdup_printf("Immediately start a capture from this interface:\n\n%s", if_tool_str->str);
+ gtk_tooltips_set_tip(tooltips, if_dlg_data->capture_bt,
+ tmp_str, NULL);
+ g_free(tmp_str);
+ gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->capture_bt, 5, 6, row, row+1);
+
+ /* prepare button */
+ if_dlg_data->prepare_bt = gtk_button_new_with_label("Prepare");
+ SIGNAL_CONNECT(if_dlg_data->prepare_bt, "clicked", capture_prepare_cb, if_dlg_data);
+ gtk_tooltips_set_tip(tooltips, if_dlg_data->prepare_bt,
+ "Open the capture options dialog with this interface selected.", NULL);
+ gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->prepare_bt, 6, 7, row, row+1);
+
+ open_if(if_info->name, if_dlg_data);
+
+ if_data = g_list_append(if_data, if_dlg_data);
+
+ row++;
+ }
+
+ g_string_free(if_tool_str, TRUE);
+
+ /* Button row: close button */
+ bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
+ gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
+
+ close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
+ window_set_cancel_button(cap_if_w, close_bt, window_cancel_button_cb);
+ gtk_tooltips_set_tip(tooltips, close_bt, "Close this window.", NULL);
+
+ gtk_widget_grab_default(close_bt);
+
+ SIGNAL_CONNECT(cap_if_w, "delete_event", window_delete_event_cb, NULL);
+ SIGNAL_CONNECT(cap_if_w, "destroy", capture_if_destroy_cb, NULL);
+
+ gtk_widget_show_all(cap_if_w);
+ window_present(cap_if_w);
+
+ set_capture_if_dialog_for_capture_in_progress(is_capture_in_progress());
+
+ /* update the interface list every 1000ms */
+ timer_id = gtk_timeout_add(1000, update_all, if_data);
+}
+
+
+#endif /* HAVE_LIBPCAP */
diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c
index 3f0648bf27..44d4807d61 100644
--- a/gtk/capture_info_dlg.c
+++ b/gtk/capture_info_dlg.c
@@ -1,7 +1,7 @@
/* capture_info_dlg.c
* Routines for packet capture info dialog
*
- * $Id: capture_info_dlg.c,v 1.17 2004/05/27 17:26:46 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c
index 8f9381a5ac..7207f1113f 100644
--- a/gtk/capture_prefs.c
+++ b/gtk/capture_prefs.c
@@ -1,7 +1,7 @@
/* capture_prefs.c
* Dialog box for capture preferences
*
- * $Id: capture_prefs.c,v 1.39 2004/07/13 05:43:59 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/capture_prefs.h b/gtk/capture_prefs.h
index 234dbde473..cdc0d22907 100644
--- a/gtk/capture_prefs.h
+++ b/gtk/capture_prefs.h
@@ -1,7 +1,7 @@
/* capture_prefs.h
* Definitions for capture preferences window
*
- * $Id: capture_prefs.h,v 1.5 2004/06/04 20:05:30 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index 00faa09a45..ea94f62dc8 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -1,7 +1,7 @@
/* color_dlg.c
* Definitions for dialog boxes for color filters
*
- * $Id: color_dlg.c,v 1.52 2004/06/05 10:13:37 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/color_dlg.h b/gtk/color_dlg.h
index 383f95ef90..163467c585 100644
--- a/gtk/color_dlg.h
+++ b/gtk/color_dlg.h
@@ -1,7 +1,7 @@
/* color_dlg.h
* Definitions for dialog boxes for color filters
*
- * $Id: color_dlg.h,v 1.6 2004/06/04 20:05:30 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/color_filters.c b/gtk/color_filters.c
index a971e499d1..fa5793f0ac 100644
--- a/gtk/color_filters.c
+++ b/gtk/color_filters.c
@@ -1,7 +1,7 @@
/* color_filters.c
* Routines for color filters
*
- * $Id: color_filters.c,v 1.10 2004/04/16 19:36:36 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/color_filters.h b/gtk/color_filters.h
index 8c5d2bd573..d6db23f8e3 100644
--- a/gtk/color_filters.h
+++ b/gtk/color_filters.h
@@ -1,7 +1,7 @@
/* color_filters.h
* Definitions for color filters
*
- * $Id: color_filters.h,v 1.7 2004/06/01 20:28:04 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/color_utils.c b/gtk/color_utils.c
index 8bf665dd77..6fca4eadfa 100644
--- a/gtk/color_utils.c
+++ b/gtk/color_utils.c
@@ -2,7 +2,7 @@
* Utilities for converting between "toolkit-independent" and GDK
* notions of color
*
- * $Id: color_utils.c,v 1.4 2002/09/23 19:09:49 oabad Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/color_utils.h b/gtk/color_utils.h
index 836595b425..36f27ce2f9 100644
--- a/gtk/color_utils.h
+++ b/gtk/color_utils.h
@@ -2,7 +2,7 @@
* Declarations of utilities for converting between "toolkit-independent"
* and GDK notions of color
*
- * $Id: color_utils.h,v 1.3 2004/06/01 20:28:04 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/colors.c b/gtk/colors.c
index 23ad9d81af..3d9ad7f1ce 100644
--- a/gtk/colors.c
+++ b/gtk/colors.c
@@ -1,7 +1,7 @@
/* colors.c
* Routines for colors
*
- * $Id: colors.c,v 1.28 2004/01/31 03:22:39 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/colors.h b/gtk/colors.h
index f66a522eaf..4ff136d8c2 100644
--- a/gtk/colors.h
+++ b/gtk/colors.h
@@ -1,7 +1,7 @@
/* colors.h
* Definitions for color structures and routines
*
- * $Id: colors.h,v 1.12 2004/06/01 20:28:04 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c
index 3f42ca939f..9600cea0ef 100644
--- a/gtk/column_prefs.c
+++ b/gtk/column_prefs.c
@@ -1,7 +1,7 @@
/* column_prefs.c
* Dialog box for column preferences
*
- * $Id: column_prefs.c,v 1.24 2004/05/27 16:48:36 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/column_prefs.h b/gtk/column_prefs.h
index 378343cf59..02968977d6 100644
--- a/gtk/column_prefs.h
+++ b/gtk/column_prefs.h
@@ -1,7 +1,7 @@
/* column_prefs.h
* Definitions for column preferences window
*
- * $Id: column_prefs.h,v 1.7 2004/06/04 20:05:30 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index 888a6d7369..be990fa9f9 100644
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -1,7 +1,7 @@
/* compat_macros.h
* GTK-related Global defines, etc.
*
- * $Id: compat_macros.h,v 1.21 2004/07/13 07:15:44 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 918ea20a13..c9d86e2d04 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -1,7 +1,7 @@
/* dcerpc_stat.c
* dcerpc_stat 2002 Ronnie Sahlberg
*
- * $Id: dcerpc_stat.c,v 1.58 2004/06/02 07:12:09 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index 4c9729196d..a9bb26577b 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -1,6 +1,6 @@
/* decode_as_dlg.c
*
- * $Id: decode_as_dlg.c,v 1.41 2004/06/10 09:46:26 guy Exp $
+ * $Id$
*
* Routines to modify dissector tables on the fly.
*
diff --git a/gtk/decode_as_dlg.h b/gtk/decode_as_dlg.h
index f080e7ce94..57ceb84c7f 100644
--- a/gtk/decode_as_dlg.h
+++ b/gtk/decode_as_dlg.h
@@ -1,6 +1,6 @@
/* decode_as_dlg.h
*
- * $Id: decode_as_dlg.h,v 1.6 2004/06/04 20:05:30 ulfl Exp $
+ * $Id$
*
* Routines to modify dissector tables on the fly.
*
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index ff120dfdbc..1fbae8d561 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -7,7 +7,7 @@
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: dfilter_expr_dlg.c,v 1.60 2004/06/10 20:16:50 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/dfilter_expr_dlg.h b/gtk/dfilter_expr_dlg.h
index d0d331c82f..024819c68a 100644
--- a/gtk/dfilter_expr_dlg.h
+++ b/gtk/dfilter_expr_dlg.h
@@ -1,7 +1,7 @@
/* dfilter_expr_dlg.h
* Definitions for dialog boxes for display filter expression construction
*
- * $Id: dfilter_expr_dlg.h,v 1.4 2004/06/04 20:05:30 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c
index 0ace9be012..532a249d6b 100644
--- a/gtk/dlg_utils.c
+++ b/gtk/dlg_utils.c
@@ -1,7 +1,7 @@
/* dlg_utils.c
* Utilities to use when constructing dialogs
*
- * $Id: dlg_utils.c,v 1.42 2004/07/13 07:15:44 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/dlg_utils.h b/gtk/dlg_utils.h
index 3be89cb3a4..e8dc130d0a 100644
--- a/gtk/dlg_utils.h
+++ b/gtk/dlg_utils.h
@@ -1,7 +1,7 @@
/* dlg_utils.h
* Declarations of utilities to use when constructing dialogs
*
- * $Id: dlg_utils.h,v 1.21 2004/06/05 12:12:13 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/endpoint_talkers_eth.c b/gtk/endpoint_talkers_eth.c
index 7136d72a96..1318fd6e66 100644
--- a/gtk/endpoint_talkers_eth.c
+++ b/gtk/endpoint_talkers_eth.c
@@ -1,7 +1,7 @@
/* endpoint_talkers_eth.c
* endpoint_talkers_eth 2003 Ronnie Sahlberg
*
- * $Id: endpoint_talkers_eth.c,v 1.25 2004/05/02 17:25:09 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/endpoint_talkers_fc.c b/gtk/endpoint_talkers_fc.c
index 3172771e66..7d3ea9413c 100644
--- a/gtk/endpoint_talkers_fc.c
+++ b/gtk/endpoint_talkers_fc.c
@@ -1,7 +1,7 @@
/* endpoint_talkers_fc.c
* endpoint_talkers_fc 2003 Ronnie Sahlberg
*
- * $Id: endpoint_talkers_fc.c,v 1.25 2004/05/02 17:25:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/endpoint_talkers_fddi.c b/gtk/endpoint_talkers_fddi.c
index 7e49090777..40c31794cc 100644
--- a/gtk/endpoint_talkers_fddi.c
+++ b/gtk/endpoint_talkers_fddi.c
@@ -1,7 +1,7 @@
/* endpoint_talkers_fddi.c
* endpoint_talkers_fddi 2003 Ronnie Sahlberg
*
- * $Id: endpoint_talkers_fddi.c,v 1.20 2004/05/02 17:25:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/endpoint_talkers_ip.c b/gtk/endpoint_talkers_ip.c
index 1d3ae17eaf..3d97e37300 100644
--- a/gtk/endpoint_talkers_ip.c
+++ b/gtk/endpoint_talkers_ip.c
@@ -1,7 +1,7 @@
/* endpoint_talkers_ip.c
* endpoint_talkers_ip 2003 Ronnie Sahlberg
*
- * $Id: endpoint_talkers_ip.c,v 1.26 2004/05/02 17:25:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/endpoint_talkers_ipx.c b/gtk/endpoint_talkers_ipx.c
index 47de417e3a..4e2dfa0392 100644
--- a/gtk/endpoint_talkers_ipx.c
+++ b/gtk/endpoint_talkers_ipx.c
@@ -1,7 +1,7 @@
/* endpoint_talkers_ipx.c
* endpoint_talkers_ipx 2003 Ronnie Sahlberg
*
- * $Id: endpoint_talkers_ipx.c,v 1.24 2004/05/02 17:25:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/endpoint_talkers_table.c b/gtk/endpoint_talkers_table.c
index aec06db0b4..b74dce51ba 100644
--- a/gtk/endpoint_talkers_table.c
+++ b/gtk/endpoint_talkers_table.c
@@ -4,7 +4,7 @@
* endpoint_talkers_table 2003 Ronnie Sahlberg
* Helper routines common to all endpoint talkers tap.
*
- * $Id: endpoint_talkers_table.c,v 1.47 2004/07/13 18:14:00 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/endpoint_talkers_table.h b/gtk/endpoint_talkers_table.h
index d92f521a8d..9b8b3c6a43 100644
--- a/gtk/endpoint_talkers_table.h
+++ b/gtk/endpoint_talkers_table.h
@@ -2,7 +2,7 @@
* endpoint_talkers_table 2003 Ronnie Sahlberg
* Helper routines common to all endpoint talkers taps.
*
- * $Id: endpoint_talkers_table.h,v 1.14 2004/06/05 13:28:13 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/endpoint_talkers_tcpip.c b/gtk/endpoint_talkers_tcpip.c
index cf25358406..004ef62a4c 100644
--- a/gtk/endpoint_talkers_tcpip.c
+++ b/gtk/endpoint_talkers_tcpip.c
@@ -1,7 +1,7 @@
/* endpoint_talkers_tcpip.c
* endpoint_talkers_tcpip 2003 Ronnie Sahlberg
*
- * $Id: endpoint_talkers_tcpip.c,v 1.27 2004/05/02 17:25:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/endpoint_talkers_tr.c b/gtk/endpoint_talkers_tr.c
index dc904df3e5..cf5708a3a0 100644
--- a/gtk/endpoint_talkers_tr.c
+++ b/gtk/endpoint_talkers_tr.c
@@ -1,7 +1,7 @@
/* endpoint_talkers_tr.c
* endpoint_talkers_tr 2003 Ronnie Sahlberg
*
- * $Id: endpoint_talkers_tr.c,v 1.26 2004/05/02 17:25:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/endpoint_talkers_udpip.c b/gtk/endpoint_talkers_udpip.c
index 56de56e028..706990358f 100644
--- a/gtk/endpoint_talkers_udpip.c
+++ b/gtk/endpoint_talkers_udpip.c
@@ -1,7 +1,7 @@
/* endpoint_talkers_udpip.c
* endpoint_talkers_udpip 2003 Ronnie Sahlberg
*
- * $Id: endpoint_talkers_udpip.c,v 1.27 2004/05/02 17:25:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/ethclist.c b/gtk/ethclist.c
index 8def115a12..b263c165b7 100644
--- a/gtk/ethclist.c
+++ b/gtk/ethclist.c
@@ -2,7 +2,7 @@
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald,
* Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org>
*
- * $Id: ethclist.c,v 1.1 2004/01/09 08:36:22 guy Exp $
+ * $Id$
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/gtk/ethclist.h b/gtk/ethclist.h
index b90ba1e6b7..9d45f28703 100644
--- a/gtk/ethclist.h
+++ b/gtk/ethclist.h
@@ -2,7 +2,7 @@
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald
* Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org>
*
- * $Id: ethclist.h,v 1.4 2004/06/01 21:56:03 ulfl Exp $
+ * $Id$
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index f27476ea7c..a5187e526e 100644
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -1,7 +1,7 @@
/* fc_stat.c
* fc_stat 2003 Ronnie Sahlberg
*
- * $Id: fc_stat.c,v 1.34 2004/06/02 07:12:09 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index 947ed555ba..e70de62299 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -1,7 +1,7 @@
/* file_dlg.c
* Dialog boxes for handling files
*
- * $Id: file_dlg.c,v 1.128 2004/07/13 07:15:44 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/file_dlg.h b/gtk/file_dlg.h
index 59923ac166..143bce5ef8 100644
--- a/gtk/file_dlg.h
+++ b/gtk/file_dlg.h
@@ -1,7 +1,7 @@
/* file_dlg.h
* Definitions for dialog boxes for handling files
*
- * $Id: file_dlg.h,v 1.13 2004/06/17 21:53:25 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/filter_prefs.c b/gtk/filter_prefs.c
index 0147618be5..c33c387a1c 100644
--- a/gtk/filter_prefs.c
+++ b/gtk/filter_prefs.c
@@ -3,7 +3,7 @@
* (This used to be a notebook page under "Preferences", hence the
* "prefs" in the file name.)
*
- * $Id: filter_prefs.c,v 1.67 2004/06/05 10:27:38 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/filter_prefs.h b/gtk/filter_prefs.h
index 2d2e9aa5c6..8459337329 100644
--- a/gtk/filter_prefs.h
+++ b/gtk/filter_prefs.h
@@ -3,7 +3,7 @@
* (This used to be a notebook page under "Preferences", hence the
* "prefs" in the file name.)
*
- * $Id: filter_prefs.h,v 1.21 2004/06/05 12:12:13 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index 4bbde48a77..76c5b1e8fe 100644
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.c
@@ -1,7 +1,7 @@
/* find_dlg.c
* Routines for "find frame" window
*
- * $Id: find_dlg.c,v 1.53 2004/05/26 03:49:23 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/find_dlg.h b/gtk/find_dlg.h
index c5a89c4c55..41ddfe3c4c 100644
--- a/gtk/find_dlg.h
+++ b/gtk/find_dlg.h
@@ -1,7 +1,7 @@
/* find_dlg.h
* Definitions for "find frame" window
*
- * $Id: find_dlg.h,v 1.8 2004/06/04 20:05:31 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c
index e13ff16ed3..dd4518bde2 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_dlg.c
@@ -1,6 +1,6 @@
/* follow_dlg.c
*
- * $Id: follow_dlg.c,v 1.69 2004/07/09 23:02:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/follow_dlg.h b/gtk/follow_dlg.h
index 7316f5bf3d..423da70eab 100644
--- a/gtk/follow_dlg.h
+++ b/gtk/follow_dlg.h
@@ -1,6 +1,6 @@
/* follow_dlg.c
*
- * $Id: follow_dlg.h,v 1.6 2004/06/04 20:05:31 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/font_utils.c b/gtk/font_utils.c
index 0242644585..4a5c2590a0 100644
--- a/gtk/font_utils.c
+++ b/gtk/font_utils.c
@@ -1,7 +1,7 @@
/* font_utils.c
* Utilities to use for font manipulation
*
- * $Id: font_utils.c,v 1.1 2004/06/17 16:35:24 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/font_utils.h b/gtk/font_utils.h
index e8a3b5faa7..ac91a43943 100644
--- a/gtk/font_utils.h
+++ b/gtk/font_utils.h
@@ -1,7 +1,7 @@
/* font_utils.h
* Declarations of utilities to use for font manipulation
*
- * $Id: font_utils.h,v 1.1 2004/06/17 16:35:24 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c
index ef9ade53e1..2199bc1206 100644
--- a/gtk/goto_dlg.c
+++ b/gtk/goto_dlg.c
@@ -1,7 +1,7 @@
/* goto_dlg.c
* Routines for "go to packet" window
*
- * $Id: goto_dlg.c,v 1.27 2004/06/01 17:33:36 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/goto_dlg.h b/gtk/goto_dlg.h
index 0e04ec3b43..0614acd167 100644
--- a/gtk/goto_dlg.h
+++ b/gtk/goto_dlg.h
@@ -1,7 +1,7 @@
/* goto_dlg.h
* Definitions for "go to frame" window
*
- * $Id: goto_dlg.h,v 1.4 2004/06/04 20:05:31 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index 7a20d98874..e79910e886 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -5,7 +5,7 @@
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: gsm_a_stat.c,v 1.18 2004/05/23 23:24:05 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c
index ebd5e784ec..aac5582da1 100644
--- a/gtk/gsm_map_stat.c
+++ b/gtk/gsm_map_stat.c
@@ -5,7 +5,7 @@
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: gsm_map_stat.c,v 1.9 2004/05/23 23:24:05 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/gsm_map_stat.h b/gtk/gsm_map_stat.h
index dabede3235..283aac6b69 100644
--- a/gtk/gsm_map_stat.h
+++ b/gtk/gsm_map_stat.h
@@ -1,6 +1,6 @@
/* gsm_map_stat.h
*
- * $Id: gsm_map_stat.h,v 1.3 2004/06/05 11:03:14 ulfl Exp $
+ * $Id$
*
* Copyright 2004, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
diff --git a/gtk/gsm_map_summary.c b/gtk/gsm_map_summary.c
index 9071c7fdf9..53c207283b 100644
--- a/gtk/gsm_map_summary.c
+++ b/gtk/gsm_map_summary.c
@@ -6,7 +6,7 @@
*
* Modified from summary_dlg.c
*
- * $Id: gsm_map_summary.c,v 1.3 2004/05/23 23:24:05 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/gtk_stat_util.c b/gtk/gtk_stat_util.c
index 9250a4eb65..3ee77a30e7 100644
--- a/gtk/gtk_stat_util.c
+++ b/gtk/gtk_stat_util.c
@@ -2,7 +2,7 @@
* gui functions used by stats
* Copyright 2003 Lars Roland
*
- * $Id: gtk_stat_util.c,v 1.6 2004/06/01 21:56:04 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/gtk_stat_util.h b/gtk/gtk_stat_util.h
index ee85295fa4..4cbb6a011b 100644
--- a/gtk/gtk_stat_util.h
+++ b/gtk/gtk_stat_util.h
@@ -2,7 +2,7 @@
* gui functions used by stats
* Copyright 2003 Lars Roland
*
- * $Id: gtk_stat_util.h,v 1.4 2004/06/01 21:56:04 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/gtkglobals.h b/gtk/gtkglobals.h
index 3469e8c378..c1226e6cbb 100644
--- a/gtk/gtkglobals.h
+++ b/gtk/gtkglobals.h
@@ -1,7 +1,7 @@
/* gtkglobals.h
* GTK-related Global defines, etc.
*
- * $Id: gtkglobals.h,v 1.31 2004/07/09 23:02:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c
index 1cc621bb55..87eb3a2191 100644
--- a/gtk/gui_prefs.c
+++ b/gtk/gui_prefs.c
@@ -1,7 +1,7 @@
/* gui_prefs.c
* Dialog box for GUI preferences
*
- * $Id: gui_prefs.c,v 1.77 2004/07/14 08:04:39 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/gui_prefs.h b/gtk/gui_prefs.h
index 048cf82e07..b88e0eae28 100644
--- a/gtk/gui_prefs.h
+++ b/gtk/gui_prefs.h
@@ -1,7 +1,7 @@
/* gui_prefs.h
* Definitions for GUI preferences window
*
- * $Id: gui_prefs.h,v 1.8 2004/06/04 20:05:31 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c
index 307f9f9a70..be0f4bd200 100644
--- a/gtk/h225_counter.c
+++ b/gtk/h225_counter.c
@@ -2,7 +2,7 @@
* h225 message counter for ethereal
* Copyright 2003 Lars Roland
*
- * $Id: h225_counter.c,v 1.22 2004/06/02 07:12:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c
index 3344d67a06..2a9d78cdf8 100644
--- a/gtk/h225_ras_srt.c
+++ b/gtk/h225_ras_srt.c
@@ -2,7 +2,7 @@
* h225 RAS Service Response Time statistics for ethereal
* Copyright 2003 Lars Roland
*
- * $Id: h225_ras_srt.c,v 1.19 2004/06/02 07:12:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c
index cb9397bb3b..20d1ee1b52 100644
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -1,6 +1,6 @@
/* help_dlg.c
*
- * $Id: help_dlg.c,v 1.56 2004/06/05 09:57:10 ulfl Exp $
+ * $Id$
*
* Laurent Deniel <laurent.deniel@free.fr>
*
diff --git a/gtk/help_dlg.h b/gtk/help_dlg.h
index 9e3a687842..df06f21a6b 100644
--- a/gtk/help_dlg.h
+++ b/gtk/help_dlg.h
@@ -1,6 +1,6 @@
/* help_dlg.h
*
- * $Id: help_dlg.h,v 1.8 2004/06/04 20:05:31 ulfl Exp $
+ * $Id$
*
* Laurent Deniel <laurent.deniel@free.fr>
*
diff --git a/gtk/hostlist_eth.c b/gtk/hostlist_eth.c
index e70d1c1312..88c61e346c 100644
--- a/gtk/hostlist_eth.c
+++ b/gtk/hostlist_eth.c
@@ -1,7 +1,7 @@
/* hostlist_eth.c 2004 Ian Schorr
* modified from endpoint_talkers_eth.c 2003 Ronnie Sahlberg
*
- * $Id: hostlist_eth.c,v 1.6 2004/05/02 21:16:08 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/hostlist_fc.c b/gtk/hostlist_fc.c
index 562c815d70..5ac88f55c8 100644
--- a/gtk/hostlist_fc.c
+++ b/gtk/hostlist_fc.c
@@ -1,7 +1,7 @@
/* hostlist_fc.c 2004 Ian Schorr
* modified from endpoint_talkers_fc.c 2003 Ronnie Sahlberg
*
- * $Id: hostlist_fc.c,v 1.6 2004/05/02 21:16:08 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/hostlist_fddi.c b/gtk/hostlist_fddi.c
index 9e890655f6..62098070dc 100644
--- a/gtk/hostlist_fddi.c
+++ b/gtk/hostlist_fddi.c
@@ -1,7 +1,7 @@
/* hostlist_fddi.c 2004 Ian Schorr
* modified from endpoint_talkers_fddi.c 2003 Ronnie Sahlberg
*
- * $Id: hostlist_fddi.c,v 1.6 2004/05/02 21:16:08 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/hostlist_ip.c b/gtk/hostlist_ip.c
index a16210c411..a738f897a8 100644
--- a/gtk/hostlist_ip.c
+++ b/gtk/hostlist_ip.c
@@ -1,7 +1,7 @@
/* hostlist_ip.c 2004 Ian Schorr
* modified from endpoint_talkers_ip.c 2003 Ronnie Sahlberg
*
- * $Id: hostlist_ip.c,v 1.6 2004/05/02 21:16:08 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/hostlist_ipx.c b/gtk/hostlist_ipx.c
index 70e51ad2d2..7d9903456b 100644
--- a/gtk/hostlist_ipx.c
+++ b/gtk/hostlist_ipx.c
@@ -1,7 +1,7 @@
/* hostlist_ipx.c 2004 Ian Schorr
* modified from endpoint_talkers_ipx.c 2003 Ronnie Sahlberg
*
- * $Id: hostlist_ipx.c,v 1.6 2004/05/02 21:16:08 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index dd6b0e997d..8d71c28791 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -2,7 +2,7 @@
* modified from endpoint_talkers_table.c 2003 Ronnie Sahlberg
* Helper routines common to all host list taps.
*
- * $Id: hostlist_table.c,v 1.19 2004/07/13 18:14:00 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/hostlist_table.h b/gtk/hostlist_table.h
index 63749f2582..4fbb77e960 100644
--- a/gtk/hostlist_table.h
+++ b/gtk/hostlist_table.h
@@ -2,7 +2,7 @@
* modified from endpoint_talkers_table 2003 Ronnie Sahlberg
* Helper routines common to all host talkers taps.
*
- * $Id: hostlist_table.h,v 1.8 2004/06/05 13:28:13 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/hostlist_tcpip.c b/gtk/hostlist_tcpip.c
index 171ddf7167..e47c337ef0 100644
--- a/gtk/hostlist_tcpip.c
+++ b/gtk/hostlist_tcpip.c
@@ -1,7 +1,7 @@
/* hostlist_tcpip.c 2004 Ian Schorr
* modified from endpoint_talkers_tcpip.c 2003 Ronnie Sahlberg
*
- * $Id: hostlist_tcpip.c,v 1.6 2004/05/02 21:16:09 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/hostlist_tr.c b/gtk/hostlist_tr.c
index f3ade56f09..f68d56ea70 100644
--- a/gtk/hostlist_tr.c
+++ b/gtk/hostlist_tr.c
@@ -1,7 +1,7 @@
/* hostlist_tr.c 2004 Ian Schorr
* modified from endpoint_talkers_tr.c 2003 Ronnie Sahlberg
*
- * $Id: hostlist_tr.c,v 1.6 2004/05/02 21:16:09 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/hostlist_udpip.c b/gtk/hostlist_udpip.c
index 01f63366c8..9640c245eb 100644
--- a/gtk/hostlist_udpip.c
+++ b/gtk/hostlist_udpip.c
@@ -1,7 +1,7 @@
/* hostlist_udpip.c 2004 Ian Schorr
* modified from endpoint_talkers_udpip.c 2003 Ronnie Sahlberg
*
- * $Id: hostlist_udpip.c,v 1.6 2004/05/02 21:16:09 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/http_stat.c b/gtk/http_stat.c
index f1fb482456..4a7f9c7031 100644
--- a/gtk/http_stat.c
+++ b/gtk/http_stat.c
@@ -1,7 +1,7 @@
/* http_stat.c
* http_stat 2003 Jean-Michel FAYARD
*
- * $Id: http_stat.c,v 1.30 2004/05/23 23:24:06 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index da0e0475c7..912a89dd7d 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -1,7 +1,7 @@
/* io_stat.c
* io_stat 2002 Ronnie Sahlberg
*
- * $Id: io_stat.c,v 1.76 2004/05/23 23:24:06 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/isprint.h b/gtk/isprint.h
index 274fc43e3d..cd4a836120 100644
--- a/gtk/isprint.h
+++ b/gtk/isprint.h
@@ -2,7 +2,7 @@
* Temporary redefinition of "isprint()" to cope with GTK+ 1.3 and
* later using UTF-8 strings
*
- * $Id: isprint.h,v 1.1 2004/07/09 23:02:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/isup_stat.c b/gtk/isup_stat.c
index 16c97a6df3..d186cb4fac 100644
--- a/gtk/isup_stat.c
+++ b/gtk/isup_stat.c
@@ -5,7 +5,7 @@
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: isup_stat.c,v 1.23 2004/05/23 23:24:06 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/keys.h b/gtk/keys.h
index 5433915a11..afa0295f2c 100644
--- a/gtk/keys.h
+++ b/gtk/keys.h
@@ -1,7 +1,7 @@
/* keys.h
* Key definitions for various objects
*
- * $Id: keys.h,v 1.15 2004/06/01 21:56:04 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/layout_prefs.c b/gtk/layout_prefs.c
index 66b229581e..36d1edfe7e 100644
--- a/gtk/layout_prefs.c
+++ b/gtk/layout_prefs.c
@@ -1,7 +1,7 @@
/* layout_prefs.c
* Dialog box for layout preferences
*
- * $Id: layout_prefs.c,v 1.8 2004/05/05 07:31:05 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/layout_prefs.h b/gtk/layout_prefs.h
index 8bc016db84..34fb157633 100644
--- a/gtk/layout_prefs.h
+++ b/gtk/layout_prefs.h
@@ -1,7 +1,7 @@
/* layout_prefs.h
* Definitions for layout preferences window
*
- * $Id: layout_prefs.h,v 1.6 2004/06/04 20:05:31 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index b4a1ddc44e..a48d509bcd 100644
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.c
@@ -1,7 +1,7 @@
/* ldap_stat.c
* ldap_stat 2003 Ronnie Sahlberg
*
- * $Id: ldap_stat.c,v 1.22 2004/06/02 07:12:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/main.c b/gtk/main.c
index d0a3744d02..ab88812f5a 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c,v 1.458 2004/07/13 07:15:44 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/main.h b/gtk/main.h
index 205a5fcd8d..3cd7339081 100644
--- a/gtk/main.h
+++ b/gtk/main.h
@@ -1,7 +1,7 @@
/* main.h
* Global defines, etc.
*
- * $Id: main.h,v 1.56 2004/06/23 01:38:39 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/menu.c b/gtk/menu.c
index b642d02b23..7f49b475b0 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,1828 +1,1828 @@
-/* menu.c
- * Menu routines
- *
- * $Id: menu.c,v 1.208 2004/07/07 16:26:52 ulfl Exp $
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <gtk/gtk.h>
-
-#include <string.h>
-
-#include "main.h"
-#include "menu.h"
-#include "tap_menu.h"
-#include <epan/packet.h>
-#include <epan/resolv.h>
-#include "prefs.h"
-#include "about_dlg.h"
-#include "capture_dlg.h"
-#include "color_dlg.h"
-#include "filter_prefs.h"
-#include "dlg_utils.h"
-#include "file_dlg.h"
-#include "find_dlg.h"
-#include "goto_dlg.h"
-#include "summary_dlg.h"
-#include "prefs_dlg.h"
-#include "packet_win.h"
-#include "print.h"
-#include "follow_dlg.h"
-#include "decode_as_dlg.h"
-#include "help_dlg.h"
-#include "supported_protos_dlg.h"
-#include "proto_dlg.h"
-#include "proto_hier_stats_dlg.h"
-#include "keys.h"
-#include <epan/plugins.h>
-#include <epan/epan_dissect.h>
-#include "compat_macros.h"
-#include "toolbar.h"
-#include "gtkglobals.h"
-#include "register.h"
-#include "../tap.h"
-#include "../menu.h"
-#include "../ipproto.h"
-#include "packet_list.h"
-#include "ethclist.h"
-#include "recent.h"
-#include "../ui_util.h"
-#include "proto_draw.h"
-#include "endpoint_talkers_table.h"
-#include "hostlist_table.h"
-#include "simple_dialog.h"
-#include <epan/timestamp.h>
-
-GtkWidget *popup_menu_object;
-
-static void
-clear_menu_recent_capture_file_cmd_cb(GtkWidget *w, gpointer unused _U_);
-
-typedef struct _menu_item {
- char *name;
- gint group;
- gboolean enabled;
- GtkItemFactoryCallback callback;
- gpointer callback_data;
- gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *);
- gboolean (*selected_tree_row_enabled)(field_info *);
- GList *children;
-} menu_item_t;
-
-static GList *tap_menu_tree_root = NULL;
-
-static void
-merge_all_tap_menus(GList *node);
-
-#define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a))
-
-static void menus_init(void);
-static void set_menu_sensitivity (GtkItemFactory *, const gchar *, gint);
-static void main_toolbar_show_cb(GtkWidget *w _U_, gpointer d _U_);
-static void filter_toolbar_show_cb(GtkWidget *w _U_, gpointer d _U_);
-static void packet_list_show_cb(GtkWidget *w _U_, gpointer d _U_);
-static void tree_view_show_cb(GtkWidget *w _U_, gpointer d _U_);
-static void byte_view_show_cb(GtkWidget *w _U_, gpointer d _U_);
-static void statusbar_show_cb(GtkWidget *w _U_, gpointer d _U_);
-static void timestamp_absolute_cb(GtkWidget *w _U_, gpointer d _U_);
-static void timestamp_absolute_date_cb(GtkWidget *w _U_, gpointer d _U_);
-static void timestamp_relative_cb(GtkWidget *w _U_, gpointer d _U_);
-static void timestamp_delta_cb(GtkWidget *w _U_, gpointer d _U_);
-static void name_resolution_mac_cb(GtkWidget *w _U_, gpointer d _U_);
-static void name_resolution_network_cb(GtkWidget *w _U_, gpointer d _U_);
-static void name_resolution_transport_cb(GtkWidget *w _U_, gpointer d _U_);
-#ifdef HAVE_LIBPCAP
-static void auto_scroll_live_cb(GtkWidget *w _U_, gpointer d _U_);
-#endif
-
-/* This is the GtkItemFactoryEntry structure used to generate new menus.
- Item 1: The menu path. The letter after the underscore indicates an
- accelerator key once the menu is open.
- Item 2: The accelerator key for the entry
- Item 3: The callback function.
- Item 4: The callback action. This changes the parameters with
- which the function is called. The default is 0.
- Item 5: The item type, used to define what kind of an item it is.
- Here are the possible values:
-
- NULL -> "<Item>"
- "" -> "<Item>"
- "<Title>" -> create a title item
- "<Item>" -> create a simple item
- "<ImageItem>" -> create an item holding an image (gtk2)
- "<StockItem>" -> create an item holding a stock image (gtk2)
- "<CheckItem>" -> create a check item
- "<ToggleItem>" -> create a toggle item
- "<RadioItem>" -> create a radio item
- <path> -> path of a radio item to link against
- "<Separator>" -> create a separator
- "<Tearoff>" -> create a tearoff separator (gtk2)
- "<Branch>" -> create an item to hold sub items (optional)
- "<LastBranch>" -> create a right justified branch
- Item 6: extra data needed for ImageItem and StockItem (gtk2)
- */
-
-/* main menu */
-static GtkItemFactoryEntry menu_items[] =
-{
- ITEM_FACTORY_ENTRY("/_File", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_STOCK_ENTRY("/File/_Open...", "<control>O", file_open_cmd_cb,
- 0, GTK_STOCK_OPEN),
- ITEM_FACTORY_ENTRY("/File/Open _Recent", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/File/_Merge...", NULL, file_merge_cmd_cb, 0, NULL, NULL),
- ITEM_FACTORY_STOCK_ENTRY("/File/_Close", "<control>W", file_close_cmd_cb,
- 0, GTK_STOCK_CLOSE),
- ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_STOCK_ENTRY("/File/_Save", "<control>S", file_save_cmd_cb,
- 0, GTK_STOCK_SAVE),
- ITEM_FACTORY_STOCK_ENTRY("/File/Save _As...", "<shift><control>S", file_save_as_cmd_cb,
- 0, GTK_STOCK_SAVE_AS),
- ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/File/_Export", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/File/Export/as \"Plain _Text\" file...", NULL, export_text_cmd_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/File/Export/as \"_PostScript\" file...", NULL, export_ps_cmd_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/File/Export/as XML - \"P_SML\" (packet summary) file...", NULL, export_psml_cmd_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/File/Export/as XML - \"P_DML\" (packet details) file...", NULL, export_pdml_cmd_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/File/Export/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/File/Export/Selected Packet _Bytes...", "<control>H", savehex_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_STOCK_ENTRY("/File/_Print...", "<control>P", file_print_cmd_cb,
- 0, GTK_STOCK_PRINT),
- ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_STOCK_ENTRY("/File/_Quit", "<control>Q", file_quit_cmd_cb,
- 0, GTK_STOCK_QUIT),
- ITEM_FACTORY_ENTRY("/_Edit", NULL, NULL, 0, "<Branch>", NULL),
-#if 0
- /* Un-#if this when we actually implement Cut/Copy/Paste. */
- ITEM_FACTORY_STOCK_ENTRY("/Edit/Cut", "<control>X", NULL,
- 0, GTK_STOCK_CUT),
- ITEM_FACTORY_STOCK_ENTRY("/Edit/Copy", "<control>C", NULL,
- 0, GTK_STOCK_COPY),
- ITEM_FACTORY_STOCK_ENTRY("/Edit/Paste", "<control>V", NULL,
- 0, GTK_STOCK_PASTE),
- ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>"),
-#endif
- ITEM_FACTORY_STOCK_ENTRY("/Edit/_Find Packet...", "<control>F",
- find_frame_cb, 0, GTK_STOCK_FIND),
- ITEM_FACTORY_STOCK_ENTRY("/Edit/Find Ne_xt", "<control>N", find_next_cb,
- 0, GTK_STOCK_GO_FORWARD),
- ITEM_FACTORY_STOCK_ENTRY("/Edit/Find Pre_vious", "<control>B",
- find_previous_cb, 0, GTK_STOCK_GO_BACK),
- ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/Edit/_Time Reference", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/Edit/Time Reference/Set Time Reference (toggle)", "<control>T", reftime_frame_cb, REFTIME_TOGGLE, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Next", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Previous", NULL, reftime_frame_cb, REFTIME_FIND_PREV, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Edit/_Mark Packet", "<control>M", mark_frame_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Edit/Mark _All Packets", NULL, mark_all_frames_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Edit/_Unmark All Packets", NULL, unmark_all_frames_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_STOCK_ENTRY("/Edit/_Preferences...", "<shift><control>P", prefs_cb,
- 0, GTK_STOCK_PREFERENCES),
- ITEM_FACTORY_ENTRY("/_View", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/View/_Main Toolbar", NULL, main_toolbar_show_cb, 0, "<CheckItem>", NULL),
- ITEM_FACTORY_ENTRY("/View/_Filter Toolbar", NULL, filter_toolbar_show_cb, 0, "<CheckItem>", NULL),
- ITEM_FACTORY_ENTRY("/View/_Statusbar", NULL, statusbar_show_cb, 0, "<CheckItem>", NULL),
- ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/View/Packet _List", NULL, packet_list_show_cb, 0, "<CheckItem>", NULL),
- ITEM_FACTORY_ENTRY("/View/Packet _Details", NULL, tree_view_show_cb, 0, "<CheckItem>", NULL),
- ITEM_FACTORY_ENTRY("/View/Packet _Bytes", NULL, byte_view_show_cb, 0, "<CheckItem>", NULL),
- ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/View/_Time Display Format", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/View/Time Display Format/Time of Day", NULL, timestamp_absolute_cb,
- 0, "<RadioItem>", NULL),
- ITEM_FACTORY_ENTRY("/View/Time Display Format/Date and Time of Day", NULL, timestamp_absolute_date_cb,
- 0, "/View/Time Display Format/Time of Day", NULL),
- ITEM_FACTORY_ENTRY("/View/Time Display Format/Seconds Since Beginning of Capture", NULL, timestamp_relative_cb,
- 0, "/View/Time Display Format/Time of Day", NULL),
- ITEM_FACTORY_ENTRY("/View/Time Display Format/Seconds Since Previous Packet", NULL, timestamp_delta_cb,
- 0, "/View/Time Display Format/Time of Day", NULL),
- ITEM_FACTORY_ENTRY("/View/Name Resol_ution", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/View/Name Resolution/_Resolve Name", NULL, resolve_name_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/View/Name Resolution/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _MAC Layer", NULL, name_resolution_mac_cb, 0, "<CheckItem>", NULL),
- ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _Network Layer", NULL, name_resolution_network_cb, 0, "<CheckItem>", NULL),
- ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _Transport Layer", NULL, name_resolution_transport_cb, 0, "<CheckItem>", NULL),
-#ifdef HAVE_LIBPCAP
- ITEM_FACTORY_ENTRY("/View/Auto Scroll in Li_ve Capture", NULL, auto_scroll_live_cb, 0, "<CheckItem>", NULL),
-#endif
- ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_STOCK_ENTRY("/View/_Zoom In", "<control>plus", view_zoom_in_cb,
- 0, GTK_STOCK_ZOOM_IN),
- ITEM_FACTORY_STOCK_ENTRY("/View/Zoom _Out", "<control>minus", view_zoom_out_cb,
- 0, GTK_STOCK_ZOOM_OUT),
- ITEM_FACTORY_STOCK_ENTRY("/View/_Normal Size", "<control>equal", view_zoom_100_cb,
- 0, GTK_STOCK_ZOOM_100),
- ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/View/Collapse _All", NULL, collapse_all_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/View/_Expand All", NULL, expand_all_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/View/Expand Tree", NULL, expand_tree_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_STOCK_ENTRY("/View/_Coloring Rules...", NULL, color_display_cb,
- 0, GTK_STOCK_SELECT_COLOR),
- ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/View/Show Packet in New _Window", NULL,
- new_window_cb, 0, NULL, NULL),
- ITEM_FACTORY_STOCK_ENTRY("/View/_Reload", "<control>R", file_reload_cmd_cb,
- 0, GTK_STOCK_REFRESH),
- ITEM_FACTORY_ENTRY("/_Go", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_STOCK_ENTRY("/Go/_Go to Packet...", "<control>G",
- goto_frame_cb, 0, GTK_STOCK_JUMP_TO),
- ITEM_FACTORY_ENTRY("/Go/Go to _Corresponding Packet", NULL, goto_framenum_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Go/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_STOCK_ENTRY("/Go/_First Packet", NULL,
- goto_top_frame_cb, 0, GTK_STOCK_GOTO_TOP),
- ITEM_FACTORY_STOCK_ENTRY("/Go/_Last Packet", NULL,
- goto_bottom_frame_cb, 0, GTK_STOCK_GOTO_BOTTOM),
-#ifdef HAVE_LIBPCAP
- ITEM_FACTORY_ENTRY("/_Capture", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_STOCK_ENTRY("/Capture/_Start...", "<control>K",
- capture_prep_cb, 0, ETHEREAL_STOCK_CAPTURE_START),
- ITEM_FACTORY_STOCK_ENTRY("/Capture/S_top", "<control>E", capture_stop_cb,
- 0, GTK_STOCK_STOP),
- ITEM_FACTORY_ENTRY("/Capture/_Interfaces...", NULL,
- capture_if_cb, 0, NULL, NULL),
- ITEM_FACTORY_STOCK_ENTRY("/Capture/_Capture Filters...", NULL, cfilter_dialog_cb,
- 0, ETHEREAL_STOCK_CAPTURE_FILTER),
-#endif /* HAVE_LIBPCAP */
- ITEM_FACTORY_ENTRY("/_Analyze", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_STOCK_ENTRY("/Analyze/_Display Filters...", NULL, dfilter_dialog_cb,
- 0, ETHEREAL_STOCK_DISPLAY_FILTER),
- ITEM_FACTORY_ENTRY("/Analyze/Appl_y as Filter", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/_Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/_Not Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... _and Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... _or Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... a_nd not Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/_Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/_Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_REPLACE, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/_Not Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_NOT, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... _and Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_AND, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... _or Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_OR, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... a_nd not Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_AND_NOT, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_OR_NOT, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/Analyze/_Enabled Protocols...", "<shift><control>R", proto_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Decode _As...", NULL, decode_as_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/_User Specified Decodes...", NULL,
- decode_show_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/Analyze/_Follow TCP Stream", NULL,
- follow_stream_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/_Statistics", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/Statistics/_Summary", NULL, summary_open_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Statistics/_Protocol Hierarchy", NULL,
- proto_hier_stats_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Statistics/Conversations", NULL,
- init_ett_notebook_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Statistics/Endpoints", NULL,
- init_hostlist_notebook_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/_Help", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_STOCK_ENTRY("/Help/_Contents", "F1", help_cb, 0, GTK_STOCK_HELP),
- ITEM_FACTORY_ENTRY("/Help/_Supported Protocols", NULL, supported_cb, 0, NULL, NULL),
-#if (GLIB_MAJOR_VERSION >= 2)
- /* currently, glib1.x can't start a webbrowser, see webbrowser.c for details */
- ITEM_FACTORY_ENTRY("/Help/Manual Pages", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/Help/Manual Pages/Ethereal", NULL, url_localpage_cb, LOCALPAGE_MAN_ETHEREAL, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Help/Manual Pages/Ethereal Filter", NULL, url_localpage_cb, LOCALPAGE_MAN_ETHEREAL_FILTER, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Help/Manual Pages/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/Help/Manual Pages/Tethereal", NULL, url_localpage_cb, LOCALPAGE_MAN_TETHEREAL, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Help/Manual Pages/Mergecap", NULL, url_localpage_cb, LOCALPAGE_MAN_MERGECAP, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Help/Manual Pages/Editcap", NULL, url_localpage_cb, LOCALPAGE_MAN_EDITCAP, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Help/Manual Pages/Text2pcap", NULL, url_localpage_cb, LOCALPAGE_MAN_TEXT2PCAP, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Help/Ethereal Online", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_STOCK_ENTRY("/Help/Ethereal Online/Home Page", NULL, url_onlinepage_cb, ONLINEPAGE_HOME, GTK_STOCK_HOME),
- ITEM_FACTORY_ENTRY("/Help/Ethereal Online/User's Guide", NULL, url_onlinepage_cb, ONLINEPAGE_USERGUIDE, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Help/Ethereal Online/FAQ's", NULL, url_onlinepage_cb, ONLINEPAGE_FAQ, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Downloads", NULL, url_onlinepage_cb, ONLINEPAGE_DOWNLOAD, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Example Files", NULL, url_onlinepage_cb, ONLINEPAGE_SAMPLE, NULL, NULL),
-#endif
- ITEM_FACTORY_ENTRY("/Help/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/Help/_About Ethereal", NULL, about_ethereal_cb,
- 0, NULL, NULL)
-};
-
-
-/* calculate the number of menu_items */
-static int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
-
-/* packet list popup */
-static GtkItemFactoryEntry packet_list_menu_items[] =
-{
- ITEM_FACTORY_ENTRY("/Follow TCP Stream", NULL, follow_stream_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Decode As...", NULL, decode_as_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Display Filters...", NULL, dfilter_dialog_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/Mark Packet", NULL, mark_frame_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Time Reference", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/Time Reference/Set Time Reference (toggle)", NULL, reftime_frame_cb, REFTIME_TOGGLE, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Time Reference/Find Next", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Time Reference/Find Previous", NULL, reftime_frame_cb, REFTIME_FIND_PREV, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/Apply as Filter/_Selected", NULL, match_selected_plist_cb,
- MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Apply as Filter/_Not Selected", NULL, match_selected_plist_cb,
- MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Apply as Filter/... _and Selected", NULL, match_selected_plist_cb,
- MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Apply as Filter/... _or Selected", NULL, match_selected_plist_cb,
- MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Apply as Filter/... a_nd not Selected", NULL, match_selected_plist_cb,
- MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Apply as Filter/... o_r not Selected", NULL, match_selected_plist_cb,
- MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
-
- ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/Prepare a Filter/_Selected", NULL, match_selected_plist_cb,
- MATCH_SELECTED_REPLACE, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare a Filter/_Not Selected", NULL, match_selected_plist_cb,
- MATCH_SELECTED_NOT, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare a Filter/... _and Selected", NULL, match_selected_plist_cb,
- MATCH_SELECTED_AND, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare a Filter/... _or Selected", NULL, match_selected_plist_cb,
- MATCH_SELECTED_OR, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare a Filter/... a_nd not Selected", NULL, match_selected_plist_cb,
- MATCH_SELECTED_AND_NOT, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare a Filter/... o_r not Selected", NULL, match_selected_plist_cb,
- MATCH_SELECTED_OR_NOT, NULL, NULL),
-
- ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/Coloring Rules...", NULL, color_display_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Print...", NULL, file_print_cmd_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Show Packet in New Window", NULL, new_window_cb,
- 0, NULL, NULL),
-};
-
-static GtkItemFactoryEntry tree_view_menu_items[] =
-{
- ITEM_FACTORY_ENTRY("/Follow TCP Stream", NULL, follow_stream_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Decode As...", NULL, decode_as_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Display Filters...", NULL, dfilter_dialog_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/_Resolve Name", NULL, resolve_name_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/_Go to Corresponding Packet", NULL, goto_framenum_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/_Export Selected Packet Bytes...", NULL, savehex_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Protocol Preferences...", NULL, properties_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/Apply as Filter/_Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Apply as Filter/_Not Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Apply as Filter/... _and Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Apply as Filter/... _or Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Apply as Filter/... a_nd not Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Apply as Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
-
- ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/Prepare a Filter/_Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_REPLACE, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare a Filter/_Not Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_NOT, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare a Filter/... _and Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_AND, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare a Filter/... _or Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_OR, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare a Filter/... a_nd not Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_AND_NOT, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare a Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
- MATCH_SELECTED_OR_NOT, NULL, NULL),
- ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/Collapse All", NULL, collapse_all_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Expand All", NULL, expand_all_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Expand Tree", NULL, expand_tree_cb, 0, NULL, NULL)
-};
-
-static GtkItemFactoryEntry hexdump_menu_items[] =
-{
- ITEM_FACTORY_ENTRY("/Follow TCP Stream", NULL, follow_stream_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Decode As...", NULL, decode_as_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Display Filters...", NULL, dfilter_dialog_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Export Selected Packet Bytes...", NULL, savehex_cb,
- 0, NULL, NULL)
-};
-
-static int initialize = TRUE;
-static GtkItemFactory *main_menu_factory = NULL;
-static GtkItemFactory *packet_list_menu_factory = NULL;
-static GtkItemFactory *tree_view_menu_factory = NULL;
-static GtkItemFactory *hexdump_menu_factory = NULL;
-
-static GSList *popup_menu_list = NULL;
-
-static GtkAccelGroup *grp;
-
-GtkWidget *
-main_menu_new(GtkAccelGroup ** table) {
- GtkWidget *menubar;
-
- grp = gtk_accel_group_new();
-
- if (initialize)
- menus_init();
-
- menubar = main_menu_factory->widget;
-
- if (table)
- *table = grp;
-
- return menubar;
-}
-
-static void
-menus_init(void) {
- if (initialize) {
- initialize = FALSE;
-
- /* popup */
- packet_list_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
- popup_menu_object = gtk_menu_new();
- gtk_item_factory_create_items_ac(packet_list_menu_factory, sizeof(packet_list_menu_items)/sizeof(packet_list_menu_items[0]), packet_list_menu_items, popup_menu_object, 2);
- OBJECT_SET_DATA(popup_menu_object, PM_PACKET_LIST_KEY,
- packet_list_menu_factory->widget);
- popup_menu_list = g_slist_append((GSList *)popup_menu_list, packet_list_menu_factory);
-
- tree_view_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
- gtk_item_factory_create_items_ac(tree_view_menu_factory, sizeof(tree_view_menu_items)/sizeof(tree_view_menu_items[0]), tree_view_menu_items, popup_menu_object, 2);
- OBJECT_SET_DATA(popup_menu_object, PM_TREE_VIEW_KEY,
- tree_view_menu_factory->widget);
- popup_menu_list = g_slist_append((GSList *)popup_menu_list, tree_view_menu_factory);
-
- hexdump_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
- gtk_item_factory_create_items_ac(hexdump_menu_factory, sizeof(hexdump_menu_items)/sizeof(hexdump_menu_items[0]), hexdump_menu_items, popup_menu_object, 2);
- OBJECT_SET_DATA(popup_menu_object, PM_HEXDUMP_KEY,
- hexdump_menu_factory->widget);
- popup_menu_list = g_slist_append((GSList *)popup_menu_list, hexdump_menu_factory);
-
- /* main */
- main_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", grp);
- gtk_item_factory_create_items_ac(main_menu_factory, nmenu_items, menu_items, NULL, 2);
-
- merge_all_tap_menus(tap_menu_tree_root);
-
- /* Initialize enabled/disabled state of menu items */
- set_menus_for_unsaved_capture_file(FALSE);
- set_menus_for_capture_file(FALSE);
-#if 0
- /* Un-#if this when we actually implement Cut/Copy/Paste.
- Then make sure you enable them when they can be done. */
- set_menu_sensitivity(main_menu_factory, "/Edit/Cut", FALSE);
- set_menu_sensitivity(main_menu_factory, "/Edit/Copy", FALSE);
- set_menu_sensitivity(main_menu_factory, "/Edit/Paste", FALSE);
-#endif
-
- set_menus_for_captured_packets(FALSE);
- set_menus_for_selected_packet(&cfile);
- set_menus_for_selected_tree_row(&cfile);
-
- /* init with an empty recent files list */
- clear_menu_recent_capture_file_cmd_cb(NULL, NULL);
- }
-}
-
-
-gint tap_menu_item_add_compare(gconstpointer a, gconstpointer b)
-{
- return strcmp(
- ((const menu_item_t *) a)->name,
- ((const menu_item_t *) b)->name);
-}
-
-
-/* add a menuitem below the current node */
-GList * tap_menu_item_add(
- char *name,
- gint group,
- GtkItemFactoryCallback callback,
- gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *),
- gboolean (*selected_tree_row_enabled)(field_info *),
- gpointer callback_data,
- GList *curnode)
-{
- menu_item_t *curr;
- menu_item_t *child;
-
-
- child = g_malloc(sizeof (menu_item_t));
- child->group = group;
- child->name = name;
- child->callback = callback;
- child->selected_packet_enabled = selected_packet_enabled;
- child->selected_tree_row_enabled = selected_tree_row_enabled;
- child->callback_data = callback_data;
- child->enabled = FALSE;
- child->children = NULL;
-
- /* insert the new child node into the parent */
- curr = curnode->data;
- curr->children = g_list_insert_sorted(curr->children, child, tap_menu_item_add_compare);
-
- /* return the new node */
- /* XXX: improve this */
- return g_list_find(curr->children, child);
-}
-
-/*
- * Add a new menu item for a tap.
- * This must be called after we've created the main menu, so it can't
- * be called from the routine that registers taps - we have to introduce
- * another per-tap registration routine.
- *
- * "callback" gets called when the menu item is selected; it should do
- * the work of creating the tap window.
- *
- * "selected_packet_enabled" gets called by "set_menus_for_selected_packet()";
- * it's passed a Boolean that's TRUE if a packet is selected and FALSE
- * otherwise, and should return TRUE if the tap will work now (which
- * might depend on whether a packet is selected and, if one is, on the
- * packet) and FALSE if not.
- *
- * "selected_tree_row_enabled" gets called by
- * "set_menus_for_selected_tree_row()"; it's passed a Boolean that's TRUE if
- * a protocol tree row is selected and FALSE otherwise, and should return
- * TRUE if the tap will work now (which might depend on whether a tree row
- * is selected and, if one is, on the tree row) and FALSE if not.
- */
-void
-register_tap_menu_item(
- char *name,
- REGISTER_TAP_GROUP_E group,
- GtkItemFactoryCallback callback,
- gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *),
- gboolean (*selected_tree_row_enabled)(field_info *),
- gpointer callback_data)
-{
- /*static const char toolspath[] = "/Statistics/";*/
- char *toolspath;
- char *p;
- char *menupath;
- size_t menupathlen;
- menu_item_t *child;
- GList *curnode;
- GList *childnode;
-
- /*
- * The menu path must be relative.
- */
- g_assert(*name != '/');
-
- switch(group) {
- case(REGISTER_TAP_GROUP_GENERIC): toolspath = "/Statistics/"; break;
- case(REGISTER_TAP_GROUP_CONVERSATION_LIST): toolspath = "/Statistics/_Conversation List/"; break;
- case(REGISTER_TAP_GROUP_ENDPOINT_LIST): toolspath = "/Statistics/_Endpoint List/"; break;
- case(REGISTER_TAP_GROUP_RESPONSE_TIME): toolspath = "/Statistics/Service _Response Time/"; break;
- case(REGISTER_TAP_GROUP_NONE): toolspath = "/Statistics/"; break;
- default:
- g_assert(0);
- toolspath = NULL;
- }
-
- /* add the (empty) root node, if not already done */
- if(tap_menu_tree_root == NULL) {
- child = g_malloc0(sizeof (menu_item_t));
- tap_menu_tree_root = g_list_append(NULL, child);
- }
-
- /*
- * Create any submenus required.
- */
- curnode = tap_menu_tree_root;
- p = name;
- while ((p = strchr(p, '/')) != NULL) {
- /*
- * OK, everything between "name" and "p" is
- * a menu relative subtree into which the menu item
- * will be placed.
- *
- * Construct the absolute path name of that subtree.
- */
- menupathlen = strlen(toolspath) + 1 + (p - name);
- menupath = g_malloc(menupathlen);
- strcpy(menupath, toolspath);
- strncat(menupath, name, p - name);
-
- /*
- * Does there exist an entry with that path at this
- * level of the Analyze menu tree?
- */
- child = curnode->data;
- for (childnode = child->children; childnode != NULL; childnode = childnode->next) {
- child = childnode->data;
- if (strcmp(child->name, menupath) == 0)
- break;
- }
- if (childnode == NULL) {
- /*
- * No. Create such an item as a subtree, and
- * add it to the Tools menu tree.
- */
- childnode = tap_menu_item_add(
- menupath, group, NULL, NULL ,NULL, NULL, curnode);
- } else {
- /*
- * Yes. We don't need this "menupath" any longer.
- */
- g_free(menupath);
- }
- curnode = childnode;
-
- /*
- * Skip over the '/' we found.
- */
- p++;
- }
-
- /*
- * Construct the main menu path for the menu item.
- */
- menupathlen = strlen(toolspath) + 1 + strlen(name);
- menupath = g_malloc(menupathlen);
- strcpy(menupath, toolspath);
- strcat(menupath, name);
-
- /*
- * Construct an item factory entry for the item, and add it to
- * the main menu.
- */
- tap_menu_item_add(
- menupath, group, callback,
- selected_packet_enabled, selected_tree_row_enabled,
- callback_data, curnode);
-}
-
-
-guint merge_tap_menus_layered(GList *node, gint group) {
- GtkItemFactoryEntry *entry;
- GList *child;
- guint added = 0;
- menu_item_t *node_data = node->data;
-
- /*
- * Is this a leaf node or an interior node?
- */
- if (node_data->children == NULL) {
- /*
- * It's a leaf node.
- */
-
- /*
- * The root node doesn't correspond to a menu tree item; it
- * has a null name pointer.
- */
- if (node_data->name != NULL && group == node_data->group) {
- entry = g_malloc0(sizeof (GtkItemFactoryEntry));
- entry->path = node_data->name;
- entry->callback = node_data->callback;
- gtk_item_factory_create_item(main_menu_factory, entry, node_data->callback_data, 2);
- set_menu_sensitivity(main_menu_factory, node_data->name, FALSE); /* no capture file yet */
- added++;
- }
- } else {
- /*
- * It's an interior node; call
- * "merge_tap_menus_layered()" on all its children
- */
-
- /*
- * The root node doesn't correspond to a menu tree item; it
- * has a null name pointer.
- */
- if (node_data->name != NULL && group == node_data->group) {
- entry = g_malloc0(sizeof (GtkItemFactoryEntry));
- entry->path = node_data->name;
- entry->item_type = "<Branch>";
- gtk_item_factory_create_item(main_menu_factory, entry,
- NULL, 2);
- set_menu_sensitivity(main_menu_factory, node_data->name,
- FALSE); /* no children yet */
- added++;
- }
-
- for (child = node_data->children; child != NULL; child =
- child->next) {
- added += merge_tap_menus_layered(child, group);
- }
- }
-
- return added;
-}
-
-
-void merge_all_tap_menus(GList *node) {
- GtkItemFactoryEntry *entry;
-
- entry = g_malloc0(sizeof (GtkItemFactoryEntry));
- entry->item_type = "<Separator>";
- entry->path = "/Statistics/";
-
- /*
- * merge only the menu items of the specific group,
- * and then append a seperator
- */
- if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_GENERIC)) {
- gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);
- }
- if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_CONVERSATION_LIST)) {
- /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
- }
- if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_ENDPOINT_LIST)) {
- /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
- }
- if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_RESPONSE_TIME)) {
- gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);
- }
- if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_NONE)) {
- /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
- }
-}
-
-
-
-/*
- * Enable/disable menu sensitivity.
- */
-static void
-set_menu_sensitivity(GtkItemFactory *ifactory, const gchar *path, gint val)
-{
- GSList *menu_list;
- GtkWidget *menu_item;
- gchar *dup;
- gchar *dest;
-
-
- /* the underscore character regularly confuses things, as it will prevent finding
- * the menu_item, so it has to be removed first */
- dup = g_strdup(path);
- dest = dup;
- while(*path) {
- if (*path != '_') {
- *dest = *path;
- dest++;
- }
- path++;
- }
- *dest = '\0';
-
- if (ifactory == NULL) {
- /*
- * Do it for all pop-up menus.
- */
- for (menu_list = popup_menu_list; menu_list != NULL;
- menu_list = g_slist_next(menu_list))
- set_menu_sensitivity(menu_list->data, dup, val);
- } else {
- /*
- * Do it for that particular menu.
- */
- if ((menu_item = gtk_item_factory_get_widget(ifactory, dup)) != NULL) {
- if (GTK_IS_MENU(menu_item)) {
- /*
- * "dup" refers to a submenu; "gtk_item_factory_get_widget()"
- * gets the menu, not the item that, when selected, pops up
- * the submenu.
- *
- * We have to change the latter item's sensitivity, so that
- * it shows up normally if sensitive and grayed-out if
- * insensitive.
- */
- menu_item = gtk_menu_get_attach_widget(GTK_MENU(menu_item));
- }
- gtk_widget_set_sensitive(menu_item, val);
- } else{
- /* be sure this menu item *is* existing */
- g_assert_not_reached();
- }
- }
-
- g_free(dup);
-}
-
-void
-set_menu_object_data_meat(GtkItemFactory *ifactory, gchar *path, gchar *key, gpointer data)
-{
- GtkWidget *menu = NULL;
-
- if ((menu = gtk_item_factory_get_widget(ifactory, path)) != NULL)
- OBJECT_SET_DATA(menu, key, data);
-}
-
-void
-set_menu_object_data (gchar *path, gchar *key, gpointer data) {
- GSList *menu_list = popup_menu_list;
- gchar *shortpath = strrchr(path, '/');
-
- set_menu_object_data_meat(main_menu_factory, path, key, data);
- while (menu_list != NULL) {
- set_menu_object_data_meat(menu_list->data, shortpath, key, data);
- menu_list = g_slist_next(menu_list);
- }
-}
-
-
-/* Recently used capture files submenu:
- * Submenu containing the recently used capture files.
- * The capture filenames are always kept with the absolute path, to be independant
- * of the current path.
- * They are only stored inside the labels of the submenu (no separate list). */
-
-#define MENU_RECENT_FILES_PATH "/File/Open Recent"
-#define MENU_RECENT_FILES_KEY "Recent File Name"
-
-void
-update_menu_recent_capture_file1(GtkWidget *widget, gpointer cnt) {
- gchar *widget_cf_name;
-
- widget_cf_name = OBJECT_GET_DATA(widget, MENU_RECENT_FILES_KEY);
-
- /* if this menu item is a file, count it */
- if (widget_cf_name) {
- (*(guint *)cnt)++;
- }
-}
-
-
-/* update the menu */
-void
-update_menu_recent_capture_file(GtkWidget *submenu_recent_files) {
- guint cnt = 0;
-
- gtk_container_foreach(GTK_CONTAINER(submenu_recent_files),
- update_menu_recent_capture_file1, &cnt);
-
- /* make parent menu item sensitive only, if we have any valid files in the list */
- set_menu_sensitivity(main_menu_factory, MENU_RECENT_FILES_PATH, cnt);
-}
-
-
-/* remove the capture filename from the "Recent Files" menu */
-void
-remove_menu_recent_capture_file(GtkWidget *widget, gpointer unused _U_) {
- GtkWidget *submenu_recent_files;
- gchar *widget_cf_name;
-
-
- widget_cf_name = OBJECT_GET_DATA(widget, MENU_RECENT_FILES_KEY);
- g_free(widget_cf_name);
-
- /* get the submenu container item */
- submenu_recent_files = gtk_item_factory_get_widget(main_menu_factory, MENU_RECENT_FILES_PATH);
-
- /* XXX: is this all we need to do, to free the menu item and its label?
- The reference count of widget will go to 0, so it'll be freed;
- will that free the label? */
- gtk_container_remove(GTK_CONTAINER(submenu_recent_files), widget);
-}
-
-
-/* callback, if the user pushed the <Clear File List> item */
-static void
-clear_menu_recent_capture_file_cmd_cb(GtkWidget *w _U_, gpointer unused _U_) {
- GtkWidget *submenu_recent_files;
-
-
- submenu_recent_files = gtk_item_factory_get_widget(main_menu_factory, MENU_RECENT_FILES_PATH);
-
- gtk_container_foreach(GTK_CONTAINER(submenu_recent_files),
- remove_menu_recent_capture_file, NULL);
-
- update_menu_recent_capture_file(submenu_recent_files);
-}
-
-
-/* callback, if the user pushed a recent file submenu item */
-void
-menu_open_recent_file_cmd(GtkWidget *w)
-{
- GtkWidget *submenu_recent_files;
- GtkWidget *menu_item_child;
- gchar *cf_name;
- int err;
-
- submenu_recent_files = gtk_item_factory_get_widget(main_menu_factory, MENU_RECENT_FILES_PATH);
-
- /* get capture filename from the menu item label */
- menu_item_child = (GTK_BIN(w))->child;
- gtk_label_get(GTK_LABEL(menu_item_child), &cf_name);
-
- /* open and read the capture file (this will close an existing file) */
- if ((err = cf_open(cf_name, FALSE, &cfile)) == 0) {
- cf_read(&cfile);
- } else {
- /* the capture file isn't existing any longer, remove menu item */
- /* XXX: ask user to remove item, it's maybe only a temporary problem */
- remove_menu_recent_capture_file(w, NULL);
- }
-
- update_menu_recent_capture_file(submenu_recent_files);
-}
-
-static void menu_open_recent_file_answered_cb(gpointer dialog _U_, gint btn, gpointer data _U_)
-{
- switch(btn) {
- case(ESD_BTN_YES):
- /* save file first */
- file_save_as_cmd(after_save_open_recent_file, data);
- break;
- case(ESD_BTN_NO):
- cf_close(&cfile);
- menu_open_recent_file_cmd(data);
- break;
- case(ESD_BTN_CANCEL):
- break;
- default:
- g_assert_not_reached();
- }
-}
-
-void
-menu_open_recent_file_cmd_cb(GtkWidget *widget, gpointer data _U_) {
- gpointer dialog;
-
-
- if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
- /* user didn't saved his current file, ask him */
- dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO_CANCEL,
- PRIMARY_TEXT_START "Save capture file before opening a new one?" PRIMARY_TEXT_END "\n\n"
- "If you open a new capture file without saving, your current capture data will be discarded.");
- simple_dialog_set_cb(dialog, menu_open_recent_file_answered_cb, widget);
- } else {
- /* unchanged file */
- menu_open_recent_file_cmd(widget);
- }
-}
-
-/* add the capture filename (with an absolute path) to the "Recent Files" menu */
-void
-add_menu_recent_capture_file_absolute(gchar *cf_name) {
- GtkWidget *submenu_recent_files;
- GList *menu_item_list;
- GList *li;
- gchar *widget_cf_name;
- gchar *normalized_cf_name;
- GtkWidget *menu_item;
- guint cnt;
-
-
-
- normalized_cf_name = g_strdup(cf_name);
-#ifdef WIN32
- /* replace all slashes by backslashes */
- g_strdelimit(normalized_cf_name, "/", '\\');
-#endif
-
- /* get the submenu container item */
- submenu_recent_files = gtk_item_factory_get_widget(main_menu_factory, MENU_RECENT_FILES_PATH);
-
- /* convert container to a GList */
- menu_item_list = gtk_container_children(GTK_CONTAINER(submenu_recent_files));
-
- /* iterate through list items of menu_item_list,
- * removing special items, a maybe duplicate entry and every item above count_max */
- cnt = 1;
- for (li = g_list_first(menu_item_list); li; li = li->next, cnt++) {
- /* get capture filename */
- menu_item = GTK_WIDGET(li->data);
- widget_cf_name = OBJECT_GET_DATA(menu_item, MENU_RECENT_FILES_KEY);
-
- /* if this element string is one of our special items (seperator, ...) or
- * already in the list or
- * this element is above maximum count (too old), remove it */
- if (!widget_cf_name ||
-#ifdef WIN32
- /* do a case insensitive compare on win32 */
-#if GLIB_MAJOR_VERSION < 2
- g_strncasecmp(widget_cf_name, normalized_cf_name, 1000) == 0 ||
-#else
- g_ascii_strncasecmp(widget_cf_name, normalized_cf_name, 1000) == 0 ||
-#endif
-#else /* WIN32 */
- /* do a case sensitive compare on unix */
- strncmp(widget_cf_name, normalized_cf_name, 1000) == 0 ||
-#endif
- cnt >= prefs.gui_recent_files_count_max) {
- remove_menu_recent_capture_file(li->data, NULL);
- cnt--;
- }
- }
-
- g_list_free(menu_item_list);
-
- /* add new item at latest position */
- menu_item = gtk_menu_item_new_with_label(normalized_cf_name);
- OBJECT_SET_DATA(menu_item, MENU_RECENT_FILES_KEY, normalized_cf_name);
- gtk_menu_prepend (GTK_MENU(submenu_recent_files), menu_item);
- SIGNAL_CONNECT_OBJECT(GTK_OBJECT(menu_item), "activate",
- menu_open_recent_file_cmd_cb, (GtkObject *) menu_item);
- gtk_widget_show (menu_item);
-
- /* add seperator at last position */
- menu_item = gtk_menu_item_new();
- gtk_menu_append (GTK_MENU(submenu_recent_files), menu_item);
- gtk_widget_show (menu_item);
-
- /* add new "clear list" item at last position */
-#if GTK_MAJOR_VERSION < 2
- menu_item = gtk_menu_item_new_with_label("<Clear File List>");
-#else
- menu_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLEAR, NULL);
-#endif
- gtk_menu_append (GTK_MENU(submenu_recent_files), menu_item);
- SIGNAL_CONNECT_OBJECT(GTK_OBJECT(menu_item), "activate",
- clear_menu_recent_capture_file_cmd_cb, (GtkObject *) menu_item);
- gtk_widget_show (menu_item);
-
- update_menu_recent_capture_file(submenu_recent_files);
-}
-
-
-/* add the capture filename to the "Recent Files" menu */
-/* (will change nothing, if this filename is already in the menu) */
-void
-add_menu_recent_capture_file(gchar *cf_name) {
- gchar *curr;
- gchar *absolute;
-
-
- /* if this filename is an absolute path, we can use it directly */
- if (g_path_is_absolute(cf_name)) {
- add_menu_recent_capture_file_absolute(cf_name);
- return;
- }
-
- /* this filename is not an absolute path, prepend the current dir */
- curr = g_get_current_dir();
- absolute = g_strdup_printf("%s%s%s", curr, G_DIR_SEPARATOR_S, cf_name);
- add_menu_recent_capture_file_absolute(absolute);
- g_free(curr);
- g_free(absolute);
-}
-
-
-/* write all capture filenames of the menu to the user's recent file */
-void
-menu_recent_file_write_all(FILE *rf) {
- GtkWidget *submenu_recent_files;
- GList *children;
- GList *child;
- gchar *cf_name;
-
-
- submenu_recent_files = gtk_item_factory_get_widget(main_menu_factory, MENU_RECENT_FILES_PATH);
-
- /* we have to iterate backwards through the children's list,
- * so we get the latest item last in the file.
- * (don't use gtk_container_foreach() here, it will return the wrong iteration order) */
- children = gtk_container_children(GTK_CONTAINER(submenu_recent_files));
- child = g_list_last(children);
- while(child != NULL) {
- /* get capture filename from the menu item label */
- cf_name = OBJECT_GET_DATA(child->data, MENU_RECENT_FILES_KEY);
- if (cf_name) {
- fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", cf_name);
- }
-
- child = g_list_previous(child);
- }
-
- g_list_free(children);
-}
-
-
-static void
-main_toolbar_show_cb(GtkWidget *w _U_, gpointer d _U_)
-{
-
- /* save current setting in recent */
- recent.main_toolbar_show = GTK_CHECK_MENU_ITEM(w)->active;
-
- main_widgets_show_or_hide();
-}
-
-
-static void
-filter_toolbar_show_cb(GtkWidget *w _U_, gpointer d _U_)
-{
-
- /* save current setting in recent */
- recent.filter_toolbar_show = GTK_CHECK_MENU_ITEM(w)->active;
-
- main_widgets_show_or_hide();
-}
-
-
-static void
-packet_list_show_cb(GtkWidget *w _U_, gpointer d _U_)
-{
-
- /* save current setting in recent */
- recent.packet_list_show = GTK_CHECK_MENU_ITEM(w)->active;
-
- main_widgets_show_or_hide();
-}
-
-
-static void
-tree_view_show_cb(GtkWidget *w _U_, gpointer d _U_)
-{
-
- /* save current setting in recent */
- recent.tree_view_show = GTK_CHECK_MENU_ITEM(w)->active;
-
- main_widgets_show_or_hide();
-}
-
-
-static void
-byte_view_show_cb(GtkWidget *w _U_, gpointer d _U_)
-{
-
- /* save current setting in recent */
- recent.byte_view_show = GTK_CHECK_MENU_ITEM(w)->active;
-
- main_widgets_show_or_hide();
-}
-
-
-static void
-statusbar_show_cb(GtkWidget *w _U_, gpointer d _U_)
-{
-
- /* save current setting in recent */
- recent.statusbar_show = GTK_CHECK_MENU_ITEM(w)->active;
-
- main_widgets_show_or_hide();
-}
-
-
-static void
-timestamp_absolute_cb(GtkWidget *w _U_, gpointer d _U_)
-{
- if (recent.gui_time_format != TS_ABSOLUTE) {
- set_timestamp_setting(TS_ABSOLUTE);
- recent.gui_time_format = TS_ABSOLUTE;
- change_time_formats(&cfile);
- }
-}
-
-static void
-timestamp_absolute_date_cb(GtkWidget *w _U_, gpointer d _U_)
-{
- if (recent.gui_time_format != TS_ABSOLUTE_WITH_DATE) {
- set_timestamp_setting(TS_ABSOLUTE_WITH_DATE);
- recent.gui_time_format = TS_ABSOLUTE_WITH_DATE;
- change_time_formats(&cfile);
- }
-}
-
-static void
-timestamp_relative_cb(GtkWidget *w _U_, gpointer d _U_)
-{
- if (recent.gui_time_format != TS_RELATIVE) {
- set_timestamp_setting(TS_RELATIVE);
- recent.gui_time_format = TS_RELATIVE;
- change_time_formats(&cfile);
- }
-}
-
-static void
-timestamp_delta_cb(GtkWidget *w _U_, gpointer d _U_)
-{
- if (recent.gui_time_format != TS_DELTA) {
- set_timestamp_setting(TS_DELTA);
- recent.gui_time_format = TS_DELTA;
- change_time_formats(&cfile);
- }
-}
-
-void
-menu_name_resolution_changed(void)
-{
- GtkWidget *menu = NULL;
-
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Name Resolution/Enable for MAC Layer");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), g_resolv_flags & RESOLV_MAC);
-
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Name Resolution/Enable for Network Layer");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), g_resolv_flags & RESOLV_NETWORK);
-
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Name Resolution/Enable for Transport Layer");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), g_resolv_flags & RESOLV_TRANSPORT);
-}
-
-static void
-name_resolution_mac_cb(GtkWidget *w _U_, gpointer d _U_)
-{
- if (GTK_CHECK_MENU_ITEM(w)->active) {
- g_resolv_flags |= RESOLV_MAC;
- } else {
- g_resolv_flags &= ~RESOLV_MAC;
- }
-}
-
-static void
-name_resolution_network_cb(GtkWidget *w _U_, gpointer d _U_)
-{
- if (GTK_CHECK_MENU_ITEM(w)->active) {
- g_resolv_flags |= RESOLV_NETWORK;
- } else {
- g_resolv_flags &= ~RESOLV_NETWORK;
- }
-}
-
-static void
-name_resolution_transport_cb(GtkWidget *w _U_, gpointer d _U_)
-{
- if (GTK_CHECK_MENU_ITEM(w)->active) {
- g_resolv_flags |= RESOLV_TRANSPORT;
- } else {
- g_resolv_flags &= ~RESOLV_TRANSPORT;
- }
-}
-
-#ifdef HAVE_LIBPCAP
-static void
-auto_scroll_live_cb(GtkWidget *w _U_, gpointer d _U_)
-{
- auto_scroll_live = GTK_CHECK_MENU_ITEM(w)->active;
-}
-#endif
-
-/* the recent file read has finished, update the menu corresponding */
-void
-menu_recent_read_finished(void) {
- GtkWidget *menu = NULL;
-
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Main Toolbar");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.main_toolbar_show);
-
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Filter Toolbar");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.filter_toolbar_show);
-
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Statusbar");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.statusbar_show);
-
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Packet List");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.packet_list_show);
-
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Packet Details");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.tree_view_show);
-
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Packet Bytes");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.byte_view_show);
-
- menu_name_resolution_changed();
-
-#ifdef HAVE_LIBPCAP
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Auto Scroll in Live Capture");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), auto_scroll_live);
-#endif
-
- main_widgets_rearrange();
-
- /* don't change the time format, if we had a command line value */
- if (get_timestamp_setting() != TS_NOT_SET) {
- recent.gui_time_format = get_timestamp_setting();
- }
-
- switch(recent.gui_time_format) {
- case(TS_ABSOLUTE):
- menu = gtk_item_factory_get_widget(main_menu_factory,
- "/View/Time Display Format/Time of Day");
- /* set_active will not trigger the callback when activating an active item! */
- recent.gui_time_format = -1;
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), FALSE);
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), TRUE);
- break;
- case(TS_ABSOLUTE_WITH_DATE):
- menu = gtk_item_factory_get_widget(main_menu_factory,
- "/View/Time Display Format/Date and Time of Day");
- recent.gui_time_format = -1;
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), TRUE);
- break;
- case(TS_RELATIVE):
- menu = gtk_item_factory_get_widget(main_menu_factory,
- "/View/Time Display Format/Seconds Since Beginning of Capture");
- recent.gui_time_format = -1;
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), TRUE);
- break;
- case(TS_DELTA):
- menu = gtk_item_factory_get_widget(main_menu_factory,
- "/View/Time Display Format/Seconds Since Previous Packet");
- recent.gui_time_format = -1;
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), TRUE);
- break;
- default:
- g_assert_not_reached();
- }
-}
-
-
-gint
-popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data)
-{
- GtkWidget *menu = (GtkWidget *)data;
- GdkEventButton *event_button = NULL;
- gint row, column;
-
- if(widget == NULL || event == NULL || data == NULL) {
- return FALSE;
- }
-
- /*
- * If we ever want to make the menu differ based on what row
- * and/or column we're above, we'd use "eth_clist_get_selection_info()"
- * to find the row and column number for the coordinates; a CTree is,
- * I guess, like a CList with one column(?) and the expander widget
- * as a pixmap.
- */
- /* Check if we are on packet_list object */
- if (widget == OBJECT_GET_DATA(popup_menu_object, E_MPACKET_LIST_KEY)) {
- if (packet_list_get_event_row_column(widget, (GdkEventButton *)event,
- &row, &column)) {
- OBJECT_SET_DATA(popup_menu_object, E_MPACKET_LIST_ROW_KEY,
- GINT_TO_POINTER(row));
- OBJECT_SET_DATA(popup_menu_object, E_MPACKET_LIST_COL_KEY,
- GINT_TO_POINTER(column));
- packet_list_set_selected_row(row);
- }
- }
-
- /* Check if we are on tree_view object */
- if (widget == tree_view) {
- tree_view_select(widget, (GdkEventButton *) event);
- }
-
- /* Check if we are on byte_view object */
- if(widget == get_notebook_bv_ptr(byte_nb_ptr)) {
- byte_view_select(widget, (GdkEventButton *) event);
- }
-
- /* context menu handler (but the byte view notebook pages have their own handler) */
- if(event->type == GDK_BUTTON_PRESS && widget != byte_nb_ptr) {
- event_button = (GdkEventButton *) event;
-
- /* To qoute the "Gdk Event Structures" doc:
- * "Normally button 1 is the left mouse button, 2 is the middle button, and 3 is the right button" */
- if(event_button->button == 3) {
- gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
- event_button->button,
- event_button->time);
- SIGNAL_EMIT_STOP_BY_NAME(widget, "button_press_event");
- return TRUE;
- }
- }
-#if GTK_MAJOR_VERSION >= 2
- /* GDK_2BUTTON_PRESS is a doubleclick -> expand/collapse tree row */
- /* GTK version 1 seems to be doing this automatically */
- if (widget == tree_view && event->type == GDK_2BUTTON_PRESS) {
- GtkTreePath *path;
-
- if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget),
- (gint) (((GdkEventButton *)event)->x),
- (gint) (((GdkEventButton *)event)->y),
- &path, NULL, NULL, NULL))
- {
- if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget), path))
- gtk_tree_view_collapse_row(GTK_TREE_VIEW(widget), path);
- else
- gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), path,
- FALSE);
- gtk_tree_path_free(path);
- }
- }
-#endif
- return FALSE;
-}
-
-/* Enable or disable menu items based on whether you have a capture file
- you've finished reading. */
-void
-set_menus_for_capture_file(gboolean have_capture_file)
-{
- set_menu_sensitivity(main_menu_factory, "/File/Open...", have_capture_file);
- set_menu_sensitivity(main_menu_factory, "/File/Open Recent", have_capture_file);
- set_menu_sensitivity(main_menu_factory, "/File/Merge...", have_capture_file);
- set_menu_sensitivity(main_menu_factory, "/File/Close", have_capture_file);
- set_menu_sensitivity(main_menu_factory, "/File/Save As...",
- have_capture_file);
- set_menu_sensitivity(main_menu_factory, "/File/Export", have_capture_file);
- set_menu_sensitivity(main_menu_factory, "/View/Reload", have_capture_file);
- set_toolbar_for_capture_file(have_capture_file);
- packets_bar_update();
-}
-
-/* Enable or disable menu items based on whether you have an unsaved
- capture file you've finished reading. */
-void
-set_menus_for_unsaved_capture_file(gboolean have_unsaved_capture_file)
-{
- set_menu_sensitivity(main_menu_factory, "/File/Save",
- have_unsaved_capture_file);
- set_toolbar_for_unsaved_capture_file(have_unsaved_capture_file);
-}
-
-/* Enable or disable menu items based on whether there's a capture in
- progress. */
-void
-set_menus_for_capture_in_progress(gboolean capture_in_progress)
-{
- set_menu_sensitivity(main_menu_factory, "/File/Open...",
- !capture_in_progress);
- set_menu_sensitivity(main_menu_factory, "/File/Open Recent",
- !capture_in_progress);
-#ifdef HAVE_LIBPCAP
- set_menu_sensitivity(main_menu_factory, "/Capture/Start...",
- !capture_in_progress);
- set_menu_sensitivity(main_menu_factory, "/Capture/Stop",
- capture_in_progress);
-#endif /* HAVE_LIBPCAP */
- set_toolbar_for_capture_in_progress(capture_in_progress);
-
- set_capture_if_dialog_for_capture_in_progress(capture_in_progress);
-}
-
-/* Enable or disable menu items based on whether you have some captured
- packets. */
-static gboolean
-walk_menu_tree_for_captured_packets(GList *node,
- gboolean have_captured_packets)
-{
- gboolean is_enabled;
- GList *child;
- menu_item_t *node_data = node->data;
-
- /*
- * Is this a leaf node or an interior node?
- */
- if (node_data->children == NULL) {
- /*
- * It's a leaf node.
- *
- * If it has no "selected_packet_enabled()" or
- * "selected_tree_row_enabled()" routines, we enable
- * it. This allows tap windows to be popped up even
- * if you have no capture file; this is done to let
- * the user pop up multiple tap windows before reading
- * in a capture file, so that they can be processed in
- * parallel while the capture file is being read rather
- * than one at at time as you pop up the windows, and to
- * let the user pop up tap windows before starting an
- * "Update list of packets in real time" capture, so that
- * the statistics can be displayed while the capture is
- * in progress.
- *
- * If it has either of those routines, we disable it for
- * now - as long as, when a capture is first available,
- * we don't get called after a packet or tree row is
- * selected, that's OK.
- * XXX - that should be done better.
- */
- if (node_data->selected_packet_enabled == NULL &&
- node_data->selected_tree_row_enabled == NULL)
- node_data->enabled = TRUE;
- else
- node_data->enabled = FALSE;
- } else {
- /*
- * It's an interior node; call
- * "walk_menu_tree_for_captured_packets()" on all its
- * children and, if any of them are enabled, enable
- * this node, otherwise disable it.
- *
- * XXX - should we just leave all interior nodes enabled?
- * Which is a better UI choice?
- */
- is_enabled = FALSE;
- for (child = node_data->children; child != NULL; child =
- child->next) {
- if (walk_menu_tree_for_captured_packets(child,
- have_captured_packets))
- is_enabled = TRUE;
- }
- node_data->enabled = is_enabled;
- }
-
- /*
- * The root node doesn't correspond to a menu tree item; it
- * has a null name pointer.
- */
- if (node_data->name != NULL) {
- set_menu_sensitivity(main_menu_factory, node_data->name,
- node_data->enabled);
- }
- return node_data->enabled;
-}
-
-void
-set_menus_for_captured_packets(gboolean have_captured_packets)
-{
- set_menu_sensitivity(main_menu_factory, "/File/Print...",
- have_captured_packets);
- set_menu_sensitivity(packet_list_menu_factory, "/Print...",
- have_captured_packets);
- set_menu_sensitivity(main_menu_factory, "/Edit/Find Packet...",
- have_captured_packets);
- set_menu_sensitivity(main_menu_factory, "/Edit/Find Next",
- have_captured_packets);
- set_menu_sensitivity(main_menu_factory, "/Edit/Find Previous",
- have_captured_packets);
- set_menu_sensitivity(main_menu_factory, "/View/Zoom In",
- have_captured_packets);
- set_menu_sensitivity(main_menu_factory, "/View/Zoom Out",
- have_captured_packets);
- set_menu_sensitivity(main_menu_factory, "/View/Normal Size",
- have_captured_packets);
- set_menu_sensitivity(packet_list_menu_factory, "/Coloring Rules...",
- have_captured_packets);
- set_menu_sensitivity(main_menu_factory, "/Go/Go to Packet...",
- have_captured_packets);
- set_menu_sensitivity(main_menu_factory, "/Go/First Packet",
- have_captured_packets);
- set_menu_sensitivity(main_menu_factory, "/Go/Last Packet",
- have_captured_packets);
- set_menu_sensitivity(main_menu_factory, "/Statistics/Summary",
- have_captured_packets);
- set_menu_sensitivity(main_menu_factory, "/Statistics/Protocol Hierarchy",
- have_captured_packets);
-
- walk_menu_tree_for_captured_packets(tap_menu_tree_root,
- have_captured_packets);
- set_toolbar_for_captured_packets(have_captured_packets);
- packets_bar_update();
-}
-
-/* Enable or disable menu items based on whether a packet is selected and,
- if so, on the properties of the packet. */
-static gboolean
-walk_menu_tree_for_selected_packet(GList *node, frame_data *fd,
- epan_dissect_t *edt)
-{
- gboolean is_enabled;
- GList *child;
- menu_item_t *node_data = node->data;
-
- /*
- * Is this a leaf node or an interior node?
- */
- if (node_data->children == NULL) {
- /*
- * It's a leaf node.
- *
- * If it has no "selected_packet_enabled()" routine,
- * leave its enabled/disabled status alone - it
- * doesn't depend on whether we have a packet selected
- * or not or on the selected packet.
- *
- * If it has a "selected_packet_enabled()" routine,
- * call it and set the item's enabled/disabled status
- * based on its return value.
- */
- if (node_data->selected_packet_enabled != NULL)
- node_data->enabled = node_data->selected_packet_enabled(fd, edt);
- } else {
- /*
- * It's an interior node; call
- * "walk_menu_tree_for_selected_packet()" on all its
- * children and, if any of them are enabled, enable
- * this node, otherwise disable it.
- *
- * XXX - should we just leave all interior nodes enabled?
- * Which is a better UI choice?
- */
- is_enabled = FALSE;
- for (child = node_data->children; child != NULL; child =
- child->next) {
- if (walk_menu_tree_for_selected_packet(child, fd, edt))
- is_enabled = TRUE;
- }
- node_data->enabled = is_enabled;
- }
-
- /*
- * The root node doesn't correspond to a menu tree item; it
- * has a null name pointer.
- */
- if (node_data->name != NULL) {
- set_menu_sensitivity(main_menu_factory, node_data->name,
- node_data->enabled);
- }
- return node_data->enabled;
-}
-
-void
-set_menus_for_selected_packet(capture_file *cf)
-{
- set_menu_sensitivity(main_menu_factory, "/Edit/Mark Packet",
- cf->current_frame != NULL);
- set_menu_sensitivity(packet_list_menu_factory, "/Mark Packet",
- cf->current_frame != NULL);
- set_menu_sensitivity(main_menu_factory, "/Edit/Time Reference",
- cf->current_frame != NULL);
- set_menu_sensitivity(packet_list_menu_factory, "/Time Reference",
- cf->current_frame != NULL);
- set_menu_sensitivity(main_menu_factory, "/Edit/Mark All Packets",
- cf->current_frame != NULL);
- set_menu_sensitivity(main_menu_factory, "/Edit/Unmark All Packets",
- cf->current_frame != NULL);
- set_menu_sensitivity(main_menu_factory, "/View/Collapse All",
- cf->current_frame != NULL);
- set_menu_sensitivity(tree_view_menu_factory, "/Collapse All",
- cf->current_frame != NULL);
- set_menu_sensitivity(main_menu_factory, "/View/Expand All",
- cf->current_frame != NULL);
- set_menu_sensitivity(tree_view_menu_factory, "/Expand All",
- cf->current_frame != NULL);
- set_menu_sensitivity(main_menu_factory, "/View/Show Packet in New Window",
- cf->current_frame != NULL);
- set_menu_sensitivity(packet_list_menu_factory, "/Show Packet in New Window",
- cf->current_frame != NULL);
- set_menu_sensitivity(main_menu_factory, "/Analyze/Follow TCP Stream",
- cf->current_frame != NULL ? (cf->edt->pi.ipproto == IP_PROTO_TCP) : FALSE);
- set_menu_sensitivity(NULL, "/Follow TCP Stream",
- cf->current_frame != NULL ? (cf->edt->pi.ipproto == IP_PROTO_TCP) : FALSE);
- set_menu_sensitivity(main_menu_factory, "/Analyze/Decode As...",
- cf->current_frame != NULL && decode_as_ok());
- set_menu_sensitivity(NULL, "/Decode As...",
- cf->current_frame != NULL && decode_as_ok());
- set_menu_sensitivity(main_menu_factory, "/View/Name Resolution/Resolve Name",
- cf->current_frame != NULL && (g_resolv_flags & RESOLV_ALL_ADDRS) != RESOLV_ALL_ADDRS);
- set_menu_sensitivity(tree_view_menu_factory, "/Resolve Name",
- cf->current_frame != NULL && (g_resolv_flags & RESOLV_ALL_ADDRS) != RESOLV_ALL_ADDRS);
- set_menu_sensitivity(packet_list_menu_factory, "/Apply as Filter",
- cf->current_frame != NULL);
- set_menu_sensitivity(packet_list_menu_factory, "/Prepare a Filter",
- cf->current_frame != NULL);
-
- walk_menu_tree_for_selected_packet(tap_menu_tree_root, cf->current_frame,
- cf->edt);
- packets_bar_update();
-}
-
-/* Enable or disable menu items based on whether a tree row is selected
- and, if so, on the properties of the tree row. */
-static gboolean
-walk_menu_tree_for_selected_tree_row(GList *node, field_info *fi)
-{
- gboolean is_enabled;
- GList *child;
- menu_item_t *node_data = node->data;
-
- /*
- * Is this a leaf node or an interior node?
- */
- if (node_data->children == NULL) {
- /*
- * It's a leaf node.
- *
- * If it has no "selected_tree_row_enabled()" routine,
- * leave its enabled/disabled status alone - it
- * doesn't depend on whether we have a tree row selected
- * or not or on the selected tree row.
- *
- * If it has a "selected_tree_row_enabled()" routine,
- * call it and set the item's enabled/disabled status
- * based on its return value.
- */
- if (node_data->selected_tree_row_enabled != NULL)
- node_data->enabled = node_data->selected_tree_row_enabled(fi);
- } else {
- /*
- * It's an interior node; call
- * "walk_menu_tree_for_selected_tree_row()" on all its
- * children and, if any of them are enabled, enable
- * this node, otherwise disable it.
- *
- * XXX - should we just leave all interior nodes enabled?
- * Which is a better UI choice?
- */
- is_enabled = FALSE;
- for (child = node_data->children; child != NULL; child =
- child->next) {
- if (walk_menu_tree_for_selected_tree_row(child, fi))
- is_enabled = TRUE;
- }
- node_data->enabled = is_enabled;
- }
-
- /*
- * The root node doesn't correspond to a menu tree item; it
- * has a null name pointer.
- */
- if (node_data->name != NULL) {
- set_menu_sensitivity(main_menu_factory, node_data->name,
- node_data->enabled);
- }
- return node_data->enabled;
-}
-
-void
-set_menus_for_selected_tree_row(capture_file *cf)
-{
- gboolean properties;
-
-
- set_menu_sensitivity(main_menu_factory, "/File/Export/Selected Packet Bytes...",
- cf->finfo_selected != NULL);
- set_menu_sensitivity(tree_view_menu_factory, "/Export Selected Packet Bytes...",
- cf->finfo_selected != NULL);
- set_menu_sensitivity(hexdump_menu_factory, "/Export Selected Packet Bytes...",
- cf->finfo_selected != NULL);
-
- if (cf->finfo_selected != NULL) {
- header_field_info *hfinfo = cf->finfo_selected->hfinfo;
- if (hfinfo->parent == -1) {
- properties = prefs_is_registered_protocol(hfinfo->abbrev);
- } else {
- properties = prefs_is_registered_protocol(proto_registrar_get_abbrev(hfinfo->parent));
- }
- set_menu_sensitivity(main_menu_factory,
- "/Go/Go to Corresponding Packet", hfinfo->type == FT_FRAMENUM);
- set_menu_sensitivity(tree_view_menu_factory,
- "/Go to Corresponding Packet", hfinfo->type == FT_FRAMENUM);
- set_menu_sensitivity(main_menu_factory, "/Analyze/Apply as Filter",
- proto_can_match_selected(cf->finfo_selected, cf->edt));
- set_menu_sensitivity(tree_view_menu_factory, "/Apply as Filter",
- proto_can_match_selected(cf->finfo_selected, cf->edt));
- set_menu_sensitivity(main_menu_factory, "/Analyze/Prepare a Filter",
- proto_can_match_selected(cf->finfo_selected, cf->edt));
- set_menu_sensitivity(tree_view_menu_factory, "/Prepare a Filter",
- proto_can_match_selected(cf->finfo_selected, cf->edt));
- set_menu_sensitivity(tree_view_menu_factory, "/Protocol Preferences...",
- properties);
- set_menu_sensitivity(main_menu_factory, "/View/Expand Tree", cf->finfo_selected->tree_type != -1);
- set_menu_sensitivity(tree_view_menu_factory, "/Expand Tree", cf->finfo_selected->tree_type != -1);
- } else {
- set_menu_sensitivity(main_menu_factory,
- "/Go/Go to Corresponding Packet", FALSE);
- set_menu_sensitivity(tree_view_menu_factory,
- "/Go to Corresponding Packet", FALSE);
- set_menu_sensitivity(main_menu_factory, "/Analyze/Apply as Filter", FALSE);
- set_menu_sensitivity(tree_view_menu_factory, "/Apply as Filter", FALSE);
- set_menu_sensitivity(main_menu_factory, "/Analyze/Prepare a Filter", FALSE);
- set_menu_sensitivity(tree_view_menu_factory, "/Prepare a Filter", FALSE);
- set_menu_sensitivity(tree_view_menu_factory, "/Protocol Preferences...",
- FALSE);
- set_menu_sensitivity(main_menu_factory, "/View/Expand Tree", FALSE);
- set_menu_sensitivity(tree_view_menu_factory, "/Expand Tree", FALSE);
- }
-
- walk_menu_tree_for_selected_tree_row(tap_menu_tree_root, cf->finfo_selected);
-}
+/* menu.c
+ * Menu routines
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <gtk/gtk.h>
+
+#include <string.h>
+
+#include "main.h"
+#include "menu.h"
+#include "tap_menu.h"
+#include <epan/packet.h>
+#include <epan/resolv.h>
+#include "prefs.h"
+#include "about_dlg.h"
+#include "capture_dlg.h"
+#include "color_dlg.h"
+#include "filter_prefs.h"
+#include "dlg_utils.h"
+#include "file_dlg.h"
+#include "find_dlg.h"
+#include "goto_dlg.h"
+#include "summary_dlg.h"
+#include "prefs_dlg.h"
+#include "packet_win.h"
+#include "print.h"
+#include "follow_dlg.h"
+#include "decode_as_dlg.h"
+#include "help_dlg.h"
+#include "supported_protos_dlg.h"
+#include "proto_dlg.h"
+#include "proto_hier_stats_dlg.h"
+#include "keys.h"
+#include <epan/plugins.h>
+#include <epan/epan_dissect.h>
+#include "compat_macros.h"
+#include "toolbar.h"
+#include "gtkglobals.h"
+#include "register.h"
+#include "../tap.h"
+#include "../menu.h"
+#include "../ipproto.h"
+#include "packet_list.h"
+#include "ethclist.h"
+#include "recent.h"
+#include "../ui_util.h"
+#include "proto_draw.h"
+#include "endpoint_talkers_table.h"
+#include "hostlist_table.h"
+#include "simple_dialog.h"
+#include <epan/timestamp.h>
+
+GtkWidget *popup_menu_object;
+
+static void
+clear_menu_recent_capture_file_cmd_cb(GtkWidget *w, gpointer unused _U_);
+
+typedef struct _menu_item {
+ char *name;
+ gint group;
+ gboolean enabled;
+ GtkItemFactoryCallback callback;
+ gpointer callback_data;
+ gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *);
+ gboolean (*selected_tree_row_enabled)(field_info *);
+ GList *children;
+} menu_item_t;
+
+static GList *tap_menu_tree_root = NULL;
+
+static void
+merge_all_tap_menus(GList *node);
+
+#define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a))
+
+static void menus_init(void);
+static void set_menu_sensitivity (GtkItemFactory *, const gchar *, gint);
+static void main_toolbar_show_cb(GtkWidget *w _U_, gpointer d _U_);
+static void filter_toolbar_show_cb(GtkWidget *w _U_, gpointer d _U_);
+static void packet_list_show_cb(GtkWidget *w _U_, gpointer d _U_);
+static void tree_view_show_cb(GtkWidget *w _U_, gpointer d _U_);
+static void byte_view_show_cb(GtkWidget *w _U_, gpointer d _U_);
+static void statusbar_show_cb(GtkWidget *w _U_, gpointer d _U_);
+static void timestamp_absolute_cb(GtkWidget *w _U_, gpointer d _U_);
+static void timestamp_absolute_date_cb(GtkWidget *w _U_, gpointer d _U_);
+static void timestamp_relative_cb(GtkWidget *w _U_, gpointer d _U_);
+static void timestamp_delta_cb(GtkWidget *w _U_, gpointer d _U_);
+static void name_resolution_mac_cb(GtkWidget *w _U_, gpointer d _U_);
+static void name_resolution_network_cb(GtkWidget *w _U_, gpointer d _U_);
+static void name_resolution_transport_cb(GtkWidget *w _U_, gpointer d _U_);
+#ifdef HAVE_LIBPCAP
+static void auto_scroll_live_cb(GtkWidget *w _U_, gpointer d _U_);
+#endif
+
+/* This is the GtkItemFactoryEntry structure used to generate new menus.
+ Item 1: The menu path. The letter after the underscore indicates an
+ accelerator key once the menu is open.
+ Item 2: The accelerator key for the entry
+ Item 3: The callback function.
+ Item 4: The callback action. This changes the parameters with
+ which the function is called. The default is 0.
+ Item 5: The item type, used to define what kind of an item it is.
+ Here are the possible values:
+
+ NULL -> "<Item>"
+ "" -> "<Item>"
+ "<Title>" -> create a title item
+ "<Item>" -> create a simple item
+ "<ImageItem>" -> create an item holding an image (gtk2)
+ "<StockItem>" -> create an item holding a stock image (gtk2)
+ "<CheckItem>" -> create a check item
+ "<ToggleItem>" -> create a toggle item
+ "<RadioItem>" -> create a radio item
+ <path> -> path of a radio item to link against
+ "<Separator>" -> create a separator
+ "<Tearoff>" -> create a tearoff separator (gtk2)
+ "<Branch>" -> create an item to hold sub items (optional)
+ "<LastBranch>" -> create a right justified branch
+ Item 6: extra data needed for ImageItem and StockItem (gtk2)
+ */
+
+/* main menu */
+static GtkItemFactoryEntry menu_items[] =
+{
+ ITEM_FACTORY_ENTRY("/_File", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/File/_Open...", "<control>O", file_open_cmd_cb,
+ 0, GTK_STOCK_OPEN),
+ ITEM_FACTORY_ENTRY("/File/Open _Recent", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/File/_Merge...", NULL, file_merge_cmd_cb, 0, NULL, NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/File/_Close", "<control>W", file_close_cmd_cb,
+ 0, GTK_STOCK_CLOSE),
+ ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/File/_Save", "<control>S", file_save_cmd_cb,
+ 0, GTK_STOCK_SAVE),
+ ITEM_FACTORY_STOCK_ENTRY("/File/Save _As...", "<shift><control>S", file_save_as_cmd_cb,
+ 0, GTK_STOCK_SAVE_AS),
+ ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/File/_Export", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/File/Export/as \"Plain _Text\" file...", NULL, export_text_cmd_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/File/Export/as \"_PostScript\" file...", NULL, export_ps_cmd_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/File/Export/as XML - \"P_SML\" (packet summary) file...", NULL, export_psml_cmd_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/File/Export/as XML - \"P_DML\" (packet details) file...", NULL, export_pdml_cmd_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/File/Export/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/File/Export/Selected Packet _Bytes...", "<control>H", savehex_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/File/_Print...", "<control>P", file_print_cmd_cb,
+ 0, GTK_STOCK_PRINT),
+ ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/File/_Quit", "<control>Q", file_quit_cmd_cb,
+ 0, GTK_STOCK_QUIT),
+ ITEM_FACTORY_ENTRY("/_Edit", NULL, NULL, 0, "<Branch>", NULL),
+#if 0
+ /* Un-#if this when we actually implement Cut/Copy/Paste. */
+ ITEM_FACTORY_STOCK_ENTRY("/Edit/Cut", "<control>X", NULL,
+ 0, GTK_STOCK_CUT),
+ ITEM_FACTORY_STOCK_ENTRY("/Edit/Copy", "<control>C", NULL,
+ 0, GTK_STOCK_COPY),
+ ITEM_FACTORY_STOCK_ENTRY("/Edit/Paste", "<control>V", NULL,
+ 0, GTK_STOCK_PASTE),
+ ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>"),
+#endif
+ ITEM_FACTORY_STOCK_ENTRY("/Edit/_Find Packet...", "<control>F",
+ find_frame_cb, 0, GTK_STOCK_FIND),
+ ITEM_FACTORY_STOCK_ENTRY("/Edit/Find Ne_xt", "<control>N", find_next_cb,
+ 0, GTK_STOCK_GO_FORWARD),
+ ITEM_FACTORY_STOCK_ENTRY("/Edit/Find Pre_vious", "<control>B",
+ find_previous_cb, 0, GTK_STOCK_GO_BACK),
+ ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/Edit/_Time Reference", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Edit/Time Reference/Set Time Reference (toggle)", "<control>T", reftime_frame_cb, REFTIME_TOGGLE, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Next", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Previous", NULL, reftime_frame_cb, REFTIME_FIND_PREV, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Edit/_Mark Packet", "<control>M", mark_frame_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Edit/Mark _All Packets", NULL, mark_all_frames_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Edit/_Unmark All Packets", NULL, unmark_all_frames_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/Edit/_Preferences...", "<shift><control>P", prefs_cb,
+ 0, GTK_STOCK_PREFERENCES),
+ ITEM_FACTORY_ENTRY("/_View", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/View/_Main Toolbar", NULL, main_toolbar_show_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/_Filter Toolbar", NULL, filter_toolbar_show_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/_Statusbar", NULL, statusbar_show_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Packet _List", NULL, packet_list_show_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Packet _Details", NULL, tree_view_show_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Packet _Bytes", NULL, byte_view_show_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/View/_Time Display Format", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Time Display Format/Time of Day", NULL, timestamp_absolute_cb,
+ 0, "<RadioItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Time Display Format/Date and Time of Day", NULL, timestamp_absolute_date_cb,
+ 0, "/View/Time Display Format/Time of Day", NULL),
+ ITEM_FACTORY_ENTRY("/View/Time Display Format/Seconds Since Beginning of Capture", NULL, timestamp_relative_cb,
+ 0, "/View/Time Display Format/Time of Day", NULL),
+ ITEM_FACTORY_ENTRY("/View/Time Display Format/Seconds Since Previous Packet", NULL, timestamp_delta_cb,
+ 0, "/View/Time Display Format/Time of Day", NULL),
+ ITEM_FACTORY_ENTRY("/View/Name Resol_ution", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Name Resolution/_Resolve Name", NULL, resolve_name_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/View/Name Resolution/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _MAC Layer", NULL, name_resolution_mac_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _Network Layer", NULL, name_resolution_network_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _Transport Layer", NULL, name_resolution_transport_cb, 0, "<CheckItem>", NULL),
+#ifdef HAVE_LIBPCAP
+ ITEM_FACTORY_ENTRY("/View/Auto Scroll in Li_ve Capture", NULL, auto_scroll_live_cb, 0, "<CheckItem>", NULL),
+#endif
+ ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/View/_Zoom In", "<control>plus", view_zoom_in_cb,
+ 0, GTK_STOCK_ZOOM_IN),
+ ITEM_FACTORY_STOCK_ENTRY("/View/Zoom _Out", "<control>minus", view_zoom_out_cb,
+ 0, GTK_STOCK_ZOOM_OUT),
+ ITEM_FACTORY_STOCK_ENTRY("/View/_Normal Size", "<control>equal", view_zoom_100_cb,
+ 0, GTK_STOCK_ZOOM_100),
+ ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Collapse _All", NULL, collapse_all_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/View/_Expand All", NULL, expand_all_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/View/Expand Tree", NULL, expand_tree_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/View/_Coloring Rules...", NULL, color_display_cb,
+ 0, GTK_STOCK_SELECT_COLOR),
+ ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Show Packet in New _Window", NULL,
+ new_window_cb, 0, NULL, NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/View/_Reload", "<control>R", file_reload_cmd_cb,
+ 0, GTK_STOCK_REFRESH),
+ ITEM_FACTORY_ENTRY("/_Go", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/Go/_Go to Packet...", "<control>G",
+ goto_frame_cb, 0, GTK_STOCK_JUMP_TO),
+ ITEM_FACTORY_ENTRY("/Go/Go to _Corresponding Packet", NULL, goto_framenum_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Go/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/Go/_First Packet", NULL,
+ goto_top_frame_cb, 0, GTK_STOCK_GOTO_TOP),
+ ITEM_FACTORY_STOCK_ENTRY("/Go/_Last Packet", NULL,
+ goto_bottom_frame_cb, 0, GTK_STOCK_GOTO_BOTTOM),
+#ifdef HAVE_LIBPCAP
+ ITEM_FACTORY_ENTRY("/_Capture", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/Capture/_Start...", "<control>K",
+ capture_prep_cb, 0, ETHEREAL_STOCK_CAPTURE_START),
+ ITEM_FACTORY_STOCK_ENTRY("/Capture/S_top", "<control>E", capture_stop_cb,
+ 0, GTK_STOCK_STOP),
+ ITEM_FACTORY_ENTRY("/Capture/_Interfaces...", NULL,
+ capture_if_cb, 0, NULL, NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/Capture/_Capture Filters...", NULL, cfilter_dialog_cb,
+ 0, ETHEREAL_STOCK_CAPTURE_FILTER),
+#endif /* HAVE_LIBPCAP */
+ ITEM_FACTORY_ENTRY("/_Analyze", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/Analyze/_Display Filters...", NULL, dfilter_dialog_cb,
+ 0, ETHEREAL_STOCK_DISPLAY_FILTER),
+ ITEM_FACTORY_ENTRY("/Analyze/Appl_y as Filter", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/_Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/_Not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... _and Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... _or Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... a_nd not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/_Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/_Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_REPLACE, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/_Not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_NOT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... _and Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... _or Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... a_nd not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND_NOT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR_NOT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/_Enabled Protocols...", "<shift><control>R", proto_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Decode _As...", NULL, decode_as_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/_User Specified Decodes...", NULL,
+ decode_show_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/_Follow TCP Stream", NULL,
+ follow_stream_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/_Statistics", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Statistics/_Summary", NULL, summary_open_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Statistics/_Protocol Hierarchy", NULL,
+ proto_hier_stats_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Statistics/Conversations", NULL,
+ init_ett_notebook_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Statistics/Endpoints", NULL,
+ init_hostlist_notebook_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/_Help", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/Help/_Contents", "F1", help_cb, 0, GTK_STOCK_HELP),
+ ITEM_FACTORY_ENTRY("/Help/_Supported Protocols", NULL, supported_cb, 0, NULL, NULL),
+#if (GLIB_MAJOR_VERSION >= 2)
+ /* currently, glib1.x can't start a webbrowser, see webbrowser.c for details */
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages/Ethereal", NULL, url_localpage_cb, LOCALPAGE_MAN_ETHEREAL, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages/Ethereal Filter", NULL, url_localpage_cb, LOCALPAGE_MAN_ETHEREAL_FILTER, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages/Tethereal", NULL, url_localpage_cb, LOCALPAGE_MAN_TETHEREAL, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages/Mergecap", NULL, url_localpage_cb, LOCALPAGE_MAN_MERGECAP, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages/Editcap", NULL, url_localpage_cb, LOCALPAGE_MAN_EDITCAP, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages/Text2pcap", NULL, url_localpage_cb, LOCALPAGE_MAN_TEXT2PCAP, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Ethereal Online", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/Help/Ethereal Online/Home Page", NULL, url_onlinepage_cb, ONLINEPAGE_HOME, GTK_STOCK_HOME),
+ ITEM_FACTORY_ENTRY("/Help/Ethereal Online/User's Guide", NULL, url_onlinepage_cb, ONLINEPAGE_USERGUIDE, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Ethereal Online/FAQ's", NULL, url_onlinepage_cb, ONLINEPAGE_FAQ, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Downloads", NULL, url_onlinepage_cb, ONLINEPAGE_DOWNLOAD, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Example Files", NULL, url_onlinepage_cb, ONLINEPAGE_SAMPLE, NULL, NULL),
+#endif
+ ITEM_FACTORY_ENTRY("/Help/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/Help/_About Ethereal", NULL, about_ethereal_cb,
+ 0, NULL, NULL)
+};
+
+
+/* calculate the number of menu_items */
+static int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
+
+/* packet list popup */
+static GtkItemFactoryEntry packet_list_menu_items[] =
+{
+ ITEM_FACTORY_ENTRY("/Follow TCP Stream", NULL, follow_stream_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Decode As...", NULL, decode_as_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Display Filters...", NULL, dfilter_dialog_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/Mark Packet", NULL, mark_frame_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Time Reference", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Time Reference/Set Time Reference (toggle)", NULL, reftime_frame_cb, REFTIME_TOGGLE, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Time Reference/Find Next", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Time Reference/Find Previous", NULL, reftime_frame_cb, REFTIME_FIND_PREV, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/_Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/_Not Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... _and Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... _or Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... a_nd not Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... o_r not Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+
+ ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/_Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_REPLACE, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/_Not Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_NOT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... _and Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_AND, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... _or Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_OR, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... a_nd not Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_AND_NOT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... o_r not Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_OR_NOT, NULL, NULL),
+
+ ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/Coloring Rules...", NULL, color_display_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Print...", NULL, file_print_cmd_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Show Packet in New Window", NULL, new_window_cb,
+ 0, NULL, NULL),
+};
+
+static GtkItemFactoryEntry tree_view_menu_items[] =
+{
+ ITEM_FACTORY_ENTRY("/Follow TCP Stream", NULL, follow_stream_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Decode As...", NULL, decode_as_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Display Filters...", NULL, dfilter_dialog_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/_Resolve Name", NULL, resolve_name_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/_Go to Corresponding Packet", NULL, goto_framenum_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/_Export Selected Packet Bytes...", NULL, savehex_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Protocol Preferences...", NULL, properties_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/_Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/_Not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... _and Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... _or Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... a_nd not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+
+ ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/_Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_REPLACE, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/_Not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_NOT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... _and Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... _or Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... a_nd not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND_NOT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR_NOT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/Collapse All", NULL, collapse_all_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Expand All", NULL, expand_all_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Expand Tree", NULL, expand_tree_cb, 0, NULL, NULL)
+};
+
+static GtkItemFactoryEntry hexdump_menu_items[] =
+{
+ ITEM_FACTORY_ENTRY("/Follow TCP Stream", NULL, follow_stream_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Decode As...", NULL, decode_as_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Display Filters...", NULL, dfilter_dialog_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Export Selected Packet Bytes...", NULL, savehex_cb,
+ 0, NULL, NULL)
+};
+
+static int initialize = TRUE;
+static GtkItemFactory *main_menu_factory = NULL;
+static GtkItemFactory *packet_list_menu_factory = NULL;
+static GtkItemFactory *tree_view_menu_factory = NULL;
+static GtkItemFactory *hexdump_menu_factory = NULL;
+
+static GSList *popup_menu_list = NULL;
+
+static GtkAccelGroup *grp;
+
+GtkWidget *
+main_menu_new(GtkAccelGroup ** table) {
+ GtkWidget *menubar;
+
+ grp = gtk_accel_group_new();
+
+ if (initialize)
+ menus_init();
+
+ menubar = main_menu_factory->widget;
+
+ if (table)
+ *table = grp;
+
+ return menubar;
+}
+
+static void
+menus_init(void) {
+ if (initialize) {
+ initialize = FALSE;
+
+ /* popup */
+ packet_list_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
+ popup_menu_object = gtk_menu_new();
+ gtk_item_factory_create_items_ac(packet_list_menu_factory, sizeof(packet_list_menu_items)/sizeof(packet_list_menu_items[0]), packet_list_menu_items, popup_menu_object, 2);
+ OBJECT_SET_DATA(popup_menu_object, PM_PACKET_LIST_KEY,
+ packet_list_menu_factory->widget);
+ popup_menu_list = g_slist_append((GSList *)popup_menu_list, packet_list_menu_factory);
+
+ tree_view_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
+ gtk_item_factory_create_items_ac(tree_view_menu_factory, sizeof(tree_view_menu_items)/sizeof(tree_view_menu_items[0]), tree_view_menu_items, popup_menu_object, 2);
+ OBJECT_SET_DATA(popup_menu_object, PM_TREE_VIEW_KEY,
+ tree_view_menu_factory->widget);
+ popup_menu_list = g_slist_append((GSList *)popup_menu_list, tree_view_menu_factory);
+
+ hexdump_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
+ gtk_item_factory_create_items_ac(hexdump_menu_factory, sizeof(hexdump_menu_items)/sizeof(hexdump_menu_items[0]), hexdump_menu_items, popup_menu_object, 2);
+ OBJECT_SET_DATA(popup_menu_object, PM_HEXDUMP_KEY,
+ hexdump_menu_factory->widget);
+ popup_menu_list = g_slist_append((GSList *)popup_menu_list, hexdump_menu_factory);
+
+ /* main */
+ main_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", grp);
+ gtk_item_factory_create_items_ac(main_menu_factory, nmenu_items, menu_items, NULL, 2);
+
+ merge_all_tap_menus(tap_menu_tree_root);
+
+ /* Initialize enabled/disabled state of menu items */
+ set_menus_for_unsaved_capture_file(FALSE);
+ set_menus_for_capture_file(FALSE);
+#if 0
+ /* Un-#if this when we actually implement Cut/Copy/Paste.
+ Then make sure you enable them when they can be done. */
+ set_menu_sensitivity(main_menu_factory, "/Edit/Cut", FALSE);
+ set_menu_sensitivity(main_menu_factory, "/Edit/Copy", FALSE);
+ set_menu_sensitivity(main_menu_factory, "/Edit/Paste", FALSE);
+#endif
+
+ set_menus_for_captured_packets(FALSE);
+ set_menus_for_selected_packet(&cfile);
+ set_menus_for_selected_tree_row(&cfile);
+
+ /* init with an empty recent files list */
+ clear_menu_recent_capture_file_cmd_cb(NULL, NULL);
+ }
+}
+
+
+gint tap_menu_item_add_compare(gconstpointer a, gconstpointer b)
+{
+ return strcmp(
+ ((const menu_item_t *) a)->name,
+ ((const menu_item_t *) b)->name);
+}
+
+
+/* add a menuitem below the current node */
+GList * tap_menu_item_add(
+ char *name,
+ gint group,
+ GtkItemFactoryCallback callback,
+ gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *),
+ gboolean (*selected_tree_row_enabled)(field_info *),
+ gpointer callback_data,
+ GList *curnode)
+{
+ menu_item_t *curr;
+ menu_item_t *child;
+
+
+ child = g_malloc(sizeof (menu_item_t));
+ child->group = group;
+ child->name = name;
+ child->callback = callback;
+ child->selected_packet_enabled = selected_packet_enabled;
+ child->selected_tree_row_enabled = selected_tree_row_enabled;
+ child->callback_data = callback_data;
+ child->enabled = FALSE;
+ child->children = NULL;
+
+ /* insert the new child node into the parent */
+ curr = curnode->data;
+ curr->children = g_list_insert_sorted(curr->children, child, tap_menu_item_add_compare);
+
+ /* return the new node */
+ /* XXX: improve this */
+ return g_list_find(curr->children, child);
+}
+
+/*
+ * Add a new menu item for a tap.
+ * This must be called after we've created the main menu, so it can't
+ * be called from the routine that registers taps - we have to introduce
+ * another per-tap registration routine.
+ *
+ * "callback" gets called when the menu item is selected; it should do
+ * the work of creating the tap window.
+ *
+ * "selected_packet_enabled" gets called by "set_menus_for_selected_packet()";
+ * it's passed a Boolean that's TRUE if a packet is selected and FALSE
+ * otherwise, and should return TRUE if the tap will work now (which
+ * might depend on whether a packet is selected and, if one is, on the
+ * packet) and FALSE if not.
+ *
+ * "selected_tree_row_enabled" gets called by
+ * "set_menus_for_selected_tree_row()"; it's passed a Boolean that's TRUE if
+ * a protocol tree row is selected and FALSE otherwise, and should return
+ * TRUE if the tap will work now (which might depend on whether a tree row
+ * is selected and, if one is, on the tree row) and FALSE if not.
+ */
+void
+register_tap_menu_item(
+ char *name,
+ REGISTER_TAP_GROUP_E group,
+ GtkItemFactoryCallback callback,
+ gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *),
+ gboolean (*selected_tree_row_enabled)(field_info *),
+ gpointer callback_data)
+{
+ /*static const char toolspath[] = "/Statistics/";*/
+ char *toolspath;
+ char *p;
+ char *menupath;
+ size_t menupathlen;
+ menu_item_t *child;
+ GList *curnode;
+ GList *childnode;
+
+ /*
+ * The menu path must be relative.
+ */
+ g_assert(*name != '/');
+
+ switch(group) {
+ case(REGISTER_TAP_GROUP_GENERIC): toolspath = "/Statistics/"; break;
+ case(REGISTER_TAP_GROUP_CONVERSATION_LIST): toolspath = "/Statistics/_Conversation List/"; break;
+ case(REGISTER_TAP_GROUP_ENDPOINT_LIST): toolspath = "/Statistics/_Endpoint List/"; break;
+ case(REGISTER_TAP_GROUP_RESPONSE_TIME): toolspath = "/Statistics/Service _Response Time/"; break;
+ case(REGISTER_TAP_GROUP_NONE): toolspath = "/Statistics/"; break;
+ default:
+ g_assert(0);
+ toolspath = NULL;
+ }
+
+ /* add the (empty) root node, if not already done */
+ if(tap_menu_tree_root == NULL) {
+ child = g_malloc0(sizeof (menu_item_t));
+ tap_menu_tree_root = g_list_append(NULL, child);
+ }
+
+ /*
+ * Create any submenus required.
+ */
+ curnode = tap_menu_tree_root;
+ p = name;
+ while ((p = strchr(p, '/')) != NULL) {
+ /*
+ * OK, everything between "name" and "p" is
+ * a menu relative subtree into which the menu item
+ * will be placed.
+ *
+ * Construct the absolute path name of that subtree.
+ */
+ menupathlen = strlen(toolspath) + 1 + (p - name);
+ menupath = g_malloc(menupathlen);
+ strcpy(menupath, toolspath);
+ strncat(menupath, name, p - name);
+
+ /*
+ * Does there exist an entry with that path at this
+ * level of the Analyze menu tree?
+ */
+ child = curnode->data;
+ for (childnode = child->children; childnode != NULL; childnode = childnode->next) {
+ child = childnode->data;
+ if (strcmp(child->name, menupath) == 0)
+ break;
+ }
+ if (childnode == NULL) {
+ /*
+ * No. Create such an item as a subtree, and
+ * add it to the Tools menu tree.
+ */
+ childnode = tap_menu_item_add(
+ menupath, group, NULL, NULL ,NULL, NULL, curnode);
+ } else {
+ /*
+ * Yes. We don't need this "menupath" any longer.
+ */
+ g_free(menupath);
+ }
+ curnode = childnode;
+
+ /*
+ * Skip over the '/' we found.
+ */
+ p++;
+ }
+
+ /*
+ * Construct the main menu path for the menu item.
+ */
+ menupathlen = strlen(toolspath) + 1 + strlen(name);
+ menupath = g_malloc(menupathlen);
+ strcpy(menupath, toolspath);
+ strcat(menupath, name);
+
+ /*
+ * Construct an item factory entry for the item, and add it to
+ * the main menu.
+ */
+ tap_menu_item_add(
+ menupath, group, callback,
+ selected_packet_enabled, selected_tree_row_enabled,
+ callback_data, curnode);
+}
+
+
+guint merge_tap_menus_layered(GList *node, gint group) {
+ GtkItemFactoryEntry *entry;
+ GList *child;
+ guint added = 0;
+ menu_item_t *node_data = node->data;
+
+ /*
+ * Is this a leaf node or an interior node?
+ */
+ if (node_data->children == NULL) {
+ /*
+ * It's a leaf node.
+ */
+
+ /*
+ * The root node doesn't correspond to a menu tree item; it
+ * has a null name pointer.
+ */
+ if (node_data->name != NULL && group == node_data->group) {
+ entry = g_malloc0(sizeof (GtkItemFactoryEntry));
+ entry->path = node_data->name;
+ entry->callback = node_data->callback;
+ gtk_item_factory_create_item(main_menu_factory, entry, node_data->callback_data, 2);
+ set_menu_sensitivity(main_menu_factory, node_data->name, FALSE); /* no capture file yet */
+ added++;
+ }
+ } else {
+ /*
+ * It's an interior node; call
+ * "merge_tap_menus_layered()" on all its children
+ */
+
+ /*
+ * The root node doesn't correspond to a menu tree item; it
+ * has a null name pointer.
+ */
+ if (node_data->name != NULL && group == node_data->group) {
+ entry = g_malloc0(sizeof (GtkItemFactoryEntry));
+ entry->path = node_data->name;
+ entry->item_type = "<Branch>";
+ gtk_item_factory_create_item(main_menu_factory, entry,
+ NULL, 2);
+ set_menu_sensitivity(main_menu_factory, node_data->name,
+ FALSE); /* no children yet */
+ added++;
+ }
+
+ for (child = node_data->children; child != NULL; child =
+ child->next) {
+ added += merge_tap_menus_layered(child, group);
+ }
+ }
+
+ return added;
+}
+
+
+void merge_all_tap_menus(GList *node) {
+ GtkItemFactoryEntry *entry;
+
+ entry = g_malloc0(sizeof (GtkItemFactoryEntry));
+ entry->item_type = "<Separator>";
+ entry->path = "/Statistics/";
+
+ /*
+ * merge only the menu items of the specific group,
+ * and then append a seperator
+ */
+ if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_GENERIC)) {
+ gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);
+ }
+ if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_CONVERSATION_LIST)) {
+ /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
+ }
+ if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_ENDPOINT_LIST)) {
+ /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
+ }
+ if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_RESPONSE_TIME)) {
+ gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);
+ }
+ if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_NONE)) {
+ /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
+ }
+}
+
+
+
+/*
+ * Enable/disable menu sensitivity.
+ */
+static void
+set_menu_sensitivity(GtkItemFactory *ifactory, const gchar *path, gint val)
+{
+ GSList *menu_list;
+ GtkWidget *menu_item;
+ gchar *dup;
+ gchar *dest;
+
+
+ /* the underscore character regularly confuses things, as it will prevent finding
+ * the menu_item, so it has to be removed first */
+ dup = g_strdup(path);
+ dest = dup;
+ while(*path) {
+ if (*path != '_') {
+ *dest = *path;
+ dest++;
+ }
+ path++;
+ }
+ *dest = '\0';
+
+ if (ifactory == NULL) {
+ /*
+ * Do it for all pop-up menus.
+ */
+ for (menu_list = popup_menu_list; menu_list != NULL;
+ menu_list = g_slist_next(menu_list))
+ set_menu_sensitivity(menu_list->data, dup, val);
+ } else {
+ /*
+ * Do it for that particular menu.
+ */
+ if ((menu_item = gtk_item_factory_get_widget(ifactory, dup)) != NULL) {
+ if (GTK_IS_MENU(menu_item)) {
+ /*
+ * "dup" refers to a submenu; "gtk_item_factory_get_widget()"
+ * gets the menu, not the item that, when selected, pops up
+ * the submenu.
+ *
+ * We have to change the latter item's sensitivity, so that
+ * it shows up normally if sensitive and grayed-out if
+ * insensitive.
+ */
+ menu_item = gtk_menu_get_attach_widget(GTK_MENU(menu_item));
+ }
+ gtk_widget_set_sensitive(menu_item, val);
+ } else{
+ /* be sure this menu item *is* existing */
+ g_assert_not_reached();
+ }
+ }
+
+ g_free(dup);
+}
+
+void
+set_menu_object_data_meat(GtkItemFactory *ifactory, gchar *path, gchar *key, gpointer data)
+{
+ GtkWidget *menu = NULL;
+
+ if ((menu = gtk_item_factory_get_widget(ifactory, path)) != NULL)
+ OBJECT_SET_DATA(menu, key, data);
+}
+
+void
+set_menu_object_data (gchar *path, gchar *key, gpointer data) {
+ GSList *menu_list = popup_menu_list;
+ gchar *shortpath = strrchr(path, '/');
+
+ set_menu_object_data_meat(main_menu_factory, path, key, data);
+ while (menu_list != NULL) {
+ set_menu_object_data_meat(menu_list->data, shortpath, key, data);
+ menu_list = g_slist_next(menu_list);
+ }
+}
+
+
+/* Recently used capture files submenu:
+ * Submenu containing the recently used capture files.
+ * The capture filenames are always kept with the absolute path, to be independant
+ * of the current path.
+ * They are only stored inside the labels of the submenu (no separate list). */
+
+#define MENU_RECENT_FILES_PATH "/File/Open Recent"
+#define MENU_RECENT_FILES_KEY "Recent File Name"
+
+void
+update_menu_recent_capture_file1(GtkWidget *widget, gpointer cnt) {
+ gchar *widget_cf_name;
+
+ widget_cf_name = OBJECT_GET_DATA(widget, MENU_RECENT_FILES_KEY);
+
+ /* if this menu item is a file, count it */
+ if (widget_cf_name) {
+ (*(guint *)cnt)++;
+ }
+}
+
+
+/* update the menu */
+void
+update_menu_recent_capture_file(GtkWidget *submenu_recent_files) {
+ guint cnt = 0;
+
+ gtk_container_foreach(GTK_CONTAINER(submenu_recent_files),
+ update_menu_recent_capture_file1, &cnt);
+
+ /* make parent menu item sensitive only, if we have any valid files in the list */
+ set_menu_sensitivity(main_menu_factory, MENU_RECENT_FILES_PATH, cnt);
+}
+
+
+/* remove the capture filename from the "Recent Files" menu */
+void
+remove_menu_recent_capture_file(GtkWidget *widget, gpointer unused _U_) {
+ GtkWidget *submenu_recent_files;
+ gchar *widget_cf_name;
+
+
+ widget_cf_name = OBJECT_GET_DATA(widget, MENU_RECENT_FILES_KEY);
+ g_free(widget_cf_name);
+
+ /* get the submenu container item */
+ submenu_recent_files = gtk_item_factory_get_widget(main_menu_factory, MENU_RECENT_FILES_PATH);
+
+ /* XXX: is this all we need to do, to free the menu item and its label?
+ The reference count of widget will go to 0, so it'll be freed;
+ will that free the label? */
+ gtk_container_remove(GTK_CONTAINER(submenu_recent_files), widget);
+}
+
+
+/* callback, if the user pushed the <Clear File List> item */
+static void
+clear_menu_recent_capture_file_cmd_cb(GtkWidget *w _U_, gpointer unused _U_) {
+ GtkWidget *submenu_recent_files;
+
+
+ submenu_recent_files = gtk_item_factory_get_widget(main_menu_factory, MENU_RECENT_FILES_PATH);
+
+ gtk_container_foreach(GTK_CONTAINER(submenu_recent_files),
+ remove_menu_recent_capture_file, NULL);
+
+ update_menu_recent_capture_file(submenu_recent_files);
+}
+
+
+/* callback, if the user pushed a recent file submenu item */
+void
+menu_open_recent_file_cmd(GtkWidget *w)
+{
+ GtkWidget *submenu_recent_files;
+ GtkWidget *menu_item_child;
+ gchar *cf_name;
+ int err;
+
+ submenu_recent_files = gtk_item_factory_get_widget(main_menu_factory, MENU_RECENT_FILES_PATH);
+
+ /* get capture filename from the menu item label */
+ menu_item_child = (GTK_BIN(w))->child;
+ gtk_label_get(GTK_LABEL(menu_item_child), &cf_name);
+
+ /* open and read the capture file (this will close an existing file) */
+ if ((err = cf_open(cf_name, FALSE, &cfile)) == 0) {
+ cf_read(&cfile);
+ } else {
+ /* the capture file isn't existing any longer, remove menu item */
+ /* XXX: ask user to remove item, it's maybe only a temporary problem */
+ remove_menu_recent_capture_file(w, NULL);
+ }
+
+ update_menu_recent_capture_file(submenu_recent_files);
+}
+
+static void menu_open_recent_file_answered_cb(gpointer dialog _U_, gint btn, gpointer data _U_)
+{
+ switch(btn) {
+ case(ESD_BTN_YES):
+ /* save file first */
+ file_save_as_cmd(after_save_open_recent_file, data);
+ break;
+ case(ESD_BTN_NO):
+ cf_close(&cfile);
+ menu_open_recent_file_cmd(data);
+ break;
+ case(ESD_BTN_CANCEL):
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
+
+void
+menu_open_recent_file_cmd_cb(GtkWidget *widget, gpointer data _U_) {
+ gpointer dialog;
+
+
+ if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
+ /* user didn't saved his current file, ask him */
+ dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO_CANCEL,
+ PRIMARY_TEXT_START "Save capture file before opening a new one?" PRIMARY_TEXT_END "\n\n"
+ "If you open a new capture file without saving, your current capture data will be discarded.");
+ simple_dialog_set_cb(dialog, menu_open_recent_file_answered_cb, widget);
+ } else {
+ /* unchanged file */
+ menu_open_recent_file_cmd(widget);
+ }
+}
+
+/* add the capture filename (with an absolute path) to the "Recent Files" menu */
+void
+add_menu_recent_capture_file_absolute(gchar *cf_name) {
+ GtkWidget *submenu_recent_files;
+ GList *menu_item_list;
+ GList *li;
+ gchar *widget_cf_name;
+ gchar *normalized_cf_name;
+ GtkWidget *menu_item;
+ guint cnt;
+
+
+
+ normalized_cf_name = g_strdup(cf_name);
+#ifdef WIN32
+ /* replace all slashes by backslashes */
+ g_strdelimit(normalized_cf_name, "/", '\\');
+#endif
+
+ /* get the submenu container item */
+ submenu_recent_files = gtk_item_factory_get_widget(main_menu_factory, MENU_RECENT_FILES_PATH);
+
+ /* convert container to a GList */
+ menu_item_list = gtk_container_children(GTK_CONTAINER(submenu_recent_files));
+
+ /* iterate through list items of menu_item_list,
+ * removing special items, a maybe duplicate entry and every item above count_max */
+ cnt = 1;
+ for (li = g_list_first(menu_item_list); li; li = li->next, cnt++) {
+ /* get capture filename */
+ menu_item = GTK_WIDGET(li->data);
+ widget_cf_name = OBJECT_GET_DATA(menu_item, MENU_RECENT_FILES_KEY);
+
+ /* if this element string is one of our special items (seperator, ...) or
+ * already in the list or
+ * this element is above maximum count (too old), remove it */
+ if (!widget_cf_name ||
+#ifdef WIN32
+ /* do a case insensitive compare on win32 */
+#if GLIB_MAJOR_VERSION < 2
+ g_strncasecmp(widget_cf_name, normalized_cf_name, 1000) == 0 ||
+#else
+ g_ascii_strncasecmp(widget_cf_name, normalized_cf_name, 1000) == 0 ||
+#endif
+#else /* WIN32 */
+ /* do a case sensitive compare on unix */
+ strncmp(widget_cf_name, normalized_cf_name, 1000) == 0 ||
+#endif
+ cnt >= prefs.gui_recent_files_count_max) {
+ remove_menu_recent_capture_file(li->data, NULL);
+ cnt--;
+ }
+ }
+
+ g_list_free(menu_item_list);
+
+ /* add new item at latest position */
+ menu_item = gtk_menu_item_new_with_label(normalized_cf_name);
+ OBJECT_SET_DATA(menu_item, MENU_RECENT_FILES_KEY, normalized_cf_name);
+ gtk_menu_prepend (GTK_MENU(submenu_recent_files), menu_item);
+ SIGNAL_CONNECT_OBJECT(GTK_OBJECT(menu_item), "activate",
+ menu_open_recent_file_cmd_cb, (GtkObject *) menu_item);
+ gtk_widget_show (menu_item);
+
+ /* add seperator at last position */
+ menu_item = gtk_menu_item_new();
+ gtk_menu_append (GTK_MENU(submenu_recent_files), menu_item);
+ gtk_widget_show (menu_item);
+
+ /* add new "clear list" item at last position */
+#if GTK_MAJOR_VERSION < 2
+ menu_item = gtk_menu_item_new_with_label("<Clear File List>");
+#else
+ menu_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLEAR, NULL);
+#endif
+ gtk_menu_append (GTK_MENU(submenu_recent_files), menu_item);
+ SIGNAL_CONNECT_OBJECT(GTK_OBJECT(menu_item), "activate",
+ clear_menu_recent_capture_file_cmd_cb, (GtkObject *) menu_item);
+ gtk_widget_show (menu_item);
+
+ update_menu_recent_capture_file(submenu_recent_files);
+}
+
+
+/* add the capture filename to the "Recent Files" menu */
+/* (will change nothing, if this filename is already in the menu) */
+void
+add_menu_recent_capture_file(gchar *cf_name) {
+ gchar *curr;
+ gchar *absolute;
+
+
+ /* if this filename is an absolute path, we can use it directly */
+ if (g_path_is_absolute(cf_name)) {
+ add_menu_recent_capture_file_absolute(cf_name);
+ return;
+ }
+
+ /* this filename is not an absolute path, prepend the current dir */
+ curr = g_get_current_dir();
+ absolute = g_strdup_printf("%s%s%s", curr, G_DIR_SEPARATOR_S, cf_name);
+ add_menu_recent_capture_file_absolute(absolute);
+ g_free(curr);
+ g_free(absolute);
+}
+
+
+/* write all capture filenames of the menu to the user's recent file */
+void
+menu_recent_file_write_all(FILE *rf) {
+ GtkWidget *submenu_recent_files;
+ GList *children;
+ GList *child;
+ gchar *cf_name;
+
+
+ submenu_recent_files = gtk_item_factory_get_widget(main_menu_factory, MENU_RECENT_FILES_PATH);
+
+ /* we have to iterate backwards through the children's list,
+ * so we get the latest item last in the file.
+ * (don't use gtk_container_foreach() here, it will return the wrong iteration order) */
+ children = gtk_container_children(GTK_CONTAINER(submenu_recent_files));
+ child = g_list_last(children);
+ while(child != NULL) {
+ /* get capture filename from the menu item label */
+ cf_name = OBJECT_GET_DATA(child->data, MENU_RECENT_FILES_KEY);
+ if (cf_name) {
+ fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", cf_name);
+ }
+
+ child = g_list_previous(child);
+ }
+
+ g_list_free(children);
+}
+
+
+static void
+main_toolbar_show_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+
+ /* save current setting in recent */
+ recent.main_toolbar_show = GTK_CHECK_MENU_ITEM(w)->active;
+
+ main_widgets_show_or_hide();
+}
+
+
+static void
+filter_toolbar_show_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+
+ /* save current setting in recent */
+ recent.filter_toolbar_show = GTK_CHECK_MENU_ITEM(w)->active;
+
+ main_widgets_show_or_hide();
+}
+
+
+static void
+packet_list_show_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+
+ /* save current setting in recent */
+ recent.packet_list_show = GTK_CHECK_MENU_ITEM(w)->active;
+
+ main_widgets_show_or_hide();
+}
+
+
+static void
+tree_view_show_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+
+ /* save current setting in recent */
+ recent.tree_view_show = GTK_CHECK_MENU_ITEM(w)->active;
+
+ main_widgets_show_or_hide();
+}
+
+
+static void
+byte_view_show_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+
+ /* save current setting in recent */
+ recent.byte_view_show = GTK_CHECK_MENU_ITEM(w)->active;
+
+ main_widgets_show_or_hide();
+}
+
+
+static void
+statusbar_show_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+
+ /* save current setting in recent */
+ recent.statusbar_show = GTK_CHECK_MENU_ITEM(w)->active;
+
+ main_widgets_show_or_hide();
+}
+
+
+static void
+timestamp_absolute_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+ if (recent.gui_time_format != TS_ABSOLUTE) {
+ set_timestamp_setting(TS_ABSOLUTE);
+ recent.gui_time_format = TS_ABSOLUTE;
+ change_time_formats(&cfile);
+ }
+}
+
+static void
+timestamp_absolute_date_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+ if (recent.gui_time_format != TS_ABSOLUTE_WITH_DATE) {
+ set_timestamp_setting(TS_ABSOLUTE_WITH_DATE);
+ recent.gui_time_format = TS_ABSOLUTE_WITH_DATE;
+ change_time_formats(&cfile);
+ }
+}
+
+static void
+timestamp_relative_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+ if (recent.gui_time_format != TS_RELATIVE) {
+ set_timestamp_setting(TS_RELATIVE);
+ recent.gui_time_format = TS_RELATIVE;
+ change_time_formats(&cfile);
+ }
+}
+
+static void
+timestamp_delta_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+ if (recent.gui_time_format != TS_DELTA) {
+ set_timestamp_setting(TS_DELTA);
+ recent.gui_time_format = TS_DELTA;
+ change_time_formats(&cfile);
+ }
+}
+
+void
+menu_name_resolution_changed(void)
+{
+ GtkWidget *menu = NULL;
+
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Name Resolution/Enable for MAC Layer");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), g_resolv_flags & RESOLV_MAC);
+
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Name Resolution/Enable for Network Layer");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), g_resolv_flags & RESOLV_NETWORK);
+
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Name Resolution/Enable for Transport Layer");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), g_resolv_flags & RESOLV_TRANSPORT);
+}
+
+static void
+name_resolution_mac_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+ if (GTK_CHECK_MENU_ITEM(w)->active) {
+ g_resolv_flags |= RESOLV_MAC;
+ } else {
+ g_resolv_flags &= ~RESOLV_MAC;
+ }
+}
+
+static void
+name_resolution_network_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+ if (GTK_CHECK_MENU_ITEM(w)->active) {
+ g_resolv_flags |= RESOLV_NETWORK;
+ } else {
+ g_resolv_flags &= ~RESOLV_NETWORK;
+ }
+}
+
+static void
+name_resolution_transport_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+ if (GTK_CHECK_MENU_ITEM(w)->active) {
+ g_resolv_flags |= RESOLV_TRANSPORT;
+ } else {
+ g_resolv_flags &= ~RESOLV_TRANSPORT;
+ }
+}
+
+#ifdef HAVE_LIBPCAP
+static void
+auto_scroll_live_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+ auto_scroll_live = GTK_CHECK_MENU_ITEM(w)->active;
+}
+#endif
+
+/* the recent file read has finished, update the menu corresponding */
+void
+menu_recent_read_finished(void) {
+ GtkWidget *menu = NULL;
+
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Main Toolbar");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.main_toolbar_show);
+
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Filter Toolbar");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.filter_toolbar_show);
+
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Statusbar");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.statusbar_show);
+
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Packet List");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.packet_list_show);
+
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Packet Details");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.tree_view_show);
+
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Packet Bytes");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.byte_view_show);
+
+ menu_name_resolution_changed();
+
+#ifdef HAVE_LIBPCAP
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Auto Scroll in Live Capture");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), auto_scroll_live);
+#endif
+
+ main_widgets_rearrange();
+
+ /* don't change the time format, if we had a command line value */
+ if (get_timestamp_setting() != TS_NOT_SET) {
+ recent.gui_time_format = get_timestamp_setting();
+ }
+
+ switch(recent.gui_time_format) {
+ case(TS_ABSOLUTE):
+ menu = gtk_item_factory_get_widget(main_menu_factory,
+ "/View/Time Display Format/Time of Day");
+ /* set_active will not trigger the callback when activating an active item! */
+ recent.gui_time_format = -1;
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), FALSE);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), TRUE);
+ break;
+ case(TS_ABSOLUTE_WITH_DATE):
+ menu = gtk_item_factory_get_widget(main_menu_factory,
+ "/View/Time Display Format/Date and Time of Day");
+ recent.gui_time_format = -1;
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), TRUE);
+ break;
+ case(TS_RELATIVE):
+ menu = gtk_item_factory_get_widget(main_menu_factory,
+ "/View/Time Display Format/Seconds Since Beginning of Capture");
+ recent.gui_time_format = -1;
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), TRUE);
+ break;
+ case(TS_DELTA):
+ menu = gtk_item_factory_get_widget(main_menu_factory,
+ "/View/Time Display Format/Seconds Since Previous Packet");
+ recent.gui_time_format = -1;
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), TRUE);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
+
+
+gint
+popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+ GtkWidget *menu = (GtkWidget *)data;
+ GdkEventButton *event_button = NULL;
+ gint row, column;
+
+ if(widget == NULL || event == NULL || data == NULL) {
+ return FALSE;
+ }
+
+ /*
+ * If we ever want to make the menu differ based on what row
+ * and/or column we're above, we'd use "eth_clist_get_selection_info()"
+ * to find the row and column number for the coordinates; a CTree is,
+ * I guess, like a CList with one column(?) and the expander widget
+ * as a pixmap.
+ */
+ /* Check if we are on packet_list object */
+ if (widget == OBJECT_GET_DATA(popup_menu_object, E_MPACKET_LIST_KEY)) {
+ if (packet_list_get_event_row_column(widget, (GdkEventButton *)event,
+ &row, &column)) {
+ OBJECT_SET_DATA(popup_menu_object, E_MPACKET_LIST_ROW_KEY,
+ GINT_TO_POINTER(row));
+ OBJECT_SET_DATA(popup_menu_object, E_MPACKET_LIST_COL_KEY,
+ GINT_TO_POINTER(column));
+ packet_list_set_selected_row(row);
+ }
+ }
+
+ /* Check if we are on tree_view object */
+ if (widget == tree_view) {
+ tree_view_select(widget, (GdkEventButton *) event);
+ }
+
+ /* Check if we are on byte_view object */
+ if(widget == get_notebook_bv_ptr(byte_nb_ptr)) {
+ byte_view_select(widget, (GdkEventButton *) event);
+ }
+
+ /* context menu handler (but the byte view notebook pages have their own handler) */
+ if(event->type == GDK_BUTTON_PRESS && widget != byte_nb_ptr) {
+ event_button = (GdkEventButton *) event;
+
+ /* To qoute the "Gdk Event Structures" doc:
+ * "Normally button 1 is the left mouse button, 2 is the middle button, and 3 is the right button" */
+ if(event_button->button == 3) {
+ gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
+ event_button->button,
+ event_button->time);
+ SIGNAL_EMIT_STOP_BY_NAME(widget, "button_press_event");
+ return TRUE;
+ }
+ }
+#if GTK_MAJOR_VERSION >= 2
+ /* GDK_2BUTTON_PRESS is a doubleclick -> expand/collapse tree row */
+ /* GTK version 1 seems to be doing this automatically */
+ if (widget == tree_view && event->type == GDK_2BUTTON_PRESS) {
+ GtkTreePath *path;
+
+ if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget),
+ (gint) (((GdkEventButton *)event)->x),
+ (gint) (((GdkEventButton *)event)->y),
+ &path, NULL, NULL, NULL))
+ {
+ if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget), path))
+ gtk_tree_view_collapse_row(GTK_TREE_VIEW(widget), path);
+ else
+ gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), path,
+ FALSE);
+ gtk_tree_path_free(path);
+ }
+ }
+#endif
+ return FALSE;
+}
+
+/* Enable or disable menu items based on whether you have a capture file
+ you've finished reading. */
+void
+set_menus_for_capture_file(gboolean have_capture_file)
+{
+ set_menu_sensitivity(main_menu_factory, "/File/Open...", have_capture_file);
+ set_menu_sensitivity(main_menu_factory, "/File/Open Recent", have_capture_file);
+ set_menu_sensitivity(main_menu_factory, "/File/Merge...", have_capture_file);
+ set_menu_sensitivity(main_menu_factory, "/File/Close", have_capture_file);
+ set_menu_sensitivity(main_menu_factory, "/File/Save As...",
+ have_capture_file);
+ set_menu_sensitivity(main_menu_factory, "/File/Export", have_capture_file);
+ set_menu_sensitivity(main_menu_factory, "/View/Reload", have_capture_file);
+ set_toolbar_for_capture_file(have_capture_file);
+ packets_bar_update();
+}
+
+/* Enable or disable menu items based on whether you have an unsaved
+ capture file you've finished reading. */
+void
+set_menus_for_unsaved_capture_file(gboolean have_unsaved_capture_file)
+{
+ set_menu_sensitivity(main_menu_factory, "/File/Save",
+ have_unsaved_capture_file);
+ set_toolbar_for_unsaved_capture_file(have_unsaved_capture_file);
+}
+
+/* Enable or disable menu items based on whether there's a capture in
+ progress. */
+void
+set_menus_for_capture_in_progress(gboolean capture_in_progress)
+{
+ set_menu_sensitivity(main_menu_factory, "/File/Open...",
+ !capture_in_progress);
+ set_menu_sensitivity(main_menu_factory, "/File/Open Recent",
+ !capture_in_progress);
+#ifdef HAVE_LIBPCAP
+ set_menu_sensitivity(main_menu_factory, "/Capture/Start...",
+ !capture_in_progress);
+ set_menu_sensitivity(main_menu_factory, "/Capture/Stop",
+ capture_in_progress);
+#endif /* HAVE_LIBPCAP */
+ set_toolbar_for_capture_in_progress(capture_in_progress);
+
+ set_capture_if_dialog_for_capture_in_progress(capture_in_progress);
+}
+
+/* Enable or disable menu items based on whether you have some captured
+ packets. */
+static gboolean
+walk_menu_tree_for_captured_packets(GList *node,
+ gboolean have_captured_packets)
+{
+ gboolean is_enabled;
+ GList *child;
+ menu_item_t *node_data = node->data;
+
+ /*
+ * Is this a leaf node or an interior node?
+ */
+ if (node_data->children == NULL) {
+ /*
+ * It's a leaf node.
+ *
+ * If it has no "selected_packet_enabled()" or
+ * "selected_tree_row_enabled()" routines, we enable
+ * it. This allows tap windows to be popped up even
+ * if you have no capture file; this is done to let
+ * the user pop up multiple tap windows before reading
+ * in a capture file, so that they can be processed in
+ * parallel while the capture file is being read rather
+ * than one at at time as you pop up the windows, and to
+ * let the user pop up tap windows before starting an
+ * "Update list of packets in real time" capture, so that
+ * the statistics can be displayed while the capture is
+ * in progress.
+ *
+ * If it has either of those routines, we disable it for
+ * now - as long as, when a capture is first available,
+ * we don't get called after a packet or tree row is
+ * selected, that's OK.
+ * XXX - that should be done better.
+ */
+ if (node_data->selected_packet_enabled == NULL &&
+ node_data->selected_tree_row_enabled == NULL)
+ node_data->enabled = TRUE;
+ else
+ node_data->enabled = FALSE;
+ } else {
+ /*
+ * It's an interior node; call
+ * "walk_menu_tree_for_captured_packets()" on all its
+ * children and, if any of them are enabled, enable
+ * this node, otherwise disable it.
+ *
+ * XXX - should we just leave all interior nodes enabled?
+ * Which is a better UI choice?
+ */
+ is_enabled = FALSE;
+ for (child = node_data->children; child != NULL; child =
+ child->next) {
+ if (walk_menu_tree_for_captured_packets(child,
+ have_captured_packets))
+ is_enabled = TRUE;
+ }
+ node_data->enabled = is_enabled;
+ }
+
+ /*
+ * The root node doesn't correspond to a menu tree item; it
+ * has a null name pointer.
+ */
+ if (node_data->name != NULL) {
+ set_menu_sensitivity(main_menu_factory, node_data->name,
+ node_data->enabled);
+ }
+ return node_data->enabled;
+}
+
+void
+set_menus_for_captured_packets(gboolean have_captured_packets)
+{
+ set_menu_sensitivity(main_menu_factory, "/File/Print...",
+ have_captured_packets);
+ set_menu_sensitivity(packet_list_menu_factory, "/Print...",
+ have_captured_packets);
+ set_menu_sensitivity(main_menu_factory, "/Edit/Find Packet...",
+ have_captured_packets);
+ set_menu_sensitivity(main_menu_factory, "/Edit/Find Next",
+ have_captured_packets);
+ set_menu_sensitivity(main_menu_factory, "/Edit/Find Previous",
+ have_captured_packets);
+ set_menu_sensitivity(main_menu_factory, "/View/Zoom In",
+ have_captured_packets);
+ set_menu_sensitivity(main_menu_factory, "/View/Zoom Out",
+ have_captured_packets);
+ set_menu_sensitivity(main_menu_factory, "/View/Normal Size",
+ have_captured_packets);
+ set_menu_sensitivity(packet_list_menu_factory, "/Coloring Rules...",
+ have_captured_packets);
+ set_menu_sensitivity(main_menu_factory, "/Go/Go to Packet...",
+ have_captured_packets);
+ set_menu_sensitivity(main_menu_factory, "/Go/First Packet",
+ have_captured_packets);
+ set_menu_sensitivity(main_menu_factory, "/Go/Last Packet",
+ have_captured_packets);
+ set_menu_sensitivity(main_menu_factory, "/Statistics/Summary",
+ have_captured_packets);
+ set_menu_sensitivity(main_menu_factory, "/Statistics/Protocol Hierarchy",
+ have_captured_packets);
+
+ walk_menu_tree_for_captured_packets(tap_menu_tree_root,
+ have_captured_packets);
+ set_toolbar_for_captured_packets(have_captured_packets);
+ packets_bar_update();
+}
+
+/* Enable or disable menu items based on whether a packet is selected and,
+ if so, on the properties of the packet. */
+static gboolean
+walk_menu_tree_for_selected_packet(GList *node, frame_data *fd,
+ epan_dissect_t *edt)
+{
+ gboolean is_enabled;
+ GList *child;
+ menu_item_t *node_data = node->data;
+
+ /*
+ * Is this a leaf node or an interior node?
+ */
+ if (node_data->children == NULL) {
+ /*
+ * It's a leaf node.
+ *
+ * If it has no "selected_packet_enabled()" routine,
+ * leave its enabled/disabled status alone - it
+ * doesn't depend on whether we have a packet selected
+ * or not or on the selected packet.
+ *
+ * If it has a "selected_packet_enabled()" routine,
+ * call it and set the item's enabled/disabled status
+ * based on its return value.
+ */
+ if (node_data->selected_packet_enabled != NULL)
+ node_data->enabled = node_data->selected_packet_enabled(fd, edt);
+ } else {
+ /*
+ * It's an interior node; call
+ * "walk_menu_tree_for_selected_packet()" on all its
+ * children and, if any of them are enabled, enable
+ * this node, otherwise disable it.
+ *
+ * XXX - should we just leave all interior nodes enabled?
+ * Which is a better UI choice?
+ */
+ is_enabled = FALSE;
+ for (child = node_data->children; child != NULL; child =
+ child->next) {
+ if (walk_menu_tree_for_selected_packet(child, fd, edt))
+ is_enabled = TRUE;
+ }
+ node_data->enabled = is_enabled;
+ }
+
+ /*
+ * The root node doesn't correspond to a menu tree item; it
+ * has a null name pointer.
+ */
+ if (node_data->name != NULL) {
+ set_menu_sensitivity(main_menu_factory, node_data->name,
+ node_data->enabled);
+ }
+ return node_data->enabled;
+}
+
+void
+set_menus_for_selected_packet(capture_file *cf)
+{
+ set_menu_sensitivity(main_menu_factory, "/Edit/Mark Packet",
+ cf->current_frame != NULL);
+ set_menu_sensitivity(packet_list_menu_factory, "/Mark Packet",
+ cf->current_frame != NULL);
+ set_menu_sensitivity(main_menu_factory, "/Edit/Time Reference",
+ cf->current_frame != NULL);
+ set_menu_sensitivity(packet_list_menu_factory, "/Time Reference",
+ cf->current_frame != NULL);
+ set_menu_sensitivity(main_menu_factory, "/Edit/Mark All Packets",
+ cf->current_frame != NULL);
+ set_menu_sensitivity(main_menu_factory, "/Edit/Unmark All Packets",
+ cf->current_frame != NULL);
+ set_menu_sensitivity(main_menu_factory, "/View/Collapse All",
+ cf->current_frame != NULL);
+ set_menu_sensitivity(tree_view_menu_factory, "/Collapse All",
+ cf->current_frame != NULL);
+ set_menu_sensitivity(main_menu_factory, "/View/Expand All",
+ cf->current_frame != NULL);
+ set_menu_sensitivity(tree_view_menu_factory, "/Expand All",
+ cf->current_frame != NULL);
+ set_menu_sensitivity(main_menu_factory, "/View/Show Packet in New Window",
+ cf->current_frame != NULL);
+ set_menu_sensitivity(packet_list_menu_factory, "/Show Packet in New Window",
+ cf->current_frame != NULL);
+ set_menu_sensitivity(main_menu_factory, "/Analyze/Follow TCP Stream",
+ cf->current_frame != NULL ? (cf->edt->pi.ipproto == IP_PROTO_TCP) : FALSE);
+ set_menu_sensitivity(NULL, "/Follow TCP Stream",
+ cf->current_frame != NULL ? (cf->edt->pi.ipproto == IP_PROTO_TCP) : FALSE);
+ set_menu_sensitivity(main_menu_factory, "/Analyze/Decode As...",
+ cf->current_frame != NULL && decode_as_ok());
+ set_menu_sensitivity(NULL, "/Decode As...",
+ cf->current_frame != NULL && decode_as_ok());
+ set_menu_sensitivity(main_menu_factory, "/View/Name Resolution/Resolve Name",
+ cf->current_frame != NULL && (g_resolv_flags & RESOLV_ALL_ADDRS) != RESOLV_ALL_ADDRS);
+ set_menu_sensitivity(tree_view_menu_factory, "/Resolve Name",
+ cf->current_frame != NULL && (g_resolv_flags & RESOLV_ALL_ADDRS) != RESOLV_ALL_ADDRS);
+ set_menu_sensitivity(packet_list_menu_factory, "/Apply as Filter",
+ cf->current_frame != NULL);
+ set_menu_sensitivity(packet_list_menu_factory, "/Prepare a Filter",
+ cf->current_frame != NULL);
+
+ walk_menu_tree_for_selected_packet(tap_menu_tree_root, cf->current_frame,
+ cf->edt);
+ packets_bar_update();
+}
+
+/* Enable or disable menu items based on whether a tree row is selected
+ and, if so, on the properties of the tree row. */
+static gboolean
+walk_menu_tree_for_selected_tree_row(GList *node, field_info *fi)
+{
+ gboolean is_enabled;
+ GList *child;
+ menu_item_t *node_data = node->data;
+
+ /*
+ * Is this a leaf node or an interior node?
+ */
+ if (node_data->children == NULL) {
+ /*
+ * It's a leaf node.
+ *
+ * If it has no "selected_tree_row_enabled()" routine,
+ * leave its enabled/disabled status alone - it
+ * doesn't depend on whether we have a tree row selected
+ * or not or on the selected tree row.
+ *
+ * If it has a "selected_tree_row_enabled()" routine,
+ * call it and set the item's enabled/disabled status
+ * based on its return value.
+ */
+ if (node_data->selected_tree_row_enabled != NULL)
+ node_data->enabled = node_data->selected_tree_row_enabled(fi);
+ } else {
+ /*
+ * It's an interior node; call
+ * "walk_menu_tree_for_selected_tree_row()" on all its
+ * children and, if any of them are enabled, enable
+ * this node, otherwise disable it.
+ *
+ * XXX - should we just leave all interior nodes enabled?
+ * Which is a better UI choice?
+ */
+ is_enabled = FALSE;
+ for (child = node_data->children; child != NULL; child =
+ child->next) {
+ if (walk_menu_tree_for_selected_tree_row(child, fi))
+ is_enabled = TRUE;
+ }
+ node_data->enabled = is_enabled;
+ }
+
+ /*
+ * The root node doesn't correspond to a menu tree item; it
+ * has a null name pointer.
+ */
+ if (node_data->name != NULL) {
+ set_menu_sensitivity(main_menu_factory, node_data->name,
+ node_data->enabled);
+ }
+ return node_data->enabled;
+}
+
+void
+set_menus_for_selected_tree_row(capture_file *cf)
+{
+ gboolean properties;
+
+
+ set_menu_sensitivity(main_menu_factory, "/File/Export/Selected Packet Bytes...",
+ cf->finfo_selected != NULL);
+ set_menu_sensitivity(tree_view_menu_factory, "/Export Selected Packet Bytes...",
+ cf->finfo_selected != NULL);
+ set_menu_sensitivity(hexdump_menu_factory, "/Export Selected Packet Bytes...",
+ cf->finfo_selected != NULL);
+
+ if (cf->finfo_selected != NULL) {
+ header_field_info *hfinfo = cf->finfo_selected->hfinfo;
+ if (hfinfo->parent == -1) {
+ properties = prefs_is_registered_protocol(hfinfo->abbrev);
+ } else {
+ properties = prefs_is_registered_protocol(proto_registrar_get_abbrev(hfinfo->parent));
+ }
+ set_menu_sensitivity(main_menu_factory,
+ "/Go/Go to Corresponding Packet", hfinfo->type == FT_FRAMENUM);
+ set_menu_sensitivity(tree_view_menu_factory,
+ "/Go to Corresponding Packet", hfinfo->type == FT_FRAMENUM);
+ set_menu_sensitivity(main_menu_factory, "/Analyze/Apply as Filter",
+ proto_can_match_selected(cf->finfo_selected, cf->edt));
+ set_menu_sensitivity(tree_view_menu_factory, "/Apply as Filter",
+ proto_can_match_selected(cf->finfo_selected, cf->edt));
+ set_menu_sensitivity(main_menu_factory, "/Analyze/Prepare a Filter",
+ proto_can_match_selected(cf->finfo_selected, cf->edt));
+ set_menu_sensitivity(tree_view_menu_factory, "/Prepare a Filter",
+ proto_can_match_selected(cf->finfo_selected, cf->edt));
+ set_menu_sensitivity(tree_view_menu_factory, "/Protocol Preferences...",
+ properties);
+ set_menu_sensitivity(main_menu_factory, "/View/Expand Tree", cf->finfo_selected->tree_type != -1);
+ set_menu_sensitivity(tree_view_menu_factory, "/Expand Tree", cf->finfo_selected->tree_type != -1);
+ } else {
+ set_menu_sensitivity(main_menu_factory,
+ "/Go/Go to Corresponding Packet", FALSE);
+ set_menu_sensitivity(tree_view_menu_factory,
+ "/Go to Corresponding Packet", FALSE);
+ set_menu_sensitivity(main_menu_factory, "/Analyze/Apply as Filter", FALSE);
+ set_menu_sensitivity(tree_view_menu_factory, "/Apply as Filter", FALSE);
+ set_menu_sensitivity(main_menu_factory, "/Analyze/Prepare a Filter", FALSE);
+ set_menu_sensitivity(tree_view_menu_factory, "/Prepare a Filter", FALSE);
+ set_menu_sensitivity(tree_view_menu_factory, "/Protocol Preferences...",
+ FALSE);
+ set_menu_sensitivity(main_menu_factory, "/View/Expand Tree", FALSE);
+ set_menu_sensitivity(tree_view_menu_factory, "/Expand Tree", FALSE);
+ }
+
+ walk_menu_tree_for_selected_tree_row(tap_menu_tree_root, cf->finfo_selected);
+}
diff --git a/gtk/menu.h b/gtk/menu.h
index 16d1c5d733..e79637c322 100644
--- a/gtk/menu.h
+++ b/gtk/menu.h
@@ -1,7 +1,7 @@
/* menu.h
* Menu definitions
*
- * $Id: menu.h,v 1.20 2004/06/04 17:16:57 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index e84427b15e..247ee317ca 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -2,7 +2,7 @@
* mgcp-statistics for ethereal
* Copyright 2003 Lars Roland
*
- * $Id: mgcp_stat.c,v 1.37 2004/06/02 07:12:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c
index 4199fb5bca..02d46ebd21 100644
--- a/gtk/mtp3_stat.c
+++ b/gtk/mtp3_stat.c
@@ -5,7 +5,7 @@
*
* Modified from gsm_map_stat.c
*
- * $Id: mtp3_stat.c,v 1.2 2004/05/23 23:24:06 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/mtp3_stat.h b/gtk/mtp3_stat.h
index 26844fc536..3aded4a8fe 100644
--- a/gtk/mtp3_stat.h
+++ b/gtk/mtp3_stat.h
@@ -1,6 +1,6 @@
/* mtp3_stat.h
*
- * $Id: mtp3_stat.h,v 1.2 2004/06/02 18:44:10 ulfl Exp $
+ * $Id$
*
* Copyright 2004, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
diff --git a/gtk/mtp3_summary.c b/gtk/mtp3_summary.c
index 32eb053595..585bd020c3 100644
--- a/gtk/mtp3_summary.c
+++ b/gtk/mtp3_summary.c
@@ -6,7 +6,7 @@
*
* Modified from gsm_map_summary.c
*
- * $Id: mtp3_summary.c,v 1.3 2004/05/23 23:24:06 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/nameres_prefs.c b/gtk/nameres_prefs.c
index 2a85ede0a5..262d18ffa0 100644
--- a/gtk/nameres_prefs.c
+++ b/gtk/nameres_prefs.c
@@ -1,7 +1,7 @@
/* nameres_prefs.c
* Dialog box for name resolution preferences
*
- * $Id: nameres_prefs.c,v 1.11 2004/05/27 16:43:01 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/nameres_prefs.h b/gtk/nameres_prefs.h
index 9600d0fcf8..22866adc35 100644
--- a/gtk/nameres_prefs.h
+++ b/gtk/nameres_prefs.h
@@ -1,7 +1,7 @@
/* nameres_prefs.h
* Definitions for name resolution preferences window
*
- * $Id: nameres_prefs.h,v 1.5 2004/06/04 20:05:31 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/packet_list.c b/gtk/packet_list.c
index b6e4549cb8..abf61293d4 100644
--- a/gtk/packet_list.c
+++ b/gtk/packet_list.c
@@ -1,7 +1,7 @@
/* packet_list.c
* packet list related functions 2002 Olivier Abad
*
- * $Id: packet_list.c,v 1.21 2004/06/17 16:35:25 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/packet_list.h b/gtk/packet_list.h
index 1b4fe0cd44..a3f10bd385 100644
--- a/gtk/packet_list.h
+++ b/gtk/packet_list.h
@@ -1,7 +1,7 @@
/* packet_list.h
* Declarations of GTK+-specific routines for managing the packet list.
*
- * $Id: packet_list.h,v 1.5 2004/06/17 16:35:25 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/packet_win.c b/gtk/packet_win.c
index 34b9b1865e..cc232b56c6 100644
--- a/gtk/packet_win.c
+++ b/gtk/packet_win.c
@@ -3,7 +3,7 @@
*
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet_win.c,v 1.45 2004/05/26 03:49:23 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/packet_win.h b/gtk/packet_win.h
index 7f5d711dd2..e582ade17f 100644
--- a/gtk/packet_win.h
+++ b/gtk/packet_win.h
@@ -3,7 +3,7 @@
*
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet_win.h,v 1.10 2004/06/02 18:44:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c
index 3be4629d86..7d39128f85 100644
--- a/gtk/plugins_dlg.c
+++ b/gtk/plugins_dlg.c
@@ -1,7 +1,7 @@
/* plugins_dlg.c
* Dialog boxes for plugins
*
- * $Id: plugins_dlg.c,v 1.37 2004/05/26 03:49:23 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 6e73d31a4c..b995eed15f 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,7 +1,7 @@
/* prefs_dlg.c
* Routines for handling preferences
*
- * $Id: prefs_dlg.c,v 1.87 2004/06/10 10:09:58 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/prefs_dlg.h b/gtk/prefs_dlg.h
index 2c485e07a3..96cc238786 100644
--- a/gtk/prefs_dlg.h
+++ b/gtk/prefs_dlg.h
@@ -1,7 +1,7 @@
/* prefs_dlg.h
* Definitions for preference handling routines
*
- * $Id: prefs_dlg.h,v 1.12 2004/06/04 20:05:31 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index c37b2c2cf8..bd111dc078 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -1,7 +1,7 @@
/* print_dlg.c
* Dialog boxes for printing and exporting to text files
*
- * $Id: print_dlg.c,v 1.81 2004/07/08 10:36:29 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/print_mswin.c b/gtk/print_mswin.c
index 9cd86eae06..4f805f6cf0 100644
--- a/gtk/print_mswin.c
+++ b/gtk/print_mswin.c
@@ -1,7 +1,7 @@
/* print_mswin.c
* Printing support for MSWindows
*
- * $Id: print_mswin.c,v 1.7 2003/11/11 13:59:53 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/print_mswin.h b/gtk/print_mswin.h
index 923dc3ff78..0f221eae62 100644
--- a/gtk/print_mswin.h
+++ b/gtk/print_mswin.h
@@ -1,7 +1,7 @@
/* print_mswin.h
* Printing support for MSWindows
*
- * $Id: print_mswin.h,v 1.5 2004/06/02 20:14:51 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c
index e867ee443c..c536dbd20e 100644
--- a/gtk/print_prefs.c
+++ b/gtk/print_prefs.c
@@ -1,7 +1,7 @@
/* print_prefs.c
* Dialog boxes for preferences for printing
*
- * $Id: print_prefs.c,v 1.22 2004/05/26 04:21:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/print_prefs.h b/gtk/print_prefs.h
index 92d7388b0d..80df32775f 100644
--- a/gtk/print_prefs.h
+++ b/gtk/print_prefs.h
@@ -1,7 +1,7 @@
/* print_prefs.h
* Definitions for print preferences window
*
- * $Id: print_prefs.h,v 1.9 2004/06/04 20:05:31 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/progress_dlg.c b/gtk/progress_dlg.c
index 786078cf67..85231aed50 100644
--- a/gtk/progress_dlg.c
+++ b/gtk/progress_dlg.c
@@ -1,7 +1,7 @@
/* progress_dlg.c
* Routines for progress-bar (modal) dialog
*
- * $Id: progress_dlg.c,v 1.23 2004/05/26 03:49:24 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index 7053a263fb..cf7580fbe5 100644
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -1,6 +1,6 @@
/* proto_dlg.c
*
- * $Id: proto_dlg.c,v 1.35 2004/06/10 10:09:58 guy Exp $
+ * $Id$
*
* Laurent Deniel <laurent.deniel@free.fr>
*
diff --git a/gtk/proto_dlg.h b/gtk/proto_dlg.h
index fe0efa6e15..fb2c331f91 100644
--- a/gtk/proto_dlg.h
+++ b/gtk/proto_dlg.h
@@ -1,6 +1,6 @@
/* proto_dlg.h
*
- * $Id: proto_dlg.h,v 1.5 2004/06/04 20:05:31 ulfl Exp $
+ * $Id$
*
* Laurent Deniel <laurent.deniel@free.fr>
*
diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index fde570ef57..fa3eb1c39e 100644
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.c
@@ -1,7 +1,7 @@
/* proto_draw.c
* Routines for GTK+ packet display
*
- * $Id: proto_draw.c,v 1.108 2004/07/09 23:02:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/proto_draw.h b/gtk/proto_draw.h
index ce8d117840..6f9a95f3d0 100644
--- a/gtk/proto_draw.h
+++ b/gtk/proto_draw.h
@@ -1,7 +1,7 @@
/* proto_draw.h
* Definitions for GTK+ packet display structures and routines
*
- * $Id: proto_draw.h,v 1.29 2004/06/05 13:28:13 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c
index 4f98863f18..0777e190e8 100644
--- a/gtk/proto_hier_stats_dlg.c
+++ b/gtk/proto_hier_stats_dlg.c
@@ -1,6 +1,6 @@
/* proto_hier_stats_dlg.c
*
- * $Id: proto_hier_stats_dlg.c,v 1.18 2004/05/23 23:24:06 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/proto_hier_stats_dlg.h b/gtk/proto_hier_stats_dlg.h
index 9bde408feb..6725ee9718 100644
--- a/gtk/proto_hier_stats_dlg.h
+++ b/gtk/proto_hier_stats_dlg.h
@@ -1,6 +1,6 @@
/* proto_hier_stats_dlg.h
*
- * $Id: proto_hier_stats_dlg.h,v 1.3 2004/06/02 22:13:04 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/range_utils.c b/gtk/range_utils.c
index bc52e04699..fb00ccd566 100644
--- a/gtk/range_utils.c
+++ b/gtk/range_utils.c
@@ -1,7 +1,7 @@
/* range_utils.c
* Packet range routines (save, print, ...) for GTK things
*
- * $Id: range_utils.c,v 1.3 2004/04/25 08:01:06 ulfl Exp $
+ * $Id$
*
* Ulf Lamping <ulf.lamping@web.de>
*
diff --git a/gtk/range_utils.h b/gtk/range_utils.h
index 823217a470..3bd4303f4b 100644
--- a/gtk/range_utils.h
+++ b/gtk/range_utils.h
@@ -1,7 +1,7 @@
/* range_utils.h
* Declarations of utilities to with range_utils.c (packet range dialog)
*
- * $Id: range_utils.h,v 1.2 2004/06/02 22:13:04 ulfl Exp $
+ * $Id$
*
* Ulf Lamping <ulf.lamping@web.de>
*
diff --git a/gtk/recent.c b/gtk/recent.c
index 5a4e2781e6..bcf2137720 100644
--- a/gtk/recent.c
+++ b/gtk/recent.c
@@ -2,7 +2,7 @@
* Recent "preference" handling routines
* Copyright 2004, Ulf Lamping <ulf.lamping@web.de>
*
- * $Id: recent.c,v 1.18 2004/07/09 21:13:22 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/recent.h b/gtk/recent.h
index 3c6d8e74b5..6307b58b1d 100644
--- a/gtk/recent.h
+++ b/gtk/recent.h
@@ -2,7 +2,7 @@
* Definitions for recent "preference" handling routines
* Copyright 2004, Ulf Lamping <ulf.lamping@web.de>
*
- * $Id: recent.h,v 1.11 2004/06/04 17:16:58 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c
index 3059bf47dc..af5ecf0c9b 100644
--- a/gtk/rpc_progs.c
+++ b/gtk/rpc_progs.c
@@ -1,7 +1,7 @@
/* rpc_progs.c
* rpc_progs 2002 Ronnie Sahlberg
*
- * $Id: rpc_progs.c,v 1.25 2004/05/23 23:24:06 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index 1c1a5b08cb..aea44c6919 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -1,7 +1,7 @@
/* rpc_stat.c
* rpc_stat 2002 Ronnie Sahlberg
*
- * $Id: rpc_stat.c,v 1.48 2004/06/02 07:12:10 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index c1e36d708a..615058cf2b 100644
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -1,7 +1,7 @@
/* rtp_analysis.c
* RTP analysis addition for ethereal
*
- * $Id: rtp_analysis.c,v 1.47 2004/06/30 06:58:58 guy Exp $
+ * $Id$
*
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
diff --git a/gtk/rtp_analysis.h b/gtk/rtp_analysis.h
index b18fa0bebd..4adb04def6 100644
--- a/gtk/rtp_analysis.h
+++ b/gtk/rtp_analysis.h
@@ -1,7 +1,7 @@
/* rtp_analysis.h
* RTP analysis addition for ethereal
*
- * $Id: rtp_analysis.h,v 1.2 2004/06/02 22:13:04 ulfl Exp $
+ * $Id$
*
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c
index 647a01934a..44d38355e4 100644
--- a/gtk/rtp_stream.c
+++ b/gtk/rtp_stream.c
@@ -1,7 +1,7 @@
/* rtp_stream.c
* RTP streams summary addition for ethereal
*
- * $Id: rtp_stream.c,v 1.15 2004/06/29 20:46:29 ulfl Exp $
+ * $Id$
*
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
diff --git a/gtk/rtp_stream.h b/gtk/rtp_stream.h
index 6d7a387b7a..fa4f7278ee 100644
--- a/gtk/rtp_stream.h
+++ b/gtk/rtp_stream.h
@@ -1,7 +1,7 @@
/* rtp_stream.h
* RTP streams summary addition for ethereal
*
- * $Id: rtp_stream.h,v 1.7 2004/06/04 20:05:31 ulfl Exp $
+ * $Id$
*
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index c5fe83432a..e4a67c5567 100644
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -1,7 +1,7 @@
/* rtp_stream_dlg.c
* RTP streams summary addition for ethereal
*
- * $Id: rtp_stream_dlg.c,v 1.26 2004/06/30 21:17:55 etxrab Exp $
+ * $Id$
*
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
diff --git a/gtk/rtp_stream_dlg.h b/gtk/rtp_stream_dlg.h
index a3efd09fb1..4f5cc5b82f 100644
--- a/gtk/rtp_stream_dlg.h
+++ b/gtk/rtp_stream_dlg.h
@@ -1,7 +1,7 @@
/* rtp_stream_dlg.h
* RTP streams summary addition for ethereal
*
- * $Id: rtp_stream_dlg.h,v 1.2 2004/06/02 22:13:04 ulfl Exp $
+ * $Id$
*
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
diff --git a/gtk/sat.h b/gtk/sat.h
index a0f6b950bd..5cd108b9e4 100644
--- a/gtk/sat.h
+++ b/gtk/sat.h
@@ -2,7 +2,7 @@
* 2003 Ronnie Sahlberg
* Sub-address types for MAC addresses
*
- * $Id: sat.h,v 1.1 2004/06/03 21:46:27 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c
index 8e1da8ceb0..db9ecc8fa6 100644
--- a/gtk/service_response_time_table.c
+++ b/gtk/service_response_time_table.c
@@ -3,7 +3,7 @@
* Helper routines common to all service response time statistics
* tap.
*
- * $Id: service_response_time_table.c,v 1.19 2004/06/02 07:12:11 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/service_response_time_table.h b/gtk/service_response_time_table.h
index f99bb3d527..223c9e8998 100644
--- a/gtk/service_response_time_table.h
+++ b/gtk/service_response_time_table.h
@@ -3,7 +3,7 @@
* Helper routines common to all service response time statistics
* tap.
*
- * $Id: service_response_time_table.h,v 1.4 2004/06/05 12:12:13 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c
index 64f81b0caf..a602a60e1b 100644
--- a/gtk/simple_dialog.c
+++ b/gtk/simple_dialog.c
@@ -1,7 +1,7 @@
/* simple_dialog.c
* Simple message dialog box routines.
*
- * $Id: simple_dialog.c,v 1.40 2004/07/13 07:15:45 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c
index 3d68fdc244..6e37ffca44 100644
--- a/gtk/sip_stat.c
+++ b/gtk/sip_stat.c
@@ -1,7 +1,7 @@
/* sip_stat.c
* sip_stat 2004 Martin Mathieson
*
- * $Id: sip_stat.c,v 1.6 2004/05/23 23:24:06 ulfl Exp $
+ * $Id$
* Copied from http_stat.c
*
* Ethereal - Network traffic analyzer
diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index 06ddd5d426..2463b0152e 100644
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.c
@@ -1,7 +1,7 @@
/* smb_stat.c
* smb_stat 2003 Ronnie Sahlberg
*
- * $Id: smb_stat.c,v 1.45 2004/06/02 07:12:11 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c
index d3f3874087..bac2ebfac1 100644
--- a/gtk/stream_prefs.c
+++ b/gtk/stream_prefs.c
@@ -1,7 +1,7 @@
/* stream_prefs.c
* Dialog boxes for preferences for the stream window
*
- * $Id: stream_prefs.c,v 1.20 2004/03/11 00:22:41 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/stream_prefs.h b/gtk/stream_prefs.h
index 94a486e7ad..0e934d68ea 100644
--- a/gtk/stream_prefs.h
+++ b/gtk/stream_prefs.h
@@ -1,7 +1,7 @@
/* stream_prefs.h
* Definitions for stream preferences window
*
- * $Id: stream_prefs.h,v 1.7 2004/06/04 20:05:31 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c
index 13357c98bb..71dcd55cbb 100644
--- a/gtk/summary_dlg.c
+++ b/gtk/summary_dlg.c
@@ -1,7 +1,7 @@
/* summary_dlg.c
* Routines for capture file summary window
*
- * $Id: summary_dlg.c,v 1.35 2004/06/18 20:23:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/summary_dlg.h b/gtk/summary_dlg.h
index 840d4d0109..3b33cd0804 100644
--- a/gtk/summary_dlg.h
+++ b/gtk/summary_dlg.h
@@ -1,7 +1,7 @@
/* summary_dlg.h
* Routines for capture file summary window
*
- * $Id: summary_dlg.h,v 1.3 2004/06/02 22:13:04 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/supported_protos_dlg.c b/gtk/supported_protos_dlg.c
index 29991eaffd..046528eeaf 100644
--- a/gtk/supported_protos_dlg.c
+++ b/gtk/supported_protos_dlg.c
@@ -2,7 +2,7 @@
*
* Laurent Deniel <laurent.deniel@free.fr>
*
- * $Id: supported_protos_dlg.c,v 1.12 2004/06/17 16:35:25 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/supported_protos_dlg.h b/gtk/supported_protos_dlg.h
index 360c39fed8..ef9dd8bd37 100644
--- a/gtk/supported_protos_dlg.h
+++ b/gtk/supported_protos_dlg.h
@@ -2,7 +2,7 @@
*
* Laurent Deniel <laurent.deniel@free.fr>
*
- * $Id: supported_protos_dlg.h,v 1.3 2004/06/02 22:13:04 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index 06f770b8f5..61ad674808 100644
--- a/gtk/tap_dfilter_dlg.c
+++ b/gtk/tap_dfilter_dlg.c
@@ -2,7 +2,7 @@
* Routines for display filter dialog used by gui taps
* Copyright 2003 Lars Roland
*
- * $Id: tap_dfilter_dlg.c,v 1.10 2004/06/02 07:12:11 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/tap_dfilter_dlg.h b/gtk/tap_dfilter_dlg.h
index b11645a0ca..331d003214 100644
--- a/gtk/tap_dfilter_dlg.h
+++ b/gtk/tap_dfilter_dlg.h
@@ -2,7 +2,7 @@
* Header file for display filter dialog used by GTK gui taps
* Copyright 2003 Lars Roland
*
- * $Id: tap_dfilter_dlg.h,v 1.3 2004/06/02 22:13:04 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/tap_menu.h b/gtk/tap_menu.h
index e4820e4fd8..0a4aefd723 100644
--- a/gtk/tap_menu.h
+++ b/gtk/tap_menu.h
@@ -1,7 +1,7 @@
/* tap_menu.h
* Menu definitions for use by taps
*
- * $Id: tap_menu.h,v 1.6 2004/06/03 02:14:14 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index fc893ecf8f..446a525c01 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -3,7 +3,7 @@
* By Pavel Mores <pvl@uh.cz>
* Win32 port: rwh@unifiedtech.com
*
- * $Id: tcp_graph.c,v 1.64 2004/06/17 16:35:25 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/text_page.c b/gtk/text_page.c
index cdc7b433c5..5bdb519b45 100644
--- a/gtk/text_page.c
+++ b/gtk/text_page.c
@@ -1,6 +1,6 @@
/* text_page.c
*
- * $Id: text_page.c,v 1.3 2004/06/17 16:35:26 ulfl Exp $
+ * $Id$
*
* Ulf Lamping
*
diff --git a/gtk/text_page.h b/gtk/text_page.h
index d21c3e93b2..893d371cc7 100644
--- a/gtk/text_page.h
+++ b/gtk/text_page.h
@@ -1,7 +1,7 @@
/* text_page.h
* Declarations of routine to construct a simple text page from a file.
*
- * $Id: text_page.h,v 1.4 2004/06/05 09:57:11 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 209de0af68..81e8b62bf0 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -2,7 +2,7 @@
* The main toolbar
* Copyright 2003, Ulf Lamping <ulf.lamping@web.de>
*
- * $Id: toolbar.c,v 1.29 2004/07/13 07:15:45 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/toolbar.h b/gtk/toolbar.h
index b6833c4b4d..ad01fe4ab2 100644
--- a/gtk/toolbar.h
+++ b/gtk/toolbar.h
@@ -2,7 +2,7 @@
* Definitions for toolbar utility routines
* Copyright 2003, Ulf Lamping <ulf.lamping@web.de>
*
- * $Id: toolbar.h,v 1.9 2004/06/04 17:16:58 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/ui_util.c b/gtk/ui_util.c
index 7fb8864e25..8132f9174e 100644
--- a/gtk/ui_util.c
+++ b/gtk/ui_util.c
@@ -1,7 +1,7 @@
/* ui_util.c
* UI utility routines
*
- * $Id: ui_util.c,v 1.29 2004/07/07 05:36:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/ui_util.h b/gtk/ui_util.h
index 4100ece8c3..9ac69a2e89 100644
--- a/gtk/ui_util.h
+++ b/gtk/ui_util.h
@@ -1,7 +1,7 @@
/* ui_util.h
* Definitions for UI utility routines
*
- * $Id: ui_util.h,v 1.16 2004/07/07 05:36:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/webbrowser.h b/gtk/webbrowser.h
index 1b8348d5c8..7765f0b127 100644
--- a/gtk/webbrowser.h
+++ b/gtk/webbrowser.h
@@ -1,7 +1,7 @@
/* webbrowser.h
* Web browser activation functions
*
- * $Id: webbrowser.h,v 1.3 2004/07/01 09:35:33 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index a3a3713144..3809208584 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -1,7 +1,7 @@
/* wsp_stat.c
* wsp_stat 2003 Jean-Michel FAYARD
*
- * $Id: wsp_stat.c,v 1.27 2004/05/23 23:24:07 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/h225-persistentdata.c b/h225-persistentdata.c
index 40b5607a5b..2c64a6a2e5 100755
--- a/h225-persistentdata.c
+++ b/h225-persistentdata.c
@@ -5,7 +5,7 @@
*
* Copyright 2003 Lars Roland
*
- * $Id: h225-persistentdata.c,v 1.1 2003/11/16 23:11:18 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/h225-persistentdata.h b/h225-persistentdata.h
index 061978a51d..aed7972c5f 100755
--- a/h225-persistentdata.h
+++ b/h225-persistentdata.h
@@ -5,7 +5,7 @@
*
* Copyright 2003 Lars Roland
*
- * $Id: h225-persistentdata.h,v 1.1 2003/11/16 23:11:18 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/help/Makefile.am b/help/Makefile.am
index 3bfde55d82..694b0c9daf 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal help files
#
-# $Id: Makefile.am,v 1.6 2004/02/09 18:22:28 ulfl Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/help/Makefile.nmake b/help/Makefile.nmake
index d820ddceb4..8ec24259ef 100644
--- a/help/Makefile.nmake
+++ b/help/Makefile.nmake
@@ -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.2 2003/12/22 08:07:13 ulfl Exp $
+# $Id$
include ..\config.nmake
diff --git a/iax2_codec_type.h b/iax2_codec_type.h
index 460b6e5bc1..c373a35bf8 100644
--- a/iax2_codec_type.h
+++ b/iax2_codec_type.h
@@ -1,7 +1,7 @@
/* iax2_codec_type.h
* Defines IAX2 codec types
*
- * $Id: iax2_codec_type.h,v 1.1 2004/06/25 06:31:46 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/idl2eth.sh b/idl2eth.sh
index 6b4a4a666f..4e67881f7b 100644
--- a/idl2eth.sh
+++ b/idl2eth.sh
@@ -1,6 +1,6 @@
#! @SHELL@
#
-# $Id: idl2eth.sh,v 1.1 2001/09/15 23:01:12 guy Exp $
+# $Id$
#
# File : idl2eth
#
diff --git a/image/Makefile.nmake b/image/Makefile.nmake
index dc15d9afad..8836313de9 100644
--- a/image/Makefile.nmake
+++ b/image/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.6 2003/10/10 21:31:48 guy Exp $
+# $Id$
#
include ..\config.nmake
diff --git a/in_cksum.c b/in_cksum.c
index 4bf224e6a9..e52ffae411 100644
--- a/in_cksum.c
+++ b/in_cksum.c
@@ -2,7 +2,7 @@
* 4.4-Lite-2 Internet checksum routine, modified to take a vector of
* pointers/lengths giving the pieces to be checksummed.
*
- * $Id: in_cksum.c,v 1.9 2002/08/28 21:00:06 jmayer Exp $
+ * $Id$
*/
/*
diff --git a/in_cksum.h b/in_cksum.h
index 66cbcc4a91..53b274976f 100644
--- a/in_cksum.h
+++ b/in_cksum.h
@@ -1,7 +1,7 @@
/* in_cksum.h
* Declaration of Internet checksum routine.
*
- * $Id: in_cksum.h,v 1.1 2000/12/13 02:24:22 guy Exp $
+ * $Id$
*/
typedef struct {
diff --git a/ip_opts.h b/ip_opts.h
index 68fa85342c..afe1197adc 100644
--- a/ip_opts.h
+++ b/ip_opts.h
@@ -2,7 +2,7 @@
* Definitions of structures and routines for dissection of options that
* work like IPv4 or IPv6 options
*
- * $Id: ip_opts.h,v 1.1 2003/07/11 09:30:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/ipproto.c b/ipproto.c
index a6f145a798..e4f81f8ae2 100644
--- a/ipproto.c
+++ b/ipproto.c
@@ -1,7 +1,7 @@
/* ipproto.c
* Routines for converting IPv4 protocol/v6 nxthdr field into string
*
- * $Id: ipproto.c,v 1.24 2003/11/24 21:42:13 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/ipproto.h b/ipproto.h
index 8b8e7de534..d48493b2b8 100644
--- a/ipproto.h
+++ b/ipproto.h
@@ -2,7 +2,7 @@
* Declarations of IP protocol numbers, and of routines for converting
* IP protocol numbers into strings.
*
- * $Id: ipproto.h,v 1.13 2003/11/25 00:21:06 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/isprint.h b/isprint.h
index 7f47ad5e83..85a23b6b43 100644
--- a/isprint.h
+++ b/isprint.h
@@ -2,7 +2,7 @@
* Temporary redefinition of "isprint()" to cope with GTK+ 1.3 and
* later using UTF-8 strings
*
- * $Id: isprint.h,v 1.1 2004/07/09 23:17:02 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/lapd_sapi.h b/lapd_sapi.h
index 7a401e5f57..7fe486dee5 100644
--- a/lapd_sapi.h
+++ b/lapd_sapi.h
@@ -1,7 +1,7 @@
/* lapd_sapi.h
* Declarations of LAPD SAPI values.
*
- * $Id: lapd_sapi.h,v 1.1 2004/01/26 20:48:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/llcsaps.h b/llcsaps.h
index 4a0a0d663d..43b336d144 100644
--- a/llcsaps.h
+++ b/llcsaps.h
@@ -1,7 +1,7 @@
/* llcsaps.h
* Defines LLC SAP values.
*
- * $Id: llcsaps.h,v 1.7 2003/06/10 05:38:52 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/make-authors-short.pl b/make-authors-short.pl
index 9601e2910a..51fd6fc0c9 100755
--- a/make-authors-short.pl
+++ b/make-authors-short.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
-# $Id: make-authors-short.pl,v 1.3 2004/05/22 14:05:33 jmayer Exp $
+# $Id$
# Remove tasks from individual author entries from AUTHORS file
# for use in the about dialog.
diff --git a/make-faq b/make-faq
index 5d5abcaed0..a4e8d9084f 100755
--- a/make-faq
+++ b/make-faq
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: make-faq,v 1.8 2004/02/18 00:31:22 jmayer Exp $
+# $Id$
#
# Make-faq - Creates a plain text version of the Ethereal FAQ
# from http://www.ethereal.com/faq.html
diff --git a/make-manuf b/make-manuf
index 4a00dbb98b..7232118153 100755
--- a/make-manuf
+++ b/make-manuf
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
#
-# $Id: make-manuf,v 1.13 2004/02/01 02:26:30 jmayer Exp $
+# $Id$
#
# Make-manuf - Creates a file containing ethernet OUIs and their
# company IDs. It merges the databases at
diff --git a/make-reg-dotc b/make-reg-dotc
index 47cc31732a..a90019af05 100755
--- a/make-reg-dotc
+++ b/make-reg-dotc
@@ -1,7 +1,7 @@
#! /bin/sh
#
-# $Id: make-reg-dotc,v 1.8 2004/05/03 18:53:16 guy Exp $
+# $Id$
#
#
diff --git a/make-reg-dotc.py b/make-reg-dotc.py
index 503e1060c5..5c1411cb9c 100755
--- a/make-reg-dotc.py
+++ b/make-reg-dotc.py
@@ -9,7 +9,7 @@
# seds for each input file. I wrote this python version so that
# less processes would have to be started.
#
-# $Id: make-reg-dotc.py,v 1.4 2003/07/21 07:05:44 girlich Exp $
+# $Id$
import os
import sys
diff --git a/make-tapreg-dotc b/make-tapreg-dotc
index f2acb5994d..aa5e6931ea 100755
--- a/make-tapreg-dotc
+++ b/make-tapreg-dotc
@@ -1,7 +1,7 @@
#! /bin/sh
#
-# $Id: make-tapreg-dotc,v 1.4 2004/05/03 18:53:57 guy Exp $
+# $Id$
#
#
diff --git a/make-version.pl b/make-version.pl
index 58b5fd34df..93d0f5ceb3 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -2,7 +2,7 @@
#
# Copyright 2004 Jörg Mayer (see AUTHORS file)
#
-# $Id: make-version.pl,v 1.7 2004/03/04 16:19:40 jmayer Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/manuf b/manuf
index 8d5d402337..24ab82aaf3 100644
--- a/manuf
+++ b/manuf
@@ -1,7 +1,7 @@
#
# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
#
-# $Id: manuf,v 1.43 2004/06/18 14:27:13 jmayer Exp $
+# $Id$
#
# Laurent Deniel <laurent.deniel [AT] free.fr>
#
@@ -7600,7 +7600,7 @@ EC:10:00 EnanceSour # Enance Source Co., Ltd. PC clones(?)
#
# Well-known addresses.
#
-# $Id: manuf,v 1.43 2004/06/18 14:27:13 jmayer Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald [AT] ethereal.com>
diff --git a/manuf.tmpl b/manuf.tmpl
index 41cea30e37..faffd2c9a5 100644
--- a/manuf.tmpl
+++ b/manuf.tmpl
@@ -1,7 +1,7 @@
#
# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
#
-# $Id: manuf.tmpl,v 1.14 2003/04/29 23:58:00 jmayer Exp $
+# $Id$
#
# Laurent Deniel <laurent.deniel [AT] free.fr>
#
diff --git a/menu.h b/menu.h
index 9ee8247ea5..dc95178210 100644
--- a/menu.h
+++ b/menu.h
@@ -2,7 +2,7 @@
* Definitions for menu routines with toolkit-independent APIs but
* toolkit-dependent implementations.
*
- * $Id: menu.h,v 1.12 2003/12/13 18:01:29 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/merge.c b/merge.c
index 33a12e1637..ac46050042 100644
--- a/merge.c
+++ b/merge.c
@@ -1,6 +1,6 @@
/* Combine two dump files, either by appending or by merging by timestamp
*
- * $Id: merge.c,v 1.6 2004/06/29 20:59:23 ulfl Exp $
+ * $Id$
*
* Written by Scott Renfro <scott@renfro.org> based on
* editcap by Richard Sharpe and Guy Harris
diff --git a/merge.h b/merge.h
index 933333c146..398a9fa8fd 100644
--- a/merge.h
+++ b/merge.h
@@ -2,7 +2,7 @@
* Definitions for menu routines with toolkit-independent APIs but
* toolkit-dependent implementations.
*
- * $Id: merge.h,v 1.4 2004/06/29 20:59:23 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/mergecap.c b/mergecap.c
index 88f7c732a4..07552bc121 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -1,6 +1,6 @@
/* Combine two dump files, either by appending or by merging by timestamp
*
- * $Id: mergecap.c,v 1.26 2004/07/13 05:58:15 guy Exp $
+ * $Id$
*
* Written by Scott Renfro <scott@renfro.org> based on
* editcap by Richard Sharpe and Guy Harris
diff --git a/mkcap.c b/mkcap.c
index 383d532ac9..0a912e402a 100644
--- a/mkcap.c
+++ b/mkcap.c
@@ -2,7 +2,7 @@
* A small program to generate the ASCII form of a capture with TCP
* segments of a reasonable nature. The payload is all zeros.
*
- * $Id: mkcap.c,v 1.2 2003/10/05 14:58:11 sharpe Exp $
+ * $Id$
*
* By Ronnie Sahlberg and Richard Sharpe. From a program initially
* written by Ronnie.
diff --git a/ncp2222.py b/ncp2222.py
index c992768b39..b341510745 100755
--- a/ncp2222.py
+++ b/ncp2222.py
@@ -25,7 +25,7 @@ http://developer.novell.com/ndk/doc/ncp/
for a badly-formatted HTML version of the same PDF.
-$Id: ncp2222.py,v 1.65 2004/06/15 09:14:14 guy Exp $
+$Id$
Portions Copyright (c) 2000-2002 by Gilbert Ramirez <gram@alumni.rice.edu>.
diff --git a/nlpid.h b/nlpid.h
index 66347e16f7..0b9370d9bf 100644
--- a/nlpid.h
+++ b/nlpid.h
@@ -2,7 +2,7 @@
* Definitions of OSI NLPIDs (Network Layer Protocol IDs)
* Laurent Deniel <laurent.deniel@free.fr>
*
- * $Id: nlpid.h,v 1.14 2003/09/03 05:39:21 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/oui.h b/oui.h
index 724f2fa9e4..5aea27a11f 100644
--- a/oui.h
+++ b/oui.h
@@ -1,7 +1,7 @@
/* oui.h
* Definitions of OUIs
*
- * $Id: oui.h,v 1.13 2003/08/28 00:11:31 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 4748a599b9..fd2ed07fa6 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.42 2004/05/23 22:21:30 guy Exp $
+# $Id$
#
# NSIS is a free packager/installer/uninstaller program for Win32.
# It was originally written for the Winamp package, but various
diff --git a/packet-3g-a11.c b/packet-3g-a11.c
index 6a28006ace..b6730088ef 100644
--- a/packet-3g-a11.c
+++ b/packet-3g-a11.c
@@ -8,7 +8,7 @@
* Routines for Mobile IP dissection
* Copyright 2000, Stefan Raab <sraab@cisco.com>
*
- * $Id: packet-3g-a11.c,v 1.9 2004/05/12 09:29:34 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aarp.c b/packet-aarp.c
index fa0aa223c1..9c68873009 100644
--- a/packet-aarp.c
+++ b/packet-aarp.c
@@ -1,7 +1,7 @@
/* packet-aarp.c
* Routines for Appletalk ARP packet disassembly
*
- * $Id: packet-aarp.c,v 1.37 2002/08/28 21:00:06 jmayer Exp $
+ * $Id$
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
diff --git a/packet-acap.c b/packet-acap.c
index 0c414c1f30..aee315dd2c 100644
--- a/packet-acap.c
+++ b/packet-acap.c
@@ -3,7 +3,7 @@
* Copyright 2003, Brad Hards <bradh@frogmouth.net>
* Heavily based in packet-imap.c, Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-acap.c,v 1.2 2003/06/11 20:04:13 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-acse.c b/packet-acse.c
index f44c3574dc..f7a4ed7e2e 100644
--- a/packet-acse.c
+++ b/packet-acse.c
@@ -2,7 +2,7 @@
*
* Routine to dissect OSI ACSE Protocol packets
*
-* $Id: packet-acse.c,v 1.5 2004/04/30 06:24:35 ulfl Exp $
+* $Id$
*
* Yuriy Sidelnikov <YSidelnikov@hotmail.com>
*
diff --git a/packet-acse.h b/packet-acse.h
index 747297f102..d5cb006b67 100644
--- a/packet-acse.h
+++ b/packet-acse.h
@@ -2,7 +2,7 @@
*
* Routine to dissect OSI ISO/IEC 10035-1 ACSE Protocol packets
*
-* $Id: packet-acse.h,v 1.2 2004/01/24 01:30:20 jmayer Exp $
+* $Id$
*
* Yuriy Sidelnikov <YSidelnikov@hotmail.com>
*
diff --git a/packet-afp.c b/packet-afp.c
index 6e60ddb493..e0e50c48b4 100644
--- a/packet-afp.c
+++ b/packet-afp.c
@@ -2,7 +2,7 @@
* Routines for afp packet dissection
* Copyright 2002, Didier Gautheron <dgautheron@magic.fr>
*
- * $Id: packet-afp.c,v 1.36 2004/02/25 23:15:23 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-afp.h b/packet-afp.h
index 50d3015458..1ab90f5992 100644
--- a/packet-afp.h
+++ b/packet-afp.h
@@ -1,7 +1,7 @@
/* packet-afp.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet-afp.h,v 1.5 2002/10/17 22:38:19 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-afs-defs.h b/packet-afs-defs.h
index 69e88fcef9..913b43839e 100644
--- a/packet-afs-defs.h
+++ b/packet-afs-defs.h
@@ -8,7 +8,7 @@
* Portions based on information/specs retrieved from the OpenAFS sources at
* www.openafs.org, Copyright IBM.
*
- * $Id: packet-afs-defs.h,v 1.14 2004/05/11 14:21:48 nneul Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-afs-macros.h b/packet-afs-macros.h
index 5b66b41b10..0f84032b4b 100644
--- a/packet-afs-macros.h
+++ b/packet-afs-macros.h
@@ -8,7 +8,7 @@
* Portions based on information/specs retrieved from the OpenAFS sources at
* www.openafs.org, Copyright IBM.
*
- * $Id: packet-afs-macros.h,v 1.24 2004/05/11 14:21:48 nneul Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-afs-register-info.h b/packet-afs-register-info.h
index eb736117f4..7b3d116c52 100644
--- a/packet-afs-register-info.h
+++ b/packet-afs-register-info.h
@@ -8,7 +8,7 @@
* Portions based on information/specs retrieved from the OpenAFS sources at
* www.openafs.org, Copyright IBM.
*
- * $Id: packet-afs-register-info.h,v 1.20 2004/05/11 14:21:48 nneul Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-afs.c b/packet-afs.c
index 1f2c114435..2292e45bc2 100644
--- a/packet-afs.c
+++ b/packet-afs.c
@@ -8,7 +8,7 @@
* Portions based on information/specs retrieved from the OpenAFS sources at
* www.openafs.org, Copyright IBM.
*
- * $Id: packet-afs.c,v 1.57 2004/05/11 14:21:48 nneul Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-afs.h b/packet-afs.h
index 4ea7f73543..6569b08c9b 100644
--- a/packet-afs.h
+++ b/packet-afs.h
@@ -1,7 +1,7 @@
/* packet-afs.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet-afs.h,v 1.8 2004/05/11 14:21:48 nneul Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-admin.c b/packet-aim-admin.c
index 07d6940791..5a347bff5d 100644
--- a/packet-aim-admin.c
+++ b/packet-aim-admin.c
@@ -2,7 +2,7 @@
* Routines for AIM (OSCAR) dissection, Administration Service
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim-admin.c,v 1.3 2004/04/26 18:21:09 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-adverts.c b/packet-aim-adverts.c
index 3a0cfa708a..a0fc9a4663 100644
--- a/packet-aim-adverts.c
+++ b/packet-aim-adverts.c
@@ -2,7 +2,7 @@
* Routines for AIM (OSCAR) dissection, SNAC Advertisements
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim-adverts.c,v 1.4 2004/04/26 18:21:09 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-bos.c b/packet-aim-bos.c
index 7379ee12e8..69db5c4fb5 100644
--- a/packet-aim-bos.c
+++ b/packet-aim-bos.c
@@ -2,7 +2,7 @@
* Routines for AIM (OSCAR) dissection, SNAC BOS
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim-bos.c,v 1.4 2004/05/05 09:30:56 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-buddylist.c b/packet-aim-buddylist.c
index c2ee5150a0..2a2cbe2bda 100644
--- a/packet-aim-buddylist.c
+++ b/packet-aim-buddylist.c
@@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Buddylist
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim-buddylist.c,v 1.4 2004/06/16 07:51:21 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-chat.c b/packet-aim-chat.c
index 6b09a2e038..31905827c2 100644
--- a/packet-aim-chat.c
+++ b/packet-aim-chat.c
@@ -3,7 +3,7 @@
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
* Copyright 2000, Ralf Hoelzer <ralf@well.com>
*
- * $Id: packet-aim-chat.c,v 1.5 2004/06/16 07:51:21 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-chatnav.c b/packet-aim-chatnav.c
index 0bf22ce702..d7cb30704c 100644
--- a/packet-aim-chatnav.c
+++ b/packet-aim-chatnav.c
@@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim-chatnav.c,v 1.4 2004/04/20 04:48:31 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-directory.c b/packet-aim-directory.c
index 01ea232073..ea9d064d9f 100644
--- a/packet-aim-directory.c
+++ b/packet-aim-directory.c
@@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Directory
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim-directory.c,v 1.4 2004/04/26 18:21:09 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-generic.c b/packet-aim-generic.c
index c4b557b31e..caefda6428 100644
--- a/packet-aim-generic.c
+++ b/packet-aim-generic.c
@@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Family Generic
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim-generic.c,v 1.3 2004/04/26 18:21:09 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-icq.c b/packet-aim-icq.c
index 0481c00b3a..6fc357b2cd 100644
--- a/packet-aim-icq.c
+++ b/packet-aim-icq.c
@@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection, SNAC ICQ
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim-icq.c,v 1.5 2004/04/26 18:21:09 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-invitation.c b/packet-aim-invitation.c
index cbb1277546..26b468d317 100644
--- a/packet-aim-invitation.c
+++ b/packet-aim-invitation.c
@@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Invitation
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim-invitation.c,v 1.4 2004/04/26 18:21:09 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-location.c b/packet-aim-location.c
index b083ec1912..44da9d81a5 100644
--- a/packet-aim-location.c
+++ b/packet-aim-location.c
@@ -3,7 +3,7 @@
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
* Copyright 2000, Ralf Hoelzer <ralf@well.com>
*
- * $Id: packet-aim-location.c,v 1.4 2004/04/26 18:21:09 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-messaging.c b/packet-aim-messaging.c
index 615a2f0e4b..15522ea6c9 100644
--- a/packet-aim-messaging.c
+++ b/packet-aim-messaging.c
@@ -4,7 +4,7 @@
* Copyright 2000, Ralf Hoelzer <ralf@well.com>
* Copyright 2004, Devin Heitmueller <dheitmueller@netilla.com>
*
- * $Id: packet-aim-messaging.c,v 1.11 2004/06/16 07:51:21 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-oft.c b/packet-aim-oft.c
index 0dff1bb512..a4c8ded9f0 100644
--- a/packet-aim-oft.c
+++ b/packet-aim-oft.c
@@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim-oft.c,v 1.5 2004/04/20 05:32:46 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-popup.c b/packet-aim-popup.c
index d47da76ed1..8aad38fd25 100644
--- a/packet-aim-popup.c
+++ b/packet-aim-popup.c
@@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim-popup.c,v 1.4 2004/04/26 18:21:10 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-signon.c b/packet-aim-signon.c
index 95b100674a..e068de9e0f 100644
--- a/packet-aim-signon.c
+++ b/packet-aim-signon.c
@@ -3,7 +3,7 @@
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
* Copyright 2000, Ralf Hoelzer <ralf@well.com>
*
- * $Id: packet-aim-signon.c,v 1.4 2004/06/16 07:51:21 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-ssi.c b/packet-aim-ssi.c
index a09e942e5c..18e0faa662 100644
--- a/packet-aim-ssi.c
+++ b/packet-aim-ssi.c
@@ -3,7 +3,7 @@
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
* Copyright 2000, Ralf Hoelzer <ralf@well.com>
*
- * $Id: packet-aim-ssi.c,v 1.3 2004/04/26 18:21:10 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-stats.c b/packet-aim-stats.c
index c3d7e2a757..2a5da29b2d 100644
--- a/packet-aim-stats.c
+++ b/packet-aim-stats.c
@@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Stats
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim-stats.c,v 1.3 2004/03/24 06:36:32 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-translate.c b/packet-aim-translate.c
index b6dd0bef59..dbf1f193c8 100644
--- a/packet-aim-translate.c
+++ b/packet-aim-translate.c
@@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Translate
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim-translate.c,v 1.5 2004/04/26 18:21:10 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim-userlookup.c b/packet-aim-userlookup.c
index 82e8f3d790..ebf7c95531 100644
--- a/packet-aim-userlookup.c
+++ b/packet-aim-userlookup.c
@@ -2,7 +2,7 @@
* Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Userlookup
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim-userlookup.c,v 1.3 2004/04/26 18:21:10 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim.c b/packet-aim.c
index 461ef6eac9..7a1d9b5e94 100644
--- a/packet-aim.c
+++ b/packet-aim.c
@@ -4,7 +4,7 @@
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
* Copyright 2004, Devin Heitmueller <dheitmueller@netilla.com>
*
- * $Id: packet-aim.c,v 1.44 2004/07/09 23:17:02 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-aim.h b/packet-aim.h
index b9800ed54e..5848aba9c0 100644
--- a/packet-aim.h
+++ b/packet-aim.h
@@ -1,7 +1,7 @@
/* packet-tcp.h
* Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
*
- * $Id: packet-aim.h,v 1.6 2004/06/03 04:19:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ajp13.c b/packet-ajp13.c
index 24d2e9c738..3fe267b0da 100644
--- a/packet-ajp13.c
+++ b/packet-ajp13.c
@@ -2,7 +2,7 @@
* Routines for AJP13 dissection
* Copyright 2002, Christopher K. St. John <cks@distributopia.com>
*
- * $Id: packet-ajp13.c,v 1.10 2003/03/26 21:47:34 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-alcap.c b/packet-alcap.c
index 3cfeb7ecb6..92a4eb11c1 100644
--- a/packet-alcap.c
+++ b/packet-alcap.c
@@ -6,7 +6,7 @@
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>
* In association with Telos Technology Inc.
*
- * $Id: packet-alcap.c,v 1.5 2003/12/08 23:40:11 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ans.c b/packet-ans.c
index e0b992808b..bd2c791d99 100644
--- a/packet-ans.c
+++ b/packet-ans.c
@@ -1,7 +1,7 @@
/* packet-ans.c
* Routines for Intel ANS probe dissection
*
- * $Id: packet-ans.c,v 1.1 2003/03/23 19:32:19 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ansi_637.c b/packet-ansi_637.c
index 9bec802790..8285ed698f 100644
--- a/packet-ansi_637.c
+++ b/packet-ansi_637.c
@@ -9,7 +9,7 @@
* Short Message Service
* 3GPP2 C.S0015-0 TIA/EIA-637-A
*
- * $Id: packet-ansi_637.c,v 1.5 2003/12/09 00:52:02 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ansi_683.c b/packet-ansi_683.c
index 7e7196467e..0cecfa7a93 100644
--- a/packet-ansi_683.c
+++ b/packet-ansi_683.c
@@ -4,7 +4,7 @@
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>
* In association with Telos Technology Inc.
*
- * $Id: packet-ansi_683.c,v 1.4 2003/12/08 23:40:12 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ansi_801.c b/packet-ansi_801.c
index 371f312ee6..0dc32b518a 100644
--- a/packet-ansi_801.c
+++ b/packet-ansi_801.c
@@ -10,7 +10,7 @@
* Copyright 2004, Michael Lum <mlum [AT] telostech.com>
* In association with Telos Technology Inc.
*
- * $Id: packet-ansi_801.c,v 1.1 2004/03/27 11:32:27 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ansi_a.c b/packet-ansi_a.c
index 648b466251..bc4884c05b 100644
--- a/packet-ansi_a.c
+++ b/packet-ansi_a.c
@@ -10,7 +10,7 @@
* 2000 Access Network Interfaces
* 3GPP2 A.S0001-1 TIA/EIA-2001
*
- * $Id: packet-ansi_a.c,v 1.17 2004/05/24 02:25:17 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ansi_a.h b/packet-ansi_a.h
index f3601f77e4..9c49486aff 100644
--- a/packet-ansi_a.h
+++ b/packet-ansi_a.h
@@ -1,6 +1,6 @@
/* packet-ansi_a.h
*
- * $Id: packet-ansi_a.h,v 1.4 2004/05/09 10:03:37 guy Exp $
+ * $Id$
*
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
diff --git a/packet-ansi_map.c b/packet-ansi_map.c
index 95d662acb3..3cc58ede94 100644
--- a/packet-ansi_map.c
+++ b/packet-ansi_map.c
@@ -79,7 +79,7 @@
* UIM
* 3GPP2 N.S0003
*
- * $Id: packet-ansi_map.c,v 1.15 2004/04/21 05:53:55 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ansi_map.h b/packet-ansi_map.h
index 6b3d1e5e80..db7e4e9f79 100644
--- a/packet-ansi_map.h
+++ b/packet-ansi_map.h
@@ -1,6 +1,6 @@
/* packet-ansi_map.h
*
- * $Id: packet-ansi_map.h,v 1.3 2004/05/09 10:03:37 guy Exp $
+ * $Id$
*
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
diff --git a/packet-aodv.c b/packet-aodv.c
index 2a44a4e7b1..b262dccc79 100644
--- a/packet-aodv.c
+++ b/packet-aodv.c
@@ -2,7 +2,7 @@
* Routines for AODV dissection
* Copyright 2000, Erik Nordström <erik.nordstrom@it.uu.se>
*
- * $Id: packet-aodv.c,v 1.10 2003/09/13 00:57:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ap1394.c b/packet-ap1394.c
index 6f9f00002c..9560391eaa 100644
--- a/packet-ap1394.c
+++ b/packet-ap1394.c
@@ -1,7 +1,7 @@
/* packet-ap1394.c
* Routines for Apple IP-over-IEEE 1394 packet disassembly
*
- * $Id: packet-ap1394.c,v 1.1 2004/03/23 01:02:40 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ap1394.h b/packet-ap1394.h
index 55e6ac3810..f8f8cbc0ab 100644
--- a/packet-ap1394.h
+++ b/packet-ap1394.h
@@ -1,6 +1,6 @@
/* packet-ap1394.h
*
- * $Id: packet-ap1394.h,v 1.1 2004/03/23 01:02:40 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-arcnet.c b/packet-arcnet.c
index 3a73c7d8dc..9fe970b3e0 100644
--- a/packet-arcnet.c
+++ b/packet-arcnet.c
@@ -2,7 +2,7 @@
* Routines for arcnet dissection
* Copyright 2001-2002, Peter Fales <ethereal@fales-lorenz.net>
*
- * $Id: packet-arcnet.c,v 1.11 2003/12/19 19:09:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-arcnet.h b/packet-arcnet.h
index d1334ca0be..7047671e51 100644
--- a/packet-arcnet.h
+++ b/packet-arcnet.h
@@ -1,6 +1,6 @@
/* packet-arcnet.h
*
- * $Id: packet-arcnet.h,v 1.2 2003/01/23 09:04:54 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-arp.c b/packet-arp.c
index f7cb74063c..a0e5153e13 100644
--- a/packet-arp.c
+++ b/packet-arp.c
@@ -1,7 +1,7 @@
/* packet-arp.c
* Routines for ARP packet disassembly (RFC 826)
*
- * $Id: packet-arp.c,v 1.60 2004/06/17 20:04:53 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-arp.h b/packet-arp.h
index b20bb48e16..782ac7fbf5 100644
--- a/packet-arp.h
+++ b/packet-arp.h
@@ -2,7 +2,7 @@
* Definitions of routines for ARP packet disassembly that are used
* elsewhere
*
- * $Id: packet-arp.h,v 1.6 2002/08/28 21:00:07 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-asap.c b/packet-asap.c
index 4697c7fdcc..d06aef7434 100644
--- a/packet-asap.c
+++ b/packet-asap.c
@@ -6,7 +6,7 @@
*
* Copyright 2004, Michael Tuexen <tuexen [AT] fh-muenster.de>
*
- * $Id: packet-asap.c,v 1.12 2004/07/03 21:37:15 tuexen Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ascend.c b/packet-ascend.c
index 56d4412512..1c3caa7f8d 100644
--- a/packet-ascend.c
+++ b/packet-ascend.c
@@ -1,7 +1,7 @@
/* packet-ascend.c
* Routines for decoding Lucent/Ascend packet traces
*
- * $Id: packet-ascend.c,v 1.32 2002/08/28 21:00:07 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-asf.c b/packet-asf.c
index b9097e594b..db0b534d18 100644
--- a/packet-asf.c
+++ b/packet-asf.c
@@ -3,7 +3,7 @@
*
* Duncan Laurie <duncan@sun.com>
*
- * $Id: packet-asf.c,v 1.2 2003/06/04 08:51:36 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-atalk.c b/packet-atalk.c
index dab3c9d848..f74520ef27 100644
--- a/packet-atalk.c
+++ b/packet-atalk.c
@@ -2,7 +2,7 @@
* Routines for AppleTalk packet disassembly: LLAP, DDP, NBP, ATP, ASP,
* RTMP.
*
- * $Id: packet-atalk.c,v 1.96 2004/02/25 09:31:05 guy Exp $
+ * $Id$
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
diff --git a/packet-atalk.h b/packet-atalk.h
index add0e83e7d..592dd1948e 100644
--- a/packet-atalk.h
+++ b/packet-atalk.h
@@ -1,7 +1,7 @@
/* packet-atalk.h
* Definitions for Appletalk packet disassembly (DDP, currently).
*
- * $Id: packet-atalk.h,v 1.9 2002/08/28 21:00:07 jmayer Exp $
+ * $Id$
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/packet-atm.c b/packet-atm.c
index 4cd676fd6a..1c2420d6d2 100644
--- a/packet-atm.c
+++ b/packet-atm.c
@@ -1,7 +1,7 @@
/* packet-atm.c
* Routines for ATM packet disassembly
*
- * $Id: packet-atm.c,v 1.66 2004/06/16 23:36:57 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-atm.h b/packet-atm.h
index d10bb783ef..3e60eeeafe 100644
--- a/packet-atm.h
+++ b/packet-atm.h
@@ -1,6 +1,6 @@
/* packet-atm.h
*
- * $Id: packet-atm.h,v 1.9 2002/08/28 21:00:07 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-auto_rp.c b/packet-auto_rp.c
index d6acab5ebf..2bfc62cfcf 100644
--- a/packet-auto_rp.c
+++ b/packet-auto_rp.c
@@ -4,7 +4,7 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-auto_rp.c,v 1.23 2003/01/31 03:17:45 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-bacapp.c b/packet-bacapp.c
index b9f6965eb9..b89a5051c6 100644
--- a/packet-bacapp.c
+++ b/packet-bacapp.c
@@ -2,7 +2,7 @@
* Routines for BACnet (APDU) dissection
* Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
*
- * $Id: packet-bacapp.c,v 1.13 2002/08/28 21:00:07 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-bacnet.c b/packet-bacnet.c
index d96bd0540e..46053b7e5a 100644
--- a/packet-bacnet.c
+++ b/packet-bacnet.c
@@ -2,7 +2,7 @@
* Routines for BACnet (NPDU) dissection
* Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
*
- * $Id: packet-bacnet.c,v 1.18 2004/05/12 19:55:14 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-beep.c b/packet-beep.c
index 8be72383fd..7b02f1ce17 100644
--- a/packet-beep.c
+++ b/packet-beep.c
@@ -1,7 +1,7 @@
/* packet-beep.c
* Routines for BEEP packet disassembly
*
- * $Id: packet-beep.c,v 1.14 2003/12/23 21:18:57 guy Exp $
+ * $Id$
*
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
* Modified 2001 Darren New <dnew@invisible.net> for BEEP.
diff --git a/packet-ber.c b/packet-ber.c
index 7a312e7563..b681b9bdc0 100644
--- a/packet-ber.c
+++ b/packet-ber.c
@@ -2,7 +2,7 @@
* Helpers for ASN.1/BER dissection
* Ronnie Sahlberg (C) 2004
*
- * $Id: packet-ber.c,v 1.13 2004/06/25 09:24:17 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ber.h b/packet-ber.h
index f56a3977cc..5d00016602 100644
--- a/packet-ber.h
+++ b/packet-ber.h
@@ -2,7 +2,7 @@
* Helpers for ASN.1/BER dissection
* Ronnie Sahlberg (C) 2004
*
- * $Id: packet-ber.h,v 1.8 2004/06/05 09:59:45 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-bfd.c b/packet-bfd.c
index 3ebdfbf9a3..50d35d571f 100644
--- a/packet-bfd.c
+++ b/packet-bfd.c
@@ -3,7 +3,7 @@
*
* Copyright 2003, Hannes Gredler <hannes@juniper.net>
*
- * $Id: packet-bfd.c,v 1.1 2003/11/23 22:00:48 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-bgp.c b/packet-bgp.c
index 52dc0fde96..a0b91350f3 100644
--- a/packet-bgp.c
+++ b/packet-bgp.c
@@ -2,7 +2,7 @@
* Routines for BGP packet dissection.
* Copyright 1999, Jun-ichiro itojun Hagino <itojun@itojun.org>
*
- * $Id: packet-bgp.c,v 1.88 2004/05/24 02:25:17 guy Exp $
+ * $Id$
*
* Supports:
* RFC1771 A Border Gateway Protocol 4 (BGP-4)
diff --git a/packet-bgp.h b/packet-bgp.h
index ac5a54fbc9..e92f278a21 100644
--- a/packet-bgp.h
+++ b/packet-bgp.h
@@ -1,7 +1,7 @@
/* packet-bgp.c
* Definitions for BGP packet disassembly structures and routine
*
- * $Id: packet-bgp.h,v 1.25 2003/05/19 20:36:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-bofl.c b/packet-bofl.c
index 5d3f1f1cc4..3a9e9dd2f7 100644
--- a/packet-bofl.c
+++ b/packet-bofl.c
@@ -2,7 +2,7 @@
* Routines for Wellfleet BOFL dissection
* Author: Endoh Akira (endoh@netmarks.co.jp)
*
- * $Id: packet-bofl.c,v 1.3 2003/03/01 09:37:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
diff --git a/packet-bootp.c b/packet-bootp.c
index 2631729efa..02ce06d3e7 100644
--- a/packet-bootp.c
+++ b/packet-bootp.c
@@ -3,7 +3,7 @@
* Copyright 1998, Gilbert Ramirez <gram@alumni.rice.edu>
* Copyright 2004, Thomas Anders <thomas.anders [AT] blue-cable.de>
*
- * $Id: packet-bootp.c,v 1.79 2004/05/24 16:38:29 guy Exp $
+ * $Id$
*
* The information used comes from:
* RFC 951: Bootstrap Protocol
diff --git a/packet-bootparams.c b/packet-bootparams.c
index 22f63a650e..3634a82a11 100644
--- a/packet-bootparams.c
+++ b/packet-bootparams.c
@@ -1,7 +1,7 @@
/* packet-bootparams.c
* Routines for bootparams dissection
*
- * $Id: packet-bootparams.c,v 1.24 2002/11/01 00:48:38 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-bootparams.h b/packet-bootparams.h
index 9b060e3d63..9601a6a6d1 100644
--- a/packet-bootparams.h
+++ b/packet-bootparams.h
@@ -1,5 +1,5 @@
/* packet-bootparams.h */
-/* $Id: packet-bootparams.h,v 1.1 1999/11/10 17:23:53 nneul Exp $ */
+/* $Id$ */
#ifndef PACKET_BOOTPARAMS_H
#define PACKET_BOOTPARAMS_H
diff --git a/packet-bpdu.c b/packet-bpdu.c
index 703c955a61..194b54d25f 100644
--- a/packet-bpdu.c
+++ b/packet-bpdu.c
@@ -1,7 +1,7 @@
/* packet-bpdu.c
* Routines for BPDU (Spanning Tree Protocol) disassembly
*
- * $Id: packet-bpdu.c,v 1.51 2004/04/13 04:04:55 guy Exp $
+ * $Id$
*
* Copyright 1999 Christophe Tronche <ch.tronche@computer.org>
*
diff --git a/packet-brdwlk.c b/packet-brdwlk.c
index 9c96af6558..1fce4130d8 100644
--- a/packet-brdwlk.c
+++ b/packet-brdwlk.c
@@ -2,7 +2,7 @@
* Routines for decoding MDS Port Analyzer Adapter (FC in Eth) Header
* Copyright 2001, Dinesh G Dutt <ddutt@andiamo.com>
*
- * $Id: packet-brdwlk.c,v 1.6 2003/10/30 03:15:26 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-bssap.c b/packet-bssap.c
index 4181087337..c422677a99 100644
--- a/packet-bssap.c
+++ b/packet-bssap.c
@@ -7,7 +7,7 @@
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>
* In association with Telos Technology Inc.
*
- * $Id: packet-bssap.c,v 1.10 2004/05/24 02:25:18 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-bssap.h b/packet-bssap.h
index 229951c470..63a2ce3df6 100644
--- a/packet-bssap.h
+++ b/packet-bssap.h
@@ -7,7 +7,7 @@
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>
* In association with Telos Technology Inc.
*
- * $Id: packet-bssap.h,v 1.1 2003/10/22 20:59:02 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-bssgp.c b/packet-bssgp.c
index 8bb5e449cd..01e4e16dd6 100644
--- a/packet-bssgp.c
+++ b/packet-bssgp.c
@@ -2,7 +2,7 @@
* Routines for BSSGP (BSS GPRS Protocol ETSI GSM 08.18 version 6.7.1 TS 101 343 ) dissection
* Copyright 2000, Josef Korelus <jkor@quick.cz>
*
- * $Id: packet-bssgp.c,v 1.9 2004/04/13 04:21:30 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-bvlc.c b/packet-bvlc.c
index 254188bca1..16a703d1e5 100644
--- a/packet-bvlc.c
+++ b/packet-bvlc.c
@@ -2,7 +2,7 @@
* Routines for BACnet/IP (BVLL, BVLC) dissection
* Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
*
- * $Id: packet-bvlc.c,v 1.14 2004/01/27 03:49:35 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-cast.c b/packet-cast.c
index b1e63d4bbf..2c1d36a0bb 100644
--- a/packet-cast.c
+++ b/packet-cast.c
@@ -3,7 +3,7 @@
* Dissector for the CAST Client Control Protocol
* (The "D-Channel"-Protocol for Cisco Systems' IP-Phones)
*
- * $Id: packet-cast.c,v 1.2 2004/02/20 22:34:59 guy Exp $
+ * $Id$
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/packet-ccsds.c b/packet-ccsds.c
index 1fd2b7be20..b3292a672c 100644
--- a/packet-ccsds.c
+++ b/packet-ccsds.c
@@ -2,7 +2,7 @@
* Routines for CCSDS dissection
* Copyright 2000, Scott Hovis scott.hovis@ums.msfc.nasa.gov
*
- * $Id: packet-ccsds.c,v 1.3 2003/12/05 22:33:11 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-cdp.c b/packet-cdp.c
index e428811955..1c3a100096 100644
--- a/packet-cdp.c
+++ b/packet-cdp.c
@@ -2,7 +2,7 @@
* Routines for the disassembly of the "Cisco Discovery Protocol"
* (c) Copyright Hannes R. Boehm <hannes@boehm.org>
*
- * $Id: packet-cdp.c,v 1.55 2004/03/23 18:06:29 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-cgmp.c b/packet-cgmp.c
index 433ee1792a..d3611c7190 100644
--- a/packet-cgmp.c
+++ b/packet-cgmp.c
@@ -1,7 +1,7 @@
/* packet-cgmp.c
* Routines for the disassembly of the Cisco Group Management Protocol
*
- * $Id: packet-cgmp.c,v 1.17 2002/08/28 21:00:08 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-chdlc.c b/packet-chdlc.c
index 8b59c64cd2..18eef17644 100644
--- a/packet-chdlc.c
+++ b/packet-chdlc.c
@@ -1,7 +1,7 @@
/* packet-chdlc.c
* Routines for Cisco HDLC packet disassembly
*
- * $Id: packet-chdlc.c,v 1.22 2004/05/02 21:35:42 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-chdlc.h b/packet-chdlc.h
index 17a84c23c5..262b80a21b 100644
--- a/packet-chdlc.h
+++ b/packet-chdlc.h
@@ -1,6 +1,6 @@
/* packet-chdlc.h
*
- * $Id: packet-chdlc.h,v 1.5 2002/08/28 21:00:08 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-cisco-oui.c b/packet-cisco-oui.c
index 1d30a45f2b..073e034ab1 100644
--- a/packet-cisco-oui.c
+++ b/packet-cisco-oui.c
@@ -1,7 +1,7 @@
/* packet-cisco-oui.c
* Register an LLC dissector table for Cisco's OUI 00:00:0c
*
- * $Id: packet-cisco-oui.c,v 1.4 2004/04/13 04:04:55 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-clearcase.c b/packet-clearcase.c
index 36a36a152d..8f654bf38f 100644
--- a/packet-clearcase.c
+++ b/packet-clearcase.c
@@ -1,7 +1,7 @@
/* packet-clearcase.c
* Routines for ClearCase NFS dissection
*
- * $Id: packet-clearcase.c,v 1.1 2002/11/15 22:45:52 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-clearcase.h b/packet-clearcase.h
index 8e5a3de7d8..9d80c0e8f7 100644
--- a/packet-clearcase.h
+++ b/packet-clearcase.h
@@ -1,6 +1,6 @@
/* packet-clearcase.h
*
- * $Id: packet-clearcase.h,v 1.1 2002/11/15 22:45:52 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-clip.c b/packet-clip.c
index d7d1b7f1af..cae6dd1982 100644
--- a/packet-clip.c
+++ b/packet-clip.c
@@ -1,7 +1,7 @@
/* packet-clip.c
* Routines for clip packet disassembly
*
- * $Id: packet-clip.c,v 1.21 2002/08/28 21:00:08 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-clip.h b/packet-clip.h
index b5438500d8..efc0ea66ff 100644
--- a/packet-clip.h
+++ b/packet-clip.h
@@ -1,6 +1,6 @@
/* packet-clip.h
*
- * $Id: packet-clip.h,v 1.7 2002/08/28 21:00:08 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-clnp.c b/packet-clnp.c
index c63fea55b9..c94b855043 100644
--- a/packet-clnp.c
+++ b/packet-clnp.c
@@ -1,7 +1,7 @@
/* packet-clnp.c
* Routines for ISO/OSI network and transport protocol packet disassembly
*
- * $Id: packet-clnp.c,v 1.86 2004/06/20 01:05:07 guy Exp $
+ * $Id$
* Laurent Deniel <laurent.deniel@free.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
diff --git a/packet-cops.c b/packet-cops.c
index 80add6b8aa..8db35e43ed 100644
--- a/packet-cops.c
+++ b/packet-cops.c
@@ -13,7 +13,7 @@
*
* Implemented in ethereal at April 7-8, 2004
*
- * $Id: packet-cops.c,v 1.49 2004/07/09 23:17:03 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-cosine.c b/packet-cosine.c
index ebb5a6b5aa..2c8fa84666 100644
--- a/packet-cosine.c
+++ b/packet-cosine.c
@@ -1,7 +1,7 @@
/* packet-cosine.c
* Routines for decoding CoSine IPNOS L2 debug output
*
- * $Id: packet-cosine.c,v 1.4 2002/08/28 21:00:08 jmayer Exp $
+ * $Id$
*
* Motonori Shindo <mshindo@mshindo.net>
*
diff --git a/packet-cpfi.c b/packet-cpfi.c
index 69add23657..e478a255b6 100644
--- a/packet-cpfi.c
+++ b/packet-cpfi.c
@@ -5,7 +5,7 @@
*
* Copyright 2003, Dave Sclarsky <dave_sclarsky[AT]cnt.com>
*
- * $Id: packet-cpfi.c,v 1.7 2004/06/17 07:10:33 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-cpha.c b/packet-cpha.c
index c01e5e1dd0..77f7a75543 100644
--- a/packet-cpha.c
+++ b/packet-cpha.c
@@ -2,7 +2,7 @@
* Routines for the Check Point High-Availability Protocol (CPHAP)
* Copyright 2002, Yaniv Kaul <ykaul-at-netvision.net.il>
*
- * $Id: packet-cpha.c,v 1.9 2003/12/18 00:25:24 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-cups.c b/packet-cups.c
index 6bd56fa391..9f48d390aa 100644
--- a/packet-cups.c
+++ b/packet-cups.c
@@ -5,7 +5,7 @@
* Charles Levert <charles@comm.polymtl.ca>
* Copyright 2001 Charles Levert
*
-* $Id: packet-cups.c,v 1.12 2002/08/28 21:00:08 jmayer Exp $
+* $Id$
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/packet-data.c b/packet-data.c
index 5964b9c081..29c190e524 100644
--- a/packet-data.c
+++ b/packet-data.c
@@ -2,7 +2,7 @@
* Routines for raw data (default case)
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-data.c,v 1.34 2004/01/03 18:40:07 sharpe Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-data.h b/packet-data.h
index 5a3d503534..9906948b50 100644
--- a/packet-data.h
+++ b/packet-data.h
@@ -1,6 +1,6 @@
/* packet-data.h
*
- * $Id: packet-data.h,v 1.2 2002/08/28 21:00:08 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dccp.c b/packet-dccp.c
index 79019cf083..60cf3c64f7 100644
--- a/packet-dccp.c
+++ b/packet-dccp.c
@@ -4,7 +4,7 @@
*
* Copyright 1999, Nathan Neulinger <nneul@umr.edu>
*
- * $Id: packet-dccp.c,v 1.11 2004/03/11 03:24:13 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dccp.h b/packet-dccp.h
index 50222c4cf9..6142cae2e1 100644
--- a/packet-dccp.h
+++ b/packet-dccp.h
@@ -4,7 +4,7 @@
*
* Copyright 1999, Nathan Neulinger <nneul@umr.edu>
*
- * $Id: packet-dccp.h,v 1.3 2002/08/28 21:00:08 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-afs4int.c b/packet-dcerpc-afs4int.c
index 34d71b8a60..eae7f2a8b1 100644
--- a/packet-dcerpc-afs4int.c
+++ b/packet-dcerpc-afs4int.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/fsint/afs4int.idl
*
- * $Id: packet-dcerpc-afs4int.c,v 1.8 2004/03/09 09:24:40 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-atsvc.c b/packet-dcerpc-atsvc.c
index b239224c28..5fb8b99262 100644
--- a/packet-dcerpc-atsvc.c
+++ b/packet-dcerpc-atsvc.c
@@ -2,7 +2,7 @@
* Routines for SMB \pipe\atsvc packet disassembly
* Copyright 2003 Jean-Baptiste Marchand <jbm@hsc.fr>
*
- * $Id: packet-dcerpc-atsvc.c,v 1.5 2004/01/19 20:10:33 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-atsvc.h b/packet-dcerpc-atsvc.h
index 3cd832b1ad..b5e79659be 100644
--- a/packet-dcerpc-atsvc.h
+++ b/packet-dcerpc-atsvc.h
@@ -2,7 +2,7 @@
* Routines for SMB \pipe\atsvc packet disassembly
* Copyright 2003 Jean-Baptiste Marchand <jbm@hsc.fr>
*
- * $Id: packet-dcerpc-atsvc.h,v 1.1 2003/05/28 22:43:57 sharpe Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-bossvr.c b/packet-dcerpc-bossvr.c
index 83360c924a..ea13a37ab1 100644
--- a/packet-dcerpc-bossvr.c
+++ b/packet-dcerpc-bossvr.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/bosserver/bbos_ncs_interface.idl
*
- * $Id: packet-dcerpc-bossvr.c,v 1.5 2004/01/27 04:15:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-browser.c b/packet-dcerpc-browser.c
index 8fee1bdd99..3a4e4156f3 100644
--- a/packet-dcerpc-browser.c
+++ b/packet-dcerpc-browser.c
@@ -2,7 +2,7 @@
* Routines for DCERPC Browser packet disassembly
* Copyright 2001, Ronnie Sahlberg
*
- * $Id: packet-dcerpc-browser.c,v 1.14 2004/01/19 20:10:33 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-browser.h b/packet-dcerpc-browser.h
index 77dcfdb485..3a434c8b87 100644
--- a/packet-dcerpc-browser.h
+++ b/packet-dcerpc-browser.h
@@ -2,7 +2,7 @@
* Routines for DCERPC Browser packet disassembly
* Copyright 2002, Ronnie Sahlberg
*
- * $Id: packet-dcerpc-browser.h,v 1.3 2003/10/02 21:48:35 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-budb.c b/packet-dcerpc-budb.c
index f73423ce16..002e06cf0c 100644
--- a/packet-dcerpc-budb.c
+++ b/packet-dcerpc-budb.c
@@ -4,7 +4,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz bubasics/budb.idl
*
- * $Id: packet-dcerpc-budb.c,v 1.3 2004/06/29 08:20:53 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-butc.c b/packet-dcerpc-butc.c
index 3f642753b7..a6478f1f25 100644
--- a/packet-dcerpc-butc.c
+++ b/packet-dcerpc-butc.c
@@ -4,7 +4,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz bubasics/butc.idl
*
- * $Id: packet-dcerpc-butc.c,v 1.4 2004/02/20 22:35:43 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-cds_clerkserver.c b/packet-dcerpc-cds_clerkserver.c
index e2b6596805..f708de6d75 100644
--- a/packet-dcerpc-cds_clerkserver.c
+++ b/packet-dcerpc-cds_clerkserver.c
@@ -6,7 +6,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cds_clerkserver.idl
*
- * $Id: packet-dcerpc-cds_clerkserver.c,v 1.5 2004/01/27 04:15:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-cds_solicit.c b/packet-dcerpc-cds_solicit.c
index 1aff3c596f..6cb1375b51 100644
--- a/packet-dcerpc-cds_solicit.c
+++ b/packet-dcerpc-cds_solicit.c
@@ -4,7 +4,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cds_solicit.idl
*
- * $Id: packet-dcerpc-cds_solicit.c,v 1.5 2004/01/27 04:15:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-conv.c b/packet-dcerpc-conv.c
index 081b7ee241..bc8d3e77cc 100644
--- a/packet-dcerpc-conv.c
+++ b/packet-dcerpc-conv.c
@@ -2,7 +2,7 @@
* Routines for dcerpc conv dissection
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc-conv.c,v 1.10 2004/04/23 16:46:54 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-cprpc_server.c b/packet-dcerpc-cprpc_server.c
index 454a494458..bb7b2f1200 100644
--- a/packet-dcerpc-cprpc_server.c
+++ b/packet-dcerpc-cprpc_server.c
@@ -4,7 +4,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cprpc_server.idl
*
- * $Id: packet-dcerpc-cprpc_server.c,v 1.5 2004/01/27 04:15:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-dce122.c b/packet-dcerpc-dce122.c
index f2e988c6da..d86869e927 100644
--- a/packet-dcerpc-dce122.c
+++ b/packet-dcerpc-dce122.c
@@ -3,7 +3,7 @@
* Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com>
* This information is based off the released idl files from opengroup.
*
- * $Id: packet-dcerpc-dce122.c,v 1.4 2004/01/27 04:15:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-dce122.h b/packet-dcerpc-dce122.h
index 37ccc816a3..270ef03a7b 100644
--- a/packet-dcerpc-dce122.h
+++ b/packet-dcerpc-dce122.h
@@ -3,7 +3,7 @@
* Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com>
* This information is based off the released idl files from opengroup.
*
- * $Id: packet-dcerpc-dce122.h,v 1.3 2004/01/27 04:15:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-dcom.h b/packet-dcerpc-dcom.h
index a7fe3382ba..f07b48a1cf 100644
--- a/packet-dcerpc-dcom.h
+++ b/packet-dcerpc-dcom.h
@@ -1,6 +1,6 @@
/* packet-dcerpc-dcom.h
*
- * $Id: packet-dcerpc-dcom.h,v 1.2 2003/11/09 19:53:11 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-dfs.c b/packet-dcerpc-dfs.c
index 2a837c837e..84f887c9dd 100644
--- a/packet-dcerpc-dfs.c
+++ b/packet-dcerpc-dfs.c
@@ -2,7 +2,7 @@
* Routines for SMB \\PIPE\\netdfs packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-dfs.c,v 1.8 2003/10/02 21:45:54 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-dfs.h b/packet-dcerpc-dfs.h
index 59e3309162..672495bdce 100644
--- a/packet-dcerpc-dfs.h
+++ b/packet-dcerpc-dfs.h
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\netdfs packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-dfs.h,v 1.5 2003/10/02 21:45:55 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-dnsserver.c b/packet-dcerpc-dnsserver.c
index 8375871752..e6fdd83ce3 100644
--- a/packet-dcerpc-dnsserver.c
+++ b/packet-dcerpc-dnsserver.c
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\DNSSERVER packet disassembly
* Copyright 2001, 2002 Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-dnsserver.c,v 1.4 2003/10/02 21:37:24 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-dnsserver.h b/packet-dcerpc-dnsserver.h
index 1f6dce0446..39b13f0a58 100644
--- a/packet-dcerpc-dnsserver.h
+++ b/packet-dcerpc-dnsserver.h
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\DNSSERVER packet disassembly
* Copyright 2002, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-dnsserver.h,v 1.2 2003/10/02 21:37:24 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-drsuapi.c b/packet-dcerpc-drsuapi.c
index f263c97dab..1f16f5ef52 100644
--- a/packet-dcerpc-drsuapi.c
+++ b/packet-dcerpc-drsuapi.c
@@ -2,7 +2,7 @@
* Routines for the drsuapi (Directory Replication Service) MSRPC interface
* Copyright 2003 Jean-Baptiste Marchand <jbm@hsc.fr>
*
- * $Id: packet-dcerpc-drsuapi.c,v 1.1 2003/09/20 08:56:56 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-drsuapi.h b/packet-dcerpc-drsuapi.h
index 5b9b7c525c..eeb4a6c7a0 100644
--- a/packet-dcerpc-drsuapi.h
+++ b/packet-dcerpc-drsuapi.h
@@ -2,7 +2,7 @@
* Routines for the drsuapi (Directory Replication Service) MSRPC interface
* Copyright 2003 Jean-Baptiste Marchand <jbm@hsc.fr>
*
- * $Id: packet-dcerpc-drsuapi.h,v 1.1 2003/09/20 08:56:56 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-dtsprovider.c b/packet-dcerpc-dtsprovider.c
index e1d1dfec53..c564e11b68 100644
--- a/packet-dcerpc-dtsprovider.c
+++ b/packet-dcerpc-dtsprovider.c
@@ -4,7 +4,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/time.tar.gz time/service/dtsprovider.idl
*
- * $Id: packet-dcerpc-dtsprovider.c,v 1.7 2004/01/27 04:15:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-dtsstime_req.c b/packet-dcerpc-dtsstime_req.c
index 3d366adcfc..e45d36c546 100644
--- a/packet-dcerpc-dtsstime_req.c
+++ b/packet-dcerpc-dtsstime_req.c
@@ -4,7 +4,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/time.tar.gz time/service/dtsstime_req.idl
*
- * $Id: packet-dcerpc-dtsstime_req.c,v 1.6 2004/01/27 04:15:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-efs.c b/packet-dcerpc-efs.c
index 271e37e7f4..260fbb0ef5 100755
--- a/packet-dcerpc-efs.c
+++ b/packet-dcerpc-efs.c
@@ -1,698 +1,698 @@
-/* packet-dcerpc-efs.c
- * Routines for the efsrpc MSRPC interface
- * Copyright 2004 Ronnie Sahlberg, Jean-Baptiste Marchand
- *
- * $Id: packet-dcerpc-efs.c,v 1.2 2004/05/19 04:52:31 tpot Exp $
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <glib.h>
-#include <epan/packet.h>
-#include "packet-dcerpc.h"
-#include "packet-dcerpc-nt.h"
-#include "packet-dcerpc-efs.h"
-#include "smb.h"
-
-
-static int proto_dcerpc_efs = -1;
-static int hf_efsrpc_opnum = -1;
-static int hf_efsrpc_rc = -1;
-static int hf_efsrpc_filename = -1;
-static int hf_efsrpc_flags = -1;
-static int hf_efsrpc_hnd = -1;
-static int hf_efsrpc_reserved = -1;
-static int hf_efsrpc_num_entries = -1;
-static int hf_efsrpc_data_size = -1;
-static int hf_efsrpc_cert_dn = -1;
-
-static gint ett_dcerpc_efs = -1;
-static gint ett_dcerpc_efs_cert_hash = -1;
-
-
-/*
-IDL [ uuid(c681d488-d850-11d0-8c52-00c04fd90f7e),
-IDL version(1.0),
-IDL implicit_handle(handle_t rpc_binding)
-IDL ] interface efsrpc
-*/
-
-
-static e_uuid_t uuid_dcerpc_efs = {
- 0xc681d488, 0xd850, 0x11d0,
- { 0x8c, 0x52, 0x00, 0xc0, 0x4f, 0xd9, 0x0f, 0x7e }
-};
-
-static guint16 ver_dcerpc_efs = 1;
-
-
-/*
-IDL long EfsRpcOpenFileRaw(
-IDL [out] [context_handle] void *pvContext,
-IDL [in] [string] wchar_t FileName,
-IDL [in] long Flags
-IDL );
-*/
-
-static int
-efsrpc_dissect_open_file_raw_rqst(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
- sizeof(guint16),
- hf_efsrpc_filename, TRUE, NULL);
-
- offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_flags, NULL);
-
- return offset;
-
-}
-
-static int
-efsrpc_dissect_open_file_raw_reply(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
- offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_hnd, NULL, NULL, TRUE, FALSE);
-
- offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_rc, NULL);
-
- return offset;
-}
-
-
-
-/*
-IDL long EfsRpcReadFileRaw(
-IDL [in] [context_handle] void *pvContext,
-IDL [out] ??? element_5
-IDL );
-*/
-
-static int
-efsrpc_dissect_read_file_raw_rqst(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_hnd, NULL, NULL, FALSE, FALSE);
-
- return offset;
-
-}
-
-
-/*
-IDL long EfsRpcWriteFileRaw(
-IDL [in] [context_handle] void *pvContext,
-IDL [in] ??? element_7
-IDL );
-*/
-
-
-static int
-efsrpc_dissect_write_file_raw_rqst(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_hnd, NULL, NULL, FALSE, FALSE);
-
- return offset;
-
-}
-
-
-static int
-efsrpc_dissect_write_file_raw_reply(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_rc, NULL);
-
- return offset;
-
-}
-
-
-/*
-IDL
-IDL void EfsRpcCloseRaw(
-IDL [in,out] [context_handle] void *pvContext,
-IDL );
-*/
-
-
-static int
-efsrpc_dissect_close_file_raw_rqst(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_hnd, NULL, NULL, FALSE, TRUE);
-
- return offset;
-
-}
-
-
-static int
-efsrpc_dissect_close_file_raw_reply(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_hnd, NULL, NULL, FALSE, FALSE);
-
- return offset;
-
-}
-
-
-
-/*
-IDL long EfsRpcEncryptFileSrv(
-IDL [in] [string] wchar_t Filename
-IDL );
- */
-
-static int
-efsrpc_dissect_encrypt_file_srv_rqst(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
- sizeof(guint16),
- hf_efsrpc_filename, TRUE, NULL);
-
- return offset;
-
-}
-
-
-static int
-efsrpc_dissect_encrypt_file_srv_reply(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_rc, NULL);
-
- return offset;
-
-}
-
-
-/*
-IDL long EfsRpcDecryptFileSrv(
-IDL [in] [string] wchar_t FileName,
-IDL [in] long Reserved
-IDL );
-*/
-
-
-static int
-efsrpc_dissect_decrypt_file_srv_rqst(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
- sizeof(guint16),
- hf_efsrpc_filename, TRUE, NULL);
-
- offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_reserved, NULL);
-
- return offset;
-
-}
-
-
-static int
-efsrpc_dissect_decrypt_file_srv_reply(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_rc, NULL);
-
- return offset;
-
-}
-
-
-/*
-IDL typedef struct {
-IDL long cbData;
-IDL [size_is(cbData)] void *pbData;
-IDL } EFS_HASH_BLOB;
-*/
-
-static int
-efsrpc_dissect_EFS_HASH_BLOB_data(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree,
- guint8 *drep)
-{
- guint32 size;
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
-
- if(di->conformant_run){
- return offset; /* cant modify offset while performing conformant run */
- }
-
- offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_data_size, &size);
-
- /* XXX insert some sort of proto_tree_add_item here and show hex data
- of the blob */
- offset += size;
- return offset;
-}
-
-static int
-efsrpc_dissect_EFS_HASH_BLOB(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree,
- guint8 *drep)
-{
- guint32 size;
-
- offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_data_size, &size);
-
- offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
- efsrpc_dissect_EFS_HASH_BLOB_data, NDR_POINTER_UNIQUE,
- "HASH_BLOB", -1);
-
- return offset;
-}
-
-
-static int
-efsrpc_dissect_efs_SID_ptr(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree,
- guint8 *drep)
-{
- offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
-
- return offset;
-}
-
-
-/*
-IDL typedef struct {
-IDL long cbTotalLength;
-IDL SID *pUserSid;
-IDL EFS_HASH_BLOB *pHash;
-IDL [string] wchar_t lpDisplayInformation;
-IDL } ENCRYPTION_CERTIFICATE_HASH;
-*/
-
-static int
-efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *parent_tree,
- guint8 *drep)
-{
- proto_item *item = NULL;
- proto_tree *tree = NULL;
-
- if (parent_tree) {
- item = proto_tree_add_text(parent_tree, tvb, offset, -1, "ENCRYPTION_CERTIFICATE_HASH");
- tree = proto_item_add_subtree(item, ett_dcerpc_efs_cert_hash);
- }
-
- offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_data_size, NULL);
-
- offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
- efsrpc_dissect_efs_SID_ptr, NDR_POINTER_UNIQUE,
- "SID", -1);
-
- offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
- efsrpc_dissect_EFS_HASH_BLOB, NDR_POINTER_UNIQUE,
- "EFS_HASH_BLOB", -1);
-
- offset = dissect_ndr_pointer_cb(
- tvb, offset, pinfo, tree, drep,
- dissect_ndr_wchar_cvstring, NDR_POINTER_UNIQUE,
- "Certificate DN", hf_efsrpc_cert_dn, cb_wstr_postprocess,
- GINT_TO_POINTER(CB_STR_COL_INFO | 1));
-
- return offset;
-}
-
-
-static int
-efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH_ptr(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree,
- guint8 *drep)
-{
-
- offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
- efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH, NDR_POINTER_UNIQUE,
- "ENCRYPTION_CERTIFICATE_HASH", -1);
-
- return offset;
-
-}
-
-
-static int
-efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH_array(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree,
- guint8 *drep)
-{
- offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep,
- efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH_ptr);
-
- return offset;
-}
-
-/*
-IDL typedef struct {
-IDL long nCert_Hash;
-IDL [size_is(nCert_Hash)] [unique] ENCRYPTION_CERTIFICATE_HASH *pUsers;
-IDL } ENCRYPTION_CERTIFICATE_HASH_LIST;
-*/
-
-static int
-efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH_LIST(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_num_entries, NULL);
-
- offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
- efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH_array, NDR_POINTER_UNIQUE,
- "ENCRYPTION_CERTIFICATE_HASH array:", -1);
-
- return offset;
-
-}
-
-
-
-/*
-IDL long EfsRpcQueryUsersOnFile(
-IDL [in] [string] wchar_t FileName,
-IDL [out] [ref] ENCRYPTION_CERTIFICATE_HASH_LIST **pUsers
-IDL );
-*/
-
-
-static int
-efsrpc_dissect_query_users_on_file_rqst(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
- sizeof(guint16),
- hf_efsrpc_filename, TRUE, NULL);
-
-
- return offset;
-
-}
-
-
-static int
-efsrpc_dissect_query_users_on_file_reply(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
- offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
- efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH_LIST, NDR_POINTER_UNIQUE,
- "ENCRYPTION_CERTIFICATE_HASH_LIST", -1);
-
- offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_rc, NULL);
-
- return offset;
-
-}
-
-/*
-IDL long EfsRpcQueryRecoveryAgents(
-IDL [in] [string] wchar_t FileName,
-IDL [out] [ref] ENCRYPTION_CERTIFICATE_HASH_LIST **pRecoveryAgents
-IDL );
-*/
-
-static int
-efsrpc_dissect_query_recovery_agents_rqst(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
- sizeof(guint16),
- hf_efsrpc_filename, TRUE, NULL);
-
- return offset;
-
-}
-
-
-static int
-efsrpc_dissect_query_recovery_agents_reply(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
- efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH_LIST, NDR_POINTER_UNIQUE,
- "ENCRYPTION_CERTIFICATE_HASH_LIST", -1);
-
- offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_rc, NULL);
-
- return offset;
-
-
-}
-
-
-
-/*
-IDL long EfsRpcRemoveUsersFromFile(
-IDL [in] [string] wchar_t FileName,
-IDL [in] ENCRYPTION_CERTIFICATE_LIST Hashes
-IDL );
-*/
-
-static int
-efsrpc_dissect_remove_users_from_file_rqst(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
- sizeof(guint16),
- hf_efsrpc_filename, TRUE, NULL);
-#if 0
- offset = efsrpc_dissect_ENCRYPTION_CERTIFICATE_LIST(tvb, offset,
- pinfo, tree, drep);
-#endif
- return offset;
-
-}
-
-
-static int
-efsrpc_dissect_remove_users_from_file_reply(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_rc, NULL);
-
- return offset;
-
-}
-
-/*
-IDL long EfsRpcAddUsersToFile(
-IDL [in] [string] wchar_t FileName,
-IDL [in] ENCRYPTION_CERTIFICATE_LIST Hashes
-IDL );
-*/
-
-static int
-efsrpc_dissect_add_users_from_file_rqst(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
- sizeof(guint16),
- hf_efsrpc_filename, TRUE, NULL);
-#if 0
- offset = efsrpc_dissect_ENCRYPTION_CERTIFICATE_LIST(tvb, offset,
- pinfo, tree, drep);
-#endif
- return offset;
-
-}
-
-
-static int
-efsrpc_dissect_add_users_from_file_reply(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint8 *drep)
-{
-
- offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
- hf_efsrpc_rc, NULL);
-
- return offset;
-
-}
-
-
-/*
-IDL typedef struct {
-IDL long dwCertEncodingType;
-IDL long cbData;
-IDL [size_is(cbData)] [unique] byte *pbData
-IDL } EFS_CERTIFICATE_BLOB;
-*/
-
-/*
-IDL typedef struct {
-IDL long TotalLength;
-IDL [unique] SID *pUserSid;
-IDL [unique] EFS_CERTIFICATE_BLOB *pCertBlob;
-IDL } ENCRYPTION_CERTIFICATE;
-*/
-
-/*
-IDL long EfsRpcSetFileEncryptionKey(
-IDL [in] [unique] ENCRYPTION_CERTIFICATE *pEncryptionCertificate
-IDL );
-*/
-
-static dcerpc_sub_dissector dcerpc_efs_dissectors[] = {
- { EFS_RPC_OPEN_FILE_RAW , "EfsRpcOpenFileRaw",
- efsrpc_dissect_open_file_raw_rqst,
- efsrpc_dissect_open_file_raw_reply },
- { EFS_RPC_READ_FILE_RAW, "EfsRpcReadFileRaw",
- efsrpc_dissect_read_file_raw_rqst,
- NULL },
- { EFS_RPC_WRITE_FILE_RAW, "EfsRpcWriteFileRaw",
- efsrpc_dissect_write_file_raw_rqst,
- efsrpc_dissect_write_file_raw_reply },
- { EFS_RPC_CLOSE_RAW, "EfsRpcCloseRaw",
- efsrpc_dissect_close_file_raw_rqst,
- efsrpc_dissect_close_file_raw_reply },
- { EFS_RPC_ENCRYPT_FILE_SRV, "EfsRpcEncryptFileSrv",
- efsrpc_dissect_encrypt_file_srv_rqst,
- efsrpc_dissect_encrypt_file_srv_reply },
- { EFS_RPC_DECRYPT_FILE_SRV, "EfsRpcDecryptFileSrv",
- efsrpc_dissect_decrypt_file_srv_rqst,
- efsrpc_dissect_decrypt_file_srv_reply },
- { EFS_RPC_QUERY_USERS_ON_FILE, "EfsRpcQueryUsersOnFile",
- efsrpc_dissect_query_users_on_file_rqst,
- efsrpc_dissect_query_users_on_file_reply },
- { EFS_RPC_QUERY_RECOVERY_AGENTS, "EfsRpcQueryRecoveryAgents",
- efsrpc_dissect_query_recovery_agents_rqst,
- efsrpc_dissect_query_recovery_agents_reply },
- { EFS_RPC_REMOVE_USERS_FROM_FILE, "EfsRpcRemoveUsersFromFile",
- efsrpc_dissect_remove_users_from_file_rqst,
- efsrpc_dissect_remove_users_from_file_reply },
- { EFS_RPC_ADD_USERS_TO_FILE, "EfsRpcAddUsersToFile",
- efsrpc_dissect_add_users_from_file_rqst,
- efsrpc_dissect_add_users_from_file_reply },
- { EFS_RPC_SET_FILE_ENCRYPTION_KEY, "EfsRpcSetFileEncryptionKey"
- , NULL, NULL },
- { EFS_RPC_NOT_SUPPORTED, "EfsRpcNotSupported"
- , NULL, NULL },
- { EFS_RPC_FILE_KEY_INFO, "EfsRpcFileKeyInfo"
- , NULL, NULL },
- { EFS_RPC_DUPLICATE_ENCRYPTION_INFO_FILE,
- "EfsRpcDuplicateEncryptionInfoFile", NULL, NULL },
- { 0, NULL, NULL, NULL }
-};
-
-void
-proto_register_dcerpc_efs(void)
-{
-static hf_register_info hf[] = {
- { &hf_efsrpc_opnum, {
- "Operation", "efsrpc.opnum", FT_UINT16, BASE_DEC,
- NULL, 0x0, "", HFILL }},
- { &hf_efsrpc_rc, {
- "Return code", "efsrpc.rc", FT_UINT32, BASE_HEX,
- VALS(NT_errors), 0x0, "EFSRPC return code", HFILL }},
- { &hf_efsrpc_filename,
- { "Filename", "efsrpc.filename", FT_STRING, BASE_NONE,
- NULL, 0x0, "File name", HFILL}},
-
- { &hf_efsrpc_flags, {
- "Flags", "efsrpc.flags", FT_UINT32, BASE_HEX,
- NULL, 0x0, "EFSRPC Flags", HFILL }},
-
- { &hf_efsrpc_hnd, {
- "Context Handle", "efsrpc.hnd", FT_BYTES,
- BASE_NONE, NULL, 0x0, "Context Handle", HFILL}},
-
- { &hf_efsrpc_reserved, {
- "Reserved value", "efsrpc.reserved", FT_UINT32, BASE_HEX,
- NULL, 0x0, "Reserved value", HFILL }},
-
- { &hf_efsrpc_num_entries,
- { "Number of entries", "efsrpc.num_entries", FT_UINT32,
- BASE_DEC, NULL, 0x0, "Number of Entries", HFILL}},
-
- { &hf_efsrpc_data_size,
- { "Size of data structure", "efsrpc.data_size", FT_UINT32,
- BASE_DEC, NULL, 0x0, "Size of data structure", HFILL}},
-
- { &hf_efsrpc_cert_dn,
- { "Certificate DN", "efsrpc.cert_dn", FT_STRING, BASE_NONE,
- NULL, 0x0, "Distinguished Name of EFS certificate", HFILL}},
-
-
- };
-
- static gint *ett[] = {
- &ett_dcerpc_efs,
- &ett_dcerpc_efs_cert_hash
- };
-
- proto_dcerpc_efs = proto_register_protocol(
- "Microsoft Encrypted File System Service", "EFSRPC", "efsrpc");
-
- proto_register_field_array(proto_dcerpc_efs, hf,
- array_length(hf));
-
- proto_register_subtree_array(ett, array_length(ett));
-}
-
-void
-proto_reg_handoff_dcerpc_efs(void)
-{
- /* Register protocol as dcerpc */
-
- dcerpc_init_uuid(proto_dcerpc_efs, ett_dcerpc_efs,
- &uuid_dcerpc_efs, ver_dcerpc_efs,
- dcerpc_efs_dissectors, hf_efsrpc_opnum);
-}
+/* packet-dcerpc-efs.c
+ * Routines for the efsrpc MSRPC interface
+ * Copyright 2004 Ronnie Sahlberg, Jean-Baptiste Marchand
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <glib.h>
+#include <epan/packet.h>
+#include "packet-dcerpc.h"
+#include "packet-dcerpc-nt.h"
+#include "packet-dcerpc-efs.h"
+#include "smb.h"
+
+
+static int proto_dcerpc_efs = -1;
+static int hf_efsrpc_opnum = -1;
+static int hf_efsrpc_rc = -1;
+static int hf_efsrpc_filename = -1;
+static int hf_efsrpc_flags = -1;
+static int hf_efsrpc_hnd = -1;
+static int hf_efsrpc_reserved = -1;
+static int hf_efsrpc_num_entries = -1;
+static int hf_efsrpc_data_size = -1;
+static int hf_efsrpc_cert_dn = -1;
+
+static gint ett_dcerpc_efs = -1;
+static gint ett_dcerpc_efs_cert_hash = -1;
+
+
+/*
+IDL [ uuid(c681d488-d850-11d0-8c52-00c04fd90f7e),
+IDL version(1.0),
+IDL implicit_handle(handle_t rpc_binding)
+IDL ] interface efsrpc
+*/
+
+
+static e_uuid_t uuid_dcerpc_efs = {
+ 0xc681d488, 0xd850, 0x11d0,
+ { 0x8c, 0x52, 0x00, 0xc0, 0x4f, 0xd9, 0x0f, 0x7e }
+};
+
+static guint16 ver_dcerpc_efs = 1;
+
+
+/*
+IDL long EfsRpcOpenFileRaw(
+IDL [out] [context_handle] void *pvContext,
+IDL [in] [string] wchar_t FileName,
+IDL [in] long Flags
+IDL );
+*/
+
+static int
+efsrpc_dissect_open_file_raw_rqst(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
+ sizeof(guint16),
+ hf_efsrpc_filename, TRUE, NULL);
+
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_flags, NULL);
+
+ return offset;
+
+}
+
+static int
+efsrpc_dissect_open_file_raw_reply(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_hnd, NULL, NULL, TRUE, FALSE);
+
+ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_rc, NULL);
+
+ return offset;
+}
+
+
+
+/*
+IDL long EfsRpcReadFileRaw(
+IDL [in] [context_handle] void *pvContext,
+IDL [out] ??? element_5
+IDL );
+*/
+
+static int
+efsrpc_dissect_read_file_raw_rqst(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_hnd, NULL, NULL, FALSE, FALSE);
+
+ return offset;
+
+}
+
+
+/*
+IDL long EfsRpcWriteFileRaw(
+IDL [in] [context_handle] void *pvContext,
+IDL [in] ??? element_7
+IDL );
+*/
+
+
+static int
+efsrpc_dissect_write_file_raw_rqst(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_hnd, NULL, NULL, FALSE, FALSE);
+
+ return offset;
+
+}
+
+
+static int
+efsrpc_dissect_write_file_raw_reply(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_rc, NULL);
+
+ return offset;
+
+}
+
+
+/*
+IDL
+IDL void EfsRpcCloseRaw(
+IDL [in,out] [context_handle] void *pvContext,
+IDL );
+*/
+
+
+static int
+efsrpc_dissect_close_file_raw_rqst(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_hnd, NULL, NULL, FALSE, TRUE);
+
+ return offset;
+
+}
+
+
+static int
+efsrpc_dissect_close_file_raw_reply(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_hnd, NULL, NULL, FALSE, FALSE);
+
+ return offset;
+
+}
+
+
+
+/*
+IDL long EfsRpcEncryptFileSrv(
+IDL [in] [string] wchar_t Filename
+IDL );
+ */
+
+static int
+efsrpc_dissect_encrypt_file_srv_rqst(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
+ sizeof(guint16),
+ hf_efsrpc_filename, TRUE, NULL);
+
+ return offset;
+
+}
+
+
+static int
+efsrpc_dissect_encrypt_file_srv_reply(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_rc, NULL);
+
+ return offset;
+
+}
+
+
+/*
+IDL long EfsRpcDecryptFileSrv(
+IDL [in] [string] wchar_t FileName,
+IDL [in] long Reserved
+IDL );
+*/
+
+
+static int
+efsrpc_dissect_decrypt_file_srv_rqst(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
+ sizeof(guint16),
+ hf_efsrpc_filename, TRUE, NULL);
+
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_reserved, NULL);
+
+ return offset;
+
+}
+
+
+static int
+efsrpc_dissect_decrypt_file_srv_reply(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_rc, NULL);
+
+ return offset;
+
+}
+
+
+/*
+IDL typedef struct {
+IDL long cbData;
+IDL [size_is(cbData)] void *pbData;
+IDL } EFS_HASH_BLOB;
+*/
+
+static int
+efsrpc_dissect_EFS_HASH_BLOB_data(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree,
+ guint8 *drep)
+{
+ guint32 size;
+ dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
+
+ if(di->conformant_run){
+ return offset; /* cant modify offset while performing conformant run */
+ }
+
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_data_size, &size);
+
+ /* XXX insert some sort of proto_tree_add_item here and show hex data
+ of the blob */
+ offset += size;
+ return offset;
+}
+
+static int
+efsrpc_dissect_EFS_HASH_BLOB(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree,
+ guint8 *drep)
+{
+ guint32 size;
+
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_data_size, &size);
+
+ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+ efsrpc_dissect_EFS_HASH_BLOB_data, NDR_POINTER_UNIQUE,
+ "HASH_BLOB", -1);
+
+ return offset;
+}
+
+
+static int
+efsrpc_dissect_efs_SID_ptr(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree,
+ guint8 *drep)
+{
+ offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
+
+ return offset;
+}
+
+
+/*
+IDL typedef struct {
+IDL long cbTotalLength;
+IDL SID *pUserSid;
+IDL EFS_HASH_BLOB *pHash;
+IDL [string] wchar_t lpDisplayInformation;
+IDL } ENCRYPTION_CERTIFICATE_HASH;
+*/
+
+static int
+efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *parent_tree,
+ guint8 *drep)
+{
+ proto_item *item = NULL;
+ proto_tree *tree = NULL;
+
+ if (parent_tree) {
+ item = proto_tree_add_text(parent_tree, tvb, offset, -1, "ENCRYPTION_CERTIFICATE_HASH");
+ tree = proto_item_add_subtree(item, ett_dcerpc_efs_cert_hash);
+ }
+
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_data_size, NULL);
+
+ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+ efsrpc_dissect_efs_SID_ptr, NDR_POINTER_UNIQUE,
+ "SID", -1);
+
+ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+ efsrpc_dissect_EFS_HASH_BLOB, NDR_POINTER_UNIQUE,
+ "EFS_HASH_BLOB", -1);
+
+ offset = dissect_ndr_pointer_cb(
+ tvb, offset, pinfo, tree, drep,
+ dissect_ndr_wchar_cvstring, NDR_POINTER_UNIQUE,
+ "Certificate DN", hf_efsrpc_cert_dn, cb_wstr_postprocess,
+ GINT_TO_POINTER(CB_STR_COL_INFO | 1));
+
+ return offset;
+}
+
+
+static int
+efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH_ptr(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree,
+ guint8 *drep)
+{
+
+ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+ efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH, NDR_POINTER_UNIQUE,
+ "ENCRYPTION_CERTIFICATE_HASH", -1);
+
+ return offset;
+
+}
+
+
+static int
+efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH_array(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree,
+ guint8 *drep)
+{
+ offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep,
+ efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH_ptr);
+
+ return offset;
+}
+
+/*
+IDL typedef struct {
+IDL long nCert_Hash;
+IDL [size_is(nCert_Hash)] [unique] ENCRYPTION_CERTIFICATE_HASH *pUsers;
+IDL } ENCRYPTION_CERTIFICATE_HASH_LIST;
+*/
+
+static int
+efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH_LIST(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_num_entries, NULL);
+
+ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+ efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH_array, NDR_POINTER_UNIQUE,
+ "ENCRYPTION_CERTIFICATE_HASH array:", -1);
+
+ return offset;
+
+}
+
+
+
+/*
+IDL long EfsRpcQueryUsersOnFile(
+IDL [in] [string] wchar_t FileName,
+IDL [out] [ref] ENCRYPTION_CERTIFICATE_HASH_LIST **pUsers
+IDL );
+*/
+
+
+static int
+efsrpc_dissect_query_users_on_file_rqst(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
+ sizeof(guint16),
+ hf_efsrpc_filename, TRUE, NULL);
+
+
+ return offset;
+
+}
+
+
+static int
+efsrpc_dissect_query_users_on_file_reply(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+ efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH_LIST, NDR_POINTER_UNIQUE,
+ "ENCRYPTION_CERTIFICATE_HASH_LIST", -1);
+
+ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_rc, NULL);
+
+ return offset;
+
+}
+
+/*
+IDL long EfsRpcQueryRecoveryAgents(
+IDL [in] [string] wchar_t FileName,
+IDL [out] [ref] ENCRYPTION_CERTIFICATE_HASH_LIST **pRecoveryAgents
+IDL );
+*/
+
+static int
+efsrpc_dissect_query_recovery_agents_rqst(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
+ sizeof(guint16),
+ hf_efsrpc_filename, TRUE, NULL);
+
+ return offset;
+
+}
+
+
+static int
+efsrpc_dissect_query_recovery_agents_reply(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+ efsrpc_dissect_ENCRYPTION_CERTIFICATE_HASH_LIST, NDR_POINTER_UNIQUE,
+ "ENCRYPTION_CERTIFICATE_HASH_LIST", -1);
+
+ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_rc, NULL);
+
+ return offset;
+
+
+}
+
+
+
+/*
+IDL long EfsRpcRemoveUsersFromFile(
+IDL [in] [string] wchar_t FileName,
+IDL [in] ENCRYPTION_CERTIFICATE_LIST Hashes
+IDL );
+*/
+
+static int
+efsrpc_dissect_remove_users_from_file_rqst(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
+ sizeof(guint16),
+ hf_efsrpc_filename, TRUE, NULL);
+#if 0
+ offset = efsrpc_dissect_ENCRYPTION_CERTIFICATE_LIST(tvb, offset,
+ pinfo, tree, drep);
+#endif
+ return offset;
+
+}
+
+
+static int
+efsrpc_dissect_remove_users_from_file_reply(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_rc, NULL);
+
+ return offset;
+
+}
+
+/*
+IDL long EfsRpcAddUsersToFile(
+IDL [in] [string] wchar_t FileName,
+IDL [in] ENCRYPTION_CERTIFICATE_LIST Hashes
+IDL );
+*/
+
+static int
+efsrpc_dissect_add_users_from_file_rqst(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep,
+ sizeof(guint16),
+ hf_efsrpc_filename, TRUE, NULL);
+#if 0
+ offset = efsrpc_dissect_ENCRYPTION_CERTIFICATE_LIST(tvb, offset,
+ pinfo, tree, drep);
+#endif
+ return offset;
+
+}
+
+
+static int
+efsrpc_dissect_add_users_from_file_reply(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree, guint8 *drep)
+{
+
+ offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
+ hf_efsrpc_rc, NULL);
+
+ return offset;
+
+}
+
+
+/*
+IDL typedef struct {
+IDL long dwCertEncodingType;
+IDL long cbData;
+IDL [size_is(cbData)] [unique] byte *pbData
+IDL } EFS_CERTIFICATE_BLOB;
+*/
+
+/*
+IDL typedef struct {
+IDL long TotalLength;
+IDL [unique] SID *pUserSid;
+IDL [unique] EFS_CERTIFICATE_BLOB *pCertBlob;
+IDL } ENCRYPTION_CERTIFICATE;
+*/
+
+/*
+IDL long EfsRpcSetFileEncryptionKey(
+IDL [in] [unique] ENCRYPTION_CERTIFICATE *pEncryptionCertificate
+IDL );
+*/
+
+static dcerpc_sub_dissector dcerpc_efs_dissectors[] = {
+ { EFS_RPC_OPEN_FILE_RAW , "EfsRpcOpenFileRaw",
+ efsrpc_dissect_open_file_raw_rqst,
+ efsrpc_dissect_open_file_raw_reply },
+ { EFS_RPC_READ_FILE_RAW, "EfsRpcReadFileRaw",
+ efsrpc_dissect_read_file_raw_rqst,
+ NULL },
+ { EFS_RPC_WRITE_FILE_RAW, "EfsRpcWriteFileRaw",
+ efsrpc_dissect_write_file_raw_rqst,
+ efsrpc_dissect_write_file_raw_reply },
+ { EFS_RPC_CLOSE_RAW, "EfsRpcCloseRaw",
+ efsrpc_dissect_close_file_raw_rqst,
+ efsrpc_dissect_close_file_raw_reply },
+ { EFS_RPC_ENCRYPT_FILE_SRV, "EfsRpcEncryptFileSrv",
+ efsrpc_dissect_encrypt_file_srv_rqst,
+ efsrpc_dissect_encrypt_file_srv_reply },
+ { EFS_RPC_DECRYPT_FILE_SRV, "EfsRpcDecryptFileSrv",
+ efsrpc_dissect_decrypt_file_srv_rqst,
+ efsrpc_dissect_decrypt_file_srv_reply },
+ { EFS_RPC_QUERY_USERS_ON_FILE, "EfsRpcQueryUsersOnFile",
+ efsrpc_dissect_query_users_on_file_rqst,
+ efsrpc_dissect_query_users_on_file_reply },
+ { EFS_RPC_QUERY_RECOVERY_AGENTS, "EfsRpcQueryRecoveryAgents",
+ efsrpc_dissect_query_recovery_agents_rqst,
+ efsrpc_dissect_query_recovery_agents_reply },
+ { EFS_RPC_REMOVE_USERS_FROM_FILE, "EfsRpcRemoveUsersFromFile",
+ efsrpc_dissect_remove_users_from_file_rqst,
+ efsrpc_dissect_remove_users_from_file_reply },
+ { EFS_RPC_ADD_USERS_TO_FILE, "EfsRpcAddUsersToFile",
+ efsrpc_dissect_add_users_from_file_rqst,
+ efsrpc_dissect_add_users_from_file_reply },
+ { EFS_RPC_SET_FILE_ENCRYPTION_KEY, "EfsRpcSetFileEncryptionKey"
+ , NULL, NULL },
+ { EFS_RPC_NOT_SUPPORTED, "EfsRpcNotSupported"
+ , NULL, NULL },
+ { EFS_RPC_FILE_KEY_INFO, "EfsRpcFileKeyInfo"
+ , NULL, NULL },
+ { EFS_RPC_DUPLICATE_ENCRYPTION_INFO_FILE,
+ "EfsRpcDuplicateEncryptionInfoFile", NULL, NULL },
+ { 0, NULL, NULL, NULL }
+};
+
+void
+proto_register_dcerpc_efs(void)
+{
+static hf_register_info hf[] = {
+ { &hf_efsrpc_opnum, {
+ "Operation", "efsrpc.opnum", FT_UINT16, BASE_DEC,
+ NULL, 0x0, "", HFILL }},
+ { &hf_efsrpc_rc, {
+ "Return code", "efsrpc.rc", FT_UINT32, BASE_HEX,
+ VALS(NT_errors), 0x0, "EFSRPC return code", HFILL }},
+ { &hf_efsrpc_filename,
+ { "Filename", "efsrpc.filename", FT_STRING, BASE_NONE,
+ NULL, 0x0, "File name", HFILL}},
+
+ { &hf_efsrpc_flags, {
+ "Flags", "efsrpc.flags", FT_UINT32, BASE_HEX,
+ NULL, 0x0, "EFSRPC Flags", HFILL }},
+
+ { &hf_efsrpc_hnd, {
+ "Context Handle", "efsrpc.hnd", FT_BYTES,
+ BASE_NONE, NULL, 0x0, "Context Handle", HFILL}},
+
+ { &hf_efsrpc_reserved, {
+ "Reserved value", "efsrpc.reserved", FT_UINT32, BASE_HEX,
+ NULL, 0x0, "Reserved value", HFILL }},
+
+ { &hf_efsrpc_num_entries,
+ { "Number of entries", "efsrpc.num_entries", FT_UINT32,
+ BASE_DEC, NULL, 0x0, "Number of Entries", HFILL}},
+
+ { &hf_efsrpc_data_size,
+ { "Size of data structure", "efsrpc.data_size", FT_UINT32,
+ BASE_DEC, NULL, 0x0, "Size of data structure", HFILL}},
+
+ { &hf_efsrpc_cert_dn,
+ { "Certificate DN", "efsrpc.cert_dn", FT_STRING, BASE_NONE,
+ NULL, 0x0, "Distinguished Name of EFS certificate", HFILL}},
+
+
+ };
+
+ static gint *ett[] = {
+ &ett_dcerpc_efs,
+ &ett_dcerpc_efs_cert_hash
+ };
+
+ proto_dcerpc_efs = proto_register_protocol(
+ "Microsoft Encrypted File System Service", "EFSRPC", "efsrpc");
+
+ proto_register_field_array(proto_dcerpc_efs, hf,
+ array_length(hf));
+
+ proto_register_subtree_array(ett, array_length(ett));
+}
+
+void
+proto_reg_handoff_dcerpc_efs(void)
+{
+ /* Register protocol as dcerpc */
+
+ dcerpc_init_uuid(proto_dcerpc_efs, ett_dcerpc_efs,
+ &uuid_dcerpc_efs, ver_dcerpc_efs,
+ dcerpc_efs_dissectors, hf_efsrpc_opnum);
+}
diff --git a/packet-dcerpc-efs.h b/packet-dcerpc-efs.h
index ee6252b778..31ac17a4d5 100755
--- a/packet-dcerpc-efs.h
+++ b/packet-dcerpc-efs.h
@@ -1,46 +1,46 @@
-/* packet-dcerpc-efs.h
- * Routines for the efsrpc MSRPC interface
- * Copyright 2004 Ronnie Sahlberg, Jean-Baptiste Marchand
- *
- * $Id: packet-dcerpc-efs.h,v 1.1 2004/04/29 22:40:21 sahlberg Exp $
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __PACKET_DCERPC_EFS_H
-#define __PACKET_DCERPC_EFS_H
-
-/* MSRPC functions available in the efsrpc interface */
-
-#define EFS_RPC_OPEN_FILE_RAW 0x00
-#define EFS_RPC_READ_FILE_RAW 0x01
-#define EFS_RPC_WRITE_FILE_RAW 0x02
-#define EFS_RPC_CLOSE_RAW 0x03
-#define EFS_RPC_ENCRYPT_FILE_SRV 0x04
-#define EFS_RPC_DECRYPT_FILE_SRV 0x05
-#define EFS_RPC_QUERY_USERS_ON_FILE 0x06
-#define EFS_RPC_QUERY_RECOVERY_AGENTS 0x07
-#define EFS_RPC_REMOVE_USERS_FROM_FILE 0x08
-#define EFS_RPC_ADD_USERS_TO_FILE 0x09
-#define EFS_RPC_SET_FILE_ENCRYPTION_KEY 0x0a
-#define EFS_RPC_NOT_SUPPORTED 0x0b
-#define EFS_RPC_FILE_KEY_INFO 0x0c
-#define EFS_RPC_DUPLICATE_ENCRYPTION_INFO_FILE 0x0d
-
-#endif /* packet-dcerpc-efs.h */
+/* packet-dcerpc-efs.h
+ * Routines for the efsrpc MSRPC interface
+ * Copyright 2004 Ronnie Sahlberg, Jean-Baptiste Marchand
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __PACKET_DCERPC_EFS_H
+#define __PACKET_DCERPC_EFS_H
+
+/* MSRPC functions available in the efsrpc interface */
+
+#define EFS_RPC_OPEN_FILE_RAW 0x00
+#define EFS_RPC_READ_FILE_RAW 0x01
+#define EFS_RPC_WRITE_FILE_RAW 0x02
+#define EFS_RPC_CLOSE_RAW 0x03
+#define EFS_RPC_ENCRYPT_FILE_SRV 0x04
+#define EFS_RPC_DECRYPT_FILE_SRV 0x05
+#define EFS_RPC_QUERY_USERS_ON_FILE 0x06
+#define EFS_RPC_QUERY_RECOVERY_AGENTS 0x07
+#define EFS_RPC_REMOVE_USERS_FROM_FILE 0x08
+#define EFS_RPC_ADD_USERS_TO_FILE 0x09
+#define EFS_RPC_SET_FILE_ENCRYPTION_KEY 0x0a
+#define EFS_RPC_NOT_SUPPORTED 0x0b
+#define EFS_RPC_FILE_KEY_INFO 0x0c
+#define EFS_RPC_DUPLICATE_ENCRYPTION_INFO_FILE 0x0d
+
+#endif /* packet-dcerpc-efs.h */
diff --git a/packet-dcerpc-epm.c b/packet-dcerpc-epm.c
index 2c2d81e48e..548a3a6c90 100644
--- a/packet-dcerpc-epm.c
+++ b/packet-dcerpc-epm.c
@@ -2,7 +2,7 @@
* Routines for dcerpc endpoint mapper dissection
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc-epm.c,v 1.25 2004/01/19 20:10:33 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-epm4.c b/packet-dcerpc-epm4.c
index 5a364f4cfa..5d4c3ad385 100644
--- a/packet-dcerpc-epm4.c
+++ b/packet-dcerpc-epm4.c
@@ -2,7 +2,7 @@
* Routines for dcerpc endpoint mapper dissection
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc-epm4.c,v 1.2 2004/01/19 20:10:33 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-eventlog.c b/packet-dcerpc-eventlog.c
index 469edf174e..4541330671 100644
--- a/packet-dcerpc-eventlog.c
+++ b/packet-dcerpc-eventlog.c
@@ -2,7 +2,7 @@
* Routines for SMB \pipe\eventlog packet disassembly
* Copyright 2004 Jean-Baptiste Marchand <jbm@hsc.fr>
*
- * $Id: packet-dcerpc-eventlog.c,v 1.1 2004/07/13 05:29:22 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-eventlog.h b/packet-dcerpc-eventlog.h
index aa41baba37..1c8e37eacc 100644
--- a/packet-dcerpc-eventlog.h
+++ b/packet-dcerpc-eventlog.h
@@ -2,7 +2,7 @@
* Routines for SMB \pipe\eventlog packet disassembly
* Copyright 2004 Jean-Baptiste Marchand <jbm@hsc.fr>
*
- * $Id: packet-dcerpc-eventlog.h,v 1.1 2004/07/13 05:29:22 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-fldb.c b/packet-dcerpc-fldb.c
index c281b33f8c..ee39792543 100644
--- a/packet-dcerpc-fldb.c
+++ b/packet-dcerpc-fldb.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/flserver/fldb_proc.idl
*
- * $Id: packet-dcerpc-fldb.c,v 1.8 2004/03/09 09:24:40 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-frsapi.c b/packet-dcerpc-frsapi.c
index b67f919f14..979e708f06 100644
--- a/packet-dcerpc-frsapi.c
+++ b/packet-dcerpc-frsapi.c
@@ -2,7 +2,7 @@
* Routines for the frs API (File Replication Service) MSRPC interface
* Copyright 2004 Jean-Baptiste Marchand <jbm@hsc.fr>
*
- * $Id: packet-dcerpc-frsapi.c,v 1.1 2004/07/10 07:16:54 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-frsapi.h b/packet-dcerpc-frsapi.h
index b3a4c2b1e4..dbd2ba9f5f 100644
--- a/packet-dcerpc-frsapi.h
+++ b/packet-dcerpc-frsapi.h
@@ -2,7 +2,7 @@
* Routines for the frs API (File Replication Service) MSRPC interface
* Copyright 2004 Jean-Baptiste Marchand <jbm@hsc.fr>
*
- * $Id: packet-dcerpc-frsapi.h,v 1.1 2004/07/10 07:16:54 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-frsrpc.c b/packet-dcerpc-frsrpc.c
index fc63858b7d..805e45b661 100644
--- a/packet-dcerpc-frsrpc.c
+++ b/packet-dcerpc-frsrpc.c
@@ -2,7 +2,7 @@
* Routines for the frs (File Replication Service) MSRPC interface
* Copyright 2004 Jean-Baptiste Marchand <jbm@hsc.fr>
*
- * $Id: packet-dcerpc-frsrpc.c,v 1.1 2004/07/10 07:16:54 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-frsrpc.h b/packet-dcerpc-frsrpc.h
index 528d41a3c2..8132405395 100644
--- a/packet-dcerpc-frsrpc.h
+++ b/packet-dcerpc-frsrpc.h
@@ -2,7 +2,7 @@
* Routines for the frs (File Replication Service) MSRPC interface
* Copyright 2004 Jean-Baptiste Marchand <jbm@hsc.fr>
*
- * $Id: packet-dcerpc-frsrpc.h,v 1.1 2004/07/10 07:16:54 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-ftserver.c b/packet-dcerpc-ftserver.c
index 70fe92d46e..8d3223e088 100644
--- a/packet-dcerpc-ftserver.c
+++ b/packet-dcerpc-ftserver.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tgz file/ftserver/ftserver_proc.idl
*
- * $Id: packet-dcerpc-ftserver.c,v 1.5 2004/01/27 04:15:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-icl_rpc.c b/packet-dcerpc-icl_rpc.c
index cd8d49c9b9..16016e6eb7 100644
--- a/packet-dcerpc-icl_rpc.c
+++ b/packet-dcerpc-icl_rpc.c
@@ -4,7 +4,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz icl_rpc.idl
*
- * $Id: packet-dcerpc-icl_rpc.c,v 1.2 2004/01/27 04:15:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-initshutdown.c b/packet-dcerpc-initshutdown.c
index 4fd58210c6..2d38ec1322 100644
--- a/packet-dcerpc-initshutdown.c
+++ b/packet-dcerpc-initshutdown.c
@@ -4,7 +4,7 @@
* Copyright 2001-2003 Tim Potter <tpot@samba.org>
* as per a suggestion by Jim McDonough
*
- * $Id: packet-dcerpc-initshutdown.c,v 1.2 2004/01/19 20:10:33 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-initshutdown.h b/packet-dcerpc-initshutdown.h
index 245fde9b39..4ff8b36eaf 100644
--- a/packet-dcerpc-initshutdown.h
+++ b/packet-dcerpc-initshutdown.h
@@ -4,7 +4,7 @@
* Copyright 2001-2003 Tim Potter <tpot@samba.org>
* as per a suggestion by Jim McDonough
*
- * $Id: packet-dcerpc-initshutdown.h,v 1.1 2003/10/27 23:31:54 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-krb5rpc.c b/packet-dcerpc-krb5rpc.c
index 390d7ee8f8..b062e52db9 100644
--- a/packet-dcerpc-krb5rpc.c
+++ b/packet-dcerpc-krb5rpc.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/krb5rpc.idl
*
- * $Id: packet-dcerpc-krb5rpc.c,v 1.9 2004/06/04 01:56:25 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-llb.c b/packet-dcerpc-llb.c
index 4b595717eb..efbd3e90b4 100755
--- a/packet-dcerpc-llb.c
+++ b/packet-dcerpc-llb.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/admin.tar.gz ./admin/dced/idl/llb.idl
*
- * $Id: packet-dcerpc-llb.c,v 1.1 2004/02/10 23:38:34 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-lsa-ds.c b/packet-dcerpc-lsa-ds.c
index 7c9e3897b3..8f48809115 100644
--- a/packet-dcerpc-lsa-ds.c
+++ b/packet-dcerpc-lsa-ds.c
@@ -3,7 +3,7 @@
* Copyright 2002-2003, Tim Potter <tpot@samba.org>
* Copyright 2002, Jim McDonough <jmcd@samba.org>
*
- * $Id: packet-dcerpc-lsa-ds.c,v 1.14 2004/05/03 19:03:56 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-lsa.c b/packet-dcerpc-lsa.c
index dee93b632e..d276869292 100644
--- a/packet-dcerpc-lsa.c
+++ b/packet-dcerpc-lsa.c
@@ -3,7 +3,7 @@
* Copyright 2001,2003 Tim Potter <tpot@samba.org>
* 2002 Added LSA command dissectors Ronnie Sahlberg
*
- * $Id: packet-dcerpc-lsa.c,v 1.97 2004/06/28 05:35:06 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-lsa.h b/packet-dcerpc-lsa.h
index 500ba00ce4..3347c34d06 100644
--- a/packet-dcerpc-lsa.h
+++ b/packet-dcerpc-lsa.h
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\lsarpc packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-lsa.h,v 1.13 2004/01/19 20:10:33 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-mapi.c b/packet-dcerpc-mapi.c
index dc3d4d519e..5792f418e0 100644
--- a/packet-dcerpc-mapi.c
+++ b/packet-dcerpc-mapi.c
@@ -2,7 +2,7 @@
* Routines for MS Exchange MAPI
* Copyright 2002, Ronnie Sahlberg
*
- * $Id: packet-dcerpc-mapi.c,v 1.27 2004/02/25 09:31:05 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-mapi.h b/packet-dcerpc-mapi.h
index 8c03cee131..ca92d508e9 100644
--- a/packet-dcerpc-mapi.h
+++ b/packet-dcerpc-mapi.h
@@ -2,7 +2,7 @@
* Routines for MS Exchange MAPI dissection
* Copyright 2002, Ronnie Sahlberg
*
- * $Id: packet-dcerpc-mapi.h,v 1.4 2003/10/24 00:42:16 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-messenger.c b/packet-dcerpc-messenger.c
index 6fb350b9c2..757fe2fb02 100644
--- a/packet-dcerpc-messenger.c
+++ b/packet-dcerpc-messenger.c
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\msgsvc packet disassembly
* Copyright 2003 Ronnie Sahlberg
*
- * $Id: packet-dcerpc-messenger.c,v 1.6 2004/01/19 20:10:34 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-mgmt.c b/packet-dcerpc-mgmt.c
index 5c5153e7c4..ac4f3e56a5 100644
--- a/packet-dcerpc-mgmt.c
+++ b/packet-dcerpc-mgmt.c
@@ -2,7 +2,7 @@
* Routines for dcerpc mgmt dissection
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc-mgmt.c,v 1.7 2003/08/04 02:49:02 tpot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-ndr.c b/packet-dcerpc-ndr.c
index 60d20365dd..df2193ca72 100644
--- a/packet-dcerpc-ndr.c
+++ b/packet-dcerpc-ndr.c
@@ -2,7 +2,7 @@
* Routines for DCERPC NDR dissection
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc-ndr.c,v 1.15 2004/01/19 20:10:34 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-netlogon.c b/packet-dcerpc-netlogon.c
index a6edda99ea..7f06a040ac 100644
--- a/packet-dcerpc-netlogon.c
+++ b/packet-dcerpc-netlogon.c
@@ -3,7 +3,7 @@
* Copyright 2001,2003 Tim Potter <tpot@samba.org>
* 2002 structure and command dissectors by Ronnie Sahlberg
*
- * $Id: packet-dcerpc-netlogon.c,v 1.106 2004/05/19 04:52:31 tpot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-netlogon.h b/packet-dcerpc-netlogon.h
index b97237e5e5..429d525e78 100644
--- a/packet-dcerpc-netlogon.h
+++ b/packet-dcerpc-netlogon.h
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\NETLOGON packet disassembly
* Copyright 2001,2003 Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-netlogon.h,v 1.17 2004/03/05 23:12:10 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-nspi.c b/packet-dcerpc-nspi.c
index 1ce17b5288..459bd503d9 100644
--- a/packet-dcerpc-nspi.c
+++ b/packet-dcerpc-nspi.c
@@ -2,7 +2,7 @@
* Routines for dcerpc nspi dissection
* Copyright 2001, Todd Sabin <tsabin@optonline.net>
*
- * $Id: packet-dcerpc-nspi.c,v 1.4 2002/08/02 23:35:48 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-nt.c b/packet-dcerpc-nt.c
index 12d2d20509..5af4750a3c 100644
--- a/packet-dcerpc-nt.c
+++ b/packet-dcerpc-nt.c
@@ -2,7 +2,7 @@
* Routines for DCERPC over SMB packet disassembly
* Copyright 2001-2003, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-nt.c,v 1.80 2004/05/19 04:52:31 tpot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-nt.h b/packet-dcerpc-nt.h
index c6457814ad..59dc173469 100644
--- a/packet-dcerpc-nt.h
+++ b/packet-dcerpc-nt.h
@@ -2,7 +2,7 @@
* Routines for DCERPC over SMB packet disassembly
* Copyright 2001-2003 Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-nt.h,v 1.50 2004/05/19 04:52:31 tpot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-oxid.c b/packet-dcerpc-oxid.c
index 7381784bc1..0c31a527a0 100644
--- a/packet-dcerpc-oxid.c
+++ b/packet-dcerpc-oxid.c
@@ -2,7 +2,7 @@
* Routines for DCOM OXID Resolver
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc-oxid.c,v 1.11 2004/01/19 20:10:35 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rdaclif.c b/packet-dcerpc-rdaclif.c
index 7e9ba3bb29..fb0b431f96 100755
--- a/packet-dcerpc-rdaclif.c
+++ b/packet-dcerpc-rdaclif.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz ../security/idl/rdaclif.idl
*
- * $Id: packet-dcerpc-rdaclif.c,v 1.1 2004/02/10 23:38:34 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-reg.c b/packet-dcerpc-reg.c
index 75370a3a36..5cc600ad13 100644
--- a/packet-dcerpc-reg.c
+++ b/packet-dcerpc-reg.c
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\winreg packet disassembly
* Copyright 2001-2003 Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-reg.c,v 1.24 2004/01/19 20:10:35 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-reg.h b/packet-dcerpc-reg.h
index 6700deac25..6c7805aefb 100644
--- a/packet-dcerpc-reg.h
+++ b/packet-dcerpc-reg.h
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\winreg packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-reg.h,v 1.8 2003/09/28 11:35:20 tpot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-remact.c b/packet-dcerpc-remact.c
index 2967c65c92..352940929a 100644
--- a/packet-dcerpc-remact.c
+++ b/packet-dcerpc-remact.c
@@ -2,7 +2,7 @@
* Routines for DCOM Remote Activation
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
- * $Id: packet-dcerpc-remact.c,v 1.8 2003/08/04 02:49:02 tpot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rep_proc.c b/packet-dcerpc-rep_proc.c
index 3179a5e941..350b22ade1 100644
--- a/packet-dcerpc-rep_proc.c
+++ b/packet-dcerpc-rep_proc.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tgz file/fsint/rep_proc.idl
*
- * $Id: packet-dcerpc-rep_proc.c,v 1.5 2004/01/27 04:15:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-roverride.c b/packet-dcerpc-roverride.c
index b304467905..1423a6376a 100644
--- a/packet-dcerpc-roverride.c
+++ b/packet-dcerpc-roverride.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/roverride.idl
*
- * $Id: packet-dcerpc-roverride.c,v 1.5 2004/01/27 04:15:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rpriv.c b/packet-dcerpc-rpriv.c
index 3e4b2ae93e..50018c7b03 100644
--- a/packet-dcerpc-rpriv.c
+++ b/packet-dcerpc-rpriv.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rpriv.idl
*
- * $Id: packet-dcerpc-rpriv.c,v 1.11 2004/06/29 08:20:53 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_acct.c b/packet-dcerpc-rs_acct.c
index ee89b7abc8..f5d38ecb7e 100644
--- a/packet-dcerpc-rs_acct.c
+++ b/packet-dcerpc-rs_acct.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_acct.idl
*
- * $Id: packet-dcerpc-rs_acct.c,v 1.9 2004/06/29 08:20:53 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_attr.c b/packet-dcerpc-rs_attr.c
index 4bdb885d5b..7c6f3f3e8e 100644
--- a/packet-dcerpc-rs_attr.c
+++ b/packet-dcerpc-rs_attr.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_attr.idl
*
- * $Id: packet-dcerpc-rs_attr.c,v 1.5 2004/01/27 04:15:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_attr_schema.c b/packet-dcerpc-rs_attr_schema.c
index 6825fbddaa..7f3d768678 100755
--- a/packet-dcerpc-rs_attr_schema.c
+++ b/packet-dcerpc-rs_attr_schema.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_attr_schema.idl
*
- * $Id: packet-dcerpc-rs_attr_schema.c,v 1.1 2004/02/10 23:38:34 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_bind.c b/packet-dcerpc-rs_bind.c
index aeadc20552..eda49acbeb 100644
--- a/packet-dcerpc-rs_bind.c
+++ b/packet-dcerpc-rs_bind.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_bind.idl
*
- * $Id: packet-dcerpc-rs_bind.c,v 1.3 2004/01/27 04:15:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_misc.c b/packet-dcerpc-rs_misc.c
index 18146894aa..27fb388910 100644
--- a/packet-dcerpc-rs_misc.c
+++ b/packet-dcerpc-rs_misc.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_misc.idl
*
- * $Id: packet-dcerpc-rs_misc.c,v 1.9 2004/06/29 08:20:53 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_pgo.c b/packet-dcerpc-rs_pgo.c
index 924e2f8af1..8357184eec 100644
--- a/packet-dcerpc-rs_pgo.c
+++ b/packet-dcerpc-rs_pgo.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_pgo.idl
*
- * $Id: packet-dcerpc-rs_pgo.c,v 1.12 2004/03/09 09:24:41 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_plcy.c b/packet-dcerpc-rs_plcy.c
index 7aa74cd7ac..58b499d010 100644
--- a/packet-dcerpc-rs_plcy.c
+++ b/packet-dcerpc-rs_plcy.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz rs_plcy.idl
*
- * $Id: packet-dcerpc-rs_plcy.c,v 1.2 2004/01/27 04:15:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_prop_acct.c b/packet-dcerpc-rs_prop_acct.c
index dbe0ba5d74..49f0401659 100644
--- a/packet-dcerpc-rs_prop_acct.c
+++ b/packet-dcerpc-rs_prop_acct.c
@@ -4,7 +4,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz bubasics/rs_prop_acct.idl
*
- * $Id: packet-dcerpc-rs_prop_acct.c,v 1.2 2004/01/27 04:15:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_prop_acl.c b/packet-dcerpc-rs_prop_acl.c
index 02b0a39a8d..2a96a833bb 100755
--- a/packet-dcerpc-rs_prop_acl.c
+++ b/packet-dcerpc-rs_prop_acl.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_acl.idl
*
- * $Id: packet-dcerpc-rs_prop_acl.c,v 1.1 2004/02/10 23:38:34 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_prop_attr.c b/packet-dcerpc-rs_prop_attr.c
index ab91089f2c..f03bbfe0ae 100755
--- a/packet-dcerpc-rs_prop_attr.c
+++ b/packet-dcerpc-rs_prop_attr.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_attr.idl
*
- * $Id: packet-dcerpc-rs_prop_attr.c,v 1.1 2004/02/10 23:38:34 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_prop_pgo.c b/packet-dcerpc-rs_prop_pgo.c
index bd38468883..5dbe7a9d3f 100755
--- a/packet-dcerpc-rs_prop_pgo.c
+++ b/packet-dcerpc-rs_prop_pgo.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_pgo.idl
*
- * $Id: packet-dcerpc-rs_prop_pgo.c,v 1.1 2004/02/10 23:38:34 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_prop_plcy.c b/packet-dcerpc-rs_prop_plcy.c
index 98662c603e..afcace8964 100755
--- a/packet-dcerpc-rs_prop_plcy.c
+++ b/packet-dcerpc-rs_prop_plcy.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_plcy.idl
*
- * $Id: packet-dcerpc-rs_prop_plcy.c,v 1.3 2004/03/25 08:01:14 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_pwd_mgmt.c b/packet-dcerpc-rs_pwd_mgmt.c
index 5d615d5f37..7e029e1ccf 100755
--- a/packet-dcerpc-rs_pwd_mgmt.c
+++ b/packet-dcerpc-rs_pwd_mgmt.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_pwd_mgmt.idl
*
- * $Id: packet-dcerpc-rs_pwd_mgmt.c,v 1.1 2004/02/10 23:38:34 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_repadm.c b/packet-dcerpc-rs_repadm.c
index 6486cac105..6f1d035595 100644
--- a/packet-dcerpc-rs_repadm.c
+++ b/packet-dcerpc-rs_repadm.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_repadm.idl
*
- * $Id: packet-dcerpc-rs_repadm.c,v 1.8 2004/06/29 08:20:53 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_replist.c b/packet-dcerpc-rs_replist.c
index b3ebc10519..e0baac8d3a 100644
--- a/packet-dcerpc-rs_replist.c
+++ b/packet-dcerpc-rs_replist.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_repadm.idl
*
- * $Id: packet-dcerpc-rs_replist.c,v 1.5 2004/01/27 04:15:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_repmgr.c b/packet-dcerpc-rs_repmgr.c
index ebb47d7bf5..d9e52e9359 100755
--- a/packet-dcerpc-rs_repmgr.c
+++ b/packet-dcerpc-rs_repmgr.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_repmgr.idl
*
- * $Id: packet-dcerpc-rs_repmgr.c,v 1.1 2004/02/10 23:38:34 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rs_unix.c b/packet-dcerpc-rs_unix.c
index 6ad8205f98..e51963adfa 100644
--- a/packet-dcerpc-rs_unix.c
+++ b/packet-dcerpc-rs_unix.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_unix.idl
*
- * $Id: packet-dcerpc-rs_unix.c,v 1.6 2004/06/29 08:20:53 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-rsec_login.c b/packet-dcerpc-rsec_login.c
index c8a341e50a..26b11e304c 100644
--- a/packet-dcerpc-rsec_login.c
+++ b/packet-dcerpc-rsec_login.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rsec_login.idl
*
- * $Id: packet-dcerpc-rsec_login.c,v 1.5 2004/01/27 04:15:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-samr.c b/packet-dcerpc-samr.c
index b296626197..9e6d52fb43 100644
--- a/packet-dcerpc-samr.c
+++ b/packet-dcerpc-samr.c
@@ -3,7 +3,7 @@
* Copyright 2001,2003 Tim Potter <tpot@samba.org>
* 2002 Added all command dissectors Ronnie Sahlberg
*
- * $Id: packet-dcerpc-samr.c,v 1.111 2004/06/28 05:54:35 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-samr.h b/packet-dcerpc-samr.h
index 4e331e2c5a..b8b83a7296 100644
--- a/packet-dcerpc-samr.h
+++ b/packet-dcerpc-samr.h
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\samr packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-samr.h,v 1.12 2003/09/29 00:01:27 tpot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-secidmap.c b/packet-dcerpc-secidmap.c
index 08825c5d52..9161d52422 100644
--- a/packet-dcerpc-secidmap.c
+++ b/packet-dcerpc-secidmap.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rsecidmap.idl
*
- * $Id: packet-dcerpc-secidmap.c,v 1.6 2004/06/29 08:20:54 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-spoolss.c b/packet-dcerpc-spoolss.c
index b75a7fe23c..86220411b3 100644
--- a/packet-dcerpc-spoolss.c
+++ b/packet-dcerpc-spoolss.c
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\spoolss packet disassembly
* Copyright 2001-2003, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-spoolss.c,v 1.108 2004/03/30 07:39:04 sharpe Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-spoolss.h b/packet-dcerpc-spoolss.h
index 4e7ab9ccfd..34a718dbaa 100644
--- a/packet-dcerpc-spoolss.h
+++ b/packet-dcerpc-spoolss.h
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\spoolss packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-spoolss.h,v 1.18 2003/02/14 06:21:30 tpot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-srvsvc.c b/packet-dcerpc-srvsvc.c
index 43c5991c0a..d699a3be33 100644
--- a/packet-dcerpc-srvsvc.c
+++ b/packet-dcerpc-srvsvc.c
@@ -9,7 +9,7 @@
* 2002, some share information levels implemented based on samba
* sources.
*
- * $Id: packet-dcerpc-srvsvc.c,v 1.65 2004/06/28 05:17:13 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-srvsvc.h b/packet-dcerpc-srvsvc.h
index 5d730684c8..008b2624ad 100644
--- a/packet-dcerpc-srvsvc.h
+++ b/packet-dcerpc-srvsvc.h
@@ -7,7 +7,7 @@
* Rewrote entire file with a complete and correct list of all
* function names. Ronnie Sahlberg
*
- * $Id: packet-dcerpc-srvsvc.h,v 1.7 2003/09/27 23:34:57 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-svcctl.c b/packet-dcerpc-svcctl.c
index 09663c5c2a..b2040cbfc6 100644
--- a/packet-dcerpc-svcctl.c
+++ b/packet-dcerpc-svcctl.c
@@ -3,7 +3,7 @@
* Copyright 2003, Tim Potter <tpot@samba.org>
* Copyright 2003, Ronnie Sahlberg, added function dissectors
*
- * $Id: packet-dcerpc-svcctl.c,v 1.15 2004/03/30 07:39:05 sharpe Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-svcctl.h b/packet-dcerpc-svcctl.h
index ca12edb198..f5431e7746 100644
--- a/packet-dcerpc-svcctl.h
+++ b/packet-dcerpc-svcctl.h
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\svcctl packet disassembly
* Copyright 2003, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-svcctl.h,v 1.6 2003/10/02 21:40:22 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-tapi.c b/packet-dcerpc-tapi.c
index 359bbfc99c..628b04841d 100644
--- a/packet-dcerpc-tapi.c
+++ b/packet-dcerpc-tapi.c
@@ -2,7 +2,7 @@
* Routines for DCERPC TAPI packet disassembly
* Copyright 2002, Ronnie Sahlberg
*
- * $Id: packet-dcerpc-tapi.c,v 1.9 2004/01/19 20:10:36 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-tapi.h b/packet-dcerpc-tapi.h
index b4a5ac0ac8..8749c79401 100644
--- a/packet-dcerpc-tapi.h
+++ b/packet-dcerpc-tapi.h
@@ -2,7 +2,7 @@
* Routines for DCERPC TAPI packet disassembly
* Copyright 2002, Ronnie Sahlberg
*
- * $Id: packet-dcerpc-tapi.h,v 1.3 2003/10/22 01:55:04 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-tkn4int.c b/packet-dcerpc-tkn4int.c
index c47a9f72ff..55a5376595 100644
--- a/packet-dcerpc-tkn4int.c
+++ b/packet-dcerpc-tkn4int.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/fsint/tkn4int.idl
*
- * $Id: packet-dcerpc-tkn4int.c,v 1.5 2004/01/27 04:15:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-trksvr.c b/packet-dcerpc-trksvr.c
index a7b3304125..e819c57346 100644
--- a/packet-dcerpc-trksvr.c
+++ b/packet-dcerpc-trksvr.c
@@ -2,7 +2,7 @@
* Routines for DCERPC Distributed Link tracking Server packet disassembly
* Copyright 2003, Ronnie Sahlberg
*
- * $Id: packet-dcerpc-trksvr.c,v 1.1 2003/12/16 05:07:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-ubikdisk.c b/packet-dcerpc-ubikdisk.c
index b3cb8114e0..c68b3d7e04 100644
--- a/packet-dcerpc-ubikdisk.c
+++ b/packet-dcerpc-ubikdisk.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/ncsubik/ubikdisk_proc.idl
*
- * $Id: packet-dcerpc-ubikdisk.c,v 1.5 2004/01/27 04:15:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-ubikvote.c b/packet-dcerpc-ubikvote.c
index 38ccd226e6..eb9e79d162 100644
--- a/packet-dcerpc-ubikvote.c
+++ b/packet-dcerpc-ubikvote.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/ncsubik/ubikvote_proc.idl
*
- * $Id: packet-dcerpc-ubikvote.c,v 1.5 2004/01/27 04:15:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-update.c b/packet-dcerpc-update.c
index a2b5d72052..9da2fa232e 100644
--- a/packet-dcerpc-update.c
+++ b/packet-dcerpc-update.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/update/update.idl
*
- * $Id: packet-dcerpc-update.c,v 1.5 2004/01/27 04:15:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-wkssvc.c b/packet-dcerpc-wkssvc.c
index 0382d4c1ae..ed18756b1e 100644
--- a/packet-dcerpc-wkssvc.c
+++ b/packet-dcerpc-wkssvc.c
@@ -3,7 +3,7 @@
* Copyright 2001, Tim Potter <tpot@samba.org>
* Copyright 2003, Richard Sharpe <rsharpe@richardsharpe.com>
*
- * $Id: packet-dcerpc-wkssvc.c,v 1.33 2004/06/28 05:22:55 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc-wkssvc.h b/packet-dcerpc-wkssvc.h
index 008e3105a1..5b442ba764 100644
--- a/packet-dcerpc-wkssvc.h
+++ b/packet-dcerpc-wkssvc.h
@@ -3,7 +3,7 @@
* Copyright 2001, Tim Potter <tpot@samba.org>
* Copyright 2002, Richard Sharpe <rsharpe@richardsharpe.org>
*
- * $Id: packet-dcerpc-wkssvc.h,v 1.8 2003/09/27 23:43:29 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc.c b/packet-dcerpc.c
index 8c27532a1b..98d8a2854b 100644
--- a/packet-dcerpc.c
+++ b/packet-dcerpc.c
@@ -3,7 +3,7 @@
* Copyright 2001, Todd Sabin <tas@webspan.net>
* Copyright 2003, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc.c,v 1.180 2004/06/24 07:43:24 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcerpc.h b/packet-dcerpc.h
index 8d90878066..2ef9774a1e 100644
--- a/packet-dcerpc.h
+++ b/packet-dcerpc.h
@@ -2,7 +2,7 @@
* Copyright 2001, Todd Sabin <tas@webspan.net>
* Copyright 2003, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc.h,v 1.43 2004/06/09 09:24:07 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dcm.c b/packet-dcm.c
index 8262e17c9f..cb42cf01ce 100644
--- a/packet-dcm.c
+++ b/packet-dcm.c
@@ -11,7 +11,7 @@
* DICOM packets correctly.
* This should probably be documented somewhere besides here.)
*
- * $Id: packet-dcm.c,v 1.4 2004/07/09 23:17:04 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ddtp.c b/packet-ddtp.c
index 7f5b92a81c..b5d1c0ddb1 100644
--- a/packet-ddtp.c
+++ b/packet-ddtp.c
@@ -3,7 +3,7 @@
* see http://ddt.sourceforge.net/
* Olivier Abad <oabad@noos.fr>
*
- * $Id: packet-ddtp.c,v 1.24 2003/01/19 21:43:18 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ddtp.h b/packet-ddtp.h
index 6e1d5c7d85..599b25c2a1 100644
--- a/packet-ddtp.h
+++ b/packet-ddtp.h
@@ -3,7 +3,7 @@
* see http://ddt.sourceforge.net/
* Olivier Abad <oabad@noos.fr>
*
- * $Id: packet-ddtp.h,v 1.5 2002/09/01 14:30:30 oabad Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-dec-bpdu.c b/packet-dec-bpdu.c
index 5b3d2b5cec..13c4984133 100644
--- a/packet-dec-bpdu.c
+++ b/packet-dec-bpdu.c
@@ -1,7 +1,7 @@
/* packet-dec-bpdu.c
* Routines for DEC BPDU (DEC Spanning Tree Protocol) disassembly
*
- * $Id: packet-dec-bpdu.c,v 1.15 2002/08/28 21:00:12 jmayer Exp $
+ * $Id$
*
* Copyright 2001 Paul Ionescu <paul@acorp.ro>
*
diff --git a/packet-dhcpv6.c b/packet-dhcpv6.c
index 75c3654819..528969277f 100644
--- a/packet-dhcpv6.c
+++ b/packet-dhcpv6.c
@@ -5,7 +5,7 @@
* SHIRASAKI Yasuhiro <yasuhiro@gnome.gr.jp>
* Tony Lindstrom <tony.lindstrom@ericsson.com>
*
- * $Id: packet-dhcpv6.c,v 1.11 2004/02/25 09:31:05 guy Exp $
+ * $Id$
*
* The information used comes from:
* RFC3315.txt
diff --git a/packet-diameter-defs.h b/packet-diameter-defs.h
index 1fd0b07ec1..0a4d6c96cf 100644
--- a/packet-diameter-defs.h
+++ b/packet-diameter-defs.h
@@ -5,7 +5,7 @@
* AVPs. If libxml is in the LD_LIBRARY_PATH, and dictionary.xml exists,
* then it will not be used.
*
- * $Id: packet-diameter-defs.h,v 1.12 2004/04/02 05:07:42 guy Exp $
+ * $Id$
* Generated: Fri Feb 23 13:04:15 2001
* References:
* http://www.ietf.org/rfc/rfc3588.txt
diff --git a/packet-diameter.c b/packet-diameter.c
index b2a78aab93..acb9466014 100644
--- a/packet-diameter.c
+++ b/packet-diameter.c
@@ -1,7 +1,7 @@
/* packet-diameter.c
* Routines for Diameter packet disassembly
*
- * $Id: packet-diameter.c,v 1.68 2004/04/25 10:40:42 etxrab Exp $
+ * $Id$
*
* Copyright (c) 2001 by David Frascone <dave@frascone.com>
*
diff --git a/packet-diffserv-mpls-common.c b/packet-diffserv-mpls-common.c
index 71d93490c2..7491854239 100644
--- a/packet-diffserv-mpls-common.c
+++ b/packet-diffserv-mpls-common.c
@@ -2,7 +2,7 @@
* Routines for the common part of Diffserv MPLS signaling protocols
* Author: Endoh Akira (endoh@netmarks.co.jp)
*
- * $Id: packet-diffserv-mpls-common.c,v 1.2 2003/10/13 20:53:30 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-diffserv-mpls-common.h b/packet-diffserv-mpls-common.h
index 4df889c2a7..4294ee06a8 100644
--- a/packet-diffserv-mpls-common.h
+++ b/packet-diffserv-mpls-common.h
@@ -2,7 +2,7 @@
* Routines for the common part of Diffserv MPLS signaling protocols
* Author: Endoh Akira (endoh@netmarks.co.jp)
*
- * $Id: packet-diffserv-mpls-common.h,v 1.2 2003/10/13 20:53:30 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-distcc.c b/packet-distcc.c
index a927861f25..a17e2d2ddd 100644
--- a/packet-distcc.c
+++ b/packet-distcc.c
@@ -3,7 +3,7 @@
* Copyright 2003, Brad Hards <bradh@frogmouth.net>
* Copyright 2003, Ronnie Sahlberg, added TCP desegmentation.
*
- * $Id: packet-distcc.c,v 1.5 2004/01/25 15:56:04 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dlsw.c b/packet-dlsw.c
index b4c5e700ef..7c7de82851 100644
--- a/packet-dlsw.c
+++ b/packet-dlsw.c
@@ -2,7 +2,7 @@
* Routines for DLSw packet dissection (Data Link Switching)
* Copyright 2001, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-dlsw.c,v 1.7 2002/08/28 21:00:12 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dnp.c b/packet-dnp.c
index 2e9dc6ea3d..7e58442869 100644
--- a/packet-dnp.c
+++ b/packet-dnp.c
@@ -2,7 +2,7 @@
* Routines for DNP dissection
* Copyright 2003, Graham Bloice <graham.bloice@trihedral.com>
*
- * $Id: packet-dnp.c,v 1.1 2004/06/04 00:12:12 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dns.c b/packet-dns.c
index cb20d28c82..bf23288f13 100644
--- a/packet-dns.c
+++ b/packet-dns.c
@@ -1,7 +1,7 @@
/* packet-dns.c
* Routines for DNS packet disassembly
*
- * $Id: packet-dns.c,v 1.120 2004/01/23 19:16:52 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dns.h b/packet-dns.h
index 86831e2150..5f751c7c7d 100644
--- a/packet-dns.h
+++ b/packet-dns.h
@@ -2,7 +2,7 @@
* Definitions for packet disassembly structures and routines used both by
* DNS and NBNS.
*
- * $Id: packet-dns.h,v 1.13 2002/08/28 21:00:12 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dsi.c b/packet-dsi.c
index 4437c1872b..adbc28ed64 100644
--- a/packet-dsi.c
+++ b/packet-dsi.c
@@ -2,7 +2,7 @@
* Routines for dsi packet dissection
* Copyright 2001, Randy McEoin <rmceoin@pe.com>
*
- * $Id: packet-dsi.c,v 1.30 2004/02/25 09:31:05 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dvmrp.c b/packet-dvmrp.c
index dbbb89dfb7..9c919385fe 100644
--- a/packet-dvmrp.c
+++ b/packet-dvmrp.c
@@ -1,7 +1,7 @@
/* packet-dvmrp.c 2001 Ronnie Sahlberg <See AUTHORS for email>
* Routines for IGMP/DVMRP packet disassembly
*
- * $Id: packet-dvmrp.c,v 1.14 2003/11/16 23:17:17 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-dvmrp.h b/packet-dvmrp.h
index d524dc3c5d..3e29d614cd 100644
--- a/packet-dvmrp.h
+++ b/packet-dvmrp.h
@@ -1,7 +1,7 @@
/* packet-dvmrp.h 2001 Ronnie Sahlberg <See AUTHORS for email>
* Declarations of routines for IGMP/DVMRP packet disassembly
*
- * $Id: packet-dvmrp.h,v 1.3 2002/08/28 21:00:12 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-e164.c b/packet-e164.c
index 974e5cfcfc..6e449c6be0 100644
--- a/packet-e164.c
+++ b/packet-e164.c
@@ -3,7 +3,7 @@
* to many dissectors.
* Copyright 2004, Anders Broman <anders.broman@ericsson.com>
*
- * $Id: packet-e164.c,v 1.2 2004/03/19 10:24:43 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-e164.h b/packet-e164.h
index f8990a8517..a9d2ced989 100644
--- a/packet-e164.h
+++ b/packet-e164.h
@@ -2,7 +2,7 @@
* E164 tables
* Copyright 2004, Anders Broman <anders.broman@ericsson.com>
*
- * $Id: packet-e164.h,v 1.1 2004/03/05 10:29:35 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-eap.c b/packet-eap.c
index 29c5d4836b..d419598a1e 100644
--- a/packet-eap.c
+++ b/packet-eap.c
@@ -2,7 +2,7 @@
* Routines for EAP Extensible Authentication Protocol dissection
* RFC 2284, RFC 3748
*
- * $Id: packet-eap.c,v 1.37 2004/07/04 10:26:01 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-eapol.c b/packet-eapol.c
index 5fe09ff0d2..80a78c6c6c 100644
--- a/packet-eapol.c
+++ b/packet-eapol.c
@@ -3,7 +3,7 @@
* (From IEEE Draft P802.1X/D11; is there a later draft, or a
* final standard? If so, check it.)
*
- * $Id: packet-eapol.c,v 1.19 2004/04/07 06:04:22 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-echo.c b/packet-echo.c
index 3b3daa1098..b90883041b 100644
--- a/packet-echo.c
+++ b/packet-echo.c
@@ -6,7 +6,7 @@
*
* Laurent Deniel <laurent.deniel@free.fr>
*
- * $Id: packet-echo.c,v 1.1 2003/06/25 13:42:18 deniel Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-edonkey.c b/packet-edonkey.c
index 342ca9a651..038c224162 100644
--- a/packet-edonkey.c
+++ b/packet-edonkey.c
@@ -5,7 +5,7 @@
* http://savannah.nongnu.org/download/mldonkey/docs/Edonkey-Overnet/edonkey-protocol.txt
* http://savannah.nongnu.org/download/mldonkey/docs/Edonkey-Overnet/overnet-protocol.txt
*
- * $Id: packet-edonkey.c,v 1.1 2003/07/16 21:13:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-edonkey.h b/packet-edonkey.h
index 0aef851218..21bb2e6c60 100644
--- a/packet-edonkey.h
+++ b/packet-edonkey.h
@@ -5,7 +5,7 @@
* http://savannah.nongnu.org/download/mldonkey/docs/Edonkey-Overnet/edonkey-protocol.txt
* http://savannah.nongnu.org/download/mldonkey/docs/Edonkey-Overnet/overnet-protocol.txt
*
- * $Id: packet-edonkey.h,v 1.1 2003/07/16 21:13:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-eigrp.c b/packet-eigrp.c
index a76d021607..70138f71b2 100644
--- a/packet-eigrp.c
+++ b/packet-eigrp.c
@@ -2,7 +2,7 @@
* Routines for EIGRP dissection
* Copyright 2000, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-eigrp.c,v 1.27 2004/03/06 03:25:09 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-enc.c b/packet-enc.c
index 1661cb0af7..e061f454a0 100644
--- a/packet-enc.c
+++ b/packet-enc.c
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2003 Markus Friedl. All rights reserved.
*
- * $Id: packet-enc.c,v 1.2 2003/03/08 09:11:51 guy Exp $
+ * $Id$
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/packet-enip.c b/packet-enip.c
index 756833eb75..0ceb080ca5 100644
--- a/packet-enip.c
+++ b/packet-enip.c
@@ -6,7 +6,7 @@
* Magnus Hansson <mah@hms.se>
* Joakim Wiberg <jow@hms.se>
*
- * $Id: packet-enip.c,v 1.11 2004/06/02 06:30:15 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-enrp.c b/packet-enrp.c
index 9ad2e4903c..1aa87c442b 100644
--- a/packet-enrp.c
+++ b/packet-enrp.c
@@ -13,7 +13,7 @@
*
* Copyright 2004, Michael Tuexen <tuexen [AT] fh-muenster.de>
*
- * $Id: packet-enrp.c,v 1.2 2004/07/09 19:50:00 tuexen Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-esis.c b/packet-esis.c
index e412c91e4a..b923067719 100644
--- a/packet-esis.c
+++ b/packet-esis.c
@@ -2,7 +2,7 @@
* Routines for ISO/OSI End System to Intermediate System
* Routing Exchange Protocol ISO 9542.
*
- * $Id: packet-esis.c,v 1.31 2003/12/21 05:51:33 jmayer Exp $
+ * $Id$
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
* Ethereal - Network traffic analyzer
diff --git a/packet-esis.h b/packet-esis.h
index 297e88777c..f2231c68db 100644
--- a/packet-esis.h
+++ b/packet-esis.h
@@ -1,7 +1,7 @@
/* packet-esis.h
* Defines and such for ESIS protocol decode.
*
- * $Id: packet-esis.h,v 1.4 2002/08/28 21:00:13 jmayer Exp $
+ * $Id$
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
* Ethereal - Network traffic analyzer
diff --git a/packet-eth.c b/packet-eth.c
index a5d07880ae..89b49b6d30 100644
--- a/packet-eth.c
+++ b/packet-eth.c
@@ -1,7 +1,7 @@
/* packet-eth.c
* Routines for ethernet packet disassembly
*
- * $Id: packet-eth.c,v 1.90 2004/06/26 09:48:11 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-eth.h b/packet-eth.h
index d775264269..df190750d9 100644
--- a/packet-eth.h
+++ b/packet-eth.h
@@ -1,6 +1,6 @@
/* packet-eth.h
*
- * $Id: packet-eth.h,v 1.13 2003/10/01 07:11:44 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-etherip.c b/packet-etherip.c
index 87cfc1eb9e..302a422579 100644
--- a/packet-etherip.c
+++ b/packet-etherip.c
@@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: packet-etherip.c,v 1.2 2003/10/02 22:44:19 guy Exp $
+ * $Id$
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
diff --git a/packet-ethertype.c b/packet-ethertype.c
index 83bf5bfbc8..ecbc6dc9cb 100644
--- a/packet-ethertype.c
+++ b/packet-ethertype.c
@@ -1,7 +1,7 @@
/* ethertype.c
* Routines for calling the right protocol for the ethertype.
*
- * $Id: packet-ethertype.c,v 1.46 2004/04/07 06:04:22 guy Exp $
+ * $Id$
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
diff --git a/packet-fc.c b/packet-fc.c
index 32ff569dcb..68253d2965 100644
--- a/packet-fc.c
+++ b/packet-fc.c
@@ -4,7 +4,7 @@
* Copyright 2003 Ronnie Sahlberg, exchange first/last matching and
* tap listener and misc updates
*
- * $Id: packet-fc.c,v 1.18 2004/02/19 00:29:15 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fc.h b/packet-fc.h
index a542382e88..772a9f4ce0 100644
--- a/packet-fc.h
+++ b/packet-fc.h
@@ -2,7 +2,7 @@
* Basic Fibre Channel Header definitions
* Copyright 2002 Dinesh G Dutt (ddutt@cisco.com)
*
- * $Id: packet-fc.h,v 1.6 2004/05/09 10:03:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcbls.h b/packet-fcbls.h
index 19ccd3db1d..0517cd0aa5 100644
--- a/packet-fcbls.h
+++ b/packet-fcbls.h
@@ -2,7 +2,7 @@
* Fibre Channel Basic Link Services header
* Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
*
- * $Id: packet-fcbls.h,v 1.2 2003/07/09 06:24:32 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcct.c b/packet-fcct.c
index 10a5ebf2fb..269edacd97 100644
--- a/packet-fcct.c
+++ b/packet-fcct.c
@@ -2,7 +2,7 @@
* Routines for FC Common Transport Protocol (used by GS3 services)
* Copyright 2001, Dinesh G Dutt <ddutt@andiamo.com>
*
- * $Id: packet-fcct.c,v 1.2 2003/06/30 21:50:17 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcct.h b/packet-fcct.h
index f0116ab239..667a8c8a72 100644
--- a/packet-fcct.h
+++ b/packet-fcct.h
@@ -1,6 +1,6 @@
/* packet-fcct.h
*
- * $Id: packet-fcct.h,v 1.3 2003/06/30 21:50:17 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcdns.c b/packet-fcdns.c
index 083f955a28..78c2099ebd 100644
--- a/packet-fcdns.c
+++ b/packet-fcdns.c
@@ -2,7 +2,7 @@
* Routines for FC distributed Name Server (dNS)
* Copyright 2001, Dinesh G Dutt <ddutt@andiamo.com>
*
- * $Id: packet-fcdns.c,v 1.2 2003/10/06 20:46:50 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcdns.h b/packet-fcdns.h
index d49cb1e277..d405ab46c5 100644
--- a/packet-fcdns.h
+++ b/packet-fcdns.h
@@ -1,6 +1,6 @@
/* packet-fcdns.h
*
- * $Id: packet-fcdns.h,v 1.2 2003/03/06 21:55:26 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcels.c b/packet-fcels.c
index 2e98967ac3..a31387038f 100644
--- a/packet-fcels.c
+++ b/packet-fcels.c
@@ -2,7 +2,7 @@
* Routines for FC Extended Link Services
* Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
*
- * $Id: packet-fcels.c,v 1.6 2003/11/07 08:50:43 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcels.h b/packet-fcels.h
index a13a649aa9..aff03712d3 100644
--- a/packet-fcels.h
+++ b/packet-fcels.h
@@ -2,7 +2,7 @@
* Fibre Channel Extended Link Services Definitions (ddutt@cisco.com)
* Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
*
- * $Id: packet-fcels.h,v 1.3 2003/11/07 08:50:44 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcfcs.c b/packet-fcfcs.c
index b71d741633..179e9f1e66 100644
--- a/packet-fcfcs.c
+++ b/packet-fcfcs.c
@@ -2,7 +2,7 @@
* Routines for FC Fabric Configuration Server
* Copyright 2001, Dinesh G Dutt <ddutt@andiamo.com>
*
- * $Id: packet-fcfcs.c,v 1.2 2004/02/29 09:02:19 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcfcs.h b/packet-fcfcs.h
index fcb8dbc5c9..daca528a9a 100644
--- a/packet-fcfcs.h
+++ b/packet-fcfcs.h
@@ -1,6 +1,6 @@
/* packet-fcfcs.h
*
- * $Id: packet-fcfcs.h,v 1.2 2003/03/06 21:55:26 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcfzs.c b/packet-fcfzs.c
index 474a4aa48a..6a3154d81f 100644
--- a/packet-fcfzs.c
+++ b/packet-fcfzs.c
@@ -2,7 +2,7 @@
* Routines for FC Fabric Zone Server
* Copyright 2001, Dinesh G Dutt <ddutt@andiamo.com>
*
- * $Id: packet-fcfzs.c,v 1.2 2003/12/02 06:06:30 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcfzs.h b/packet-fcfzs.h
index 48902da503..1d8bb82c13 100644
--- a/packet-fcfzs.h
+++ b/packet-fcfzs.h
@@ -1,6 +1,6 @@
/* packet-fcfzs.h
*
- * $Id: packet-fcfzs.h,v 1.2 2003/03/06 21:55:26 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcip.c b/packet-fcip.c
index 1c16a5a5c2..194ff1c82b 100644
--- a/packet-fcip.c
+++ b/packet-fcip.c
@@ -2,7 +2,7 @@
* Routines for FCIP dissection
* Copyright 2001, Dinesh G Dutt (ddutt@cisco.com)
*
- * $Id: packet-fcip.c,v 1.12 2004/02/19 00:29:15 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fclctl.c b/packet-fclctl.c
index e2c332c1ec..fbb7ecf298 100644
--- a/packet-fclctl.c
+++ b/packet-fclctl.c
@@ -2,7 +2,7 @@
* Routines for FC Link Control Frames
* Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
*
- * $Id: packet-fclctl.c,v 1.2 2003/06/30 21:50:17 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fclctl.h b/packet-fclctl.h
index d5966b6336..67c8bca908 100644
--- a/packet-fclctl.h
+++ b/packet-fclctl.h
@@ -2,7 +2,7 @@
* Fibre Channel Link Control definitions
* Copyright 2001 Dinesh G Dutt (ddutt@cisco.com)
*
- * $Id: packet-fclctl.h,v 1.2 2003/06/30 21:50:17 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcp.c b/packet-fcp.c
index fe7ce0fb27..b1171e9e9b 100644
--- a/packet-fcp.c
+++ b/packet-fcp.c
@@ -2,7 +2,7 @@
* Routines for Fibre Channel Protocol for SCSI (FCP)
* Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
*
- * $Id: packet-fcp.c,v 1.2 2003/01/31 03:17:46 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcp.h b/packet-fcp.h
index 3960654288..b3770cb977 100644
--- a/packet-fcp.h
+++ b/packet-fcp.h
@@ -2,7 +2,7 @@
* Fibre Channel SCSI (FCP) Protocol definitions
* Copyright 2001 Dinesh G Dutt (ddutt@cisco.com)
*
- * $Id: packet-fcp.h,v 1.1 2002/12/08 02:32:17 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcsb3.c b/packet-fcsb3.c
index 0afb728c0c..84460e0677 100644
--- a/packet-fcsb3.c
+++ b/packet-fcsb3.c
@@ -3,7 +3,7 @@
* This decoder is for FC-SB3 version 1.4
* Copyright 2003, Dinesh G Dutt <ddutt@cisco.com>
*
- * $Id: packet-fcsb3.c,v 1.3 2003/12/18 00:28:39 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcsb3.h b/packet-fcsb3.h
index 1375e85f33..c7a4301e83 100755
--- a/packet-fcsb3.h
+++ b/packet-fcsb3.h
@@ -3,7 +3,7 @@
* This decoder is for FC-SB3 version 1.4
* Copyright 2003 Dinesh G Dutt (ddutt@cisco.com)
*
- * $Id: packet-fcsb3.h,v 1.1 2003/10/30 02:06:12 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcsp.c b/packet-fcsp.c
index f55d3c9443..df87eea14a 100755
--- a/packet-fcsp.c
+++ b/packet-fcsp.c
@@ -3,7 +3,7 @@
* This decoder is for FC-SP version 1.1
* Copyright 2003, Dinesh G Dutt <ddutt@cisco.com>
*
- * $Id: packet-fcsp.c,v 1.2 2003/11/07 08:47:53 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcsp.h b/packet-fcsp.h
index 699779634d..80d1f1f94f 100755
--- a/packet-fcsp.h
+++ b/packet-fcsp.h
@@ -3,7 +3,7 @@
* This decoder is for FC-SP version 1.1
* Copyright 2003 Dinesh G Dutt (ddutt@cisco.com)
*
- * $Id: packet-fcsp.h,v 1.2 2004/02/20 22:38:44 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcswils.c b/packet-fcswils.c
index ff6123a85e..45cf941d37 100644
--- a/packet-fcswils.c
+++ b/packet-fcswils.c
@@ -2,7 +2,7 @@
* Routines for FC Inter-switch link services
* Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
*
- * $Id: packet-fcswils.c,v 1.8 2003/12/04 05:40:17 gram Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fcswils.h b/packet-fcswils.h
index 42fc99de44..729bf4092d 100644
--- a/packet-fcswils.h
+++ b/packet-fcswils.h
@@ -2,7 +2,7 @@
* Fibre Channel Switch InterLink Services Definitions
* Copyright 2001 Dinesh G Dutt (ddutt@cisco.com)
*
- * $Id: packet-fcswils.h,v 1.3 2003/10/30 02:06:12 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fddi.c b/packet-fddi.c
index 318ac0b013..a676f5767d 100644
--- a/packet-fddi.c
+++ b/packet-fddi.c
@@ -3,7 +3,7 @@
*
* Laurent Deniel <laurent.deniel@free.fr>
*
- * $Id: packet-fddi.c,v 1.62 2003/08/29 10:59:09 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fddi.h b/packet-fddi.h
index a8f6a95e11..bb2b40e5fc 100644
--- a/packet-fddi.h
+++ b/packet-fddi.h
@@ -1,6 +1,6 @@
/* packet-fddi.h
*
- * $Id: packet-fddi.h,v 1.8 2003/08/29 10:59:10 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fix.c b/packet-fix.c
index fa5b245b50..7d8931d60c 100644
--- a/packet-fix.c
+++ b/packet-fix.c
@@ -2,7 +2,7 @@
* Routines for Financial Information eXchange (FIX) Protocol dissection
* Copyright 2000, PC Drew <drewpc@ibsncentral.com>
*
- * $Id: packet-fix.c,v 1.6 2003/06/12 08:33:29 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fr.c b/packet-fr.c
index 5d2637c0c4..bb99dd18dc 100644
--- a/packet-fr.c
+++ b/packet-fr.c
@@ -3,7 +3,7 @@
*
* Copyright 2001, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-fr.c,v 1.49 2004/07/01 08:35:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-frame.c b/packet-frame.c
index 65fbf10568..5d53b752ef 100644
--- a/packet-frame.c
+++ b/packet-frame.c
@@ -2,7 +2,7 @@
*
* Top-most dissector. Decides dissector based on Wiretap Encapsulation Type.
*
- * $Id: packet-frame.c,v 1.43 2004/01/03 18:40:07 sharpe Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-frame.h b/packet-frame.h
index 1ed34b4841..77fbff6f1f 100644
--- a/packet-frame.h
+++ b/packet-frame.h
@@ -2,7 +2,7 @@
*
* Top-most dissector. Decides dissector based on Wiretap Encapsulation Type.
*
- * $Id: packet-frame.h,v 1.7 2003/12/06 06:09:10 gram Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ftam.c b/packet-ftam.c
index 84bb9819dc..504c7fc010 100644
--- a/packet-ftam.c
+++ b/packet-ftam.c
@@ -2,7 +2,7 @@
*
* Routine to dissect OSI ISO 8571 FTAM Protocol packets
*
-* $Id: packet-ftam.c,v 1.2 2004/04/20 04:17:52 guy Exp $
+* $Id$
*
* Yuriy Sidelnikov <YSidelnikov@hotmail.com>
*
diff --git a/packet-ftam.h b/packet-ftam.h
index 4a166f9513..5c9fb8cafd 100644
--- a/packet-ftam.h
+++ b/packet-ftam.h
@@ -2,7 +2,7 @@
*
* Routine to dissect OSI ISO 8571 FTAM Protocol packets
*
-* $Id: packet-ftam.h,v 1.1 2004/03/23 19:51:06 guy Exp $
+* $Id$
*
* Yuriy Sidelnikov <YSidelnikov@hotmail.com>
*
diff --git a/packet-ftp.c b/packet-ftp.c
index 4393f16f1e..1084e05720 100644
--- a/packet-ftp.c
+++ b/packet-ftp.c
@@ -3,7 +3,7 @@
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
* Copyright 2001, Juan Toledo <toledo@users.sourceforge.net> (Passive FTP)
*
- * $Id: packet-ftp.c,v 1.54 2003/10/08 11:33:19 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-fw1.c b/packet-fw1.c
index 0d3bd820e9..d1c35aa67a 100644
--- a/packet-fw1.c
+++ b/packet-fw1.c
@@ -2,7 +2,7 @@
* Routines for Ethernet header disassembly of FW1 "monitor" files
* Copyright 2002,2003, Alfred Koebler <ako@icon.de>
*
- * $Id: packet-fw1.c,v 1.11 2004/01/06 22:05:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Alfred Koebler <ako@icon.de>
diff --git a/packet-gift.c b/packet-gift.c
index e469d1de08..1022a637e9 100644
--- a/packet-gift.c
+++ b/packet-gift.c
@@ -4,7 +4,7 @@
*
* See http://www.giftproject.org/
*
- * $Id: packet-gift.c,v 1.2 2004/07/01 06:30:29 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-giop.c b/packet-giop.c
index 5361b55e9b..5167ff7d86 100644
--- a/packet-giop.c
+++ b/packet-giop.c
@@ -9,7 +9,7 @@
* Frank Singleton <frank.singleton@ericsson.com>
* Trevor Shepherd <eustrsd@am1.ericsson.se>
*
- * $Id: packet-giop.c,v 1.77 2004/07/09 23:17:04 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-giop.h b/packet-giop.h
index 6309b56d0f..928bbf6eeb 100644
--- a/packet-giop.h
+++ b/packet-giop.h
@@ -4,7 +4,7 @@
*
* Based on CORBAv2.4.2 Chapter 15 GIOP Description.
*
- * $Id: packet-giop.h,v 1.12 2003/12/21 03:44:00 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gmrp.c b/packet-gmrp.c
index 0354eeb329..872eb92a08 100644
--- a/packet-gmrp.c
+++ b/packet-gmrp.c
@@ -5,7 +5,7 @@
* Based on the code from packet-gvrp.c (GVRP) from
* Kevin Shi <techishi@ms22.hinet.net> Copyright 2000
*
- * $Id: packet-gmrp.c,v 1.10 2002/08/28 21:00:13 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gnutella.c b/packet-gnutella.c
index d425030e39..a88301eb5d 100644
--- a/packet-gnutella.c
+++ b/packet-gnutella.c
@@ -2,7 +2,7 @@
* Routines for gnutella dissection
* Copyright 2001, B. Johannessen <bob@havoq.com>
*
- * $Id: packet-gnutella.c,v 1.15 2002/08/28 21:00:13 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gnutella.h b/packet-gnutella.h
index f518b7292a..f079595827 100644
--- a/packet-gnutella.h
+++ b/packet-gnutella.h
@@ -2,7 +2,7 @@
* Declarations for gnutella dissection
* Copyright 2001, B. Johannessen <bob@havoq.com>
*
- * $Id: packet-gnutella.h,v 1.2 2002/08/28 21:00:13 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gprs-llc.c b/packet-gprs-llc.c
index 12d019fc1c..a3837a9221 100644
--- a/packet-gprs-llc.c
+++ b/packet-gprs-llc.c
@@ -2,7 +2,7 @@
* Routines for Logical Link Control GPRS dissection ETSI 4.64
* Copyright 2000, Josef Korelus <jkor@quick.cz>
*
- * $Id: packet-gprs-llc.c,v 1.5 2004/05/04 09:03:57 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gprs-ns.c b/packet-gprs-ns.c
index 5c7b4a59de..1a63cb29c8 100644
--- a/packet-gprs-ns.c
+++ b/packet-gprs-ns.c
@@ -3,7 +3,7 @@
* dissection
* Copyright 2003, Josef Korelus <jkor@quick.cz>
*
- * $Id: packet-gprs-ns.c,v 1.8 2004/02/18 10:11:51 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gre.c b/packet-gre.c
index 757beebf1f..b7a29f575c 100644
--- a/packet-gre.c
+++ b/packet-gre.c
@@ -2,7 +2,7 @@
* Routines for the Generic Routing Encapsulation (GRE) protocol
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-gre.c,v 1.56 2004/05/15 19:54:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gsm_a.c b/packet-gsm_a.c
index fe368933b7..93fd544ac8 100644
--- a/packet-gsm_a.c
+++ b/packet-gsm_a.c
@@ -38,7 +38,7 @@
* Formats and coding
* (3GPP TS 24.080 version 4.3.0 Release 4)
*
- * $Id: packet-gsm_a.c,v 1.13 2004/04/21 05:53:55 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gsm_a.h b/packet-gsm_a.h
index 1c44b5f9d9..6a6d084315 100644
--- a/packet-gsm_a.h
+++ b/packet-gsm_a.h
@@ -1,6 +1,6 @@
/* packet-gsm_a.h
*
- * $Id: packet-gsm_a.h,v 1.2 2004/05/09 10:03:37 guy Exp $
+ * $Id$
*
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
diff --git a/packet-gsm_map.c b/packet-gsm_map.c
index 06f7194eaa..2f2bbeb8e9 100644
--- a/packet-gsm_map.c
+++ b/packet-gsm_map.c
@@ -7,7 +7,7 @@
* Changed to run on new version of TCAP, many changes for
* EOC matching, and parameter separation. (2003)
*
- * $Id: packet-gsm_map.c,v 1.11 2004/04/21 05:53:56 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gsm_map.h b/packet-gsm_map.h
index 7c7c90743c..c313a8f1b8 100644
--- a/packet-gsm_map.h
+++ b/packet-gsm_map.h
@@ -1,6 +1,6 @@
/* packet-gsm_map.h
*
- * $Id: packet-gsm_map.h,v 1.3 2004/05/09 10:03:37 guy Exp $
+ * $Id$
*
* Copyright 2004, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
diff --git a/packet-gsm_sms.c b/packet-gsm_sms.c
index 49c371774a..2ae4cb7bd1 100644
--- a/packet-gsm_sms.c
+++ b/packet-gsm_sms.c
@@ -11,7 +11,7 @@
* Technical realization of Short Message Service (SMS)
* (3GPP TS 23.040 version 5.4.0 Release 5)
*
- * $Id: packet-gsm_sms.c,v 1.12 2004/04/21 05:53:56 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gsm_sms.h b/packet-gsm_sms.h
index 8a311a2c4a..bb55808543 100644
--- a/packet-gsm_sms.h
+++ b/packet-gsm_sms.h
@@ -1,6 +1,6 @@
/* packet-gsm_sms.h
*
- * $Id: packet-gsm_sms.h,v 1.1 2004/03/27 11:32:29 guy Exp $
+ * $Id$
*
* Copyright 2004, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
diff --git a/packet-gsm_sms_ud.c b/packet-gsm_sms_ud.c
index e87d6bea28..fb9ae7b639 100755
--- a/packet-gsm_sms_ud.c
+++ b/packet-gsm_sms_ud.c
@@ -1,7 +1,7 @@
/* packet-gsm_sms_ud.c
* Routines for GSM SMS TP-UD (GSM 03.40) dissection
*
- * $Id: packet-gsm_sms_ud.c,v 1.5 2004/01/29 21:19:10 obiot Exp $
+ * $Id$
*
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
diff --git a/packet-gsm_ss.c b/packet-gsm_ss.c
index 16e7b41f58..01963aa756 100644
--- a/packet-gsm_ss.c
+++ b/packet-gsm_ss.c
@@ -19,7 +19,7 @@
* Michael Lum <mlum [AT] telostech.com>,
* Created (2004).
*
- * $Id: packet-gsm_ss.c,v 1.3 2004/04/21 05:53:56 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gsm_ss.h b/packet-gsm_ss.h
index 2a632bfe3a..8c6c6f7f49 100644
--- a/packet-gsm_ss.h
+++ b/packet-gsm_ss.h
@@ -1,6 +1,6 @@
/* packet-gsm_ss.h
*
- * $Id: packet-gsm_ss.h,v 1.3 2004/04/21 05:53:56 guy Exp $
+ * $Id$
*
* Copyright 2004, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
diff --git a/packet-gssapi.c b/packet-gssapi.c
index 9b86fa3e6c..78735df26d 100644
--- a/packet-gssapi.c
+++ b/packet-gssapi.c
@@ -4,7 +4,7 @@
* Copyright 2002, Richard Sharpe <rsharpe@samba.org> Added a few
* bits and pieces ...
*
- * $Id: packet-gssapi.c,v 1.29 2004/01/19 20:10:36 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gssapi.h b/packet-gssapi.h
index f55f20998f..17fef33317 100644
--- a/packet-gssapi.h
+++ b/packet-gssapi.h
@@ -2,7 +2,7 @@
* Dissector for GSS-API tokens as described in rfc2078, section 3.1
* Copyright 2002, Tim Potter <tpot@samba.org>
*
- * $Id: packet-gssapi.h,v 1.9 2003/11/16 23:17:19 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gtp.c b/packet-gtp.c
index 169ba7be6f..58fa038fd7 100644
--- a/packet-gtp.c
+++ b/packet-gtp.c
@@ -4,7 +4,7 @@
* Copyright 2001, Michal Melerowicz <michal.melerowicz@nokia.com>
* Nicolas Balkota <balkota@mac.com>
*
- * $Id: packet-gtp.c,v 1.74 2004/03/30 18:14:22 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gtp.h b/packet-gtp.h
index 05d4ff3ce0..2afccb64b8 100644
--- a/packet-gtp.h
+++ b/packet-gtp.h
@@ -4,7 +4,7 @@
* Copyright 2001, Michal Melerowicz <michal.melerowicz@nokia.com>
* Nicolas Balkota <balkota@mac.com>
*
- * $Id: packet-gtp.h,v 1.2 2002/08/28 21:00:14 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-gvrp.c b/packet-gvrp.c
index 4fda70f880..80fd96ad05 100644
--- a/packet-gvrp.c
+++ b/packet-gvrp.c
@@ -2,7 +2,7 @@
* Routines for GVRP (GARP VLAN Registration Protocol) dissection
* Copyright 2000, Kevin Shi <techishi@ms22.hinet.net>
*
- * $Id: packet-gvrp.c,v 1.14 2002/08/28 21:00:14 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-h1.c b/packet-h1.c
index 403303f15b..245dff7c16 100644
--- a/packet-h1.c
+++ b/packet-h1.c
@@ -2,7 +2,7 @@
* Routines for Sinec H1 packet disassembly
* Gerrit Gehnen <G.Gehnen@atrie.de>
*
- * $Id: packet-h1.c,v 1.25 2002/08/28 21:00:14 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-h225.c b/packet-h225.c
index 082e52d76f..7da3f330cd 100644
--- a/packet-h225.c
+++ b/packet-h225.c
@@ -4,7 +4,7 @@
*
* Maintained by Andreas Sikkema (h323@ramdyne.nl)
*
- * $Id: packet-h225.c,v 1.47 2004/06/24 21:50:03 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-h225.h b/packet-h225.h
index c5ab623084..0b2eb3f834 100644
--- a/packet-h225.h
+++ b/packet-h225.h
@@ -2,7 +2,7 @@
* Routines for H.225 packet dissection
* 2003 Tomas Kukosa
*
- * $Id: packet-h225.h,v 1.8 2004/05/09 10:03:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-h235.c b/packet-h235.c
index 288dbb9f02..e97be14376 100644
--- a/packet-h235.c
+++ b/packet-h235.c
@@ -10,7 +10,7 @@
* Routines for H.235 packet dissection
* 2004 Tomas Kukosa
*
- * $Id: packet-h235.c,v 1.6 2004/06/24 21:50:04 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-h235.h b/packet-h235.h
index 161c747584..e5663d4d5d 100644
--- a/packet-h235.h
+++ b/packet-h235.h
@@ -10,7 +10,7 @@
* Routines for H.235 packet dissection
* 2004 Tomas Kukosa
*
- * $Id: packet-h235.h,v 1.6 2004/06/24 21:50:04 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-h245.c b/packet-h245.c
index c55977b2e7..899dab9fb6 100644
--- a/packet-h245.c
+++ b/packet-h245.c
@@ -6,7 +6,7 @@
*
* Maintained by Andreas Sikkema (h323@ramdyne.nl)
*
- * $Id: packet-h245.c,v 1.48 2004/06/15 18:26:08 etxrab Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-h245.h b/packet-h245.h
index dde2b6366b..288e9925f1 100644
--- a/packet-h245.h
+++ b/packet-h245.h
@@ -2,7 +2,7 @@
* Routines for H.245 packet dissection
* 2003 Ronnie Sahlberg
*
- * $Id: packet-h245.h,v 1.5 2003/09/26 22:20:07 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-h261.c b/packet-h261.c
index b3ad7f98dd..8b291d2e9b 100644
--- a/packet-h261.c
+++ b/packet-h261.c
@@ -2,7 +2,7 @@
*
* Routines for ITU-T Recommendation H.261 dissection
*
- * $Id: packet-h261.c,v 1.20 2004/02/14 22:48:52 guy Exp $
+ * $Id$
*
* Copyright 2000, Philips Electronics N.V.
* Andreas Sikkema <h323@ramdyne.nl>
diff --git a/packet-h263.c b/packet-h263.c
index 820bcdbbc9..e0feaf106a 100644
--- a/packet-h263.c
+++ b/packet-h263.c
@@ -5,7 +5,7 @@
* Copyright 2003 Niklas Ögren <niklas.ogren@7l.se>
* Seven Levels Consultants AB
*
- * $Id: packet-h263.c,v 1.5 2004/06/25 06:31:46 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-h450.c b/packet-h450.c
index e04bd68543..fffbd98cda 100644
--- a/packet-h450.c
+++ b/packet-h450.c
@@ -4,7 +4,7 @@
*
* Copied from packet-h225.c and packet-h245.c
*
- * $Id: packet-h450.c,v 1.10 2004/06/24 06:01:47 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-hclnfsd.c b/packet-hclnfsd.c
index 6d12c52545..1adf5ac57a 100644
--- a/packet-hclnfsd.c
+++ b/packet-hclnfsd.c
@@ -2,7 +2,7 @@
* Routines for hclnfsd (Hummingbird NFS Daemon) dissection
* Copyright 2001, Mike Frisch <frisch@hummingbird.com>
*
- * $Id: packet-hclnfsd.c,v 1.20 2003/08/17 21:34:21 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-hclnfsd.h b/packet-hclnfsd.h
index 5b2ca86669..e42392722c 100644
--- a/packet-hclnfsd.h
+++ b/packet-hclnfsd.h
@@ -1,6 +1,6 @@
/* packet-hclnfsd.h
*
- * $Id: packet-hclnfsd.h,v 1.2 2002/08/28 21:00:16 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-hpext.c b/packet-hpext.c
index 0576a14a4f..3a14dbb9c3 100644
--- a/packet-hpext.c
+++ b/packet-hpext.c
@@ -2,7 +2,7 @@
* Routines for HP extended IEEE 802.2 LLC layer
* Jochen Friedrich <jochen@scram.de>
*
- * $Id: packet-hpext.c,v 1.1 2003/03/02 21:52:16 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-hpext.h b/packet-hpext.h
index e7136e0c59..ec7e148ca2 100644
--- a/packet-hpext.h
+++ b/packet-hpext.h
@@ -2,7 +2,7 @@
* Routines for HP extended IEEE 802.2 LLC layer
* Jochen Friedrich <jochen@scram.de>
*
- * $Id: packet-hpext.h,v 1.1 2003/03/02 21:52:16 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-hsrp.c b/packet-hsrp.c
index f95b1dbb34..62f20e1f8b 100644
--- a/packet-hsrp.c
+++ b/packet-hsrp.c
@@ -4,7 +4,7 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-hsrp.c,v 1.24 2002/08/28 21:00:16 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-http.c b/packet-http.c
index 4af3b57849..76f70e289f 100644
--- a/packet-http.c
+++ b/packet-http.c
@@ -9,7 +9,7 @@
* Copyright 2002, Tim Potter <tpot@samba.org>
* Copyright 1999, Andrew Tridgell <tridge@samba.org>
*
- * $Id: packet-http.c,v 1.111 2004/07/09 23:37:39 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-http.h b/packet-http.h
index 5144e4f74b..e79ffa4e43 100644
--- a/packet-http.h
+++ b/packet-http.h
@@ -1,6 +1,6 @@
/* packet-http.h
*
- * $Id: packet-http.h,v 1.9 2003/09/02 23:09:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-hyperscsi.c b/packet-hyperscsi.c
index e7872b3b64..f4ed93349a 100644
--- a/packet-hyperscsi.c
+++ b/packet-hyperscsi.c
@@ -1,7 +1,7 @@
/* packet-ip.c
* Routines for dissassembly of the Hyper SCSI protocol.
*
- * $Id: packet-hyperscsi.c,v 1.4 2002/12/03 01:09:00 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-iapp.c b/packet-iapp.c
index 94217014bf..4ec7ad94dd 100644
--- a/packet-iapp.c
+++ b/packet-iapp.c
@@ -2,7 +2,7 @@
* Routines for IAPP dissection
* Copyright 2002, Alfred Arnold <aarnold@elsa.de>
*
- * $Id: packet-iapp.c,v 1.6 2002/08/28 21:00:16 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-iax2.c b/packet-iax2.c
index c50106eef7..6277a1922a 100644
--- a/packet-iax2.c
+++ b/packet-iax2.c
@@ -8,7 +8,7 @@
* IAX2 is a VoIP protocol for the open source PBX Asterisk. Please see
* http://www.asterisk.org for more information.
*
- * $Id: packet-iax2.c,v 1.8 2004/06/30 18:47:27 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-iax2.h b/packet-iax2.h
index 320698252e..96e861f944 100644
--- a/packet-iax2.h
+++ b/packet-iax2.h
@@ -7,7 +7,7 @@
*
* Mark Spencer <markster@linux-support.net>
*
- * $Id: packet-iax2.h,v 1.3 2004/06/25 06:31:46 sahlberg Exp $
+ * $Id$
*
* This program is free software, distributed under the terms of
* the GNU General Public License
diff --git a/packet-ib.c b/packet-ib.c
index 9ef6866ee5..13fe694897 100644
--- a/packet-ib.c
+++ b/packet-ib.c
@@ -4,7 +4,7 @@
* Erik Kunze <kunze@philosys.de>
* Uwe Girlich <Uwe.Girlich@philosys.de>
*
- * $Id: packet-ib.c,v 1.2 2003/01/20 08:03:16 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-icap.c b/packet-icap.c
index 4c6a9c2ed1..214febaa26 100644
--- a/packet-icap.c
+++ b/packet-icap.c
@@ -4,7 +4,7 @@
*
* Srishylam Simharajan simha@netapp.com
*
- * $Id: packet-icap.c,v 1.13 2004/07/09 23:37:40 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-icmpv6.c b/packet-icmpv6.c
index f4ff6fec07..d77f7c0ffe 100644
--- a/packet-icmpv6.c
+++ b/packet-icmpv6.c
@@ -1,7 +1,7 @@
/* packet-icmpv6.c
* Routines for ICMPv6 packet disassembly
*
- * $Id: packet-icmpv6.c,v 1.78 2004/04/22 08:22:07 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-icp.c b/packet-icp.c
index 2084732f86..83eea14ac9 100644
--- a/packet-icp.c
+++ b/packet-icp.c
@@ -4,7 +4,7 @@
* By Peter Torvals
* Copyright 1999 Peter Torvals
*
- * $Id: packet-icp.c,v 1.23 2002/08/28 21:00:17 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-icq.c b/packet-icq.c
index 1b5265537f..407abe431f 100644
--- a/packet-icq.c
+++ b/packet-icq.c
@@ -1,7 +1,7 @@
/* packet-icq.c
* Routines for ICQ packet disassembly
*
- * $Id: packet-icq.c,v 1.48 2002/08/28 21:00:17 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ieee80211.c b/packet-ieee80211.c
index 7406a1d912..d6f86433a8 100644
--- a/packet-ieee80211.c
+++ b/packet-ieee80211.c
@@ -3,7 +3,7 @@
* Copyright 2000, Axis Communications AB
* Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
*
- * $Id: packet-ieee80211.c,v 1.116 2004/07/09 04:54:08 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ieee80211.h b/packet-ieee80211.h
index 8441eb9e5c..c6396cb8e4 100644
--- a/packet-ieee80211.h
+++ b/packet-ieee80211.h
@@ -4,7 +4,7 @@
* Copyright 2000, Axis Communications AB
* Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
*
- * $Id: packet-ieee80211.h,v 1.8 2003/09/23 02:35:59 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ieee8023.c b/packet-ieee8023.c
index 80092c6e62..5e8f98aa2d 100644
--- a/packet-ieee8023.c
+++ b/packet-ieee8023.c
@@ -1,7 +1,7 @@
/* packet-ieee8023.c
* Routine for dissecting 802.3 (as opposed to D/I/X Ethernet) packets.
*
- * $Id: packet-ieee8023.c,v 1.9 2004/02/21 05:12:45 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ieee8023.h b/packet-ieee8023.h
index 533b59cd96..48c1d13548 100644
--- a/packet-ieee8023.h
+++ b/packet-ieee8023.h
@@ -2,7 +2,7 @@
* Declaration of routine for dissecting 802.3 (as opposed to D/I/X Ethernet)
* packets.
*
- * $Id: packet-ieee8023.h,v 1.3 2003/10/01 07:11:44 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-igap.c b/packet-igap.c
index 20d882716c..287b8c451d 100644
--- a/packet-igap.c
+++ b/packet-igap.c
@@ -2,7 +2,7 @@
* Routines for IGMP/IGAP packet disassembly
* 2003, Endoh Akria (see AUTHORS for email)
*
- * $Id: packet-igap.c,v 1.2 2004/03/06 01:54:53 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-igap.h b/packet-igap.h
index a6f523c6ea..e8907e7bd0 100644
--- a/packet-igap.h
+++ b/packet-igap.h
@@ -2,7 +2,7 @@
* Declarations of routines for IGMP/IGAP packet disassembly
* 2003, Endoh Akira <See AUTHORS for email>
*
- * $Id: packet-igap.h,v 1.1 2003/12/10 19:21:55 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-igmp.c b/packet-igmp.c
index d39b556f86..11aaad97a1 100644
--- a/packet-igmp.c
+++ b/packet-igmp.c
@@ -1,7 +1,7 @@
/* packet-igmp.c 2001 Ronnie Sahlberg <See AUTHORS for email>
* Routines for IGMP packet disassembly
*
- * $Id: packet-igmp.c,v 1.25 2003/12/10 19:21:55 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-igmp.h b/packet-igmp.h
index de6f8655bb..b37ac5729e 100644
--- a/packet-igmp.h
+++ b/packet-igmp.h
@@ -1,7 +1,7 @@
/* packet-igmp.h 2001 Ronnie Sahlberg <See AUTHORS for email>
* Declarations of routines for IGMP packet disassembly
*
- * $Id: packet-igmp.h,v 1.2 2002/08/28 21:00:17 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-igrp.c b/packet-igrp.c
index 395bdcf74c..bbbc4b60be 100644
--- a/packet-igrp.c
+++ b/packet-igrp.c
@@ -2,7 +2,7 @@
* Routines for IGRP dissection
* Copyright 2000, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-igrp.c,v 1.14 2003/12/21 05:51:33 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-image-gif.c b/packet-image-gif.c
index d1d2add93a..c58d5f5a56 100755
--- a/packet-image-gif.c
+++ b/packet-image-gif.c
@@ -3,7 +3,7 @@
* Routines for image/gif media dissection
* Copyright 2003, 2004, Olivier Biot.
*
- * $Id: packet-image-gif.c,v 1.4 2004/03/08 22:03:58 obiot Exp $
+ * $Id$
*
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
diff --git a/packet-image-jfif.c b/packet-image-jfif.c
index ea16c1bd94..666584c84d 100644
--- a/packet-image-jfif.c
+++ b/packet-image-jfif.c
@@ -3,7 +3,7 @@
* Routines for JFIF image/jpeg media dissection
* Copyright 2004, Olivier Biot.
*
- * $Id: packet-image-jfif.c,v 1.5 2004/05/31 01:24:03 obiot Exp $
+ * $Id$
*
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
diff --git a/packet-imap.c b/packet-imap.c
index 6db69081e6..88075e96d5 100644
--- a/packet-imap.c
+++ b/packet-imap.c
@@ -2,7 +2,7 @@
* Routines for imap packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-imap.c,v 1.23 2003/06/11 20:03:39 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ip.c b/packet-ip.c
index efab251239..9a5d3e6154 100644
--- a/packet-ip.c
+++ b/packet-ip.c
@@ -1,7 +1,7 @@
/* packet-ip.c
* Routines for IP and miscellaneous IP protocol packet disassembly
*
- * $Id: packet-ip.c,v 1.203 2004/04/19 23:36:46 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ip.h b/packet-ip.h
index 60df820ab3..43c6f5e5ac 100644
--- a/packet-ip.h
+++ b/packet-ip.h
@@ -1,7 +1,7 @@
/* packet-ip.h
* Definitions for IP packet disassembly structures and routines
*
- * $Id: packet-ip.h,v 1.29 2003/08/23 09:09:33 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ipdc.c b/packet-ipdc.c
index d206e783f4..e2378ba6e2 100644
--- a/packet-ipdc.c
+++ b/packet-ipdc.c
@@ -5,7 +5,7 @@
*
* Using IPDC spec 0.20.2
*
- * $Id: packet-ipdc.c,v 1.5 2004/04/09 08:39:00 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ipdc.h b/packet-ipdc.h
index c2f0bdfba1..514b27e682 100644
--- a/packet-ipdc.h
+++ b/packet-ipdc.h
@@ -5,7 +5,7 @@
*
* Using IPDC spec 0.20.2
*
- * $Id: packet-ipdc.h,v 1.6 2004/04/22 20:31:01 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ipfc.c b/packet-ipfc.c
index 22a27a0e42..2845dfe7ea 100644
--- a/packet-ipfc.c
+++ b/packet-ipfc.c
@@ -5,7 +5,7 @@
* See RFC 2625.
* Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
*
- * $Id: packet-ipfc.c,v 1.6 2003/01/21 05:21:03 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ipfc.h b/packet-ipfc.h
index 2c86f4b837..8a329893d4 100644
--- a/packet-ipfc.h
+++ b/packet-ipfc.h
@@ -1,6 +1,6 @@
/* packet-ipfc.h
*
- * $Id: packet-ipfc.h,v 1.1 2002/12/08 22:35:30 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ipmi.c b/packet-ipmi.c
index 44f297e62a..ea0ff5caa7 100644
--- a/packet-ipmi.c
+++ b/packet-ipmi.c
@@ -3,7 +3,7 @@
*
* Duncan Laurie <duncan@sun.com>
*
- * $Id: packet-ipmi.c,v 1.5 2004/04/07 06:18:55 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ipp.c b/packet-ipp.c
index 5449fa9908..4b01e19cd2 100644
--- a/packet-ipp.c
+++ b/packet-ipp.c
@@ -3,7 +3,7 @@
*
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-ipp.c,v 1.34 2003/01/28 22:02:26 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ipsec-udp.c b/packet-ipsec-udp.c
index eeb9b3ae6e..afb52d0814 100644
--- a/packet-ipsec-udp.c
+++ b/packet-ipsec-udp.c
@@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: packet-ipsec-udp.c,v 1.4 2003/10/02 22:44:19 guy Exp $
+ * $Id$
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
diff --git a/packet-ipsec.c b/packet-ipsec.c
index a246ae242c..5ca0ed54dd 100644
--- a/packet-ipsec.c
+++ b/packet-ipsec.c
@@ -1,7 +1,7 @@
/* packet-ipsec.c
* Routines for IPsec/IPComp packet disassembly
*
- * $Id: packet-ipsec.c,v 1.44 2003/08/16 00:11:07 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ipsec.h b/packet-ipsec.h
index b0ebaa7494..62d3d58a9f 100644
--- a/packet-ipsec.h
+++ b/packet-ipsec.h
@@ -1,6 +1,6 @@
/* packet-ipsec.h
*
- * $Id: packet-ipsec.h,v 1.7 2002/08/28 21:00:17 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-ipv6.c b/packet-ipv6.c
index 647770d1aa..3c0a2b6572 100644
--- a/packet-ipv6.c
+++ b/packet-ipv6.c
@@ -1,7 +1,7 @@
/* packet-ipv6.c
* Routines for IPv6 packet disassembly
*
- * $Id: packet-ipv6.c,v 1.102 2004/03/23 01:58:19 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ipv6.h b/packet-ipv6.h
index b8406ce4f3..693e8f6543 100644
--- a/packet-ipv6.h
+++ b/packet-ipv6.h
@@ -1,7 +1,7 @@
/* packet-ipv6.h
* Definitions for IPv6 packet disassembly
*
- * $Id: packet-ipv6.h,v 1.33 2004/04/22 08:22:07 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ipvs-syncd.c b/packet-ipvs-syncd.c
index 063289dd06..928dcba807 100644
--- a/packet-ipvs-syncd.c
+++ b/packet-ipvs-syncd.c
@@ -1,7 +1,7 @@
/* packet-ipvs-syncd.c 2001 Ronnie Sahlberg <See AUTHORS for email>
* Routines for IGMP packet disassembly
*
- * $Id: packet-ipvs-syncd.c,v 1.1 2004/03/21 17:13:01 nneul Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ipx.c b/packet-ipx.c
index cc45df342d..3b851d48ef 100644
--- a/packet-ipx.c
+++ b/packet-ipx.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 2000-2002 by Gilbert Ramirez.
* Portions Copyright (c) Novell, Inc. 2002-2003
*
- * $Id: packet-ipx.c,v 1.138 2003/12/29 19:04:05 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ipx.h b/packet-ipx.h
index 771271b5cf..859fd9b09f 100644
--- a/packet-ipx.h
+++ b/packet-ipx.h
@@ -6,7 +6,7 @@
* Portions Copyright (c) by Gilbert Ramirez 2000-2002
* Portions Copyright (c) Novell, Inc. 2002-2003
*
- * $Id: packet-ipx.h,v 1.28 2003/08/24 05:17:51 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ipxwan.c b/packet-ipxwan.c
index 9e0ca06678..764f9cbc3e 100644
--- a/packet-ipxwan.c
+++ b/packet-ipxwan.c
@@ -1,7 +1,7 @@
/* packet-ipxwan.c
* Routines for NetWare IPX WAN Protocol
*
- * $Id: packet-ipxwan.c,v 1.1 2003/04/06 02:32:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-irc.c b/packet-irc.c
index d8a9885814..66976bed7b 100644
--- a/packet-irc.c
+++ b/packet-irc.c
@@ -1,7 +1,7 @@
/* packet-irc.c
* Routines for IRC packet dissection
*
- * $Id: packet-irc.c,v 1.21 2002/08/28 21:00:18 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-isakmp.c b/packet-isakmp.c
index 0739e3778f..6092c7ef2d 100644
--- a/packet-isakmp.c
+++ b/packet-isakmp.c
@@ -4,7 +4,7 @@
* for ISAKMP (RFC 2407)
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-isakmp.c,v 1.79 2004/06/15 18:47:24 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-iscsi.c b/packet-iscsi.c
index e7439d73a2..c141535e6c 100644
--- a/packet-iscsi.c
+++ b/packet-iscsi.c
@@ -3,7 +3,7 @@
* Copyright 2001, Eurologic and Mark Burton <markb@ordern.com>
* 2004 Request/Response matching and Service Response Time: ronnie sahlberg
*
- * $Id: packet-iscsi.c,v 1.50 2004/05/24 02:25:18 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-isdn.c b/packet-isdn.c
index e3ef57bf72..e1c2337cc2 100644
--- a/packet-isdn.c
+++ b/packet-isdn.c
@@ -1,7 +1,7 @@
/* packet-isdn.c
* Routines for ISDN packet disassembly
*
- * $Id: packet-isdn.c,v 1.5 2003/12/21 12:07:09 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-isis-clv.c b/packet-isis-clv.c
index e893439613..371576118d 100644
--- a/packet-isis-clv.c
+++ b/packet-isis-clv.c
@@ -1,7 +1,7 @@
/* packet-isis-clv.c
* Common CLV decode routines.
*
- * $Id: packet-isis-clv.c,v 1.29 2003/12/08 20:40:32 guy Exp $
+ * $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
diff --git a/packet-isis-clv.h b/packet-isis-clv.h
index ab8c31bedd..90d4a7bc3e 100644
--- a/packet-isis-clv.h
+++ b/packet-isis-clv.h
@@ -1,7 +1,7 @@
/* packet-isis-clv.h
* Declares for common clv decoding functions.
*
- * $Id: packet-isis-clv.h,v 1.10 2003/12/08 20:40:32 guy Exp $
+ * $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
diff --git a/packet-isis-hello.c b/packet-isis-hello.c
index 4fc44057bf..f7518d5bfa 100644
--- a/packet-isis-hello.c
+++ b/packet-isis-hello.c
@@ -1,7 +1,7 @@
/* packet-isis-hello.c
* Routines for decoding isis hello packets and their CLVs
*
- * $Id: packet-isis-hello.c,v 1.34 2003/12/08 20:40:32 guy Exp $
+ * $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
diff --git a/packet-isis-hello.h b/packet-isis-hello.h
index 32247966b8..31ab933958 100644
--- a/packet-isis-hello.h
+++ b/packet-isis-hello.h
@@ -1,7 +1,7 @@
/* packet-isis-hello.h
* Declares for hello handling inside isis.
*
- * $Id: packet-isis-hello.h,v 1.11 2003/12/08 20:40:33 guy Exp $
+ * $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
diff --git a/packet-isis-lsp.c b/packet-isis-lsp.c
index b239d8438f..36d975e924 100644
--- a/packet-isis-lsp.c
+++ b/packet-isis-lsp.c
@@ -1,7 +1,7 @@
/* packet-isis-lsp.c
* Routines for decoding isis lsp packets and their CLVs
*
- * $Id: packet-isis-lsp.c,v 1.46 2003/12/08 20:40:33 guy Exp $
+ * $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
diff --git a/packet-isis-lsp.h b/packet-isis-lsp.h
index 93851f3156..751dfd5c0d 100644
--- a/packet-isis-lsp.h
+++ b/packet-isis-lsp.h
@@ -1,7 +1,7 @@
/* packet-isis-lsp.h
* Defines and such for LSP and their CLV decodes
*
- * $Id: packet-isis-lsp.h,v 1.19 2003/12/08 20:40:33 guy Exp $
+ * $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
diff --git a/packet-isis-snp.c b/packet-isis-snp.c
index 3d460c1852..34b6109961 100644
--- a/packet-isis-snp.c
+++ b/packet-isis-snp.c
@@ -1,7 +1,7 @@
/* packet-isis-snp.c
* Routines for decoding isis complete & partial SNP and their payload
*
- * $Id: packet-isis-snp.c,v 1.23 2003/12/08 20:40:33 guy Exp $
+ * $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
diff --git a/packet-isis-snp.h b/packet-isis-snp.h
index c16113b9cd..252f04866c 100644
--- a/packet-isis-snp.h
+++ b/packet-isis-snp.h
@@ -1,7 +1,7 @@
/* packet-isis-snp.h
* Defines and such for CSNP, PSNP, and their payloads
*
- * $Id: packet-isis-snp.h,v 1.8 2003/12/08 20:40:33 guy Exp $
+ * $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
diff --git a/packet-isis.c b/packet-isis.c
index 18dfcf53a0..47b5a411c6 100644
--- a/packet-isis.c
+++ b/packet-isis.c
@@ -2,7 +2,7 @@
* Routines for ISO/OSI network and transport protocol packet disassembly, core
* bits.
*
- * $Id: packet-isis.c,v 1.35 2003/03/31 08:09:28 guy Exp $
+ * $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
diff --git a/packet-isis.h b/packet-isis.h
index 2ae8db4980..f4565eced3 100644
--- a/packet-isis.h
+++ b/packet-isis.h
@@ -1,7 +1,7 @@
/* packet-isis.h
* Defines and such for core isis protcol decode.
*
- * $Id: packet-isis.h,v 1.9 2002/08/28 21:00:18 jmayer Exp $
+ * $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
diff --git a/packet-isl.c b/packet-isl.c
index 72d6b97bc2..daf984661d 100644
--- a/packet-isl.c
+++ b/packet-isl.c
@@ -1,7 +1,7 @@
/* packet-isl.c
* Routines for Cisco ISL Ethernet header disassembly
*
- * $Id: packet-isl.c,v 1.33 2003/08/08 17:57:44 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-isl.h b/packet-isl.h
index dd0d06062d..d26417c9f0 100644
--- a/packet-isl.h
+++ b/packet-isl.h
@@ -1,6 +1,6 @@
/* packet-isl.h
*
- * $Id: packet-isl.h,v 1.6 2002/08/28 21:00:19 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ismp.c b/packet-ismp.c
index cf486807c6..2e5da036df 100644
--- a/packet-ismp.c
+++ b/packet-ismp.c
@@ -3,7 +3,7 @@
* Enterasys Networks Home: http://www.enterasys.com/
* Copyright 2003, Joshua Craig Douglas <jdouglas@enterasys.com>
*
- * $Id: packet-ismp.c,v 1.4 2004/02/18 10:11:51 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-isns.c b/packet-isns.c
index 243d9a9808..f4fa286494 100644
--- a/packet-isns.c
+++ b/packet-isns.c
@@ -7,7 +7,7 @@
* Copyright 2003, Elipsan, Gareth Bushell <gbushell@elipsan.com>
* (c) 2004 Ronnie Sahlberg updates
*
- * $Id: packet-isns.c,v 1.9 2004/07/06 19:01:31 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-isup.c b/packet-isup.c
index 82de32e598..a2189d843b 100644
--- a/packet-isup.c
+++ b/packet-isup.c
@@ -9,7 +9,7 @@
* Modified 2004-01-10 by Anders Broman to add abillity to dissect
* Content type application/ISUP RFC 3204 used in SIP-T
*
- * $Id: packet-isup.c,v 1.63 2004/07/04 03:48:05 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-isup.h b/packet-isup.h
index cc93ca5ff2..0704d05417 100644
--- a/packet-isup.h
+++ b/packet-isup.h
@@ -1,6 +1,6 @@
/* packet-isup.h
*
- * $Id: packet-isup.h,v 1.3 2004/05/09 10:03:37 guy Exp $
+ * $Id$
*
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
diff --git a/packet-iua.c b/packet-iua.c
index 36c7689974..516961cd71 100644
--- a/packet-iua.c
+++ b/packet-iua.c
@@ -8,7 +8,7 @@
*
* Copyright 2002, Michael Tuexen <tuexen [AT] fh-muenster.de>
*
- * $Id: packet-iua.c,v 1.22 2003/12/21 05:51:33 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-jabber.c b/packet-jabber.c
index 755264e2fb..78b3f6c8c0 100644
--- a/packet-jabber.c
+++ b/packet-jabber.c
@@ -4,7 +4,7 @@
* Heavily based in packet-acap.c, which in turn is heavily based on
* packet-imap.c, Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-jabber.c,v 1.1 2003/07/07 22:48:55 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-kadm5.c b/packet-kadm5.c
index f77dc7e3ad..a292a8f19d 100644
--- a/packet-kadm5.c
+++ b/packet-kadm5.c
@@ -1,7 +1,7 @@
/* packet-kadm5.c
* Routines for kadm5 dissection
*
- * $Id: packet-kadm5.c,v 1.1 2003/04/25 21:09:35 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-kerberos.c b/packet-kerberos.c
index a09acf100d..0dd3c04227 100644
--- a/packet-kerberos.c
+++ b/packet-kerberos.c
@@ -23,7 +23,7 @@
*
* Some structures from RFC2630
*
- * $Id: packet-kerberos.c,v 1.71 2004/06/15 09:50:57 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-kerberos.h b/packet-kerberos.h
index ad53f589bb..9e915e5618 100644
--- a/packet-kerberos.h
+++ b/packet-kerberos.h
@@ -1,6 +1,6 @@
/* packet-kerberos.h
*
- * $Id: packet-kerberos.h,v 1.8 2004/06/04 01:56:25 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-klm.c b/packet-klm.c
index 5c3b3bcc33..c8e455f4a2 100644
--- a/packet-klm.c
+++ b/packet-klm.c
@@ -1,7 +1,7 @@
/* packet-klm.c 2001 Ronnie Sahlberg <See AUTHORS for email>
* Routines for klm dissection
*
- * $Id: packet-klm.c,v 1.13 2003/08/17 21:34:22 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-klm.h b/packet-klm.h
index 1657f2a643..03ba46fc86 100644
--- a/packet-klm.h
+++ b/packet-klm.h
@@ -1,6 +1,6 @@
/* packet-klm.h 2001 Ronnie Sahlberg <See AUTHORS for email>
*
- * $Id: packet-klm.h,v 1.4 2002/08/28 21:00:19 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-kpasswd.c b/packet-kpasswd.c
index 2a4a4788b8..efd396bca8 100644
--- a/packet-kpasswd.c
+++ b/packet-kpasswd.c
@@ -4,7 +4,7 @@
*
* See RFC 3244
*
- * $Id: packet-kpasswd.c,v 1.3 2004/06/04 01:56:25 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-l2tp.c b/packet-l2tp.c
index bb4d508f43..719d8b32d3 100644
--- a/packet-l2tp.c
+++ b/packet-l2tp.c
@@ -7,7 +7,7 @@
* Laurent Cazalet <laurent.cazalet@mailclub.net>
* Thomas Parvais <thomas.parvais@advalvas.be>
*
- * $Id: packet-l2tp.c,v 1.39 2004/02/28 22:56:35 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-lapb.c b/packet-lapb.c
index d015e22a15..0b010e5073 100644
--- a/packet-lapb.c
+++ b/packet-lapb.c
@@ -2,7 +2,7 @@
* Routines for lapb frame disassembly
* Olivier Abad <oabad@noos.fr>
*
- * $Id: packet-lapb.c,v 1.42 2004/01/18 08:32:45 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-lapbether.c b/packet-lapbether.c
index 9acbd08087..5257e7f383 100644
--- a/packet-lapbether.c
+++ b/packet-lapbether.c
@@ -3,7 +3,7 @@
* Richard Sharpe <rsharpe@ns.aus.com> based on the lapb module by
* Olivier Abad <oabad@noos.fr>
*
- * $Id: packet-lapbether.c,v 1.12 2002/09/01 14:30:30 oabad Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-lapd.c b/packet-lapd.c
index d8a6d053f6..d766047ef8 100644
--- a/packet-lapd.c
+++ b/packet-lapd.c
@@ -2,7 +2,7 @@
* Routines for LAPD frame disassembly
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-lapd.c,v 1.38 2004/01/26 20:48:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-laplink.c b/packet-laplink.c
index 016444722e..279240b06b 100644
--- a/packet-laplink.c
+++ b/packet-laplink.c
@@ -2,7 +2,7 @@
* Routines for laplink dissection
* Copyright 2003, Brad Hards <bradh@frogmouth.net>
*
- * $Id: packet-laplink.c,v 1.4 2003/10/20 23:05:41 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ldap.c b/packet-ldap.c
index e0374c902a..583b9142f1 100644
--- a/packet-ldap.c
+++ b/packet-ldap.c
@@ -3,7 +3,7 @@
*
* See RFC 1777 (LDAP v2), RFC 2251 (LDAP v3), and RFC 2222 (SASL).
*
- * $Id: packet-ldap.c,v 1.74 2004/04/20 08:33:15 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ldap.h b/packet-ldap.h
index f4124d8f73..0462ae66fc 100644
--- a/packet-ldap.h
+++ b/packet-ldap.h
@@ -1,6 +1,6 @@
/* packet-ldap.h
*
- * $Id: packet-ldap.h,v 1.7 2003/11/05 09:04:16 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-ldp.c b/packet-ldp.c
index c5d2e57f44..d4682034d0 100644
--- a/packet-ldp.c
+++ b/packet-ldp.c
@@ -1,7 +1,7 @@
/* packet-ldp.c
* Routines for LDP (RFC 3036) packet disassembly
*
- * $Id: packet-ldp.c,v 1.53 2004/05/13 20:20:33 gerald Exp $
+ * $Id$
*
* Copyright (c) November 2000 by Richard Sharpe <rsharpe@ns.aus.com>
*
diff --git a/packet-ldp.h b/packet-ldp.h
index 46244db517..e1e311df2e 100644
--- a/packet-ldp.h
+++ b/packet-ldp.h
@@ -2,7 +2,7 @@
* Declarations of exported routines from LDP dissector
* Copyright 2004, Carlos Pignataro <cpignata@cisco.com>
*
- * $Id: packet-ldp.h,v 1.1 2004/05/13 20:20:34 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-llc.c b/packet-llc.c
index 61932494f5..6d488c446d 100644
--- a/packet-llc.c
+++ b/packet-llc.c
@@ -2,7 +2,7 @@
* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-llc.c,v 1.118 2004/01/18 08:32:45 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-llc.h b/packet-llc.h
index 948d6ad092..1271473404 100644
--- a/packet-llc.h
+++ b/packet-llc.h
@@ -1,6 +1,6 @@
/* packet-llc.h
*
- * $Id: packet-llc.h,v 1.11 2003/09/03 06:27:03 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-lmi.c b/packet-lmi.c
index 3bab37007c..7a37bcb509 100644
--- a/packet-lmi.c
+++ b/packet-lmi.c
@@ -2,7 +2,7 @@
* Routines for Frame Relay Local Management Interface (LMI) disassembly
* Copyright 2001, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-lmi.c,v 1.15 2003/10/17 23:44:06 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-lmp.c b/packet-lmp.c
index 33a8d484db..5d019a3f0d 100644
--- a/packet-lmp.c
+++ b/packet-lmp.c
@@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: packet-lmp.c,v 1.22 2004/07/02 08:38:36 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-lpd.c b/packet-lpd.c
index fcb26541fe..d79ea39638 100644
--- a/packet-lpd.c
+++ b/packet-lpd.c
@@ -2,7 +2,7 @@
* Routines for LPR and LPRng packet disassembly
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-lpd.c,v 1.37 2002/08/28 21:00:20 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-lwapp.c b/packet-lwapp.c
index 57ac76aae0..ee23838bce 100644
--- a/packet-lwapp.c
+++ b/packet-lwapp.c
@@ -3,7 +3,7 @@
* Routines for LWAPP encapsulated packet disassembly
* draft-calhoun-seamoby-lwapp-N (the current draft is 3)
*
- * $Id: packet-lwapp.c,v 1.5 2003/12/16 19:58:45 guy Exp $
+ * $Id$
*
* Copyright (c) 2003 by David Frascone <dave@frascone.com>
*
diff --git a/packet-m2pa.c b/packet-m2pa.c
index 43189a050c..db548e3e86 100644
--- a/packet-m2pa.c
+++ b/packet-m2pa.c
@@ -7,7 +7,7 @@
* Copyright 2001, 2002, Jeff Morriss <jeff.morriss[AT]ulticom.com>,
* updated by Michael Tuexen <tuexen [AT] fh-muenster.de>
*
- * $Id: packet-m2pa.c,v 1.24 2004/05/24 02:25:18 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-m2tp.c b/packet-m2tp.c
index d16dce93f8..e17b80f31a 100644
--- a/packet-m2tp.c
+++ b/packet-m2tp.c
@@ -5,7 +5,7 @@
*
* Copyright 2001, Heinz Prantner <heinz.prantner[AT]radisys.com>
*
- * $Id: packet-m2tp.c,v 1.9 2003/12/21 05:51:33 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-m2ua.c b/packet-m2ua.c
index 8bcc61a1ef..48ab05a047 100644
--- a/packet-m2ua.c
+++ b/packet-m2ua.c
@@ -6,7 +6,7 @@
*
* Copyright 2002, Michael Tuexen <tuexen [AT] fh-muenster.de>
*
- * $Id: packet-m2ua.c,v 1.15 2004/05/24 02:25:19 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-m3ua.c b/packet-m3ua.c
index 47d47f440e..407a394bc2 100644
--- a/packet-m3ua.c
+++ b/packet-m3ua.c
@@ -8,7 +8,7 @@
*
* Copyright 2000, 2001, 2002, 2003, 2004 Michael Tuexen <tuexen [AT] fh-muenster.de>
*
- * $Id: packet-m3ua.c,v 1.41 2004/06/27 17:16:25 tuexen Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mbtcp.c b/packet-mbtcp.c
index 996b96a62e..4d9549b45f 100644
--- a/packet-mbtcp.c
+++ b/packet-mbtcp.c
@@ -10,7 +10,7 @@
*
* for information on Modbus/TCP.
*
- * $Id: packet-mbtcp.c,v 1.14 2003/05/08 00:42:28 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mdshdr.c b/packet-mdshdr.c
index df1f46b330..b99f0b1a6c 100644
--- a/packet-mdshdr.c
+++ b/packet-mdshdr.c
@@ -2,7 +2,7 @@
* Routines for dissection of Cisco MDS Switch Internal Header
* Copyright 2001, Dinesh G Dutt <ddutt@andiamo.com>
*
- * $Id: packet-mdshdr.c,v 1.9 2004/02/24 17:49:06 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-media.c b/packet-media.c
index 7c56d9d8ab..726da7a292 100755
--- a/packet-media.c
+++ b/packet-media.c
@@ -4,7 +4,7 @@
*
* (C) Olivier Biot, 2004
*
- * $Id: packet-media.c,v 1.2 2004/04/30 21:33:15 guy Exp $
+ * $Id$
*
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
diff --git a/packet-mip.c b/packet-mip.c
index 8129121c56..ce2e46bd80 100644
--- a/packet-mip.c
+++ b/packet-mip.c
@@ -2,7 +2,7 @@
* Routines for Mobile IP dissection
* Copyright 2000, Stefan Raab <sraab@cisco.com>
*
- * $Id: packet-mip.c,v 1.35 2003/12/21 05:51:33 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mip6.c b/packet-mip6.c
index 20321270d9..cf0cf16b37 100644
--- a/packet-mip6.c
+++ b/packet-mip6.c
@@ -1,6 +1,6 @@
/* packet-mip6.c
*
- * $Id: packet-mip6.c,v 1.7 2004/03/30 17:52:15 guy Exp $
+ * $Id$
*
* Routines for Mobile IPv6 dissection (draft-ietf-mobileip-ipv6-20.txt)
* Copyright 2003 Oy L M Ericsson Ab <teemu.rinta-aho@ericsson.fi>
diff --git a/packet-mip6.h b/packet-mip6.h
index 6251a77e41..ec3d1ad9b8 100644
--- a/packet-mip6.h
+++ b/packet-mip6.h
@@ -1,6 +1,6 @@
/* packet-mip6.h
*
- * $Id: packet-mip6.h,v 1.4 2003/12/16 19:31:40 guy Exp $
+ * $Id$
*
* Definitions for Mobile IPv6 dissection (draft-ietf-mobileip-ipv6-20.txt)
* Copyright 2003 Oy L M Ericsson Ab <teemu.rinta-aho@ericsson.fi>
diff --git a/packet-mmse.c b/packet-mmse.c
index 8c2a57e9b7..7a55215b3d 100644
--- a/packet-mmse.c
+++ b/packet-mmse.c
@@ -3,7 +3,7 @@
* Copyright 2001, Tom Uijldert <tom.uijldert@cmg.nl>
* Copyright 2004, Olivier Biot
*
- * $Id: packet-mmse.c,v 1.35 2004/05/05 03:05:52 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mount.c b/packet-mount.c
index cf14210ef8..7dd2c345c9 100644
--- a/packet-mount.c
+++ b/packet-mount.c
@@ -1,7 +1,7 @@
/* packet-mount.c
* Routines for mount dissection
*
- * $Id: packet-mount.c,v 1.40 2003/09/28 01:52:57 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mount.h b/packet-mount.h
index 3c48e9d535..a6b503e2a8 100644
--- a/packet-mount.h
+++ b/packet-mount.h
@@ -1,5 +1,5 @@
/* packet-mount.h */
-/* $Id: packet-mount.h,v 1.4 2002/11/13 21:45:56 guy Exp $ */
+/* $Id$ */
#ifndef PACKET_MOUNT_H
#define PACKET_MOUNT_H
diff --git a/packet-mpeg1.c b/packet-mpeg1.c
index a6dd2a088f..e0a94920e1 100644
--- a/packet-mpeg1.c
+++ b/packet-mpeg1.c
@@ -2,7 +2,7 @@
*
* Routines for RFC 2250 MPEG-1 dissection
*
- * $Id: packet-mpeg1.c,v 1.10 2003/08/23 06:36:46 guy Exp $
+ * $Id$
*
* Copyright 2001,
* Francisco Javier Cabello Torres, <fjcabello@vtools.es>
diff --git a/packet-mpls-echo.c b/packet-mpls-echo.c
index 3f5d8ec5e3..2dde42f368 100644
--- a/packet-mpls-echo.c
+++ b/packet-mpls-echo.c
@@ -2,7 +2,7 @@
* Routines for Multiprotocol Label Switching Echo dissection
* Copyright 2004, Carlos Pignataro <cpignata@cisco.com>
*
- * $Id: packet-mpls-echo.c,v 1.1 2004/05/13 20:20:34 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mpls.c b/packet-mpls.c
index bc46e9425b..459122b621 100644
--- a/packet-mpls.c
+++ b/packet-mpls.c
@@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: packet-mpls.c,v 1.31 2004/05/15 19:54:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mq-pcf.c b/packet-mq-pcf.c
index 6528e8f42a..df586039bd 100644
--- a/packet-mq-pcf.c
+++ b/packet-mq-pcf.c
@@ -3,7 +3,7 @@
*
* metatech <metatech@flashmail.com>
*
- * $Id: packet-mq-pcf.c,v 1.1 2004/05/01 21:18:09 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mq.c b/packet-mq.c
index ac5be3b2bf..666415f7ae 100644
--- a/packet-mq.c
+++ b/packet-mq.c
@@ -3,7 +3,7 @@
*
* metatech <metatech@flashmail.com>
*
- * $Id: packet-mq.c,v 1.6 2004/05/11 11:27:20 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mq.h b/packet-mq.h
index 137527b52a..e2b8a18759 100644
--- a/packet-mq.h
+++ b/packet-mq.h
@@ -1,6 +1,6 @@
/* packet-mq.h
*
- * $Id: packet-mq.h,v 1.1 2004/05/01 21:18:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mrdisc.c b/packet-mrdisc.c
index c0975730db..82a00e72fe 100644
--- a/packet-mrdisc.c
+++ b/packet-mrdisc.c
@@ -1,7 +1,7 @@
/* packet-mrdisc.c 2001 Ronnie Sahlberg <See AUTHORS for email>
* Routines for IGMP/MRDISC packet disassembly
*
- * $Id: packet-mrdisc.c,v 1.10 2003/11/16 23:17:19 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mrdisc.h b/packet-mrdisc.h
index f6054f9295..5056bb1195 100644
--- a/packet-mrdisc.h
+++ b/packet-mrdisc.h
@@ -1,7 +1,7 @@
/* packet-mrdisc.h 2001 Ronnie Sahlberg <See AUTHORS for email>
* Declarations of routines for IGMP/MRDISC packet disassembly
*
- * $Id: packet-mrdisc.h,v 1.3 2002/08/28 21:00:22 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-msdp.c b/packet-msdp.c
index cbb26e797a..cb15ca0c3d 100644
--- a/packet-msdp.c
+++ b/packet-msdp.c
@@ -4,7 +4,7 @@
*
* Copyright 2001, Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-msdp.c,v 1.8 2003/01/20 06:24:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-msn-messenger.c b/packet-msn-messenger.c
index 8e0c59b0db..1b12c13eac 100644
--- a/packet-msn-messenger.c
+++ b/packet-msn-messenger.c
@@ -2,7 +2,7 @@
* Routines for MSN Messenger Service packet dissection
* Copyright 2003, Chris Waters <chris@waters.co.nz>
*
- * $Id: packet-msn-messenger.c,v 1.4 2004/02/19 20:27:43 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-msnip.c b/packet-msnip.c
index 40d0dcd222..e0ec3f0c85 100644
--- a/packet-msnip.c
+++ b/packet-msnip.c
@@ -1,7 +1,7 @@
/* packet-msnip.c 2001 Ronnie Sahlberg <See AUTHORS for email>
* Routines for IGMP/MSNIP packet disassembly
*
- * $Id: packet-msnip.c,v 1.9 2003/11/16 23:17:20 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-msnip.h b/packet-msnip.h
index e7cad883aa..5cbd4bccd4 100644
--- a/packet-msnip.h
+++ b/packet-msnip.h
@@ -1,7 +1,7 @@
/* packet-msnip.h 2001 Ronnie Sahlberg <See AUTHORS for email>
* Declarations of routines for IGMP/MSNIP packet disassembly
*
- * $Id: packet-msnip.h,v 1.3 2002/08/28 21:00:22 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-msproxy.c b/packet-msproxy.c
index b1d76aa1b4..b42d1f0a22 100644
--- a/packet-msproxy.c
+++ b/packet-msproxy.c
@@ -2,7 +2,7 @@
* Routines for Microsoft Proxy packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-msproxy.c,v 1.38 2004/01/22 20:43:17 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mtp2.c b/packet-mtp2.c
index b35ca46897..9dfc559b6c 100644
--- a/packet-mtp2.c
+++ b/packet-mtp2.c
@@ -5,7 +5,7 @@
*
* Copyright 2001, Michael Tuexen <tuexen [AT] fh-muenster.de>
*
- * $Id: packet-mtp2.c,v 1.10 2003/12/21 05:51:33 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mtp3.c b/packet-mtp3.c
index eb7cdd6a51..b23d801b46 100644
--- a/packet-mtp3.c
+++ b/packet-mtp3.c
@@ -9,7 +9,7 @@
* Copyright 2001, Michael Tuexen <tuexen [AT] fh-muenster.de>
* Updated for ANSI and Chinese ITU support by Jeff Morriss <jeff.morriss[AT]ulticom.com>
*
- * $Id: packet-mtp3.c,v 1.31 2004/07/03 12:58:41 tuexen Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mtp3.h b/packet-mtp3.h
index cd503e59cd..cdc1f476d6 100644
--- a/packet-mtp3.h
+++ b/packet-mtp3.h
@@ -1,6 +1,6 @@
/* packet-mtp3.h
*
- * $Id: packet-mtp3.h,v 1.8 2004/07/01 09:35:32 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-mtp3mg.c b/packet-mtp3mg.c
index bec2cf11fe..7bc8e4f39b 100644
--- a/packet-mtp3mg.c
+++ b/packet-mtp3mg.c
@@ -10,7 +10,7 @@
*
* Copyright 2003, Jeff Morriss <jeff.morriss[AT]ulticom.com>
*
- * $Id: packet-mtp3mg.c,v 1.12 2004/02/02 17:57:20 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-multipart.c b/packet-multipart.c
index ece40311f2..55942c4ba4 100755
--- a/packet-multipart.c
+++ b/packet-multipart.c
@@ -3,7 +3,7 @@
* Copyright 2004, Anders Broman.
* Copyright 2004, Olivier Biot.
*
- * $Id: packet-multipart.c,v 1.9 2004/04/30 17:07:21 obiot Exp $
+ * $Id$
*
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
diff --git a/packet-mysql.c b/packet-mysql.c
index f407a221c8..bda5bf6fb3 100644
--- a/packet-mysql.c
+++ b/packet-mysql.c
@@ -3,7 +3,7 @@
*
* Huagang XIE <huagang@intruvert.com>
*
- * $Id: packet-mysql.c,v 1.5 2003/04/03 23:51:31 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-nbipx.c b/packet-nbipx.c
index d21f08d5b7..3717b063f3 100644
--- a/packet-nbipx.c
+++ b/packet-nbipx.c
@@ -2,7 +2,7 @@
* Routines for NetBIOS over IPX packet disassembly
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-nbipx.c,v 1.48 2002/08/28 21:00:22 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-nbns.c b/packet-nbns.c
index 42738184ac..e2d51d206c 100644
--- a/packet-nbns.c
+++ b/packet-nbns.c
@@ -3,7 +3,7 @@
* to when it had only NBNS)
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-nbns.c,v 1.83 2004/02/24 09:40:38 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ncp-int.h b/packet-ncp-int.h
index a7e160b306..124fac3085 100644
--- a/packet-ncp-int.h
+++ b/packet-ncp-int.h
@@ -6,7 +6,7 @@
* Portions Copyright (c) Gilbert Ramirez 2000-2002
* Portions Copyright (c) Novell, Inc. 2000-2003
*
- * $Id: packet-ncp-int.h,v 1.18 2004/06/15 09:23:59 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ncp-nmas.c b/packet-ncp-nmas.c
index a55849f9aa..65517acbbc 100644
--- a/packet-ncp-nmas.c
+++ b/packet-ncp-nmas.c
@@ -3,7 +3,7 @@
* Greg Morris <gmorris@novell.com>
* Copyright (c) Novell, Inc. 2002-2004
*
- * $Id: packet-ncp-nmas.c,v 1.1 2004/02/29 08:01:22 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ncp-nmas.h b/packet-ncp-nmas.h
index 8ef7d18538..cca79a5776 100644
--- a/packet-ncp-nmas.h
+++ b/packet-ncp-nmas.h
@@ -3,7 +3,7 @@
* Greg Morris <gmorris@novell.com>
* Copyright (c) Novell, Inc. 2002-2004
*
- * $Id: packet-ncp-nmas.h,v 1.1 2004/02/29 08:01:22 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ncp.c b/packet-ncp.c
index 67b938e70b..01b8729372 100644
--- a/packet-ncp.c
+++ b/packet-ncp.c
@@ -9,7 +9,7 @@
* Portions Copyright (c) by James Coe 2000-2002
* Portions Copyright (c) Novell, Inc. 2000-2003
*
- * $Id: packet-ncp.c,v 1.78 2004/06/15 09:30:54 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ncp2222.inc b/packet-ncp2222.inc
index 1d6e426af4..52331bedba 100644
--- a/packet-ncp2222.inc
+++ b/packet-ncp2222.inc
@@ -11,7 +11,7 @@
* Portions Copyright (c) Gilbert Ramirez 2000-2002
* Portions Copyright (c) Novell, Inc. 2000-2003
*
- * $Id: packet-ncp2222.inc,v 1.71 2004/06/15 09:23:59 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ndmp.c b/packet-ndmp.c
index 4aad9397a3..4bf431a815 100644
--- a/packet-ndmp.c
+++ b/packet-ndmp.c
@@ -2,7 +2,7 @@
* Routines for NDMP dissection
* 2001 Ronnie Sahlberg (see AUTHORS for email)
*
- * $Id: packet-ndmp.c,v 1.28 2004/05/24 02:25:19 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ndps.c b/packet-ndps.c
index 43c210caed..17d890e2e2 100644
--- a/packet-ndps.c
+++ b/packet-ndps.c
@@ -3,7 +3,7 @@
* Greg Morris <gmorris@novell.com>
* Copyright (c) Novell, Inc. 2002-2003
*
- * $Id: packet-ndps.c,v 1.25 2003/10/17 22:59:18 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ndps.h b/packet-ndps.h
index c5f5ea3ad4..ac7d23eb90 100644
--- a/packet-ndps.h
+++ b/packet-ndps.h
@@ -4,7 +4,7 @@
*
* Copyright (c) Novell, Inc. 2002-2003
*
- * $Id: packet-ndps.h,v 1.5 2003/04/21 23:06:39 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-netbios.c b/packet-netbios.c
index 27e4acc66e..973731b77f 100644
--- a/packet-netbios.c
+++ b/packet-netbios.c
@@ -5,7 +5,7 @@
*
* derived from the packet-nbns.c
*
- * $Id: packet-netbios.c,v 1.57 2003/04/20 11:36:14 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-netbios.h b/packet-netbios.h
index 4c7bea8434..6bc1d51ac5 100644
--- a/packet-netbios.h
+++ b/packet-netbios.h
@@ -5,7 +5,7 @@
*
* derived from the packet-nbns.c
*
- * $Id: packet-netbios.h,v 1.15 2002/08/28 21:00:23 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-netflow.c b/packet-netflow.c
index a622472096..fcb560feaf 100644
--- a/packet-netflow.c
+++ b/packet-netflow.c
@@ -45,7 +45,7 @@
** http://www.cisco.com/univercd/cc/td/doc/cisintwk/intsolns/netflsol/nfwhite.htm
**
** $Yahoo: //depot/fumerola/packet-netflow/packet-netflow.c#14 $
- ** $Id: packet-netflow.c,v 1.13 2004/06/01 18:43:30 guy Exp $
+ ** $Id$
*/
#ifdef HAVE_CONFIG_H
diff --git a/packet-nfs.c b/packet-nfs.c
index 36cf1403d8..3b73d5640e 100644
--- a/packet-nfs.c
+++ b/packet-nfs.c
@@ -3,7 +3,7 @@
* Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
* Copyright 2000-2004, Mike Frisch <frisch@hummingbird.com> (NFSv4 decoding)
*
- * $Id: packet-nfs.c,v 1.98 2004/06/03 04:13:24 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-nfs.h b/packet-nfs.h
index 6627a6fe6c..5c5be608df 100644
--- a/packet-nfs.h
+++ b/packet-nfs.h
@@ -1,5 +1,5 @@
/* packet-nfs.h (c) 1999 Uwe Girlich */
-/* $Id: packet-nfs.h,v 1.18 2004/06/02 06:50:28 guy Exp $ */
+/* $Id$ */
#ifndef __PACKET_NFS_H__
#define __PACKET_NFS_H__
diff --git a/packet-nfsacl.c b/packet-nfsacl.c
index ea86702c1c..5999ec45d2 100644
--- a/packet-nfsacl.c
+++ b/packet-nfsacl.c
@@ -4,7 +4,7 @@
*
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-nfsacl.c,v 1.11 2003/10/06 20:46:51 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-nfsauth.c b/packet-nfsauth.c
index 28d7c78e04..fb15990de9 100644
--- a/packet-nfsauth.c
+++ b/packet-nfsauth.c
@@ -3,7 +3,7 @@
*
* Ronnie Sahlberg
*
- * $Id: packet-nfsauth.c,v 1.4 2002/11/01 00:48:38 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-nisplus.c b/packet-nisplus.c
index f1ab3f06e8..ed2975986e 100644
--- a/packet-nisplus.c
+++ b/packet-nisplus.c
@@ -1,7 +1,7 @@
/* packet-nisplus.c
* 2001 Ronnie Sahlberg <See AUTHORS for email>
*
- * $Id: packet-nisplus.c,v 1.15 2002/11/01 00:48:38 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-nisplus.h b/packet-nisplus.h
index 8bee35a213..dbc6c50aee 100644
--- a/packet-nisplus.h
+++ b/packet-nisplus.h
@@ -1,7 +1,7 @@
/* packet-nisplus.h
* 2001 Ronnie Sahlberg <See AUTHORS for email>
*
- * $Id: packet-nisplus.h,v 1.4 2002/08/28 21:00:24 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-nlm.c b/packet-nlm.c
index a7fa6f8220..7aa352c082 100644
--- a/packet-nlm.c
+++ b/packet-nlm.c
@@ -1,7 +1,7 @@
/* packet-nlm.c
* Routines for nlm dissection
*
- * $Id: packet-nlm.c,v 1.36 2004/02/25 09:31:06 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-nlm.h b/packet-nlm.h
index 77af0c0333..65e3ec18b4 100644
--- a/packet-nlm.h
+++ b/packet-nlm.h
@@ -1,5 +1,5 @@
/* packet-nlm.h (c) 1999 Uwe Girlich */
-/* $Id: packet-nlm.h,v 1.2 2000/08/02 11:32:31 girlich Exp $ */
+/* $Id$ */
#ifndef __PACKET_NLM_H__
#define __PACKET_NLM_H__
diff --git a/packet-nlsp.c b/packet-nlsp.c
index 1d88c51558..11b3159510 100644
--- a/packet-nlsp.c
+++ b/packet-nlsp.c
@@ -1,7 +1,7 @@
/* packet-nlsp.c
* Routines for NetWare Link Services Protocol
*
- * $Id: packet-nlsp.c,v 1.7 2003/10/06 08:35:30 guy Exp $
+ * $Id$
*
* Based on ISIS dissector by Stuart Stanley <stuarts@mxmail.net>
*
diff --git a/packet-nntp.c b/packet-nntp.c
index 1311546d87..71478fcd07 100644
--- a/packet-nntp.c
+++ b/packet-nntp.c
@@ -2,7 +2,7 @@
* Routines for nntp packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-nntp.c,v 1.27 2002/08/28 21:00:24 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-nt-oui.c b/packet-nt-oui.c
index 16ecd94cac..5a471943cf 100644
--- a/packet-nt-oui.c
+++ b/packet-nt-oui.c
@@ -1,7 +1,7 @@
/* packet-nt-oui.c
* Register an LLC dissector table for Nortel's OUI 00:00:0c
*
- * $Id: packet-nt-oui.c,v 1.1 2003/09/03 06:38:15 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-nt-sonmp.c b/packet-nt-sonmp.c
index f638fdccda..f0c2bebbaa 100644
--- a/packet-nt-sonmp.c
+++ b/packet-nt-sonmp.c
@@ -2,7 +2,7 @@
* Routines for the disassembly of the "Nortel Networks / SynOptics Network Management Protocol"
* (c) Copyright Giles Scott <giles.scott1 [AT] btinternet.com>
*
-* $Id: packet-nt-sonmp.c,v 1.5 2004/02/23 16:33:14 jmayer Exp $
+* $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-nt-tpcp.c b/packet-nt-tpcp.c
index 68060c7fb8..71d9e31085 100644
--- a/packet-nt-tpcp.c
+++ b/packet-nt-tpcp.c
@@ -2,7 +2,7 @@
* Routines for Transparent Proxy Cache Protocol packet disassembly
* (c) Copyright Giles Scott <giles.scott1 [AT] btinternet.com>
*
-* $Id: packet-nt-tpcp.c,v 1.3 2004/02/23 16:33:14 jmayer Exp $
+* $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ntlmssp.c b/packet-ntlmssp.c
index d01304d9b2..1d3cbcca20 100644
--- a/packet-ntlmssp.c
+++ b/packet-ntlmssp.c
@@ -3,7 +3,7 @@
* Devin Heitmueller <dheitmueller@netilla.com>
* Copyright 2003, Tim Potter <tpot@samba.org>
*
- * $Id: packet-ntlmssp.c,v 1.48 2004/05/04 08:30:36 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ntp.c b/packet-ntp.c
index a4ee76aed5..10c563b6e0 100644
--- a/packet-ntp.c
+++ b/packet-ntp.c
@@ -2,7 +2,7 @@
* Routines for NTP packet dissection
* Copyright 1999, Nathan Neulinger <nneul@umr.edu>
*
- * $Id: packet-ntp.c,v 1.41 2004/05/13 20:20:34 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ntp.h b/packet-ntp.h
index 63c224f108..889231aa21 100644
--- a/packet-ntp.h
+++ b/packet-ntp.h
@@ -1,7 +1,7 @@
/* packet-ntp.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet-ntp.h,v 1.9 2004/05/13 20:20:34 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-null.c b/packet-null.c
index 1cf359869b..cf0dc20af6 100644
--- a/packet-null.c
+++ b/packet-null.c
@@ -1,7 +1,7 @@
/* packet-null.c
* Routines for null packet disassembly
*
- * $Id: packet-null.c,v 1.63 2003/12/17 23:35:29 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-null.h b/packet-null.h
index 9d3945fd90..88eb16e46b 100644
--- a/packet-null.h
+++ b/packet-null.h
@@ -1,6 +1,6 @@
/* packet-null.h
*
- * $Id: packet-null.h,v 1.7 2002/08/28 21:00:24 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-olsr.c b/packet-olsr.c
index 967397a0d8..a3739ddfe3 100644
--- a/packet-olsr.c
+++ b/packet-olsr.c
@@ -8,7 +8,7 @@
*
* http://www.ietf.org/rfc/rfc3626.txt
*
- * $Id: packet-olsr.c,v 1.4 2004/01/18 16:48:24 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-osi-options.c b/packet-osi-options.c
index e9ec57c9e5..f49cffed75 100644
--- a/packet-osi-options.c
+++ b/packet-osi-options.c
@@ -5,7 +5,7 @@
* ISO 10589 ISIS (Intradomain Routing Information Exchange Protocol)
* ISO 9542 ESIS (End System To Intermediate System Routing Exchange Protocol)
*
- * $Id: packet-osi-options.c,v 1.16 2003/12/13 02:30:18 guy Exp $
+ * $Id$
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
* Ethereal - Network traffic analyzer
diff --git a/packet-osi-options.h b/packet-osi-options.h
index 45ff907aeb..27ee3ded8c 100644
--- a/packet-osi-options.h
+++ b/packet-osi-options.h
@@ -1,7 +1,7 @@
/* packet-osi-options.h
* Defines for OSI options part decode
*
- * $Id: packet-osi-options.h,v 1.6 2002/08/28 21:00:24 jmayer Exp $
+ * $Id$
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
* Ethereal - Network traffic analyzer
diff --git a/packet-osi.c b/packet-osi.c
index afc00cafb0..6afbc80adf 100644
--- a/packet-osi.c
+++ b/packet-osi.c
@@ -2,7 +2,7 @@
* Routines for ISO/OSI network and transport protocol packet disassembly
* Main entrance point and common functions
*
- * $Id: packet-osi.c,v 1.63 2003/09/20 03:31:25 guy Exp $
+ * $Id$
* Laurent Deniel <laurent.deniel@free.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
diff --git a/packet-osi.h b/packet-osi.h
index 8b389aab9a..9594917c09 100644
--- a/packet-osi.h
+++ b/packet-osi.h
@@ -1,6 +1,6 @@
/* packet-osi.h
*
- * $Id: packet-osi.h,v 1.14 2003/05/15 06:35:02 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ospf.c b/packet-ospf.c
index 1c31d67ec6..02ac9e64fd 100644
--- a/packet-ospf.c
+++ b/packet-ospf.c
@@ -2,7 +2,7 @@
* Routines for OSPF packet disassembly
* (c) Copyright Hannes R. Boehm <hannes@boehm.org>
*
- * $Id: packet-ospf.c,v 1.81 2004/06/19 09:48:49 guy Exp $
+ * $Id$
*
* At this time, this module is able to analyze OSPF
* packets as specified in RFC2328. MOSPF (RFC1584) and other
diff --git a/packet-pcnfsd.c b/packet-pcnfsd.c
index 1d63c7e798..40578c1e49 100644
--- a/packet-pcnfsd.c
+++ b/packet-pcnfsd.c
@@ -1,7 +1,7 @@
/* packet-pcnfsd.c
* Routines for PCNFSD dissection
*
- * $Id: packet-pcnfsd.c,v 1.12 2002/11/01 00:48:38 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-pcnfsd.h b/packet-pcnfsd.h
index 09cc7755c9..f217bdc768 100644
--- a/packet-pcnfsd.h
+++ b/packet-pcnfsd.h
@@ -1,6 +1,6 @@
/* packet-pcnfsd.h
*
- * $Id: packet-pcnfsd.h,v 1.2 2002/08/28 21:00:25 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-per.c b/packet-per.c
index cb4f667457..a18355ee4a 100644
--- a/packet-per.c
+++ b/packet-per.c
@@ -7,7 +7,7 @@ proper helper routines
* Routines for dissection of ASN.1 Aligned PER
* 2003 Ronnie Sahlberg
*
- * $Id: packet-per.c,v 1.29 2004/06/24 21:50:04 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-per.h b/packet-per.h
index 78c4973319..1aa640af81 100644
--- a/packet-per.h
+++ b/packet-per.h
@@ -2,7 +2,7 @@
* Routines for dissection of ASN.1 Aligned PER
* 2003 Ronnie Sahlberg
*
- * $Id: packet-per.h,v 1.15 2004/05/17 20:03:36 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-pflog.c b/packet-pflog.c
index 9c22e33b1e..4f53a07f2b 100644
--- a/packet-pflog.c
+++ b/packet-pflog.c
@@ -1,7 +1,7 @@
/* packet-pflog.c
* Routines for pflog (OpenBSD Firewall Logging) packet disassembly
*
- * $Id: packet-pflog.c,v 1.9 2003/05/16 00:30:54 guy Exp $
+ * $Id$
*
* Copyright 2001 Mike Frantzen
* All rights reserved.
diff --git a/packet-pflog.h b/packet-pflog.h
index eed417a0b6..fa51bb9926 100644
--- a/packet-pflog.h
+++ b/packet-pflog.h
@@ -1,6 +1,6 @@
/* packet-pflog.h
*
- * $Id: packet-pflog.h,v 1.5 2003/05/15 07:14:45 guy Exp $
+ * $Id$
*
* Copyright 2001 Mike Frantzen
* All rights reserved.
diff --git a/packet-pgm.c b/packet-pgm.c
index bb9e1a7dd2..9e7a8857be 100644
--- a/packet-pgm.c
+++ b/packet-pgm.c
@@ -1,7 +1,7 @@
/* packet-pgm.c
* Routines for PGM packet disassembly, RFC 3208
*
- * $Id: packet-pgm.c,v 1.24 2004/03/09 20:23:20 guy Exp $
+ * $Id$
*
* Copyright (c) 2000 by Talarian Corp
*
diff --git a/packet-pim.c b/packet-pim.c
index d1f598a9c9..485bb0ee33 100644
--- a/packet-pim.c
+++ b/packet-pim.c
@@ -2,7 +2,7 @@
* Routines for PIM disassembly
* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
*
- * $Id: packet-pim.c,v 1.48 2004/07/06 19:44:56 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-pim.h b/packet-pim.h
index 724233482f..e4b7514212 100644
--- a/packet-pim.h
+++ b/packet-pim.h
@@ -1,7 +1,7 @@
/* packet-pim.h
* Declarations of routines for IGMP/PIMv1 packet disassembly
*
- * $Id: packet-pim.h,v 1.4 2002/08/28 21:00:25 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-pktc.c b/packet-pktc.c
index 909c464eb1..07b63f5bf6 100644
--- a/packet-pktc.c
+++ b/packet-pktc.c
@@ -9,7 +9,7 @@
* Ronnie Sahlberg 2004
* Thomas Anders 2004
*
- * $Id: packet-pktc.c,v 1.9 2004/06/19 04:10:33 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-pktc.h b/packet-pktc.h
index bd94242227..a00b9579c7 100644
--- a/packet-pktc.h
+++ b/packet-pktc.h
@@ -3,7 +3,7 @@
* Ronnie Sahlberg 2004
* See the spec: PKT-SP-SEC-I10-040113.pdf
*
- * $Id: packet-pktc.h,v 1.1 2004/05/18 08:22:26 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-pop.c b/packet-pop.c
index 6838d54864..e78a53be54 100644
--- a/packet-pop.c
+++ b/packet-pop.c
@@ -2,7 +2,7 @@
* Routines for pop packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-pop.c,v 1.34 2003/06/11 20:03:09 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-portmap.c b/packet-portmap.c
index ce5aa72dee..72b55e6beb 100644
--- a/packet-portmap.c
+++ b/packet-portmap.c
@@ -1,7 +1,7 @@
/* packet-portmap.c
* Routines for portmap dissection
*
- * $Id: packet-portmap.c,v 1.42 2004/01/09 00:56:04 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-portmap.h b/packet-portmap.h
index 804638a541..695bad532c 100644
--- a/packet-portmap.h
+++ b/packet-portmap.h
@@ -1,6 +1,6 @@
/* packet-portmap.h
*
- * $Id: packet-portmap.h,v 1.5 2002/08/28 21:00:25 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-postgresql.c b/packet-postgresql.c
index 86ee8184f2..651ba1fb8f 100644
--- a/packet-postgresql.c
+++ b/packet-postgresql.c
@@ -3,7 +3,7 @@
*
* Copyright 2004, Edwin Calo <calo@fusemail.com>
*
- * $Id: packet-postgresql.c,v 1.7 2004/03/02 01:39:35 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ppp.c b/packet-ppp.c
index a103539c87..66962677a8 100644
--- a/packet-ppp.c
+++ b/packet-ppp.c
@@ -2,7 +2,7 @@
* Routines for ppp packet disassembly
* RFC 1661, RFC 1662
*
- * $Id: packet-ppp.c,v 1.120 2004/06/26 09:48:12 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ppp.h b/packet-ppp.h
index b04ff23f56..900f209199 100644
--- a/packet-ppp.h
+++ b/packet-ppp.h
@@ -1,6 +1,6 @@
/* packet-ppp.h
*
- * $Id: packet-ppp.h,v 1.14 2003/08/26 05:52:52 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-pppoe.c b/packet-pppoe.c
index fe6717a85c..d1f33240fc 100644
--- a/packet-pppoe.c
+++ b/packet-pppoe.c
@@ -1,7 +1,7 @@
/* packet-pppoe.c
* Routines for PPP Over Ethernet (PPPoE) packet disassembly (RFC2516)
*
- * $Id: packet-pppoe.c,v 1.25 2002/10/21 18:17:41 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-pptp.c b/packet-pptp.c
index 2c36c7efa3..f4db883388 100644
--- a/packet-pptp.c
+++ b/packet-pptp.c
@@ -2,7 +2,7 @@
* Routines for the Point-to-Point Tunnelling Protocol (PPTP) (RFC 2637)
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-pptp.c,v 1.29 2003/08/12 02:05:41 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-pres.c b/packet-pres.c
index af0b8330e4..61b421e285 100644
--- a/packet-pres.c
+++ b/packet-pres.c
@@ -2,7 +2,7 @@
*
* Routine to dissect ISO 8823 OSI Presentation Protocol packets
*
-* $Id: packet-pres.c,v 1.5 2004/04/30 06:24:35 ulfl Exp $
+* $Id$
*
* Yuriy Sidelnikov <YSidelnikov@hotmail.com>
*
diff --git a/packet-pres.h b/packet-pres.h
index dca2685ef9..a8a7f35178 100644
--- a/packet-pres.h
+++ b/packet-pres.h
@@ -2,7 +2,7 @@
*
* Routine to dissect ISO 8823 OSI Presentation Protocol packets
*
-* $Id: packet-pres.h,v 1.2 2004/03/23 19:37:23 guy Exp $
+* $Id$
*
* Yuriy Sidelnikov <YSidelnikov@hotmail.com>
*
diff --git a/packet-prism.c b/packet-prism.c
index 54830d6cca..57cc16b38a 100644
--- a/packet-prism.c
+++ b/packet-prism.c
@@ -9,7 +9,7 @@
*
* By Tim Newsham
*
- * $Id: packet-prism.c,v 1.15 2004/07/07 04:17:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-prism.h b/packet-prism.h
index b9439680bd..7af1893345 100644
--- a/packet-prism.h
+++ b/packet-prism.h
@@ -9,7 +9,7 @@
*
* By Tim Newsham
*
- * $Id: packet-prism.h,v 1.3 2002/08/28 21:00:25 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-q2931.c b/packet-q2931.c
index a765c6cf15..db34e3286e 100644
--- a/packet-q2931.c
+++ b/packet-q2931.c
@@ -2,7 +2,7 @@
* Routines for Q.2931 frame disassembly
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-q2931.c,v 1.31 2003/07/08 07:55:10 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-q931.c b/packet-q931.c
index 3e09da7165..10da9f3c95 100644
--- a/packet-q931.c
+++ b/packet-q931.c
@@ -2,7 +2,7 @@
* Routines for Q.931 frame disassembly
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-q931.c,v 1.76 2004/04/17 04:43:58 guy Exp $
+ * $Id$
*
* Modified by Andreas Sikkema for possible use with H.323
*
diff --git a/packet-q931.h b/packet-q931.h
index fb4d345026..c01cb39788 100644
--- a/packet-q931.h
+++ b/packet-q931.h
@@ -3,7 +3,7 @@
* disassembly
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-q931.h,v 1.11 2004/03/18 09:00:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-q933.c b/packet-q933.c
index d2ce596ac7..96b48a528b 100644
--- a/packet-q933.c
+++ b/packet-q933.c
@@ -2,7 +2,7 @@
* Routines for Q.933 frame disassembly
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-q933.c,v 1.7 2004/03/06 10:46:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-qllc.c b/packet-qllc.c
index 8d5f5bab36..f0913ca76b 100644
--- a/packet-qllc.c
+++ b/packet-qllc.c
@@ -2,7 +2,7 @@
* Routines for QLLC protocol - Qualified? LLC
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-qllc.c,v 1.8 2003/01/06 02:24:57 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-quake.c b/packet-quake.c
index 715c06efc7..752a19b7b8 100644
--- a/packet-quake.c
+++ b/packet-quake.c
@@ -4,7 +4,7 @@
* Uwe Girlich <uwe@planetquake.com>
* http://www.idsoftware.com/q1source/q1source.zip
*
- * $Id: packet-quake.c,v 1.30 2003/06/12 08:33:29 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-quake2.c b/packet-quake2.c
index 56a0a64d1e..188077e3e4 100644
--- a/packet-quake2.c
+++ b/packet-quake2.c
@@ -7,7 +7,7 @@
* http://www.dgs.monash.edu.au/~timf/bottim/
* http://www.opt-sci.Arizona.EDU/Pandora/default.asp
*
- * $Id: packet-quake2.c,v 1.17 2004/02/25 23:11:16 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-quake3.c b/packet-quake3.c
index 1d09fc01b3..bb8fbb3403 100644
--- a/packet-quake3.c
+++ b/packet-quake3.c
@@ -3,7 +3,7 @@
*
* Uwe Girlich <uwe@planetquake.com>
*
- * $Id: packet-quake3.c,v 1.17 2003/09/21 20:06:00 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-quakeworld.c b/packet-quakeworld.c
index 8455e8133f..5af335a52a 100644
--- a/packet-quakeworld.c
+++ b/packet-quakeworld.c
@@ -4,7 +4,7 @@
* Uwe Girlich <uwe@planetquake.com>
* http://www.idsoftware.com/q1source/q1source.zip
*
- * $Id: packet-quakeworld.c,v 1.19 2003/09/21 20:06:01 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-radiotap.c b/packet-radiotap.c
index 4d1aefd13a..e9adad14a3 100644
--- a/packet-radiotap.c
+++ b/packet-radiotap.c
@@ -2,7 +2,7 @@
* packet-radiotap.c
* Decode packets with a Radiotap header
*
- * $Id: packet-radiotap.c,v 1.5 2004/07/06 19:22:44 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-radiotap.h b/packet-radiotap.h
index 45f2b369b1..c92ecb7762 100644
--- a/packet-radiotap.h
+++ b/packet-radiotap.h
@@ -2,7 +2,7 @@
* packet-radiotap.h
* Declarations for packet-radiotap.c
*
- * $Id: packet-radiotap.h,v 1.1 2004/01/31 04:40:09 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-radius.c b/packet-radius.c
index 651da08218..ac561d4990 100644
--- a/packet-radius.c
+++ b/packet-radius.c
@@ -6,7 +6,7 @@
*
* RFC 2865, RFC 2866, RFC 2867, RFC 2868, RFC 2869
*
- * $Id: packet-radius.c,v 1.105 2004/07/09 23:17:04 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ranap.c b/packet-ranap.c
index f5549b1027..2ec6df5edc 100644
--- a/packet-ranap.c
+++ b/packet-ranap.c
@@ -3,7 +3,7 @@
* Based on 3GPP TS 25.413 V3.4.0
* Copyright 2001, Martin Held <Martin.Held@icn.siemens.de>
*
- * $Id: packet-ranap.c,v 1.23 2004/05/01 17:02:09 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-raw.c b/packet-raw.c
index 9507f7ca4d..77939b5cf7 100644
--- a/packet-raw.c
+++ b/packet-raw.c
@@ -1,7 +1,7 @@
/* packet-raw.c
* Routines for raw packet disassembly
*
- * $Id: packet-raw.c,v 1.36 2003/08/26 05:52:52 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-raw.h b/packet-raw.h
index fc56069715..40480ec0cc 100644
--- a/packet-raw.h
+++ b/packet-raw.h
@@ -1,6 +1,6 @@
/* packet-raw.h
*
- * $Id: packet-raw.h,v 1.7 2002/08/28 21:00:29 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rip.c b/packet-rip.c
index 9b9358ad58..a39a14a841 100644
--- a/packet-rip.c
+++ b/packet-rip.c
@@ -6,7 +6,7 @@
* RFC2082 ( Keyed Message Digest Algorithm )
* Emanuele Caratti <wiz@iol.it>
*
- * $Id: packet-rip.c,v 1.35 2004/07/05 10:15:30 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ripng.c b/packet-ripng.c
index 5815033942..7ed7526e92 100644
--- a/packet-ripng.c
+++ b/packet-ripng.c
@@ -3,7 +3,7 @@
* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
* derived from packet-rip.c
*
- * $Id: packet-ripng.c,v 1.27 2002/08/28 21:00:29 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ripng.h b/packet-ripng.h
index d141a98a3f..1dc0b4f641 100644
--- a/packet-ripng.h
+++ b/packet-ripng.h
@@ -2,7 +2,7 @@
* RIPng definition
* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
*
- * $Id: packet-ripng.h,v 1.6 2002/08/28 21:00:29 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-rlogin.c b/packet-rlogin.c
index b8195f0b6f..5f09780830 100644
--- a/packet-rlogin.c
+++ b/packet-rlogin.c
@@ -2,7 +2,7 @@
* Routines for unix rlogin packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-rlogin.c,v 1.28 2002/08/28 21:00:29 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rmcp.c b/packet-rmcp.c
index 881f432e1f..eb03f595b8 100644
--- a/packet-rmcp.c
+++ b/packet-rmcp.c
@@ -3,7 +3,7 @@
*
* Duncan Laurie <duncan@sun.com>
*
- * $Id: packet-rmcp.c,v 1.2 2003/06/04 08:51:36 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rmi.c b/packet-rmi.c
index f1d016bc69..ca1ed61d2a 100644
--- a/packet-rmi.c
+++ b/packet-rmi.c
@@ -2,7 +2,7 @@
* Routines for java rmiregistry dissection
* Copyright 2002, Michael Stiller <ms@2scale.net>
*
- * $Id: packet-rmi.c,v 1.9 2003/05/26 21:44:28 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rmi.h b/packet-rmi.h
index a6f5f50e71..80ed7b357a 100644
--- a/packet-rmi.h
+++ b/packet-rmi.h
@@ -2,7 +2,7 @@
* header file for java rmiregistry dissection
* Copyright 2002, Michael Stiller <ms@2scale.net>
*
- * $Id: packet-rmi.h,v 1.5 2003/12/21 03:58:29 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rmp.c b/packet-rmp.c
index 333b62baf6..bef7158581 100644
--- a/packet-rmp.c
+++ b/packet-rmp.c
@@ -2,7 +2,7 @@
* Routines for HP remote management protocol
* Gilbert Ramirez <jochen@scram.de>
*
- * $Id: packet-rmp.c,v 1.2 2003/03/03 14:08:39 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rpc.c b/packet-rpc.c
index b23d366f28..07de41b8f5 100644
--- a/packet-rpc.c
+++ b/packet-rpc.c
@@ -2,7 +2,7 @@
* Routines for rpc dissection
* Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
*
- * $Id: packet-rpc.c,v 1.144 2004/04/29 11:58:00 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rpc.h b/packet-rpc.h
index 706810d967..3eb5312e8b 100644
--- a/packet-rpc.h
+++ b/packet-rpc.h
@@ -1,6 +1,6 @@
/* packet-rpc.h
*
- * $Id: packet-rpc.h,v 1.45 2004/05/09 10:03:37 guy Exp $
+ * $Id$
*
* (c) 1999 Uwe Girlich
*
diff --git a/packet-rpl.c b/packet-rpl.c
index be445f683d..9fc84ac5af 100644
--- a/packet-rpl.c
+++ b/packet-rpl.c
@@ -2,7 +2,7 @@
* Routines for RPL
* Jochen Friedrich <jochen@scram.de>
*
- * $Id: packet-rpl.c,v 1.6 2004/02/21 08:21:43 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rquota.c b/packet-rquota.c
index 482c287a2e..98f3fc7d62 100644
--- a/packet-rquota.c
+++ b/packet-rquota.c
@@ -2,7 +2,7 @@
* Routines for rquota dissection
* Copyright 2001, Mike Frisch <frisch@hummingbird.com>
*
- * $Id: packet-rquota.c,v 1.11 2002/11/01 00:48:38 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rquota.h b/packet-rquota.h
index 588e9d5653..3bfdaced7f 100644
--- a/packet-rquota.h
+++ b/packet-rquota.h
@@ -1,6 +1,6 @@
/* packet-rquota.h
*
- * $Id: packet-rquota.h,v 1.3 2002/08/28 21:00:29 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-rsh.c b/packet-rsh.c
index ca5b6329c0..856588a085 100644
--- a/packet-rsh.c
+++ b/packet-rsh.c
@@ -4,7 +4,7 @@
* Robert Tsai <rtsai@netapp.com>
* Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-rsh.c,v 1.20 2002/08/28 21:00:29 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rstat.c b/packet-rstat.c
index aaa2236b47..8401651576 100644
--- a/packet-rstat.c
+++ b/packet-rstat.c
@@ -3,7 +3,7 @@
*
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-rstat.c,v 1.5 2004/01/06 00:08:55 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rsvp.c b/packet-rsvp.c
index 06188f52f2..dec783e763 100644
--- a/packet-rsvp.c
+++ b/packet-rsvp.c
@@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: packet-rsvp.c,v 1.91 2004/06/19 09:48:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rsvp.h b/packet-rsvp.h
index aa63fd69cc..020d74c30c 100644
--- a/packet-rsvp.h
+++ b/packet-rsvp.h
@@ -1,7 +1,7 @@
/* packet-rsvp.h
* Declarations of variables exported by "packet-rsvp.c"
*
- * $Id: packet-rsvp.h,v 1.11 2004/06/19 09:48:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rsync.c b/packet-rsync.c
index 8825eff877..0195e06ed3 100644
--- a/packet-rsync.c
+++ b/packet-rsync.c
@@ -3,7 +3,7 @@
* [ very rough, but mininally functional ]
* Copyright 2003, Brad Hards <bradh@frogmouth.net>
*
- * $Id: packet-rsync.c,v 1.7 2004/01/17 12:51:00 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rtcp.c b/packet-rtcp.c
index ed63a09690..86a826f7e6 100644
--- a/packet-rtcp.c
+++ b/packet-rtcp.c
@@ -1,6 +1,6 @@
/* packet-rtcp.c
*
- * $Id: packet-rtcp.c,v 1.46 2004/06/30 21:08:58 etxrab Exp $
+ * $Id$
*
* Routines for RTCP dissection
* RTCP = Real-time Transport Control Protocol
diff --git a/packet-rtcp.h b/packet-rtcp.h
index 1e8b217cda..30e0ee5dd9 100644
--- a/packet-rtcp.h
+++ b/packet-rtcp.h
@@ -1,6 +1,6 @@
/* packet-rtcp.h
*
- * $Id: packet-rtcp.h,v 1.9 2004/06/15 18:26:08 etxrab Exp $
+ * $Id$
*
* Routines for RTCP dissection
* RTCP = Real-time Transport Control Protocol
diff --git a/packet-rtp-events.c b/packet-rtp-events.c
index 09fcb09f74..13630e462a 100644
--- a/packet-rtp-events.c
+++ b/packet-rtp-events.c
@@ -3,7 +3,7 @@
* Routines for RFC 2833 RTP Events dissection
* Copyright 2003, Kevin A. Noll <knoll[AT]poss.com>
*
- * $Id: packet-rtp-events.c,v 1.4 2004/05/01 14:22:00 etxrab Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rtp-events.h b/packet-rtp-events.h
index 8f1231ffcf..76c972f1d1 100644
--- a/packet-rtp-events.h
+++ b/packet-rtp-events.h
@@ -3,7 +3,7 @@
* Defines for RFC 2833 RTP Events dissection
* Copyright 2003, Kevin A. Noll <knoll[AT]poss.com>
*
- * $Id: packet-rtp-events.h,v 1.1 2003/09/19 04:16:23 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rtp.c b/packet-rtp.c
index 33d08c4594..900b01c2be 100644
--- a/packet-rtp.c
+++ b/packet-rtp.c
@@ -6,7 +6,7 @@
* Copyright 2000, Philips Electronics N.V.
* Written by Andreas Sikkema <h323@ramdyne.nl>
*
- * $Id: packet-rtp.c,v 1.52 2004/07/01 06:59:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rtp.h b/packet-rtp.h
index e10b4e08be..788e060f1c 100644
--- a/packet-rtp.h
+++ b/packet-rtp.h
@@ -3,7 +3,7 @@
* Routines for RTP dissection
* RTP = Real time Transport Protocol
*
- * $Id: packet-rtp.h,v 1.12 2004/06/15 18:26:08 etxrab Exp $
+ * $Id$
*
* Copyright 2000, Philips Electronics N.V.
* Written by Andreas Sikkema <andreas.sikkema@philips.com>
diff --git a/packet-rtps.c b/packet-rtps.c
index 451310ad42..6adcf73806 100644
--- a/packet-rtps.c
+++ b/packet-rtps.c
@@ -12,7 +12,7 @@
* version: 2004/04/15 9:40:45
* dedication to Kj :]
*
- * $Id: packet-rtps.c,v 1.9 2004/04/19 22:41:19 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rtps.h b/packet-rtps.h
index 1b1b32e9f1..cbd768f2e3 100644
--- a/packet-rtps.h
+++ b/packet-rtps.h
@@ -1,5 +1,5 @@
/*
- * $Id: packet-rtps.h,v 1.3 2004/04/22 20:29:46 jmayer Exp $
+ * $Id$
*
* AUTHOR: Petr Smolik petr.smolik@wo.cz
*
diff --git a/packet-rtsp.c b/packet-rtsp.c
index 7286bedd39..1a1453494e 100644
--- a/packet-rtsp.c
+++ b/packet-rtsp.c
@@ -4,7 +4,7 @@
* Jason Lango <jal@netapp.com>
* Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-rtsp.c,v 1.67 2004/07/09 23:37:40 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rwall.c b/packet-rwall.c
index cf8c2be718..531bb0d80f 100644
--- a/packet-rwall.c
+++ b/packet-rwall.c
@@ -1,6 +1,6 @@
/* packet-rwall.c
*
- * $Id: packet-rwall.c,v 1.9 2002/11/01 00:48:38 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rwall.h b/packet-rwall.h
index b3f6459855..f63d3c88eb 100644
--- a/packet-rwall.h
+++ b/packet-rwall.h
@@ -1,6 +1,6 @@
/* packet-rwall.h
*
- * $Id: packet-rwall.h,v 1.3 2002/08/28 21:00:30 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rx.c b/packet-rx.c
index e3f9186fd7..8600c38635 100644
--- a/packet-rx.c
+++ b/packet-rx.c
@@ -4,7 +4,7 @@
* Based on routines from tcpdump patches by
* Ken Hornstein <kenh@cmf.nrl.navy.mil>
*
- * $Id: packet-rx.c,v 1.39 2003/09/21 20:06:01 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-rx.h b/packet-rx.h
index 0a103d3071..9824675b1f 100644
--- a/packet-rx.h
+++ b/packet-rx.h
@@ -1,7 +1,7 @@
/* packet-rx.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet-rx.h,v 1.9 2002/02/05 21:02:36 nneul Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sadmind.c b/packet-sadmind.c
index b05bbf23db..ffcf2a065c 100644
--- a/packet-sadmind.c
+++ b/packet-sadmind.c
@@ -3,7 +3,7 @@
*
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-sadmind.c,v 1.4 2002/11/01 00:48:39 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sap.c b/packet-sap.c
index 854415290b..c54ad1ecd8 100644
--- a/packet-sap.c
+++ b/packet-sap.c
@@ -4,7 +4,7 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-sap.c,v 1.31 2002/12/02 23:43:29 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sccp.c b/packet-sccp.c
index d9c4ef5c72..88dee1a850 100644
--- a/packet-sccp.c
+++ b/packet-sccp.c
@@ -8,7 +8,7 @@
*
* Copyright 2002, Jeff Morriss <jeff.morriss[AT]ulticom.com>
*
- * $Id: packet-sccp.c,v 1.20 2004/01/08 20:19:03 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sccpmg.c b/packet-sccpmg.c
index 0685c69c27..a0f90fcdba 100755
--- a/packet-sccpmg.c
+++ b/packet-sccpmg.c
@@ -8,7 +8,7 @@
*
* Copyright 2002, Jeff Morriss <jeff.morriss[AT]ulticom.com>
*
- * $Id: packet-sccpmg.c,v 1.8 2003/09/06 00:04:21 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-scsi.c b/packet-scsi.c
index d67b2ba6a0..0e34fb9d70 100644
--- a/packet-scsi.c
+++ b/packet-scsi.c
@@ -2,7 +2,7 @@
* Routines for decoding SCSI CDBs and responses
* Author: Dinesh G Dutt (ddutt@cisco.com)
*
- * $Id: packet-scsi.c,v 1.39 2004/06/11 08:33:58 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-scsi.h b/packet-scsi.h
index e57b186898..ed2ff42e7c 100644
--- a/packet-scsi.h
+++ b/packet-scsi.h
@@ -1,7 +1,7 @@
/* packet-scsi.h
* Author: Dinesh G Dutt (ddutt@cisco.com)
*
- * $Id: packet-scsi.h,v 1.7 2003/03/08 08:02:20 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sctp.c b/packet-sctp.c
index f97ac03a9e..4e2712db3d 100644
--- a/packet-sctp.c
+++ b/packet-sctp.c
@@ -16,7 +16,7 @@
* * bundling errors
* * value errors
*
- * $Id: packet-sctp.c,v 1.72 2004/05/24 02:25:19 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sctp.h b/packet-sctp.h
index 0af4b562cd..72e5cd594f 100644
--- a/packet-sctp.h
+++ b/packet-sctp.h
@@ -2,7 +2,7 @@
*
* Defintion of SCTP specific structures used b tap listeners.
*
- * $Id: packet-sctp.h,v 1.1 2004/03/23 17:27:29 tuexen Exp $
+ * $Id$
* Copyright 2004 Michael Tuexen <tuexen [AT] fh-muenster.de>
* Ethereal - Network traffic analyzer
diff --git a/packet-sdlc.c b/packet-sdlc.c
index 490c5c734d..12a6e2c140 100644
--- a/packet-sdlc.c
+++ b/packet-sdlc.c
@@ -1,7 +1,7 @@
/* packet-sdlc.c
* Routines for SDLC frame disassembly
*
- * $Id: packet-sdlc.c,v 1.4 2004/01/18 08:32:46 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sdp.c b/packet-sdp.c
index 420ee54075..3460bca5f7 100644
--- a/packet-sdp.c
+++ b/packet-sdp.c
@@ -4,7 +4,7 @@
* Jason Lango <jal@netapp.com>
* Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-sdp.c,v 1.47 2004/06/15 18:26:08 etxrab Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sebek.c b/packet-sebek.c
index 47879f097f..7ba6882965 100644
--- a/packet-sebek.c
+++ b/packet-sebek.c
@@ -4,7 +4,7 @@
*
* See: http://project.honeynet.org/tools/sebek/ for more details
*
- * $Id: packet-sebek.c,v 1.1 2003/11/19 22:13:29 nneul Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ses.c b/packet-ses.c
index b070588048..b1f00d845c 100644
--- a/packet-ses.c
+++ b/packet-ses.c
@@ -2,7 +2,7 @@
*
* Routine to dissect ISO 8327-1 OSI Session Protocol packets
*
-* $Id: packet-ses.c,v 1.8 2004/01/13 01:55:36 guy Exp $
+* $Id$
*
* Yuriy Sidelnikov <YSidelnikov@hotmail.com>
*
diff --git a/packet-ses.h b/packet-ses.h
index 13e6c214ab..7a8830fd6f 100644
--- a/packet-ses.h
+++ b/packet-ses.h
@@ -2,7 +2,7 @@
*
* Routine to dissect ISO 8327-1 OSI Session Protocol packets
*
-* $Id: packet-ses.h,v 1.3 2004/01/09 23:18:17 guy Exp $
+* $Id$
*
* Yuriy Sidelnikov <YSidelnikov@hotmail.com>
*
diff --git a/packet-sflow.c b/packet-sflow.c
index 57061393fe..9177a7be74 100644
--- a/packet-sflow.c
+++ b/packet-sflow.c
@@ -2,7 +2,7 @@
* Routines for sFlow dissection
* Copyright 2003, Jeff Rizzo <riz@boogers.sf.ca.us>
*
- * $Id: packet-sflow.c,v 1.2 2003/06/14 23:50:43 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sigcomp.c b/packet-sigcomp.c
index 015470745d..8cbbcc824c 100644
--- a/packet-sigcomp.c
+++ b/packet-sigcomp.c
@@ -2,7 +2,7 @@
* Routines for Signaling Compression (SigComp) dissection.
* Copyright 2004, Anders Broman <anders.broman@ericsson.com>
*
- * $Id: packet-sigcomp.c,v 1.3 2004/06/29 20:40:12 etxrab Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sip.c b/packet-sip.c
index 4f99c8dea0..e6eba141cf 100644
--- a/packet-sip.c
+++ b/packet-sip.c
@@ -18,7 +18,7 @@
* Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
* Copyright 2001, Jean-Francois Mule <jfm@cablelabs.com>
*
- * $Id: packet-sip.c,v 1.69 2004/06/16 18:20:49 etxrab Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sip.h b/packet-sip.h
index b58076fd7f..e8702758e5 100755
--- a/packet-sip.h
+++ b/packet-sip.h
@@ -1,6 +1,6 @@
/* packet-sip.h
*
- * $Id: packet-sip.h,v 1.3 2004/06/16 18:20:49 etxrab Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sipfrag.c b/packet-sipfrag.c
index 9c49d93ffc..c40bfaf89f 100644
--- a/packet-sipfrag.c
+++ b/packet-sipfrag.c
@@ -3,7 +3,7 @@
* Martin Mathieson
* Based on packet-sdp.c
*
- * $Id: packet-sipfrag.c,v 1.1 2004/02/03 18:57:26 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-skinny.c b/packet-skinny.c
index 682c956398..ff8b025799 100644
--- a/packet-skinny.c
+++ b/packet-skinny.c
@@ -11,7 +11,7 @@
* This file is based on packet-aim.c, which is
* Copyright 2000, Ralf Hoelzer <ralf@well.com>
*
- * $Id: packet-skinny.c,v 1.24 2004/02/20 23:09:51 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-slimp3.c b/packet-slimp3.c
index 8926592104..89071840eb 100644
--- a/packet-slimp3.c
+++ b/packet-slimp3.c
@@ -6,7 +6,7 @@
* Adds support for the data packet protocol for the SliMP3
* See www.slimdevices.com for details.
*
- * $Id: packet-slimp3.c,v 1.10 2003/02/27 05:54:31 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sll.c b/packet-sll.c
index 0748293332..d1fb2a968f 100644
--- a/packet-sll.c
+++ b/packet-sll.c
@@ -1,7 +1,7 @@
/* packet-sll.c
* Routines for disassembly of packets from Linux "cooked mode" captures
*
- * $Id: packet-sll.c,v 1.21 2003/12/22 20:26:21 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sll.h b/packet-sll.h
index 8cb86cbc0f..e108e9f13d 100644
--- a/packet-sll.h
+++ b/packet-sll.h
@@ -1,6 +1,6 @@
/* packet-sll.h
*
- * $Id: packet-sll.h,v 1.4 2002/08/28 21:00:31 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-slowprotocols.c b/packet-slowprotocols.c
index 5a4a4a445f..aa50a31b3a 100644
--- a/packet-slowprotocols.c
+++ b/packet-slowprotocols.c
@@ -1,7 +1,7 @@
/* packet-slowprotocols.c
* Routines for EtherType (0x8809) Slow Protocols disassembly.
*
- * $Id: packet-slowprotocols.c,v 1.4 2002/08/28 21:00:31 jmayer Exp $
+ * $Id$
*
* Copyright 2002 Steve Housley <steve_housley@3com.com>
*
diff --git a/packet-slsk.c b/packet-slsk.c
index 66b5d5af7b..a9f75795e8 100644
--- a/packet-slsk.c
+++ b/packet-slsk.c
@@ -9,7 +9,7 @@
* http://cvs.sourceforge.net/viewcvs.py/soleseek/SoleSeek/doc/protocol.html?rev=HEAD
* Updated for SoulSeek client version 151
*
- * $Id: packet-slsk.c,v 1.4 2004/05/05 17:28:12 obiot Exp $
+ * $Id$
*
*
* Ethereal - Network traffic analyzer
diff --git a/packet-smb-browse.c b/packet-smb-browse.c
index d5c78339e3..103e7799aa 100644
--- a/packet-smb-browse.c
+++ b/packet-smb-browse.c
@@ -2,7 +2,7 @@
* Routines for SMB Browser packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-smb-browse.c,v 1.36 2004/01/19 20:10:36 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-smb-browse.h b/packet-smb-browse.h
index 94bf48bd09..20385fe949 100644
--- a/packet-smb-browse.h
+++ b/packet-smb-browse.h
@@ -2,7 +2,7 @@
* Declaration of routines for SMB Browser packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-smb-browse.h,v 1.8 2004/01/19 20:10:36 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-smb-common.c b/packet-smb-common.c
index 991fbf9961..f5e4d09275 100644
--- a/packet-smb-common.c
+++ b/packet-smb-common.c
@@ -2,7 +2,7 @@
* Common routines for smb packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-smb-common.c,v 1.20 2004/04/03 03:50:44 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-smb-common.h b/packet-smb-common.h
index eb436f3ba5..94d0a4b889 100644
--- a/packet-smb-common.h
+++ b/packet-smb-common.h
@@ -2,7 +2,7 @@
* Routines for SMB packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-smb-common.h,v 1.27 2004/03/30 07:39:05 sharpe Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-smb-logon.c b/packet-smb-logon.c
index 5d1f2376b2..a1060353f0 100644
--- a/packet-smb-logon.c
+++ b/packet-smb-logon.c
@@ -2,7 +2,7 @@
* Routines for SMB net logon packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-smb-logon.c,v 1.36 2003/11/19 03:53:32 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-smb-mailslot.c b/packet-smb-mailslot.c
index 9879433a4e..9ad7db08ed 100644
--- a/packet-smb-mailslot.c
+++ b/packet-smb-mailslot.c
@@ -2,7 +2,7 @@
* Routines for SMB mailslot packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-smb-mailslot.c,v 1.36 2004/03/30 19:37:31 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-smb-mailslot.h b/packet-smb-mailslot.h
index 879113bcef..aa8cf9a9d7 100644
--- a/packet-smb-mailslot.h
+++ b/packet-smb-mailslot.h
@@ -2,7 +2,7 @@
* Declaration of routines for SMB mailslot packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-smb-mailslot.h,v 1.7 2002/08/28 21:00:31 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c
index 1a8748c2dd..b7ba500976 100644
--- a/packet-smb-pipe.c
+++ b/packet-smb-pipe.c
@@ -8,7 +8,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets
* significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and
* Guy Harris 2001
*
- * $Id: packet-smb-pipe.c,v 1.101 2004/06/09 09:24:07 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-smb-pipe.h b/packet-smb-pipe.h
index f422fd27f4..5df9511689 100644
--- a/packet-smb-pipe.h
+++ b/packet-smb-pipe.h
@@ -2,7 +2,7 @@
* Declarations of routines for SMB named pipe packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-smb-pipe.h,v 1.11 2002/08/28 21:00:31 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-smb-sidsnooping.c b/packet-smb-sidsnooping.c
index edd22c43f0..84cdb8125e 100644
--- a/packet-smb-sidsnooping.c
+++ b/packet-smb-sidsnooping.c
@@ -2,7 +2,7 @@
* Routines for snooping SID to name mappings
* Copyright 2003, Ronnie Sahlberg
*
- * $Id: packet-smb-sidsnooping.c,v 1.13 2004/06/04 00:15:55 tpot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-smb-sidsnooping.h b/packet-smb-sidsnooping.h
index ee633acbea..b369b525fe 100644
--- a/packet-smb-sidsnooping.h
+++ b/packet-smb-sidsnooping.h
@@ -2,7 +2,7 @@
* Routines for snooping SID to name mappings
* Copyright 2003, Ronnie Sahlberg
*
- * $Id: packet-smb-sidsnooping.h,v 1.3 2004/05/09 10:03:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-smb.c b/packet-smb.c
index 81567aa1b0..33d1c8fca3 100644
--- a/packet-smb.c
+++ b/packet-smb.c
@@ -3,7 +3,7 @@
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
* 2001 Rewrite by Ronnie Sahlberg and Guy Harris
*
- * $Id: packet-smb.c,v 1.391 2004/05/29 06:55:52 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-smpp.c b/packet-smpp.c
index 031a7aca65..5d92afc530 100644
--- a/packet-smpp.c
+++ b/packet-smpp.c
@@ -8,7 +8,7 @@
* Dissection of multiple SMPP PDUs within one packet
* provided by Chris Wilson.
*
- * $Id: packet-smpp.c,v 1.29 2004/03/08 22:03:59 obiot Exp $
+ * $Id$
*
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
diff --git a/packet-smtp.c b/packet-smtp.c
index 200c72b336..f95978411c 100644
--- a/packet-smtp.c
+++ b/packet-smtp.c
@@ -1,7 +1,7 @@
/* packet-smtp.c
* Routines for SMTP packet disassembly
*
- * $Id: packet-smtp.c,v 1.37 2004/05/16 18:50:40 guy Exp $
+ * $Id$
*
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
*
diff --git a/packet-sna.c b/packet-sna.c
index 4cad38284b..be53b18c43 100644
--- a/packet-sna.c
+++ b/packet-sna.c
@@ -3,7 +3,7 @@
* Gilbert Ramirez <gram@alumni.rice.edu>
* Jochen Friedrich <jochen@scram.de>
*
- * $Id: packet-sna.c,v 1.51 2004/02/27 09:02:36 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sna.h b/packet-sna.h
index 2e3d411662..47056a5a46 100644
--- a/packet-sna.h
+++ b/packet-sna.h
@@ -1,7 +1,7 @@
/* packet-sna.h
* Definitions for SNA dissection.
*
- * $Id: packet-sna.h,v 1.6 2003/08/26 01:00:28 guy Exp $
+ * $Id$
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/packet-snaeth.c b/packet-snaeth.c
index e18d228550..b4e055a917 100644
--- a/packet-snaeth.c
+++ b/packet-snaeth.c
@@ -1,7 +1,7 @@
/* packet-snaeth.c
* Routines for SNA-over-Ethernet (Ethernet type 80d5)
*
- * $Id: packet-snaeth.c,v 1.4 2002/08/28 21:00:34 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sndcp.c b/packet-sndcp.c
index 0dc1237040..b6123b3310 100644
--- a/packet-sndcp.c
+++ b/packet-sndcp.c
@@ -2,7 +2,7 @@
* Routines for Subnetwork Dependent Convergence Protocol (SNDCP) dissection
* Copyright 2000, Christian Falckenberg <christian.falckenberg@nortelnetworks.com>
*
- * $Id: packet-sndcp.c,v 1.4 2004/05/04 09:12:26 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-snmp.c b/packet-snmp.c
index 2fa26faac1..fc6d191df8 100644
--- a/packet-snmp.c
+++ b/packet-snmp.c
@@ -10,7 +10,7 @@
*
* See RFCs 2570-2576 for SNMPv3
*
- * $Id: packet-snmp.c,v 1.129 2004/07/09 23:17:05 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-snmp.h b/packet-snmp.h
index e1bb815940..3f4f3feed5 100644
--- a/packet-snmp.h
+++ b/packet-snmp.h
@@ -2,7 +2,7 @@
* Exported routines for SNMP (simple network management protocol)
* D.Jorand (c) 1998
*
- * $Id: packet-snmp.h,v 1.9 2003/09/06 01:21:00 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-socks.c b/packet-socks.c
index 0bf210ac65..502eb68a2b 100644
--- a/packet-socks.c
+++ b/packet-socks.c
@@ -2,7 +2,7 @@
* Routines for socks versions 4 &5 packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-socks.c,v 1.59 2004/06/03 08:04:07 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-spnego.c b/packet-spnego.c
index 36459770da..70eace5ff2 100644
--- a/packet-spnego.c
+++ b/packet-spnego.c
@@ -5,7 +5,7 @@
* Copyright 2002, Richard Sharpe <rsharpe@ns.aus.com>
* Copyright 2003, Richard Sharpe <rsharpe@richardsharpe.com>
*
- * $Id: packet-spnego.c,v 1.56 2004/06/04 01:56:25 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-spray.c b/packet-spray.c
index 26f9a9c35d..e2b74d3aee 100644
--- a/packet-spray.c
+++ b/packet-spray.c
@@ -1,7 +1,7 @@
/* packet-spray.c
* 2001 Ronnie Sahlberg <See AUTHORS for email>
*
- * $Id: packet-spray.c,v 1.12 2002/11/01 00:48:39 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-spray.h b/packet-spray.h
index 5a7bfb1f93..68153ef672 100644
--- a/packet-spray.h
+++ b/packet-spray.h
@@ -1,7 +1,7 @@
/* packet-spray.h
* 2001 Ronnie Sahlberg <See AUTHORS for email>
*
- * $Id: packet-spray.h,v 1.4 2002/08/28 21:00:35 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-srvloc.c b/packet-srvloc.c
index 4c9e15c8ed..a5a099b249 100644
--- a/packet-srvloc.c
+++ b/packet-srvloc.c
@@ -9,7 +9,7 @@
* In particular I have not had an opportunity to see how it
* responds to SRVLOC over TCP.
*
- * $Id: packet-srvloc.c,v 1.46 2004/02/28 22:56:36 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sscop.c b/packet-sscop.c
index 8529fd2be2..ae048ecf36 100644
--- a/packet-sscop.c
+++ b/packet-sscop.c
@@ -2,7 +2,7 @@
* Routines for SSCOP (Q.2110, Q.SAAL) frame disassembly
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-sscop.c,v 1.20 2002/08/28 21:00:35 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ssh.c b/packet-ssh.c
index 556f0c485c..9cc34d3b6f 100644
--- a/packet-ssh.c
+++ b/packet-ssh.c
@@ -3,7 +3,7 @@
*
* Huagang XIE <huagang@intruvert.com>
*
- * $Id: packet-ssh.c,v 1.8 2003/12/23 21:16:27 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ssl.c b/packet-ssl.c
index b0480ca70f..c6614b66ab 100644
--- a/packet-ssl.c
+++ b/packet-ssl.c
@@ -2,7 +2,7 @@
* Routines for ssl dissection
* Copyright (c) 2000-2001, Scott Renfro <scott@renfro.org>
*
- * $Id: packet-ssl.c,v 1.30 2004/06/01 01:03:49 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-stat-notify.c b/packet-stat-notify.c
index dd0978c78f..ad5ff36189 100644
--- a/packet-stat-notify.c
+++ b/packet-stat-notify.c
@@ -2,7 +2,7 @@
* Routines for async NSM stat callback dissection
* 2001 Ronnie Sahlberg <See AUTHORS for email>
*
- * $Id: packet-stat-notify.c,v 1.13 2002/11/01 00:48:39 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-stat-notify.h b/packet-stat-notify.h
index ac71d7d720..f0f5e791ca 100644
--- a/packet-stat-notify.h
+++ b/packet-stat-notify.h
@@ -2,7 +2,7 @@
* Async callback to notify NSM servers of changes in client status
* 2001 Ronnie Sahlberg <See AUTHORS for email>
*
- * $Id: packet-stat-notify.h,v 1.4 2002/08/28 21:00:35 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-stat.c b/packet-stat.c
index c8616e5fdf..a631ef4519 100644
--- a/packet-stat.c
+++ b/packet-stat.c
@@ -1,7 +1,7 @@
/* packet-stat.c
* Routines for stat dissection
*
- * $Id: packet-stat.c,v 1.19 2002/11/01 00:48:39 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-stat.h b/packet-stat.h
index b3586dbc35..8ad388feaa 100644
--- a/packet-stat.h
+++ b/packet-stat.h
@@ -1,6 +1,6 @@
/* packet-stat.h
*
- * $Id: packet-stat.h,v 1.3 2002/08/28 21:00:35 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-stun.c b/packet-stun.c
index d8ed4d5152..45249e1646 100644
--- a/packet-stun.c
+++ b/packet-stun.c
@@ -2,7 +2,7 @@
* Routines for Simple Traversal of UDP Through NAT dissection
* Copyright 2003, Shiang-Ming Huang <smhuang@pcs.csie.nctu.edu.tw>
*
- * $Id: packet-stun.c,v 1.4 2004/01/04 20:44:50 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-sua.c b/packet-sua.c
index bb3178aa75..cd90c4e390 100644
--- a/packet-sua.c
+++ b/packet-sua.c
@@ -5,7 +5,7 @@
*
* Copyright 2002, 2003 Michael Tuexen <tuexen [AT] fh-muenster.de>
*
- * $Id: packet-sua.c,v 1.21 2003/10/06 08:35:30 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-symantec.c b/packet-symantec.c
index da63242e5f..1969ab4f3f 100644
--- a/packet-symantec.c
+++ b/packet-symantec.c
@@ -2,7 +2,7 @@
* Routines for dissection of packets from the Axent Raptor firewall/
* Symantec Enterprise Firewall
*
- * $Id: packet-symantec.c,v 1.1 2004/03/11 09:18:32 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-syslog.c b/packet-syslog.c
index 45d66e9c98..67859835e7 100644
--- a/packet-syslog.c
+++ b/packet-syslog.c
@@ -3,7 +3,7 @@
*
* Copyright 2000, Gerald Combs <gerald@ethereal.com>
*
- * $Id: packet-syslog.c,v 1.19 2002/08/28 21:00:35 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-t38.c b/packet-t38.c
index 1dd1d53a6c..5fe112dbc1 100644
--- a/packet-t38.c
+++ b/packet-t38.c
@@ -2,7 +2,7 @@
* Routines for T.38 packet dissection
* 2003 Hans Viens
*
- * $Id: packet-t38.c,v 1.7 2004/05/24 02:25:19 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-tacacs.c b/packet-tacacs.c
index 25402d57cb..8968beb5a5 100644
--- a/packet-tacacs.c
+++ b/packet-tacacs.c
@@ -5,7 +5,7 @@
* Full Tacacs+ parsing with decryption by
* Emanuele Caratti <wiz@iol.it>
*
- * $Id: packet-tacacs.c,v 1.32 2003/12/19 19:03:13 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-tacacs.h b/packet-tacacs.h
index 85e0d232d9..0c8adc24c6 100644
--- a/packet-tacacs.h
+++ b/packet-tacacs.h
@@ -2,7 +2,7 @@
* Routines for cisco tacplus packet dissection
* Copyright 2000, Emanuele Caratti <wiz@iol.it>
*
- * $Id: packet-tacacs.h,v 1.6 2003/12/21 04:31:57 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-tcap.c b/packet-tcap.c
index 6c8d00f88f..4c87ebf756 100644
--- a/packet-tcap.c
+++ b/packet-tcap.c
@@ -9,7 +9,7 @@
*
* (append your name here for newer version)
*
- * $Id: packet-tcap.c,v 1.11 2004/05/24 02:25:19 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-tcap.h b/packet-tcap.h
index 3a9cbff654..7af75162f5 100644
--- a/packet-tcap.h
+++ b/packet-tcap.h
@@ -1,6 +1,6 @@
/* packet-tcap.h
*
- * $Id: packet-tcap.h,v 1.3 2004/03/19 07:54:58 guy Exp $
+ * $Id$
*
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
diff --git a/packet-tcp.c b/packet-tcp.c
index 6b9bfdaf08..e48d7d0379 100644
--- a/packet-tcp.c
+++ b/packet-tcp.c
@@ -1,7 +1,7 @@
/* packet-tcp.c
* Routines for TCP packet disassembly
*
- * $Id: packet-tcp.c,v 1.235 2004/05/15 00:41:26 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-tcp.h b/packet-tcp.h
index 63656a3ce2..a33472a978 100644
--- a/packet-tcp.h
+++ b/packet-tcp.h
@@ -1,6 +1,6 @@
/* packet-tcp.h
*
- * $Id: packet-tcp.h,v 1.21 2003/12/30 00:03:48 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-tds.c b/packet-tds.c
index 2693deef08..f443ea53b1 100644
--- a/packet-tds.c
+++ b/packet-tds.c
@@ -3,7 +3,7 @@
* Copyright 2000-2002, Brian Bruns <camber@ais.org>
* Copyright 2002, Steve Langasek <vorlon@netexpress.net>
*
- * $Id: packet-tds.c,v 1.28 2004/07/09 23:17:05 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-teimanagement.c b/packet-teimanagement.c
index 2af1a8a1ed..8d6dab4d41 100644
--- a/packet-teimanagement.c
+++ b/packet-teimanagement.c
@@ -3,7 +3,7 @@
* Rolf Fiedler <rolf.fiedler@innoventif.com>
* based on code by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-teimanagement.c,v 1.1 2004/01/26 20:48:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-telnet.c b/packet-telnet.c
index e062201287..2f76364754 100644
--- a/packet-telnet.c
+++ b/packet-telnet.c
@@ -2,7 +2,7 @@
* Routines for Telnet packet dissection; see RFC 854 and RFC 855
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-telnet.c,v 1.46 2004/06/04 01:56:25 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-teredo.c b/packet-teredo.c
index 81cdc7a4ab..f591997a69 100644
--- a/packet-teredo.c
+++ b/packet-teredo.c
@@ -6,7 +6,7 @@
* Copyright 2003, Ragi BEJJANI - 6WIND - <ragi.bejjani@6wind.com>
* Copyright 2003, Vincent JARDIN - 6WIND - <vincent.jardin@6wind.com>
*
- * $Id: packet-teredo.c,v 1.4 2003/12/29 00:19:00 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-text-media.c b/packet-text-media.c
index e3dc28aebd..7e4d9516bf 100644
--- a/packet-text-media.c
+++ b/packet-text-media.c
@@ -6,7 +6,7 @@
*
* (C) Olivier Biot, 2004.
*
- * $Id: packet-text-media.c,v 1.9 2004/06/17 20:49:01 etxrab Exp $
+ * $Id$
*
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
diff --git a/packet-tftp.c b/packet-tftp.c
index e559e47a4c..879619b72f 100644
--- a/packet-tftp.c
+++ b/packet-tftp.c
@@ -5,7 +5,7 @@
* Craig Newell <CraigN@cheque.uq.edu.au>
* RFC2347 TFTP Option Extension
*
- * $Id: packet-tftp.c,v 1.41 2003/12/24 10:48:13 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-time.c b/packet-time.c
index 8942279209..73c115d13d 100644
--- a/packet-time.c
+++ b/packet-time.c
@@ -3,7 +3,7 @@
*
* Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-time.c,v 1.20 2004/05/12 19:23:08 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-tns.c b/packet-tns.c
index 0a55bf9471..f3e0d50ed7 100644
--- a/packet-tns.c
+++ b/packet-tns.c
@@ -1,7 +1,7 @@
/* packet-tns.c
* Routines for Oracle TNS packet dissection
*
- * $Id: packet-tns.c,v 1.39 2003/02/05 08:06:40 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-tns.h b/packet-tns.h
index 93b8f9cbf8..26ea435704 100644
--- a/packet-tns.h
+++ b/packet-tns.h
@@ -1,6 +1,6 @@
/* packet-tns.h
*
- * $Id: packet-tns.h,v 1.5 2002/08/28 21:00:36 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-tpkt.c b/packet-tpkt.c
index 4c6de18bff..88938f56fe 100644
--- a/packet-tpkt.c
+++ b/packet-tpkt.c
@@ -7,7 +7,7 @@
* Routine to dissect RFC 1006 TPKT packet containing OSI TP PDU
* Copyright 2001, Martin Thomas <Martin_A_Thomas@yahoo.com>
*
- * $Id: packet-tpkt.c,v 1.25 2004/02/14 22:48:53 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-tpkt.h b/packet-tpkt.h
index d5e1665fc7..f4404e8f0e 100644
--- a/packet-tpkt.h
+++ b/packet-tpkt.h
@@ -5,7 +5,7 @@
* Copyright 2000, Philips Electronics N.V.
* Andreas Sikkema <andreas.sikkema@philips.com>
*
- * $Id: packet-tpkt.h,v 1.9 2002/08/28 21:00:36 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-tr.c b/packet-tr.c
index cf63cb3a52..79d1130a6a 100644
--- a/packet-tr.c
+++ b/packet-tr.c
@@ -2,7 +2,7 @@
* Routines for Token-Ring packet disassembly
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-tr.c,v 1.77 2003/08/23 09:09:33 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-tr.h b/packet-tr.h
index d47271ca86..910bd4799c 100644
--- a/packet-tr.h
+++ b/packet-tr.h
@@ -1,6 +1,6 @@
/* packet-tr.h
*
- * $Id: packet-tr.h,v 1.9 2003/08/23 09:09:33 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-trmac.c b/packet-trmac.c
index 86e24a00f3..42472b9866 100644
--- a/packet-trmac.c
+++ b/packet-trmac.c
@@ -2,7 +2,7 @@
* Routines for Token-Ring Media Access Control
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-trmac.c,v 1.39 2004/02/18 10:11:52 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-tsp.c b/packet-tsp.c
index 43f63f315d..1673712f0b 100644
--- a/packet-tsp.c
+++ b/packet-tsp.c
@@ -3,7 +3,7 @@
*
* Uwe Girlich <Uwe.Girlich@philosys.de>
*
- * $Id: packet-tsp.c,v 1.4 2003/06/11 20:41:45 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-tuxedo.c b/packet-tuxedo.c
index 7747b694be..8144643694 100644
--- a/packet-tuxedo.c
+++ b/packet-tuxedo.c
@@ -3,7 +3,7 @@
*
* metatech <metatech@flashmail.com>
*
- * $Id: packet-tuxedo.c,v 1.1 2004/04/20 05:07:23 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-tzsp.c b/packet-tzsp.c
index dde6cc2e90..b7db2431e8 100644
--- a/packet-tzsp.c
+++ b/packet-tzsp.c
@@ -1,6 +1,6 @@
/* packet-tzsp.c
*
- * $Id: packet-tzsp.c,v 1.6 2004/01/29 10:58:28 guy Exp $
+ * $Id$
*
* Copyright 2002, Tazmen Technologies Inc
*
diff --git a/packet-ucp.c b/packet-ucp.c
index d965b24834..6ff5490dd1 100644
--- a/packet-ucp.c
+++ b/packet-ucp.c
@@ -2,7 +2,7 @@
* Routines for Universal Computer Protocol dissection
* Copyright 2001, Tom Uijldert <tom.uijldert@cmg.nl>
*
- * $Id: packet-ucp.c,v 1.24 2004/03/23 01:29:45 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-udp.c b/packet-udp.c
index 6644155753..a905d46408 100644
--- a/packet-udp.c
+++ b/packet-udp.c
@@ -1,7 +1,7 @@
/* packet-udp.c
* Routines for UDP packet disassembly
*
- * $Id: packet-udp.c,v 1.112 2004/01/22 20:43:17 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-udp.h b/packet-udp.h
index c157b9693a..06fd66c708 100644
--- a/packet-udp.h
+++ b/packet-udp.h
@@ -1,6 +1,6 @@
/* packet-udp.h
*
- * $Id: packet-udp.h,v 1.9 2004/01/22 20:43:17 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-v120.c b/packet-v120.c
index 9512a66de7..b47668fc2a 100644
--- a/packet-v120.c
+++ b/packet-v120.c
@@ -2,7 +2,7 @@
* Routines for v120 frame disassembly
* Bert Driehuis <driehuis@playbeing.org>
*
- * $Id: packet-v120.c,v 1.33 2004/01/18 08:32:46 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-vines.c b/packet-vines.c
index b085e30fab..4440012385 100644
--- a/packet-vines.c
+++ b/packet-vines.c
@@ -1,7 +1,7 @@
/* packet-vines.c
* Routines for Banyan VINES protocol packet disassembly
*
- * $Id: packet-vines.c,v 1.63 2004/01/06 02:51:13 guy Exp $
+ * $Id$
*
* Don Lafontaine <lafont02@cn.ca>
*
diff --git a/packet-vines.h b/packet-vines.h
index 2dd49cfc67..ff8a2c7a73 100644
--- a/packet-vines.h
+++ b/packet-vines.h
@@ -1,7 +1,7 @@
/* packet-vines.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet-vines.h,v 1.17 2003/04/22 08:37:55 guy Exp $
+ * $Id$
*
* Don Lafontaine <lafont02@cn.ca>
*
diff --git a/packet-vj.c b/packet-vj.c
index 34e3668601..30bbe0cbca 100644
--- a/packet-vj.c
+++ b/packet-vj.c
@@ -1,7 +1,7 @@
/* packet-vj.c
* Routines for Van Jacobson header decompression.
*
- * $Id: packet-vj.c,v 1.18 2004/02/25 09:31:07 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-vlan.c b/packet-vlan.c
index 5a43b697fb..d9d423f411 100644
--- a/packet-vlan.c
+++ b/packet-vlan.c
@@ -1,7 +1,7 @@
/* packet-vlan.c
* Routines for VLAN 802.1Q ethernet header disassembly
*
- * $Id: packet-vlan.c,v 1.43 2003/10/01 07:11:45 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-vlan.h b/packet-vlan.h
index ea74dcb770..356b01a7c2 100644
--- a/packet-vlan.h
+++ b/packet-vlan.h
@@ -1,6 +1,6 @@
/* packet-vlan.h
*
- * $Id: packet-vlan.h,v 1.6 2002/08/28 21:00:36 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-vrrp.c b/packet-vrrp.c
index 2256c157f5..e85c1c8cc4 100644
--- a/packet-vrrp.c
+++ b/packet-vrrp.c
@@ -4,7 +4,7 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-vrrp.c,v 1.28 2004/05/16 18:42:23 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-vtp.c b/packet-vtp.c
index 42ca6ea1e6..0b82539b81 100644
--- a/packet-vtp.c
+++ b/packet-vtp.c
@@ -1,7 +1,7 @@
/* packet-vtp.c
* Routines for the disassembly of Cisco's Virtual Trunking Protocol
*
- * $Id: packet-vtp.c,v 1.21 2002/08/28 21:00:36 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-wap.c b/packet-wap.c
index 553a6ead68..f53db7b24c 100644
--- a/packet-wap.c
+++ b/packet-wap.c
@@ -2,7 +2,7 @@
*
* Utility routines for WAP dissectors
*
- * $Id: packet-wap.c,v 1.9 2004/01/13 20:59:37 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-wap.h b/packet-wap.h
index bfab8d801a..a28cdbf984 100644
--- a/packet-wap.h
+++ b/packet-wap.h
@@ -2,7 +2,7 @@
*
* Declarations for WAP packet disassembly
*
- * $Id: packet-wap.h,v 1.9 2004/02/28 22:56:36 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-wbxml.c b/packet-wbxml.c
index 4b5393edc3..2ebba21fe4 100644
--- a/packet-wbxml.c
+++ b/packet-wbxml.c
@@ -3,7 +3,7 @@
* Routines for WAP Binary XML dissection
* Copyright 2003, 2004, Olivier Biot.
*
- * $Id: packet-wbxml.c,v 1.38 2004/06/27 22:21:28 obiot Exp $
+ * $Id$
*
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
diff --git a/packet-wccp.c b/packet-wccp.c
index 32311bd2fe..ef5d89fb62 100644
--- a/packet-wccp.c
+++ b/packet-wccp.c
@@ -2,7 +2,7 @@
* Routines for Web Cache Coordination Protocol dissection
* Jerry Talkington <jtalkington@users.sourceforge.net>
*
- * $Id: packet-wccp.c,v 1.34 2004/04/26 17:10:40 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-wccp.h b/packet-wccp.h
index 4d0714db2a..7f3bf35c9a 100644
--- a/packet-wccp.h
+++ b/packet-wccp.h
@@ -1,7 +1,7 @@
/* packet-wccp.h
* Declarations for Cisco Web Cache Coordination Protocol
*
- * $Id: packet-wccp.h,v 1.4 2002/08/28 21:00:37 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-wcp.c b/packet-wcp.c
index c714005d69..c46afafd31 100644
--- a/packet-wcp.c
+++ b/packet-wcp.c
@@ -2,7 +2,7 @@
* Routines for Wellfleet Compression frame disassembly
* Copyright 2001, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-wcp.c,v 1.31 2003/01/31 03:17:47 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-wfleet-hdlc.c b/packet-wfleet-hdlc.c
index d571f3d89a..9c70f2d0fd 100644
--- a/packet-wfleet-hdlc.c
+++ b/packet-wfleet-hdlc.c
@@ -2,7 +2,7 @@
* Routines for Wellfleet HDLC packet disassembly
* Copied from the Cisco HDLC packet disassembly routines
*
- * $Id: packet-wfleet-hdlc.c,v 1.1 2002/12/20 07:56:07 sharpe Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-who.c b/packet-who.c
index 23ebc3a1f2..1050ecb7a3 100644
--- a/packet-who.c
+++ b/packet-who.c
@@ -2,7 +2,7 @@
* Routines for who protocol (see man rwhod)
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-who.c,v 1.26 2003/04/30 02:35:20 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-wlancap.c b/packet-wlancap.c
index f0ce9c3af0..ecb15a1419 100644
--- a/packet-wlancap.c
+++ b/packet-wlancap.c
@@ -14,7 +14,7 @@
*
* By Solomon Peachy
*
- * $Id: packet-wlancap.c,v 1.6 2004/07/06 19:22:45 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-wlancap.h b/packet-wlancap.h
index a2ad227c38..05c0990fcb 100644
--- a/packet-wlancap.h
+++ b/packet-wlancap.h
@@ -2,7 +2,7 @@
* packet-wlancap.h
* Declarations for packet-wlancap.c
*
- * $Id: packet-wlancap.h,v 1.1 2002/11/06 21:49:29 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-wsp.c b/packet-wsp.c
index e4c8e2bce6..e05bc1874c 100644
--- a/packet-wsp.c
+++ b/packet-wsp.c
@@ -2,7 +2,7 @@
*
* Routines to dissect WSP component of WAP traffic.
*
- * $Id: packet-wsp.c,v 1.116 2004/06/27 22:21:28 obiot Exp $
+ * $Id$
*
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
diff --git a/packet-wsp.h b/packet-wsp.h
index b66f684027..cd3773e32e 100644
--- a/packet-wsp.h
+++ b/packet-wsp.h
@@ -2,7 +2,7 @@
*
* Declarations for disassembly of WSP component of WAP traffic.
*
- * $Id: packet-wsp.h,v 1.11 2004/05/09 10:03:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-wtls.c b/packet-wtls.c
index 7823691890..50e0dbfa5a 100644
--- a/packet-wtls.c
+++ b/packet-wtls.c
@@ -2,7 +2,7 @@
*
* Routines to dissect WTLS component of WAP traffic.
*
- * $Id: packet-wtls.c,v 1.24 2004/02/28 22:56:36 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-wtls.h b/packet-wtls.h
index 200d74d6cd..d8acf91630 100644
--- a/packet-wtls.h
+++ b/packet-wtls.h
@@ -2,7 +2,7 @@
*
* Declarations for disassembly of WTLS component of WAP traffic.
*
- * $Id: packet-wtls.h,v 1.2 2002/08/28 21:00:37 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-wtp.c b/packet-wtp.c
index 5b59266606..d05693ebc2 100644
--- a/packet-wtp.c
+++ b/packet-wtp.c
@@ -2,7 +2,7 @@
*
* Routines to dissect WTP component of WAP traffic.
*
- * $Id: packet-wtp.c,v 1.63 2004/02/28 22:56:36 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-wtp.h b/packet-wtp.h
index 796bd06572..552cff095c 100644
--- a/packet-wtp.h
+++ b/packet-wtp.h
@@ -2,7 +2,7 @@
*
* Declarations for disassembly of WTP component of WAP traffic.
*
- * $Id: packet-wtp.h,v 1.4 2002/08/28 21:00:39 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-x11-keysym.h b/packet-x11-keysym.h
index f47cfe7e97..9afbfd5e93 100644
--- a/packet-x11-keysym.h
+++ b/packet-x11-keysym.h
@@ -1,6 +1,6 @@
/* packet-x11-keysym.h
*
- * $Id: packet-x11-keysym.h,v 1.6 2002/08/28 21:00:40 jmayer Exp $
+ * $Id$
*
* Put there so as to make packet-x11.c lighter. See packet-x11.c
*/
diff --git a/packet-x11-keysymdef.h b/packet-x11-keysymdef.h
index d7efed0690..c1e263e273 100644
--- a/packet-x11-keysymdef.h
+++ b/packet-x11-keysymdef.h
@@ -3,7 +3,7 @@
* Copyright holders: Digital, The Open Group
* (see below for their copyright statement)
*
- * $Id: packet-x11-keysymdef.h,v 1.3 2004/01/04 10:57:17 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-x11.c b/packet-x11.c
index 2e124d0a28..dc7a16751c 100644
--- a/packet-x11.c
+++ b/packet-x11.c
@@ -3,7 +3,7 @@
* Copyright 2000, Christophe Tronche <ch.tronche@computer.org>
* Copyright 2003, Michael Shuldman
*
- * $Id: packet-x11.c,v 1.59 2004/06/23 21:43:02 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-x25.c b/packet-x25.c
index 9e5496bf6b..653b5049c1 100644
--- a/packet-x25.c
+++ b/packet-x25.c
@@ -2,7 +2,7 @@
* Routines for X.25 packet disassembly
* Olivier Abad <oabad@noos.fr>
*
- * $Id: packet-x25.c,v 1.85 2003/10/07 18:19:59 oabad Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-x29.c b/packet-x29.c
index 49afb898be..5d7b937b47 100644
--- a/packet-x29.c
+++ b/packet-x29.c
@@ -1,7 +1,7 @@
/* packet-x29.c
* Routines for X.29 packet dissection
*
- * $Id: packet-x29.c,v 1.1 2003/01/06 02:24:57 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-xdmcp.c b/packet-xdmcp.c
index 28a5655981..6bf94692c7 100644
--- a/packet-xdmcp.c
+++ b/packet-xdmcp.c
@@ -2,7 +2,7 @@
* Routines for XDMCP message dissection
* Copyright 2002, Pasi Eronen <pasi.eronen@nixu.com>
*
- * $Id: packet-xdmcp.c,v 1.5 2004/02/25 09:31:07 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-xot.c b/packet-xot.c
index ffa252a8e3..6c3f56fe15 100644
--- a/packet-xot.c
+++ b/packet-xot.c
@@ -3,7 +3,7 @@
*
* Copyright 2000, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-xot.c,v 1.12 2003/01/21 01:45:17 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-xyplex.c b/packet-xyplex.c
index b83c19987e..9ad7a58b59 100644
--- a/packet-xyplex.c
+++ b/packet-xyplex.c
@@ -3,7 +3,7 @@
*
* Copyright 2002 Randy McEoin <rmceoin@pe.com>
*
- * $Id: packet-xyplex.c,v 1.2 2002/08/28 21:00:40 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-yhoo.c b/packet-yhoo.c
index 9b3636cf98..f812816421 100644
--- a/packet-yhoo.c
+++ b/packet-yhoo.c
@@ -2,7 +2,7 @@
* Routines for yahoo messenger packet dissection
* Copyright 1999, Nathan Neulinger <nneul@umr.edu>
*
- * $Id: packet-yhoo.c,v 1.26 2003/03/01 00:09:00 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ymsg.c b/packet-ymsg.c
index 0bf192dbb5..a9ed099730 100644
--- a/packet-ymsg.c
+++ b/packet-ymsg.c
@@ -3,7 +3,7 @@
* Copyright 2003, Wayne Parrott <wayne_p@pacific.net.au>
* Copied from packet-yhoo.c and updated
*
- * $Id: packet-ymsg.c,v 1.4 2004/04/02 07:28:43 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ypbind.c b/packet-ypbind.c
index 320eaf6d95..c66a503550 100644
--- a/packet-ypbind.c
+++ b/packet-ypbind.c
@@ -1,7 +1,7 @@
/* packet-ypbind.c
* Routines for ypbind dissection
*
- * $Id: packet-ypbind.c,v 1.15 2002/11/01 00:48:39 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ypbind.h b/packet-ypbind.h
index 1368b00c66..19ef71f84f 100644
--- a/packet-ypbind.h
+++ b/packet-ypbind.h
@@ -1,6 +1,6 @@
/* packet-ypbind.h
*
- * $Id: packet-ypbind.h,v 1.3 2002/08/28 21:00:40 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-yppasswd.c b/packet-yppasswd.c
index 832cf35cb7..2db6fe9644 100644
--- a/packet-yppasswd.c
+++ b/packet-yppasswd.c
@@ -1,7 +1,7 @@
/* packet-yppasswd.c
* Routines for yppasswd dissection
*
- * $Id: packet-yppasswd.c,v 1.10 2002/11/01 00:48:39 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-yppasswd.h b/packet-yppasswd.h
index 7246a8dfb3..9e6f666c4c 100644
--- a/packet-yppasswd.h
+++ b/packet-yppasswd.h
@@ -1,6 +1,6 @@
/* packet-yppasswd.h
*
- * $Id: packet-yppasswd.h,v 1.4 2002/11/01 00:48:39 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ypserv.c b/packet-ypserv.c
index 58d0c05fb9..18aa640384 100644
--- a/packet-ypserv.c
+++ b/packet-ypserv.c
@@ -1,7 +1,7 @@
/* packet-ypserv.c
* Routines for ypserv dissection
*
- * $Id: packet-ypserv.c,v 1.26 2002/10/24 20:59:21 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/packet-ypserv.h b/packet-ypserv.h
index a6d2c14a6c..b528bf6493 100644
--- a/packet-ypserv.h
+++ b/packet-ypserv.h
@@ -1,6 +1,6 @@
/* packet-ypserv.h
*
- * $Id: packet-ypserv.h,v 1.3 2002/08/28 21:00:40 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-ypxfr.c b/packet-ypxfr.c
index b478f82f3e..706e68e636 100644
--- a/packet-ypxfr.c
+++ b/packet-ypxfr.c
@@ -1,7 +1,7 @@
/* packet-ypxfr.c
* Routines for ypxfr dissection
*
- * $Id: packet-ypxfr.c,v 1.9 2002/11/01 00:48:39 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-ypxfr.h b/packet-ypxfr.h
index e7e6a53c31..9a346806fa 100644
--- a/packet-ypxfr.h
+++ b/packet-ypxfr.h
@@ -1,6 +1,6 @@
/* packet-ypxfr.h
*
- * $Id: packet-ypxfr.h,v 1.3 2002/08/28 21:00:40 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/packet-zebra.c b/packet-zebra.c
index ce6546a159..5e5bfaef2b 100644
--- a/packet-zebra.c
+++ b/packet-zebra.c
@@ -3,7 +3,7 @@
*
* Jochen Friedrich <jochen@scram.de>
*
- * $Id: packet-zebra.c,v 1.24 2003/07/09 05:42:23 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/pcap-util-int.h b/pcap-util-int.h
index 7958d4e3fa..5a653f3612 100644
--- a/pcap-util-int.h
+++ b/pcap-util-int.h
@@ -1,7 +1,7 @@
/* pcap-util-int.h
* Definitions of routines internal to the libpcap/WinPcap utilities
*
- * $Id: pcap-util-int.h,v 1.1 2003/10/10 03:04:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/pcap-util-unix.c b/pcap-util-unix.c
index d0b4c0ec41..f0297e080d 100644
--- a/pcap-util-unix.c
+++ b/pcap-util-unix.c
@@ -1,7 +1,7 @@
/* pcap-util-unix.c
* UN*X-specific utility routines for packet capture
*
- * $Id: pcap-util-unix.c,v 1.3 2004/06/12 07:47:13 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/pcap-util.c b/pcap-util.c
index 3ad0110fa0..72d369a5a6 100644
--- a/pcap-util.c
+++ b/pcap-util.c
@@ -1,410 +1,410 @@
-/* pcap-util.c
- * Utility routines for packet capture
- *
- * $Id: pcap-util.c,v 1.24 2004/02/24 01:11:27 guy Exp $
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_LIBPCAP
-
-#include <pcap.h>
-
-#include <glib.h>
-
-#include <stdlib.h>
-#include <limits.h>
-#include <string.h>
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#include <wtap.h>
-#include <wtap-capture.h>
-
-#include "pcap-util.h"
-#include "pcap-util-int.h"
-
-#ifndef WIN32
-#include <netinet/in.h>
-#endif
-
-
-/*
- * Get the data-link type for a libpcap device.
- * This works around AIX 5.x's non-standard and incompatible-with-the-
- * rest-of-the-universe libpcap.
- */
-int
-get_pcap_linktype(pcap_t *pch, char *devname
-#ifndef _AIX
- _U_
-#endif
-)
-{
- int linktype;
-#ifdef _AIX
- char *ifacename;
-#endif
-
- linktype = pcap_datalink(pch);
-#ifdef _AIX
-
- /*
- * The libpcap that comes with AIX 5.x uses RFC 1573 ifType values
- * rather than DLT_ values for link-layer types; the ifType values
- * for LAN devices are:
- *
- * Ethernet 6
- * 802.3 7
- * Token Ring 9
- * FDDI 15
- *
- * and the ifType value for a loopback device is 24.
- *
- * The AIX names for LAN devices begin with:
- *
- * Ethernet en
- * 802.3 et
- * Token Ring tr
- * FDDI fi
- *
- * and the AIX names for loopback devices begin with "lo".
- *
- * (The difference between "Ethernet" and "802.3" is presumably
- * whether packets have an Ethernet header, with a packet type,
- * or an 802.3 header, with a packet length, followed by an 802.2
- * header and possibly a SNAP header.)
- *
- * If the device name matches "linktype" interpreted as an ifType
- * value, rather than as a DLT_ value, we will assume this is AIX's
- * non-standard, incompatible libpcap, rather than a standard libpcap,
- * and will map the link-layer type to the standard DLT_ value for
- * that link-layer type, as that's what the rest of Ethereal expects.
- *
- * (This means the capture files won't be readable by a tcpdump
- * linked with AIX's non-standard libpcap, but so it goes. They
- * *will* be readable by standard versions of tcpdump, Ethereal,
- * and so on.)
- *
- * XXX - if we conclude we're using AIX libpcap, should we also
- * set a flag to cause us to assume the time stamps are in
- * seconds-and-nanoseconds form, and to convert them to
- * seconds-and-microseconds form before processing them and
- * writing them out?
- */
-
- /*
- * Find the last component of the device name, which is the
- * interface name.
- */
- ifacename = strchr(devname, '/');
- if (ifacename == NULL)
- ifacename = devname;
-
- /* See if it matches any of the LAN device names. */
- if (strncmp(ifacename, "en", 2) == 0) {
- if (linktype == 6) {
- /*
- * That's the RFC 1573 value for Ethernet; map it
- * to DLT_EN10MB.
- */
- linktype = 1;
- }
- } else if (strncmp(ifacename, "et", 2) == 0) {
- if (linktype == 7) {
- /*
- * That's the RFC 1573 value for 802.3; map it to
- * DLT_EN10MB.
- * (libpcap, tcpdump, Ethereal, etc. don't care if
- * it's Ethernet or 802.3.)
- */
- linktype = 1;
- }
- } else if (strncmp(ifacename, "tr", 2) == 0) {
- if (linktype == 9) {
- /*
- * That's the RFC 1573 value for 802.5 (Token Ring);
- * map it to DLT_IEEE802, which is what's used for
- * Token Ring.
- */
- linktype = 6;
- }
- } else if (strncmp(ifacename, "fi", 2) == 0) {
- if (linktype == 15) {
- /*
- * That's the RFC 1573 value for FDDI; map it to
- * DLT_FDDI.
- */
- linktype = 10;
- }
- } else if (strncmp(ifacename, "lo", 2) == 0) {
- if (linktype == 24) {
- /*
- * That's the RFC 1573 value for "software loopback"
- * devices; map it to DLT_NULL, which is what's used
- * for loopback devices on BSD.
- */
- linktype = 0;
- }
- }
-#endif
-
- return linktype;
-}
-
-if_info_t *
-if_info_new(char *name, char *description)
-{
- if_info_t *if_info;
-
- if_info = g_malloc(sizeof (if_info_t));
- if_info->name = g_strdup(name);
- if (description == NULL)
- if_info->description = NULL;
- else
- if_info->description = g_strdup(description);
- if_info->ip_addr = NULL;
- if_info->loopback = FALSE;
- return if_info;
-}
-
-
-/* get all ip address information from the given interface */
-static void if_info_ip(if_info_t *if_info, pcap_if_t *d)
-{
- pcap_addr_t *a;
- guint32 *ip_addr;
-
- /* Loopback interface */
- if_info->loopback = (d->flags & PCAP_IF_LOOPBACK) ? TRUE : FALSE;
-
- /* All addresses */
- for(a=d->addresses;a;a=a->next) {
- switch(a->addr->sa_family)
- {
- /* IPv4 address */
- case AF_INET:
- if (a->addr) {
- struct sockaddr_in *ai = ((struct sockaddr_in *)(a->addr));
- ip_addr = g_malloc(sizeof(*ip_addr));
- *ip_addr = *((guint32 *)&(ai->sin_addr.s_addr));
- if_info->ip_addr = g_slist_append(if_info->ip_addr, ip_addr);
- }
- break;
- default:
- break;
- }
- }
-}
-
-
-#ifdef HAVE_PCAP_FINDALLDEVS
-GList *
-get_interface_list_findalldevs(int *err, char *err_str)
-{
- GList *il = NULL;
- pcap_if_t *alldevs, *dev;
- if_info_t *if_info;
-
- if (pcap_findalldevs(&alldevs, err_str) == -1) {
- *err = CANT_GET_INTERFACE_LIST;
- return NULL;
- }
-
- if (alldevs == NULL) {
- /*
- * No interfaces found.
- */
- *err = NO_INTERFACES_FOUND;
- return NULL;
- }
-
- for (dev = alldevs; dev != NULL; dev = dev->next) {
- if_info = if_info_new(dev->name, dev->description);
- il = g_list_append(il, if_info);
- if_info_ip(if_info, dev);
- }
- pcap_freealldevs(alldevs);
-
- return il;
-}
-#endif /* HAVE_PCAP_FINDALLDEVS */
-
-static void
-free_if_info_addr_cb(gpointer addr, gpointer user_data _U_)
-{
- g_free(addr);
-}
-
-static void
-free_if_cb(gpointer data, gpointer user_data _U_)
-{
- if_info_t *if_info = data;
-
- g_free(if_info->name);
- if (if_info->description != NULL)
- g_free(if_info->description);
-
- g_slist_foreach(if_info->ip_addr, free_if_info_addr_cb, NULL);
- g_slist_free(if_info->ip_addr);
-}
-
-void
-free_interface_list(GList *if_list)
-{
- g_list_foreach(if_list, free_if_cb, NULL);
- g_list_free(if_list);
-}
-
-/*
- * Get the data-link types available for a libpcap device.
- */
-static data_link_info_t *
-create_data_link_info(int dlt)
-{
- data_link_info_t *data_link_info;
-#ifdef HAVE_PCAP_DATALINK_VAL_TO_NAME
- const char *typename;
-#endif
- int wtap_encap;
-
- data_link_info = g_malloc(sizeof (data_link_info_t));
- data_link_info->dlt = dlt;
-#ifdef HAVE_PCAP_DATALINK_VAL_TO_NAME
- typename = pcap_datalink_val_to_name(dlt);
- if (typename != NULL)
- data_link_info->name = g_strdup(typename);
- else
-#endif
- data_link_info->name = g_strdup_printf("DLT %d", dlt);
- wtap_encap = wtap_pcap_encap_to_wtap_encap(dlt);
- if (wtap_encap == WTAP_ENCAP_UNKNOWN) {
- /*
- * We don't support this in Wiretap.
- * However, we should, so you can capture on it.
- * Put in an entry for it, with no description.
- */
- data_link_info->description = NULL;
- } else {
- /*
- * If this is null, that's a bug in
- * "wtap_pcap_encap_to_wtap_encap()" - it should always
- * return a valid encapsulation type - so we assume it's
- * not null.
- */
- data_link_info->description =
- g_strdup(wtap_encap_string(wtap_encap));
- }
- return data_link_info;
-}
-
-GList *
-get_pcap_linktype_list(char *devname, char *err_buf)
-{
- GList *linktype_list = NULL;
- pcap_t *pch;
- int deflt;
-#ifdef HAVE_PCAP_SET_DATALINK
- int *linktypes;
- int i, nlt;
-#endif
- data_link_info_t *data_link_info;
-
- pch = pcap_open_live(devname, MIN_PACKET_SIZE, 0, 0, err_buf);
- if (pch == NULL)
- return NULL;
- err_buf[0] = '\0'; /* an empty list doesn't mean an error */
- deflt = get_pcap_linktype(pch, devname);
-#ifdef HAVE_PCAP_LIST_DATALINKS
- nlt = pcap_list_datalinks(pch, &linktypes);
- if (nlt == 0 || linktypes == NULL)
- return NULL;
- for (i = 0; i < nlt; i++) {
- data_link_info = create_data_link_info(linktypes[i]);
-
- /*
- * XXX - for 802.11, make the most detailed 802.11
- * version the default, rather than the one the
- * device has as the default?
- */
- if (linktypes[i] == deflt)
- linktype_list = g_list_prepend(linktype_list,
- data_link_info);
- else
- linktype_list = g_list_append(linktype_list,
- data_link_info);
- }
- free(linktypes);
-#else
- data_link_info = create_data_link_info(deflt);
- linktype_list = g_list_append(linktype_list, data_link_info);
-#endif
-
- pcap_close(pch);
- return linktype_list;
-}
-
-static void
-free_linktype_cb(gpointer data, gpointer user_data _U_)
-{
- data_link_info_t *linktype_info = data;
-
- g_free(linktype_info->name);
- if (linktype_info->description != NULL)
- g_free(linktype_info->description);
-}
-
-void
-free_pcap_linktype_list(GList *linktype_list)
-{
- g_list_foreach(linktype_list, free_linktype_cb, NULL);
- g_list_free(linktype_list);
-}
-
-/* Set the data link type on a pcap. */
-const char *
-set_pcap_linktype(pcap_t *pch, char *devname
-#ifdef HAVE_PCAP_SET_DATALINK
- _U_
-#endif
- , int dlt)
-{
-#ifdef HAVE_PCAP_SET_DATALINK
- if (pcap_set_datalink(pch, dlt) == 0)
- return NULL; /* no error */
- return pcap_geterr(pch);
-#else
- /* Let them set it to the type it is; reject any other request. */
- if (get_pcap_linktype(pch, devname) == dlt)
- return NULL; /* no error */
- return "That DLT is not one of the DLTs supported by this device";
-#endif
-}
-
-#endif /* HAVE_LIBPCAP */
+/* pcap-util.c
+ * Utility routines for packet capture
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_LIBPCAP
+
+#include <pcap.h>
+
+#include <glib.h>
+
+#include <stdlib.h>
+#include <limits.h>
+#include <string.h>
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#include <wtap.h>
+#include <wtap-capture.h>
+
+#include "pcap-util.h"
+#include "pcap-util-int.h"
+
+#ifndef WIN32
+#include <netinet/in.h>
+#endif
+
+
+/*
+ * Get the data-link type for a libpcap device.
+ * This works around AIX 5.x's non-standard and incompatible-with-the-
+ * rest-of-the-universe libpcap.
+ */
+int
+get_pcap_linktype(pcap_t *pch, char *devname
+#ifndef _AIX
+ _U_
+#endif
+)
+{
+ int linktype;
+#ifdef _AIX
+ char *ifacename;
+#endif
+
+ linktype = pcap_datalink(pch);
+#ifdef _AIX
+
+ /*
+ * The libpcap that comes with AIX 5.x uses RFC 1573 ifType values
+ * rather than DLT_ values for link-layer types; the ifType values
+ * for LAN devices are:
+ *
+ * Ethernet 6
+ * 802.3 7
+ * Token Ring 9
+ * FDDI 15
+ *
+ * and the ifType value for a loopback device is 24.
+ *
+ * The AIX names for LAN devices begin with:
+ *
+ * Ethernet en
+ * 802.3 et
+ * Token Ring tr
+ * FDDI fi
+ *
+ * and the AIX names for loopback devices begin with "lo".
+ *
+ * (The difference between "Ethernet" and "802.3" is presumably
+ * whether packets have an Ethernet header, with a packet type,
+ * or an 802.3 header, with a packet length, followed by an 802.2
+ * header and possibly a SNAP header.)
+ *
+ * If the device name matches "linktype" interpreted as an ifType
+ * value, rather than as a DLT_ value, we will assume this is AIX's
+ * non-standard, incompatible libpcap, rather than a standard libpcap,
+ * and will map the link-layer type to the standard DLT_ value for
+ * that link-layer type, as that's what the rest of Ethereal expects.
+ *
+ * (This means the capture files won't be readable by a tcpdump
+ * linked with AIX's non-standard libpcap, but so it goes. They
+ * *will* be readable by standard versions of tcpdump, Ethereal,
+ * and so on.)
+ *
+ * XXX - if we conclude we're using AIX libpcap, should we also
+ * set a flag to cause us to assume the time stamps are in
+ * seconds-and-nanoseconds form, and to convert them to
+ * seconds-and-microseconds form before processing them and
+ * writing them out?
+ */
+
+ /*
+ * Find the last component of the device name, which is the
+ * interface name.
+ */
+ ifacename = strchr(devname, '/');
+ if (ifacename == NULL)
+ ifacename = devname;
+
+ /* See if it matches any of the LAN device names. */
+ if (strncmp(ifacename, "en", 2) == 0) {
+ if (linktype == 6) {
+ /*
+ * That's the RFC 1573 value for Ethernet; map it
+ * to DLT_EN10MB.
+ */
+ linktype = 1;
+ }
+ } else if (strncmp(ifacename, "et", 2) == 0) {
+ if (linktype == 7) {
+ /*
+ * That's the RFC 1573 value for 802.3; map it to
+ * DLT_EN10MB.
+ * (libpcap, tcpdump, Ethereal, etc. don't care if
+ * it's Ethernet or 802.3.)
+ */
+ linktype = 1;
+ }
+ } else if (strncmp(ifacename, "tr", 2) == 0) {
+ if (linktype == 9) {
+ /*
+ * That's the RFC 1573 value for 802.5 (Token Ring);
+ * map it to DLT_IEEE802, which is what's used for
+ * Token Ring.
+ */
+ linktype = 6;
+ }
+ } else if (strncmp(ifacename, "fi", 2) == 0) {
+ if (linktype == 15) {
+ /*
+ * That's the RFC 1573 value for FDDI; map it to
+ * DLT_FDDI.
+ */
+ linktype = 10;
+ }
+ } else if (strncmp(ifacename, "lo", 2) == 0) {
+ if (linktype == 24) {
+ /*
+ * That's the RFC 1573 value for "software loopback"
+ * devices; map it to DLT_NULL, which is what's used
+ * for loopback devices on BSD.
+ */
+ linktype = 0;
+ }
+ }
+#endif
+
+ return linktype;
+}
+
+if_info_t *
+if_info_new(char *name, char *description)
+{
+ if_info_t *if_info;
+
+ if_info = g_malloc(sizeof (if_info_t));
+ if_info->name = g_strdup(name);
+ if (description == NULL)
+ if_info->description = NULL;
+ else
+ if_info->description = g_strdup(description);
+ if_info->ip_addr = NULL;
+ if_info->loopback = FALSE;
+ return if_info;
+}
+
+
+/* get all ip address information from the given interface */
+static void if_info_ip(if_info_t *if_info, pcap_if_t *d)
+{
+ pcap_addr_t *a;
+ guint32 *ip_addr;
+
+ /* Loopback interface */
+ if_info->loopback = (d->flags & PCAP_IF_LOOPBACK) ? TRUE : FALSE;
+
+ /* All addresses */
+ for(a=d->addresses;a;a=a->next) {
+ switch(a->addr->sa_family)
+ {
+ /* IPv4 address */
+ case AF_INET:
+ if (a->addr) {
+ struct sockaddr_in *ai = ((struct sockaddr_in *)(a->addr));
+ ip_addr = g_malloc(sizeof(*ip_addr));
+ *ip_addr = *((guint32 *)&(ai->sin_addr.s_addr));
+ if_info->ip_addr = g_slist_append(if_info->ip_addr, ip_addr);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+}
+
+
+#ifdef HAVE_PCAP_FINDALLDEVS
+GList *
+get_interface_list_findalldevs(int *err, char *err_str)
+{
+ GList *il = NULL;
+ pcap_if_t *alldevs, *dev;
+ if_info_t *if_info;
+
+ if (pcap_findalldevs(&alldevs, err_str) == -1) {
+ *err = CANT_GET_INTERFACE_LIST;
+ return NULL;
+ }
+
+ if (alldevs == NULL) {
+ /*
+ * No interfaces found.
+ */
+ *err = NO_INTERFACES_FOUND;
+ return NULL;
+ }
+
+ for (dev = alldevs; dev != NULL; dev = dev->next) {
+ if_info = if_info_new(dev->name, dev->description);
+ il = g_list_append(il, if_info);
+ if_info_ip(if_info, dev);
+ }
+ pcap_freealldevs(alldevs);
+
+ return il;
+}
+#endif /* HAVE_PCAP_FINDALLDEVS */
+
+static void
+free_if_info_addr_cb(gpointer addr, gpointer user_data _U_)
+{
+ g_free(addr);
+}
+
+static void
+free_if_cb(gpointer data, gpointer user_data _U_)
+{
+ if_info_t *if_info = data;
+
+ g_free(if_info->name);
+ if (if_info->description != NULL)
+ g_free(if_info->description);
+
+ g_slist_foreach(if_info->ip_addr, free_if_info_addr_cb, NULL);
+ g_slist_free(if_info->ip_addr);
+}
+
+void
+free_interface_list(GList *if_list)
+{
+ g_list_foreach(if_list, free_if_cb, NULL);
+ g_list_free(if_list);
+}
+
+/*
+ * Get the data-link types available for a libpcap device.
+ */
+static data_link_info_t *
+create_data_link_info(int dlt)
+{
+ data_link_info_t *data_link_info;
+#ifdef HAVE_PCAP_DATALINK_VAL_TO_NAME
+ const char *typename;
+#endif
+ int wtap_encap;
+
+ data_link_info = g_malloc(sizeof (data_link_info_t));
+ data_link_info->dlt = dlt;
+#ifdef HAVE_PCAP_DATALINK_VAL_TO_NAME
+ typename = pcap_datalink_val_to_name(dlt);
+ if (typename != NULL)
+ data_link_info->name = g_strdup(typename);
+ else
+#endif
+ data_link_info->name = g_strdup_printf("DLT %d", dlt);
+ wtap_encap = wtap_pcap_encap_to_wtap_encap(dlt);
+ if (wtap_encap == WTAP_ENCAP_UNKNOWN) {
+ /*
+ * We don't support this in Wiretap.
+ * However, we should, so you can capture on it.
+ * Put in an entry for it, with no description.
+ */
+ data_link_info->description = NULL;
+ } else {
+ /*
+ * If this is null, that's a bug in
+ * "wtap_pcap_encap_to_wtap_encap()" - it should always
+ * return a valid encapsulation type - so we assume it's
+ * not null.
+ */
+ data_link_info->description =
+ g_strdup(wtap_encap_string(wtap_encap));
+ }
+ return data_link_info;
+}
+
+GList *
+get_pcap_linktype_list(char *devname, char *err_buf)
+{
+ GList *linktype_list = NULL;
+ pcap_t *pch;
+ int deflt;
+#ifdef HAVE_PCAP_SET_DATALINK
+ int *linktypes;
+ int i, nlt;
+#endif
+ data_link_info_t *data_link_info;
+
+ pch = pcap_open_live(devname, MIN_PACKET_SIZE, 0, 0, err_buf);
+ if (pch == NULL)
+ return NULL;
+ err_buf[0] = '\0'; /* an empty list doesn't mean an error */
+ deflt = get_pcap_linktype(pch, devname);
+#ifdef HAVE_PCAP_LIST_DATALINKS
+ nlt = pcap_list_datalinks(pch, &linktypes);
+ if (nlt == 0 || linktypes == NULL)
+ return NULL;
+ for (i = 0; i < nlt; i++) {
+ data_link_info = create_data_link_info(linktypes[i]);
+
+ /*
+ * XXX - for 802.11, make the most detailed 802.11
+ * version the default, rather than the one the
+ * device has as the default?
+ */
+ if (linktypes[i] == deflt)
+ linktype_list = g_list_prepend(linktype_list,
+ data_link_info);
+ else
+ linktype_list = g_list_append(linktype_list,
+ data_link_info);
+ }
+ free(linktypes);
+#else
+ data_link_info = create_data_link_info(deflt);
+ linktype_list = g_list_append(linktype_list, data_link_info);
+#endif
+
+ pcap_close(pch);
+ return linktype_list;
+}
+
+static void
+free_linktype_cb(gpointer data, gpointer user_data _U_)
+{
+ data_link_info_t *linktype_info = data;
+
+ g_free(linktype_info->name);
+ if (linktype_info->description != NULL)
+ g_free(linktype_info->description);
+}
+
+void
+free_pcap_linktype_list(GList *linktype_list)
+{
+ g_list_foreach(linktype_list, free_linktype_cb, NULL);
+ g_list_free(linktype_list);
+}
+
+/* Set the data link type on a pcap. */
+const char *
+set_pcap_linktype(pcap_t *pch, char *devname
+#ifdef HAVE_PCAP_SET_DATALINK
+ _U_
+#endif
+ , int dlt)
+{
+#ifdef HAVE_PCAP_SET_DATALINK
+ if (pcap_set_datalink(pch, dlt) == 0)
+ return NULL; /* no error */
+ return pcap_geterr(pch);
+#else
+ /* Let them set it to the type it is; reject any other request. */
+ if (get_pcap_linktype(pch, devname) == dlt)
+ return NULL; /* no error */
+ return "That DLT is not one of the DLTs supported by this device";
+#endif
+}
+
+#endif /* HAVE_LIBPCAP */
diff --git a/pcap-util.h b/pcap-util.h
index 0ea23f5134..7f864fd470 100644
--- a/pcap-util.h
+++ b/pcap-util.h
@@ -1,107 +1,107 @@
-/* pcap-util.h
- * Utility definitions for packet capture
- *
- * $Id: pcap-util.h,v 1.7 2004/06/12 07:47:13 guy Exp $
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __PCAP_UTIL_H__
-#define __PCAP_UTIL_H__
-
-#ifdef HAVE_LIBPCAP
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * XXX - this is also the traditional default snapshot size in
- * tcpdump - but, if IPv6 is enabled, it defaults to 96, to get an
- * IPv6 header + TCP + 22 extra bytes.
- *
- * Some libpcap versions for particular capture devices might happen
- * to impose a minimum, but it's not always 68.
- */
-#define MIN_PACKET_SIZE 68 /* minimum amount of packet data we can read */
-
-#define MAX_WIN_IF_NAME_LEN 511
-
-/*
- * The list of interfaces returned by "get_interface_list()" is
- * a list of these structures.
- */
-typedef struct {
- char *name;
- char *description;
- GSList *ip_addr; /* containing guint32 values */
- gboolean loopback;
-} if_info_t;
-
-GList *get_interface_list(int *err, char *err_str);
-
-/* Error values from "get_interface_list()". */
-#define CANT_GET_INTERFACE_LIST 0 /* error getting list */
-#define NO_INTERFACES_FOUND 1 /* list is empty */
-
-void free_interface_list(GList *if_list);
-
-/*
- * Get an error message string for a CANT_GET_INTERFACE_LIST error from
- * "get_interface_list()".
- */
-gchar *cant_get_if_list_error_message(const char *err_str);
-
-/*
- * The list of data link types returned by "get_pcap_linktype_list()" is
- * a list of these structures.
- */
-typedef struct {
- int dlt;
- char *name;
- char *description;
-} data_link_info_t;
-
-int get_pcap_linktype(pcap_t *pch, char *devname);
-GList *get_pcap_linktype_list(char *devname, char *err_buf);
-void free_pcap_linktype_list(GList *linktype_list);
-const char *set_pcap_linktype(pcap_t *pch, char *devname, int dlt);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* HAVE_LIBPCAP */
-
-/*
- * Append to a GString an indication of the version of libpcap/WinPcap
- * with which we were compiled, if we were, or an indication that we
- * weren't compiled with libpcap/WinPcap, if we weren't.
- */
-extern void get_compiled_pcap_version(GString *str);
-
-/*
- * Append to a GString an indication of the version of libpcap/WinPcap
- * with which we're running, or an indication that we're not running
- * with libpcap/WinPcap, if we were compiled with libpcap/WinPcap,
- * or nothing, if we weren't compiled with libpcap/WinPcap.
- */
-extern void get_runtime_pcap_version(GString *str);
-
-#endif /* __PCAP_UTIL_H__ */
+/* pcap-util.h
+ * Utility definitions for packet capture
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __PCAP_UTIL_H__
+#define __PCAP_UTIL_H__
+
+#ifdef HAVE_LIBPCAP
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/*
+ * XXX - this is also the traditional default snapshot size in
+ * tcpdump - but, if IPv6 is enabled, it defaults to 96, to get an
+ * IPv6 header + TCP + 22 extra bytes.
+ *
+ * Some libpcap versions for particular capture devices might happen
+ * to impose a minimum, but it's not always 68.
+ */
+#define MIN_PACKET_SIZE 68 /* minimum amount of packet data we can read */
+
+#define MAX_WIN_IF_NAME_LEN 511
+
+/*
+ * The list of interfaces returned by "get_interface_list()" is
+ * a list of these structures.
+ */
+typedef struct {
+ char *name;
+ char *description;
+ GSList *ip_addr; /* containing guint32 values */
+ gboolean loopback;
+} if_info_t;
+
+GList *get_interface_list(int *err, char *err_str);
+
+/* Error values from "get_interface_list()". */
+#define CANT_GET_INTERFACE_LIST 0 /* error getting list */
+#define NO_INTERFACES_FOUND 1 /* list is empty */
+
+void free_interface_list(GList *if_list);
+
+/*
+ * Get an error message string for a CANT_GET_INTERFACE_LIST error from
+ * "get_interface_list()".
+ */
+gchar *cant_get_if_list_error_message(const char *err_str);
+
+/*
+ * The list of data link types returned by "get_pcap_linktype_list()" is
+ * a list of these structures.
+ */
+typedef struct {
+ int dlt;
+ char *name;
+ char *description;
+} data_link_info_t;
+
+int get_pcap_linktype(pcap_t *pch, char *devname);
+GList *get_pcap_linktype_list(char *devname, char *err_buf);
+void free_pcap_linktype_list(GList *linktype_list);
+const char *set_pcap_linktype(pcap_t *pch, char *devname, int dlt);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* HAVE_LIBPCAP */
+
+/*
+ * Append to a GString an indication of the version of libpcap/WinPcap
+ * with which we were compiled, if we were, or an indication that we
+ * weren't compiled with libpcap/WinPcap, if we weren't.
+ */
+extern void get_compiled_pcap_version(GString *str);
+
+/*
+ * Append to a GString an indication of the version of libpcap/WinPcap
+ * with which we're running, or an indication that we're not running
+ * with libpcap/WinPcap, if we were compiled with libpcap/WinPcap,
+ * or nothing, if we weren't compiled with libpcap/WinPcap.
+ */
+extern void get_runtime_pcap_version(GString *str);
+
+#endif /* __PCAP_UTIL_H__ */
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index d7c3d757a0..f4e66baa93 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
-# $Id: Makefile.am,v 1.30 2004/03/25 11:21:06 guy Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index ee6a007aa8..9e78f91641 100644
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.34 2004/03/30 18:45:04 guy Exp $
+# $Id$
#
include ..\config.nmake
diff --git a/plugins/acn/ChangeLog b/plugins/acn/ChangeLog
index 5e3506a33b..7511f461eb 100644
--- a/plugins/acn/ChangeLog
+++ b/plugins/acn/ChangeLog
@@ -1,2 +1,2 @@
-$Id: ChangeLog,v 1.1 2003/10/14 01:18:11 guy Exp $
+$Id$
diff --git a/plugins/acn/Makefile.am b/plugins/acn/Makefile.am
index d33e0e625e..8df2be4ea0 100644
--- a/plugins/acn/Makefile.am
+++ b/plugins/acn/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal/ACN
#
-# $Id: Makefile.am,v 1.4 2004/04/25 21:07:15 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/acn/Makefile.nmake b/plugins/acn/Makefile.nmake
index c0ca4caab4..a0140a91e4 100644
--- a/plugins/acn/Makefile.nmake
+++ b/plugins/acn/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.2 2003/11/06 09:05:10 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/acn/packet-acn.c b/plugins/acn/packet-acn.c
index fd51aaa17d..cd749e826e 100644
--- a/plugins/acn/packet-acn.c
+++ b/plugins/acn/packet-acn.c
@@ -1,7 +1,7 @@
/* packet-acn.c
* Routines for ACN packet disassembly
*
- * $Id: packet-acn.c,v 1.4 2003/11/06 09:32:46 guy Exp $
+ * $Id$
*
* Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com>
*
diff --git a/plugins/artnet/ChangeLog b/plugins/artnet/ChangeLog
index 1af3471cf7..4f1d55b68e 100644
--- a/plugins/artnet/ChangeLog
+++ b/plugins/artnet/ChangeLog
@@ -1,4 +1,4 @@
-$Id: ChangeLog,v 1.3 2003/11/17 20:57:11 guy Exp $
+$Id$
Overview of changes in Art-Net Ethereal plugin:
diff --git a/plugins/artnet/Makefile.am b/plugins/artnet/Makefile.am
index 788d32c55b..8f090e6d6c 100644
--- a/plugins/artnet/Makefile.am
+++ b/plugins/artnet/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal/ArtNET
#
-# $Id: Makefile.am,v 1.5 2004/04/25 21:07:16 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake
index 7b69cfc00d..16f0372189 100644
--- a/plugins/artnet/Makefile.nmake
+++ b/plugins/artnet/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.5 2003/11/06 09:05:10 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/artnet/packet-artnet.c b/plugins/artnet/packet-artnet.c
index cb56c03258..d1649b63ac 100644
--- a/plugins/artnet/packet-artnet.c
+++ b/plugins/artnet/packet-artnet.c
@@ -1,7 +1,7 @@
/* packet-artnet.c
* Routines for Art-Net packet disassembly
*
- * $Id: packet-artnet.c,v 1.7 2004/01/07 04:33:21 guy Exp $
+ * $Id$
*
* Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com>
*
diff --git a/plugins/asn1/Makefile.am b/plugins/asn1/Makefile.am
index a29e7eae05..471c014e0c 100644
--- a/plugins/asn1/Makefile.am
+++ b/plugins/asn1/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal/asn1
#
-# $Id: Makefile.am,v 1.6 2004/04/25 21:07:16 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake
index 2a91f17bbb..00d685db97 100644
--- a/plugins/asn1/Makefile.nmake
+++ b/plugins/asn1/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.6 2004/02/18 20:45:53 gerald Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index 65f0288809..41f01e2c8c 100644
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2003 by Matthijs Melchior <matthijs.melchior@xs4all.nl>
*
- * $Id: packet-asn1.c,v 1.23 2004/05/24 02:25:21 guy Exp $
+ * $Id$
*
* A plugin for:
*
diff --git a/plugins/ciscosm/Makefile.am b/plugins/ciscosm/Makefile.am
index 2f26a6325d..050db9e32b 100644
--- a/plugins/ciscosm/Makefile.am
+++ b/plugins/ciscosm/Makefile.am
@@ -2,7 +2,7 @@
# Automake file for Cisco SS7 Session Management dissector
# Copyright 2004, Duncan Sargeant <dunc-ethereal@rcpt.to>
#
-# $Id: Makefile.am,v 1.3 2004/04/25 21:07:16 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/ciscosm/Makefile.nmake b/plugins/ciscosm/Makefile.nmake
index 8038737b9d..21017ebd59 100644
--- a/plugins/ciscosm/Makefile.nmake
+++ b/plugins/ciscosm/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.1 2004/03/25 11:21:06 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/ciscosm/packet-sm.c b/plugins/ciscosm/packet-sm.c
index 47480120a3..ee7e0d3f3c 100644
--- a/plugins/ciscosm/packet-sm.c
+++ b/plugins/ciscosm/packet-sm.c
@@ -2,7 +2,7 @@
* Routines for Cisco Session Management Protocol dissection
* Copyright 2004, Duncan Sargeant <dunc-ethereal@rcpt.to>
*
- * $Id: packet-sm.c,v 1.5 2004/04/25 15:16:38 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
index 6a2c681b72..067e97c416 100644
--- a/plugins/docsis/Makefile.am
+++ b/plugins/docsis/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal/docsis subdissectors
#
-# $Id: Makefile.am,v 1.8 2004/04/25 21:07:17 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index 93bf1ac048..ab5f331d98 100644
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.8 2004/03/17 06:55:02 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/docsis/packet-bpkmattr.c b/plugins/docsis/packet-bpkmattr.c
index 45fe592cea..41bf022b14 100644
--- a/plugins/docsis/packet-bpkmattr.c
+++ b/plugins/docsis/packet-bpkmattr.c
@@ -2,7 +2,7 @@
* Routines for Baseline Privacy Key Management Attributes dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-bpkmattr.c,v 1.7 2003/12/13 03:18:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-bpkmreq.c b/plugins/docsis/packet-bpkmreq.c
index edbadc2b6e..ed9f467e1d 100644
--- a/plugins/docsis/packet-bpkmreq.c
+++ b/plugins/docsis/packet-bpkmreq.c
@@ -2,7 +2,7 @@
* Routines for Baseline Privacy Key Management Request dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-bpkmreq.c,v 1.6 2003/12/13 03:18:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-bpkmrsp.c b/plugins/docsis/packet-bpkmrsp.c
index 9056d25ef3..3dd4cf9e8e 100644
--- a/plugins/docsis/packet-bpkmrsp.c
+++ b/plugins/docsis/packet-bpkmrsp.c
@@ -2,7 +2,7 @@
* Routines for Baseline Privacy Key Management Response dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-bpkmrsp.c,v 1.6 2003/12/13 03:18:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c
index c9f40c9207..75ecacb1c5 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/docsis/packet-docsis.c
@@ -2,7 +2,7 @@
* Routines for docsis dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-docsis.c,v 1.19 2004/03/17 06:55:03 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-docsis.h b/plugins/docsis/packet-docsis.h
index e2d5cc8d4a..1e7f595e48 100644
--- a/plugins/docsis/packet-docsis.h
+++ b/plugins/docsis/packet-docsis.h
@@ -1,6 +1,6 @@
/* packet-docsis.h
*
- * $Id: packet-docsis.h,v 1.5 2004/03/17 06:55:03 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-dsaack.c b/plugins/docsis/packet-dsaack.c
index 0723fedb5e..16f5581ea9 100644
--- a/plugins/docsis/packet-dsaack.c
+++ b/plugins/docsis/packet-dsaack.c
@@ -2,7 +2,7 @@
* Routines for Dynamic Service Addition Acknowledge dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-dsaack.c,v 1.6 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-dsareq.c b/plugins/docsis/packet-dsareq.c
index 8718d9c57c..23e57ef54c 100644
--- a/plugins/docsis/packet-dsareq.c
+++ b/plugins/docsis/packet-dsareq.c
@@ -2,7 +2,7 @@
* Routines for Dynamic Service Addition Request dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-dsareq.c,v 1.6 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-dsarsp.c b/plugins/docsis/packet-dsarsp.c
index 912646f2f9..369cc93681 100644
--- a/plugins/docsis/packet-dsarsp.c
+++ b/plugins/docsis/packet-dsarsp.c
@@ -2,7 +2,7 @@
* Routines for Dynamic Service Addition Response dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-dsarsp.c,v 1.6 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c
index 0934fd32a6..eb320fb3de 100644
--- a/plugins/docsis/packet-dscack.c
+++ b/plugins/docsis/packet-dscack.c
@@ -2,7 +2,7 @@
* Routines for Dynamic Service Change Acknowledge dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-dscack.c,v 1.6 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-dscreq.c b/plugins/docsis/packet-dscreq.c
index c422a881f1..cc427534d8 100644
--- a/plugins/docsis/packet-dscreq.c
+++ b/plugins/docsis/packet-dscreq.c
@@ -2,7 +2,7 @@
* Routines for Dynamic Service Change Request dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-dscreq.c,v 1.6 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-dscrsp.c b/plugins/docsis/packet-dscrsp.c
index 8550717ddb..da70b34c37 100644
--- a/plugins/docsis/packet-dscrsp.c
+++ b/plugins/docsis/packet-dscrsp.c
@@ -2,7 +2,7 @@
* Routines for Dynamic Service Change Response dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-dscrsp.c,v 1.6 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-dsdreq.c b/plugins/docsis/packet-dsdreq.c
index a4bfefca79..1352e15743 100644
--- a/plugins/docsis/packet-dsdreq.c
+++ b/plugins/docsis/packet-dsdreq.c
@@ -2,7 +2,7 @@
* Routines for Dynamic Service Delete Request dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-dsdreq.c,v 1.6 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-dsdrsp.c b/plugins/docsis/packet-dsdrsp.c
index d910068ec9..31fdc66b2c 100644
--- a/plugins/docsis/packet-dsdrsp.c
+++ b/plugins/docsis/packet-dsdrsp.c
@@ -2,7 +2,7 @@
* Routines for Dynamic Service Delete Response dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-dsdrsp.c,v 1.6 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-intrngreq.c b/plugins/docsis/packet-intrngreq.c
index d5cdcc896b..37dcf69615 100644
--- a/plugins/docsis/packet-intrngreq.c
+++ b/plugins/docsis/packet-intrngreq.c
@@ -2,7 +2,7 @@
* Routines for Intial Ranging Request Message dissection
* Copyright 2003, Brian Wheeler <brian.wheeler[AT]arrisi.com>
*
- * $Id: packet-intrngreq.c,v 1.1 2004/03/17 06:55:03 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c
index 76c878b945..e6a88e9e74 100644
--- a/plugins/docsis/packet-macmgmt.c
+++ b/plugins/docsis/packet-macmgmt.c
@@ -2,7 +2,7 @@
* Routines for docsis Mac Management Header dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-macmgmt.c,v 1.6 2004/03/17 06:55:03 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c
index 57a4ae63a5..01be69fc66 100644
--- a/plugins/docsis/packet-map.c
+++ b/plugins/docsis/packet-map.c
@@ -2,7 +2,7 @@
* Routines for MAP Message dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-map.c,v 1.7 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-regack.c b/plugins/docsis/packet-regack.c
index 2219b3b921..916d0677eb 100644
--- a/plugins/docsis/packet-regack.c
+++ b/plugins/docsis/packet-regack.c
@@ -2,7 +2,7 @@
* Routines for Registration Acknowledge Message dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-regack.c,v 1.6 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-regreq.c b/plugins/docsis/packet-regreq.c
index 065bb97226..69a80dac1d 100644
--- a/plugins/docsis/packet-regreq.c
+++ b/plugins/docsis/packet-regreq.c
@@ -2,7 +2,7 @@
* Routines for Registration Request dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-regreq.c,v 1.6 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-regrsp.c b/plugins/docsis/packet-regrsp.c
index be5fc42544..2669fbdc62 100644
--- a/plugins/docsis/packet-regrsp.c
+++ b/plugins/docsis/packet-regrsp.c
@@ -2,7 +2,7 @@
* Routines for Registration Response Message dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-regrsp.c,v 1.7 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-rngreq.c b/plugins/docsis/packet-rngreq.c
index d3a160a89b..cb0bface54 100644
--- a/plugins/docsis/packet-rngreq.c
+++ b/plugins/docsis/packet-rngreq.c
@@ -2,7 +2,7 @@
* Routines for Ranging Request Message dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-rngreq.c,v 1.7 2004/03/17 06:55:03 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-rngrsp.c b/plugins/docsis/packet-rngrsp.c
index 29601714a0..60840746c3 100644
--- a/plugins/docsis/packet-rngrsp.c
+++ b/plugins/docsis/packet-rngrsp.c
@@ -2,7 +2,7 @@
* Routines for Ranging Response Message dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-rngrsp.c,v 1.8 2004/01/07 05:13:29 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c
index ce0d8bd79d..93819b6d7b 100644
--- a/plugins/docsis/packet-tlv.c
+++ b/plugins/docsis/packet-tlv.c
@@ -2,7 +2,7 @@
* Routines to Dissect Appendix C TLV's
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-tlv.c,v 1.16 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-tlv.h b/plugins/docsis/packet-tlv.h
index 5db38f941a..16ec280419 100644
--- a/plugins/docsis/packet-tlv.h
+++ b/plugins/docsis/packet-tlv.h
@@ -2,7 +2,7 @@
* Contains Definitions for Configuration types
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-tlv.h,v 1.4 2003/05/28 14:52:52 gerald Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c
index b76e69b5b3..769a74975f 100644
--- a/plugins/docsis/packet-type29ucd.c
+++ b/plugins/docsis/packet-type29ucd.c
@@ -2,7 +2,7 @@
* Routines for Type 29 UCD - DOCSIS 2.0 only - Message dissection
* Copyright 2003, Brian Wheeler <brian.wheeler[AT]arrisi.com>
*
- * $Id: packet-type29ucd.c,v 1.1 2004/03/17 06:55:03 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-uccreq.c b/plugins/docsis/packet-uccreq.c
index e19335c32b..681dad7655 100644
--- a/plugins/docsis/packet-uccreq.c
+++ b/plugins/docsis/packet-uccreq.c
@@ -2,7 +2,7 @@
* Routines for Upstream Channel Change Request dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-uccreq.c,v 1.6 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-uccrsp.c b/plugins/docsis/packet-uccrsp.c
index e2b54f1aea..d04b6925b7 100644
--- a/plugins/docsis/packet-uccrsp.c
+++ b/plugins/docsis/packet-uccrsp.c
@@ -2,7 +2,7 @@
* Routines for Upstream Channel Change Response dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-uccrsp.c,v 1.6 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c
index 0e806b91a4..c08e113ee7 100644
--- a/plugins/docsis/packet-ucd.c
+++ b/plugins/docsis/packet-ucd.c
@@ -2,7 +2,7 @@
* Routines for UCD Message dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-ucd.c,v 1.8 2004/03/17 06:55:03 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/docsis/packet-vendor.c b/plugins/docsis/packet-vendor.c
index 93b5bb58d4..1b4247e76d 100644
--- a/plugins/docsis/packet-vendor.c
+++ b/plugins/docsis/packet-vendor.c
@@ -2,7 +2,7 @@
* Routines for Vendor Specific Encodings dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-vendor.c,v 1.6 2003/12/13 03:18:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/enttec/ChangeLog b/plugins/enttec/ChangeLog
index 6df4047cb7..153c05a409 100644
--- a/plugins/enttec/ChangeLog
+++ b/plugins/enttec/ChangeLog
@@ -1,4 +1,4 @@
-$Id: ChangeLog,v 1.1 2003/11/17 20:57:12 guy Exp $
+$Id$
Overview of changes in ENTTEC Ethereal plugin
diff --git a/plugins/enttec/Makefile.am b/plugins/enttec/Makefile.am
index 8a267d201c..839615acae 100644
--- a/plugins/enttec/Makefile.am
+++ b/plugins/enttec/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal/ENTTEC
#
-# $Id: Makefile.am,v 1.3 2004/04/25 21:07:17 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/enttec/Makefile.nmake b/plugins/enttec/Makefile.nmake
index 46cbf21807..7a4cbf3a9b 100644
--- a/plugins/enttec/Makefile.nmake
+++ b/plugins/enttec/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.1 2003/11/17 20:57:13 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/enttec/packet-enttec.c b/plugins/enttec/packet-enttec.c
index 955852188b..6660892f8c 100644
--- a/plugins/enttec/packet-enttec.c
+++ b/plugins/enttec/packet-enttec.c
@@ -1,7 +1,7 @@
/* packet-enttec.c
* Routines for ENTTEC packet disassembly
*
- * $Id: packet-enttec.c,v 1.1 2003/11/17 20:57:13 guy Exp $
+ * $Id$
*
* Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com>
*
diff --git a/plugins/giop/Makefile.am b/plugins/giop/Makefile.am
index e6dff8df38..d35e3b2414 100644
--- a/plugins/giop/Makefile.am
+++ b/plugins/giop/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal/GIOP subdissectors
#
-# $Id: Makefile.am,v 1.7 2004/04/25 21:07:18 obiot Exp $
+# $Id$
#
# Copyright 2001, Ericsson Inc.
# Frank Singleton <frank.singleton@ericsson.com>
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index dc652335f0..eb65154b45 100644
--- a/plugins/giop/Makefile.nmake
+++ b/plugins/giop/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.9 2003/10/10 21:31:50 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am
index 9aa62bbdce..ebc1b659b0 100644
--- a/plugins/gryphon/Makefile.am
+++ b/plugins/gryphon/Makefile.am
@@ -3,7 +3,7 @@
# By Steve Limkemann <stevelim@dgtech.com>
# Copyright 1998 Steve Limkemann
#
-# $Id: Makefile.am,v 1.14 2004/04/25 21:07:19 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index 23a04bf941..72f8f5ad79 100644
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.13 2003/11/06 09:05:12 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index 0283105fe5..c7a1b86e7f 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -3,7 +3,7 @@
* By Steve Limkemann <stevelim@dgtech.com>
* Copyright 1998 Steve Limkemann
*
- * $Id: packet-gryphon.c,v 1.45 2004/01/24 02:07:05 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/gryphon/packet-gryphon.h b/plugins/gryphon/packet-gryphon.h
index 3abd0840f2..abac7c3957 100644
--- a/plugins/gryphon/packet-gryphon.h
+++ b/plugins/gryphon/packet-gryphon.h
@@ -1,7 +1,7 @@
/* packet-gryphon.c
* Definitions for Gryphon packet disassembly structures and routines
*
- * $Id: packet-gryphon.h,v 1.8 2003/10/03 23:22:12 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Steve Limkemann <stevelim@dgtech.com>
diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am
index 60e4919083..d0a5b93be4 100644
--- a/plugins/irda/Makefile.am
+++ b/plugins/irda/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal/IrDA
#
-# $Id: Makefile.am,v 1.4 2004/06/30 07:34:52 guy Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake
index 16cb5cf884..af828558bf 100644
--- a/plugins/irda/Makefile.nmake
+++ b/plugins/irda/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.2 2004/06/30 07:34:52 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/irda/irda-appl.h b/plugins/irda/irda-appl.h
index d448f9edfe..571d8bfc5e 100644
--- a/plugins/irda/irda-appl.h
+++ b/plugins/irda/irda-appl.h
@@ -3,7 +3,7 @@
* By Jan Kiszka <jan.kiszka@web.de>
* Copyright 2003 Jan Kiszka
*
- * $Id: irda-appl.h,v 1.2 2004/06/30 07:34:52 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c
index b4d476fe2a..f2888839ea 100644
--- a/plugins/irda/packet-ircomm.c
+++ b/plugins/irda/packet-ircomm.c
@@ -3,7 +3,7 @@
* By Jan Kiszka <jan.kiszka@web.de>
* Copyright 2003 Jan Kiszka
*
- * $Id: packet-ircomm.c,v 1.3 2004/03/08 19:41:52 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index 289032812e..4287aa7fd9 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -6,7 +6,7 @@
* Extended by Jan Kiszka <jan.kiszka@web.de>
* Copyright 2003 Jan Kiszka
*
- * $Id: packet-irda.c,v 1.8 2004/06/30 15:42:24 tuexen Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/lwres/Makefile.am b/plugins/lwres/Makefile.am
index f7a7c3651b..fd12536d17 100644
--- a/plugins/lwres/Makefile.am
+++ b/plugins/lwres/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal/lwres
#
-# $Id: Makefile.am,v 1.5 2004/04/25 21:07:22 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer / light waight resolver (part of Bind9)
# By Steve Oleg Terletsky <oleg.terletsky@comverse.com>
diff --git a/plugins/lwres/Makefile.nmake b/plugins/lwres/Makefile.nmake
index 8cd491fc2d..3bc05a84a8 100644
--- a/plugins/lwres/Makefile.nmake
+++ b/plugins/lwres/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.4 2003/11/06 09:05:12 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/lwres/packet-lwres.c b/plugins/lwres/packet-lwres.c
index e5ff0b2492..a69441dfbb 100644
--- a/plugins/lwres/packet-lwres.c
+++ b/plugins/lwres/packet-lwres.c
@@ -1,7 +1,7 @@
/* packet-lwres.c
* Routines for light weight reslover (lwres, part of BIND9) packet disassembly
*
- * $Id: packet-lwres.c,v 1.3 2003/09/05 07:44:47 jmayer Exp $
+ * $Id$
*
* Copyright (c) 2003 by Oleg Terletsky <oleg.terletsky@comverse.com>
*
diff --git a/plugins/megaco/Makefile.am b/plugins/megaco/Makefile.am
index cdf77eff4a..9d4b288463 100644
--- a/plugins/megaco/Makefile.am
+++ b/plugins/megaco/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Megaco Ethereal plugin
#
-# $Id: Makefile.am,v 1.4 2004/04/25 21:07:23 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/megaco/Makefile.nmake b/plugins/megaco/Makefile.nmake
index 73f4776f49..6d95fb4cc9 100644
--- a/plugins/megaco/Makefile.nmake
+++ b/plugins/megaco/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.5 2003/11/06 09:05:13 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/megaco/packet-megaco.c b/plugins/megaco/packet-megaco.c
index 6ece7bdfb6..c7ea7fb52e 100644
--- a/plugins/megaco/packet-megaco.c
+++ b/plugins/megaco/packet-megaco.c
@@ -2,7 +2,7 @@
* Routines for megaco packet disassembly
* RFC 3015
*
-* $Id: packet-megaco.c,v 1.16 2004/04/23 03:20:58 guy Exp $
+* $Id$
*
* Christian Falckenberg, 2002/10/17
* Copyright (c) 2002 by Christian Falckenberg
diff --git a/plugins/mgcp/Makefile.am b/plugins/mgcp/Makefile.am
index b53ff61ecb..283f7c4ffa 100644
--- a/plugins/mgcp/Makefile.am
+++ b/plugins/mgcp/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal/MGCP
#
-# $Id: Makefile.am,v 1.10 2004/04/25 21:07:23 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake
index 91a785222b..70d3d1cdf1 100644
--- a/plugins/mgcp/Makefile.nmake
+++ b/plugins/mgcp/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.10 2004/05/09 10:03:41 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c
index f34fb0701b..0df25e6199 100644
--- a/plugins/mgcp/packet-mgcp.c
+++ b/plugins/mgcp/packet-mgcp.c
@@ -8,7 +8,7 @@
* PKT-SP-EC-MGCP-I09-040113, January 13, 2004, Cable Television
* Laboratories, Inc., http://www.PacketCable.com/
*
- * $Id: packet-mgcp.c,v 1.47 2004/05/31 19:31:14 etxrab Exp $
+ * $Id$
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
* Copyright (c) 2004 by Thomas Anders <thomas.anders [AT] blue-cable.de>
diff --git a/plugins/mgcp/packet-mgcp.h b/plugins/mgcp/packet-mgcp.h
index 1df7343d0c..50f08685e5 100755
--- a/plugins/mgcp/packet-mgcp.h
+++ b/plugins/mgcp/packet-mgcp.h
@@ -2,7 +2,7 @@
* Routines for mgcp packet disassembly
* RFC 2705
*
- * $Id: packet-mgcp.h,v 1.2 2003/07/25 17:57:09 guy Exp $
+ * $Id$
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
*
diff --git a/plugins/pcli/Makefile.am b/plugins/pcli/Makefile.am
index 5d7b300634..18af83bd73 100644
--- a/plugins/pcli/Makefile.am
+++ b/plugins/pcli/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal/Gryphon
#
-# $Id: Makefile.am,v 1.5 2004/04/25 21:07:23 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake
index d691025b45..69e613a3e1 100644
--- a/plugins/pcli/Makefile.nmake
+++ b/plugins/pcli/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.5 2003/11/06 09:05:14 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/pcli/packet-pcli.c b/plugins/pcli/packet-pcli.c
index f9c198ae1b..16e121444d 100644
--- a/plugins/pcli/packet-pcli.c
+++ b/plugins/pcli/packet-pcli.c
@@ -4,7 +4,7 @@
* http://www.packetcable.com/downloads/specs/pkt-sp-esp-I01-991229.pdf
* Chapter 4 ( Call Content Connection Interface )
*
- * $Id: packet-pcli.c,v 1.8 2003/09/05 07:44:50 jmayer Exp $
+ * $Id$
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
*
diff --git a/plugins/plugin_api.c b/plugins/plugin_api.c
index 0e125299f7..8b1bbff9a5 100644
--- a/plugins/plugin_api.c
+++ b/plugins/plugin_api.c
@@ -1,7 +1,7 @@
/* plugin_api.c
* Routines for Ethereal plugins.
*
- * $Id: plugin_api.c,v 1.53 2003/07/18 03:01:34 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h
index 73e9f594ce..3ee009b6c6 100644
--- a/plugins/plugin_api.h
+++ b/plugins/plugin_api.h
@@ -1,7 +1,7 @@
/* plugin_api.h
* Routines for Ethereal plugins.
*
- * $Id: plugin_api.h,v 1.63 2004/06/30 17:57:53 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/plugins/plugin_api_decls.h b/plugins/plugin_api_decls.h
index 119afbda0d..29f1d54c8f 100644
--- a/plugins/plugin_api_decls.h
+++ b/plugins/plugin_api_decls.h
@@ -2,7 +2,7 @@
* Declarations of a list of "p_" names; included in various places
* to declare them as variables or as function members.
*
- * $Id: plugin_api_decls.h,v 1.16 2003/07/18 03:01:34 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/plugins/plugin_api_defs.h b/plugins/plugin_api_defs.h
index 9f9365ebb5..6ac566d0d2 100644
--- a/plugins/plugin_api_defs.h
+++ b/plugins/plugin_api_defs.h
@@ -1,7 +1,7 @@
/* plugin_api_defs.h
* Define the variables that hold pointers to plugin API functions
*
- * $Id: plugin_api_defs.h,v 1.15 2002/08/28 20:38:58 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/plugins/plugin_api_list.c b/plugins/plugin_api_list.c
index 5ae533e6d7..5dd3a25d93 100644
--- a/plugins/plugin_api_list.c
+++ b/plugins/plugin_api_list.c
@@ -1,7 +1,7 @@
/* plugin_api_list.c
* Used to generate various included files for plugin API
*
- * $Id: plugin_api_list.c,v 1.36 2004/06/30 08:21:58 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/plugin_gen.py b/plugins/plugin_gen.py
index e9f8fab693..850acd0293 100644
--- a/plugins/plugin_gen.py
+++ b/plugins/plugin_gen.py
@@ -1,7 +1,7 @@
#! /usr/bin/python
# -*- python -*-
#
-# $Id: plugin_gen.py,v 1.3 2003/08/23 07:34:31 guy Exp $
+# $Id$
#
# mmelchior@xs4all.nl
#
diff --git a/plugins/plugin_table.h b/plugins/plugin_table.h
index 7d9c4eaefb..4d7f1e614c 100644
--- a/plugins/plugin_table.h
+++ b/plugins/plugin_table.h
@@ -1,7 +1,7 @@
/* plugin_table.h
* Table of exported addresses for Ethereal plugins.
*
- * $Id: plugin_table.h,v 1.67 2003/07/18 03:01:35 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/plugins/rdm/Makefile.am b/plugins/rdm/Makefile.am
index a8f298782e..85dd54b789 100644
--- a/plugins/rdm/Makefile.am
+++ b/plugins/rdm/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal/RDM
#
-# $Id: Makefile.am,v 1.3 2004/04/25 21:07:23 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/rdm/Makefile.nmake b/plugins/rdm/Makefile.nmake
index 52810eae63..8f6276fcc2 100644
--- a/plugins/rdm/Makefile.nmake
+++ b/plugins/rdm/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.2 2003/11/18 19:18:45 ulfl Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/rdm/packet-rdm.c b/plugins/rdm/packet-rdm.c
index 8a6e7b76e8..ee49155d10 100644
--- a/plugins/rdm/packet-rdm.c
+++ b/plugins/rdm/packet-rdm.c
@@ -1,7 +1,7 @@
/* packet-rdm.c
* Routines for RDM packet disassembly
*
- * $Id: packet-rdm.c,v 1.2 2003/11/17 22:26:57 guy Exp $
+ * $Id$
*
* Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com>
*
diff --git a/plugins/rlm/Makefile.am b/plugins/rlm/Makefile.am
index 8ac56aae3d..56f26dc792 100644
--- a/plugins/rlm/Makefile.am
+++ b/plugins/rlm/Makefile.am
@@ -2,7 +2,7 @@
# Automake file for Cisco SS7 Redundant Link Management dissector
# Copyright 2004, Duncan Sargeant <dunc-ethereal@rcpt.to>
#
-# $Id: Makefile.am,v 1.3 2004/04/25 21:07:23 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/rlm/Makefile.nmake b/plugins/rlm/Makefile.nmake
index 300c12cfc0..3d72d58ffa 100644
--- a/plugins/rlm/Makefile.nmake
+++ b/plugins/rlm/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.1 2004/03/25 11:21:07 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/rlm/packet-rlm.c b/plugins/rlm/packet-rlm.c
index b230f89759..1b0fe320f0 100644
--- a/plugins/rlm/packet-rlm.c
+++ b/plugins/rlm/packet-rlm.c
@@ -2,7 +2,7 @@
* Routines for RLM dissection
* Copyright 2004, Duncan Sargeant <dunc-ethereal@rcpt.to>
*
- * $Id: packet-rlm.c,v 1.5 2004/04/25 15:16:38 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/rtnet/Makefile.am b/plugins/rtnet/Makefile.am
index 2564080005..0d3b36634b 100644
--- a/plugins/rtnet/Makefile.am
+++ b/plugins/rtnet/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal/RTNET
#
-# $Id: Makefile.am,v 1.5 2004/04/25 21:07:24 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake
index 2440e43f7e..af4e114eb8 100644
--- a/plugins/rtnet/Makefile.nmake
+++ b/plugins/rtnet/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.6 2003/11/06 09:05:14 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/rtnet/packet-rtnet.c b/plugins/rtnet/packet-rtnet.c
index 1d1c70b28b..b1065e9912 100644
--- a/plugins/rtnet/packet-rtnet.c
+++ b/plugins/rtnet/packet-rtnet.c
@@ -1,7 +1,7 @@
/* packet-rtnet.c
* Routines for RTnet packet disassembly
*
- * $Id: packet-rtnet.c,v 1.7 2004/02/18 05:33:35 guy Exp $
+ * $Id$
*
* Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com>
*
diff --git a/plugins/rudp/Makefile.am b/plugins/rudp/Makefile.am
index d62af1a067..dbcbcde3ad 100644
--- a/plugins/rudp/Makefile.am
+++ b/plugins/rudp/Makefile.am
@@ -2,7 +2,7 @@
# Automake file for Cisco SS7 Reliable UDP dissector
# Copyright 2004, Duncan Sargeant <dunc-ethereal@rcpt.to>
#
-# $Id: Makefile.am,v 1.3 2004/04/25 21:07:24 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/rudp/Makefile.nmake b/plugins/rudp/Makefile.nmake
index aefe44ab37..3ff1a9fb99 100644
--- a/plugins/rudp/Makefile.nmake
+++ b/plugins/rudp/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.1 2004/03/25 11:21:07 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/plugins/rudp/packet-rudp.c b/plugins/rudp/packet-rudp.c
index df207d0567..f01ca31ae4 100644
--- a/plugins/rudp/packet-rudp.c
+++ b/plugins/rudp/packet-rudp.c
@@ -2,7 +2,7 @@
* Routines for Reliable UDP Protocol.
* Copyright 2004, Duncan Sargeant <dunc-ethereal@rcpt.to>
*
- * $Id: packet-rudp.c,v 1.8 2004/04/25 15:16:39 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/v5ua/Makefile.am b/plugins/v5ua/Makefile.am
index cbcb11e38f..abaf7e540b 100644
--- a/plugins/v5ua/Makefile.am
+++ b/plugins/v5ua/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for V5UA plugin
#
-# $Id: Makefile.am,v 1.4 2004/04/25 21:07:25 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/plugins/v5ua/Makefile.nmake b/plugins/v5ua/Makefile.nmake
index 22f8dd7733..a1afdddce9 100644
--- a/plugins/v5ua/Makefile.nmake
+++ b/plugins/v5ua/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.2 2003/12/17 07:02:12 guy Exp $
+# $Id$
#
include ..\..\config.nmake
diff --git a/ppptypes.h b/ppptypes.h
index 318028f58a..3dbf3b0238 100644
--- a/ppptypes.h
+++ b/ppptypes.h
@@ -1,7 +1,7 @@
/* ppptypes.h
* Defines PPP packet types.
*
- * $Id: ppptypes.h,v 1.14 2002/08/28 21:00:40 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/prefs-int.h b/prefs-int.h
index 8e425bc85e..055c980d06 100644
--- a/prefs-int.h
+++ b/prefs-int.h
@@ -2,7 +2,7 @@
* Definitions for implementation of preference handling routines;
* used by "friends" of the preferences type.
*
- * $Id: prefs-int.h,v 1.12 2004/05/09 10:03:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/prefs.c b/prefs.c
index 2521d13d07..4eb90c6430 100644
--- a/prefs.c
+++ b/prefs.c
@@ -1,7 +1,7 @@
/* prefs.c
* Routines for handling preferences
*
- * $Id: prefs.c,v 1.139 2004/06/29 17:10:52 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/prefs.h b/prefs.h
index dc4e94927a..863f02e73a 100644
--- a/prefs.h
+++ b/prefs.h
@@ -1,7 +1,7 @@
/* prefs.h
* Definitions for preference handling routines
*
- * $Id: prefs.h,v 1.67 2004/06/29 17:10:52 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/print.c b/print.c
index 159989d7f7..7ca7705ab8 100644
--- a/print.c
+++ b/print.c
@@ -1,7 +1,7 @@
/* print.c
* Routines for printing packet analysis trees.
*
- * $Id: print.c,v 1.84 2004/07/08 10:36:27 guy Exp $
+ * $Id$
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
diff --git a/print.h b/print.h
index 73f9116d38..33908927df 100644
--- a/print.h
+++ b/print.h
@@ -1,7 +1,7 @@
/* print.h
* Definitions for printing packet analysis trees.
*
- * $Id: print.h,v 1.45 2004/07/08 10:36:27 guy Exp $
+ * $Id$
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
diff --git a/process-x11-fields.pl b/process-x11-fields.pl
index ae2edcc18a..057f9b44b7 100644
--- a/process-x11-fields.pl
+++ b/process-x11-fields.pl
@@ -6,7 +6,7 @@
#
# Copyright 2000, Christophe Tronche <ch.tronche@computer.org>
#
-# $Id: process-x11-fields.pl,v 1.6 2004/03/27 11:33:40 guy Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/progress_dlg.h b/progress_dlg.h
index 34d2ae37d4..c50108b2b2 100644
--- a/progress_dlg.h
+++ b/progress_dlg.h
@@ -1,7 +1,7 @@
/* progress_dlg.h
* Definitions for progress dialog box routines
*
- * $Id: progress_dlg.h,v 1.7 2004/06/04 20:04:34 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/proto_hier_stats.c b/proto_hier_stats.c
index a54fb0b5a0..8974e52ac1 100644
--- a/proto_hier_stats.c
+++ b/proto_hier_stats.c
@@ -1,7 +1,7 @@
/* proto_hier_stats.c
* Routines for calculating statistics based on protocol.
*
- * $Id: proto_hier_stats.c,v 1.26 2004/03/17 21:48:15 deniel Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/proto_hier_stats.h b/proto_hier_stats.h
index 55e1fade30..45e9cc4b07 100644
--- a/proto_hier_stats.h
+++ b/proto_hier_stats.h
@@ -1,6 +1,6 @@
/* proto_hier_stats.h
*
- * $Id: proto_hier_stats.h,v 1.5 2004/03/17 21:48:15 deniel Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/ps.h b/ps.h
index a41d0f245a..c7c2ee955f 100644
--- a/ps.h
+++ b/ps.h
@@ -1,7 +1,7 @@
/* ps.h
* Definitions for generating PostScript(R) packet output.
*
- * $Id: ps.h,v 1.7 2004/01/25 00:58:12 guy Exp $
+ * $Id$
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
diff --git a/ptvcursor.c b/ptvcursor.c
index 9c482a3959..cde56022f0 100644
--- a/ptvcursor.c
+++ b/ptvcursor.c
@@ -3,7 +3,7 @@
* Proto Tree TVBuff cursor
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: ptvcursor.c,v 1.7 2002/08/28 21:00:41 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/ptvcursor.h b/ptvcursor.h
index fb1e1d95f6..6467bcdea9 100644
--- a/ptvcursor.h
+++ b/ptvcursor.h
@@ -3,7 +3,7 @@
* Proto Tree TVBuff cursor
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: ptvcursor.h,v 1.7 2002/08/28 21:00:41 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/randpkt.c b/randpkt.c
index f88cac0925..d88637215a 100644
--- a/randpkt.c
+++ b/randpkt.c
@@ -4,7 +4,7 @@
* Creates random packet traces. Useful for debugging sniffers by testing
* assumptions about the veracity of the data found in the packet.
*
- * $Id: randpkt.c,v 1.19 2004/02/23 14:37:59 jmayer Exp $
+ * $Id$
*
* Copyright (C) 1999 by Gilbert Ramirez <gram@alumni.rice.edu>
*
diff --git a/range.c b/range.c
index 0ff0dcacf5..d5d507b902 100644
--- a/range.c
+++ b/range.c
@@ -1,7 +1,7 @@
/* range.c
* Packet range routines (save, print, ...)
*
- * $Id: range.c,v 1.9 2004/02/11 09:19:54 guy Exp $
+ * $Id$
*
* Dick Gooris <gooris@lucent.com>
* Ulf Lamping <ulf.lamping@web.de>
diff --git a/range.h b/range.h
index 7178fc18fb..fe13aa01f0 100644
--- a/range.h
+++ b/range.h
@@ -1,7 +1,7 @@
/* range.h
* Packet range routines (save, print, ...)
*
- * $Id: range.h,v 1.8 2004/01/09 18:10:40 ulfl Exp $
+ * $Id$
*
* Dick Gooris <gooris@lucent.com>
* Ulf Lamping <ulf.lamping@web.de>
diff --git a/rdps.c b/rdps.c
index 1a54c1bdc9..2f8209de83 100644
--- a/rdps.c
+++ b/rdps.c
@@ -1,6 +1,6 @@
/* rdps.c
*
- * $Id: rdps.c,v 1.8 2004/01/25 00:58:12 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/reassemble.c b/reassemble.c
index a323f4fc33..70c475c349 100644
--- a/reassemble.c
+++ b/reassemble.c
@@ -1,7 +1,7 @@
/* reassemble.c
* Routines for {fragment,segment} reassembly
*
- * $Id: reassemble.c,v 1.51 2004/06/25 06:16:35 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/reassemble.h b/reassemble.h
index 58ffcf5ce8..85c66942c9 100644
--- a/reassemble.h
+++ b/reassemble.h
@@ -1,7 +1,7 @@
/* reassemble.h
* Declarations of outines for {fragment,segment} reassembly
*
- * $Id: reassemble.h,v 1.22 2004/06/24 07:43:24 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/register.h b/register.h
index d3ffe3d8c9..3888df3608 100644
--- a/register.h
+++ b/register.h
@@ -1,7 +1,7 @@
/* register.h
* Definitions for protocol registration
*
- * $Id: register.h,v 1.6 2004/05/03 18:51:50 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/req_resp_hdrs.c b/req_resp_hdrs.c
index 3ff5318491..fad48804d4 100644
--- a/req_resp_hdrs.c
+++ b/req_resp_hdrs.c
@@ -2,7 +2,7 @@
* Routines handling protocols with a request/response line, headers,
* a blank line, and an optional body.
*
- * $Id: req_resp_hdrs.c,v 1.5 2004/05/04 06:53:47 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/req_resp_hdrs.h b/req_resp_hdrs.h
index b0e384eeb2..a4783a5440 100644
--- a/req_resp_hdrs.h
+++ b/req_resp_hdrs.h
@@ -2,7 +2,7 @@
* Declarations of routines handling protocols with a request/response line,
* headers, a blank line, and an optional body.
*
- * $Id: req_resp_hdrs.h,v 1.1 2003/12/23 02:29:11 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/ringbuffer.c b/ringbuffer.c
index 93d4201848..651f2a25b1 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -1,7 +1,7 @@
/* ringbuffer.c
* Routines for packet capture windows
*
- * $Id: ringbuffer.c,v 1.12 2004/06/30 06:58:57 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/ringbuffer.h b/ringbuffer.h
index c905b4b893..4e269a49cb 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -1,7 +1,7 @@
/* capture.h
* Definitions for packet capture windows
*
- * $Id: ringbuffer.h,v 1.3 2003/06/22 16:06:03 deniel Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/rpc_defrag.h b/rpc_defrag.h
index 02e60f9bfe..c84317c467 100644
--- a/rpc_defrag.h
+++ b/rpc_defrag.h
@@ -1,7 +1,7 @@
/* rpc_defrag.h
* Declarations for RPC defragmentation
*
- * $Id: rpc_defrag.h,v 1.5 2003/04/21 08:13:18 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/rtp_pt.h b/rtp_pt.h
index 789054886b..5508c066de 100644
--- a/rtp_pt.h
+++ b/rtp_pt.h
@@ -1,7 +1,7 @@
/* rtp_pt.h
* Defines RTP payload types
*
- * $Id: rtp_pt.h,v 1.4 2004/06/01 23:08:00 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/sctpppids.h b/sctpppids.h
index d7cc25da9d..dc74f18882 100644
--- a/sctpppids.h
+++ b/sctpppids.h
@@ -1,7 +1,7 @@
/* sctpppids.h
* Declarations of SCTP payload protocol IDs.
*
- * $Id: sctpppids.h,v 1.2 2003/01/20 22:44:58 tuexen Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/simple_dialog.h b/simple_dialog.h
index 7d5a4c8bf5..6120220c19 100644
--- a/simple_dialog.h
+++ b/simple_dialog.h
@@ -2,7 +2,7 @@
* Definitions for alert box routines with toolkit-independent APIs but
* toolkit-dependent implementations.
*
- * $Id: simple_dialog.h,v 1.16 2004/07/13 07:15:42 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/smb.h b/smb.h
index 6724974a31..0fc680ba62 100644
--- a/smb.h
+++ b/smb.h
@@ -2,7 +2,7 @@
* Defines for smb packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: smb.h,v 1.55 2004/05/09 10:03:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/snprintf-imp.h b/snprintf-imp.h
index 4f3b0860e2..27a823ee3f 100644
--- a/snprintf-imp.h
+++ b/snprintf-imp.h
@@ -1,5 +1,5 @@
/*
- * $Id: snprintf-imp.h,v 1.4 2002/08/28 21:00:41 jmayer Exp $
+ * $Id$
*/
/*
diff --git a/snprintf.c b/snprintf.c
index be45f15c25..51b8f51b3b 100644
--- a/snprintf.c
+++ b/snprintf.c
@@ -1,5 +1,5 @@
/*
- * $Id: snprintf.c,v 1.14 2002/08/28 21:00:41 jmayer Exp $
+ * $Id$
*/
/*
diff --git a/snprintf.h b/snprintf.h
index f135fa27f9..b1553e4349 100644
--- a/snprintf.h
+++ b/snprintf.h
@@ -1,5 +1,5 @@
/*
- * $Id: snprintf.h,v 1.9 2002/09/12 21:26:51 gram Exp $
+ * $Id$
*/
#ifndef __ETHEREAL_SNPRINTF_H__
diff --git a/statusbar.h b/statusbar.h
index 0695a6d66a..0d2a005362 100644
--- a/statusbar.h
+++ b/statusbar.h
@@ -1,7 +1,7 @@
/* statusbar.h
* Definitions for status bar UI routines
*
- * $Id: statusbar.h,v 1.2 2002/08/28 21:00:41 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/strerror.c b/strerror.c
index 1ad86bd1b0..18dafbcc24 100644
--- a/strerror.c
+++ b/strerror.c
@@ -1,6 +1,6 @@
/* strerror.c
*
- * $Id: strerror.c,v 1.2 2002/08/28 21:00:41 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/strerror.h b/strerror.h
index d625a1fb1a..19eeacdb98 100644
--- a/strerror.h
+++ b/strerror.h
@@ -1,6 +1,6 @@
/* strerror.h
*
- * $Id: strerror.h,v 1.3 2002/08/28 21:00:41 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
diff --git a/strptime.h b/strptime.h
index 5bb6162330..52100917c9 100644
--- a/strptime.h
+++ b/strptime.h
@@ -1,6 +1,6 @@
/* strptime.h
*
- * $Id: strptime.h,v 1.2 2002/08/28 21:00:41 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/summary.c b/summary.c
index 2b5715a485..fc3c51cc91 100644
--- a/summary.c
+++ b/summary.c
@@ -1,7 +1,7 @@
/* summary.c
* Routines for capture file summary info
*
- * $Id: summary.c,v 1.23 2003/09/02 22:10:32 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/summary.h b/summary.h
index 92eb2575f7..5ec4b0aad9 100644
--- a/summary.h
+++ b/summary.h
@@ -1,7 +1,7 @@
/* summary.h
* Definitions for capture file summary data
*
- * $Id: summary.h,v 1.8 2003/09/02 22:10:32 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/t35.c b/t35.c
index b18e7b1600..16fdc0ec97 100644
--- a/t35.c
+++ b/t35.c
@@ -2,7 +2,7 @@
* T.35 and H.221 tables
* 2003 Tomas Kukosa
*
- * $Id: t35.c,v 1.5 2004/06/15 09:43:19 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/t35.h b/t35.h
index 05ab6570f2..a9d8abf422 100644
--- a/t35.h
+++ b/t35.h
@@ -2,7 +2,7 @@
* T.35 and H.221 tables
* 2003 Tomas Kukosa
*
- * $Id: t35.h,v 1.2 2003/10/02 22:40:37 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-ansi_astat.c b/tap-ansi_astat.c
index 53eae264e7..bb97694b88 100644
--- a/tap-ansi_astat.c
+++ b/tap-ansi_astat.c
@@ -3,7 +3,7 @@
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>
* In association with Telos Technology Inc.
*
- * $Id: tap-ansi_astat.c,v 1.4 2004/05/09 10:03:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-bootpstat.c b/tap-bootpstat.c
index effb401156..5b3b05c278 100644
--- a/tap-bootpstat.c
+++ b/tap-bootpstat.c
@@ -1,7 +1,7 @@
/* tap-bootpstat.c
* boop_stat 2003 Jean-Michel FAYARD
*
- * $Id: tap-bootpstat.c,v 1.1 2003/09/02 22:47:58 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-dcerpcstat.c b/tap-dcerpcstat.c
index bd14a7b718..aa4c64ec7d 100644
--- a/tap-dcerpcstat.c
+++ b/tap-dcerpcstat.c
@@ -1,7 +1,7 @@
/* tap-dcerpcstat.c
* dcerpcstat 2002 Ronnie Sahlberg
*
- * $Id: tap-dcerpcstat.c,v 1.10 2004/05/07 11:25:15 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-gsm_astat.c b/tap-gsm_astat.c
index 33b6f91120..ecaca3ea2f 100644
--- a/tap-gsm_astat.c
+++ b/tap-gsm_astat.c
@@ -3,7 +3,7 @@
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>
* In association with Telos Technology Inc.
*
- * $Id: tap-gsm_astat.c,v 1.2 2004/05/09 10:03:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-h225counter.c b/tap-h225counter.c
index 400c9f3a64..c9ed94d9ee 100644
--- a/tap-h225counter.c
+++ b/tap-h225counter.c
@@ -2,7 +2,7 @@
* h225 message counter for ethereal
* Copyright 2003 Lars Roland
*
- * $Id: tap-h225counter.c,v 1.3 2004/05/09 10:03:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-h225rassrt.c b/tap-h225rassrt.c
index a33fd8ba60..97f5409f95 100755
--- a/tap-h225rassrt.c
+++ b/tap-h225rassrt.c
@@ -2,7 +2,7 @@
* h225 RAS Service Response Time statistics for ethereal
* Copyright 2003 Lars Roland
*
- * $Id: tap-h225rassrt.c,v 1.1 2003/11/16 23:11:18 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-httpstat.c b/tap-httpstat.c
index 3b2d38d0fe..2828819632 100644
--- a/tap-httpstat.c
+++ b/tap-httpstat.c
@@ -1,7 +1,7 @@
/* tap-httpstat.c
* tap-httpstat 2003 Jean-Michel FAYARD
*
- * $Id: tap-httpstat.c,v 1.3 2003/09/29 19:18:43 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-iostat.c b/tap-iostat.c
index d90344f631..d36faa05c4 100644
--- a/tap-iostat.c
+++ b/tap-iostat.c
@@ -1,7 +1,7 @@
/* tap-iostat.c
* iostat 2002 Ronnie Sahlberg
*
- * $Id: tap-iostat.c,v 1.9 2003/12/02 21:15:46 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-iousers.c b/tap-iousers.c
index 409e9ac936..63989b094f 100644
--- a/tap-iousers.c
+++ b/tap-iousers.c
@@ -1,7 +1,7 @@
/* tap-iousers.c
* iostat 2003 Ronnie Sahlberg
*
- * $Id: tap-iousers.c,v 1.15 2003/09/05 01:33:40 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-mgcpstat.c b/tap-mgcpstat.c
index 193b2d5135..a7905ed03e 100644
--- a/tap-mgcpstat.c
+++ b/tap-mgcpstat.c
@@ -1,7 +1,7 @@
/* tap-mgcpstat.c
* mgcpstat 2003 Lars Roland
*
- * $Id: tap-mgcpstat.c,v 1.6 2003/04/23 08:20:01 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-protocolinfo.c b/tap-protocolinfo.c
index eade2065be..229e59575f 100644
--- a/tap-protocolinfo.c
+++ b/tap-protocolinfo.c
@@ -1,7 +1,7 @@
/* tap-protocolinfo.c
* protohierstat 2002 Ronnie Sahlberg
*
- * $Id: tap-protocolinfo.c,v 1.4 2003/05/03 00:48:33 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-protohierstat.c b/tap-protohierstat.c
index 532ebcc343..d6966676b1 100644
--- a/tap-protohierstat.c
+++ b/tap-protohierstat.c
@@ -1,7 +1,7 @@
/* tap-protohierstat.c
* protohierstat 2002 Ronnie Sahlberg
*
- * $Id: tap-protohierstat.c,v 1.6 2003/12/04 10:59:33 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-rpcprogs.c b/tap-rpcprogs.c
index 51454e8582..caa4a0ecac 100644
--- a/tap-rpcprogs.c
+++ b/tap-rpcprogs.c
@@ -1,7 +1,7 @@
/* tap-rpcprogs.c
* rpcstat 2002 Ronnie Sahlberg
*
- * $Id: tap-rpcprogs.c,v 1.6 2004/05/17 20:06:32 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-rpcstat.c b/tap-rpcstat.c
index f523515221..8c1e7bba15 100644
--- a/tap-rpcstat.c
+++ b/tap-rpcstat.c
@@ -1,7 +1,7 @@
/* tap-rpcstat.c
* rpcstat 2002 Ronnie Sahlberg
*
- * $Id: tap-rpcstat.c,v 1.12 2004/05/09 10:03:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-sipstat.c b/tap-sipstat.c
index 3856f400c5..fb517e6b1f 100644
--- a/tap-sipstat.c
+++ b/tap-sipstat.c
@@ -1,7 +1,7 @@
/* tap_sipstat.c
* sip message counter for ethereal
*
- * $Id: tap-sipstat.c,v 1.2 2004/05/01 21:34:24 guy Exp $
+ * $Id$
* Copied from gtk/sip_stat.c and tap-httpstat.c
*
* Ethereal - Network traffic analyzer
diff --git a/tap-smbsids.c b/tap-smbsids.c
index 2923cb8a4e..0f1e4c640a 100644
--- a/tap-smbsids.c
+++ b/tap-smbsids.c
@@ -1,7 +1,7 @@
/* tap-smbsids.c
* smbstat 2003 Ronnie Sahlberg
*
- * $Id: tap-smbsids.c,v 1.2 2004/05/09 10:03:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-smbstat.c b/tap-smbstat.c
index 1ed8ae2193..4c0efe62bc 100644
--- a/tap-smbstat.c
+++ b/tap-smbstat.c
@@ -1,7 +1,7 @@
/* tap-smbstat.c
* smbstat 2003 Ronnie Sahlberg
*
- * $Id: tap-smbstat.c,v 1.6 2004/05/09 10:03:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap-wspstat.c b/tap-wspstat.c
index 7aff157f1c..8c099d2b03 100644
--- a/tap-wspstat.c
+++ b/tap-wspstat.c
@@ -1,7 +1,7 @@
/* tap-rpcstat.c
* wspstat 2003 Jean-Michel FAYARD
*
- * $Id: tap-wspstat.c,v 1.4 2004/05/09 10:03:38 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap.c b/tap.c
index adb290e4fc..fb9d0bf994 100644
--- a/tap.c
+++ b/tap.c
@@ -1,7 +1,7 @@
/* tap.c
* packet tap interface 2002 Ronnie Sahlberg
*
- * $Id: tap.c,v 1.10 2004/05/31 09:53:21 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap.h b/tap.h
index dd504daa5d..491ed3cae5 100644
--- a/tap.h
+++ b/tap.h
@@ -1,7 +1,7 @@
/* tap.h
* packet tap interface 2002 Ronnie Sahlberg
*
- * $Id: tap.h,v 1.10 2004/05/31 09:53:21 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tap_dfilter_dlg.h b/tap_dfilter_dlg.h
index 1cc4b73f03..0116eae595 100644
--- a/tap_dfilter_dlg.h
+++ b/tap_dfilter_dlg.h
@@ -2,7 +2,7 @@
* Header file for display filter dialog used by gui taps
* Copyright 2003 Lars Roland
*
- * $Id: tap_dfilter_dlg.h,v 1.1 2003/12/19 23:39:53 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tethereal.c b/tethereal.c
index 2c1bfeb0ea..c2bcc5f074 100644
--- a/tethereal.c
+++ b/tethereal.c
@@ -1,6 +1,6 @@
/* tethereal.c
*
- * $Id: tethereal.c,v 1.247 2004/07/09 09:21:07 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/text2pcap-scanner.l b/text2pcap-scanner.l
index 0f20ba70b3..da36898ad1 100644
--- a/text2pcap-scanner.l
+++ b/text2pcap-scanner.l
@@ -10,7 +10,7 @@
*
* (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: text2pcap-scanner.l,v 1.3 2001/11/24 09:46:28 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/text2pcap.c b/text2pcap.c
index d20b7f5b83..a1374af38f 100644
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -6,7 +6,7 @@
*
* (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: text2pcap.c,v 1.30 2004/07/04 17:36:53 tuexen Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/text2pcap.h b/text2pcap.h
index 3bcb98a8a1..e800c09f41 100644
--- a/text2pcap.h
+++ b/text2pcap.h
@@ -6,7 +6,7 @@
*
* (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: text2pcap.h,v 1.3 2002/08/28 21:00:41 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/timestats.c b/timestats.c
index 5593c26d89..7a42558b15 100644
--- a/timestats.c
+++ b/timestats.c
@@ -2,7 +2,7 @@
* routines for time statistics
* Copyrigth 2003 Lars Roland
*
- * $Id: timestats.c,v 1.2 2003/09/03 10:10:17 sahlberg Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/timestats.h b/timestats.h
index 8f584ef173..f259859bd7 100644
--- a/timestats.h
+++ b/timestats.h
@@ -2,7 +2,7 @@
* Routines and definitions for time statistics
* Copyrigth 2003 Lars Roland
*
- * $Id: timestats.h,v 1.1 2003/04/16 07:24:04 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1012d455ba..b5f1a4da60 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
-# $Id: Makefile.am,v 1.8 2004/06/04 03:25:35 gerald Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/tools/Makefile.nmake b/tools/Makefile.nmake
index 876f8aae0f..018733d60c 100755
--- a/tools/Makefile.nmake
+++ b/tools/Makefile.nmake
@@ -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.5 2003/10/13 19:04:56 guy Exp $
+# $Id$
all: lemon
diff --git a/tools/asn2eth.py b/tools/asn2eth.py
index 88a1a30bd2..abf9faf98e 100644
--- a/tools/asn2eth.py
+++ b/tools/asn2eth.py
@@ -5,7 +5,7 @@
# ASN.1 to Ethereal dissector compiler
# 2004 Tomas Kukosa
#
-# $Id: asn2eth.py,v 1.12 2004/06/26 09:56:22 guy Exp $
+# $Id$
#
"""ASN.1 to Ethereal dissector compiler"""
diff --git a/tools/cvsdiff-fix.py b/tools/cvsdiff-fix.py
index 91a648a4bd..17b5fc3be3 100755
--- a/tools/cvsdiff-fix.py
+++ b/tools/cvsdiff-fix.py
@@ -6,7 +6,7 @@
# recursive diff, and unflattens it so that it can be
# applied correctly with "patch".
#
-# $Id: cvsdiff-fix.py,v 1.3 2003/06/11 14:48:27 gram Exp $
+# $Id$
#
# Copyright (C) 2001 by Gilbert Ramirez <gram@alumni.rice.edu>
#
diff --git a/tools/dfilter-test.py b/tools/dfilter-test.py
index ab999ddfe6..9dcae85dbc 100755
--- a/tools/dfilter-test.py
+++ b/tools/dfilter-test.py
@@ -4,7 +4,7 @@ Test-suite to test ethereal's dfilter mechanism.
"""
#
-# $Id: dfilter-test.py,v 1.4 2004/02/22 03:04:41 gram Exp $
+# $Id$
#
# Copyright (C) 2003 by Gilbert Ramirez <gram@alumni.rice.edu>
#
diff --git a/tools/lemon/Makefile.am b/tools/lemon/Makefile.am
index 40b6e9348f..fc6d2f0810 100644
--- a/tools/lemon/Makefile.am
+++ b/tools/lemon/Makefile.am
@@ -1,6 +1,6 @@
# Makefile.am
#
-# $Id: Makefile.am,v 1.3 2001/02/27 20:34:09 gram Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
diff --git a/tools/lemon/Makefile.nmake b/tools/lemon/Makefile.nmake
index ed61d9776a..bbbc7244b8 100644
--- a/tools/lemon/Makefile.nmake
+++ b/tools/lemon/Makefile.nmake
@@ -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.9 2003/10/10 21:31:53 guy Exp $
+# $Id$
include ..\..\config.nmake
diff --git a/tools/lemon/README b/tools/lemon/README
index 52ce8b4c54..f8692bf62a 100644
--- a/tools/lemon/README
+++ b/tools/lemon/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.1 2001/02/01 20:21:25 gram Exp $
+$Id$
The Lemon Parser Generator's home page is:
diff --git a/tools/lemon/cppmagic.h b/tools/lemon/cppmagic.h
index c3f448ec41..7efd066acc 100644
--- a/tools/lemon/cppmagic.h
+++ b/tools/lemon/cppmagic.h
@@ -1,4 +1,4 @@
-/* $Id: cppmagic.h,v 1.1 2001/02/27 20:34:09 gram Exp $ */
+/* $Id$ */
/**************************************** CPP definitions ***************/
diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c
index ddb18a3c0e..89dc2c1329 100644
--- a/tools/lemon/lemon.c
+++ b/tools/lemon/lemon.c
@@ -25,7 +25,7 @@
** drh@acm.org
** http://www.hwaci.com/drh/
**
-** $Id: lemon.c,v 1.17 2004/01/25 09:49:50 jmayer Exp $
+** $Id$
*/
#include <stdio.h>
#include <stdarg.h>
diff --git a/tools/lemon/lemonflex-head.inc b/tools/lemon/lemonflex-head.inc
index 0387b03b4c..194579ff26 100644
--- a/tools/lemon/lemonflex-head.inc
+++ b/tools/lemon/lemonflex-head.inc
@@ -1,4 +1,4 @@
-/* $Id: lemonflex-head.inc,v 1.1 2001/02/01 20:21:25 gram Exp $ */
+/* $Id$ */
/* This file is #include'd at the top of a Lex/Flex scanner
for use with the Lemon parser. You must have #define'd:
diff --git a/tools/lemon/lemonflex-tail.inc b/tools/lemon/lemonflex-tail.inc
index e71ac723e7..580b8cc839 100644
--- a/tools/lemon/lemonflex-tail.inc
+++ b/tools/lemon/lemonflex-tail.inc
@@ -1,4 +1,4 @@
-/* $Id: lemonflex-tail.inc,v 1.2 2004/04/25 04:53:42 gram Exp $ */
+/* $Id$ */
/* This file is #include'd at the bottom of a Lex/Flex scanner
for use with the Lemon parser. You must have #define'd:
diff --git a/ui_util.h b/ui_util.h
index 9ceea0583d..e03badfaed 100644
--- a/ui_util.h
+++ b/ui_util.h
@@ -1,7 +1,7 @@
/* ui_util.h
* Definitions for UI utility routines
*
- * $Id: ui_util.h,v 1.16 2004/01/22 18:13:56 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/util.c b/util.c
index 29777962e0..e4ab33b75c 100644
--- a/util.c
+++ b/util.c
@@ -1,7 +1,7 @@
/* util.c
* Utility routines
*
- * $Id: util.c,v 1.81 2004/06/25 07:00:54 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/util.h b/util.h
index 6b03bd6125..9f87a0f97b 100644
--- a/util.h
+++ b/util.h
@@ -1,7 +1,7 @@
/* util.h
* Utility definitions
*
- * $Id: util.h,v 1.32 2004/05/10 22:20:24 obiot Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/version_info.c b/version_info.c
index 374814eda7..db2e1e2ebe 100644
--- a/version_info.c
+++ b/version_info.c
@@ -1,7 +1,7 @@
/* version_info.c
* Routines to report version information for stuff used by Ethereal
*
- * $Id: version_info.c,v 1.4 2004/05/22 04:15:01 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/version_info.h b/version_info.h
index 7b81e6b7fc..bcba136d2c 100644
--- a/version_info.h
+++ b/version_info.h
@@ -2,7 +2,7 @@
* Declarations of outines to report version information for stuff used
* by Ethereal
*
- * $Id: version_info.h,v 1.1 2004/01/11 22:17:43 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/wiretap/5views.c b/wiretap/5views.c
index 43b533c7e6..8e9cc877d1 100644
--- a/wiretap/5views.c
+++ b/wiretap/5views.c
@@ -1,6 +1,6 @@
/* 5views.c
*
- * $Id: 5views.c,v 1.5 2004/03/03 22:24:50 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/5views.h b/wiretap/5views.h
index 69f84f2675..bc4a9df842 100644
--- a/wiretap/5views.h
+++ b/wiretap/5views.h
@@ -1,6 +1,6 @@
/* 5views.h
*
- * $Id: 5views.h,v 1.2 2004/01/25 21:55:12 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index fdf0a8f6dd..1c25e50d98 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Wiretap
#
-# $Id: Makefile.am,v 1.52 2004/03/24 21:27:44 obiot Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index 8ad4d10ae2..98644e9ccb 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.40 2004/02/11 20:05:15 guy Exp $
+# $Id$
#
include ..\config.nmake
diff --git a/wiretap/README b/wiretap/README
index 1aa6fa0c8b..e451d6a383 100644
--- a/wiretap/README
+++ b/wiretap/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.30 2002/05/22 10:53:17 sahlberg Exp $
+$Id$
Wiretap is a library that is being developed as a future replacement for
libpcap, the current standard Unix library for packet capturing. Libpcap
diff --git a/wiretap/README.developer b/wiretap/README.developer
index 238df5f8bc..457038ff78 100644
--- a/wiretap/README.developer
+++ b/wiretap/README.developer
@@ -1,4 +1,4 @@
-$Id: README.developer,v 1.2 2003/09/24 23:53:11 guy Exp $
+$Id$
This is a very quick and very dirty guide to adding support for new
capture file formats. If you see any errors or have any improvements,
diff --git a/wiretap/acinclude.m4 b/wiretap/acinclude.m4
index 054718d3ff..52f1299d1c 100644
--- a/wiretap/acinclude.m4
+++ b/wiretap/acinclude.m4
@@ -2,7 +2,7 @@ dnl Macros that test for specific features.
dnl This file is part of the Autoconf packaging for Ethereal.
dnl Copyright (C) 1998-2000 by Gerald Combs.
dnl
-dnl $Id: acinclude.m4,v 1.19 2004/03/27 12:07:57 jmayer Exp $
+dnl $Id$
dnl
#
diff --git a/wiretap/airopeek9.c b/wiretap/airopeek9.c
index 7d8be7563d..7cf4f97475 100644
--- a/wiretap/airopeek9.c
+++ b/wiretap/airopeek9.c
@@ -1,7 +1,7 @@
/* airopeek9.c
* Routines for opening EtherPeek and AiroPeek V9 files
*
- * $Id: airopeek9.c,v 1.12 2004/03/03 22:24:50 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/airopeek9.h b/wiretap/airopeek9.h
index f7ad4bd820..7726537d03 100644
--- a/wiretap/airopeek9.h
+++ b/wiretap/airopeek9.h
@@ -1,6 +1,6 @@
/* airopeek9.h
*
- * $Id: airopeek9.h,v 1.2 2004/01/25 21:55:12 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/ascend-grammar.y b/wiretap/ascend-grammar.y
index fd0e776567..323b5c497d 100644
--- a/wiretap/ascend-grammar.y
+++ b/wiretap/ascend-grammar.y
@@ -1,7 +1,7 @@
%{
/* ascend-grammar.y
*
- * $Id: ascend-grammar.y,v 1.26 2004/01/25 21:55:12 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/ascend-int.h b/wiretap/ascend-int.h
index 9a506a0e0d..137984cf5f 100644
--- a/wiretap/ascend-int.h
+++ b/wiretap/ascend-int.h
@@ -2,7 +2,7 @@
* Definitions for routines common to multiple modules in the Lucent/Ascend
* capture file reading code code, but not used outside that code.
*
- * $Id: ascend-int.h,v 1.11 2004/01/25 21:55:12 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/wiretap/ascend-scanner.l b/wiretap/ascend-scanner.l
index c5b9e55d10..0f3658f6b8 100644
--- a/wiretap/ascend-scanner.l
+++ b/wiretap/ascend-scanner.l
@@ -1,7 +1,7 @@
%{
/* ascend-scanner.l
*
- * $Id: ascend-scanner.l,v 1.27 2004/01/06 20:05:39 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/ascend.c b/wiretap/ascend.c
index 0fb002c00d..73c2202b74 100644
--- a/wiretap/ascend.c
+++ b/wiretap/ascend.c
@@ -1,6 +1,6 @@
/* ascend.c
*
- * $Id: ascend.c,v 1.33 2004/03/03 22:24:51 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/ascend.h b/wiretap/ascend.h
index 4f462957fd..9e493ab36c 100644
--- a/wiretap/ascend.h
+++ b/wiretap/ascend.h
@@ -1,6 +1,6 @@
/* ascend.h
*
- * $Id: ascend.h,v 1.10 2004/01/25 21:55:12 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/atm.c b/wiretap/atm.c
index 180cab0483..fb730b7c19 100644
--- a/wiretap/atm.c
+++ b/wiretap/atm.c
@@ -1,6 +1,6 @@
/* atm.c
*
- * $Id: atm.c,v 1.3 2002/08/28 20:30:44 jmayer Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/atm.h b/wiretap/atm.h
index a405130d3d..a74eb4245a 100644
--- a/wiretap/atm.h
+++ b/wiretap/atm.h
@@ -1,6 +1,6 @@
/* atm.h
*
- * $Id: atm.h,v 1.3 2002/08/28 20:30:44 jmayer Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/buffer.c b/wiretap/buffer.c
index 3b1a088057..f86c6457f5 100644
--- a/wiretap/buffer.c
+++ b/wiretap/buffer.c
@@ -1,6 +1,6 @@
/* buffer.c
*
- * $Id: buffer.c,v 1.14 2002/08/28 20:30:44 jmayer Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/buffer.h b/wiretap/buffer.h
index b28eebf205..0dd47d5851 100644
--- a/wiretap/buffer.h
+++ b/wiretap/buffer.h
@@ -1,6 +1,6 @@
/* buffer.h
*
- * $Id: buffer.h,v 1.11 2002/08/28 20:30:44 jmayer Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/config.h.win32 b/wiretap/config.h.win32
index 5ef85cee30..2ed6192394 100644
--- a/wiretap/config.h.win32
+++ b/wiretap/config.h.win32
@@ -1,4 +1,4 @@
-/* $Id: config.h.win32,v 1.11 2003/11/07 23:27:13 guy Exp $ */
+/* $Id$ */
/* config.h.win32 Generated manually. :-) */
/* config.h. Generated automatically by configure. */
/* config.h.in. Generated automatically from configure.in by autoheader. */
diff --git a/wiretap/configure.in b/wiretap/configure.in
index 7a5ca2b7b0..adc3141478 100644
--- a/wiretap/configure.in
+++ b/wiretap/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.58 2004/06/01 00:15:38 jmayer Exp $
+# $Id$
#
AC_INIT(wtap.c)
diff --git a/wiretap/cosine.c b/wiretap/cosine.c
index eb3bbb70cb..c17171ea69 100644
--- a/wiretap/cosine.c
+++ b/wiretap/cosine.c
@@ -1,6 +1,6 @@
/* cosine.c
*
- * $Id: cosine.c,v 1.10 2004/03/03 22:24:51 guy Exp $
+ * $Id$
*
* CoSine IPNOS L2 debug output parsing
* Copyright (c) 2002 by Motonori Shindo <mshindo@mshindo.net>
diff --git a/wiretap/cosine.h b/wiretap/cosine.h
index db74316c9d..559ac21e2c 100644
--- a/wiretap/cosine.h
+++ b/wiretap/cosine.h
@@ -1,6 +1,6 @@
/* cosine.h
*
- * $Id: cosine.h,v 1.3 2004/01/25 21:55:12 guy Exp $
+ * $Id$
*
* CoSine IPNOS L2 debug output parsing
* Copyright (c) 2002 by Motonori Shindo <mshindo@mshindo.net>
diff --git a/wiretap/csids.c b/wiretap/csids.c
index be747386dc..cfe1ce7a65 100644
--- a/wiretap/csids.c
+++ b/wiretap/csids.c
@@ -1,6 +1,6 @@
/* csids.c
*
- * $Id: csids.c,v 1.17 2004/03/03 22:24:51 guy Exp $
+ * $Id$
*
* Copyright (c) 2000 by Mike Hall <mlh@io.com>
* Copyright (c) 2000 by Cisco Systems
diff --git a/wiretap/csids.h b/wiretap/csids.h
index 00fbf69ab9..ddd7cf9e60 100644
--- a/wiretap/csids.h
+++ b/wiretap/csids.h
@@ -1,6 +1,6 @@
/* csids.h
*
- * $Id: csids.h,v 1.4 2004/01/25 21:55:13 guy Exp $
+ * $Id$
*
* Copyright (c) 2000 by Mike Hall <mlh@io.com>
* Copyright (c) Cisco Systems
diff --git a/wiretap/dbs-etherwatch.c b/wiretap/dbs-etherwatch.c
index d247112b5e..4baff3a339 100644
--- a/wiretap/dbs-etherwatch.c
+++ b/wiretap/dbs-etherwatch.c
@@ -1,6 +1,6 @@
/* dbs-etherwatch.c
*
- * $Id: dbs-etherwatch.c,v 1.17 2004/03/03 22:24:51 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 2001 by Marc Milgram <ethereal@mmilgram.NOSPAMmail.net>
diff --git a/wiretap/dbs-etherwatch.h b/wiretap/dbs-etherwatch.h
index 5a6ecb836a..ba122efd87 100644
--- a/wiretap/dbs-etherwatch.h
+++ b/wiretap/dbs-etherwatch.h
@@ -1,6 +1,6 @@
/* dbs-etherwatch.h
*
- * $Id: dbs-etherwatch.h,v 1.5 2004/01/25 21:55:13 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/erf.c b/wiretap/erf.c
index 777b860f2c..29715d5c07 100644
--- a/wiretap/erf.c
+++ b/wiretap/erf.c
@@ -32,7 +32,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
-* $Id: erf.c,v 1.7 2004/01/25 21:55:13 guy Exp $
+* $Id$
*/
/*
diff --git a/wiretap/erf.h b/wiretap/erf.h
index 2c1e404de1..0b99fbc80d 100644
--- a/wiretap/erf.h
+++ b/wiretap/erf.h
@@ -32,7 +32,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
-* $Id: erf.h,v 1.2 2004/01/25 21:55:13 guy Exp $
+* $Id$
*/
#ifndef __W_ERF_H__
diff --git a/wiretap/etherpeek.c b/wiretap/etherpeek.c
index 18decfa48a..7967df2f90 100644
--- a/wiretap/etherpeek.c
+++ b/wiretap/etherpeek.c
@@ -3,7 +3,7 @@
* and V7 files
* Copyright (c) 2001, Daniel Thompson <d.thompson@gmx.net>
*
- * $Id: etherpeek.c,v 1.29 2004/03/03 22:24:51 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/etherpeek.h b/wiretap/etherpeek.h
index 7d28a0abad..02cf750df2 100644
--- a/wiretap/etherpeek.h
+++ b/wiretap/etherpeek.h
@@ -1,6 +1,6 @@
/* etherpeek.h
*
- * $Id: etherpeek.h,v 1.4 2004/01/25 21:55:13 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c
index 7320d8edff..90a2ad39b6 100644
--- a/wiretap/eyesdn.c
+++ b/wiretap/eyesdn.c
@@ -1,6 +1,6 @@
/* eyesdn.c
*
- * $Id: eyesdn.c,v 1.8 2004/04/02 07:40:37 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/eyesdn.h b/wiretap/eyesdn.h
index 8535809c90..63b6cbaf59 100644
--- a/wiretap/eyesdn.h
+++ b/wiretap/eyesdn.h
@@ -1,6 +1,6 @@
/* eyesdn.h
*
- * $Id: eyesdn.h,v 1.1 2004/02/11 20:05:16 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 55bdf7429a..71a73b2e90 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -1,6 +1,6 @@
/* file_access.c
*
- * $Id: file_access.c,v 1.14 2004/06/30 06:58:59 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c
index 223e55fbe8..eda7717a3c 100644
--- a/wiretap/file_wrappers.c
+++ b/wiretap/file_wrappers.c
@@ -1,6 +1,6 @@
/* file_wrappers.c
*
- * $Id: file_wrappers.c,v 1.12 2002/08/28 20:30:44 jmayer Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h
index 4950c5f59b..ef88fd0896 100644
--- a/wiretap/file_wrappers.h
+++ b/wiretap/file_wrappers.h
@@ -1,6 +1,6 @@
/* file_wrappers.h
*
- * $Id: file_wrappers.h,v 1.10 2002/08/28 20:30:44 jmayer Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/hcidump.c b/wiretap/hcidump.c
index f1d59d2774..d9c5718999 100644
--- a/wiretap/hcidump.c
+++ b/wiretap/hcidump.c
@@ -1,6 +1,6 @@
/* hcidump.c
*
- * $Id: hcidump.c,v 1.4 2004/03/03 22:24:51 guy Exp $
+ * $Id$
*
* Copyright (c) 2003 by Marcel Holtmann <marcel@holtmann.org>
*
diff --git a/wiretap/hcidump.h b/wiretap/hcidump.h
index e1d0b0c4de..fa187cba1a 100644
--- a/wiretap/hcidump.h
+++ b/wiretap/hcidump.h
@@ -1,6 +1,6 @@
/* hcidump.h
*
- * $Id: hcidump.h,v 1.2 2004/01/25 21:55:14 guy Exp $
+ * $Id$
*
* Copyright (c) 2003 by Marcel Holtmann <marcel@holtmann.org>
*
diff --git a/wiretap/i4b_trace.h b/wiretap/i4b_trace.h
index 1990be1c86..2e3fd636c1 100644
--- a/wiretap/i4b_trace.h
+++ b/wiretap/i4b_trace.h
@@ -27,7 +27,7 @@
* i4b_trace.h - header file for trace data read device
* ----------------------------------------------------
*
- * $Id: i4b_trace.h,v 1.3 2002/08/28 20:30:44 jmayer Exp $
+ * $Id$
*
* last edit-date: [Sun Feb 14 10:39:26 1999]
*
diff --git a/wiretap/i4btrace.c b/wiretap/i4btrace.c
index 076618543e..04a9fe7f2c 100644
--- a/wiretap/i4btrace.c
+++ b/wiretap/i4btrace.c
@@ -1,6 +1,6 @@
/* i4btrace.c
*
- * $Id: i4btrace.c,v 1.25 2004/01/26 21:26:52 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1999 by Bert Driehuis <driehuis@playbeing.org>
diff --git a/wiretap/i4btrace.h b/wiretap/i4btrace.h
index 56bbfbc7f9..6bbc32eeb5 100644
--- a/wiretap/i4btrace.h
+++ b/wiretap/i4btrace.h
@@ -1,6 +1,6 @@
/* i4btrace.h
*
- * $Id: i4btrace.h,v 1.4 2004/01/25 21:55:15 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1999 by Bert Driehuis <driehuis@playbeing.org>
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c
index e580155a62..f427cff95b 100644
--- a/wiretap/iptrace.c
+++ b/wiretap/iptrace.c
@@ -1,6 +1,6 @@
/* iptrace.c
*
- * $Id: iptrace.c,v 1.50 2004/01/25 21:55:15 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/iptrace.h b/wiretap/iptrace.h
index 617b7bc3ab..519917edd3 100644
--- a/wiretap/iptrace.h
+++ b/wiretap/iptrace.h
@@ -1,6 +1,6 @@
/* iptrace.h
*
- * $Id: iptrace.h,v 1.8 2004/01/25 21:55:15 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c
index 6f8aa3d211..00679a94fb 100644
--- a/wiretap/lanalyzer.c
+++ b/wiretap/lanalyzer.c
@@ -1,6 +1,6 @@
/* lanalyzer.c
*
- * $Id: lanalyzer.c,v 1.48 2004/07/08 07:32:39 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/lanalyzer.h b/wiretap/lanalyzer.h
index 7f597da6db..88420d2b93 100644
--- a/wiretap/lanalyzer.h
+++ b/wiretap/lanalyzer.h
@@ -1,6 +1,6 @@
/* lanalyzer.h
*
- * $Id: lanalyzer.h,v 1.9 2004/01/25 21:55:15 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index c8d2b93289..e58821a82a 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -1,6 +1,6 @@
/* libpcap.c
*
- * $Id: libpcap.c,v 1.120 2004/06/07 20:28:50 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/libpcap.h b/wiretap/libpcap.h
index 98a2c36f6d..f76b09bb98 100644
--- a/wiretap/libpcap.h
+++ b/wiretap/libpcap.h
@@ -1,6 +1,6 @@
/* libpcap.h
*
- * $Id: libpcap.h,v 1.15 2004/01/25 21:55:15 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index b6be16ce5b..61d9e5c415 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -1,6 +1,6 @@
/* netmon.c
*
- * $Id: netmon.c,v 1.69 2004/03/03 22:24:51 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/netmon.h b/wiretap/netmon.h
index d1c2659560..9310547525 100644
--- a/wiretap/netmon.h
+++ b/wiretap/netmon.h
@@ -1,6 +1,6 @@
/* netmon.h
*
- * $Id: netmon.h,v 1.12 2004/01/25 21:55:15 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/nettl.c b/wiretap/nettl.c
index f8ed03ccaf..c7aa7f18a7 100644
--- a/wiretap/nettl.c
+++ b/wiretap/nettl.c
@@ -1,6 +1,6 @@
/* nettl.c
*
- * $Id: nettl.c,v 1.36 2004/04/02 08:27:26 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/nettl.h b/wiretap/nettl.h
index 313b97ec59..5aa5a5fad9 100644
--- a/wiretap/nettl.h
+++ b/wiretap/nettl.h
@@ -1,6 +1,6 @@
/* nettl.h
*
- * $Id: nettl.h,v 1.12 2004/04/02 08:27:26 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c
index ce59a85946..4244ba0427 100644
--- a/wiretap/network_instruments.c
+++ b/wiretap/network_instruments.c
@@ -1,5 +1,5 @@
/*
- * $Id: network_instruments.c,v 1.8 2004/02/09 00:05:35 guy Exp $
+ * $Id$
*/
/***************************************************************************
diff --git a/wiretap/network_instruments.h b/wiretap/network_instruments.h
index 63c6b83302..8c6a8bbb21 100644
--- a/wiretap/network_instruments.h
+++ b/wiretap/network_instruments.h
@@ -1,5 +1,5 @@
/*
- * $Id: network_instruments.h,v 1.5 2004/01/25 21:55:16 guy Exp $
+ * $Id$
*/
/***************************************************************************
diff --git a/wiretap/netxray.c b/wiretap/netxray.c
index 2f88a4845e..b623e69f8e 100644
--- a/wiretap/netxray.c
+++ b/wiretap/netxray.c
@@ -1,6 +1,6 @@
/* netxray.c
*
- * $Id: netxray.c,v 1.90 2004/03/03 22:24:51 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/netxray.h b/wiretap/netxray.h
index 0aae12380a..eeb3319672 100644
--- a/wiretap/netxray.h
+++ b/wiretap/netxray.h
@@ -1,6 +1,6 @@
/* netxray.h
*
- * $Id: netxray.h,v 1.12 2004/01/25 21:55:16 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c
index fcabc3f20e..cceab47505 100644
--- a/wiretap/ngsniffer.c
+++ b/wiretap/ngsniffer.c
@@ -1,6 +1,6 @@
/* ngsniffer.c
*
- * $Id: ngsniffer.c,v 1.113 2004/01/25 21:55:16 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/ngsniffer.h b/wiretap/ngsniffer.h
index c861e9c4e8..7260947eeb 100644
--- a/wiretap/ngsniffer.h
+++ b/wiretap/ngsniffer.h
@@ -1,6 +1,6 @@
/* ngsniffer.h
*
- * $Id: ngsniffer.h,v 1.13 2004/01/25 21:55:16 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/pppdump.c b/wiretap/pppdump.c
index 914460c977..2f2ec0ba45 100644
--- a/wiretap/pppdump.c
+++ b/wiretap/pppdump.c
@@ -1,6 +1,6 @@
/* pppdump.c
*
- * $Id: pppdump.c,v 1.25 2004/01/25 21:55:17 guy Exp $
+ * $Id$
*
* Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
*
diff --git a/wiretap/pppdump.h b/wiretap/pppdump.h
index 49ea0eda40..9f98a9aaca 100644
--- a/wiretap/pppdump.h
+++ b/wiretap/pppdump.h
@@ -1,6 +1,6 @@
/* pppdump.h
*
- * $Id: pppdump.h,v 1.4 2004/01/25 21:55:17 guy Exp $
+ * $Id$
*
* Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
*
diff --git a/wiretap/radcom.c b/wiretap/radcom.c
index 664fc18ba8..08524b23a3 100644
--- a/wiretap/radcom.c
+++ b/wiretap/radcom.c
@@ -1,6 +1,6 @@
/* radcom.c
*
- * $Id: radcom.c,v 1.46 2004/06/16 08:11:59 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/radcom.h b/wiretap/radcom.h
index a345a0f0ff..35ee182b7f 100644
--- a/wiretap/radcom.h
+++ b/wiretap/radcom.h
@@ -1,6 +1,6 @@
/* radcom.h
*
- * $Id: radcom.h,v 1.8 2004/01/25 21:55:17 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/snoop.c b/wiretap/snoop.c
index 676f4f9d85..a19e4cd532 100644
--- a/wiretap/snoop.c
+++ b/wiretap/snoop.c
@@ -1,6 +1,6 @@
/* snoop.c
*
- * $Id: snoop.c,v 1.69 2004/03/03 22:24:52 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/snoop.h b/wiretap/snoop.h
index 7be282ab04..c52972ae10 100644
--- a/wiretap/snoop.h
+++ b/wiretap/snoop.h
@@ -1,6 +1,6 @@
/* snoop.h
*
- * $Id: snoop.h,v 1.13 2004/01/25 21:55:17 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/toshiba.c b/wiretap/toshiba.c
index 315ab9649a..1c4121aab4 100644
--- a/wiretap/toshiba.c
+++ b/wiretap/toshiba.c
@@ -1,6 +1,6 @@
/* toshiba.c
*
- * $Id: toshiba.c,v 1.29 2004/01/25 21:55:17 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/toshiba.h b/wiretap/toshiba.h
index 1dd684fb6d..314848b32b 100644
--- a/wiretap/toshiba.h
+++ b/wiretap/toshiba.h
@@ -1,6 +1,6 @@
/* toshiba.h
*
- * $Id: toshiba.h,v 1.6 2004/01/25 21:55:17 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/visual.c b/wiretap/visual.c
index 96a13be830..5725aa9375 100644
--- a/wiretap/visual.c
+++ b/wiretap/visual.c
@@ -2,7 +2,7 @@
* File read and write routines for Visual Networks cap files.
* Copyright (c) 2001, Tom Nisbet tnisbet@visualnetworks.com
*
- * $Id: visual.c,v 1.16 2004/03/03 22:24:52 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/visual.h b/wiretap/visual.h
index 7becff9bf7..9e32791234 100644
--- a/wiretap/visual.h
+++ b/wiretap/visual.h
@@ -5,7 +5,7 @@
*
* Based on the code that handles netmon files.
*
- * $Id: visual.h,v 1.6 2004/01/25 21:55:17 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/vms.c b/wiretap/vms.c
index 27b88d33ad..a43b280cbc 100644
--- a/wiretap/vms.c
+++ b/wiretap/vms.c
@@ -1,6 +1,6 @@
/* vms.c
*
- * $Id: vms.c,v 1.23 2004/03/03 22:24:53 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 2001 by Marc Milgram <ethereal@mmilgram.NOSPAMmail.net>
diff --git a/wiretap/vms.h b/wiretap/vms.h
index 23cfdf3fab..66bbd68104 100644
--- a/wiretap/vms.h
+++ b/wiretap/vms.h
@@ -1,6 +1,6 @@
/* vms.h
*
- * $Id: vms.h,v 1.3 2004/01/25 21:55:17 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 2001 by Marc Milgram <ethereal@mmilgram.NOSPAMmail.net>
diff --git a/wiretap/wtap-capture.h b/wiretap/wtap-capture.h
index 6354bfe46c..00a947b54f 100644
--- a/wiretap/wtap-capture.h
+++ b/wiretap/wtap-capture.h
@@ -1,6 +1,6 @@
/* wtap_capture.h
*
- * $Id: wtap-capture.h,v 1.3 2002/08/28 20:30:45 jmayer Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h
index b98a200084..62b2859dff 100644
--- a/wiretap/wtap-int.h
+++ b/wiretap/wtap-int.h
@@ -1,6 +1,6 @@
/* wtap-int.h
*
- * $Id: wtap-int.h,v 1.45 2004/02/06 20:50:44 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 3ec9d2d773..dda21fde40 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -1,6 +1,6 @@
/* wtap.c
*
- * $Id: wtap.c,v 1.94 2004/06/07 20:28:51 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/wtap.def b/wiretap/wtap.def
index 2d1b803bb2..3e847a3bba 100644
--- a/wiretap/wtap.def
+++ b/wiretap/wtap.def
@@ -1,32 +1,32 @@
-EXPORTS
-wtap_buf_ptr
-wtap_close
-wtap_dump
-wtap_dump_can_open
-wtap_dump_can_write_encap
-wtap_dump_close
-wtap_dump_fdopen
-wtap_dump_file
-wtap_dump_open
-wtap_encap_short_string
-wtap_encap_string
-wtap_fd
-wtap_file_encap
-wtap_file_type
-wtap_file_type_short_string
-wtap_file_type_string
-wtap_get_bytes_dumped
-wtap_set_bytes_dumped
-wtap_loop
-wtap_open_offline
-wtap_pcap_encap_to_wtap_encap
-wtap_phdr
-wtap_process_pcap_packet
-wtap_pseudoheader
-wtap_read
-wtap_seek_read
-wtap_sequential_close
-wtap_short_string_to_encap
-wtap_short_string_to_file_type
-wtap_snapshot_length
-wtap_strerror
+EXPORTS
+wtap_buf_ptr
+wtap_close
+wtap_dump
+wtap_dump_can_open
+wtap_dump_can_write_encap
+wtap_dump_close
+wtap_dump_fdopen
+wtap_dump_file
+wtap_dump_open
+wtap_encap_short_string
+wtap_encap_string
+wtap_fd
+wtap_file_encap
+wtap_file_type
+wtap_file_type_short_string
+wtap_file_type_string
+wtap_get_bytes_dumped
+wtap_set_bytes_dumped
+wtap_loop
+wtap_open_offline
+wtap_pcap_encap_to_wtap_encap
+wtap_phdr
+wtap_process_pcap_packet
+wtap_pseudoheader
+wtap_read
+wtap_seek_read
+wtap_sequential_close
+wtap_short_string_to_encap
+wtap_short_string_to_file_type
+wtap_snapshot_length
+wtap_strerror
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 8963045c2d..2df872017c 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -1,6 +1,6 @@
/* wtap.h
*
- * $Id: wtap.h,v 1.155 2004/06/07 20:28:51 guy Exp $
+ * $Id$
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wka.tmpl b/wka.tmpl
index fe742d5ac1..eca77c18aa 100644
--- a/wka.tmpl
+++ b/wka.tmpl
@@ -1,7 +1,7 @@
#
# Well-known addresses.
#
-# $Id: wka.tmpl,v 1.4 2004/06/18 14:27:12 jmayer Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald [AT] ethereal.com>
diff --git a/x11-fields b/x11-fields
index 3bd1487a6a..51625d953e 100644
--- a/x11-fields
+++ b/x11-fields
@@ -3,7 +3,7 @@
#
# Copyright 2000, Christophe Tronche <ch.tronche@computer.org>
#
-# $Id: x11-fields,v 1.14 2004/04/17 03:38:09 guy Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/x264_prt_id.h b/x264_prt_id.h
index b15b084c47..3cf75f352f 100644
--- a/x264_prt_id.h
+++ b/x264_prt_id.h
@@ -1,7 +1,7 @@
/* x264_prt_id.h
* Definitions of X.264/ISO 11570 transport protocol IDs
*
- * $Id: x264_prt_id.h,v 1.2 2002/08/28 21:00:41 jmayer Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/xdlc.c b/xdlc.c
index 3bdb307ada..9d3a4d7b9f 100644
--- a/xdlc.c
+++ b/xdlc.c
@@ -2,7 +2,7 @@
* Routines for use by various SDLC-derived protocols, such as HDLC
* and its derivatives LAPB, IEEE 802.2 LLC, etc..
*
- * $Id: xdlc.c,v 1.26 2004/03/04 07:51:47 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/xdlc.h b/xdlc.h
index ed94ec570f..fc924ef6ee 100644
--- a/xdlc.h
+++ b/xdlc.h
@@ -2,7 +2,7 @@
* Define *DLC frame types, and routine to dissect the control field of
* a *DLC frame.
*
- * $Id: xdlc.h,v 1.20 2004/01/18 08:32:46 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/xmlstub.c b/xmlstub.c
index 73a96ed73e..c64bdd02af 100644
--- a/xmlstub.c
+++ b/xmlstub.c
@@ -3,7 +3,7 @@
* exists so that the library can be loaded on systems that
* have it.
*
- * $Id: xmlstub.c,v 1.4 2004/04/25 10:38:24 etxrab Exp $
+ * $Id$
*
* Copyright (c) 2001 by David Frascone <dave@frascone.com>
*