aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/dissectors/format-oid.h4
-rw-r--r--epan/dissectors/packet-3com-njack.c4
-rw-r--r--epan/dissectors/packet-3com-xns.c4
-rw-r--r--epan/dissectors/packet-3g-a11.c6
-rw-r--r--epan/dissectors/packet-9p.c6
-rw-r--r--epan/dissectors/packet-MAP_DialoguePDU.c6
-rw-r--r--epan/dissectors/packet-MAP_DialoguePDU.h6
-rw-r--r--epan/dissectors/packet-aarp.c4
-rw-r--r--epan/dissectors/packet-acap.c4
-rw-r--r--epan/dissectors/packet-acp133.c6
-rw-r--r--epan/dissectors/packet-acp133.h6
-rw-r--r--epan/dissectors/packet-acse.c6
-rw-r--r--epan/dissectors/packet-acse.h6
-rw-r--r--epan/dissectors/packet-actrace.c4
-rw-r--r--epan/dissectors/packet-actrace.h4
-rw-r--r--epan/dissectors/packet-afp.c4
-rw-r--r--epan/dissectors/packet-afp.h4
-rw-r--r--epan/dissectors/packet-afs.c4
-rw-r--r--epan/dissectors/packet-afs.h4
-rw-r--r--epan/dissectors/packet-aim-admin.c6
-rw-r--r--epan/dissectors/packet-aim-adverts.c6
-rw-r--r--epan/dissectors/packet-aim-bos.c6
-rw-r--r--epan/dissectors/packet-aim-buddylist.c6
-rw-r--r--epan/dissectors/packet-aim-chat.c6
-rw-r--r--epan/dissectors/packet-aim-chatnav.c6
-rw-r--r--epan/dissectors/packet-aim-directory.c6
-rw-r--r--epan/dissectors/packet-aim-email.c6
-rw-r--r--epan/dissectors/packet-aim-generic.c6
-rw-r--r--epan/dissectors/packet-aim-icq.c6
-rw-r--r--epan/dissectors/packet-aim-invitation.c6
-rw-r--r--epan/dissectors/packet-aim-location.c4
-rw-r--r--epan/dissectors/packet-aim-messaging.c6
-rw-r--r--epan/dissectors/packet-aim-oft.c6
-rw-r--r--epan/dissectors/packet-aim-popup.c6
-rw-r--r--epan/dissectors/packet-aim-signon.c6
-rw-r--r--epan/dissectors/packet-aim-ssi.c6
-rw-r--r--epan/dissectors/packet-aim-sst.c6
-rw-r--r--epan/dissectors/packet-aim-stats.c6
-rw-r--r--epan/dissectors/packet-aim-translate.c6
-rw-r--r--epan/dissectors/packet-aim-userlookup.c6
-rw-r--r--epan/dissectors/packet-aim.c6
-rw-r--r--epan/dissectors/packet-aim.h4
-rw-r--r--epan/dissectors/packet-ajp13.c16
-rw-r--r--epan/dissectors/packet-alcap.c4
-rw-r--r--epan/dissectors/packet-alcap.h4
-rw-r--r--epan/dissectors/packet-amr.c6
-rw-r--r--epan/dissectors/packet-ans.c4
-rw-r--r--epan/dissectors/packet-ansi_637.c6
-rw-r--r--epan/dissectors/packet-ansi_683.c6
-rw-r--r--epan/dissectors/packet-ansi_801.c6
-rw-r--r--epan/dissectors/packet-ansi_a.c6
-rw-r--r--epan/dissectors/packet-ansi_a.h6
-rw-r--r--epan/dissectors/packet-ansi_map.c6
-rw-r--r--epan/dissectors/packet-ansi_map.h6
-rw-r--r--epan/dissectors/packet-aodv.c6
-rw-r--r--epan/dissectors/packet-ap1394.c4
-rw-r--r--epan/dissectors/packet-ap1394.h4
-rw-r--r--epan/dissectors/packet-app-pkix-cert.c6
-rw-r--r--epan/dissectors/packet-arcnet.c4
-rw-r--r--epan/dissectors/packet-arcnet.h4
-rw-r--r--epan/dissectors/packet-armagetronad.c4
-rw-r--r--epan/dissectors/packet-arp.c4
-rw-r--r--epan/dissectors/packet-arp.h4
-rw-r--r--epan/dissectors/packet-aruba-adp.c4
-rw-r--r--epan/dissectors/packet-asap.c6
-rw-r--r--epan/dissectors/packet-ascend.c4
-rw-r--r--epan/dissectors/packet-asf.c4
-rw-r--r--epan/dissectors/packet-atalk.c4
-rw-r--r--epan/dissectors/packet-atm.c4
-rw-r--r--epan/dissectors/packet-atm.h4
-rw-r--r--epan/dissectors/packet-auto_rp.c4
-rw-r--r--epan/dissectors/packet-ax4000.c6
-rw-r--r--epan/dissectors/packet-bacapp.c4
-rw-r--r--epan/dissectors/packet-bacapp.h4
-rw-r--r--epan/dissectors/packet-bacnet.c4
-rw-r--r--epan/dissectors/packet-beep.c2
-rw-r--r--epan/dissectors/packet-ber.c6
-rw-r--r--epan/dissectors/packet-ber.h4
-rw-r--r--epan/dissectors/packet-bfd.c6
-rw-r--r--epan/dissectors/packet-bgp.c4
-rw-r--r--epan/dissectors/packet-bgp.h4
-rw-r--r--epan/dissectors/packet-bittorrent.c4
-rw-r--r--epan/dissectors/packet-bofl.c2
-rw-r--r--epan/dissectors/packet-bootp.c4
-rw-r--r--epan/dissectors/packet-bootparams.c4
-rw-r--r--epan/dissectors/packet-bpdu.c6
-rw-r--r--epan/dissectors/packet-brdwlk.c6
-rw-r--r--epan/dissectors/packet-bssap.c6
-rw-r--r--epan/dissectors/packet-bssap.h4
-rw-r--r--epan/dissectors/packet-bssgp.c4
-rw-r--r--epan/dissectors/packet-bthci_acl.c6
-rw-r--r--epan/dissectors/packet-bthci_cmd.c8
-rw-r--r--epan/dissectors/packet-bthci_evt.c8
-rw-r--r--epan/dissectors/packet-btl2cap.c8
-rw-r--r--epan/dissectors/packet-btl2cap.h4
-rw-r--r--epan/dissectors/packet-bvlc.c6
-rw-r--r--epan/dissectors/packet-camel.c6
-rw-r--r--epan/dissectors/packet-camel.h6
-rw-r--r--epan/dissectors/packet-cast.c2
-rw-r--r--epan/dissectors/packet-catapult-dct2000.c10
-rw-r--r--epan/dissectors/packet-ccsds.c6
-rw-r--r--epan/dissectors/packet-cdp.c4
-rw-r--r--epan/dissectors/packet-cdt.c6
-rw-r--r--epan/dissectors/packet-cdt.h6
-rw-r--r--epan/dissectors/packet-cgmp.c4
-rw-r--r--epan/dissectors/packet-chdlc.c4
-rw-r--r--epan/dissectors/packet-chdlc.h4
-rw-r--r--epan/dissectors/packet-cigi.c6
-rw-r--r--epan/dissectors/packet-cimd.c4
-rw-r--r--epan/dissectors/packet-cimd.h4
-rw-r--r--epan/dissectors/packet-cip.c4
-rw-r--r--epan/dissectors/packet-cip.h4
-rw-r--r--epan/dissectors/packet-cisco-oui.c4
-rw-r--r--epan/dissectors/packet-cisco-wireless.c4
-rw-r--r--epan/dissectors/packet-clearcase.c2
-rw-r--r--epan/dissectors/packet-clearcase.h2
-rw-r--r--epan/dissectors/packet-clip.c4
-rw-r--r--epan/dissectors/packet-clip.h4
-rw-r--r--epan/dissectors/packet-clnp.c4
-rw-r--r--epan/dissectors/packet-cmip.c6
-rw-r--r--epan/dissectors/packet-cmip.h6
-rw-r--r--epan/dissectors/packet-cmp.c6
-rw-r--r--epan/dissectors/packet-cmp.h6
-rw-r--r--epan/dissectors/packet-cms.c6
-rw-r--r--epan/dissectors/packet-cms.h6
-rw-r--r--epan/dissectors/packet-cops.c8
-rw-r--r--epan/dissectors/packet-cosine.c4
-rw-r--r--epan/dissectors/packet-cpfi.c6
-rw-r--r--epan/dissectors/packet-cpha.c4
-rw-r--r--epan/dissectors/packet-crmf.c6
-rw-r--r--epan/dissectors/packet-crmf.h6
-rw-r--r--epan/dissectors/packet-csm-encaps.c4
-rw-r--r--epan/dissectors/packet-cups.c2
-rw-r--r--epan/dissectors/packet-daap.c6
-rw-r--r--epan/dissectors/packet-dap.c6
-rw-r--r--epan/dissectors/packet-dap.h6
-rw-r--r--epan/dissectors/packet-data.c4
-rw-r--r--epan/dissectors/packet-data.h6
-rw-r--r--epan/dissectors/packet-dccp.c4
-rw-r--r--epan/dissectors/packet-dccp.h4
-rw-r--r--epan/dissectors/packet-dcerpc-afs4int.c4
-rw-r--r--epan/dissectors/packet-dcerpc-atsvc.c4
-rw-r--r--epan/dissectors/packet-dcerpc-atsvc.h4
-rw-r--r--epan/dissectors/packet-dcerpc-bossvr.c4
-rw-r--r--epan/dissectors/packet-dcerpc-browser.c20
-rw-r--r--epan/dissectors/packet-dcerpc-browser.h4
-rw-r--r--epan/dissectors/packet-dcerpc-budb.c4
-rw-r--r--epan/dissectors/packet-dcerpc-budb.h4
-rw-r--r--epan/dissectors/packet-dcerpc-butc.c4
-rw-r--r--epan/dissectors/packet-dcerpc-butc.h4
-rw-r--r--epan/dissectors/packet-dcerpc-cds_clerkserver.c4
-rw-r--r--epan/dissectors/packet-dcerpc-cds_solicit.c4
-rw-r--r--epan/dissectors/packet-dcerpc-conv.c4
-rw-r--r--epan/dissectors/packet-dcerpc-cprpc_server.c4
-rw-r--r--epan/dissectors/packet-dcerpc-dce122.c4
-rw-r--r--epan/dissectors/packet-dcerpc-dce122.h4
-rw-r--r--epan/dissectors/packet-dcerpc-dcom.h4
-rw-r--r--epan/dissectors/packet-dcerpc-dfs.c4
-rw-r--r--epan/dissectors/packet-dcerpc-dfs.h4
-rw-r--r--epan/dissectors/packet-dcerpc-dnsserver.c4
-rw-r--r--epan/dissectors/packet-dcerpc-dnsserver.h4
-rw-r--r--epan/dissectors/packet-dcerpc-drsuapi.c4
-rw-r--r--epan/dissectors/packet-dcerpc-drsuapi.h4
-rw-r--r--epan/dissectors/packet-dcerpc-dssetup.c4
-rw-r--r--epan/dissectors/packet-dcerpc-dssetup.h4
-rw-r--r--epan/dissectors/packet-dcerpc-dtsprovider.c4
-rw-r--r--epan/dissectors/packet-dcerpc-dtsstime_req.c4
-rw-r--r--epan/dissectors/packet-dcerpc-efs.c4
-rw-r--r--epan/dissectors/packet-dcerpc-efs.h4
-rw-r--r--epan/dissectors/packet-dcerpc-epm.c4
-rw-r--r--epan/dissectors/packet-dcerpc-eventlog.c4
-rw-r--r--epan/dissectors/packet-dcerpc-eventlog.h4
-rw-r--r--epan/dissectors/packet-dcerpc-fldb.c4
-rw-r--r--epan/dissectors/packet-dcerpc-frsapi.c4
-rw-r--r--epan/dissectors/packet-dcerpc-frsapi.h4
-rw-r--r--epan/dissectors/packet-dcerpc-frsrpc.c4
-rw-r--r--epan/dissectors/packet-dcerpc-frsrpc.h4
-rw-r--r--epan/dissectors/packet-dcerpc-ftserver.c4
-rw-r--r--epan/dissectors/packet-dcerpc-icl_rpc.c4
-rw-r--r--epan/dissectors/packet-dcerpc-initshutdown.c4
-rw-r--r--epan/dissectors/packet-dcerpc-initshutdown.h4
-rw-r--r--epan/dissectors/packet-dcerpc-krb5rpc.c4
-rw-r--r--epan/dissectors/packet-dcerpc-llb.c4
-rw-r--r--epan/dissectors/packet-dcerpc-lsa.c14
-rw-r--r--epan/dissectors/packet-dcerpc-lsa.h4
-rw-r--r--epan/dissectors/packet-dcerpc-mapi.c10
-rw-r--r--epan/dissectors/packet-dcerpc-mapi.h4
-rw-r--r--epan/dissectors/packet-dcerpc-messenger.c4
-rw-r--r--epan/dissectors/packet-dcerpc-mgmt.c4
-rw-r--r--epan/dissectors/packet-dcerpc-ndr.c4
-rw-r--r--epan/dissectors/packet-dcerpc-netlogon.c12
-rw-r--r--epan/dissectors/packet-dcerpc-netlogon.h4
-rw-r--r--epan/dissectors/packet-dcerpc-nspi.c4
-rw-r--r--epan/dissectors/packet-dcerpc-nt.c8
-rw-r--r--epan/dissectors/packet-dcerpc-nt.h4
-rw-r--r--epan/dissectors/packet-dcerpc-pnp.c4
-rw-r--r--epan/dissectors/packet-dcerpc-pnp.h4
-rw-r--r--epan/dissectors/packet-dcerpc-rdaclif.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rep_proc.c4
-rw-r--r--epan/dissectors/packet-dcerpc-roverride.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rpriv.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rras.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rras.h4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_acct.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_attr.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_attr_schema.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_bind.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_misc.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_pgo.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_plcy.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_prop_acct.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_prop_acl.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_prop_attr.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_prop_pgo.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_prop_plcy.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_repadm.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_replist.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_repmgr.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_unix.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rsec_login.c4
-rw-r--r--epan/dissectors/packet-dcerpc-samr.c18
-rw-r--r--epan/dissectors/packet-dcerpc-samr.h4
-rw-r--r--epan/dissectors/packet-dcerpc-secidmap.c4
-rw-r--r--epan/dissectors/packet-dcerpc-spoolss.c6
-rw-r--r--epan/dissectors/packet-dcerpc-spoolss.h4
-rw-r--r--epan/dissectors/packet-dcerpc-srvsvc.c12
-rw-r--r--epan/dissectors/packet-dcerpc-srvsvc.h4
-rw-r--r--epan/dissectors/packet-dcerpc-svcctl.c4
-rw-r--r--epan/dissectors/packet-dcerpc-svcctl.h4
-rw-r--r--epan/dissectors/packet-dcerpc-tapi.c12
-rw-r--r--epan/dissectors/packet-dcerpc-tapi.h4
-rw-r--r--epan/dissectors/packet-dcerpc-tkn4int.c4
-rw-r--r--epan/dissectors/packet-dcerpc-trksvr.c4
-rw-r--r--epan/dissectors/packet-dcerpc-ubikdisk.c4
-rw-r--r--epan/dissectors/packet-dcerpc-ubikvote.c4
-rw-r--r--epan/dissectors/packet-dcerpc-update.c4
-rw-r--r--epan/dissectors/packet-dcerpc-winreg.c4
-rw-r--r--epan/dissectors/packet-dcerpc-winreg.h4
-rw-r--r--epan/dissectors/packet-dcerpc-wkssvc.c4
-rw-r--r--epan/dissectors/packet-dcerpc-wkssvc.h4
-rw-r--r--epan/dissectors/packet-dcerpc.c10
-rw-r--r--epan/dissectors/packet-dcerpc.h8
-rw-r--r--epan/dissectors/packet-dcm.c10
-rw-r--r--epan/dissectors/packet-dcom-cba-acco.c4
-rw-r--r--epan/dissectors/packet-dcom-cba-acco.h4
-rw-r--r--epan/dissectors/packet-dcom-cba.c4
-rw-r--r--epan/dissectors/packet-dcom-dispatch.c4
-rw-r--r--epan/dissectors/packet-dcom-dispatch.h4
-rw-r--r--epan/dissectors/packet-dcom-oxid.c4
-rw-r--r--epan/dissectors/packet-dcom-remact.c4
-rw-r--r--epan/dissectors/packet-dcom-remunkn.c4
-rw-r--r--epan/dissectors/packet-dcom-sysact.c4
-rw-r--r--epan/dissectors/packet-dcom.c280
-rw-r--r--epan/dissectors/packet-dcom.h4
-rw-r--r--epan/dissectors/packet-dcp.c4
-rw-r--r--epan/dissectors/packet-dcp.h4
-rw-r--r--epan/dissectors/packet-ddtp.c4
-rw-r--r--epan/dissectors/packet-ddtp.h2
-rw-r--r--epan/dissectors/packet-dec-bpdu.c4
-rw-r--r--epan/dissectors/packet-dec-dnart.c4
-rw-r--r--epan/dissectors/packet-dhcp-failover.c6
-rw-r--r--epan/dissectors/packet-dhcpv6.c4
-rw-r--r--epan/dissectors/packet-diameter.c4
-rw-r--r--epan/dissectors/packet-diffserv-mpls-common.c4
-rw-r--r--epan/dissectors/packet-diffserv-mpls-common.h4
-rw-r--r--epan/dissectors/packet-dis-enums.c4
-rw-r--r--epan/dissectors/packet-dis-enums.h4
-rw-r--r--epan/dissectors/packet-dis-fields.c4
-rw-r--r--epan/dissectors/packet-dis-fields.h4
-rw-r--r--epan/dissectors/packet-dis-pdus.c4
-rw-r--r--epan/dissectors/packet-dis-pdus.h4
-rw-r--r--epan/dissectors/packet-dis.c4
-rw-r--r--epan/dissectors/packet-disp.c6
-rw-r--r--epan/dissectors/packet-disp.h6
-rw-r--r--epan/dissectors/packet-distcc.c6
-rw-r--r--epan/dissectors/packet-dlsw.c4
-rw-r--r--epan/dissectors/packet-dnp.c6
-rw-r--r--epan/dissectors/packet-dns.c4
-rw-r--r--epan/dissectors/packet-dns.h4
-rw-r--r--epan/dissectors/packet-dop.c6
-rw-r--r--epan/dissectors/packet-dop.h6
-rw-r--r--epan/dissectors/packet-dsi.c4
-rw-r--r--epan/dissectors/packet-dsp.c6
-rw-r--r--epan/dissectors/packet-dsp.h6
-rw-r--r--epan/dissectors/packet-dtp.c4
-rw-r--r--epan/dissectors/packet-dua.c6
-rw-r--r--epan/dissectors/packet-dvmrp.c4
-rw-r--r--epan/dissectors/packet-dvmrp.h4
-rw-r--r--epan/dissectors/packet-e164.c6
-rw-r--r--epan/dissectors/packet-e164.h4
-rw-r--r--epan/dissectors/packet-e212.c6
-rw-r--r--epan/dissectors/packet-e212.h4
-rw-r--r--epan/dissectors/packet-eap.c4
-rw-r--r--epan/dissectors/packet-eapol.c4
-rw-r--r--epan/dissectors/packet-echo.c4
-rw-r--r--epan/dissectors/packet-edonkey.c4
-rw-r--r--epan/dissectors/packet-edonkey.h4
-rw-r--r--epan/dissectors/packet-eigrp.c4
-rw-r--r--epan/dissectors/packet-enc.h4
-rw-r--r--epan/dissectors/packet-enip.c6
-rw-r--r--epan/dissectors/packet-enrp.c6
-rw-r--r--epan/dissectors/packet-esis.c4
-rw-r--r--epan/dissectors/packet-esis.h2
-rw-r--r--epan/dissectors/packet-ess.c6
-rw-r--r--epan/dissectors/packet-ess.h6
-rw-r--r--epan/dissectors/packet-eth.c4
-rw-r--r--epan/dissectors/packet-eth.h4
-rw-r--r--epan/dissectors/packet-etheric.c4
-rw-r--r--epan/dissectors/packet-ethertype.c4
-rw-r--r--epan/dissectors/packet-extreme.c6
-rw-r--r--epan/dissectors/packet-fc.c6
-rw-r--r--epan/dissectors/packet-fc.h6
-rw-r--r--epan/dissectors/packet-fcbls.h4
-rw-r--r--epan/dissectors/packet-fcct.c6
-rw-r--r--epan/dissectors/packet-fcct.h4
-rw-r--r--epan/dissectors/packet-fcdns.c6
-rw-r--r--epan/dissectors/packet-fcdns.h4
-rw-r--r--epan/dissectors/packet-fcels.c4
-rw-r--r--epan/dissectors/packet-fcels.h4
-rw-r--r--epan/dissectors/packet-fcfcs.c6
-rw-r--r--epan/dissectors/packet-fcfcs.h4
-rw-r--r--epan/dissectors/packet-fcfzs.c6
-rw-r--r--epan/dissectors/packet-fcfzs.h4
-rw-r--r--epan/dissectors/packet-fcip.c4
-rw-r--r--epan/dissectors/packet-fclctl.c4
-rw-r--r--epan/dissectors/packet-fclctl.h4
-rw-r--r--epan/dissectors/packet-fcp.c6
-rw-r--r--epan/dissectors/packet-fcp.h4
-rw-r--r--epan/dissectors/packet-fcsb3.c6
-rw-r--r--epan/dissectors/packet-fcsb3.h4
-rw-r--r--epan/dissectors/packet-fcsp.c4
-rw-r--r--epan/dissectors/packet-fcswils.c6
-rw-r--r--epan/dissectors/packet-fcswils.h4
-rw-r--r--epan/dissectors/packet-fddi.c4
-rw-r--r--epan/dissectors/packet-fddi.h4
-rw-r--r--epan/dissectors/packet-fix.c6
-rw-r--r--epan/dissectors/packet-fr.c6
-rw-r--r--epan/dissectors/packet-fr.h4
-rw-r--r--epan/dissectors/packet-frame.c6
-rw-r--r--epan/dissectors/packet-frame.h6
-rw-r--r--epan/dissectors/packet-ftam.c6
-rw-r--r--epan/dissectors/packet-ftam.h6
-rw-r--r--epan/dissectors/packet-ftbp.c6
-rw-r--r--epan/dissectors/packet-ftbp.h6
-rw-r--r--epan/dissectors/packet-ftp.c4
-rw-r--r--epan/dissectors/packet-fw1.c4
-rw-r--r--epan/dissectors/packet-g723.c6
-rw-r--r--epan/dissectors/packet-gift.c4
-rw-r--r--epan/dissectors/packet-giop.c8
-rw-r--r--epan/dissectors/packet-giop.h4
-rw-r--r--epan/dissectors/packet-gmrp.c8
-rw-r--r--epan/dissectors/packet-gnm.c6
-rw-r--r--epan/dissectors/packet-gnm.h6
-rw-r--r--epan/dissectors/packet-gnutella.c4
-rw-r--r--epan/dissectors/packet-gnutella.h4
-rw-r--r--epan/dissectors/packet-gprs-llc.c6
-rw-r--r--epan/dissectors/packet-gprs-ns.c6
-rw-r--r--epan/dissectors/packet-gre.c4
-rw-r--r--epan/dissectors/packet-gsm_a.c6
-rw-r--r--epan/dissectors/packet-gsm_a.h6
-rw-r--r--epan/dissectors/packet-gsm_map.c6
-rw-r--r--epan/dissectors/packet-gsm_map.h6
-rw-r--r--epan/dissectors/packet-gsm_sms.c6
-rw-r--r--epan/dissectors/packet-gsm_sms.h4
-rw-r--r--epan/dissectors/packet-gsm_sms_ud.c6
-rw-r--r--epan/dissectors/packet-gsm_ss.c6
-rw-r--r--epan/dissectors/packet-gsm_ss.h6
-rw-r--r--epan/dissectors/packet-gssapi.c4
-rw-r--r--epan/dissectors/packet-gssapi.h4
-rw-r--r--epan/dissectors/packet-gtp.c4
-rw-r--r--epan/dissectors/packet-gvrp.c8
-rw-r--r--epan/dissectors/packet-h1.c4
-rw-r--r--epan/dissectors/packet-h221_nonstd.c4
-rw-r--r--epan/dissectors/packet-h225.c6
-rw-r--r--epan/dissectors/packet-h225.h8
-rw-r--r--epan/dissectors/packet-h235.c6
-rw-r--r--epan/dissectors/packet-h235.h6
-rw-r--r--epan/dissectors/packet-h245.c6
-rw-r--r--epan/dissectors/packet-h245.h6
-rw-r--r--epan/dissectors/packet-h248.c6
-rw-r--r--epan/dissectors/packet-h248.h6
-rw-r--r--epan/dissectors/packet-h248_package_bcp.c6
-rw-r--r--epan/dissectors/packet-h248_package_bcp.h6
-rw-r--r--epan/dissectors/packet-h261.c4
-rw-r--r--epan/dissectors/packet-h263.c4
-rw-r--r--epan/dissectors/packet-h450.c6
-rw-r--r--epan/dissectors/packet-h450.h6
-rw-r--r--epan/dissectors/packet-hci_h4.c6
-rw-r--r--epan/dissectors/packet-hci_h4.h4
-rw-r--r--epan/dissectors/packet-hclnfsd.c4
-rw-r--r--epan/dissectors/packet-hclnfsd.h2
-rw-r--r--epan/dissectors/packet-hpext.c4
-rw-r--r--epan/dissectors/packet-hpext.h4
-rw-r--r--epan/dissectors/packet-hpsw.c4
-rw-r--r--epan/dissectors/packet-hsrp.c4
-rw-r--r--epan/dissectors/packet-http.c4
-rw-r--r--epan/dissectors/packet-http.h4
-rw-r--r--epan/dissectors/packet-hyperscsi.c4
-rw-r--r--epan/dissectors/packet-iapp.c6
-rw-r--r--epan/dissectors/packet-iax2.c10
-rw-r--r--epan/dissectors/packet-ib.c6
-rw-r--r--epan/dissectors/packet-icap.c4
-rw-r--r--epan/dissectors/packet-icep.c6
-rw-r--r--epan/dissectors/packet-icmpv6.c4
-rw-r--r--epan/dissectors/packet-icp.c4
-rw-r--r--epan/dissectors/packet-icq.c4
-rw-r--r--epan/dissectors/packet-idp.c4
-rw-r--r--epan/dissectors/packet-idp.h4
-rw-r--r--epan/dissectors/packet-ieee80211.c4
-rw-r--r--epan/dissectors/packet-ieee80211.h4
-rw-r--r--epan/dissectors/packet-ieee8023.c4
-rw-r--r--epan/dissectors/packet-ieee8023.h2
-rw-r--r--epan/dissectors/packet-ieee802a.c4
-rw-r--r--epan/dissectors/packet-ieee802a.h4
-rw-r--r--epan/dissectors/packet-ifcp.c4
-rw-r--r--epan/dissectors/packet-igap.c4
-rw-r--r--epan/dissectors/packet-igap.h4
-rw-r--r--epan/dissectors/packet-igmp.c4
-rw-r--r--epan/dissectors/packet-igmp.h4
-rw-r--r--epan/dissectors/packet-igrp.c6
-rw-r--r--epan/dissectors/packet-image-gif.c6
-rw-r--r--epan/dissectors/packet-image-jfif.c6
-rw-r--r--epan/dissectors/packet-imap.c4
-rw-r--r--epan/dissectors/packet-inap.c6
-rw-r--r--epan/dissectors/packet-inap.h6
-rw-r--r--epan/dissectors/packet-ip.c4
-rw-r--r--epan/dissectors/packet-ip.h4
-rw-r--r--epan/dissectors/packet-ipdc.c4
-rw-r--r--epan/dissectors/packet-ipdc.h4
-rw-r--r--epan/dissectors/packet-ipfc.c6
-rw-r--r--epan/dissectors/packet-ipfc.h4
-rw-r--r--epan/dissectors/packet-ipmi.c4
-rw-r--r--epan/dissectors/packet-ipp.c4
-rw-r--r--epan/dissectors/packet-ipsec.c4
-rw-r--r--epan/dissectors/packet-ipsec.h2
-rw-r--r--epan/dissectors/packet-ipv6.c4
-rw-r--r--epan/dissectors/packet-ipv6.h4
-rw-r--r--epan/dissectors/packet-ipvs-syncd.c4
-rw-r--r--epan/dissectors/packet-ipx.c6
-rw-r--r--epan/dissectors/packet-ipx.h4
-rw-r--r--epan/dissectors/packet-ipxwan.c4
-rw-r--r--epan/dissectors/packet-irc.c4
-rw-r--r--epan/dissectors/packet-isakmp.c4
-rw-r--r--epan/dissectors/packet-isakmp.h4
-rw-r--r--epan/dissectors/packet-iscsi.c6
-rw-r--r--epan/dissectors/packet-isdn.c4
-rw-r--r--epan/dissectors/packet-isis-clv.c4
-rw-r--r--epan/dissectors/packet-isis-clv.h4
-rw-r--r--epan/dissectors/packet-isis-hello.c4
-rw-r--r--epan/dissectors/packet-isis-hello.h4
-rw-r--r--epan/dissectors/packet-isis-lsp.c4
-rw-r--r--epan/dissectors/packet-isis-lsp.h4
-rw-r--r--epan/dissectors/packet-isis-snp.c4
-rw-r--r--epan/dissectors/packet-isis-snp.h4
-rw-r--r--epan/dissectors/packet-isis.c4
-rw-r--r--epan/dissectors/packet-isis.h4
-rw-r--r--epan/dissectors/packet-isl.c4
-rw-r--r--epan/dissectors/packet-isl.h4
-rw-r--r--epan/dissectors/packet-ismp.c6
-rw-r--r--epan/dissectors/packet-isns.c8
-rw-r--r--epan/dissectors/packet-isup.c6
-rw-r--r--epan/dissectors/packet-isup.h6
-rw-r--r--epan/dissectors/packet-isup_thin.c6
-rw-r--r--epan/dissectors/packet-iua.c6
-rw-r--r--epan/dissectors/packet-iuup.c4
-rw-r--r--epan/dissectors/packet-jabber.c4
-rw-r--r--epan/dissectors/packet-juniper.c4
-rw-r--r--epan/dissectors/packet-jxta.c4
-rw-r--r--epan/dissectors/packet-jxta.h4
-rw-r--r--epan/dissectors/packet-k12.c4
-rw-r--r--epan/dissectors/packet-kadm5.c4
-rw-r--r--epan/dissectors/packet-kerberos.c8
-rw-r--r--epan/dissectors/packet-kerberos.h4
-rw-r--r--epan/dissectors/packet-kerberos4.c4
-rw-r--r--epan/dissectors/packet-kink.c4
-rw-r--r--epan/dissectors/packet-klm.c4
-rw-r--r--epan/dissectors/packet-klm.h4
-rw-r--r--epan/dissectors/packet-kpasswd.c4
-rw-r--r--epan/dissectors/packet-l2tp.c4
-rw-r--r--epan/dissectors/packet-lapb.c4
-rw-r--r--epan/dissectors/packet-lapbether.c4
-rw-r--r--epan/dissectors/packet-lapd.c4
-rw-r--r--epan/dissectors/packet-laplink.c6
-rw-r--r--epan/dissectors/packet-ldap.c10
-rw-r--r--epan/dissectors/packet-ldap.h6
-rw-r--r--epan/dissectors/packet-ldp.c4
-rw-r--r--epan/dissectors/packet-ldp.h4
-rw-r--r--epan/dissectors/packet-lge_monitor.c4
-rw-r--r--epan/dissectors/packet-llc.c4
-rw-r--r--epan/dissectors/packet-llc.h4
-rw-r--r--epan/dissectors/packet-lldp.c6
-rw-r--r--epan/dissectors/packet-lmi.c4
-rw-r--r--epan/dissectors/packet-lmp.c4
-rw-r--r--epan/dissectors/packet-logotypecertextn.c6
-rw-r--r--epan/dissectors/packet-logotypecertextn.h6
-rw-r--r--epan/dissectors/packet-loop.c4
-rw-r--r--epan/dissectors/packet-lpd.c4
-rw-r--r--epan/dissectors/packet-lwapp.c4
-rw-r--r--epan/dissectors/packet-m2pa.c6
-rw-r--r--epan/dissectors/packet-m2tp.c6
-rw-r--r--epan/dissectors/packet-m2ua.c6
-rw-r--r--epan/dissectors/packet-m3ua.c8
-rw-r--r--epan/dissectors/packet-maccontrol.c4
-rw-r--r--epan/dissectors/packet-manolito.c6
-rw-r--r--epan/dissectors/packet-mbtcp.c6
-rw-r--r--epan/dissectors/packet-mdshdr.c8
-rw-r--r--epan/dissectors/packet-media.c4
-rw-r--r--epan/dissectors/packet-mip.c6
-rw-r--r--epan/dissectors/packet-mip6.c6
-rw-r--r--epan/dissectors/packet-mip6.h4
-rw-r--r--epan/dissectors/packet-mms.c6
-rw-r--r--epan/dissectors/packet-mms.h6
-rw-r--r--epan/dissectors/packet-mmse.c6
-rw-r--r--epan/dissectors/packet-mount.c4
-rw-r--r--epan/dissectors/packet-mpeg1.c4
-rw-r--r--epan/dissectors/packet-mpls-echo.c6
-rw-r--r--epan/dissectors/packet-mpls.c4
-rw-r--r--epan/dissectors/packet-mpls.h4
-rw-r--r--epan/dissectors/packet-mq-pcf.c4
-rw-r--r--epan/dissectors/packet-mq.c4
-rw-r--r--epan/dissectors/packet-mq.h4
-rw-r--r--epan/dissectors/packet-mrdisc.c4
-rw-r--r--epan/dissectors/packet-mrdisc.h4
-rw-r--r--epan/dissectors/packet-ms-mms.c4
-rw-r--r--epan/dissectors/packet-msdp.c4
-rw-r--r--epan/dissectors/packet-msn-messenger.c4
-rw-r--r--epan/dissectors/packet-msnip.c4
-rw-r--r--epan/dissectors/packet-msnip.h4
-rw-r--r--epan/dissectors/packet-msnlb.c4
-rw-r--r--epan/dissectors/packet-msproxy.c4
-rw-r--r--epan/dissectors/packet-msrp.c6
-rw-r--r--epan/dissectors/packet-mtp2.c4
-rw-r--r--epan/dissectors/packet-mtp3.c4
-rw-r--r--epan/dissectors/packet-mtp3.h6
-rw-r--r--epan/dissectors/packet-mtp3mg.c4
-rw-r--r--epan/dissectors/packet-multipart.c6
-rw-r--r--epan/dissectors/packet-mysql.c6
-rw-r--r--epan/dissectors/packet-nbap.c6
-rw-r--r--epan/dissectors/packet-nbap.h8
-rw-r--r--epan/dissectors/packet-nbipx.c6
-rw-r--r--epan/dissectors/packet-nbns.c4
-rw-r--r--epan/dissectors/packet-ncp-int.h4
-rw-r--r--epan/dissectors/packet-ncp-nmas.c4
-rw-r--r--epan/dissectors/packet-ncp-nmas.h4
-rw-r--r--epan/dissectors/packet-ncp-sss.c4
-rw-r--r--epan/dissectors/packet-ncp-sss.h4
-rw-r--r--epan/dissectors/packet-ncp.c6
-rw-r--r--epan/dissectors/packet-ncs.c4
-rw-r--r--epan/dissectors/packet-ndmp.c4
-rw-r--r--epan/dissectors/packet-ndps.c8
-rw-r--r--epan/dissectors/packet-ndps.h4
-rw-r--r--epan/dissectors/packet-netbios.c4
-rw-r--r--epan/dissectors/packet-netbios.h4
-rw-r--r--epan/dissectors/packet-netflow.c2
-rw-r--r--epan/dissectors/packet-netsync.c4
-rw-r--r--epan/dissectors/packet-nettl.c6
-rw-r--r--epan/dissectors/packet-nfs.c4
-rw-r--r--epan/dissectors/packet-nfsacl.c4
-rw-r--r--epan/dissectors/packet-nfsauth.c4
-rw-r--r--epan/dissectors/packet-nhrp.c4
-rw-r--r--epan/dissectors/packet-nhrp.h4
-rw-r--r--epan/dissectors/packet-nisplus.c4
-rw-r--r--epan/dissectors/packet-nisplus.h4
-rw-r--r--epan/dissectors/packet-nlm.c4
-rw-r--r--epan/dissectors/packet-nlsp.c4
-rw-r--r--epan/dissectors/packet-nntp.c4
-rw-r--r--epan/dissectors/packet-ns_cert_exts.c6
-rw-r--r--epan/dissectors/packet-nsip.c4
-rw-r--r--epan/dissectors/packet-nt-oui.c4
-rw-r--r--epan/dissectors/packet-nt-sonmp.c4
-rw-r--r--epan/dissectors/packet-nt-tpcp.c4
-rw-r--r--epan/dissectors/packet-ntlmssp.c4
-rw-r--r--epan/dissectors/packet-ntlmssp.h4
-rw-r--r--epan/dissectors/packet-ntp.c4
-rw-r--r--epan/dissectors/packet-ntp.h2
-rw-r--r--epan/dissectors/packet-null.c6
-rw-r--r--epan/dissectors/packet-null.h4
-rw-r--r--epan/dissectors/packet-ocsp.c6
-rw-r--r--epan/dissectors/packet-ocsp.h6
-rw-r--r--epan/dissectors/packet-oicq.c4
-rw-r--r--epan/dissectors/packet-olsr.c6
-rw-r--r--epan/dissectors/packet-osi-options.c4
-rw-r--r--epan/dissectors/packet-osi-options.h4
-rw-r--r--epan/dissectors/packet-osi.c4
-rw-r--r--epan/dissectors/packet-osi.h4
-rw-r--r--epan/dissectors/packet-ospf.c4
-rw-r--r--epan/dissectors/packet-p_mul.c4
-rw-r--r--epan/dissectors/packet-pagp.c6
-rw-r--r--epan/dissectors/packet-pcnfsd.c4
-rw-r--r--epan/dissectors/packet-pcnfsd.h2
-rw-r--r--epan/dissectors/packet-per.c4
-rw-r--r--epan/dissectors/packet-per.h4
-rw-r--r--epan/dissectors/packet-pgm.c4
-rw-r--r--epan/dissectors/packet-pgsql.c4
-rw-r--r--epan/dissectors/packet-pim.c4
-rw-r--r--epan/dissectors/packet-pim.h4
-rw-r--r--epan/dissectors/packet-pkcs1.c6
-rw-r--r--epan/dissectors/packet-pkcs1.h6
-rw-r--r--epan/dissectors/packet-pkinit.c6
-rw-r--r--epan/dissectors/packet-pkinit.h6
-rw-r--r--epan/dissectors/packet-pkix1explicit.c6
-rw-r--r--epan/dissectors/packet-pkix1explicit.h6
-rw-r--r--epan/dissectors/packet-pkix1implicit.c6
-rw-r--r--epan/dissectors/packet-pkix1implicit.h6
-rw-r--r--epan/dissectors/packet-pkixproxy.c6
-rw-r--r--epan/dissectors/packet-pkixproxy.h6
-rw-r--r--epan/dissectors/packet-pkixqualified.c6
-rw-r--r--epan/dissectors/packet-pkixqualified.h6
-rw-r--r--epan/dissectors/packet-pkixtsp.c6
-rw-r--r--epan/dissectors/packet-pkixtsp.h6
-rw-r--r--epan/dissectors/packet-pktc.c4
-rw-r--r--epan/dissectors/packet-pktc.h4
-rw-r--r--epan/dissectors/packet-pn-rt.c4
-rw-r--r--epan/dissectors/packet-pop.c4
-rw-r--r--epan/dissectors/packet-portmap.c4
-rw-r--r--epan/dissectors/packet-portmap.h2
-rw-r--r--epan/dissectors/packet-ppp.c4
-rw-r--r--epan/dissectors/packet-ppp.h4
-rw-r--r--epan/dissectors/packet-pppoe.c4
-rw-r--r--epan/dissectors/packet-pptp.c4
-rw-r--r--epan/dissectors/packet-pres.c6
-rw-r--r--epan/dissectors/packet-pres.h6
-rw-r--r--epan/dissectors/packet-prism.c4
-rw-r--r--epan/dissectors/packet-prism.h4
-rw-r--r--epan/dissectors/packet-ptp.c6
-rw-r--r--epan/dissectors/packet-pvfs2.c6
-rw-r--r--epan/dissectors/packet-q2931.c4
-rw-r--r--epan/dissectors/packet-q931.c4
-rw-r--r--epan/dissectors/packet-q931.h6
-rw-r--r--epan/dissectors/packet-q933.c4
-rw-r--r--epan/dissectors/packet-qllc.c4
-rw-r--r--epan/dissectors/packet-quake.c4
-rw-r--r--epan/dissectors/packet-quake2.c4
-rw-r--r--epan/dissectors/packet-quake3.c4
-rw-r--r--epan/dissectors/packet-quakeworld.c4
-rw-r--r--epan/dissectors/packet-radiotap.c4
-rw-r--r--epan/dissectors/packet-radiotap.h4
-rw-r--r--epan/dissectors/packet-radius.c4
-rw-r--r--epan/dissectors/packet-radius.h4
-rw-r--r--epan/dissectors/packet-radius_packetcable.c4
-rw-r--r--epan/dissectors/packet-ranap.c6
-rw-r--r--epan/dissectors/packet-ranap.h6
-rw-r--r--epan/dissectors/packet-raw.c4
-rw-r--r--epan/dissectors/packet-raw.h4
-rw-r--r--epan/dissectors/packet-rdt.c4
-rw-r--r--epan/dissectors/packet-rdt.h4
-rw-r--r--epan/dissectors/packet-redback.c4
-rw-r--r--epan/dissectors/packet-retix-bpdu.c4
-rw-r--r--epan/dissectors/packet-rip.c4
-rw-r--r--epan/dissectors/packet-ripng.c4
-rw-r--r--epan/dissectors/packet-ripng.h2
-rw-r--r--epan/dissectors/packet-rlogin.c4
-rw-r--r--epan/dissectors/packet-rmcp.c4
-rw-r--r--epan/dissectors/packet-rmi.c4
-rw-r--r--epan/dissectors/packet-rmi.h4
-rw-r--r--epan/dissectors/packet-rmp.c4
-rw-r--r--epan/dissectors/packet-rmt-alc.c4
-rw-r--r--epan/dissectors/packet-rmt-alc.h6
-rw-r--r--epan/dissectors/packet-rmt-common.c4
-rw-r--r--epan/dissectors/packet-rmt-common.h4
-rw-r--r--epan/dissectors/packet-rmt-fec.c4
-rw-r--r--epan/dissectors/packet-rmt-fec.h6
-rw-r--r--epan/dissectors/packet-rmt-lct.c8
-rw-r--r--epan/dissectors/packet-rmt-lct.h6
-rw-r--r--epan/dissectors/packet-rmt-norm.c4
-rw-r--r--epan/dissectors/packet-rmt-norm.h6
-rw-r--r--epan/dissectors/packet-rnsap.c6
-rw-r--r--epan/dissectors/packet-rnsap.h6
-rw-r--r--epan/dissectors/packet-ros.c8
-rw-r--r--epan/dissectors/packet-ros.h6
-rw-r--r--epan/dissectors/packet-rpc.c12
-rw-r--r--epan/dissectors/packet-rpc.h8
-rw-r--r--epan/dissectors/packet-rpl.c4
-rw-r--r--epan/dissectors/packet-rquota.c4
-rw-r--r--epan/dissectors/packet-rquota.h2
-rw-r--r--epan/dissectors/packet-rrlp.c6
-rw-r--r--epan/dissectors/packet-rrlp.h6
-rw-r--r--epan/dissectors/packet-rsh.c4
-rw-r--r--epan/dissectors/packet-rstat.c4
-rw-r--r--epan/dissectors/packet-rsvp.c6
-rw-r--r--epan/dissectors/packet-rsvp.h4
-rw-r--r--epan/dissectors/packet-rsync.c6
-rw-r--r--epan/dissectors/packet-rtcp.c4
-rw-r--r--epan/dissectors/packet-rtcp.h4
-rw-r--r--epan/dissectors/packet-rtp-events.c4
-rw-r--r--epan/dissectors/packet-rtp-events.h4
-rw-r--r--epan/dissectors/packet-rtp.c4
-rw-r--r--epan/dissectors/packet-rtp.h4
-rw-r--r--epan/dissectors/packet-rtps.c6
-rw-r--r--epan/dissectors/packet-rtse.c8
-rw-r--r--epan/dissectors/packet-rtse.h6
-rw-r--r--epan/dissectors/packet-rtsp.c4
-rw-r--r--epan/dissectors/packet-rwall.c4
-rw-r--r--epan/dissectors/packet-rwall.h4
-rw-r--r--epan/dissectors/packet-rx.c4
-rw-r--r--epan/dissectors/packet-rx.h4
-rw-r--r--epan/dissectors/packet-s4406.c6
-rw-r--r--epan/dissectors/packet-s4406.h6
-rw-r--r--epan/dissectors/packet-s5066.c4
-rw-r--r--epan/dissectors/packet-sadmind.c4
-rw-r--r--epan/dissectors/packet-sap.c4
-rw-r--r--epan/dissectors/packet-sccp.c6
-rw-r--r--epan/dissectors/packet-sccp.h4
-rw-r--r--epan/dissectors/packet-sccpmg.c6
-rw-r--r--epan/dissectors/packet-scsi.c6
-rw-r--r--epan/dissectors/packet-scsi.h4
-rw-r--r--epan/dissectors/packet-sctp.c6
-rw-r--r--epan/dissectors/packet-sctp.h4
-rw-r--r--epan/dissectors/packet-sdlc.c4
-rw-r--r--epan/dissectors/packet-sdp.c4
-rw-r--r--epan/dissectors/packet-sdp.h4
-rw-r--r--epan/dissectors/packet-sebek.c4
-rw-r--r--epan/dissectors/packet-ses.c4
-rw-r--r--epan/dissectors/packet-ses.h4
-rw-r--r--epan/dissectors/packet-sflow.c6
-rw-r--r--epan/dissectors/packet-sigcomp.c8
-rw-r--r--epan/dissectors/packet-sip.c8
-rw-r--r--epan/dissectors/packet-sip.h4
-rw-r--r--epan/dissectors/packet-sipfrag.c4
-rw-r--r--epan/dissectors/packet-skinny.c8
-rw-r--r--epan/dissectors/packet-slimp3.c4
-rw-r--r--epan/dissectors/packet-sll.c4
-rw-r--r--epan/dissectors/packet-sll.h4
-rw-r--r--epan/dissectors/packet-slowprotocols.c6
-rw-r--r--epan/dissectors/packet-slsk.c6
-rw-r--r--epan/dissectors/packet-smb-browse.c4
-rw-r--r--epan/dissectors/packet-smb-browse.h4
-rw-r--r--epan/dissectors/packet-smb-common.c6
-rw-r--r--epan/dissectors/packet-smb-common.h4
-rw-r--r--epan/dissectors/packet-smb-logon.c4
-rw-r--r--epan/dissectors/packet-smb-mailslot.c4
-rw-r--r--epan/dissectors/packet-smb-mailslot.h4
-rw-r--r--epan/dissectors/packet-smb-pipe.c4
-rw-r--r--epan/dissectors/packet-smb-pipe.h4
-rw-r--r--epan/dissectors/packet-smb-sidsnooping.c4
-rw-r--r--epan/dissectors/packet-smb-sidsnooping.h6
-rw-r--r--epan/dissectors/packet-smb.c6
-rw-r--r--epan/dissectors/packet-smb.h6
-rw-r--r--epan/dissectors/packet-smb2.c6
-rw-r--r--epan/dissectors/packet-smb2.h6
-rw-r--r--epan/dissectors/packet-smpp.c8
-rw-r--r--epan/dissectors/packet-smpp.h4
-rw-r--r--epan/dissectors/packet-smrse.c6
-rw-r--r--epan/dissectors/packet-smrse.h6
-rw-r--r--epan/dissectors/packet-smtp.c6
-rw-r--r--epan/dissectors/packet-sna.c4
-rw-r--r--epan/dissectors/packet-snaeth.c4
-rw-r--r--epan/dissectors/packet-sndcp.c6
-rw-r--r--epan/dissectors/packet-snmp.c12
-rw-r--r--epan/dissectors/packet-snmp.h6
-rw-r--r--epan/dissectors/packet-socks.c4
-rw-r--r--epan/dissectors/packet-spnego.c8
-rw-r--r--epan/dissectors/packet-spnego.h6
-rw-r--r--epan/dissectors/packet-spp.c4
-rw-r--r--epan/dissectors/packet-spray.c4
-rw-r--r--epan/dissectors/packet-spray.h4
-rw-r--r--epan/dissectors/packet-sqloracle.c4
-rw-r--r--epan/dissectors/packet-sqloracle.h4
-rw-r--r--epan/dissectors/packet-srvloc.c8
-rw-r--r--epan/dissectors/packet-sscf-nni.c6
-rw-r--r--epan/dissectors/packet-sscop.c4
-rw-r--r--epan/dissectors/packet-sscop.h4
-rw-r--r--epan/dissectors/packet-ssh.c4
-rw-r--r--epan/dissectors/packet-ssl.c8
-rw-r--r--epan/dissectors/packet-stat-notify.c4
-rw-r--r--epan/dissectors/packet-stat-notify.h4
-rw-r--r--epan/dissectors/packet-stat.c4
-rw-r--r--epan/dissectors/packet-stat.h2
-rw-r--r--epan/dissectors/packet-stun.c4
-rw-r--r--epan/dissectors/packet-sua.c8
-rw-r--r--epan/dissectors/packet-symantec.c4
-rw-r--r--epan/dissectors/packet-synergy.c4
-rw-r--r--epan/dissectors/packet-syslog.c8
-rw-r--r--epan/dissectors/packet-t38.c6
-rw-r--r--epan/dissectors/packet-t38.h4
-rw-r--r--epan/dissectors/packet-tacacs.c4
-rw-r--r--epan/dissectors/packet-tacacs.h4
-rw-r--r--epan/dissectors/packet-tali.c4
-rw-r--r--epan/dissectors/packet-tcap.c6
-rw-r--r--epan/dissectors/packet-tcap.h6
-rw-r--r--epan/dissectors/packet-tcp.c4
-rw-r--r--epan/dissectors/packet-tcp.h4
-rw-r--r--epan/dissectors/packet-tds.c8
-rw-r--r--epan/dissectors/packet-teimanagement.c4
-rw-r--r--epan/dissectors/packet-telnet.c4
-rw-r--r--epan/dissectors/packet-teredo.c4
-rw-r--r--epan/dissectors/packet-text-media.c4
-rw-r--r--epan/dissectors/packet-tftp.c4
-rw-r--r--epan/dissectors/packet-time.c4
-rw-r--r--epan/dissectors/packet-tipc.c6
-rw-r--r--epan/dissectors/packet-tns.c4
-rw-r--r--epan/dissectors/packet-tns.h2
-rw-r--r--epan/dissectors/packet-tpkt.c4
-rw-r--r--epan/dissectors/packet-tpkt.h4
-rw-r--r--epan/dissectors/packet-tr.c4
-rw-r--r--epan/dissectors/packet-tr.h4
-rw-r--r--epan/dissectors/packet-trmac.c4
-rw-r--r--epan/dissectors/packet-tsp.c4
-rw-r--r--epan/dissectors/packet-tuxedo.c4
-rw-r--r--epan/dissectors/packet-tzsp.c4
-rw-r--r--epan/dissectors/packet-ucp.c6
-rw-r--r--epan/dissectors/packet-udp.c4
-rw-r--r--epan/dissectors/packet-udp.h2
-rw-r--r--epan/dissectors/packet-ulp.c6
-rw-r--r--epan/dissectors/packet-ulp.h6
-rw-r--r--epan/dissectors/packet-uma.c6
-rw-r--r--epan/dissectors/packet-user_encap.c4
-rw-r--r--epan/dissectors/packet-v120.c4
-rw-r--r--epan/dissectors/packet-vines.c4
-rw-r--r--epan/dissectors/packet-vines.h4
-rw-r--r--epan/dissectors/packet-vj.c6
-rw-r--r--epan/dissectors/packet-vlan.c4
-rw-r--r--epan/dissectors/packet-vlan.h4
-rw-r--r--epan/dissectors/packet-vnc.c14
-rw-r--r--epan/dissectors/packet-vrrp.c4
-rw-r--r--epan/dissectors/packet-vtp.c4
-rw-r--r--epan/dissectors/packet-wap.c4
-rw-r--r--epan/dissectors/packet-wap.h4
-rw-r--r--epan/dissectors/packet-wbxml.c6
-rw-r--r--epan/dissectors/packet-wccp.c4
-rw-r--r--epan/dissectors/packet-wccp.h2
-rw-r--r--epan/dissectors/packet-wcp.c4
-rw-r--r--epan/dissectors/packet-wfleet-hdlc.c4
-rw-r--r--epan/dissectors/packet-who.c4
-rw-r--r--epan/dissectors/packet-windows-common.c4
-rw-r--r--epan/dissectors/packet-windows-common.h4
-rw-r--r--epan/dissectors/packet-winsrepl.c4
-rw-r--r--epan/dissectors/packet-wlancap.c4
-rw-r--r--epan/dissectors/packet-wlancap.h4
-rw-r--r--epan/dissectors/packet-wlancertextn.c6
-rw-r--r--epan/dissectors/packet-wlancertextn.h6
-rw-r--r--epan/dissectors/packet-wsp.c12
-rw-r--r--epan/dissectors/packet-wsp.h6
-rw-r--r--epan/dissectors/packet-wtls.c8
-rw-r--r--epan/dissectors/packet-wtls.h2
-rw-r--r--epan/dissectors/packet-wtp.c14
-rw-r--r--epan/dissectors/packet-wtp.h2
-rw-r--r--epan/dissectors/packet-x11-keysymdef.h4
-rw-r--r--epan/dissectors/packet-x11.c6
-rw-r--r--epan/dissectors/packet-x25.c4
-rw-r--r--epan/dissectors/packet-x29.c4
-rw-r--r--epan/dissectors/packet-x411.c6
-rw-r--r--epan/dissectors/packet-x411.h6
-rw-r--r--epan/dissectors/packet-x420.c6
-rw-r--r--epan/dissectors/packet-x420.h6
-rw-r--r--epan/dissectors/packet-x509af.c6
-rw-r--r--epan/dissectors/packet-x509af.h6
-rw-r--r--epan/dissectors/packet-x509ce.c6
-rw-r--r--epan/dissectors/packet-x509ce.h6
-rw-r--r--epan/dissectors/packet-x509if.c6
-rw-r--r--epan/dissectors/packet-x509if.h6
-rw-r--r--epan/dissectors/packet-x509sat.c6
-rw-r--r--epan/dissectors/packet-x509sat.h6
-rw-r--r--epan/dissectors/packet-xdmcp.c6
-rw-r--r--epan/dissectors/packet-xml.c4
-rw-r--r--epan/dissectors/packet-xot.c6
-rw-r--r--epan/dissectors/packet-xyplex.c4
-rw-r--r--epan/dissectors/packet-yhoo.c4
-rw-r--r--epan/dissectors/packet-ymsg.c4
-rw-r--r--epan/dissectors/packet-ypbind.c4
-rw-r--r--epan/dissectors/packet-ypbind.h2
-rw-r--r--epan/dissectors/packet-yppasswd.c4
-rw-r--r--epan/dissectors/packet-yppasswd.h4
-rw-r--r--epan/dissectors/packet-ypserv.c4
-rw-r--r--epan/dissectors/packet-ypserv.h2
-rw-r--r--epan/dissectors/packet-ypxfr.c2
-rw-r--r--epan/dissectors/packet-ypxfr.h2
-rw-r--r--epan/dissectors/packet-zebra.c4
-rw-r--r--epan/dissectors/rpc_defrag.h4
870 files changed, 2248 insertions, 2248 deletions
diff --git a/epan/dissectors/format-oid.h b/epan/dissectors/format-oid.h
index f74c41c0a7..33d2f48cfb 100644
--- a/epan/dissectors/format-oid.h
+++ b/epan/dissectors/format-oid.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Didier Jorand
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c
index 9090448c76..f9d70c6e3f 100644
--- a/epan/dissectors/packet-3com-njack.c
+++ b/epan/dissectors/packet-3com-njack.c
@@ -5,8 +5,8 @@
*
* Copyright 2005 Joerg Mayer (see AUTHORS file)
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-3com-xns.c b/epan/dissectors/packet-3com-xns.c
index cbbe699d56..c61a2f9819 100644
--- a/epan/dissectors/packet-3com-xns.c
+++ b/epan/dissectors/packet-3com-xns.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index fb58fb7aed..e75ae5dd65 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -13,8 +13,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1509,7 +1509,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
return tvb_length(tvb);
} /* dissect_a11 */
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void proto_register_a11(void)
{
diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c
index 2231732ef7..4a0ec69646 100644
--- a/epan/dissectors/packet-9p.c
+++ b/epan/dissectors/packet-9p.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* File permission bits decoding taken from packet-nfs.c
@@ -675,7 +675,7 @@ static void dissect_9P_dm(tvbuff_t * tvb, proto_item * item,int offset,int iscr
decode_boolean_bitfield(dm, 01, 32, "Execute permission for others", "no Execute permission for others"));
}
-/* Register 9P with Ethereal */
+/* Register 9P with Wireshark */
void proto_register_9P(void)
{
static hf_register_info hf[] = {
diff --git a/epan/dissectors/packet-MAP_DialoguePDU.c b/epan/dissectors/packet-MAP_DialoguePDU.c
index 66d87f5619..f221cfcdf4 100644
--- a/epan/dissectors/packet-MAP_DialoguePDU.c
+++ b/epan/dissectors/packet-MAP_DialoguePDU.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-MAP_DialoguePDU.c */
/* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-MAP_DialoguePDU.h b/epan/dissectors/packet-MAP_DialoguePDU.h
index d12bb8cc8b..857b9660a3 100644
--- a/epan/dissectors/packet-MAP_DialoguePDU.h
+++ b/epan/dissectors/packet-MAP_DialoguePDU.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-MAP_DialoguePDU.h */
/* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c
index 56aab63808..5162de4448 100644
--- a/epan/dissectors/packet-aarp.c
+++ b/epan/dissectors/packet-aarp.c
@@ -5,8 +5,8 @@
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c
index aee315dd2c..60d95c13d9 100644
--- a/epan/dissectors/packet-acap.c
+++ b/epan/dissectors/packet-acap.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-imap.c
diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c
index ebdae1f39c..1a024fdd54 100644
--- a/epan/dissectors/packet-acp133.c
+++ b/epan/dissectors/packet-acp133.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-acp133.c */
/* ../../tools/asn2eth.py -X -b -e -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-acp133.h b/epan/dissectors/packet-acp133.h
index d4d4989394..46f3ea462b 100644
--- a/epan/dissectors/packet-acp133.h
+++ b/epan/dissectors/packet-acp133.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-acp133.h */
/* ../../tools/asn2eth.py -X -b -e -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 4452ec806d..fdef7060b0 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-acse.c */
/* ../../tools/asn2eth.py -X -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */
@@ -23,8 +23,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-acse.h b/epan/dissectors/packet-acse.h
index dd679fdd04..e0ef3d6cb2 100644
--- a/epan/dissectors/packet-acse.h
+++ b/epan/dissectors/packet-acse.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-acse.h */
/* ../../tools/asn2eth.py -X -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c
index a446c9d0f9..6d885f0b5c 100644
--- a/epan/dissectors/packet-actrace.c
+++ b/epan/dissectors/packet-actrace.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-actrace.h b/epan/dissectors/packet-actrace.h
index 7c1ec5ef49..3d0432efab 100644
--- a/epan/dissectors/packet-actrace.h
+++ b/epan/dissectors/packet-actrace.h
@@ -5,8 +5,8 @@
*
* Copyright (c) 2005 by Alejandro Vaquero <alejandro.vaquero@verso.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index 39a4802381..1c1ab34721 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
diff --git a/epan/dissectors/packet-afp.h b/epan/dissectors/packet-afp.h
index 57e8bb80e6..f7b608a0ad 100644
--- a/epan/dissectors/packet-afp.h
+++ b/epan/dissectors/packet-afp.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c
index 544bcf3d82..f61531b54e 100644
--- a/epan/dissectors/packet-afs.c
+++ b/epan/dissectors/packet-afs.c
@@ -10,8 +10,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-afs.h b/epan/dissectors/packet-afs.h
index 6569b08c9b..29a78d1065 100644
--- a/epan/dissectors/packet-afs.h
+++ b/epan/dissectors/packet-afs.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
*
diff --git a/epan/dissectors/packet-aim-admin.c b/epan/dissectors/packet-aim-admin.c
index 774868d6e4..59d9d4d4c3 100644
--- a/epan/dissectors/packet-aim-admin.c
+++ b/epan/dissectors/packet-aim-admin.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -98,7 +98,7 @@ static const aim_subtype aim_fnac_family_admin[] = {
{ 0, NULL, NULL }
};
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_admin(void)
{
diff --git a/epan/dissectors/packet-aim-adverts.c b/epan/dissectors/packet-aim-adverts.c
index d272b2241c..2bd329cbe7 100644
--- a/epan/dissectors/packet-aim-adverts.c
+++ b/epan/dissectors/packet-aim-adverts.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -58,7 +58,7 @@ static int proto_aim_adverts = -1;
/* Initialize the subtree pointers */
static gint ett_aim_adverts = -1;
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_adverts(void)
{
diff --git a/epan/dissectors/packet-aim-bos.c b/epan/dissectors/packet-aim-bos.c
index ff52f15d41..563f52051d 100644
--- a/epan/dissectors/packet-aim-bos.c
+++ b/epan/dissectors/packet-aim-bos.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -95,7 +95,7 @@ static int dissect_aim_bos_buddyname(tvbuff_t *tvb, packet_info *pinfo, proto_tr
return offset;
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_bos(void)
{
diff --git a/epan/dissectors/packet-aim-buddylist.c b/epan/dissectors/packet-aim-buddylist.c
index 1c4af05deb..e9ed91de1f 100644
--- a/epan/dissectors/packet-aim-buddylist.c
+++ b/epan/dissectors/packet-aim-buddylist.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -141,7 +141,7 @@ static const aim_subtype aim_fnac_family_buddylist[] = {
{ 0, NULL, NULL }
};
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_buddylist(void)
{
diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c
index 9b59b39fa4..db42102309 100644
--- a/epan/dissectors/packet-aim-chat.c
+++ b/epan/dissectors/packet-aim-chat.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -135,7 +135,7 @@ static const aim_subtype aim_fnac_family_chat[] = {
{ 0, NULL, NULL }
};
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_chat(void)
{
diff --git a/epan/dissectors/packet-aim-chatnav.c b/epan/dissectors/packet-aim-chatnav.c
index cfc3aec2e4..a5f69b5122 100644
--- a/epan/dissectors/packet-aim-chatnav.c
+++ b/epan/dissectors/packet-aim-chatnav.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -59,7 +59,7 @@ static int proto_aim_chatnav = -1;
static int ett_aim_chatnav = -1;
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_chatnav(void)
{
diff --git a/epan/dissectors/packet-aim-directory.c b/epan/dissectors/packet-aim-directory.c
index e59f6cb801..65875f4a2d 100644
--- a/epan/dissectors/packet-aim-directory.c
+++ b/epan/dissectors/packet-aim-directory.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -63,7 +63,7 @@ static const aim_subtype aim_fnac_family_directory[] = {
};
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_directory(void)
{
diff --git a/epan/dissectors/packet-aim-email.c b/epan/dissectors/packet-aim-email.c
index dc1287e2cd..f69d4eb4dc 100644
--- a/epan/dissectors/packet-aim-email.c
+++ b/epan/dissectors/packet-aim-email.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -54,7 +54,7 @@ static int proto_aim_email = -1;
/* Initialize the subtree pointers */
static gint ett_aim_email = -1;
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_email(void)
{
diff --git a/epan/dissectors/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c
index dd237ca00f..86a3985a2f 100644
--- a/epan/dissectors/packet-aim-generic.c
+++ b/epan/dissectors/packet-aim-generic.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -465,7 +465,7 @@ static const aim_subtype aim_fnac_family_generic[] = {
};
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_generic(void)
{
diff --git a/epan/dissectors/packet-aim-icq.c b/epan/dissectors/packet-aim-icq.c
index f73b3ffe94..e41800d2e9 100644
--- a/epan/dissectors/packet-aim-icq.c
+++ b/epan/dissectors/packet-aim-icq.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -214,7 +214,7 @@ static const aim_subtype aim_fnac_family_icq[] = {
};
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_icq(void)
{
diff --git a/epan/dissectors/packet-aim-invitation.c b/epan/dissectors/packet-aim-invitation.c
index 6d6134f329..680c298505 100644
--- a/epan/dissectors/packet-aim-invitation.c
+++ b/epan/dissectors/packet-aim-invitation.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -60,7 +60,7 @@ static const aim_subtype aim_fnac_family_invitation[] = {
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_invitation(void)
{
diff --git a/epan/dissectors/packet-aim-location.c b/epan/dissectors/packet-aim-location.c
index b7bfe42728..d4c8b019ac 100644
--- a/epan/dissectors/packet-aim-location.c
+++ b/epan/dissectors/packet-aim-location.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c
index ba5c761c17..de7ec3abfa 100644
--- a/epan/dissectors/packet-aim-messaging.c
+++ b/epan/dissectors/packet-aim-messaging.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -535,7 +535,7 @@ static const aim_subtype aim_fnac_family_messaging[] = {
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_messaging(void)
{
diff --git a/epan/dissectors/packet-aim-oft.c b/epan/dissectors/packet-aim-oft.c
index b196d32fef..746e4368bb 100644
--- a/epan/dissectors/packet-aim-oft.c
+++ b/epan/dissectors/packet-aim-oft.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -80,7 +80,7 @@ static int ett_aim_sendfile = -1;*/
*/
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_oft(void)
{
diff --git a/epan/dissectors/packet-aim-popup.c b/epan/dissectors/packet-aim-popup.c
index 2bccc8d4ec..9b55bbf683 100644
--- a/epan/dissectors/packet-aim-popup.c
+++ b/epan/dissectors/packet-aim-popup.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -76,7 +76,7 @@ static const aim_subtype aim_fnac_family_popup[] = {
};
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_popup(void)
{
diff --git a/epan/dissectors/packet-aim-signon.c b/epan/dissectors/packet-aim-signon.c
index 4758f601f9..6f323fd443 100644
--- a/epan/dissectors/packet-aim-signon.c
+++ b/epan/dissectors/packet-aim-signon.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -153,7 +153,7 @@ static const aim_subtype aim_fnac_family_signon[] = {
};
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_signon(void)
{
diff --git a/epan/dissectors/packet-aim-ssi.c b/epan/dissectors/packet-aim-ssi.c
index 4809511b88..d95f905057 100644
--- a/epan/dissectors/packet-aim-ssi.c
+++ b/epan/dissectors/packet-aim-ssi.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -209,7 +209,7 @@ static const aim_subtype aim_fnac_family_ssi[] = {
};
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_ssi(void)
{
diff --git a/epan/dissectors/packet-aim-sst.c b/epan/dissectors/packet-aim-sst.c
index 6d83dbefa7..ca03341629 100644
--- a/epan/dissectors/packet-aim-sst.c
+++ b/epan/dissectors/packet-aim-sst.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -146,7 +146,7 @@ static const aim_subtype aim_fnac_family_sst[] = {
};
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_sst(void)
{
diff --git a/epan/dissectors/packet-aim-stats.c b/epan/dissectors/packet-aim-stats.c
index 9758cea575..06d96e57dc 100644
--- a/epan/dissectors/packet-aim-stats.c
+++ b/epan/dissectors/packet-aim-stats.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -56,7 +56,7 @@ static const aim_subtype aim_fnac_family_stats[] = {
};
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_stats(void)
{
diff --git a/epan/dissectors/packet-aim-translate.c b/epan/dissectors/packet-aim-translate.c
index 7d3943fefb..45af9e4bab 100644
--- a/epan/dissectors/packet-aim-translate.c
+++ b/epan/dissectors/packet-aim-translate.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -53,7 +53,7 @@ static const aim_subtype aim_fnac_family_translate[] = {
{ 0, NULL, NULL }
};
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_translate(void)
{
diff --git a/epan/dissectors/packet-aim-userlookup.c b/epan/dissectors/packet-aim-userlookup.c
index 6d7385716d..1d01be116f 100644
--- a/epan/dissectors/packet-aim-userlookup.c
+++ b/epan/dissectors/packet-aim-userlookup.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -67,7 +67,7 @@ static const aim_subtype aim_fnac_family_userlookup[] = {
{ 0, NULL, NULL }
};
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim_userlookup(void)
{
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index a49ad74e4d..7740f778e4 100644
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1310,7 +1310,7 @@ int dissect_aim_tlv_list(tvbuff_t *tvb, packet_info *pinfo,
return offset;
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aim(void)
{
diff --git a/epan/dissectors/packet-aim.h b/epan/dissectors/packet-aim.h
index bd50f806be..e5a69d831b 100644
--- a/epan/dissectors/packet-aim.h
+++ b/epan/dissectors/packet-aim.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c
index cfa603b347..cbaa742be0 100644
--- a/epan/dissectors/packet-ajp13.c
+++ b/epan/dissectors/packet-ajp13.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -45,7 +45,7 @@
* You need to be looking at: jk/doc/AJP13.html in the
* jakarta-tomcat-connectors repository.
*
- * If you're an ethereal dissector guru, then you can skip the rest of
+ * If you're an wireshark dissector guru, then you can skip the rest of
* this. I'm writing it all down because I've written 3 dissectors so
* far and every time I've forgotten it all and had to re-learn it
* from scratch. Not this time, damnit.
@@ -83,9 +83,9 @@
* order. Users don't normally care, because the low-level kernel
* networking code takes care of reassembling them properly. But we're
* looking at raw network packets, aren't we? The stuff on the
- * wire. Ethereal has been getting better and better at helping
+ * wire. Wireshark has been getting better and better at helping
* dissectors with this. I'm a little fuzzy on the details, but my
- * uderstanding is that ethereal now contains a fairly substantial
+ * uderstanding is that wireshark now contains a fairly substantial
* user-space TCP/IP stack so it can re-assemble the data. But I might
* be wrong. Since AJP13 is going to be used either on the loopback
* interface or on a LAN, it isn't likely to be a big issues anyway.
@@ -97,12 +97,12 @@
* obviously possible, but a royal pain. During the "phase one"
* in-order pass you have to keep track of a bunch of offsets and
* store which PDU goes with which TCP segment. Luckly, recent
- * (0.9.4+) versions of ethereal provide the "tcp_dissect_pdus()"
+ * (0.9.4+) versions of wireshark provide the "tcp_dissect_pdus()"
* function that takes care of much of the work. See the comments in
* packet-tcp.c, the example code in packet-dns.c, or check the
* ethereal-dev archives for details.
*
- * 3) Ethereal isn't guaranteed to see all the data. I'm a little
+ * 3) Wireshark isn't guaranteed to see all the data. I'm a little
* unclear on all the possible failure modes, but it comes down to: a)
* Not your fault: it's an imperfect world, we're eavesdroppers, and
* stuff happens. We might totally miss packets or get garbled
@@ -630,7 +630,7 @@ display_req_forward(tvbuff_t *tvb, packet_info *pinfo,
-/* main dissector function. ethereal calls it for segments in both
+/* main dissector function. wireshark calls it for segments in both
* directions.
*/
static void
diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c
index c64bc0dbda..45bfe3aec0 100644
--- a/epan/dissectors/packet-alcap.c
+++ b/epan/dissectors/packet-alcap.c
@@ -10,8 +10,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-alcap.h b/epan/dissectors/packet-alcap.h
index 9ed413333a..2cc34ae775 100644
--- a/epan/dissectors/packet-alcap.h
+++ b/epan/dissectors/packet-alcap.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c
index 494c4fd330..352d6b00df 100644
--- a/epan/dissectors/packet-amr.c
+++ b/epan/dissectors/packet-amr.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -282,7 +282,7 @@ dissect_amr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* If this dissector uses sub-dissector registration add a registration routine.
This format is required because a script is used to find these routines and
create the code that calls these routines.
diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c
index 213c0a9735..deda44e4fe 100644
--- a/epan/dissectors/packet-ans.c
+++ b/epan/dissectors/packet-ans.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2003 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c
index 172e5749df..67f8ff634b 100644
--- a/epan/dissectors/packet-ansi_637.c
+++ b/epan/dissectors/packet-ansi_637.c
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1777,7 +1777,7 @@ dissect_ansi_637_trans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_ansi_637(void)
{
diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c
index 7a9b261755..a75115d192 100644
--- a/epan/dissectors/packet-ansi_683.c
+++ b/epan/dissectors/packet-ansi_683.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1999,7 +1999,7 @@ dissect_ansi_683(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_ansi_683(void)
{
diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index 54db5b633d..15c0527e69 100644
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -834,7 +834,7 @@ dissect_ansi_801(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_ansi_801(void)
{
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index 87d82d855f..cbe98a4550 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -8204,7 +8204,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_ansi_a(void)
{
diff --git a/epan/dissectors/packet-ansi_a.h b/epan/dissectors/packet-ansi_a.h
index 9c49486aff..35179b7d34 100644
--- a/epan/dissectors/packet-ansi_a.h
+++ b/epan/dissectors/packet-ansi_a.h
@@ -5,8 +5,8 @@
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ typedef struct _ansi_a_tap_rec_t {
/*
* the following allows TAP code access to the messages
* without having to duplicate it. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT const value_string ansi_a_ios401_bsmap_strings[];
ETH_VAR_IMPORT const value_string ansi_a_ios401_dtap_strings[];
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index 5f009b2ac7..e7ad223cf8 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -81,8 +81,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -13016,7 +13016,7 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_ansi_map(void)
{
diff --git a/epan/dissectors/packet-ansi_map.h b/epan/dissectors/packet-ansi_map.h
index db7e4e9f79..3d9177ca8c 100644
--- a/epan/dissectors/packet-ansi_map.h
+++ b/epan/dissectors/packet-ansi_map.h
@@ -5,8 +5,8 @@
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@ typedef struct _ansi_map_tap_rec_t {
/*
* the following allows TAP code access to the messages
* without having to duplicate it. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT const value_string ansi_map_opr_code_strings[];
diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c
index f2f705e402..d228933504 100644
--- a/epan/dissectors/packet-aodv.c
+++ b/epan/dissectors/packet-aodv.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -839,7 +839,7 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_aodv(void)
{
diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c
index 98866ef628..1b19d4e820 100644
--- a/epan/dissectors/packet-ap1394.c
+++ b/epan/dissectors/packet-ap1394.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ap1394.h b/epan/dissectors/packet-ap1394.h
index f8f8cbc0ab..db4efb1193 100644
--- a/epan/dissectors/packet-ap1394.h
+++ b/epan/dissectors/packet-ap1394.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-app-pkix-cert.c b/epan/dissectors/packet-app-pkix-cert.c
index efd69cde5e..7e82e08e61 100644
--- a/epan/dissectors/packet-app-pkix-cert.c
+++ b/epan/dissectors/packet-app-pkix-cert.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -69,7 +69,7 @@ dissect_cert(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
}
-/****************** Register the protocol with Ethereal ******************/
+/****************** Register the protocol with Wireshark ******************/
/* This format is required because a script is used to build the C function
diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c
index e030e755a3..9badf3ef06 100644
--- a/epan/dissectors/packet-arcnet.c
+++ b/epan/dissectors/packet-arcnet.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-arcnet.h b/epan/dissectors/packet-arcnet.h
index 7047671e51..c6632ec469 100644
--- a/epan/dissectors/packet-arcnet.h
+++ b/epan/dissectors/packet-arcnet.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c
index b2e7080a81..e50c40248c 100644
--- a/epan/dissectors/packet-armagetronad.c
+++ b/epan/dissectors/packet-armagetronad.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c
index 227f66ffcc..9e1bcc1988 100644
--- a/epan/dissectors/packet-arp.c
+++ b/epan/dissectors/packet-arp.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-arp.h b/epan/dissectors/packet-arp.h
index 721c024d9e..793d2a44cd 100644
--- a/epan/dissectors/packet-arp.h
+++ b/epan/dissectors/packet-arp.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c
index 1103462709..840dbce27b 100644
--- a/epan/dissectors/packet-aruba-adp.c
+++ b/epan/dissectors/packet-aruba-adp.c
@@ -5,8 +5,8 @@
*
* Giles Scott < gscott <at> arubanetworks dot com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c
index 8d3ff3b49f..edb3ae5384 100644
--- a/epan/dissectors/packet-asap.c
+++ b/epan/dissectors/packet-asap.c
@@ -15,8 +15,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
@@ -691,7 +691,7 @@ dissect_asap(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
dissect_asap_message(message_tvb, pinfo, asap_tree);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_asap(void)
{
diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c
index a1274b2e4d..d9b439ba7f 100644
--- a/epan/dissectors/packet-ascend.c
+++ b/epan/dissectors/packet-ascend.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* 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/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c
index 95ae78616c..ec01becd1e 100644
--- a/epan/dissectors/packet-asf.c
+++ b/epan/dissectors/packet-asf.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-rmcp.c
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index 8cc889e20f..87d7226469 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -6,8 +6,8 @@
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c
index 900877a387..368c796e6e 100644
--- a/epan/dissectors/packet-atm.c
+++ b/epan/dissectors/packet-atm.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-atm.h b/epan/dissectors/packet-atm.h
index 3e60eeeafe..2c6f04213a 100644
--- a/epan/dissectors/packet-atm.h
+++ b/epan/dissectors/packet-atm.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c
index 6fdce8bb32..19f9e8952b 100644
--- a/epan/dissectors/packet-auto_rp.c
+++ b/epan/dissectors/packet-auto_rp.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ax4000.c b/epan/dissectors/packet-ax4000.c
index ae63cfad34..e76d406d5b 100644
--- a/epan/dissectors/packet-ax4000.c
+++ b/epan/dissectors/packet-ax4000.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -104,7 +104,7 @@ dissect_ax4000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* If this protocol has a sub-dissector call it here, see section 1.8 */
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 0ae3eb2a4b..f43ee67592 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer,v 1.23
diff --git a/epan/dissectors/packet-bacapp.h b/epan/dissectors/packet-bacapp.h
index d02f507a0a..2a37e449c6 100644
--- a/epan/dissectors/packet-bacapp.h
+++ b/epan/dissectors/packet-bacapp.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer,v 1.23
diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c
index 571bcce368..cb2966a57b 100644
--- a/epan/dissectors/packet-bacnet.c
+++ b/epan/dissectors/packet-bacnet.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer,v 1.23
diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c
index a164863911..3eaf2a4f2c 100644
--- a/epan/dissectors/packet-beep.c
+++ b/epan/dissectors/packet-beep.c
@@ -9,7 +9,7 @@
* Original BXXP dissector developed with funding from InvisibleWorlds
* (www.invisibleworlds.com) via Collab.Net.
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs
* Copyright 1999 Gerald Combs
*
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 8f28d1aab8..bb2a7b3313 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -31,8 +31,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -372,7 +372,7 @@ call_ber_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *p
if (oid == NULL)
item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "BER: No OID supplied to call_ber_oid_callback");
else
- item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "BER: Dissector for OID:%s not implemented. Contact Ethereal developers if you want this supported", oid);
+ item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "BER: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid);
if(item){
next_tree=proto_item_add_subtree(item, ett_ber_unknown);
}
diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h
index eed0051200..182d8b0450 100644
--- a/epan/dissectors/packet-ber.h
+++ b/epan/dissectors/packet-ber.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c
index e1098ea5c6..f822a7cd25 100644
--- a/epan/dissectors/packet-bfd.c
+++ b/epan/dissectors/packet-bfd.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -297,7 +297,7 @@ static void dissect_bfd_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
return;
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void proto_register_bfd(void)
{
diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c
index 39b14dabeb..5e71734f1c 100644
--- a/epan/dissectors/packet-bgp.c
+++ b/epan/dissectors/packet-bgp.c
@@ -22,8 +22,8 @@
* Destination Preference Attribute for BGP (work in progress)
* RFC1863 A BGP/IDRP Route Server alternative to a full mesh routing
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-bgp.h b/epan/dissectors/packet-bgp.h
index 0b59ab5b5c..b712fc4f79 100644
--- a/epan/dissectors/packet-bgp.h
+++ b/epan/dissectors/packet-bgp.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c
index c76ed44480..48316c6232 100644
--- a/epan/dissectors/packet-bittorrent.c
+++ b/epan/dissectors/packet-bittorrent.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c
diff --git a/epan/dissectors/packet-bofl.c b/epan/dissectors/packet-bofl.c
index 3a9e9dd2f7..20ef24da8b 100644
--- a/epan/dissectors/packet-bofl.c
+++ b/epan/dissectors/packet-bofl.c
@@ -4,7 +4,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 5607361e1e..aa266384d7 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -33,8 +33,8 @@
* CableHome(TM) 1.1 Specification
* http://www.cablelabs.com/projects/cablehome/downloads/specs/CH-SP-CH1.1-I11-060407.pdf
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-bootparams.c b/epan/dissectors/packet-bootparams.c
index 3634a82a11..9dd28daa2a 100644
--- a/epan/dissectors/packet-bootparams.c
+++ b/epan/dissectors/packet-bootparams.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-smb.c
diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index caa23d6098..769a7863e9 100644
--- a/epan/dissectors/packet-bpdu.c
+++ b/epan/dissectors/packet-bpdu.c
@@ -5,8 +5,8 @@
*
* Copyright 1999 Christophe Tronche <ch.tronche@computer.org>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -344,7 +344,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
default:
proto_tree_add_text(bpdu_tree, tvb, BPDU_VERSION_IDENTIFIER, 1,
- " (Warning: this version of Ethereal only knows about versions 0, 2 & 3)");
+ " (Warning: this version of Wireshark only knows about versions 0, 2 & 3)");
break;
}
proto_tree_add_uint(bpdu_tree, hf_bpdu_type, tvb, BPDU_TYPE, 1, bpdu_type);
diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c
index 3ce60b8404..1a74ccca7c 100644
--- a/epan/dissectors/packet-brdwlk.c
+++ b/epan/dissectors/packet-brdwlk.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -390,7 +390,7 @@ brdwlk_init(void)
first_pkt = TRUE;
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c
index f565c4d203..7078a15b71 100644
--- a/epan/dissectors/packet-bssap.c
+++ b/epan/dissectors/packet-bssap.c
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -2116,7 +2116,7 @@ dissect_bssap_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
return(TRUE);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_bssap(void)
{
diff --git a/epan/dissectors/packet-bssap.h b/epan/dissectors/packet-bssap.h
index 63a2ce3df6..43cbc73bf4 100644
--- a/epan/dissectors/packet-bssap.h
+++ b/epan/dissectors/packet-bssap.h
@@ -9,8 +9,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index d34e27144f..d341611963 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c
index c21046b250..1a09c8cb90 100644
--- a/epan/dissectors/packet-bthci_acl.c
+++ b/epan/dissectors/packet-bthci_acl.c
@@ -3,13 +3,13 @@
* Copyright 2002, Christoph Scholz <scholz@cs.uni-bonn.de>
* From: http://affix.sourceforge.net/archive/ethereal_affix-3.patch
*
- * Refactored for ethereal checkin
+ * Refactored for wireshark checkin
* Ronnie Sahlberg 2006
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c
index b6f03b0122..0b890564e3 100644
--- a/epan/dissectors/packet-bthci_cmd.c
+++ b/epan/dissectors/packet-bthci_cmd.c
@@ -3,13 +3,13 @@
* Copyright 2002, Christoph Scholz <scholz@cs.uni-bonn.de>
* From: http://affix.sourceforge.net/archive/ethereal_affix-3.patch
*
- * Refactored for ethereal checkin
+ * Refactored for wireshark checkin
* Ronnie Sahlberg 2006
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1268,7 +1268,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index a46f502126..47cafce84c 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -3,14 +3,14 @@
* Copyright 2002, Christoph Scholz <scholz@cs.uni-bonn.de>
* From: http://affix.sourceforge.net/archive/ethereal_affix-3.patch
*
- * Refactored for ethereal checkin
+ * Refactored for wireshark checkin
* Ronnie Sahlberg 2006
*
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1591,7 +1591,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c
index 00a2ccedba..ac41d6cb1d 100644
--- a/epan/dissectors/packet-btl2cap.c
+++ b/epan/dissectors/packet-btl2cap.c
@@ -3,13 +3,13 @@
* Copyright 2002, Christoph Scholz <scholz@cs.uni-bonn.de>
* From: http://affix.sourceforge.net/archive/ethereal_affix-3.patch
*
- * Refactored for ethereal checkin
+ * Refactored for wireshark checkin
* Ronnie Sahlberg 2006
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -649,7 +649,7 @@ static void dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_btl2cap(void)
{
diff --git a/epan/dissectors/packet-btl2cap.h b/epan/dissectors/packet-btl2cap.h
index 5288ce70f8..01464e5864 100644
--- a/epan/dissectors/packet-btl2cap.h
+++ b/epan/dissectors/packet-btl2cap.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c
index 0f92c5c6fa..19d5fb8fb2 100644
--- a/epan/dissectors/packet-bvlc.c
+++ b/epan/dissectors/packet-bvlc.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer,v 1.23
@@ -421,6 +421,6 @@ proto_reg_handoff_bvlc(void)
* a violation of this protocol.
*
* This dissector does not analyse UDP packets other than on port 0xBAC0.
- * If you changed your BACnet port locally, use the ethereal feature
+ * If you changed your BACnet port locally, use the wireshark feature
* "Decode As".
*/
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index 6194aced0c..0b06de168c 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-camel.c */
/* ../../tools/asn2eth.py -X -b -e -p camel -c camel.cnf -s packet-camel-template camel.asn */
@@ -17,8 +17,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-camel.h b/epan/dissectors/packet-camel.h
index be8dddd309..5848e1d5f0 100644
--- a/epan/dissectors/packet-camel.h
+++ b/epan/dissectors/packet-camel.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-camel.h */
/* ../../tools/asn2eth.py -X -b -e -p camel -c camel.cnf -s packet-camel-template camel.asn */
@@ -14,8 +14,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c
index 49077b9ae4..8af644186f 100644
--- a/epan/dissectors/packet-cast.c
+++ b/epan/dissectors/packet-cast.c
@@ -1089,7 +1089,7 @@ static void dissect_cast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tcp_dissect_pdus(tvb, pinfo, tree, cast_desegment, 4, get_cast_pdu_len, dissect_cast_pdu);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_cast(void)
{
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index 77d9f8eb95..c3def29f56 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -158,7 +158,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Note that the first item of pinfo->pseudo_header->dct2000 will contain
- the pseudo-header needed (in some cases) by the ethereal dissector */
+ the pseudo-header needed (in some cases) by the wireshark dissector */
/***********************************************************************/
@@ -290,9 +290,9 @@ void proto_register_catapult_dct2000(void)
}
},
{ &hf_catapult_dct2000_encap,
- { "Ethereal encapsulation",
+ { "Wireshark encapsulation",
"dct2000.encapsulation", FT_UINT8, BASE_DEC, VALS(encap_vals), 0x0,
- "Ethereal encapsulation used", HFILL
+ "Wireshark encapsulation used", HFILL
}
},
{ &hf_catapult_dct2000_unparsed_data,
diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c
index cc9fc8a245..d515ab753b 100644
--- a/epan/dissectors/packet-ccsds.c
+++ b/epan/dissectors/packet-ccsds.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -141,7 +141,7 @@ dissect_ccsds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
*/
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c
index d22b44863c..4e3630356c 100644
--- a/epan/dissectors/packet-cdp.c
+++ b/epan/dissectors/packet-cdp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c
index db17a8ded1..79c6dde2a5 100644
--- a/epan/dissectors/packet-cdt.c
+++ b/epan/dissectors/packet-cdt.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-cdt.c */
/* ../../tools/asn2eth.py -X -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn */
@@ -14,8 +14,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cdt.h b/epan/dissectors/packet-cdt.h
index 454d4ad362..5055825f4f 100644
--- a/epan/dissectors/packet-cdt.h
+++ b/epan/dissectors/packet-cdt.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-cdt.h */
/* ../../tools/asn2eth.py -X -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn */
@@ -14,8 +14,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cgmp.c b/epan/dissectors/packet-cgmp.c
index d3611c7190..f788508649 100644
--- a/epan/dissectors/packet-cgmp.c
+++ b/epan/dissectors/packet-cgmp.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c
index 8067feef35..85ca020f3d 100644
--- a/epan/dissectors/packet-chdlc.c
+++ b/epan/dissectors/packet-chdlc.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-chdlc.h b/epan/dissectors/packet-chdlc.h
index 262b80a21b..f46664d299 100644
--- a/epan/dissectors/packet-chdlc.h
+++ b/epan/dissectors/packet-chdlc.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c
index 37ca092f76..ecfcd0a4ab 100644
--- a/epan/dissectors/packet-cigi.c
+++ b/epan/dissectors/packet-cigi.c
@@ -6,8 +6,8 @@
*
* $Id: README.developer 15753 2005-09-10 19:43:41Z guy $
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -4890,7 +4890,7 @@ tvb_get_fixed_point(tvbuff_t *tvb, int offset, gint byte_order)
return fixed / 128.0F;
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_cigi(void)
{
diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c
index 52d595ebdf..623e816e3c 100644
--- a/epan/dissectors/packet-cimd.c
+++ b/epan/dissectors/packet-cimd.c
@@ -10,8 +10,8 @@
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cimd.h b/epan/dissectors/packet-cimd.h
index 6a376e838c..bf54e31f9c 100644
--- a/epan/dissectors/packet-cimd.h
+++ b/epan/dissectors/packet-cimd.h
@@ -10,8 +10,8 @@
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index 6e1077e631..0c9bb146e5 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cip.h b/epan/dissectors/packet-cip.h
index f5e64b16f7..1345f376bb 100644
--- a/epan/dissectors/packet-cip.h
+++ b/epan/dissectors/packet-cip.h
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cisco-oui.c b/epan/dissectors/packet-cisco-oui.c
index 276e160e20..92bbfc8beb 100644
--- a/epan/dissectors/packet-cisco-oui.c
+++ b/epan/dissectors/packet-cisco-oui.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cisco-wireless.c b/epan/dissectors/packet-cisco-wireless.c
index 08d0ee64f9..0915091a26 100644
--- a/epan/dissectors/packet-cisco-wireless.c
+++ b/epan/dissectors/packet-cisco-wireless.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-clearcase.c b/epan/dissectors/packet-clearcase.c
index 8f654bf38f..6ffe0f8bd6 100644
--- a/epan/dissectors/packet-clearcase.c
+++ b/epan/dissectors/packet-clearcase.c
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-clearcase.h b/epan/dissectors/packet-clearcase.h
index 9d80c0e8f7..2a8338c004 100644
--- a/epan/dissectors/packet-clearcase.h
+++ b/epan/dissectors/packet-clearcase.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-clip.c b/epan/dissectors/packet-clip.c
index cae6dd1982..669b2d8648 100644
--- a/epan/dissectors/packet-clip.c
+++ b/epan/dissectors/packet-clip.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* This file created by Thierry Andry <Thierry.Andry@advalvas.be>
* from nearly-the-same packet-raw.c created by Mike Hall <mlh@io.com>
diff --git a/epan/dissectors/packet-clip.h b/epan/dissectors/packet-clip.h
index efc0ea66ff..d901dd7a39 100644
--- a/epan/dissectors/packet-clip.h
+++ b/epan/dissectors/packet-clip.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c
index da4645bb43..bd0ff63796 100644
--- a/epan/dissectors/packet-clnp.c
+++ b/epan/dissectors/packet-clnp.c
@@ -5,8 +5,8 @@
* Laurent Deniel <laurent.deniel@free.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index a5712cc62f..873cb02ea2 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-cmip.c */
/* ../../tools/asn2eth.py -X -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cmip.h b/epan/dissectors/packet-cmip.h
index 010e9440a4..3ed36207ce 100644
--- a/epan/dissectors/packet-cmip.h
+++ b/epan/dissectors/packet-cmip.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-cmip.h */
/* ../../tools/asn2eth.py -X -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index 892d8853a5..cab4bcd2d3 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-cmp.c */
/* ../../tools/asn2eth.py -X -b -e -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cmp.h b/epan/dissectors/packet-cmp.h
index 041856832a..45e6c44f50 100644
--- a/epan/dissectors/packet-cmp.h
+++ b/epan/dissectors/packet-cmp.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-cmp.h */
/* ../../tools/asn2eth.py -X -b -e -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index 5e73ddaa7a..c229aae71b 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-cms.c */
/* ../../tools/asn2eth.py -X -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cms.h b/epan/dissectors/packet-cms.h
index 175e43005e..a95a4f7a19 100644
--- a/epan/dissectors/packet-cms.h
+++ b/epan/dissectors/packet-cms.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-cms.h */
/* ../../tools/asn2eth.py -X -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index 5aa892f194..21b3e0bdaf 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -15,12 +15,12 @@
*
* www.packetcable.com
*
- * Implemented in ethereal at April 7-8, 2004
+ * Implemented in wireshark at April 7-8, 2004
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1737,7 +1737,7 @@ static int dissect_cops_pr_object_data(tvbuff_t *tvb, packet_info *pinfo, guint3
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void proto_register_cops(void)
{
/* Setup list of header fields */
diff --git a/epan/dissectors/packet-cosine.c b/epan/dissectors/packet-cosine.c
index 7240678d39..7eec895bcd 100644
--- a/epan/dissectors/packet-cosine.c
+++ b/epan/dissectors/packet-cosine.c
@@ -5,8 +5,8 @@
*
* Motonori Shindo <mshindo@mshindo.net>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* 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/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c
index 7f28e1abcb..b2f4e85c3c 100644
--- a/epan/dissectors/packet-cpfi.c
+++ b/epan/dissectors/packet-cpfi.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-m2tp.c
@@ -362,7 +362,7 @@ dissect_cpfi(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_cpfi(void)
{
diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c
index bc4ba960c4..8c00605ac6 100644
--- a/epan/dissectors/packet-cpha.c
+++ b/epan/dissectors/packet-cpha.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c
index d690ee1c3a..8614a2e571 100644
--- a/epan/dissectors/packet-crmf.c
+++ b/epan/dissectors/packet-crmf.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-crmf.c */
/* ../../tools/asn2eth.py -X -b -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-crmf.h b/epan/dissectors/packet-crmf.h
index 6aed1c004d..86b946a608 100644
--- a/epan/dissectors/packet-crmf.h
+++ b/epan/dissectors/packet-crmf.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-crmf.h */
/* ../../tools/asn2eth.py -X -b -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c
index f244c19bb0..23e2c41647 100644
--- a/epan/dissectors/packet-csm-encaps.c
+++ b/epan/dissectors/packet-csm-encaps.c
@@ -3,8 +3,8 @@
* Copyright 2005, Angelo Bannack <angelo.bannack@siemens.com>
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2003 Gerald Combs
*
* Copied from packet-ans.c
diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c
index 6332506af8..5df4063414 100644
--- a/epan/dissectors/packet-cups.c
+++ b/epan/dissectors/packet-cups.c
@@ -1,6 +1,6 @@
/* packet-cups.c
* Routines for Common Unix Printing System (CUPS) Browsing Protocol
-* packet disassembly for the Ethereal network traffic analyzer.
+* packet disassembly for the Wireshark network traffic analyzer.
*
* Charles Levert <charles@comm.polymtl.ca>
* Copyright 2001 Charles Levert
diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c
index d9e0960776..ba2c2c88b1 100644
--- a/epan/dissectors/packet-daap.c
+++ b/epan/dissectors/packet-daap.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -358,7 +358,7 @@ dissect_daap_one_tag(proto_tree *tree, tvbuff_t *tvb, int offset, int length)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_daap(void)
{
diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c
index 51501343ce..d61a1f37a8 100644
--- a/epan/dissectors/packet-dap.c
+++ b/epan/dissectors/packet-dap.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-dap.c */
/* ../../tools/asn2eth.py -X -b -e -p dap -c dap.cnf -s packet-dap-template dap.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dap.h b/epan/dissectors/packet-dap.h
index 7756cf6637..7d7bdee4d7 100644
--- a/epan/dissectors/packet-dap.h
+++ b/epan/dissectors/packet-dap.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-dap.h */
/* ../../tools/asn2eth.py -X -b -e -p dap -c dap.cnf -s packet-dap-template dap.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c
index 29c190e524..1847eb8a6e 100644
--- a/epan/dissectors/packet-data.c
+++ b/epan/dissectors/packet-data.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-data.h b/epan/dissectors/packet-data.h
index 9109e6443b..27351412b0 100644
--- a/epan/dissectors/packet-data.h
+++ b/epan/dissectors/packet-data.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
#ifndef __PACKET_DATA_H__
#define __PACKET_DATA_H__
-/* "proto_data" is exported from libethereal.dll.
+/* "proto_data" is exported from libwireshark.dll.
* Thus we need a special declaration.
*/
ETH_VAR_IMPORT int proto_data;
diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c
index 2eb06b8382..3119adb32f 100644
--- a/epan/dissectors/packet-dccp.c
+++ b/epan/dissectors/packet-dccp.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-dccp.h b/epan/dissectors/packet-dccp.h
index 6142cae2e1..e217f03d85 100644
--- a/epan/dissectors/packet-dccp.h
+++ b/epan/dissectors/packet-dccp.h
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-dcerpc-afs4int.c b/epan/dissectors/packet-dcerpc-afs4int.c
index 26cf408bb5..4714d2ff4e 100644
--- a/epan/dissectors/packet-dcerpc-afs4int.c
+++ b/epan/dissectors/packet-dcerpc-afs4int.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-atsvc.c b/epan/dissectors/packet-dcerpc-atsvc.c
index c52319dcdf..fdf650caeb 100644
--- a/epan/dissectors/packet-dcerpc-atsvc.c
+++ b/epan/dissectors/packet-dcerpc-atsvc.c
@@ -3,9 +3,9 @@
from atsvc.idl and atsvc.cnf.
Pidl is a perl based IDL compiler for DCE/RPC idl files.
- It is maintained by the Samba team, not the Ethereal team.
+ It is maintained by the Samba team, not the Wireshark team.
Instructions on how to download and install Pidl can be
- found at http://wiki.ethereal.com/Pidl
+ found at http://wiki.wireshark.org/Pidl
*/
diff --git a/epan/dissectors/packet-dcerpc-atsvc.h b/epan/dissectors/packet-dcerpc-atsvc.h
index 10ad9a58d1..d53afe4be4 100644
--- a/epan/dissectors/packet-dcerpc-atsvc.h
+++ b/epan/dissectors/packet-dcerpc-atsvc.h
@@ -5,9 +5,9 @@
from atsvc.idl and atsvc.cnf.
Pidl is a perl based IDL compiler for DCE/RPC idl files.
- It is maintained by the Samba team, not the Ethereal team.
+ It is maintained by the Samba team, not the Wireshark team.
Instructions on how to download and install Pidl can be
- found at http://wiki.ethereal.com/Pidl
+ found at http://wiki.wireshark.org/Pidl
*/
diff --git a/epan/dissectors/packet-dcerpc-bossvr.c b/epan/dissectors/packet-dcerpc-bossvr.c
index ea13a37ab1..ba7072d97b 100644
--- a/epan/dissectors/packet-dcerpc-bossvr.c
+++ b/epan/dissectors/packet-dcerpc-bossvr.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-browser.c b/epan/dissectors/packet-dcerpc-browser.c
index 6a086ebcba..39cffa8d31 100644
--- a/epan/dissectors/packet-dcerpc-browser.c
+++ b/epan/dissectors/packet-dcerpc-browser.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -98,7 +98,7 @@ dissect_browser_TYPE_4_data(tvbuff_t *tvb, int offset,
di=pinfo->private_data;
if(di->conformant_run){
- /* this call is to make ethereal eat the array header for the conformant run */
+ /* this call is to make wireshark eat the array header for the conformant run */
offset =dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, NULL);
return offset;
@@ -147,7 +147,7 @@ dissect_browser_TYPE_3_data(tvbuff_t *tvb, int offset,
di=pinfo->private_data;
if(di->conformant_run){
- /* this call is to make ethereal eat the array header for the conformant run */
+ /* this call is to make wireshark eat the array header for the conformant run */
offset =dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, NULL);
return offset;
@@ -753,7 +753,7 @@ dissect_browser_TYPE_9_data(tvbuff_t *tvb, int offset,
di=pinfo->private_data;
if(di->conformant_run){
- /* this call is to make ethereal eat the array header for the conformant run */
+ /* this call is to make wireshark eat the array header for the conformant run */
offset =dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, NULL);
return offset;
@@ -945,7 +945,7 @@ dissect_browser_TYPE_12_data(tvbuff_t *tvb, int offset,
di=pinfo->private_data;
if(di->conformant_run){
- /* this call is to make ethereal eat the array header for the conformant run */
+ /* this call is to make wireshark eat the array header for the conformant run */
offset =dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, NULL);
return offset;
@@ -1155,19 +1155,19 @@ static hf_register_info hf[] = {
{ &hf_browser_unknown_long, {
"Unknown long", "rpc_browser.unknown.long", FT_UINT32, BASE_HEX,
- NULL, 0x0, "Unknown long. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown long. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_browser_unknown_hyper, {
"Unknown hyper", "rpc_browser.unknown.hyper", FT_UINT64, BASE_HEX,
- NULL, 0x0, "Unknown hyper. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown hyper. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_browser_unknown_bytes, {
"Unknown bytes", "rpc_browser.unknown.bytes", FT_BYTES, BASE_HEX,
- NULL, 0x0, "Unknown bytes. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown bytes. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_browser_unknown_string, {
"Unknown string", "rpc_browser.unknown.string", FT_STRING, BASE_HEX,
- NULL, 0x0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }}
+ NULL, 0x0, "Unknown string. If you know what this is, contact wireshark developers.", HFILL }}
};
static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-browser.h b/epan/dissectors/packet-dcerpc-browser.h
index 3a434c8b87..3449145690 100644
--- a/epan/dissectors/packet-dcerpc-browser.h
+++ b/epan/dissectors/packet-dcerpc-browser.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-budb.c b/epan/dissectors/packet-dcerpc-budb.c
index 9e574d6180..5bdd17ca38 100644
--- a/epan/dissectors/packet-dcerpc-budb.c
+++ b/epan/dissectors/packet-dcerpc-budb.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-budb.h b/epan/dissectors/packet-dcerpc-budb.h
index 931df0cab5..93e29a311a 100644
--- a/epan/dissectors/packet-dcerpc-budb.h
+++ b/epan/dissectors/packet-dcerpc-budb.h
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-butc.c b/epan/dissectors/packet-dcerpc-butc.c
index c593928679..31aa696332 100644
--- a/epan/dissectors/packet-dcerpc-butc.c
+++ b/epan/dissectors/packet-dcerpc-butc.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-butc.h b/epan/dissectors/packet-dcerpc-butc.h
index 2dfb4fdb7e..913c60b376 100644
--- a/epan/dissectors/packet-dcerpc-butc.h
+++ b/epan/dissectors/packet-dcerpc-butc.h
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-cds_clerkserver.c b/epan/dissectors/packet-dcerpc-cds_clerkserver.c
index f708de6d75..a1312513e7 100644
--- a/epan/dissectors/packet-dcerpc-cds_clerkserver.c
+++ b/epan/dissectors/packet-dcerpc-cds_clerkserver.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-cds_solicit.c b/epan/dissectors/packet-dcerpc-cds_solicit.c
index 6cb1375b51..e0e89fba3e 100644
--- a/epan/dissectors/packet-dcerpc-cds_solicit.c
+++ b/epan/dissectors/packet-dcerpc-cds_solicit.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-conv.c b/epan/dissectors/packet-dcerpc-conv.c
index bc8d3e77cc..c093edddb8 100644
--- a/epan/dissectors/packet-dcerpc-conv.c
+++ b/epan/dissectors/packet-dcerpc-conv.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-cprpc_server.c b/epan/dissectors/packet-dcerpc-cprpc_server.c
index bb7b2f1200..e07a88c034 100644
--- a/epan/dissectors/packet-dcerpc-cprpc_server.c
+++ b/epan/dissectors/packet-dcerpc-cprpc_server.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-dce122.c b/epan/dissectors/packet-dcerpc-dce122.c
index fad4da9d34..2ae8157d46 100644
--- a/epan/dissectors/packet-dcerpc-dce122.c
+++ b/epan/dissectors/packet-dcerpc-dce122.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-dce122.h b/epan/dissectors/packet-dcerpc-dce122.h
index 270ef03a7b..bad6cbc50f 100644
--- a/epan/dissectors/packet-dcerpc-dce122.h
+++ b/epan/dissectors/packet-dcerpc-dce122.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-dcom.h b/epan/dissectors/packet-dcerpc-dcom.h
index f07b48a1cf..56a42bb327 100644
--- a/epan/dissectors/packet-dcerpc-dcom.h
+++ b/epan/dissectors/packet-dcerpc-dcom.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-dfs.c b/epan/dissectors/packet-dcerpc-dfs.c
index 84f887c9dd..2654573e17 100644
--- a/epan/dissectors/packet-dcerpc-dfs.c
+++ b/epan/dissectors/packet-dcerpc-dfs.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-dfs.h b/epan/dissectors/packet-dcerpc-dfs.h
index 672495bdce..edef854a0a 100644
--- a/epan/dissectors/packet-dcerpc-dfs.h
+++ b/epan/dissectors/packet-dcerpc-dfs.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-dnsserver.c b/epan/dissectors/packet-dcerpc-dnsserver.c
index 3e2fc1c97b..1b460eb6a0 100644
--- a/epan/dissectors/packet-dcerpc-dnsserver.c
+++ b/epan/dissectors/packet-dcerpc-dnsserver.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-dnsserver.h b/epan/dissectors/packet-dcerpc-dnsserver.h
index 39b13f0a58..a7f1738992 100644
--- a/epan/dissectors/packet-dcerpc-dnsserver.h
+++ b/epan/dissectors/packet-dcerpc-dnsserver.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-drsuapi.c b/epan/dissectors/packet-dcerpc-drsuapi.c
index d9432fbcaf..5f1d0de848 100644
--- a/epan/dissectors/packet-dcerpc-drsuapi.c
+++ b/epan/dissectors/packet-dcerpc-drsuapi.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-drsuapi.h b/epan/dissectors/packet-dcerpc-drsuapi.h
index fdf5c2a91b..2f1ac0f145 100644
--- a/epan/dissectors/packet-dcerpc-drsuapi.h
+++ b/epan/dissectors/packet-dcerpc-drsuapi.h
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-dssetup.c b/epan/dissectors/packet-dcerpc-dssetup.c
index 30494a2f94..4117e68ccb 100644
--- a/epan/dissectors/packet-dcerpc-dssetup.c
+++ b/epan/dissectors/packet-dcerpc-dssetup.c
@@ -3,9 +3,9 @@
from dssetup.idl and dssetup.cnf.
Pidl is a perl based IDL compiler for DCE/RPC idl files.
- It is maintained by the Samba team, not the Ethereal team.
+ It is maintained by the Samba team, not the Wireshark team.
Instructions on how to download and install Pidl can be
- found at http://wiki.ethereal.com/Pidl
+ found at http://wiki.wireshark.org/Pidl
*/
diff --git a/epan/dissectors/packet-dcerpc-dssetup.h b/epan/dissectors/packet-dcerpc-dssetup.h
index d9f50f738b..80163e1367 100644
--- a/epan/dissectors/packet-dcerpc-dssetup.h
+++ b/epan/dissectors/packet-dcerpc-dssetup.h
@@ -5,9 +5,9 @@
from dssetup.idl and dssetup.cnf.
Pidl is a perl based IDL compiler for DCE/RPC idl files.
- It is maintained by the Samba team, not the Ethereal team.
+ It is maintained by the Samba team, not the Wireshark team.
Instructions on how to download and install Pidl can be
- found at http://wiki.ethereal.com/Pidl
+ found at http://wiki.wireshark.org/Pidl
*/
diff --git a/epan/dissectors/packet-dcerpc-dtsprovider.c b/epan/dissectors/packet-dcerpc-dtsprovider.c
index c564e11b68..3a48000abd 100644
--- a/epan/dissectors/packet-dcerpc-dtsprovider.c
+++ b/epan/dissectors/packet-dcerpc-dtsprovider.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-dtsstime_req.c b/epan/dissectors/packet-dcerpc-dtsstime_req.c
index e45d36c546..a86c9349fc 100644
--- a/epan/dissectors/packet-dcerpc-dtsstime_req.c
+++ b/epan/dissectors/packet-dcerpc-dtsstime_req.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-efs.c b/epan/dissectors/packet-dcerpc-efs.c
index fe074f3e89..ef3bbe56a8 100644
--- a/epan/dissectors/packet-dcerpc-efs.c
+++ b/epan/dissectors/packet-dcerpc-efs.c
@@ -10,8 +10,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-efs.h b/epan/dissectors/packet-dcerpc-efs.h
index d1e1294058..00dd35d17f 100644
--- a/epan/dissectors/packet-dcerpc-efs.h
+++ b/epan/dissectors/packet-dcerpc-efs.h
@@ -9,8 +9,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c
index 26b90c71cd..a749b6ca33 100644
--- a/epan/dissectors/packet-dcerpc-epm.c
+++ b/epan/dissectors/packet-dcerpc-epm.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-eventlog.c b/epan/dissectors/packet-dcerpc-eventlog.c
index 91b4d7f2f9..2c26f7d894 100644
--- a/epan/dissectors/packet-dcerpc-eventlog.c
+++ b/epan/dissectors/packet-dcerpc-eventlog.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-eventlog.h b/epan/dissectors/packet-dcerpc-eventlog.h
index 1c8e37eacc..18d9a6f048 100644
--- a/epan/dissectors/packet-dcerpc-eventlog.h
+++ b/epan/dissectors/packet-dcerpc-eventlog.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c
index f709b7bb87..ba4046dfe4 100644
--- a/epan/dissectors/packet-dcerpc-fldb.c
+++ b/epan/dissectors/packet-dcerpc-fldb.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-frsapi.c b/epan/dissectors/packet-dcerpc-frsapi.c
index 979e708f06..8532c55a29 100644
--- a/epan/dissectors/packet-dcerpc-frsapi.c
+++ b/epan/dissectors/packet-dcerpc-frsapi.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-frsapi.h b/epan/dissectors/packet-dcerpc-frsapi.h
index dbd2ba9f5f..34ca11c928 100644
--- a/epan/dissectors/packet-dcerpc-frsapi.h
+++ b/epan/dissectors/packet-dcerpc-frsapi.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-frsrpc.c b/epan/dissectors/packet-dcerpc-frsrpc.c
index 805e45b661..57672b41e6 100644
--- a/epan/dissectors/packet-dcerpc-frsrpc.c
+++ b/epan/dissectors/packet-dcerpc-frsrpc.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-frsrpc.h b/epan/dissectors/packet-dcerpc-frsrpc.h
index 8132405395..8133ea9ed7 100644
--- a/epan/dissectors/packet-dcerpc-frsrpc.h
+++ b/epan/dissectors/packet-dcerpc-frsrpc.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-ftserver.c b/epan/dissectors/packet-dcerpc-ftserver.c
index 8d3223e088..4e998ac138 100644
--- a/epan/dissectors/packet-dcerpc-ftserver.c
+++ b/epan/dissectors/packet-dcerpc-ftserver.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-icl_rpc.c b/epan/dissectors/packet-dcerpc-icl_rpc.c
index 16016e6eb7..dcd70165c4 100644
--- a/epan/dissectors/packet-dcerpc-icl_rpc.c
+++ b/epan/dissectors/packet-dcerpc-icl_rpc.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-initshutdown.c b/epan/dissectors/packet-dcerpc-initshutdown.c
index 33e62ba34a..90c6d6b78f 100644
--- a/epan/dissectors/packet-dcerpc-initshutdown.c
+++ b/epan/dissectors/packet-dcerpc-initshutdown.c
@@ -3,9 +3,9 @@
from initshutdown.idl and initshutdown.cnf.
Pidl is a perl based IDL compiler for DCE/RPC idl files.
- It is maintained by the Samba team, not the Ethereal team.
+ It is maintained by the Samba team, not the Wireshark team.
Instructions on how to download and install Pidl can be
- found at http://wiki.ethereal.com/Pidl
+ found at http://wiki.wireshark.org/Pidl
*/
diff --git a/epan/dissectors/packet-dcerpc-initshutdown.h b/epan/dissectors/packet-dcerpc-initshutdown.h
index e4a8eb4b77..ae23dbefa5 100644
--- a/epan/dissectors/packet-dcerpc-initshutdown.h
+++ b/epan/dissectors/packet-dcerpc-initshutdown.h
@@ -5,9 +5,9 @@
from initshutdown.idl and initshutdown.cnf.
Pidl is a perl based IDL compiler for DCE/RPC idl files.
- It is maintained by the Samba team, not the Ethereal team.
+ It is maintained by the Samba team, not the Wireshark team.
Instructions on how to download and install Pidl can be
- found at http://wiki.ethereal.com/Pidl
+ found at http://wiki.wireshark.org/Pidl
*/
diff --git a/epan/dissectors/packet-dcerpc-krb5rpc.c b/epan/dissectors/packet-dcerpc-krb5rpc.c
index b062e52db9..6d8442fe32 100644
--- a/epan/dissectors/packet-dcerpc-krb5rpc.c
+++ b/epan/dissectors/packet-dcerpc-krb5rpc.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-llb.c b/epan/dissectors/packet-dcerpc-llb.c
index efbd3e90b4..434f7ae4a4 100644
--- a/epan/dissectors/packet-dcerpc-llb.c
+++ b/epan/dissectors/packet-dcerpc-llb.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c
index 2163e921fa..07c4aa0bf2 100644
--- a/epan/dissectors/packet-dcerpc-lsa.c
+++ b/epan/dissectors/packet-dcerpc-lsa.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -4177,7 +4177,7 @@ proto_register_dcerpc_lsa(void)
{ &hf_lsa_unknown_string,
{ "Unknown string", "lsa.unknown_string", FT_STRING, BASE_NONE,
- NULL, 0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0, "Unknown string. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_lsa_hnd,
{ "Context Handle", "lsa.hnd", FT_BYTES, BASE_NONE,
@@ -4193,19 +4193,19 @@ proto_register_dcerpc_lsa(void)
{ &hf_lsa_unknown_hyper,
{ "Unknown hyper", "lsa.unknown.hyper", FT_UINT64, BASE_HEX,
- NULL, 0x0, "Unknown hyper. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown hyper. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_lsa_unknown_long,
{ "Unknown long", "lsa.unknown.long", FT_UINT32, BASE_HEX,
- NULL, 0x0, "Unknown long. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown long. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_lsa_unknown_short,
{ "Unknown short", "lsa.unknown.short", FT_UINT16, BASE_HEX,
- NULL, 0x0, "Unknown short. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown short. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_lsa_unknown_char,
{ "Unknown char", "lsa.unknown.char", FT_UINT8, BASE_HEX,
- NULL, 0x0, "Unknown char. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown char. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_lsa_rc,
{ "Return code", "lsa.rc", FT_UINT32, BASE_HEX,
diff --git a/epan/dissectors/packet-dcerpc-lsa.h b/epan/dissectors/packet-dcerpc-lsa.h
index 271d051626..73d28e3495 100644
--- a/epan/dissectors/packet-dcerpc-lsa.h
+++ b/epan/dissectors/packet-dcerpc-lsa.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c
index 8765704901..98a1cb55de 100644
--- a/epan/dissectors/packet-dcerpc-mapi.c
+++ b/epan/dissectors/packet-dcerpc-mapi.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -332,15 +332,15 @@ static hf_register_info hf[] = {
{ &hf_mapi_unknown_string,
{ "Unknown string", "mapi.unknown_string", FT_STRING, BASE_NONE,
- NULL, 0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0, "Unknown string. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_mapi_unknown_short,
{ "Unknown short", "mapi.unknown_short", FT_UINT16, BASE_HEX,
- NULL, 0, "Unknown short. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0, "Unknown short. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_mapi_unknown_long,
{ "Unknown long", "mapi.unknown_long", FT_UINT32, BASE_HEX,
- NULL, 0, "Unknown long. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0, "Unknown long. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_mapi_encap_datalen,
{ "Length", "mapi.encap_len", FT_UINT16, BASE_DEC,
diff --git a/epan/dissectors/packet-dcerpc-mapi.h b/epan/dissectors/packet-dcerpc-mapi.h
index ca92d508e9..d573ffd39e 100644
--- a/epan/dissectors/packet-dcerpc-mapi.h
+++ b/epan/dissectors/packet-dcerpc-mapi.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-messenger.c b/epan/dissectors/packet-dcerpc-messenger.c
index e3fba3734e..33b7ae38e4 100644
--- a/epan/dissectors/packet-dcerpc-messenger.c
+++ b/epan/dissectors/packet-dcerpc-messenger.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-mgmt.c b/epan/dissectors/packet-dcerpc-mgmt.c
index ac4f3e56a5..a7449f2c76 100644
--- a/epan/dissectors/packet-dcerpc-mgmt.c
+++ b/epan/dissectors/packet-dcerpc-mgmt.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-ndr.c b/epan/dissectors/packet-dcerpc-ndr.c
index 08dac9f2a1..34a6599764 100644
--- a/epan/dissectors/packet-dcerpc-ndr.c
+++ b/epan/dissectors/packet-dcerpc-ndr.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c
index 79f6a54d30..5b0f90df4a 100644
--- a/epan/dissectors/packet-dcerpc-netlogon.c
+++ b/epan/dissectors/packet-dcerpc-netlogon.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -6731,20 +6731,20 @@ static hf_register_info hf[] = {
{ &hf_netlogon_unknown_string,
{ "Unknown string", "netlogon.unknown_string", FT_STRING, BASE_NONE,
- NULL, 0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0, "Unknown string. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_netlogon_unknown_long,
{ "Unknown long", "netlogon.unknown.long", FT_UINT32, BASE_HEX,
- NULL, 0x0, "Unknown long. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown long. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_netlogon_reserved,
{ "Reserved", "netlogon.reserved", FT_UINT32, BASE_HEX,
NULL, 0x0, "Reserved", HFILL }},
{ &hf_netlogon_unknown_short,
{ "Unknown short", "netlogon.unknown.short", FT_UINT16, BASE_HEX,
- NULL, 0x0, "Unknown short. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown short. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_netlogon_unknown_char,
{ "Unknown char", "netlogon.unknown.char", FT_UINT8, BASE_HEX,
- NULL, 0x0, "Unknown char. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown char. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_netlogon_acct_expiry_time,
{ "Acct Expiry Time", "netlogon.acct.expiry_time", FT_ABSOLUTE_TIME, BASE_NONE,
diff --git a/epan/dissectors/packet-dcerpc-netlogon.h b/epan/dissectors/packet-dcerpc-netlogon.h
index 429d525e78..281b1a979f 100644
--- a/epan/dissectors/packet-dcerpc-netlogon.h
+++ b/epan/dissectors/packet-dcerpc-netlogon.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-nspi.c b/epan/dissectors/packet-dcerpc-nspi.c
index 459bd503d9..57cc2b7390 100644
--- a/epan/dissectors/packet-dcerpc-nspi.c
+++ b/epan/dissectors/packet-dcerpc-nspi.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c
index a869e2c90e..798db3e289 100644
--- a/epan/dissectors/packet-dcerpc-nt.c
+++ b/epan/dissectors/packet-dcerpc-nt.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -41,7 +41,7 @@
/*
* This file contains helper routines that are used by the DCERPC over SMB
- * dissectors for ethereal.
+ * dissectors for wireshark.
*/
/*
@@ -1684,7 +1684,7 @@ void dcerpc_smb_init(int proto_dcerpc)
{ "Unknown char", "nt.unknown.char",
FT_UINT8, BASE_HEX, NULL, 0x0,
"Unknown char. If you know what this is, contact "
- "ethereal developers.", HFILL }},
+ "wireshark developers.", HFILL }},
/* Misc */
diff --git a/epan/dissectors/packet-dcerpc-nt.h b/epan/dissectors/packet-dcerpc-nt.h
index 81a8ed79c1..adb85c8d39 100644
--- a/epan/dissectors/packet-dcerpc-nt.h
+++ b/epan/dissectors/packet-dcerpc-nt.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-pnp.c b/epan/dissectors/packet-dcerpc-pnp.c
index 805291ef98..5de5147421 100644
--- a/epan/dissectors/packet-dcerpc-pnp.c
+++ b/epan/dissectors/packet-dcerpc-pnp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-pnp.h b/epan/dissectors/packet-dcerpc-pnp.h
index c246ebb870..a6561fbd5f 100644
--- a/epan/dissectors/packet-dcerpc-pnp.h
+++ b/epan/dissectors/packet-dcerpc-pnp.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rdaclif.c b/epan/dissectors/packet-dcerpc-rdaclif.c
index fb0b431f96..4a0a44e5f0 100644
--- a/epan/dissectors/packet-dcerpc-rdaclif.c
+++ b/epan/dissectors/packet-dcerpc-rdaclif.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rep_proc.c b/epan/dissectors/packet-dcerpc-rep_proc.c
index 350b22ade1..463361a141 100644
--- a/epan/dissectors/packet-dcerpc-rep_proc.c
+++ b/epan/dissectors/packet-dcerpc-rep_proc.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-roverride.c b/epan/dissectors/packet-dcerpc-roverride.c
index 1423a6376a..6f2a8a354a 100644
--- a/epan/dissectors/packet-dcerpc-roverride.c
+++ b/epan/dissectors/packet-dcerpc-roverride.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c
index 50018c7b03..4ca249afc7 100644
--- a/epan/dissectors/packet-dcerpc-rpriv.c
+++ b/epan/dissectors/packet-dcerpc-rpriv.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rras.c b/epan/dissectors/packet-dcerpc-rras.c
index 19db413ba2..e05ea1b5df 100644
--- a/epan/dissectors/packet-dcerpc-rras.c
+++ b/epan/dissectors/packet-dcerpc-rras.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rras.h b/epan/dissectors/packet-dcerpc-rras.h
index 649adc2369..785f3da7e7 100644
--- a/epan/dissectors/packet-dcerpc-rras.h
+++ b/epan/dissectors/packet-dcerpc-rras.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c
index f5d38ecb7e..0586bf7dd3 100644
--- a/epan/dissectors/packet-dcerpc-rs_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_acct.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_attr.c b/epan/dissectors/packet-dcerpc-rs_attr.c
index 7c6f3f3e8e..9833671b4d 100644
--- a/epan/dissectors/packet-dcerpc-rs_attr.c
+++ b/epan/dissectors/packet-dcerpc-rs_attr.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_attr_schema.c b/epan/dissectors/packet-dcerpc-rs_attr_schema.c
index 7f3d768678..0a5e32f78a 100644
--- a/epan/dissectors/packet-dcerpc-rs_attr_schema.c
+++ b/epan/dissectors/packet-dcerpc-rs_attr_schema.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_bind.c b/epan/dissectors/packet-dcerpc-rs_bind.c
index eda49acbeb..e549647894 100644
--- a/epan/dissectors/packet-dcerpc-rs_bind.c
+++ b/epan/dissectors/packet-dcerpc-rs_bind.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_misc.c b/epan/dissectors/packet-dcerpc-rs_misc.c
index 27fb388910..4bae922f26 100644
--- a/epan/dissectors/packet-dcerpc-rs_misc.c
+++ b/epan/dissectors/packet-dcerpc-rs_misc.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c
index 70219453c9..dc1cd66c4d 100644
--- a/epan/dissectors/packet-dcerpc-rs_pgo.c
+++ b/epan/dissectors/packet-dcerpc-rs_pgo.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_plcy.c b/epan/dissectors/packet-dcerpc-rs_plcy.c
index 58b499d010..c40badbeca 100644
--- a/epan/dissectors/packet-dcerpc-rs_plcy.c
+++ b/epan/dissectors/packet-dcerpc-rs_plcy.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acct.c b/epan/dissectors/packet-dcerpc-rs_prop_acct.c
index 49f0401659..d8ca51cfd5 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_acct.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acl.c b/epan/dissectors/packet-dcerpc-rs_prop_acl.c
index 2a96a833bb..4105f69380 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_acl.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_acl.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_attr.c b/epan/dissectors/packet-dcerpc-rs_prop_attr.c
index f03bbfe0ae..a6213f19b3 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_attr.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_attr.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c
index 5dbe7a9d3f..14c787db4a 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c
index afcace8964..f4c3b67c17 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
index 7e029e1ccf..a8771eaa64 100644
--- a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
+++ b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_repadm.c b/epan/dissectors/packet-dcerpc-rs_repadm.c
index 6f1d035595..66f36e871b 100644
--- a/epan/dissectors/packet-dcerpc-rs_repadm.c
+++ b/epan/dissectors/packet-dcerpc-rs_repadm.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_replist.c b/epan/dissectors/packet-dcerpc-rs_replist.c
index e0baac8d3a..c4bc742b6f 100644
--- a/epan/dissectors/packet-dcerpc-rs_replist.c
+++ b/epan/dissectors/packet-dcerpc-rs_replist.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_repmgr.c b/epan/dissectors/packet-dcerpc-rs_repmgr.c
index d9e52e9359..502ab34451 100644
--- a/epan/dissectors/packet-dcerpc-rs_repmgr.c
+++ b/epan/dissectors/packet-dcerpc-rs_repmgr.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rs_unix.c b/epan/dissectors/packet-dcerpc-rs_unix.c
index e51963adfa..b066a81c12 100644
--- a/epan/dissectors/packet-dcerpc-rs_unix.c
+++ b/epan/dissectors/packet-dcerpc-rs_unix.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-rsec_login.c b/epan/dissectors/packet-dcerpc-rsec_login.c
index 26b11e304c..9c14c6b1f1 100644
--- a/epan/dissectors/packet-dcerpc-rsec_login.c
+++ b/epan/dissectors/packet-dcerpc-rsec_login.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c
index 4adde821a3..49a8c26b79 100644
--- a/epan/dissectors/packet-dcerpc-samr.c
+++ b/epan/dissectors/packet-dcerpc-samr.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1759,7 +1759,7 @@ decrypt_tvb_using_nt_password(packet_info *pinfo, tvbuff_t *tvb, int offset, int
over SMB" page 257. Note that this code does not properly support
Unicode. */
- /* Convert the password provided in the Ethereal GUI to Unicode
+ /* Convert the password provided in the Wireshark GUI to Unicode
(UCS-2). Since the input is always ASCII, we can just fake
it and pad every other byte with a NUL. If we ever support
UTF-8 in the GUI, we would have to perform a real UTF-8 to
@@ -5223,22 +5223,22 @@ proto_register_dcerpc_samr(void)
{ &hf_samr_unknown_string,
{ "Unknown string", "samr.unknown_string", FT_STRING, BASE_NONE,
- NULL, 0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0, "Unknown string. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_samr_unknown_hyper,
{ "Unknown hyper", "samr.unknown.hyper", FT_UINT64, BASE_HEX,
- NULL, 0x0, "Unknown hyper. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown hyper. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_samr_unknown_long,
{ "Unknown long", "samr.unknown.long", FT_UINT32, BASE_HEX,
- NULL, 0x0, "Unknown long. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown long. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_samr_unknown_short,
{ "Unknown short", "samr.unknown.short", FT_UINT16, BASE_HEX,
- NULL, 0x0, "Unknown short. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown short. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_samr_unknown_char,
{ "Unknown char", "samr.unknown.char", FT_UINT8, BASE_HEX,
- NULL, 0x0, "Unknown char. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown char. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_samr_revision,
{ "Revision", "samr.revision", FT_UINT64, BASE_HEX,
@@ -5334,7 +5334,7 @@ proto_register_dcerpc_samr(void)
NULL, 0, "Minimum Password Age before it can be changed", HFILL }},
{ &hf_samr_unknown_time,
{ "Unknown time", "samr.unknown_time", FT_ABSOLUTE_TIME, BASE_NONE,
- NULL, 0, "Unknown NT TIME, contact ethereal developers if you know what this is", HFILL }},
+ NULL, 0, "Unknown NT TIME, contact wireshark developers if you know what this is", HFILL }},
{ &hf_samr_logon_time,
{ "Last Logon Time", "samr.logon_time", FT_ABSOLUTE_TIME, BASE_NONE,
NULL, 0, "Time for last time this user logged on", HFILL }},
diff --git a/epan/dissectors/packet-dcerpc-samr.h b/epan/dissectors/packet-dcerpc-samr.h
index 85acd1895d..cd765b97a1 100644
--- a/epan/dissectors/packet-dcerpc-samr.h
+++ b/epan/dissectors/packet-dcerpc-samr.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-secidmap.c b/epan/dissectors/packet-dcerpc-secidmap.c
index 9161d52422..b6506c8830 100644
--- a/epan/dissectors/packet-dcerpc-secidmap.c
+++ b/epan/dissectors/packet-dcerpc-secidmap.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c
index 9dd5a95538..c123be1402 100644
--- a/epan/dissectors/packet-dcerpc-spoolss.c
+++ b/epan/dissectors/packet-dcerpc-spoolss.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -2414,7 +2414,7 @@ static int dissect_USER_LEVEL_1(tvbuff_t *tvb, int offset,
guint32 level;
/* Guy has pointed out that this dissection looks wrong. In
- the ethereal output for a USER_LEVEL_1 it looks like the
+ the wireshark output for a USER_LEVEL_1 it looks like the
info level and container pointer are transposed. I'm not
even sure this structure is a container. */
diff --git a/epan/dissectors/packet-dcerpc-spoolss.h b/epan/dissectors/packet-dcerpc-spoolss.h
index 34a718dbaa..fd0c6da05c 100644
--- a/epan/dissectors/packet-dcerpc-spoolss.h
+++ b/epan/dissectors/packet-dcerpc-spoolss.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-srvsvc.c b/epan/dissectors/packet-dcerpc-srvsvc.c
index 092af7a59b..a91a75b6de 100644
--- a/epan/dissectors/packet-dcerpc-srvsvc.c
+++ b/epan/dissectors/packet-dcerpc-srvsvc.c
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -5445,7 +5445,7 @@ srvsvc_dissect_DISK_INFO_0(tvbuff_t *tvb, int offset,
di=pinfo->private_data;
if(di->conformant_run){
- /* this call is to make ethereal eat the array header for the conformant run */
+ /* this call is to make wireshark eat the array header for the conformant run */
offset =dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, NULL);
return offset;
@@ -6233,7 +6233,7 @@ srvsvc_dissect_netrpathcanonicalize_reply(tvbuff_t *tvb, int offset,
di=pinfo->private_data;
if(di->conformant_run){
- /* this call is to make ethereal eat the array header for the conformant run */
+ /* this call is to make wireshark eat the array header for the conformant run */
offset =dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, NULL);
return offset;
@@ -6377,7 +6377,7 @@ srvsvc_dissect_netrnamecanonicalize_reply(tvbuff_t *tvb, int offset,
di=pinfo->private_data;
if(di->conformant_run){
- /* this call is to make ethereal eat the array header for the conformant run */
+ /* this call is to make wireshark eat the array header for the conformant run */
offset =dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, NULL);
return offset;
@@ -7027,7 +7027,7 @@ proto_register_dcerpc_srvsvc(void)
BASE_HEX, NULL, 0x0, "Permissions", HFILL}},
{ &hf_srvsvc_dfs_root_flags,
{ "DFS Root Flags", "srvsvc.dfs_root_flags", FT_UINT32,
- BASE_HEX, NULL, 0x0, "DFS Root Flags. Contact ethereal developers if you know what the bits are", HFILL}},
+ BASE_HEX, NULL, 0x0, "DFS Root Flags. Contact wireshark developers if you know what the bits are", HFILL}},
{ &hf_srvsvc_policy,
{ "Policy", "srvsvc.policy", FT_UINT32,
BASE_HEX, NULL, 0x0, "Policy", HFILL}},
diff --git a/epan/dissectors/packet-dcerpc-srvsvc.h b/epan/dissectors/packet-dcerpc-srvsvc.h
index 008b2624ad..8e120511d0 100644
--- a/epan/dissectors/packet-dcerpc-srvsvc.h
+++ b/epan/dissectors/packet-dcerpc-srvsvc.h
@@ -9,8 +9,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-svcctl.c b/epan/dissectors/packet-dcerpc-svcctl.c
index fb339f5d94..8f55a1d3bf 100644
--- a/epan/dissectors/packet-dcerpc-svcctl.c
+++ b/epan/dissectors/packet-dcerpc-svcctl.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-svcctl.h b/epan/dissectors/packet-dcerpc-svcctl.h
index f5431e7746..689b5ea105 100644
--- a/epan/dissectors/packet-dcerpc-svcctl.h
+++ b/epan/dissectors/packet-dcerpc-svcctl.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-tapi.c b/epan/dissectors/packet-dcerpc-tapi.c
index acc6224a4b..846fe0496c 100644
--- a/epan/dissectors/packet-dcerpc-tapi.c
+++ b/epan/dissectors/packet-dcerpc-tapi.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -121,7 +121,7 @@ dissect_tapi_TYPE_1(tvbuff_t *tvb, int offset,
di=pinfo->private_data;
if(di->conformant_run){
- /* this call is to make ethereal eat the array header for the conformant run */
+ /* this call is to make wireshark eat the array header for the conformant run */
offset =dissect_ndr_ucvarray(tvb, offset, pinfo, tree, drep, NULL);
return offset;
@@ -215,13 +215,13 @@ static hf_register_info hf[] = {
NULL, 0x0, "Context handle", HFILL }},
{ &hf_tapi_unknown_long, {
"Unknown long", "tapi.unknown.long", FT_UINT32, BASE_HEX,
- NULL, 0x0, "Unknown long. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown long. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_tapi_unknown_string, {
"Unknown string", "tapi.unknown.string", FT_STRING, BASE_HEX,
- NULL, 0x0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }},
+ NULL, 0x0, "Unknown string. If you know what this is, contact wireshark developers.", HFILL }},
{ &hf_tapi_unknown_bytes, {
"Unknown bytes", "tapi.unknown.bytes", FT_BYTES, BASE_HEX,
- NULL, 0x0, "Unknown bytes. If you know what this is, contact ethereal developers.", HFILL }}
+ NULL, 0x0, "Unknown bytes. If you know what this is, contact wireshark developers.", HFILL }}
};
static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-tapi.h b/epan/dissectors/packet-dcerpc-tapi.h
index 8749c79401..0cd223c5b3 100644
--- a/epan/dissectors/packet-dcerpc-tapi.h
+++ b/epan/dissectors/packet-dcerpc-tapi.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-tkn4int.c b/epan/dissectors/packet-dcerpc-tkn4int.c
index 55a5376595..68afd63bb5 100644
--- a/epan/dissectors/packet-dcerpc-tkn4int.c
+++ b/epan/dissectors/packet-dcerpc-tkn4int.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-trksvr.c b/epan/dissectors/packet-dcerpc-trksvr.c
index 9c068ebd96..d397eb1818 100644
--- a/epan/dissectors/packet-dcerpc-trksvr.c
+++ b/epan/dissectors/packet-dcerpc-trksvr.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-ubikdisk.c b/epan/dissectors/packet-dcerpc-ubikdisk.c
index c68b3d7e04..fd652378fd 100644
--- a/epan/dissectors/packet-dcerpc-ubikdisk.c
+++ b/epan/dissectors/packet-dcerpc-ubikdisk.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-ubikvote.c b/epan/dissectors/packet-dcerpc-ubikvote.c
index eb9e79d162..2427201ca1 100644
--- a/epan/dissectors/packet-dcerpc-ubikvote.c
+++ b/epan/dissectors/packet-dcerpc-ubikvote.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-update.c b/epan/dissectors/packet-dcerpc-update.c
index 9da2fa232e..b926f5ae02 100644
--- a/epan/dissectors/packet-dcerpc-update.c
+++ b/epan/dissectors/packet-dcerpc-update.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-winreg.c b/epan/dissectors/packet-dcerpc-winreg.c
index 77ee7a1559..9c3172a6f3 100644
--- a/epan/dissectors/packet-dcerpc-winreg.c
+++ b/epan/dissectors/packet-dcerpc-winreg.c
@@ -3,9 +3,9 @@
from winreg.idl and winreg.cnf.
Pidl is a perl based IDL compiler for DCE/RPC idl files.
- It is maintained by the Samba team, not the Ethereal team.
+ It is maintained by the Samba team, not the Wireshark team.
Instructions on how to download and install Pidl can be
- found at http://wiki.ethereal.com/Pidl
+ found at http://wiki.wireshark.org/Pidl
*/
diff --git a/epan/dissectors/packet-dcerpc-winreg.h b/epan/dissectors/packet-dcerpc-winreg.h
index 7bdb749736..08166d1aa8 100644
--- a/epan/dissectors/packet-dcerpc-winreg.h
+++ b/epan/dissectors/packet-dcerpc-winreg.h
@@ -5,9 +5,9 @@
from winreg.idl and winreg.cnf.
Pidl is a perl based IDL compiler for DCE/RPC idl files.
- It is maintained by the Samba team, not the Ethereal team.
+ It is maintained by the Samba team, not the Wireshark team.
Instructions on how to download and install Pidl can be
- found at http://wiki.ethereal.com/Pidl
+ found at http://wiki.wireshark.org/Pidl
*/
diff --git a/epan/dissectors/packet-dcerpc-wkssvc.c b/epan/dissectors/packet-dcerpc-wkssvc.c
index 91685be5b1..f3c72f2c5a 100644
--- a/epan/dissectors/packet-dcerpc-wkssvc.c
+++ b/epan/dissectors/packet-dcerpc-wkssvc.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc-wkssvc.h b/epan/dissectors/packet-dcerpc-wkssvc.h
index 5b442ba764..3fdb26cb8c 100644
--- a/epan/dissectors/packet-dcerpc-wkssvc.h
+++ b/epan/dissectors/packet-dcerpc-wkssvc.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 169666862e..c46aee126b 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -743,7 +743,7 @@ const gchar *dcerpc_get_uuid_name(e_uuid_t *uuid, guint16 ver)
/* Function to find the name of a registered protocol
- * or NULL if the protocol/version is not known to ethereal.
+ * or NULL if the protocol/version is not known to wireshark.
*/
const char *
dcerpc_get_proto_name(e_uuid_t *uuid, guint16 ver)
@@ -760,7 +760,7 @@ dcerpc_get_proto_name(e_uuid_t *uuid, guint16 ver)
}
/* Function to find the opnum hf-field of a registered protocol
- * or -1 if the protocol/version is not known to ethereal.
+ * or -1 if the protocol/version is not known to wireshark.
*/
int
dcerpc_get_proto_hf_opnum(e_uuid_t *uuid, guint16 ver)
@@ -805,7 +805,7 @@ value_string *value_string_from_subdissectors(dcerpc_sub_dissector *sd)
}
/* Function to find the subdissector table of a registered protocol
- * or NULL if the protocol/version is not known to ethereal.
+ * or NULL if the protocol/version is not known to wireshark.
*/
dcerpc_sub_dissector *
dcerpc_get_proto_sub_dissector(e_uuid_t *uuid, guint16 ver)
diff --git a/epan/dissectors/packet-dcerpc.h b/epan/dissectors/packet-dcerpc.h
index 1cfbafaf62..a0661d48f9 100644
--- a/epan/dissectors/packet-dcerpc.h
+++ b/epan/dissectors/packet-dcerpc.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -288,12 +288,12 @@ typedef struct _dcerpc_info {
/* the init_protocol hooks. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT GHookList dcerpc_hooks_init_protos;
/* the registered subdissectors. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT GHashTable *dcerpc_uuids;
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c
index 2a3845adc3..cb40af24e5 100644
--- a/epan/dissectors/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
@@ -17,8 +17,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -41,7 +41,7 @@
#endif
/* Notes:
- * This is my first pass at a Ethereal dissector to display
+ * This is my first pass at a Wireshark dissector to display
* DICOM (Digital Imaging and Communications in Medicine) packets.
*
* - It currently displays most of the DICOM packets.
@@ -66,7 +66,7 @@
* - Fixed the dissect code to display all the tags in the pdu
*
* 28 Apr 2005
- * - fix memory leak when Assoc packet is processed repeatedly in ethereal
+ * - fix memory leak when Assoc packet is processed repeatedly in wireshark
*
* - removed unused partial packet flag
*
@@ -1113,7 +1113,7 @@ dissect_dcm_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-dcom-cba-acco.c b/epan/dissectors/packet-dcom-cba-acco.c
index f8a32c36d0..92d4fea0c8 100644
--- a/epan/dissectors/packet-dcom-cba-acco.c
+++ b/epan/dissectors/packet-dcom-cba-acco.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcom-cba-acco.h b/epan/dissectors/packet-dcom-cba-acco.h
index 41ebdf6c17..73ca6441ee 100644
--- a/epan/dissectors/packet-dcom-cba-acco.h
+++ b/epan/dissectors/packet-dcom-cba-acco.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcom-cba.c b/epan/dissectors/packet-dcom-cba.c
index fc8e89203f..a0164f4d2e 100644
--- a/epan/dissectors/packet-dcom-cba.c
+++ b/epan/dissectors/packet-dcom-cba.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcom-dispatch.c b/epan/dissectors/packet-dcom-dispatch.c
index b6a8ae65e8..bca151fe9d 100644
--- a/epan/dissectors/packet-dcom-dispatch.c
+++ b/epan/dissectors/packet-dcom-dispatch.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcom-dispatch.h b/epan/dissectors/packet-dcom-dispatch.h
index 4593e12c3b..4ecc22d3d4 100644
--- a/epan/dissectors/packet-dcom-dispatch.h
+++ b/epan/dissectors/packet-dcom-dispatch.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcom-oxid.c b/epan/dissectors/packet-dcom-oxid.c
index 7ae4d16c31..95fadcb31f 100644
--- a/epan/dissectors/packet-dcom-oxid.c
+++ b/epan/dissectors/packet-dcom-oxid.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcom-remact.c b/epan/dissectors/packet-dcom-remact.c
index 89fc9300f1..a90268e2e7 100644
--- a/epan/dissectors/packet-dcom-remact.c
+++ b/epan/dissectors/packet-dcom-remact.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c
index ee3deec466..4f608681d8 100644
--- a/epan/dissectors/packet-dcom-remunkn.c
+++ b/epan/dissectors/packet-dcom-remunkn.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcom-sysact.c b/epan/dissectors/packet-dcom-sysact.c
index 37d2f711d7..ab66c3b4d0 100644
--- a/epan/dissectors/packet-dcom-sysact.c
+++ b/epan/dissectors/packet-dcom-sysact.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c
index dff5609e3a..40ed85a0bf 100644
--- a/epan/dissectors/packet-dcom.c
+++ b/epan/dissectors/packet-dcom.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -215,116 +215,116 @@ static int hf_dcom_vt_dispatch = -1;
/*
* Flag bits in connection-oriented PDU header.
*/
-#define ETHEREAL_FADF_AUTO 0x0001
-#define ETHEREAL_FADF_STATIC 0x0002
-#define ETHEREAL_FADF_EMBEDDED 0x0004
-#define ETHEREAL_FADF_FIXEDSIZE 0x0010
-#define ETHEREAL_FADF_RECORD 0x0020
-#define ETHEREAL_FADF_HAVEIID 0x0040
-#define ETHEREAL_FADF_HAVEVARTYPE 0x0080
-#define ETHEREAL_FADF_BSTR 0x0100
-#define ETHEREAL_FADF_UNKNOWN 0x0200
-#define ETHEREAL_FADF_DISPATCH 0x0400
-#define ETHEREAL_FADF_VARIANT 0x0800
+#define WIRESHARK_FADF_AUTO 0x0001
+#define WIRESHARK_FADF_STATIC 0x0002
+#define WIRESHARK_FADF_EMBEDDED 0x0004
+#define WIRESHARK_FADF_FIXEDSIZE 0x0010
+#define WIRESHARK_FADF_RECORD 0x0020
+#define WIRESHARK_FADF_HAVEIID 0x0040
+#define WIRESHARK_FADF_HAVEVARTYPE 0x0080
+#define WIRESHARK_FADF_BSTR 0x0100
+#define WIRESHARK_FADF_UNKNOWN 0x0200
+#define WIRESHARK_FADF_DISPATCH 0x0400
+#define WIRESHARK_FADF_VARIANT 0x0800
typedef enum {
- ETHEREAL_VT_EMPTY = 0,
- ETHEREAL_VT_NULL = 1,
- ETHEREAL_VT_I2 = 2,
- ETHEREAL_VT_I4 = 3,
- ETHEREAL_VT_R4 = 4,
- ETHEREAL_VT_R8 = 5,
- ETHEREAL_VT_CY = 6,
- ETHEREAL_VT_DATE = 7,
- ETHEREAL_VT_BSTR = 8,
- ETHEREAL_VT_DISPATCH = 9,
- ETHEREAL_VT_ERROR = 10,
- ETHEREAL_VT_BOOL = 11,
- ETHEREAL_VT_VARIANT = 12,
- ETHEREAL_VT_UNKNOWN = 13,
- ETHEREAL_VT_DECIMAL = 14,
- ETHEREAL_VT_I1 = 16,
- ETHEREAL_VT_UI1 = 17,
- ETHEREAL_VT_UI2 = 18,
- ETHEREAL_VT_UI4 = 19,
- ETHEREAL_VT_I8 = 20,
- ETHEREAL_VT_UI8 = 21,
- ETHEREAL_VT_INT = 22,
- ETHEREAL_VT_UINT = 23,
- ETHEREAL_VT_VOID = 24,
- ETHEREAL_VT_HRESULT = 25,
- ETHEREAL_VT_PTR = 26,
- ETHEREAL_VT_SAFEARRAY = 27,
- ETHEREAL_VT_CARRAY = 28,
- ETHEREAL_VT_USERDEFINED = 29,
- ETHEREAL_VT_LPSTR = 30,
- ETHEREAL_VT_LPWSTR = 31,
- ETHEREAL_VT_RECORD = 36,
- ETHEREAL_VT_FILETIME = 64,
- ETHEREAL_VT_BLOB = 65,
- ETHEREAL_VT_STREAM = 66,
- ETHEREAL_VT_STORAGE = 67,
- ETHEREAL_VT_STREAMED_OBJECT = 68,
- ETHEREAL_VT_STORED_OBJECT = 69,
- ETHEREAL_VT_BLOB_OBJECT = 70,
- ETHEREAL_VT_CF = 71,
- ETHEREAL_VT_CLSID = 72,
-
- ETHEREAL_VT_BSTR_BLOB = 0x0fff,
-
- ETHEREAL_VT_VECTOR = 0x1000,
- ETHEREAL_VT_ARRAY = 0x2000,
- ETHEREAL_VT_BYREF = 0x4000,
- ETHEREAL_VT_RESERVED = 0x8000,
-
- ETHEREAL_VT_ILLEGAL = 0xffff,
- ETHEREAL_VT_ILLEGALMASKED = 0x0fff,
- ETHEREAL_VT_TYPEMASK = 0x0fff
+ WIRESHARK_VT_EMPTY = 0,
+ WIRESHARK_VT_NULL = 1,
+ WIRESHARK_VT_I2 = 2,
+ WIRESHARK_VT_I4 = 3,
+ WIRESHARK_VT_R4 = 4,
+ WIRESHARK_VT_R8 = 5,
+ WIRESHARK_VT_CY = 6,
+ WIRESHARK_VT_DATE = 7,
+ WIRESHARK_VT_BSTR = 8,
+ WIRESHARK_VT_DISPATCH = 9,
+ WIRESHARK_VT_ERROR = 10,
+ WIRESHARK_VT_BOOL = 11,
+ WIRESHARK_VT_VARIANT = 12,
+ WIRESHARK_VT_UNKNOWN = 13,
+ WIRESHARK_VT_DECIMAL = 14,
+ WIRESHARK_VT_I1 = 16,
+ WIRESHARK_VT_UI1 = 17,
+ WIRESHARK_VT_UI2 = 18,
+ WIRESHARK_VT_UI4 = 19,
+ WIRESHARK_VT_I8 = 20,
+ WIRESHARK_VT_UI8 = 21,
+ WIRESHARK_VT_INT = 22,
+ WIRESHARK_VT_UINT = 23,
+ WIRESHARK_VT_VOID = 24,
+ WIRESHARK_VT_HRESULT = 25,
+ WIRESHARK_VT_PTR = 26,
+ WIRESHARK_VT_SAFEARRAY = 27,
+ WIRESHARK_VT_CARRAY = 28,
+ WIRESHARK_VT_USERDEFINED = 29,
+ WIRESHARK_VT_LPSTR = 30,
+ WIRESHARK_VT_LPWSTR = 31,
+ WIRESHARK_VT_RECORD = 36,
+ WIRESHARK_VT_FILETIME = 64,
+ WIRESHARK_VT_BLOB = 65,
+ WIRESHARK_VT_STREAM = 66,
+ WIRESHARK_VT_STORAGE = 67,
+ WIRESHARK_VT_STREAMED_OBJECT = 68,
+ WIRESHARK_VT_STORED_OBJECT = 69,
+ WIRESHARK_VT_BLOB_OBJECT = 70,
+ WIRESHARK_VT_CF = 71,
+ WIRESHARK_VT_CLSID = 72,
+
+ WIRESHARK_VT_BSTR_BLOB = 0x0fff,
+
+ WIRESHARK_VT_VECTOR = 0x1000,
+ WIRESHARK_VT_ARRAY = 0x2000,
+ WIRESHARK_VT_BYREF = 0x4000,
+ WIRESHARK_VT_RESERVED = 0x8000,
+
+ WIRESHARK_VT_ILLEGAL = 0xffff,
+ WIRESHARK_VT_ILLEGALMASKED = 0x0fff,
+ WIRESHARK_VT_TYPEMASK = 0x0fff
} dcom_vartype_t;
const value_string dcom_variant_type_vals[] = {
- { ETHEREAL_VT_EMPTY, "VT_EMPTY"},
- { ETHEREAL_VT_NULL, "VT_NULL"},
- { ETHEREAL_VT_I2, "VT_I2"},
- { ETHEREAL_VT_I4, "VT_I4"},
- { ETHEREAL_VT_R4, "VT_R4"},
- { ETHEREAL_VT_R8, "VT_R8"},
- { ETHEREAL_VT_CY, "VT_CY"},
- { ETHEREAL_VT_DATE, "VT_DATE"},
- { ETHEREAL_VT_BSTR, "VT_BSTR"},
- { ETHEREAL_VT_DISPATCH, "VT_DISPATCH"},
- { ETHEREAL_VT_ERROR, "VT_ERROR"},
- { ETHEREAL_VT_BOOL, "VT_BOOL"},
- { ETHEREAL_VT_I1, "VT_I1"},
- { ETHEREAL_VT_UI1, "VT_UI1"},
- { ETHEREAL_VT_UI2, "VT_UI2"},
- { ETHEREAL_VT_UI4, "VT_UI4"},
- { ETHEREAL_VT_I8, "VT_I8"},
- { ETHEREAL_VT_UI8, "VT_UI8"},
- { ETHEREAL_VT_ARRAY, "VT_ARRAY"},
- { ETHEREAL_VT_UNKNOWN, "VT_UNKNOWN"},
- { ETHEREAL_VT_USERDEFINED, "VT_USERDEFINED"},
+ { WIRESHARK_VT_EMPTY, "VT_EMPTY"},
+ { WIRESHARK_VT_NULL, "VT_NULL"},
+ { WIRESHARK_VT_I2, "VT_I2"},
+ { WIRESHARK_VT_I4, "VT_I4"},
+ { WIRESHARK_VT_R4, "VT_R4"},
+ { WIRESHARK_VT_R8, "VT_R8"},
+ { WIRESHARK_VT_CY, "VT_CY"},
+ { WIRESHARK_VT_DATE, "VT_DATE"},
+ { WIRESHARK_VT_BSTR, "VT_BSTR"},
+ { WIRESHARK_VT_DISPATCH, "VT_DISPATCH"},
+ { WIRESHARK_VT_ERROR, "VT_ERROR"},
+ { WIRESHARK_VT_BOOL, "VT_BOOL"},
+ { WIRESHARK_VT_I1, "VT_I1"},
+ { WIRESHARK_VT_UI1, "VT_UI1"},
+ { WIRESHARK_VT_UI2, "VT_UI2"},
+ { WIRESHARK_VT_UI4, "VT_UI4"},
+ { WIRESHARK_VT_I8, "VT_I8"},
+ { WIRESHARK_VT_UI8, "VT_UI8"},
+ { WIRESHARK_VT_ARRAY, "VT_ARRAY"},
+ { WIRESHARK_VT_UNKNOWN, "VT_UNKNOWN"},
+ { WIRESHARK_VT_USERDEFINED, "VT_USERDEFINED"},
/* XXX: this could be done better */
- { ETHEREAL_VT_ARRAY | ETHEREAL_VT_I2, "VT_ARRAY|VT_I2"},
- { ETHEREAL_VT_ARRAY | ETHEREAL_VT_I4, "VT_ARRAY|VT_I4"},
- { ETHEREAL_VT_ARRAY | ETHEREAL_VT_R4, "VT_ARRAY|VT_R4"},
- { ETHEREAL_VT_ARRAY | ETHEREAL_VT_R8, "VT_ARRAY|VT_R8"},
- { ETHEREAL_VT_ARRAY | ETHEREAL_VT_DATE, "VT_ARRAY|VT_DATE"},
- { ETHEREAL_VT_ARRAY | ETHEREAL_VT_BSTR, "VT_ARRAY|VT_BSTR"},
- { ETHEREAL_VT_ARRAY | ETHEREAL_VT_ERROR, "VT_ARRAY|VT_ERROR"},
- { ETHEREAL_VT_ARRAY | ETHEREAL_VT_BOOL, "VT_ARRAY|VT_BOOL"},
- { ETHEREAL_VT_ARRAY | ETHEREAL_VT_I1, "VT_ARRAY|VT_I1"},
- { ETHEREAL_VT_ARRAY | ETHEREAL_VT_UI1, "VT_ARRAY|VT_UI1"},
- { ETHEREAL_VT_ARRAY | ETHEREAL_VT_UI2, "VT_ARRAY|VT_UI2"},
- { ETHEREAL_VT_ARRAY | ETHEREAL_VT_UI4, "VT_ARRAY|VT_UI4"},
- { ETHEREAL_VT_ARRAY | ETHEREAL_VT_I8, "VT_ARRAY|VT_I8"},
- { ETHEREAL_VT_ARRAY | ETHEREAL_VT_UI8, "VT_ARRAY|VT_UI8"},
-
- { ETHEREAL_VT_BYREF | ETHEREAL_VT_I2, "VT_BYREF|VT_I2"},
- { ETHEREAL_VT_BYREF | ETHEREAL_VT_BSTR, "VT_BYREF|VT_BSTR"},
- { ETHEREAL_VT_BYREF | ETHEREAL_VT_VARIANT,"VT_BYREF|VT_VARIANT"},
+ { WIRESHARK_VT_ARRAY | WIRESHARK_VT_I2, "VT_ARRAY|VT_I2"},
+ { WIRESHARK_VT_ARRAY | WIRESHARK_VT_I4, "VT_ARRAY|VT_I4"},
+ { WIRESHARK_VT_ARRAY | WIRESHARK_VT_R4, "VT_ARRAY|VT_R4"},
+ { WIRESHARK_VT_ARRAY | WIRESHARK_VT_R8, "VT_ARRAY|VT_R8"},
+ { WIRESHARK_VT_ARRAY | WIRESHARK_VT_DATE, "VT_ARRAY|VT_DATE"},
+ { WIRESHARK_VT_ARRAY | WIRESHARK_VT_BSTR, "VT_ARRAY|VT_BSTR"},
+ { WIRESHARK_VT_ARRAY | WIRESHARK_VT_ERROR, "VT_ARRAY|VT_ERROR"},
+ { WIRESHARK_VT_ARRAY | WIRESHARK_VT_BOOL, "VT_ARRAY|VT_BOOL"},
+ { WIRESHARK_VT_ARRAY | WIRESHARK_VT_I1, "VT_ARRAY|VT_I1"},
+ { WIRESHARK_VT_ARRAY | WIRESHARK_VT_UI1, "VT_ARRAY|VT_UI1"},
+ { WIRESHARK_VT_ARRAY | WIRESHARK_VT_UI2, "VT_ARRAY|VT_UI2"},
+ { WIRESHARK_VT_ARRAY | WIRESHARK_VT_UI4, "VT_ARRAY|VT_UI4"},
+ { WIRESHARK_VT_ARRAY | WIRESHARK_VT_I8, "VT_ARRAY|VT_I8"},
+ { WIRESHARK_VT_ARRAY | WIRESHARK_VT_UI8, "VT_ARRAY|VT_UI8"},
+
+ { WIRESHARK_VT_BYREF | WIRESHARK_VT_I2, "VT_BYREF|VT_I2"},
+ { WIRESHARK_VT_BYREF | WIRESHARK_VT_BSTR, "VT_BYREF|VT_BSTR"},
+ { WIRESHARK_VT_BYREF | WIRESHARK_VT_VARIANT,"VT_BYREF|VT_VARIANT"},
{ 0, NULL }
/* XXX: append more types here */
};
@@ -994,29 +994,29 @@ dissect_dcom_SAFEARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo,
u32Tmp = u32ArraySize;
while(u32ArraySize--) {
switch(u32VarType) {
- case(ETHEREAL_VT_ERROR):
+ case(WIRESHARK_VT_ERROR):
offset = dissect_dcom_HRESULT(tvb, offset, pinfo, sub_tree, drep,
&u32Data);
break;
- case(ETHEREAL_VT_I1):
+ case(WIRESHARK_VT_I1):
offset = dissect_dcom_BYTE(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_i1, &u8Data);
break;
- case(ETHEREAL_VT_I2):
+ case(WIRESHARK_VT_I2):
offset = dissect_dcom_WORD(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_i2, &u16Data);
break;
- case(ETHEREAL_VT_I4):
+ case(WIRESHARK_VT_I4):
offset = dissect_dcom_DWORD(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_i4, &u32Data);
break;
- case(ETHEREAL_VT_I8):
+ case(WIRESHARK_VT_I8):
offset = dissect_dcom_I8(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_i8, NULL);
/* take care of the 8 byte alignment */
u32VariableOffset = offset;
break;
- case(ETHEREAL_VT_BSTR):
+ case(WIRESHARK_VT_BSTR):
offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, sub_tree, drep, &u32Pointer);
if (u32Pointer) {
u32VariableOffset = dissect_dcom_BSTR(tvb, u32VariableOffset, pinfo, sub_tree, drep,
@@ -1115,84 +1115,84 @@ dissect_dcom_VARIANT(tvbuff_t *tvb, int offset, packet_info *pinfo,
offset = dissect_dcom_DWORD(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_variant_type32, &u32VarType);
- if (u32VarType & ETHEREAL_VT_BYREF) {
- u32VarType &=~ETHEREAL_VT_BYREF;
+ if (u32VarType & WIRESHARK_VT_BYREF) {
+ u32VarType &=~WIRESHARK_VT_BYREF;
offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, sub_tree, drep, &u32Pointer);
}
switch (u32VarType) {
- case(ETHEREAL_VT_EMPTY):
+ case(WIRESHARK_VT_EMPTY):
break;
- case(ETHEREAL_VT_BOOL):
+ case(WIRESHARK_VT_BOOL):
offset = dissect_dcom_VARIANT_BOOL(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_bool, &u16Data);
break;
- case(ETHEREAL_VT_I1):
+ case(WIRESHARK_VT_I1):
offset = dissect_dcom_BYTE(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_i1, &u8Data);
break;
- case(ETHEREAL_VT_UI1):
+ case(WIRESHARK_VT_UI1):
offset = dissect_dcom_BYTE(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_ui1, &u8Data);
break;
- case(ETHEREAL_VT_I2):
+ case(WIRESHARK_VT_I2):
offset = dissect_dcom_WORD(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_i2, &u16Data);
break;
- case(ETHEREAL_VT_UI2):
+ case(WIRESHARK_VT_UI2):
offset = dissect_dcom_WORD(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_ui2, &u16Data);
break;
- case(ETHEREAL_VT_I4):
+ case(WIRESHARK_VT_I4):
offset = dissect_dcom_DWORD(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_i4, &u32Data);
break;
- case(ETHEREAL_VT_UI4):
+ case(WIRESHARK_VT_UI4):
offset = dissect_dcom_DWORD(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_ui4, &u32Data);
break;
- case(ETHEREAL_VT_R4):
+ case(WIRESHARK_VT_R4):
offset = dissect_dcom_FLOAT(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_r4, &f32Data);
break;
- case(ETHEREAL_VT_R8):
+ case(WIRESHARK_VT_R8):
offset = dissect_dcom_DOUBLE(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_r8, &f64Data);
break;
- case(ETHEREAL_VT_DATE):
+ case(WIRESHARK_VT_DATE):
offset = dissect_dcom_DATE(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_date, &f64Data);
break;
- case(ETHEREAL_VT_BSTR):
+ case(WIRESHARK_VT_BSTR):
offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, sub_tree, drep, &u32Pointer);
if (u32Pointer) {
offset = dissect_dcom_BSTR(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_bstr, cData, sizeof(cData) );
}
break;
- case(ETHEREAL_VT_DISPATCH):
+ case(WIRESHARK_VT_DISPATCH):
offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, sub_tree, drep, &u32Pointer);
if (u32Pointer) {
offset = dissect_dcom_MInterfacePointer(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_dispatch);
}
break;
- case(ETHEREAL_VT_ARRAY):
+ case(WIRESHARK_VT_ARRAY):
offset = dissect_dcom_SAFEARRAY(tvb, offset, pinfo, sub_tree, drep,
0);
break;
- case(ETHEREAL_VT_ERROR):
+ case(WIRESHARK_VT_ERROR):
offset = dissect_dcom_HRESULT(tvb, offset, pinfo, sub_tree, drep,
0);
break;
- case(ETHEREAL_VT_VARIANT):
+ case(WIRESHARK_VT_VARIANT):
offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, sub_tree, drep, &u32Pointer);
if (u32Pointer) {
offset = dissect_dcom_VARIANT(tvb, offset, pinfo, sub_tree, drep,
hf_dcom_vt_byref /* must be BYREF */);
}
break;
- case(ETHEREAL_VT_UNKNOWN):
+ case(WIRESHARK_VT_UNKNOWN):
offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, sub_tree, drep, &u32Pointer);
break;
default:
@@ -1875,27 +1875,27 @@ proto_register_dcom (void)
{ "LowBound", "dcom.sa.low_bound", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
{ &hf_dcom_sa_features_auto,
- { "AUTO", "dcom.sa.features_auto", FT_BOOLEAN, 16, TFS (&flags_set_truth), ETHEREAL_FADF_AUTO, "", HFILL }},
+ { "AUTO", "dcom.sa.features_auto", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_AUTO, "", HFILL }},
{ &hf_dcom_sa_features_static,
- { "STATIC", "dcom.sa.features_static", FT_BOOLEAN, 16, TFS (&flags_set_truth), ETHEREAL_FADF_STATIC, "", HFILL }},
+ { "STATIC", "dcom.sa.features_static", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_STATIC, "", HFILL }},
{ &hf_dcom_sa_features_embedded,
- { "EMBEDDED", "dcom.sa.features_embedded", FT_BOOLEAN, 16, TFS (&flags_set_truth), ETHEREAL_FADF_EMBEDDED, "", HFILL }},
+ { "EMBEDDED", "dcom.sa.features_embedded", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_EMBEDDED, "", HFILL }},
{ &hf_dcom_sa_features_fixedsize,
- { "FIXEDSIZE", "dcom.sa.features_fixedsize", FT_BOOLEAN, 16, TFS (&flags_set_truth), ETHEREAL_FADF_FIXEDSIZE, "", HFILL }},
+ { "FIXEDSIZE", "dcom.sa.features_fixedsize", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_FIXEDSIZE, "", HFILL }},
{ &hf_dcom_sa_features_record,
- { "RECORD", "dcom.sa.features_record", FT_BOOLEAN, 16, TFS (&flags_set_truth), ETHEREAL_FADF_RECORD, "", HFILL }},
+ { "RECORD", "dcom.sa.features_record", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_RECORD, "", HFILL }},
{ &hf_dcom_sa_features_have_iid,
- { "HAVEIID", "dcom.sa.features_have_iid", FT_BOOLEAN, 16, TFS (&flags_set_truth), ETHEREAL_FADF_HAVEIID, "", HFILL }},
+ { "HAVEIID", "dcom.sa.features_have_iid", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_HAVEIID, "", HFILL }},
{ &hf_dcom_sa_features_have_vartype,
- { "HAVEVARTYPE", "dcom.sa.features_have_vartype", FT_BOOLEAN, 16, TFS (&flags_set_truth), ETHEREAL_FADF_HAVEVARTYPE, "", HFILL }},
+ { "HAVEVARTYPE", "dcom.sa.features_have_vartype", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_HAVEVARTYPE, "", HFILL }},
{ &hf_dcom_sa_features_bstr,
- { "BSTR", "dcom.sa.features_bstr", FT_BOOLEAN, 16, TFS (&flags_set_truth), ETHEREAL_FADF_BSTR, "", HFILL }},
+ { "BSTR", "dcom.sa.features_bstr", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_BSTR, "", HFILL }},
{ &hf_dcom_sa_features_unknown,
- { "UNKNOWN", "dcom.sa.features_unknown", FT_BOOLEAN, 16, TFS (&flags_set_truth), ETHEREAL_FADF_UNKNOWN, "", HFILL }},
+ { "UNKNOWN", "dcom.sa.features_unknown", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_UNKNOWN, "", HFILL }},
{ &hf_dcom_sa_features_dispatch,
- { "DISPATCH", "dcom.sa.features_dispatch", FT_BOOLEAN, 16, TFS (&flags_set_truth), ETHEREAL_FADF_DISPATCH, "", HFILL }},
+ { "DISPATCH", "dcom.sa.features_dispatch", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_DISPATCH, "", HFILL }},
{ &hf_dcom_sa_features_variant,
- { "VARIANT", "dcom.sa.features_variant", FT_BOOLEAN, 16, TFS (&flags_set_truth), ETHEREAL_FADF_VARIANT, "", HFILL }}
+ { "VARIANT", "dcom.sa.features_variant", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_VARIANT, "", HFILL }}
};
static gint *ett_dcom[] = {
diff --git a/epan/dissectors/packet-dcom.h b/epan/dissectors/packet-dcom.h
index ccf09e762f..c95d0228c2 100644
--- a/epan/dissectors/packet-dcom.h
+++ b/epan/dissectors/packet-dcom.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dcp.c b/epan/dissectors/packet-dcp.c
index e174137365..2c8af34170 100644
--- a/epan/dissectors/packet-dcp.c
+++ b/epan/dissectors/packet-dcp.c
@@ -8,8 +8,8 @@
*
* $Id: README.developer 11973 2004-09-11 23:10:14Z guy $
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-udp.c
diff --git a/epan/dissectors/packet-dcp.h b/epan/dissectors/packet-dcp.h
index dd6c601284..5333700757 100644
--- a/epan/dissectors/packet-dcp.h
+++ b/epan/dissectors/packet-dcp.h
@@ -10,8 +10,8 @@
*
* template taken from packet-udp.c
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ddtp.c b/epan/dissectors/packet-ddtp.c
index b5d1c0ddb1..faed30b82e 100644
--- a/epan/dissectors/packet-ddtp.c
+++ b/epan/dissectors/packet-ddtp.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ddtp.h b/epan/dissectors/packet-ddtp.h
index 599b25c2a1..2ac13d9df4 100644
--- a/epan/dissectors/packet-ddtp.h
+++ b/epan/dissectors/packet-ddtp.h
@@ -5,7 +5,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2000
*
diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c
index f0347f4acc..417fad4c08 100644
--- a/epan/dissectors/packet-dec-bpdu.c
+++ b/epan/dissectors/packet-dec-bpdu.c
@@ -5,8 +5,8 @@
*
* Copyright 2001 Paul Ionescu <paul@acorp.ro>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c
index 9b621e44ca..e37f87ee00 100644
--- a/epan/dissectors/packet-dec-dnart.c
+++ b/epan/dissectors/packet-dec-dnart.c
@@ -23,8 +23,8 @@
* SECON.RNO [31,1]
* EDITED 10/17/80
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c
index 22f26ee2ec..812617a70c 100644
--- a/epan/dissectors/packet-dhcp-failover.c
+++ b/epan/dissectors/packet-dhcp-failover.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -970,7 +970,7 @@ proto_reg_handoff_dhcpfo(void)
dissector_add("tcp.port", tcp_port_pref, dhcpfo_handle);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_dhcpfo(void)
{
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index 589bf78b3a..1e50f6c127 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -21,8 +21,8 @@
* Note that protocol constants are still subject to change, based on IANA
* assignment decisions.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index dd07d5426c..2b0e2e0f50 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -5,8 +5,8 @@
*
* Copyright (c) 2001 by David Frascone <dave@frascone.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-diffserv-mpls-common.c b/epan/dissectors/packet-diffserv-mpls-common.c
index 7491854239..6f6abddd4c 100644
--- a/epan/dissectors/packet-diffserv-mpls-common.c
+++ b/epan/dissectors/packet-diffserv-mpls-common.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-diffserv-mpls-common.h b/epan/dissectors/packet-diffserv-mpls-common.h
index 4294ee06a8..0f5b507164 100644
--- a/epan/dissectors/packet-diffserv-mpls-common.h
+++ b/epan/dissectors/packet-diffserv-mpls-common.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dis-enums.c b/epan/dissectors/packet-dis-enums.c
index 8da7e268a1..379e215bee 100644
--- a/epan/dissectors/packet-dis-enums.c
+++ b/epan/dissectors/packet-dis-enums.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dis-enums.h b/epan/dissectors/packet-dis-enums.h
index 4b35a4cf0b..6f75abb7e8 100644
--- a/epan/dissectors/packet-dis-enums.h
+++ b/epan/dissectors/packet-dis-enums.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dis-fields.c b/epan/dissectors/packet-dis-fields.c
index fbbda899ab..5814f2e636 100644
--- a/epan/dissectors/packet-dis-fields.c
+++ b/epan/dissectors/packet-dis-fields.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dis-fields.h b/epan/dissectors/packet-dis-fields.h
index 29a57d311a..52f0752495 100644
--- a/epan/dissectors/packet-dis-fields.h
+++ b/epan/dissectors/packet-dis-fields.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dis-pdus.c b/epan/dissectors/packet-dis-pdus.c
index 4c4f445eee..b1ea364cf3 100644
--- a/epan/dissectors/packet-dis-pdus.c
+++ b/epan/dissectors/packet-dis-pdus.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dis-pdus.h b/epan/dissectors/packet-dis-pdus.h
index 448481aab6..553521c41e 100644
--- a/epan/dissectors/packet-dis-pdus.h
+++ b/epan/dissectors/packet-dis-pdus.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c
index 899b69e186..e7b6121203 100644
--- a/epan/dissectors/packet-dis.c
+++ b/epan/dissectors/packet-dis.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c
index 1332e05d81..9bde96117d 100644
--- a/epan/dissectors/packet-disp.c
+++ b/epan/dissectors/packet-disp.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-disp.c */
/* ../../tools/asn2eth.py -X -b -e -p disp -c disp.cnf -s packet-disp-template disp.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-disp.h b/epan/dissectors/packet-disp.h
index d61b252d3f..29e1ec7409 100644
--- a/epan/dissectors/packet-disp.h
+++ b/epan/dissectors/packet-disp.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-disp.h */
/* ../../tools/asn2eth.py -X -b -e -p disp -c disp.cnf -s packet-disp-template disp.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c
index 6d73d6b2d2..f39a5cf89b 100644
--- a/epan/dissectors/packet-distcc.c
+++ b/epan/dissectors/packet-distcc.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -347,7 +347,7 @@ dissect_distcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
}
-/* Register protocol with Ethereal. */
+/* Register protocol with Wireshark. */
void
proto_register_distcc(void)
{
diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c
index 8b24c5e370..9e25e4cbae 100644
--- a/epan/dissectors/packet-dlsw.c
+++ b/epan/dissectors/packet-dlsw.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index 1beb648069..fc29ee2db2 100644
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -2119,7 +2119,7 @@ al_defragment_init(void)
reassembled_table_init(&al_reassembled_table);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_dnp3(void)
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 2dff93c5b5..1d3e794850 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -7,8 +7,8 @@
* $Id$
*
* Copyright 2004, Nicolas DICHTEL - 6WIND - <nicolas.dichtel@6wind.com>
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dns.h b/epan/dissectors/packet-dns.h
index e80ff7f794..81d884f853 100644
--- a/epan/dissectors/packet-dns.h
+++ b/epan/dissectors/packet-dns.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index 84f41968c7..c2213e1dd7 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-dop.c */
/* ../../tools/asn2eth.py -X -b -e -p dop -c dop.cnf -s packet-dop-template dop.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dop.h b/epan/dissectors/packet-dop.h
index e5941bee36..af7def82f3 100644
--- a/epan/dissectors/packet-dop.h
+++ b/epan/dissectors/packet-dop.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-dop.h */
/* ../../tools/asn2eth.py -X -b -e -p dop -c dop.cnf -s packet-dop-template dop.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c
index 16fba4e58d..4eba39d440 100644
--- a/epan/dissectors/packet-dsi.c
+++ b/epan/dissectors/packet-dsi.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c
diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c
index e33422c331..5e868a9ab3 100644
--- a/epan/dissectors/packet-dsp.c
+++ b/epan/dissectors/packet-dsp.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-dsp.c */
/* ../../tools/asn2eth.py -X -b -e -p dsp -c dsp.cnf -s packet-dsp-template dsp.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dsp.h b/epan/dissectors/packet-dsp.h
index 1db0e03a65..dd2c7429e9 100644
--- a/epan/dissectors/packet-dsp.h
+++ b/epan/dissectors/packet-dsp.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-dsp.h */
/* ../../tools/asn2eth.py -X -b -e -p dsp -c dsp.cnf -s packet-dsp-template dsp.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c
index 10a66f8ac6..feaa924c3c 100644
--- a/epan/dissectors/packet-dtp.c
+++ b/epan/dissectors/packet-dtp.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* DTP support added by Charlie Lenahan <clenahan@fortresstech.com>
diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c
index 89dd1b9992..1cdc309773 100644
--- a/epan/dissectors/packet-dua.c
+++ b/epan/dissectors/packet-dua.c
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-iua.c
@@ -703,7 +703,7 @@ dissect_dua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
dissect_dua_message(message_tvb, pinfo, tree, dua_tree);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_dua(void)
{
diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c
index 3357af12f7..489670f78f 100644
--- a/epan/dissectors/packet-dvmrp.c
+++ b/epan/dissectors/packet-dvmrp.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-dvmrp.h b/epan/dissectors/packet-dvmrp.h
index 3e29d614cd..49206a099a 100644
--- a/epan/dissectors/packet-dvmrp.h
+++ b/epan/dissectors/packet-dvmrp.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-e164.c b/epan/dissectors/packet-e164.c
index 2eb56cc38d..523c6e3743 100644
--- a/epan/dissectors/packet-e164.c
+++ b/epan/dissectors/packet-e164.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -567,7 +567,7 @@ dissect_e164_cc(tvbuff_t *tvb, proto_tree *tree, int offset, gboolean bcd_coded)
}
/*
- * Register the protocol with Ethereal.
+ * Register the protocol with Wireshark.
*
* This format is required because a script is used to build the C function
* that calls all the protocol registration.
diff --git a/epan/dissectors/packet-e164.h b/epan/dissectors/packet-e164.h
index b2d18997fa..31fc3136c7 100644
--- a/epan/dissectors/packet-e164.h
+++ b/epan/dissectors/packet-e164.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c
index 0c2e678b9e..887ddfde16 100644
--- a/epan/dissectors/packet-e212.c
+++ b/epan/dissectors/packet-e212.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -315,7 +315,7 @@ dissect_e212_mcc_mnc(tvbuff_t *tvb, proto_tree *tree, int offset){
}
/*
- * Register the protocol with Ethereal.
+ * Register the protocol with Wireshark.
*
* This format is required because a script is used to build the C function
* that calls all the protocol registration.
diff --git a/epan/dissectors/packet-e212.h b/epan/dissectors/packet-e212.h
index 1ed149915c..620128c699 100644
--- a/epan/dissectors/packet-e212.h
+++ b/epan/dissectors/packet-e212.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c
index f82a093804..ae87dc8854 100644
--- a/epan/dissectors/packet-eap.c
+++ b/epan/dissectors/packet-eap.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c
index d772c64784..046430e1bf 100644
--- a/epan/dissectors/packet-eapol.c
+++ b/epan/dissectors/packet-eapol.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-echo.c b/epan/dissectors/packet-echo.c
index c5dc08b6e9..4ecb7ff1a7 100644
--- a/epan/dissectors/packet-echo.c
+++ b/epan/dissectors/packet-echo.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index d08fa74c8e..1a97942444 100644
--- a/epan/dissectors/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-edonkey.h b/epan/dissectors/packet-edonkey.h
index b878ea6701..1f8fcdcc42 100644
--- a/epan/dissectors/packet-edonkey.h
+++ b/epan/dissectors/packet-edonkey.h
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c
index 7324876d99..8b8cd28a50 100644
--- a/epan/dissectors/packet-eigrp.c
+++ b/epan/dissectors/packet-eigrp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-enc.h b/epan/dissectors/packet-enc.h
index c6795a3251..bd23c51876 100644
--- a/epan/dissectors/packet-enc.h
+++ b/epan/dissectors/packet-enc.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index 0347d58184..072f23ed21 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -781,7 +781,7 @@ dissect_enipio(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} /* end of dissect_enipio() */
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c
index a5af8602fe..0f0af28290 100644
--- a/epan/dissectors/packet-enrp.c
+++ b/epan/dissectors/packet-enrp.c
@@ -15,8 +15,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
@@ -858,7 +858,7 @@ dissect_enrp(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
dissect_enrp_message(message_tvb, pinfo, enrp_tree);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_enrp(void)
{
diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c
index 5e249ec5a0..9b39e94c5a 100644
--- a/epan/dissectors/packet-esis.c
+++ b/epan/dissectors/packet-esis.c
@@ -5,8 +5,8 @@
* $Id$
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-esis.h b/epan/dissectors/packet-esis.h
index f2231c68db..86000e4024 100644
--- a/epan/dissectors/packet-esis.h
+++ b/epan/dissectors/packet-esis.h
@@ -4,7 +4,7 @@
* $Id$
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c
index 6761462ab5..d1b218f776 100644
--- a/epan/dissectors/packet-ess.c
+++ b/epan/dissectors/packet-ess.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-ess.c */
/* ../../tools/asn2eth.py -X -b -k -e -p ess -c ess.cnf -s packet-ess-template ExtendedSecurityServices.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ess.h b/epan/dissectors/packet-ess.h
index 3fe99c2397..a31010ae6c 100644
--- a/epan/dissectors/packet-ess.h
+++ b/epan/dissectors/packet-ess.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-ess.h */
/* ../../tools/asn2eth.py -X -b -k -e -p ess -c ess.cnf -s packet-ess-template ExtendedSecurityServices.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index eec1d2e7d6..b59857fee2 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-eth.h b/epan/dissectors/packet-eth.h
index df190750d9..35b9c252f0 100644
--- a/epan/dissectors/packet-eth.h
+++ b/epan/dissectors/packet-eth.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-etheric.c b/epan/dissectors/packet-etheric.c
index e3b96a09b0..216c8c31b8 100644
--- a/epan/dissectors/packet-etheric.c
+++ b/epan/dissectors/packet-etheric.c
@@ -17,8 +17,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 5b6faf63b8..edaf952693 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -5,8 +5,8 @@
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c
index c008df0c15..ac0cca4f15 100644
--- a/epan/dissectors/packet-extreme.c
+++ b/epan/dissectors/packet-extreme.c
@@ -6,8 +6,8 @@
*
* Copyright 2005 Joerg Mayer (see AUTHORS file)
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1087,7 +1087,7 @@ proto_register_edp(void)
/* Unknown element */
{ &hf_edp_unknown,
{ "Unknown", "edp.unknown", FT_PROTOCOL, BASE_NONE, NULL,
- 0x0, "Element unknown to Ethereal", HFILL }},
+ 0x0, "Element unknown to Wireshark", HFILL }},
/* Null element */
{ &hf_edp_null,
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index 9e95a2a4d3..daab288379 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1125,7 +1125,7 @@ dissect_fc_ifcp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_fc_helper (tvb, pinfo, tree, TRUE);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-fc.h b/epan/dissectors/packet-fc.h
index c64bb50723..b489b55fe4 100644
--- a/epan/dissectors/packet-fc.h
+++ b/epan/dissectors/packet-fc.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -57,7 +57,7 @@
/*
* the following allows TAP code access to the messages
* without having to duplicate it. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT const value_string fc_fc4_val[];
diff --git a/epan/dissectors/packet-fcbls.h b/epan/dissectors/packet-fcbls.h
index 0517cd0aa5..7c5fcdb062 100644
--- a/epan/dissectors/packet-fcbls.h
+++ b/epan/dissectors/packet-fcbls.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c
index 08e75066f2..99834c7303 100644
--- a/epan/dissectors/packet-fcct.c
+++ b/epan/dissectors/packet-fcct.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -229,7 +229,7 @@ dissect_fcct (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-fcct.h b/epan/dissectors/packet-fcct.h
index 263d958136..c37aed2335 100644
--- a/epan/dissectors/packet-fcct.h
+++ b/epan/dissectors/packet-fcct.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c
index 11e2ba108c..68b62fbad0 100644
--- a/epan/dissectors/packet-fcdns.c
+++ b/epan/dissectors/packet-fcdns.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from WHATEVER_FILE_YOU_USED (where "WHATEVER_FILE_YOU_USED"
@@ -1786,7 +1786,7 @@ dissect_fcdns (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is required because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-fcdns.h b/epan/dissectors/packet-fcdns.h
index d405ab46c5..aa7f530de1 100644
--- a/epan/dissectors/packet-fcdns.h
+++ b/epan/dissectors/packet-fcdns.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c
index 951df91813..c4a013ce10 100644
--- a/epan/dissectors/packet-fcels.c
+++ b/epan/dissectors/packet-fcels.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fcels.h b/epan/dissectors/packet-fcels.h
index 34e0683d95..3708e73409 100644
--- a/epan/dissectors/packet-fcels.h
+++ b/epan/dissectors/packet-fcels.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c
index 978a11ddbf..294142557a 100644
--- a/epan/dissectors/packet-fcfcs.c
+++ b/epan/dissectors/packet-fcfcs.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1007,7 +1007,7 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-fcfcs.h b/epan/dissectors/packet-fcfcs.h
index daca528a9a..3102d3e74a 100644
--- a/epan/dissectors/packet-fcfcs.h
+++ b/epan/dissectors/packet-fcfcs.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c
index 8eb410006b..3d276809d6 100644
--- a/epan/dissectors/packet-fcfzs.c
+++ b/epan/dissectors/packet-fcfzs.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from WHATEVER_FILE_YOU_USED (where "WHATEVER_FILE_YOU_USED"
@@ -819,7 +819,7 @@ dissect_fcfzs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-fcfzs.h b/epan/dissectors/packet-fcfzs.h
index 1d8bb82c13..d948770fc4 100644
--- a/epan/dissectors/packet-fcfzs.h
+++ b/epan/dissectors/packet-fcfzs.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c
index 08a336e733..9922a66849 100644
--- a/epan/dissectors/packet-fcip.c
+++ b/epan/dissectors/packet-fcip.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fclctl.c b/epan/dissectors/packet-fclctl.c
index 55ec3898f5..ca8bd98098 100644
--- a/epan/dissectors/packet-fclctl.c
+++ b/epan/dissectors/packet-fclctl.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fclctl.h b/epan/dissectors/packet-fclctl.h
index 7466b9df8e..12dcd98feb 100644
--- a/epan/dissectors/packet-fclctl.h
+++ b/epan/dissectors/packet-fclctl.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index 236d4e9822..048e2e36b4 100644
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -675,7 +675,7 @@ dissect_fcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-fcp.h b/epan/dissectors/packet-fcp.h
index 4c08b2507a..03c392676b 100644
--- a/epan/dissectors/packet-fcp.h
+++ b/epan/dissectors/packet-fcp.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c
index 75a66df170..46b8c3657d 100644
--- a/epan/dissectors/packet-fcsb3.c
+++ b/epan/dissectors/packet-fcsb3.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from WHATEVER_FILE_YOU_USED (where "WHATEVER_FILE_YOU_USED"
@@ -1099,7 +1099,7 @@ static void dissect_fc_sbccs (tvbuff_t *tvb, packet_info *pinfo,
}
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is required because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-fcsb3.h b/epan/dissectors/packet-fcsb3.h
index c7a4301e83..26042f8570 100644
--- a/epan/dissectors/packet-fcsb3.h
+++ b/epan/dissectors/packet-fcsb3.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c
index d532220957..ca7c893896 100644
--- a/epan/dissectors/packet-fcsp.c
+++ b/epan/dissectors/packet-fcsp.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from WHATEVER_FILE_YOU_USED (where "WHATEVER_FILE_YOU_USED"
diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c
index a76c2decd9..2d15848133 100644
--- a/epan/dissectors/packet-fcswils.c
+++ b/epan/dissectors/packet-fcswils.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1918,7 +1918,7 @@ dissect_fcswils (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-fcswils.h b/epan/dissectors/packet-fcswils.h
index 1815c23ae1..9e9b3287bb 100644
--- a/epan/dissectors/packet-fcswils.h
+++ b/epan/dissectors/packet-fcswils.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c
index 299ccbf899..e4e7c8d09b 100644
--- a/epan/dissectors/packet-fddi.c
+++ b/epan/dissectors/packet-fddi.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fddi.h b/epan/dissectors/packet-fddi.h
index bb2b40e5fc..a79de0daa7 100644
--- a/epan/dissectors/packet-fddi.h
+++ b/epan/dissectors/packet-fddi.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index cb768f4444..3de40d5587 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -3035,7 +3035,7 @@ dissect_fix(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index a4158eeb74..d74972a2c8 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -792,7 +792,7 @@ static void dissect_fr_xid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
call_dissector(data_handle,tvb_new_subset(tvb,0,-1,-1),pinfo,tree);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void proto_register_fr(void)
{
static hf_register_info hf[] = {
diff --git a/epan/dissectors/packet-fr.h b/epan/dissectors/packet-fr.h
index 510f577485..f03ecfc532 100644
--- a/epan/dissectors/packet-fr.h
+++ b/epan/dissectors/packet-fr.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index 22bb91afa3..3585cc6da3 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -271,7 +271,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
}
}
- /* Portable Exception Handling to trap Ethereal specific exceptions like BoundsError exceptions */
+ /* Portable Exception Handling to trap Wireshark specific exceptions like BoundsError exceptions */
TRY {
#ifdef _MSC_VER
/* Win32: Visual-C Structured Exception Handling (SEH) to trap hardware exceptions like memory access violations */
diff --git a/epan/dissectors/packet-frame.h b/epan/dissectors/packet-frame.h
index 80e4d030f7..6011b04d28 100644
--- a/epan/dissectors/packet-frame.h
+++ b/epan/dissectors/packet-frame.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -50,7 +50,7 @@ register_frame_end_routine(void (*func)(void));
*/
extern int proto_malformed;
-/* following variables are exported from libethereal.dll.
+/* following variables are exported from libwireshark.dll.
* Thus we need a special declaration.
*/
ETH_VAR_IMPORT int proto_frame;
diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index d60fd7e962..ccd66baf0d 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-ftam.c */
/* ../../tools/asn2eth.py -X -b -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */
@@ -17,8 +17,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ftam.h b/epan/dissectors/packet-ftam.h
index 793d630ed8..94cc037e7b 100644
--- a/epan/dissectors/packet-ftam.h
+++ b/epan/dissectors/packet-ftam.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-ftam.h */
/* ../../tools/asn2eth.py -X -b -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */
@@ -17,8 +17,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ftbp.c b/epan/dissectors/packet-ftbp.c
index 961f501bf9..754c5c1708 100644
--- a/epan/dissectors/packet-ftbp.c
+++ b/epan/dissectors/packet-ftbp.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-ftbp.c */
/* ../../tools/asn2eth.py -X -b -e -p ftbp -c ftbp.cnf -s packet-ftbp-template ftbp.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ftbp.h b/epan/dissectors/packet-ftbp.h
index 4e4ae47c15..ae2219e3e2 100644
--- a/epan/dissectors/packet-ftbp.h
+++ b/epan/dissectors/packet-ftbp.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-ftbp.h */
/* ../../tools/asn2eth.py -X -b -e -p ftbp -c ftbp.cnf -s packet-ftbp-template ftbp.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c
index 6140340fef..ea62b24274 100644
--- a/epan/dissectors/packet-ftp.c
+++ b/epan/dissectors/packet-ftp.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c
diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c
index a04bd39e33..b14e1847bc 100644
--- a/epan/dissectors/packet-fw1.c
+++ b/epan/dissectors/packet-fw1.c
@@ -4,7 +4,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Alfred Koebler <ako@icon.de>
* Copyright 2002,2003 Alfred Koebler
*
@@ -27,7 +27,7 @@
*
* What's the problem ?
* Think about one packet traveling across the firewall.
- * With ethereal you will see 4 lines in the Top Pane.
+ * With wireshark you will see 4 lines in the Top Pane.
* To analyze a problem it is helpful to see the additional information
* in the protocol tree of the Middle Pane.
*
diff --git a/epan/dissectors/packet-g723.c b/epan/dissectors/packet-g723.c
index b01dab3f59..400d02e547 100644
--- a/epan/dissectors/packet-g723.c
+++ b/epan/dissectors/packet-g723.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -97,7 +97,7 @@ dissect_g723(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* If this dissector uses sub-dissector registration add a registration routine.
This format is required because a script is used to find these routines and
create the code that calls these routines.
diff --git a/epan/dissectors/packet-gift.c b/epan/dissectors/packet-gift.c
index 1022a637e9..5a3fd353cd 100644
--- a/epan/dissectors/packet-gift.c
+++ b/epan/dissectors/packet-gift.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index 3ac01c9055..6dbf0fe0b5 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -260,14 +260,14 @@
* To quote from the ever helpful development list
*
* " When a capture file is initially loaded, all "visited" flags
- * are 0. Ethereal then makes the first pass through file,
+ * are 0. Wireshark then makes the first pass through file,
* sequentially dissecting each packet. After the packet is
* dissected the first time, "visited" is 1. (See the end of
* dissect_packet() in epan/packet.c; that's the code that
* sets "visited" to 1).
* By the time a user clicks on a packet, "visited" will already
- * be 1 because Ethereal will have already done its first pass
+ * be 1 because Wireshark will have already done its first pass
* through the packets.
* Reload acts just like a normal Close/Open, except that it
diff --git a/epan/dissectors/packet-giop.h b/epan/dissectors/packet-giop.h
index 6c672baf03..e05d7522b9 100644
--- a/epan/dissectors/packet-giop.h
+++ b/epan/dissectors/packet-giop.h
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c
index 9b1a74e4c7..91478ef070 100644
--- a/epan/dissectors/packet-gmrp.c
+++ b/epan/dissectors/packet-gmrp.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -148,7 +148,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (protocol_id != GARP_DEFAULT_PROTOCOL_ID)
{
proto_tree_add_text(gmrp_tree, tvb, GARP_PROTOCOL_ID, sizeof(guint16),
- " (Warning: this version of Ethereal only knows about protocol id = 1)");
+ " (Warning: this version of Wireshark only knows about protocol id = 1)");
call_dissector(data_handle,
tvb_new_subset(tvb, GARP_PROTOCOL_ID + sizeof(guint16), -1, -1),
pinfo, tree);
@@ -339,7 +339,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_gmrp(void)
{
diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c
index 6e81dca602..793ae69640 100644
--- a/epan/dissectors/packet-gnm.c
+++ b/epan/dissectors/packet-gnm.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-gnm.c */
/* ../../tools/asn2eth.py -X -b -e -p gnm -c gnm.cnf -s packet-gnm-template GNM.asn */
@@ -12,8 +12,8 @@
* Copyright 2005 , Anders Broman <anders.broman [AT] ericsson.com>
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-gnm.h b/epan/dissectors/packet-gnm.h
index 4d82856de8..9081cbf9b4 100644
--- a/epan/dissectors/packet-gnm.h
+++ b/epan/dissectors/packet-gnm.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-gnm.h */
/* ../../tools/asn2eth.py -X -b -e -p gnm -c gnm.cnf -s packet-gnm-template GNM.asn */
@@ -12,8 +12,8 @@
* Copyright 2005 , Anders Broman <anders.broman [AT] ericsson.com>
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c
index d3728918b2..1aa7eefa91 100644
--- a/epan/dissectors/packet-gnutella.c
+++ b/epan/dissectors/packet-gnutella.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-gnutella.h b/epan/dissectors/packet-gnutella.h
index 64f8b49537..647718b286 100644
--- a/epan/dissectors/packet-gnutella.h
+++ b/epan/dissectors/packet-gnutella.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c
index cb11d1a0cc..e361390dbe 100644
--- a/epan/dissectors/packet-gprs-llc.c
+++ b/epan/dissectors/packet-gprs-llc.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1164,7 +1164,7 @@ dissect_llcgprs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function */
/* that calls all the protocol registration. */
diff --git a/epan/dissectors/packet-gprs-ns.c b/epan/dissectors/packet-gprs-ns.c
index 1a63cb29c8..d84117e808 100644
--- a/epan/dissectors/packet-gprs-ns.c
+++ b/epan/dissectors/packet-gprs-ns.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -315,7 +315,7 @@ dissect_gprs_ns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_gprs_ns(void)
{
diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c
index cdb20b349d..abe3c4e07a 100644
--- a/epan/dissectors/packet-gre.c
+++ b/epan/dissectors/packet-gre.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-gsm_a.c b/epan/dissectors/packet-gsm_a.c
index 22fb413bde..7a5fcedabc 100644
--- a/epan/dissectors/packet-gsm_a.c
+++ b/epan/dissectors/packet-gsm_a.c
@@ -65,8 +65,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -18199,7 +18199,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_gsm_a(void)
{
diff --git a/epan/dissectors/packet-gsm_a.h b/epan/dissectors/packet-gsm_a.h
index ff98e99884..85c44b0278 100644
--- a/epan/dissectors/packet-gsm_a.h
+++ b/epan/dissectors/packet-gsm_a.h
@@ -5,8 +5,8 @@
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -97,7 +97,7 @@ void dtap_rr_ho_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len);
/*
* the following allows TAP code access to the messages
* without having to duplicate it. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT const value_string gsm_a_bssmap_msg_strings[];
ETH_VAR_IMPORT const value_string gsm_a_dtap_msg_mm_strings[];
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 47c8fbd237..5d516356fe 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-gsm_map.c */
/* ../../tools/asn2eth.py -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */
@@ -15,8 +15,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-gsm_map.h b/epan/dissectors/packet-gsm_map.h
index 7fcb3ef4a1..51a8ba7ece 100644
--- a/epan/dissectors/packet-gsm_map.h
+++ b/epan/dissectors/packet-gsm_map.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-gsm_map.h */
/* ../../tools/asn2eth.py -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index f6dc23db06..14828e1167 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -13,8 +13,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -2597,7 +2597,7 @@ dissect_gsm_sms(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_gsm_sms(void)
{
diff --git a/epan/dissectors/packet-gsm_sms.h b/epan/dissectors/packet-gsm_sms.h
index bb55808543..2a652b52b9 100644
--- a/epan/dissectors/packet-gsm_sms.h
+++ b/epan/dissectors/packet-gsm_sms.h
@@ -5,8 +5,8 @@
* Copyright 2004, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c
index b36f588d96..6dcb172451 100644
--- a/epan/dissectors/packet-gsm_sms_ud.c
+++ b/epan/dissectors/packet-gsm_sms_ud.c
@@ -37,8 +37,8 @@
* - It is the 1st segment of an unreassembled Short Message (if the
* "always try subdissection of 1st fragment" preference is enabled)
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -438,7 +438,7 @@ dissect_gsm_sms_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
parse_gsm_sms_ud_message(subtree, tvb, pinfo, tree);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_gsm_sms_ud(void)
{
diff --git a/epan/dissectors/packet-gsm_ss.c b/epan/dissectors/packet-gsm_ss.c
index e33d55b340..7e2454541b 100644
--- a/epan/dissectors/packet-gsm_ss.c
+++ b/epan/dissectors/packet-gsm_ss.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-gsm_ss.c */
/* ../../tools/asn2eth.py -X -b -e -p gsm_ss -c gsm_ss.cnf -s packet-gsm_ss-template SS-Operations.asn */
@@ -21,8 +21,8 @@
* (3GPP TS 24.080 version )
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-gsm_ss.h b/epan/dissectors/packet-gsm_ss.h
index fdfb10fa8b..1a01651ad2 100644
--- a/epan/dissectors/packet-gsm_ss.h
+++ b/epan/dissectors/packet-gsm_ss.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-gsm_ss.h */
/* ../../tools/asn2eth.py -X -b -e -p gsm_ss -c gsm_ss.cnf -s packet-gsm_ss-template SS-Operations.asn */
@@ -20,8 +20,8 @@
* Formats and coding
* (3GPP TS 24.080 version )
* $Id$ *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c
index b5796001df..0170aac47e 100644
--- a/epan/dissectors/packet-gssapi.c
+++ b/epan/dissectors/packet-gssapi.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-gssapi.h b/epan/dissectors/packet-gssapi.h
index 1ef78b42c1..11c9586d2c 100644
--- a/epan/dissectors/packet-gssapi.h
+++ b/epan/dissectors/packet-gssapi.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index c9077c94d3..5f343e25c5 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c
index d20d2fe489..989f5f3f78 100644
--- a/epan/dissectors/packet-gvrp.c
+++ b/epan/dissectors/packet-gvrp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -132,7 +132,7 @@ dissect_gvrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (protocol_id != GARP_DEFAULT_PROTOCOL_ID)
{
proto_tree_add_text(gvrp_tree, tvb, GARP_PROTOCOL_ID, sizeof(guint16),
- " (Warning: this version of Ethereal only knows about protocol id = 1)");
+ " (Warning: this version of Wireshark only knows about protocol id = 1)");
call_dissector(data_handle,
tvb_new_subset(tvb, GARP_PROTOCOL_ID + sizeof(guint16), -1, -1),
pinfo, tree);
@@ -295,7 +295,7 @@ dissect_gvrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_gvrp(void)
{
diff --git a/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c
index c2b7cb9f0f..f0a77819f0 100644
--- a/epan/dissectors/packet-h1.c
+++ b/epan/dissectors/packet-h1.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h221_nonstd.c b/epan/dissectors/packet-h221_nonstd.c
index c6f2ef5295..4811330de0 100644
--- a/epan/dissectors/packet-h221_nonstd.c
+++ b/epan/dissectors/packet-h221_nonstd.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index b867ef1776..f77f1e03c8 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-h225.c */
/* ../../tools/asn2eth.py -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h225.h b/epan/dissectors/packet-h225.h
index 6104403546..0e08ae5b2e 100644
--- a/epan/dissectors/packet-h225.h
+++ b/epan/dissectors/packet-h225.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-h225.h */
/* ../../tools/asn2eth.py -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -81,7 +81,7 @@ typedef struct _h225_packet_info {
/*
* the following allows TAP code access to the messages
* without having to duplicate it. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c
index 1cc0710498..560e3c8ba2 100644
--- a/epan/dissectors/packet-h235.c
+++ b/epan/dissectors/packet-h235.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-h235.c */
/* ../../tools/asn2eth.py -e -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn H235-SRTP.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h235.h b/epan/dissectors/packet-h235.h
index 91ff744694..207132ea52 100644
--- a/epan/dissectors/packet-h235.h
+++ b/epan/dissectors/packet-h235.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-h235.h */
/* ../../tools/asn2eth.py -e -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn H235-SRTP.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c
index 49e606e624..cef9411e5b 100644
--- a/epan/dissectors/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-h245.c */
/* ../../tools/asn2eth.py -e -p h245 -c h245.cnf -s packet-h245-template h245.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h245.h b/epan/dissectors/packet-h245.h
index 5dc07d2f3f..13e40612f2 100644
--- a/epan/dissectors/packet-h245.h
+++ b/epan/dissectors/packet-h245.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-h245.h */
/* ../../tools/asn2eth.py -X -e -p h245 -c h245.cnf -s packet-h245-template h245.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 46b2d23bc0..bcda78111a 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-h248.c */
/* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */
@@ -15,8 +15,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h248.h b/epan/dissectors/packet-h248.h
index 6752b2cb01..a487ce3c79 100644
--- a/epan/dissectors/packet-h248.h
+++ b/epan/dissectors/packet-h248.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-h248.h */
/* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */
@@ -14,8 +14,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h248_package_bcp.c b/epan/dissectors/packet-h248_package_bcp.c
index 58d6ebce57..1641cc1623 100644
--- a/epan/dissectors/packet-h248_package_bcp.c
+++ b/epan/dissectors/packet-h248_package_bcp.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-h248_package_bcp.c */
/* ../../tools/asn2eth.py -X -b -e -p h248_package_bcp -c h248_package_bcp.cnf -s packet-h248_package_bcp-template BCP.asn */
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h248_package_bcp.h b/epan/dissectors/packet-h248_package_bcp.h
index cbf4dce717..d3e3c03225 100644
--- a/epan/dissectors/packet-h248_package_bcp.h
+++ b/epan/dissectors/packet-h248_package_bcp.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-h248_package_bcp.h */
/* ../../tools/asn2eth.py -X -b -e -p h248_package_bcp -c h248_package_bcp.cnf -s packet-h248_package_bcp-template BCP.asn */
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c
index 4c064d1058..75a5051cfd 100644
--- a/epan/dissectors/packet-h261.c
+++ b/epan/dissectors/packet-h261.c
@@ -7,8 +7,8 @@
* Copyright 2000, Philips Electronics N.V.
* Andreas Sikkema <h323@ramdyne.nl>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c
index 34bbc9df4c..3553b845a3 100644
--- a/epan/dissectors/packet-h263.c
+++ b/epan/dissectors/packet-h263.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied structure from packet-h261.c
diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c
index afdd93dd57..920fb9882f 100644
--- a/epan/dissectors/packet-h450.c
+++ b/epan/dissectors/packet-h450.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-h450.c */
/* ../../tools/asn2eth.py -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn */
@@ -14,8 +14,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-h450.h b/epan/dissectors/packet-h450.h
index 638eef84c8..0f0809237c 100644
--- a/epan/dissectors/packet-h450.h
+++ b/epan/dissectors/packet-h450.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-h450.h */
/* ../../tools/asn2eth.py -X -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c
index 78ee99736e..973bbac340 100644
--- a/epan/dissectors/packet-hci_h4.c
+++ b/epan/dissectors/packet-hci_h4.c
@@ -4,13 +4,13 @@
* Copyright 2002, Christoph Scholz <scholz@cs.uni-bonn.de>
* From: http://affix.sourceforge.net/archive/ethereal_affix-3.patch
*
- * Refactored for ethereal checkin
+ * Refactored for wireshark checkin
* Ronnie Sahlberg 2006
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-hci_h4.h b/epan/dissectors/packet-hci_h4.h
index 9be237bf43..df557612af 100644
--- a/epan/dissectors/packet-hci_h4.h
+++ b/epan/dissectors/packet-hci_h4.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c
index 841eb78128..ff0553e02a 100644
--- a/epan/dissectors/packet-hclnfsd.c
+++ b/epan/dissectors/packet-hclnfsd.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-ypserv.c
diff --git a/epan/dissectors/packet-hclnfsd.h b/epan/dissectors/packet-hclnfsd.h
index e42392722c..d7863e7fbc 100644
--- a/epan/dissectors/packet-hclnfsd.h
+++ b/epan/dissectors/packet-hclnfsd.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c
index 91b0c09da6..f5ec744c5d 100644
--- a/epan/dissectors/packet-hpext.c
+++ b/epan/dissectors/packet-hpext.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-hpext.h b/epan/dissectors/packet-hpext.h
index ec7e148ca2..830b18db10 100644
--- a/epan/dissectors/packet-hpext.h
+++ b/epan/dissectors/packet-hpext.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c
index 24c9886a52..af1c13134d 100644
--- a/epan/dissectors/packet-hpsw.c
+++ b/epan/dissectors/packet-hpsw.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c
index d4460b8107..01c2372dc1 100644
--- a/epan/dissectors/packet-hsrp.c
+++ b/epan/dissectors/packet-hsrp.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-vrrp.c
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index 2c1c10c114..8e76502101 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-http.h b/epan/dissectors/packet-http.h
index 1fd47b9c1a..ecc655709d 100644
--- a/epan/dissectors/packet-http.h
+++ b/epan/dissectors/packet-http.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c
index 23f057d894..941ea27722 100644
--- a/epan/dissectors/packet-hyperscsi.c
+++ b/epan/dissectors/packet-hyperscsi.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
* Copyright 2002 Richard Sharpe <rsharpe@richardsharpe.com>
*
diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c
index c2c2871f0f..67dfe6e4c9 100644
--- a/epan/dissectors/packet-iapp.c
+++ b/epan/dissectors/packet-iapp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -459,7 +459,7 @@ dissect_iapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 266e016d07..023f18ac64 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -10,8 +10,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or modify it
@@ -57,10 +57,10 @@
/* #define DEBUG_HASHING */
/* #define DEBUG_DESEGMENT */
-/* Ethereal ID of the IAX2 protocol */
+/* Wireshark ID of the IAX2 protocol */
static int proto_iax2 = -1;
-/* The following hf_* variables are used to hold the ethereal IDs of
+/* The following hf_* variables are used to hold the wireshark IDs of
* our header fields; they are filled out when we call
* proto_register_field_array() in proto_register_iax2()
*/
@@ -1980,7 +1980,7 @@ proto_register_iax2 (void)
{&hf_iax2_callno,
{"Call identifier", "iax2.call", FT_UINT32, BASE_DEC, NULL, 0,
- "This is the identifier Ethereal assigns to identify this call. It does "
+ "This is the identifier Wireshark assigns to identify this call. It does "
"not correspond to any real field in the protocol", HFILL }},
{&hf_iax2_scallno,
diff --git a/epan/dissectors/packet-ib.c b/epan/dissectors/packet-ib.c
index 13fe694897..cc104e1baa 100644
--- a/epan/dissectors/packet-ib.c
+++ b/epan/dissectors/packet-ib.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-x11.c
@@ -203,7 +203,7 @@ dissect_ib(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
return tvb_length(tvb);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void proto_register_ib(void)
{
diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c
index 214febaa26..390325fbe3 100644
--- a/epan/dissectors/packet-icap.c
+++ b/epan/dissectors/packet-icap.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c
index b5d31a7b31..173a4466ea 100644
--- a/epan/dissectors/packet-icep.c
+++ b/epan/dissectors/packet-icep.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1234,7 +1234,7 @@ static gboolean dissect_icep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void proto_register_icep(void)
{
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 4c772b8ef2..bde54fd7ca 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* MobileIPv6 support added by Tomislav Borosa <tomislav.borosa@siemens.hr>
diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c
index 680f579567..5dca4998b9 100644
--- a/epan/dissectors/packet-icp.c
+++ b/epan/dissectors/packet-icp.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c
index 73f22ac9e6..6bfd850c0a 100644
--- a/epan/dissectors/packet-icq.c
+++ b/epan/dissectors/packet-icq.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c
index 95f36fa64a..b86bfd1d9a 100644
--- a/epan/dissectors/packet-idp.c
+++ b/epan/dissectors/packet-idp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-idp.h b/epan/dissectors/packet-idp.h
index 320bf7707c..43addfbffe 100644
--- a/epan/dissectors/packet-idp.h
+++ b/epan/dissectors/packet-idp.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index fae0b430c9..ea129e26c6 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
diff --git a/epan/dissectors/packet-ieee80211.h b/epan/dissectors/packet-ieee80211.h
index 3760c76f6d..f7f99974df 100644
--- a/epan/dissectors/packet-ieee80211.h
+++ b/epan/dissectors/packet-ieee80211.h
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
diff --git a/epan/dissectors/packet-ieee8023.c b/epan/dissectors/packet-ieee8023.c
index 701d046858..eaae439b41 100644
--- a/epan/dissectors/packet-ieee8023.c
+++ b/epan/dissectors/packet-ieee8023.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ieee8023.h b/epan/dissectors/packet-ieee8023.h
index 48c1d13548..4f14bed6be 100644
--- a/epan/dissectors/packet-ieee8023.h
+++ b/epan/dissectors/packet-ieee8023.h
@@ -4,7 +4,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c
index 4a28b56be4..284db8273c 100644
--- a/epan/dissectors/packet-ieee802a.c
+++ b/epan/dissectors/packet-ieee802a.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ieee802a.h b/epan/dissectors/packet-ieee802a.h
index 6d95a38ffc..8f11bc17d3 100644
--- a/epan/dissectors/packet-ieee802a.h
+++ b/epan/dissectors/packet-ieee802a.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c
index 7aff5cffc1..432a327a5b 100644
--- a/epan/dissectors/packet-ifcp.c
+++ b/epan/dissectors/packet-ifcp.c
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c
index 287b8c451d..85b29d7ae0 100644
--- a/epan/dissectors/packet-igap.c
+++ b/epan/dissectors/packet-igap.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-igap.h b/epan/dissectors/packet-igap.h
index e8907e7bd0..93e4fc6ca8 100644
--- a/epan/dissectors/packet-igap.h
+++ b/epan/dissectors/packet-igap.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c
index 9b76e207d4..e16f94324d 100644
--- a/epan/dissectors/packet-igmp.c
+++ b/epan/dissectors/packet-igmp.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-igmp.h b/epan/dissectors/packet-igmp.h
index 66269aea44..3d6d423dc2 100644
--- a/epan/dissectors/packet-igmp.h
+++ b/epan/dissectors/packet-igmp.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c
index 565ac02a22..fb0d709da0 100644
--- a/epan/dissectors/packet-igrp.c
+++ b/epan/dissectors/packet-igrp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-syslog.c
@@ -167,7 +167,7 @@ static void dissect_vektor_igrp (tvbuff_t *tvb, proto_tree *igrp_vektor_tree, gu
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void proto_register_igrp(void)
{
diff --git a/epan/dissectors/packet-image-gif.c b/epan/dissectors/packet-image-gif.c
index 62bba8803f..aec14d016a 100644
--- a/epan/dissectors/packet-image-gif.c
+++ b/epan/dissectors/packet-image-gif.c
@@ -8,8 +8,8 @@
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Compuserve GIF media decoding functionality provided by Olivier Biot.
@@ -436,7 +436,7 @@ dissect_gif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
}
-/****************** Register the protocol with Ethereal ******************/
+/****************** Register the protocol with Wireshark ******************/
/* This format is required because a script is used to build the C function
diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c
index ffee2f6012..2fbf8fd012 100644
--- a/epan/dissectors/packet-image-jfif.c
+++ b/epan/dissectors/packet-image-jfif.c
@@ -8,8 +8,8 @@
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* JFIF media decoding functionality provided by Olivier Biot.
@@ -873,7 +873,7 @@ dissect_jfif(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
}
-/****************** Register the protocol with Ethereal ******************/
+/****************** Register the protocol with Wireshark ******************/
/* This format is required because a script is used to build the C function
diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c
index 88075e96d5..0f5f1be5c6 100644
--- a/epan/dissectors/packet-imap.c
+++ b/epan/dissectors/packet-imap.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index f312eb74cd..ae074f3215 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-inap.c */
/* ../../tools/asn2eth.py -X -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */
@@ -12,8 +12,8 @@
* Built from the gsm-map dissector Copyright 2004, Anders Broman <anders.broman@ericsson.com>
*
* $Id$
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-inap.h b/epan/dissectors/packet-inap.h
index 7236f9fdea..eebebf9ac0 100644
--- a/epan/dissectors/packet-inap.h
+++ b/epan/dissectors/packet-inap.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-inap.h */
/* ../../tools/asn2eth.py -X -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */
@@ -12,8 +12,8 @@
*
* Copyright 2004, Tim Endean <endeant@hotmail.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 604cf2aff7..5d30977fc1 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Monday, June 27, 2005
diff --git a/epan/dissectors/packet-ip.h b/epan/dissectors/packet-ip.h
index 43c6f5e5ac..18a74b796f 100644
--- a/epan/dissectors/packet-ip.h
+++ b/epan/dissectors/packet-ip.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c
index 0508d67f24..eabdd72e66 100644
--- a/epan/dissectors/packet-ipdc.c
+++ b/epan/dissectors/packet-ipdc.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ipdc.h b/epan/dissectors/packet-ipdc.h
index 514b27e682..61cd82fe2c 100644
--- a/epan/dissectors/packet-ipdc.h
+++ b/epan/dissectors/packet-ipdc.h
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c
index 60b9640d33..25c05fd8db 100644
--- a/epan/dissectors/packet-ipfc.c
+++ b/epan/dissectors/packet-ipfc.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -92,7 +92,7 @@ dissect_ipfc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
call_dissector(llc_handle, next_tvb, pinfo, tree);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-ipfc.h b/epan/dissectors/packet-ipfc.h
index 8a329893d4..1c02d80ccd 100644
--- a/epan/dissectors/packet-ipfc.h
+++ b/epan/dissectors/packet-ipfc.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c
index 8d71dff8de..5c588191a5 100644
--- a/epan/dissectors/packet-ipmi.c
+++ b/epan/dissectors/packet-ipmi.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-rmcp.c
diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c
index 1f5ece3234..e05ce21309 100644
--- a/epan/dissectors/packet-ipp.c
+++ b/epan/dissectors/packet-ipp.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c
index c883e72fcd..524e995a19 100644
--- a/epan/dissectors/packet-ipsec.c
+++ b/epan/dissectors/packet-ipsec.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ipsec.h b/epan/dissectors/packet-ipsec.h
index 62d3d58a9f..0df4eb17b6 100644
--- a/epan/dissectors/packet-ipsec.h
+++ b/epan/dissectors/packet-ipsec.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 498f52c49a..7c1475022a 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* MobileIPv6 support added by Tomislav Borosa <tomislav.borosa@siemens.hr>
diff --git a/epan/dissectors/packet-ipv6.h b/epan/dissectors/packet-ipv6.h
index 9995f7d5ef..276ba1496f 100644
--- a/epan/dissectors/packet-ipv6.h
+++ b/epan/dissectors/packet-ipv6.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c
index 01ad34a81c..7468db30c5 100644
--- a/epan/dissectors/packet-ipvs-syncd.c
+++ b/epan/dissectors/packet-ipvs-syncd.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c
index 678ae15a13..f1a31020e9 100644
--- a/epan/dissectors/packet-ipx.c
+++ b/epan/dissectors/packet-ipx.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -457,7 +457,7 @@ spx_hash_func(gconstpointer v)
}
/* Initializes the hash table and the mem_chunk area each time a new
- * file is loaded or re-loaded in ethereal */
+ * file is loaded or re-loaded in wireshark */
static void
spx_init_protocol(void)
{
diff --git a/epan/dissectors/packet-ipx.h b/epan/dissectors/packet-ipx.h
index 859fd9b09f..9b8d48982d 100644
--- a/epan/dissectors/packet-ipx.h
+++ b/epan/dissectors/packet-ipx.h
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c
index 764f9cbc3e..c375332004 100644
--- a/epan/dissectors/packet-ipxwan.c
+++ b/epan/dissectors/packet-ipxwan.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c
index 9edc4ffdcc..215dab4e90 100644
--- a/epan/dissectors/packet-irc.c
+++ b/epan/dissectors/packet-irc.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index 4dce32f474..507c0eba4a 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -13,8 +13,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-isakmp.h b/epan/dissectors/packet-isakmp.h
index e048309521..8f9996df33 100644
--- a/epan/dissectors/packet-isakmp.h
+++ b/epan/dissectors/packet-isakmp.h
@@ -10,8 +10,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index 5ba8c385e3..3b434a2abe 100644
--- a/epan/dissectors/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
@@ -13,8 +13,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1808,7 +1808,7 @@ dissect_iscsi_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/*
* this format is require because a script is used to build the C
diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c
index e1c2337cc2..6f28c4cbcf 100644
--- a/epan/dissectors/packet-isdn.c
+++ b/epan/dissectors/packet-isdn.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-isis-clv.c b/epan/dissectors/packet-isis-clv.c
index 334c3a9643..7aceb4b414 100644
--- a/epan/dissectors/packet-isis-clv.c
+++ b/epan/dissectors/packet-isis-clv.c
@@ -4,8 +4,8 @@
* $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-isis-clv.h b/epan/dissectors/packet-isis-clv.h
index bcf71b079f..05b43d2e09 100644
--- a/epan/dissectors/packet-isis-clv.h
+++ b/epan/dissectors/packet-isis-clv.h
@@ -4,8 +4,8 @@
* $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c
index 1ce2577aea..637dd37f9c 100644
--- a/epan/dissectors/packet-isis-hello.c
+++ b/epan/dissectors/packet-isis-hello.c
@@ -4,8 +4,8 @@
* $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-isis-hello.h b/epan/dissectors/packet-isis-hello.h
index 31ab933958..c7d4613c75 100644
--- a/epan/dissectors/packet-isis-hello.h
+++ b/epan/dissectors/packet-isis-hello.h
@@ -4,8 +4,8 @@
* $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c
index 164818de5a..c850bd6e18 100644
--- a/epan/dissectors/packet-isis-lsp.c
+++ b/epan/dissectors/packet-isis-lsp.c
@@ -4,8 +4,8 @@
* $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-isis-lsp.h b/epan/dissectors/packet-isis-lsp.h
index 751dfd5c0d..ffb115295d 100644
--- a/epan/dissectors/packet-isis-lsp.h
+++ b/epan/dissectors/packet-isis-lsp.h
@@ -4,8 +4,8 @@
* $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-isis-snp.c b/epan/dissectors/packet-isis-snp.c
index 638004c93f..363712859e 100644
--- a/epan/dissectors/packet-isis-snp.c
+++ b/epan/dissectors/packet-isis-snp.c
@@ -4,8 +4,8 @@
* $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-isis-snp.h b/epan/dissectors/packet-isis-snp.h
index 252f04866c..e4c5d5a7a2 100644
--- a/epan/dissectors/packet-isis-snp.h
+++ b/epan/dissectors/packet-isis-snp.h
@@ -4,8 +4,8 @@
* $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c
index 3182521960..bbfec8227b 100644
--- a/epan/dissectors/packet-isis.c
+++ b/epan/dissectors/packet-isis.c
@@ -5,8 +5,8 @@
* $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-isis.h b/epan/dissectors/packet-isis.h
index bb0cdf7b6b..cb64545fd5 100644
--- a/epan/dissectors/packet-isis.h
+++ b/epan/dissectors/packet-isis.h
@@ -4,8 +4,8 @@
* $Id$
* Stuart Stanley <stuarts@mxmail.net>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c
index e5bd09131f..01189a674a 100644
--- a/epan/dissectors/packet-isl.c
+++ b/epan/dissectors/packet-isl.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-isl.h b/epan/dissectors/packet-isl.h
index c926480ea5..7478f8d490 100644
--- a/epan/dissectors/packet-isl.h
+++ b/epan/dissectors/packet-isl.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c
index f227610626..ef92c960c4 100644
--- a/epan/dissectors/packet-ismp.c
+++ b/epan/dissectors/packet-ismp.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -547,7 +547,7 @@ dissect_ismp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register this protocol with Ethereal */
+/* Register this protocol with Wireshark */
void
proto_register_ismp(void)
{
diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c
index c65cc50465..e5183a8b66 100644
--- a/epan/dissectors/packet-isns.c
+++ b/epan/dissectors/packet-isns.c
@@ -10,8 +10,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1439,7 +1439,7 @@ AddAttribute(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree, guint offset,
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
@@ -1697,7 +1697,7 @@ void proto_register_isns(void)
{ &hf_isns_not_decoded_yet,
{ "Not Decoded Yet","isns.not_decoded_yet",
FT_NONE, BASE_NONE, NULL,0,
- "This tag is not yet decoded by ethereal" ,HFILL}
+ "This tag is not yet decoded by wireshark" ,HFILL}
},
{ &hf_isns_heartbeat_ipv6_addr,
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 04d46b9589..808afede2f 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
@@ -6886,7 +6886,7 @@ static int msg_stats_tree_packet(stats_tree *st , packet_info *pinfo, epan_diss
}
/*---------------------------------------------------------------------*/
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_isup(void)
{
diff --git a/epan/dissectors/packet-isup.h b/epan/dissectors/packet-isup.h
index 25349a9e3d..f37ecfec6e 100644
--- a/epan/dissectors/packet-isup.h
+++ b/epan/dissectors/packet-isup.h
@@ -5,8 +5,8 @@
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -38,7 +38,7 @@ typedef struct _isup_tap_rec_t {
/*
* the following allows TAP code access to the messages
* without having to duplicate it. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT const value_string isup_message_type_value[];
ETH_VAR_IMPORT const value_string isup_message_type_value_acro[];
diff --git a/epan/dissectors/packet-isup_thin.c b/epan/dissectors/packet-isup_thin.c
index 192615ca5c..7e81fc1d42 100644
--- a/epan/dissectors/packet-isup_thin.c
+++ b/epan/dissectors/packet-isup_thin.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -185,7 +185,7 @@ dissect_isup_thin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* If this dissector uses sub-dissector registration add a registration routine.
This format is required because a script is used to find these routines and
create the code that calls these routines.
diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c
index 694cce1088..7777de564f 100644
--- a/epan/dissectors/packet-iua.c
+++ b/epan/dissectors/packet-iua.c
@@ -10,8 +10,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
@@ -838,7 +838,7 @@ dissect_iua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
dissect_iua_message(message_tvb, pinfo, tree, iua_tree);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_iua(void)
{
diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c
index 701ac28abc..a546d3f164 100644
--- a/epan/dissectors/packet-iuup.c
+++ b/epan/dissectors/packet-iuup.c
@@ -5,8 +5,8 @@
*
* $Id: $
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-jabber.c b/epan/dissectors/packet-jabber.c
index f4b26970b6..a04d03f0ab 100644
--- a/epan/dissectors/packet-jabber.c
+++ b/epan/dissectors/packet-jabber.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-acap.c
diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c
index 2f72691bc0..ed089645b4 100644
--- a/epan/dissectors/packet-juniper.c
+++ b/epan/dissectors/packet-juniper.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c
index 8b0e8abb47..97ea9fd34b 100644
--- a/epan/dissectors/packet-jxta.c
+++ b/epan/dissectors/packet-jxta.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c, packet-jabber.c, packet-udp.c
diff --git a/epan/dissectors/packet-jxta.h b/epan/dissectors/packet-jxta.h
index 0af4610914..8ac67d2c3b 100644
--- a/epan/dissectors/packet-jxta.h
+++ b/epan/dissectors/packet-jxta.h
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c, packet-jabber.c, packet-udp.c
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c
index 9a88e4a21b..07eea3673c 100644
--- a/epan/dissectors/packet-k12.c
+++ b/epan/dissectors/packet-k12.c
@@ -5,8 +5,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
*
diff --git a/epan/dissectors/packet-kadm5.c b/epan/dissectors/packet-kadm5.c
index a292a8f19d..d300427736 100644
--- a/epan/dissectors/packet-kadm5.c
+++ b/epan/dissectors/packet-kadm5.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index 6cd1cdce99..ed29c8cfe2 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -25,8 +25,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -396,7 +396,7 @@ read_keytab_file(const char *filename, krb5_context *context)
krb5_kt_cursor cursor;
enc_key_t *new_key;
- /* should use a file in the ethereal users dir */
+ /* should use a file in the wireshark users dir */
ret = krb5_kt_resolve(*context, filename, &keytab);
if(ret){
fprintf(stderr, "KERBEROS ERROR: Could not open keytab file :%s\n",filename);
@@ -519,7 +519,7 @@ read_keytab_file(const char *filename, krb5_context *context)
krb5_kt_cursor cursor;
enc_key_t *new_key;
- /* should use a file in the ethereal users dir */
+ /* should use a file in the wireshark users dir */
ret = krb5_kt_resolve(*context, filename, &keytab);
if(ret){
fprintf(stderr, "KERBEROS ERROR: Could not open keytab file :%s\n",filename);
diff --git a/epan/dissectors/packet-kerberos.h b/epan/dissectors/packet-kerberos.h
index ccd4747b3e..0b52d71e31 100644
--- a/epan/dissectors/packet-kerberos.h
+++ b/epan/dissectors/packet-kerberos.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c
index 16544daa17..fc05ef06ea 100644
--- a/epan/dissectors/packet-kerberos4.c
+++ b/epan/dissectors/packet-kerberos4.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c
index 31216ada9b..ff309c27ef 100644
--- a/epan/dissectors/packet-kink.c
+++ b/epan/dissectors/packet-kink.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-klm.c b/epan/dissectors/packet-klm.c
index c8e455f4a2..95665f28a9 100644
--- a/epan/dissectors/packet-klm.c
+++ b/epan/dissectors/packet-klm.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-klm.h b/epan/dissectors/packet-klm.h
index 03ba46fc86..ec853ad367 100644
--- a/epan/dissectors/packet-klm.h
+++ b/epan/dissectors/packet-klm.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c
index 2dc863b82e..d3fc114e9f 100644
--- a/epan/dissectors/packet-kpasswd.c
+++ b/epan/dissectors/packet-kpasswd.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c
index 1eb4b28990..9512108a4e 100644
--- a/epan/dissectors/packet-l2tp.c
+++ b/epan/dissectors/packet-l2tp.c
@@ -9,8 +9,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c
index b208b75525..4599aa2095 100644
--- a/epan/dissectors/packet-lapb.c
+++ b/epan/dissectors/packet-lapb.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-lapbether.c b/epan/dissectors/packet-lapbether.c
index d083d9ffb0..3f3bb10659 100644
--- a/epan/dissectors/packet-lapbether.c
+++ b/epan/dissectors/packet-lapbether.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c
index 3ebadb98f7..f91e9aee70 100644
--- a/epan/dissectors/packet-lapd.c
+++ b/epan/dissectors/packet-lapd.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c
index 821baa5d1c..1f809c64f1 100644
--- a/epan/dissectors/packet-laplink.c
+++ b/epan/dissectors/packet-laplink.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -179,7 +179,7 @@ dissect_laplink_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_laplink(void)
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 8658e99aac..404e0ca4d6 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-ldap.c */
/* ../../tools/asn2eth.py -X -b -e -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */
@@ -13,8 +13,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -3132,12 +3132,12 @@ void proto_register_ldap(void) {
{ &hf_mscldap_netlogon_type,
{ "Type", "mscldap.netlogon.type",
FT_UINT32, BASE_DEC, NULL, 0x0,
- "Type of <please tell ethereal developers what this type is>", HFILL }},
+ "Type of <please tell wireshark developers what this type is>", HFILL }},
{ &hf_mscldap_netlogon_version,
{ "Version", "mscldap.netlogon.version",
FT_UINT32, BASE_DEC, NULL, 0x0,
- "Version of <please tell ethereal developers what this type is>", HFILL }},
+ "Version of <please tell wireshark developers what this type is>", HFILL }},
{ &hf_mscldap_netlogon_lm_token,
{ "LM Token", "mscldap.netlogon.lm_token",
diff --git a/epan/dissectors/packet-ldap.h b/epan/dissectors/packet-ldap.h
index 857694f325..44ab35e86d 100644
--- a/epan/dissectors/packet-ldap.h
+++ b/epan/dissectors/packet-ldap.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-ldap.h */
/* ../../tools/asn2eth.py -X -b -e -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c
index d92c5f21ae..2e62f22ddc 100644
--- a/epan/dissectors/packet-ldp.c
+++ b/epan/dissectors/packet-ldp.c
@@ -8,8 +8,8 @@
* CRLDP (RFC3212) is now supported
* - (c) 2002 Michael Rozhavsky <mike[AT]tochna.technion.ac.il>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ldp.h b/epan/dissectors/packet-ldp.h
index a68766ec74..2616f12ebd 100644
--- a/epan/dissectors/packet-ldp.h
+++ b/epan/dissectors/packet-ldp.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c
index d592780c51..65e539199d 100644
--- a/epan/dissectors/packet-lge_monitor.c
+++ b/epan/dissectors/packet-lge_monitor.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index 85e86de084..6360936a43 100644
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-llc.h b/epan/dissectors/packet-llc.h
index af50de0ee2..976de2f8d3 100644
--- a/epan/dissectors/packet-llc.h
+++ b/epan/dissectors/packet-llc.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c
index d28b2e7050..7745278dac 100644
--- a/epan/dissectors/packet-lldp.c
+++ b/epan/dissectors/packet-lldp.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -2356,7 +2356,7 @@ dissect_lldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_lldp(void)
{
diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c
index 874d91718d..8e5c2f5e53 100644
--- a/epan/dissectors/packet-lmi.c
+++ b/epan/dissectors/packet-lmi.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c
index 1b25aabb05..214eb6f21d 100644
--- a/epan/dissectors/packet-lmp.c
+++ b/epan/dissectors/packet-lmp.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c
index f5cf9a6756..4b8bf76c08 100644
--- a/epan/dissectors/packet-logotypecertextn.c
+++ b/epan/dissectors/packet-logotypecertextn.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-logotypecertextn.c */
/* ../../tools/asn2eth.py -X -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-logotypecertextn.h b/epan/dissectors/packet-logotypecertextn.h
index 9c857aa35b..fb104a2f6e 100644
--- a/epan/dissectors/packet-logotypecertextn.h
+++ b/epan/dissectors/packet-logotypecertextn.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-logotypecertextn.h */
/* ../../tools/asn2eth.py -X -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c
index 4b36b9f687..264244ae61 100644
--- a/epan/dissectors/packet-loop.c
+++ b/epan/dissectors/packet-loop.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c
index cd5aa3ccb4..a683c680cb 100644
--- a/epan/dissectors/packet-lpd.c
+++ b/epan/dissectors/packet-lpd.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c
index b0eb8360c8..c7cdb18a85 100644
--- a/epan/dissectors/packet-lwapp.c
+++ b/epan/dissectors/packet-lwapp.c
@@ -7,8 +7,8 @@
*
* Copyright (c) 2003 by David Frascone <dave@frascone.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-m2pa.c b/epan/dissectors/packet-m2pa.c
index 42ce06f55a..59b53b5fdf 100644
--- a/epan/dissectors/packet-m2pa.c
+++ b/epan/dissectors/packet-m2pa.c
@@ -10,8 +10,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-m3ua.c
@@ -573,7 +573,7 @@ proto_register_m2pa(void)
m2pa_module = prefs_register_protocol(proto_m2pa, proto_reg_handoff_m2pa);
- prefs_register_enum_preference(m2pa_module, "version", "M2PA version", "Version used by Ethereal", &m2pa_version, m2pa_version_options, FALSE);
+ prefs_register_enum_preference(m2pa_module, "version", "M2PA version", "Version used by Wireshark", &m2pa_version, m2pa_version_options, FALSE);
prefs_register_uint_preference(m2pa_module, "port", "M2PA SCTP Port", "Set the port for M2PA messages (Default of 3565)", 10, &global_sctp_port);
}
diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c
index d05bd2fddb..7ef4c15ece 100644
--- a/epan/dissectors/packet-m2tp.c
+++ b/epan/dissectors/packet-m2tp.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-m3ua.c
@@ -557,7 +557,7 @@ dissect_m2tp(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
dissect_m2tp_message(message_tvb, pinfo, m2tp_item, m2tp_tree, tree);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_m2tp(void)
{
diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c
index 337d4f595c..ff5492b417 100644
--- a/epan/dissectors/packet-m2ua.c
+++ b/epan/dissectors/packet-m2ua.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
@@ -1070,7 +1070,7 @@ dissect_m2ua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
dissect_message(message_tvb, pinfo, tree, m2ua_tree);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_m2ua(void)
{
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index 6d143fc219..c9709866c0 100644
--- a/epan/dissectors/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
@@ -10,8 +10,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
@@ -1913,7 +1913,7 @@ dissect_m3ua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
dissect_message(message_tvb, pinfo, tree, m3ua_tree);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_m3ua(void)
{
@@ -2006,7 +2006,7 @@ proto_register_m3ua(void)
register_dissector("m3ua", dissect_m3ua, proto_m3ua);
m3ua_module = prefs_register_protocol(proto_m3ua, NULL);
- prefs_register_enum_preference(m3ua_module, "version", "M3UA Version", "Version used by Ethereal", &version, options, FALSE);
+ prefs_register_enum_preference(m3ua_module, "version", "M3UA Version", "Version used by Wireshark", &version, options, FALSE);
/* Required function calls to register the header fields and subtrees used */
proto_register_field_array(proto_m3ua, hf, array_length(hf));
diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c
index 6fc2801b10..44a8bf6121 100644
--- a/epan/dissectors/packet-maccontrol.c
+++ b/epan/dissectors/packet-maccontrol.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-manolito.c b/epan/dissectors/packet-manolito.c
index 86212bcc42..2ad412ad06 100644
--- a/epan/dissectors/packet-manolito.c
+++ b/epan/dissectors/packet-manolito.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -239,7 +239,7 @@ dissect_manolito(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_manolito(void)
diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c
index 888a3a4c3e..d4ba97f5f1 100644
--- a/epan/dissectors/packet-mbtcp.c
+++ b/epan/dissectors/packet-mbtcp.c
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -589,7 +589,7 @@ dissect_mbtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_modbus(void)
diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c
index 24b0c71cf7..f7068acf7e 100644
--- a/epan/dissectors/packet-mdshdr.c
+++ b/epan/dissectors/packet-mdshdr.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from WHATEVER_FILE_YOU_USED (where "WHATEVER_FILE_YOU_USED"
@@ -274,7 +274,7 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal. This format is require because a script
+/* Register the protocol with Wireshark. This format is require because a script
* is used to build the C function that calls all the protocol registration.
*/
@@ -343,7 +343,7 @@ proto_reg_handoff_mdshdr(void)
if (!mdshdr_prefs_initialized) {
/*
* This is the first time this has been called (i.e.,
- * Ethereal/Tethereal is starting up), so create a handle for
+ * Wireshark/Tethereal is starting up), so create a handle for
* the MDS Header dissector, register the dissector for
* ethertype ETHERTYPE_FCFT, and fetch the data and Fibre
* Channel handles.
diff --git a/epan/dissectors/packet-media.c b/epan/dissectors/packet-media.c
index e10601e5f0..ef8310b1ce 100644
--- a/epan/dissectors/packet-media.c
+++ b/epan/dissectors/packet-media.c
@@ -9,8 +9,8 @@
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c
index 589b0496d2..2af04acc3c 100644
--- a/epan/dissectors/packet-mip.c
+++ b/epan/dissectors/packet-mip.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -375,7 +375,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
} /* dissect_mip */
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void proto_register_mip(void)
{
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c
index 1846b1fa83..2ce13dfb5b 100644
--- a/epan/dissectors/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
@@ -10,8 +10,8 @@
* Modifications for NEMO packets (RFC 3963): Bruno Deniaud
* (bdeniaud@irisa.fr, nono@chez.com) 12 Oct 2005
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -877,7 +877,7 @@ dissect_mip6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_mip6(void)
{
diff --git a/epan/dissectors/packet-mip6.h b/epan/dissectors/packet-mip6.h
index a225eb93e3..1a5974bedf 100644
--- a/epan/dissectors/packet-mip6.h
+++ b/epan/dissectors/packet-mip6.h
@@ -11,8 +11,8 @@
* Modifications for NEMO packets (RFC 3963): Bruno Deniaud
* (bdeniaud@irisa.fr, nono@chez.com) 12 Oct 2005
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c
index 048605be32..5394ec2d8f 100644
--- a/epan/dissectors/packet-mms.c
+++ b/epan/dissectors/packet-mms.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-mms.c */
/* ../../tools/asn2eth.py -X -b -e -p mms -c mms.cnf -s packet-mms-template mms.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-mms.h b/epan/dissectors/packet-mms.h
index 66d0c527a0..5af3eb02f4 100644
--- a/epan/dissectors/packet-mms.h
+++ b/epan/dissectors/packet-mms.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-mms.h */
/* ../../tools/asn2eth.py -X -b -e -p mms -c mms.cnf -s packet-mms-template mms.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c
index 895dcec855..d058157481 100644
--- a/epan/dissectors/packet-mmse.c
+++ b/epan/dissectors/packet-mmse.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1315,7 +1315,7 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut,
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is required because a script is used to build the C function
* that calls all the protocol registration.
diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c
index 85c9978d13..a07fdad579 100644
--- a/epan/dissectors/packet-mount.c
+++ b/epan/dissectors/packet-mount.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-smb.c
diff --git a/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c
index b466676f7e..5055d7e3a5 100644
--- a/epan/dissectors/packet-mpeg1.c
+++ b/epan/dissectors/packet-mpeg1.c
@@ -7,8 +7,8 @@
* Copyright 2001,
* Francisco Javier Cabello Torres, <fjcabello@vtools.es>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c
index 575c7506e7..767efd512e 100644
--- a/epan/dissectors/packet-mpls-echo.c
+++ b/epan/dissectors/packet-mpls-echo.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1045,7 +1045,7 @@ dissect_mpls_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_mpls_echo(void)
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index 1a3ce519bc..2f991dd211 100644
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -9,8 +9,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-mpls.h b/epan/dissectors/packet-mpls.h
index de84fa5929..d52fb70462 100644
--- a/epan/dissectors/packet-mpls.h
+++ b/epan/dissectors/packet-mpls.h
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c
index df586039bd..128a19515c 100644
--- a/epan/dissectors/packet-mq-pcf.c
+++ b/epan/dissectors/packet-mq-pcf.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index 2f8940072e..d0b3d2660c 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-mq.h b/epan/dissectors/packet-mq.h
index e2b8a18759..f537507dea 100644
--- a/epan/dissectors/packet-mq.h
+++ b/epan/dissectors/packet-mq.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c
index 35645663c8..dd8413adaf 100644
--- a/epan/dissectors/packet-mrdisc.c
+++ b/epan/dissectors/packet-mrdisc.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-mrdisc.h b/epan/dissectors/packet-mrdisc.h
index 5056bb1195..09c6fdb603 100644
--- a/epan/dissectors/packet-mrdisc.h
+++ b/epan/dissectors/packet-mrdisc.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c
index ce48bd9088..ebfecd001c 100644
--- a/epan/dissectors/packet-ms-mms.c
+++ b/epan/dissectors/packet-ms-mms.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c
index b43fcb2649..228fa1d408 100644
--- a/epan/dissectors/packet-msdp.c
+++ b/epan/dissectors/packet-msdp.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-msn-messenger.c b/epan/dissectors/packet-msn-messenger.c
index 1b12c13eac..d68c107790 100644
--- a/epan/dissectors/packet-msn-messenger.c
+++ b/epan/dissectors/packet-msn-messenger.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c
diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c
index dd00fc5f70..775083aa06 100644
--- a/epan/dissectors/packet-msnip.c
+++ b/epan/dissectors/packet-msnip.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-msnip.h b/epan/dissectors/packet-msnip.h
index 5cbd4bccd4..daf0c6e8ba 100644
--- a/epan/dissectors/packet-msnip.h
+++ b/epan/dissectors/packet-msnip.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c
index 46bf64e80f..512166bd84 100644
--- a/epan/dissectors/packet-msnlb.c
+++ b/epan/dissectors/packet-msnlb.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c
index bba64ba988..ffdbcefc88 100644
--- a/epan/dissectors/packet-msproxy.c
+++ b/epan/dissectors/packet-msproxy.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c
index 3c1223bb4a..171b4acb48 100644
--- a/epan/dissectors/packet-msrp.c
+++ b/epan/dissectors/packet-msrp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -580,7 +580,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* If this dissector uses sub-dissector registration add a registration routine.
This format is required because a script is used to find these routines and
create the code that calls these routines.
diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c
index 7d4618be15..3cbab9b489 100644
--- a/epan/dissectors/packet-mtp2.c
+++ b/epan/dissectors/packet-mtp2.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-m2pa.c
diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c
index 7414f6b5bc..e188a48f6a 100644
--- a/epan/dissectors/packet-mtp3.c
+++ b/epan/dissectors/packet-mtp3.c
@@ -16,8 +16,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
diff --git a/epan/dissectors/packet-mtp3.h b/epan/dissectors/packet-mtp3.h
index 3e9281ac02..6fc98014d3 100644
--- a/epan/dissectors/packet-mtp3.h
+++ b/epan/dissectors/packet-mtp3.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -77,7 +77,7 @@ extern guint32 mtp3_pc_hash(const guint8* data);
/*
* the following allows TAP code access to the messages
* without having to duplicate it. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT const value_string mtp3_service_indicator_code_short_vals[];
diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c
index bcc591b952..e30e60b47a 100644
--- a/epan/dissectors/packet-mtp3mg.c
+++ b/epan/dissectors/packet-mtp3mg.c
@@ -16,8 +16,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-mtp3.c
diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c
index de815cafc7..8153944440 100644
--- a/epan/dissectors/packet-multipart.c
+++ b/epan/dissectors/packet-multipart.c
@@ -8,8 +8,8 @@
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
*
@@ -804,7 +804,7 @@ is_known_multipart_header(const char *header_str, guint len)
}
/*
- * Register the protocol with Ethereal.
+ * Register the protocol with Wireshark.
*
* This format is required because a script is used to build the C function
* that calls all the protocol registration.
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index f54a7a71ef..bfab1dfc09 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
@@ -49,7 +49,7 @@
#include <epan/reassemble.h>
#include <epan/prefs.h>
-/* Define version if we are not building ethereal statically */
+/* Define version if we are not building wireshark statically */
#ifndef ENABLE_STATIC
#include <gmodule.h>
G_MODULE_EXPORT const gchar version[] = "0.1";
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index 0bec487544..eef0e32389 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-nbap.c */
/* ../../tools/asn2eth.py -X -e -p nbap -c nbap.cnf -s packet-nbap-template nbap.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-nbap.h b/epan/dissectors/packet-nbap.h
index bde6e5adea..e0eeacf997 100644
--- a/epan/dissectors/packet-nbap.h
+++ b/epan/dissectors/packet-nbap.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-nbap.h */
/* ../../tools/asn2eth.py -X -e -p nbap -c nbap.cnf -s packet-nbap-template nbap.asn */
@@ -10,10 +10,10 @@
* Routines for UMTS Node B Application Part(NBAP) packet dissection
* Copyright 2005, Anders Broman <anders.broman@ericsson.com>
*
- * $Id: packet-nbap-template.h 16293 2005-10-24 21:16:44Z etxrab $
+ * $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-nbipx.c b/epan/dissectors/packet-nbipx.c
index 85f551077f..24d67e6488 100644
--- a/epan/dissectors/packet-nbipx.c
+++ b/epan/dissectors/packet-nbipx.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -543,7 +543,7 @@ proto_reg_handoff_nbipx(void)
* SMB - and, I infer, related stuff, such as name resolution - runs
* directly over IPX. (In Windows 2000, they also run SMB directly over
* TCP, on port 445, and that also appears to be called "direct hosting".
- * Ethereal handles SMB-over-TCP.)
+ * Wireshark handles SMB-over-TCP.)
*
* The document at
*
diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c
index 599d4c61a3..f236d6c1a5 100644
--- a/epan/dissectors/packet-nbns.c
+++ b/epan/dissectors/packet-nbns.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ncp-int.h b/epan/dissectors/packet-ncp-int.h
index 8dd1599702..7a523f6b82 100644
--- a/epan/dissectors/packet-ncp-int.h
+++ b/epan/dissectors/packet-ncp-int.h
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c
index 16918ae8b7..7b2efb611e 100644
--- a/epan/dissectors/packet-ncp-nmas.c
+++ b/epan/dissectors/packet-ncp-nmas.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ncp-nmas.h b/epan/dissectors/packet-ncp-nmas.h
index cca79a5776..ac2d72c05f 100644
--- a/epan/dissectors/packet-ncp-nmas.h
+++ b/epan/dissectors/packet-ncp-nmas.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c
index 2b6e93df8b..7f3096ca8a 100644
--- a/epan/dissectors/packet-ncp-sss.c
+++ b/epan/dissectors/packet-ncp-sss.c
@@ -6,8 +6,8 @@
*
* $Id: packet-ncp-sss.c,v 1.00 2003/06/26 11:36:14 guy Exp $
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ncp-sss.h b/epan/dissectors/packet-ncp-sss.h
index c59fe6e77b..a88edd8506 100644
--- a/epan/dissectors/packet-ncp-sss.h
+++ b/epan/dissectors/packet-ncp-sss.h
@@ -5,8 +5,8 @@
*
* $Id: packet-ncp-sss.h,v 1.0 2004/02/29 08:01:22 guy Exp $
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c
index 908a87f00e..41a984afc4 100644
--- a/epan/dissectors/packet-ncp.c
+++ b/epan/dissectors/packet-ncp.c
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -234,7 +234,7 @@ mncp_hash(gconstpointer v)
}
/* Initializes the hash table and the mem_chunk area each time a new
- * file is loaded or re-loaded in ethereal */
+ * file is loaded or re-loaded in wireshark */
static void
mncp_init_protocol(void)
{
diff --git a/epan/dissectors/packet-ncs.c b/epan/dissectors/packet-ncs.c
index cadc56fa61..ef5ec3c7e2 100644
--- a/epan/dissectors/packet-ncs.c
+++ b/epan/dissectors/packet-ncs.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index 3b7c8a3d4f..57eb9c4c4e 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c
index e03c86ac3d..5b2cddd596 100644
--- a/epan/dissectors/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -4063,7 +4063,7 @@ static dissector_handle_t ndps_data_handle;
* Function and Program numbers. The response, unfortunately, only
* identifies itself via the Exchange ID; you have to know what type of NDPS
* request the request packet contained in order to successfully parse the
- * response. A global method for doing this does not exist in ethereal yet
+ * response. A global method for doing this does not exist in wireshark yet
* (NFS also requires it), so for now the NDPS section will keep its own hash
* table keeping track of NDPS packets.
*
@@ -4115,7 +4115,7 @@ ndps_hash(gconstpointer v)
}
/* Initializes the hash table and the mem_chunk area each time a new
- * file is loaded or re-loaded in ethereal */
+ * file is loaded or re-loaded in wireshark */
static void
ndps_init_protocol(void)
{
diff --git a/epan/dissectors/packet-ndps.h b/epan/dissectors/packet-ndps.h
index ac7d23eb90..1e135683ba 100644
--- a/epan/dissectors/packet-ndps.h
+++ b/epan/dissectors/packet-ndps.h
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c
index 1595aaca56..e8cd689e12 100644
--- a/epan/dissectors/packet-netbios.c
+++ b/epan/dissectors/packet-netbios.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-netbios.h b/epan/dissectors/packet-netbios.h
index c8c0194943..c9b91d5ca5 100644
--- a/epan/dissectors/packet-netbios.h
+++ b/epan/dissectors/packet-netbios.h
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 7ad121327a..fa9a0b66f6 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -150,7 +150,7 @@ struct v9_template {
static struct v9_template v9_template_cache[V9TEMPLATE_CACHE_MAX_ENTRIES];
/*
- * ethereal tree identifiers
+ * wireshark tree identifiers
*/
static int proto_netflow = -1;
diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c
index db41dfff2f..06c6e29afd 100644
--- a/epan/dissectors/packet-netsync.c
+++ b/epan/dissectors/packet-netsync.c
@@ -5,8 +5,8 @@
*
* Copyright (c) 2005 by Erwin Rol <erwin@erwinrol.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c
index e3857eb2d4..54a3caad54 100644
--- a/epan/dissectors/packet-nettl.c
+++ b/epan/dissectors/packet-nettl.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pagp.c
@@ -269,7 +269,7 @@ dissect_nettl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_nettl(void)
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 25b35b5a34..ee073f265d 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-smb.c
diff --git a/epan/dissectors/packet-nfsacl.c b/epan/dissectors/packet-nfsacl.c
index 8b6ba955ca..84c1f50a07 100644
--- a/epan/dissectors/packet-nfsacl.c
+++ b/epan/dissectors/packet-nfsacl.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-nfsauth.c b/epan/dissectors/packet-nfsauth.c
index fb15990de9..004fde5fc0 100644
--- a/epan/dissectors/packet-nfsauth.c
+++ b/epan/dissectors/packet-nfsauth.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c
index 506fa8c949..6e63fea0aa 100644
--- a/epan/dissectors/packet-nhrp.c
+++ b/epan/dissectors/packet-nhrp.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-nhrp.h b/epan/dissectors/packet-nhrp.h
index 7774b7e733..a51289392c 100644
--- a/epan/dissectors/packet-nhrp.h
+++ b/epan/dissectors/packet-nhrp.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c
index 0497013b1d..13c1bd6c71 100644
--- a/epan/dissectors/packet-nisplus.c
+++ b/epan/dissectors/packet-nisplus.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-nisplus.h b/epan/dissectors/packet-nisplus.h
index dbc6c50aee..a8965b37d2 100644
--- a/epan/dissectors/packet-nisplus.h
+++ b/epan/dissectors/packet-nisplus.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c
index fd8816ccf1..ca60e5628e 100644
--- a/epan/dissectors/packet-nlm.c
+++ b/epan/dissectors/packet-nlm.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-mount.c
diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c
index 598c4ecbd7..5935046dd1 100644
--- a/epan/dissectors/packet-nlsp.c
+++ b/epan/dissectors/packet-nlsp.c
@@ -5,8 +5,8 @@
*
* Based on ISIS dissector by Stuart Stanley <stuarts@mxmail.net>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-nntp.c b/epan/dissectors/packet-nntp.c
index 77b5aca40d..9c3cd64861 100644
--- a/epan/dissectors/packet-nntp.c
+++ b/epan/dissectors/packet-nntp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c
index eb08d90a56..e7247ab42d 100644
--- a/epan/dissectors/packet-ns_cert_exts.c
+++ b/epan/dissectors/packet-ns_cert_exts.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-ns_cert_exts.c */
/* ../../tools/asn2eth.py -X -b -e -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c
index a06b258b61..7699d7055e 100644
--- a/epan/dissectors/packet-nsip.c
+++ b/epan/dissectors/packet-nsip.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-nt-oui.c b/epan/dissectors/packet-nt-oui.c
index a6e19fd8a8..5ef0ab109a 100644
--- a/epan/dissectors/packet-nt-oui.c
+++ b/epan/dissectors/packet-nt-oui.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-nt-sonmp.c b/epan/dissectors/packet-nt-sonmp.c
index b0726d8a60..47ffa47425 100644
--- a/epan/dissectors/packet-nt-sonmp.c
+++ b/epan/dissectors/packet-nt-sonmp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c
index badbc92177..1095594f64 100644
--- a/epan/dissectors/packet-nt-tpcp.c
+++ b/epan/dissectors/packet-nt-tpcp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index ddeff6b9f0..f9daf47af6 100644
--- a/epan/dissectors/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ntlmssp.h b/epan/dissectors/packet-ntlmssp.h
index 4799e4a785..0c4b799c67 100644
--- a/epan/dissectors/packet-ntlmssp.h
+++ b/epan/dissectors/packet-ntlmssp.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c
index 1f95aa55c9..1164018a8a 100644
--- a/epan/dissectors/packet-ntp.c
+++ b/epan/dissectors/packet-ntp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-ntp.h b/epan/dissectors/packet-ntp.h
index 21c3730bbb..d23cffc500 100644
--- a/epan/dissectors/packet-ntp.h
+++ b/epan/dissectors/packet-ntp.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
* Joerg Mayer <jmayer@loplof.de>
diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c
index 722ecc627d..095f2118bc 100644
--- a/epan/dissectors/packet-null.c
+++ b/epan/dissectors/packet-null.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* This file created by Mike Hall <mlh@io.com>
* Copyright 1998
@@ -133,7 +133,7 @@ capture_null( const guchar *pd, int len, packet_counts *ld )
* 00AA0000
*
* However, according to Gerald Combs, a FreeBSD ISDN PPP dump that
- * Andreas Klemm sent to ethereal-dev has a packet type of DLT_NULL,
+ * Andreas Klemm sent to wireshark-dev has a packet type of DLT_NULL,
* and the family bits look like PPP's protocol field. (Was this an
* older, or different, ISDN driver?) Looking at what appears to be
* that capture file, it appears that it's using PPP in HDLC framing,
diff --git a/epan/dissectors/packet-null.h b/epan/dissectors/packet-null.h
index 88eb16e46b..9050fd37d2 100644
--- a/epan/dissectors/packet-null.h
+++ b/epan/dissectors/packet-null.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c
index b26fc1a095..28bc5321da 100644
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-ocsp.c */
/* ../../tools/asn2eth.py -X -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ocsp.h b/epan/dissectors/packet-ocsp.h
index f568032a8e..ad24f8222c 100644
--- a/epan/dissectors/packet-ocsp.h
+++ b/epan/dissectors/packet-ocsp.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-ocsp.h */
/* ../../tools/asn2eth.py -X -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c
index f425387347..56d34e9044 100644
--- a/epan/dissectors/packet-oicq.c
+++ b/epan/dissectors/packet-oicq.c
@@ -12,8 +12,8 @@
* The OICQ client software is always changing,and the protocol of
* communication is also.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c
index 74ee3c7933..f7c1635ece 100644
--- a/epan/dissectors/packet-olsr.c
+++ b/epan/dissectors/packet-olsr.c
@@ -10,8 +10,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -141,7 +141,7 @@ dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
return 0; /* length not enough for a message header */
}
- /*-------------Setting the Protocol and Info Columns in the Ethereal Display----------*/
+ /*-------------Setting the Protocol and Info Columns in the Wireshark Display----------*/
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "UDP");
if (check_col(pinfo->cinfo, COL_INFO))
diff --git a/epan/dissectors/packet-osi-options.c b/epan/dissectors/packet-osi-options.c
index 705ac9f55d..f4b4c1a040 100644
--- a/epan/dissectors/packet-osi-options.c
+++ b/epan/dissectors/packet-osi-options.c
@@ -8,8 +8,8 @@
* $Id$
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-osi-options.h b/epan/dissectors/packet-osi-options.h
index 27ee3ded8c..85276199b6 100644
--- a/epan/dissectors/packet-osi-options.h
+++ b/epan/dissectors/packet-osi-options.h
@@ -4,8 +4,8 @@
* $Id$
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c
index 892c213508..9bde514dcc 100644
--- a/epan/dissectors/packet-osi.c
+++ b/epan/dissectors/packet-osi.c
@@ -6,8 +6,8 @@
* Laurent Deniel <laurent.deniel@free.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-osi.h b/epan/dissectors/packet-osi.h
index 9594917c09..a25657a6b0 100644
--- a/epan/dissectors/packet-osi.h
+++ b/epan/dissectors/packet-osi.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c
index 95261f1946..f11bff263e 100644
--- a/epan/dissectors/packet-ospf.c
+++ b/epan/dissectors/packet-ospf.c
@@ -22,8 +22,8 @@
* TOS - support is not fully implemented
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c
index 4f5071ffa1..e2c7b9168b 100644
--- a/epan/dissectors/packet-p_mul.c
+++ b/epan/dissectors/packet-p_mul.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c
index 0df2ce41e1..3c5156644c 100644
--- a/epan/dissectors/packet-pagp.c
+++ b/epan/dissectors/packet-pagp.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-slowprotocols.c
@@ -416,7 +416,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_pagp(void)
diff --git a/epan/dissectors/packet-pcnfsd.c b/epan/dissectors/packet-pcnfsd.c
index e61ba6b79f..5dc24022a9 100644
--- a/epan/dissectors/packet-pcnfsd.c
+++ b/epan/dissectors/packet-pcnfsd.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-ypbind.c
diff --git a/epan/dissectors/packet-pcnfsd.h b/epan/dissectors/packet-pcnfsd.h
index f217bdc768..d52f259db6 100644
--- a/epan/dissectors/packet-pcnfsd.h
+++ b/epan/dissectors/packet-pcnfsd.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c
index e11dd852de..5806611189 100644
--- a/epan/dissectors/packet-per.c
+++ b/epan/dissectors/packet-per.c
@@ -9,8 +9,8 @@ proper helper routines
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-per.h b/epan/dissectors/packet-per.h
index 5a25919b5b..c893a6172f 100644
--- a/epan/dissectors/packet-per.h
+++ b/epan/dissectors/packet-per.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c
index c66dbd80af..7364571404 100644
--- a/epan/dissectors/packet-pgm.c
+++ b/epan/dissectors/packet-pgm.c
@@ -5,8 +5,8 @@
*
* Copyright (c) 2000 by Talarian Corp
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c
index 16c73b727e..915035a148 100644
--- a/epan/dissectors/packet-pgsql.c
+++ b/epan/dissectors/packet-pgsql.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c
index aee93f57ea..67aecdad52 100644
--- a/epan/dissectors/packet-pim.c
+++ b/epan/dissectors/packet-pim.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pim.h b/epan/dissectors/packet-pim.h
index e4b7514212..162368c46e 100644
--- a/epan/dissectors/packet-pim.h
+++ b/epan/dissectors/packet-pim.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c
index ad3c80951f..64b97ac7b2 100644
--- a/epan/dissectors/packet-pkcs1.c
+++ b/epan/dissectors/packet-pkcs1.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pkcs1.c */
/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pkcs1.h b/epan/dissectors/packet-pkcs1.h
index 45ea6c0b3a..79b0d9a168 100644
--- a/epan/dissectors/packet-pkcs1.h
+++ b/epan/dissectors/packet-pkcs1.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pkcs1.h */
/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c
index 93186a9de0..f8f2c22030 100644
--- a/epan/dissectors/packet-pkinit.c
+++ b/epan/dissectors/packet-pkinit.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pkinit.c */
/* ../../tools/asn2eth.py -e -X -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pkinit.h b/epan/dissectors/packet-pkinit.h
index 0afaba0b79..670e3ae4b9 100644
--- a/epan/dissectors/packet-pkinit.h
+++ b/epan/dissectors/packet-pkinit.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pkinit.h */
/* ../../tools/asn2eth.py -e -X -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c
index c333660f72..182459e7eb 100644
--- a/epan/dissectors/packet-pkix1explicit.c
+++ b/epan/dissectors/packet-pkix1explicit.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pkix1explicit.c */
/* ../../tools/asn2eth.py -e -X -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn */
@@ -13,8 +13,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pkix1explicit.h b/epan/dissectors/packet-pkix1explicit.h
index 8fb5b0e332..585a258c68 100644
--- a/epan/dissectors/packet-pkix1explicit.h
+++ b/epan/dissectors/packet-pkix1explicit.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pkix1explicit.h */
/* ../../tools/asn2eth.py -e -X -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn */
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c
index 2f6e818cb5..62d82cb798 100644
--- a/epan/dissectors/packet-pkix1implicit.c
+++ b/epan/dissectors/packet-pkix1implicit.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pkix1implicit.c */
/* ../../tools/asn2eth.py -e -X -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn */
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pkix1implicit.h b/epan/dissectors/packet-pkix1implicit.h
index 6d94864e0d..2c4c839099 100644
--- a/epan/dissectors/packet-pkix1implicit.h
+++ b/epan/dissectors/packet-pkix1implicit.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pkix1implicit.h */
/* ../../tools/asn2eth.py -e -X -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn */
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c
index 4773ff5489..1b8c79f8f5 100644
--- a/epan/dissectors/packet-pkixproxy.c
+++ b/epan/dissectors/packet-pkixproxy.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pkixproxy.c */
/* ../../tools/asn2eth.py -X -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pkixproxy.h b/epan/dissectors/packet-pkixproxy.h
index 8e92821b09..633d349645 100644
--- a/epan/dissectors/packet-pkixproxy.h
+++ b/epan/dissectors/packet-pkixproxy.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pkixproxy.h */
/* ../../tools/asn2eth.py -X -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c
index 28973b1237..b3d83382ae 100644
--- a/epan/dissectors/packet-pkixqualified.c
+++ b/epan/dissectors/packet-pkixqualified.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pkixqualified.c */
/* ../../tools/asn2eth.py -X -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pkixqualified.h b/epan/dissectors/packet-pkixqualified.h
index 45cdbe8481..1f9001e3d5 100644
--- a/epan/dissectors/packet-pkixqualified.h
+++ b/epan/dissectors/packet-pkixqualified.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pkixqualified.h */
/* ../../tools/asn2eth.py -X -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c
index 8019271577..f66f247f1f 100644
--- a/epan/dissectors/packet-pkixtsp.c
+++ b/epan/dissectors/packet-pkixtsp.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pkixtsp.c */
/* ../../tools/asn2eth.py -X -b -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pkixtsp.h b/epan/dissectors/packet-pkixtsp.h
index faec6452f7..002a9c3ed0 100644
--- a/epan/dissectors/packet-pkixtsp.h
+++ b/epan/dissectors/packet-pkixtsp.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pkixtsp.h */
/* ../../tools/asn2eth.py -X -b -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c
index 93fa5f4a60..54405a4d7b 100644
--- a/epan/dissectors/packet-pktc.c
+++ b/epan/dissectors/packet-pktc.c
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pktc.h b/epan/dissectors/packet-pktc.h
index a00b9579c7..8ea02b47ee 100644
--- a/epan/dissectors/packet-pktc.h
+++ b/epan/dissectors/packet-pktc.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pn-rt.c b/epan/dissectors/packet-pn-rt.c
index ab9528ae74..a151bee75b 100644
--- a/epan/dissectors/packet-pn-rt.c
+++ b/epan/dissectors/packet-pn-rt.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c
index 1200e50b27..d384cc727b 100644
--- a/epan/dissectors/packet-pop.c
+++ b/epan/dissectors/packet-pop.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c
index 89f414a814..f360bf8f79 100644
--- a/epan/dissectors/packet-portmap.c
+++ b/epan/dissectors/packet-portmap.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-smb.c
diff --git a/epan/dissectors/packet-portmap.h b/epan/dissectors/packet-portmap.h
index 695bad532c..f9df09bd86 100644
--- a/epan/dissectors/packet-portmap.h
+++ b/epan/dissectors/packet-portmap.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index db83665b13..dbaf6f37d9 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* This file created and by Mike Hall <mlh@io.com>
* Copyright 1998
diff --git a/epan/dissectors/packet-ppp.h b/epan/dissectors/packet-ppp.h
index 900f209199..b4a3c83d8d 100644
--- a/epan/dissectors/packet-ppp.h
+++ b/epan/dissectors/packet-ppp.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index 510312d839..1ce2df00a8 100644
--- a/epan/dissectors/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c
index f4db883388..4af93ea5c7 100644
--- a/epan/dissectors/packet-pptp.c
+++ b/epan/dissectors/packet-pptp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c
index 4a8bd03dc4..41df42c9fb 100644
--- a/epan/dissectors/packet-pres.c
+++ b/epan/dissectors/packet-pres.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pres.c */
/* ../../tools/asn2eth.py -X -b -e -p pres -c pres.cnf -s packet-pres-template ISO8823-PRESENTATION.asn */
@@ -13,8 +13,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-pres.h b/epan/dissectors/packet-pres.h
index f78afa9e29..41214a6dbf 100644
--- a/epan/dissectors/packet-pres.h
+++ b/epan/dissectors/packet-pres.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-pres.h */
/* ../../tools/asn2eth.py -X -b -e -p pres -c pres.cnf -s packet-pres-template ISO8823-PRESENTATION.asn */
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-prism.c b/epan/dissectors/packet-prism.c
index 57cc16b38a..a5e8b9e943 100644
--- a/epan/dissectors/packet-prism.c
+++ b/epan/dissectors/packet-prism.c
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
diff --git a/epan/dissectors/packet-prism.h b/epan/dissectors/packet-prism.h
index 7af1893345..363f9391ba 100644
--- a/epan/dissectors/packet-prism.h
+++ b/epan/dissectors/packet-prism.h
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c
index f6a20f0e9c..1539c95c70 100644
--- a/epan/dissectors/packet-ptp.c
+++ b/epan/dissectors/packet-ptp.c
@@ -14,8 +14,8 @@
*
* A plugin for:
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1319,7 +1319,7 @@ dissect_ptp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_ptp(void)
diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c
index 269fdb0037..6d21fb1642 100644
--- a/epan/dissectors/packet-pvfs2.c
+++ b/epan/dissectors/packet-pvfs2.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-smb.c and others
@@ -3242,7 +3242,7 @@ dissect_pvfs_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
return TRUE;
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_pvfs(void)
{
diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c
index 5dcb48f71a..07616efa22 100644
--- a/epan/dissectors/packet-q2931.c
+++ b/epan/dissectors/packet-q2931.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c
index a1940d2e41..0d9d10633b 100644
--- a/epan/dissectors/packet-q931.c
+++ b/epan/dissectors/packet-q931.c
@@ -6,8 +6,8 @@
*
* Modified by Andreas Sikkema for possible use with H.323
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-q931.h b/epan/dissectors/packet-q931.h
index 486443393e..6319f41a76 100644
--- a/epan/dissectors/packet-q931.h
+++ b/epan/dissectors/packet-q931.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
@@ -55,7 +55,7 @@ typedef struct _q931_packet_info {
/*
* the following allows TAP code access to the messages
* without having to duplicate it. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT const value_string q931_cause_code_vals[];
ETH_VAR_IMPORT const value_string q931_message_type_vals[];
diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c
index 351aa8039e..4f91fd3a2b 100644
--- a/epan/dissectors/packet-q933.c
+++ b/epan/dissectors/packet-q933.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c
index f0913ca76b..5c34afbe38 100644
--- a/epan/dissectors/packet-qllc.c
+++ b/epan/dissectors/packet-qllc.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c
index 51fbb5751f..9bec019ddc 100644
--- a/epan/dissectors/packet-quake.c
+++ b/epan/dissectors/packet-quake.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c
index 05b7141a8e..873b1b087c 100644
--- a/epan/dissectors/packet-quake2.c
+++ b/epan/dissectors/packet-quake2.c
@@ -9,8 +9,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-quakeworld.c
diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c
index 34e34f34cb..87f2b2dd44 100644
--- a/epan/dissectors/packet-quake3.c
+++ b/epan/dissectors/packet-quake3.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-quake2.c
diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c
index b75a67f348..14709abe52 100644
--- a/epan/dissectors/packet-quakeworld.c
+++ b/epan/dissectors/packet-quakeworld.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-quake.c
diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-radiotap.c
index 988b49ee0a..5b32bf87a9 100644
--- a/epan/dissectors/packet-radiotap.c
+++ b/epan/dissectors/packet-radiotap.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
diff --git a/epan/dissectors/packet-radiotap.h b/epan/dissectors/packet-radiotap.h
index c92ecb7762..a8e9d6e682 100644
--- a/epan/dissectors/packet-radiotap.h
+++ b/epan/dissectors/packet-radiotap.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 45eeb502f6..d2c9c4718a 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-radius.h b/epan/dissectors/packet-radius.h
index 01d3dc13d8..f35e95d048 100644
--- a/epan/dissectors/packet-radius.h
+++ b/epan/dissectors/packet-radius.h
@@ -4,8 +4,8 @@
* Definitions for RADIUS packet disassembly
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-radius_packetcable.c b/epan/dissectors/packet-radius_packetcable.c
index ad5875ca1d..e3a8c3378e 100644
--- a/epan/dissectors/packet-radius_packetcable.c
+++ b/epan/dissectors/packet-radius_packetcable.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c
index 76d97dd24a..14a4c3b736 100644
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-ranap.c */
/* ../../tools/asn2eth.py -e -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn */
@@ -11,8 +11,8 @@
* Copyright 2005 - 2006, Anders Broman <anders.broman@ericsson.com>
* Based on the dissector by Martin Held <Martin.Held@icn.siemens.de>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ranap.h b/epan/dissectors/packet-ranap.h
index 95373a4904..4e2c95dfbf 100644
--- a/epan/dissectors/packet-ranap.h
+++ b/epan/dissectors/packet-ranap.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-ranap.h */
/* ../../tools/asn2eth.py -e -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn */
@@ -10,8 +10,8 @@
* Routines for GSM Supplementary Services dissection
* Copyright 2005, Anders Broman <anders.broman@ericsson.com>
* $Id$ *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c
index 0fa9207dfa..947c98d7e2 100644
--- a/epan/dissectors/packet-raw.c
+++ b/epan/dissectors/packet-raw.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* This file created and by Mike Hall <mlh@io.com>
* Copyright 1998
diff --git a/epan/dissectors/packet-raw.h b/epan/dissectors/packet-raw.h
index 40480ec0cc..60863efc6b 100644
--- a/epan/dissectors/packet-raw.h
+++ b/epan/dissectors/packet-raw.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c
index 8e4ff4c61b..dea335d86a 100644
--- a/epan/dissectors/packet-rdt.c
+++ b/epan/dissectors/packet-rdt.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rdt.h b/epan/dissectors/packet-rdt.h
index 6c40fd2b68..f71771b8c8 100644
--- a/epan/dissectors/packet-rdt.h
+++ b/epan/dissectors/packet-rdt.h
@@ -7,8 +7,8 @@
*
* Written by Martin Mathieson
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c
index 120b34d887..faf2dafdc7 100644
--- a/epan/dissectors/packet-redback.c
+++ b/epan/dissectors/packet-redback.c
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* Start of RedBack SE400/800 tcpdump trace disassembly
* Copyright 2005 Florian Lohoff <flo@rfc822.org>
diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c
index 950247ed97..d18a5bbc5e 100644
--- a/epan/dissectors/packet-retix-bpdu.c
+++ b/epan/dissectors/packet-retix-bpdu.c
@@ -5,8 +5,8 @@
*
* Copyright 2005 Giles Scott (gscott <AT> arubanetworks dot com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c
index 3947bf9bc0..5e019bb9b8 100644
--- a/epan/dissectors/packet-rip.c
+++ b/epan/dissectors/packet-rip.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c
index 7ed7526e92..0ba56a49f0 100644
--- a/epan/dissectors/packet-ripng.c
+++ b/epan/dissectors/packet-ripng.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ripng.h b/epan/dissectors/packet-ripng.h
index caaf5a431d..5fd2225bd8 100644
--- a/epan/dissectors/packet-ripng.h
+++ b/epan/dissectors/packet-ripng.h
@@ -4,7 +4,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@eethereal.com>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c
index ba7a365dc4..3d189a1ff0 100644
--- a/epan/dissectors/packet-rlogin.c
+++ b/epan/dissectors/packet-rlogin.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Based upon RFC-1282 - BSD Rlogin
diff --git a/epan/dissectors/packet-rmcp.c b/epan/dissectors/packet-rmcp.c
index 081dfafc37..25490c22cc 100644
--- a/epan/dissectors/packet-rmcp.c
+++ b/epan/dissectors/packet-rmcp.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c
index ca1ed61d2a..1dadd6510b 100644
--- a/epan/dissectors/packet-rmi.c
+++ b/epan/dissectors/packet-rmi.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rmi.h b/epan/dissectors/packet-rmi.h
index 80ed7b357a..25389206d8 100644
--- a/epan/dissectors/packet-rmi.h
+++ b/epan/dissectors/packet-rmi.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c
index 9ee506b4cc..7d38c44402 100644
--- a/epan/dissectors/packet-rmp.c
+++ b/epan/dissectors/packet-rmp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rmt-alc.c b/epan/dissectors/packet-rmt-alc.c
index c882bd2a02..f775cdebfc 100644
--- a/epan/dissectors/packet-rmt-alc.c
+++ b/epan/dissectors/packet-rmt-alc.c
@@ -19,8 +19,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rmt-alc.h b/epan/dissectors/packet-rmt-alc.h
index a60e0cfdd4..204fc73ca8 100644
--- a/epan/dissectors/packet-rmt-alc.h
+++ b/epan/dissectors/packet-rmt-alc.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -42,7 +42,7 @@ struct _alc
struct _fec fec;
};
-/* Ethereal stuff */
+/* Wireshark stuff */
/* ============== */
/* ALC header field definitions*/
diff --git a/epan/dissectors/packet-rmt-common.c b/epan/dissectors/packet-rmt-common.c
index 7826d45e0f..f7d2695d69 100644
--- a/epan/dissectors/packet-rmt-common.c
+++ b/epan/dissectors/packet-rmt-common.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rmt-common.h b/epan/dissectors/packet-rmt-common.h
index b5dfb0c0c6..659563f7f2 100644
--- a/epan/dissectors/packet-rmt-common.h
+++ b/epan/dissectors/packet-rmt-common.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rmt-fec.c b/epan/dissectors/packet-rmt-fec.c
index eb3f3776a5..0592bd6279 100644
--- a/epan/dissectors/packet-rmt-fec.c
+++ b/epan/dissectors/packet-rmt-fec.c
@@ -19,8 +19,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rmt-fec.h b/epan/dissectors/packet-rmt-fec.h
index ca2eb9ac21..b2f846e3f7 100644
--- a/epan/dissectors/packet-rmt-fec.h
+++ b/epan/dissectors/packet-rmt-fec.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -53,7 +53,7 @@ struct _fec
guint32 esi;
};
-/* Ethereal stuff */
+/* Wireshark stuff */
/* ============== */
/* FEC header field definitions */
diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c
index a74b7ab514..fc57c7c062 100644
--- a/epan/dissectors/packet-rmt-lct.c
+++ b/epan/dissectors/packet-rmt-lct.c
@@ -19,8 +19,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -244,8 +244,8 @@ void lct_info_column(struct _lct *lct, packet_info *pinfo)
/* ---------- */
/* Dissect an LCT header:
- * l - ptr to the logical LCT packet representation to fill, and related ethereal stuffs
- * f - ptr to the FEC infos to fill (EXT_FTI), and related ethereal stuffs
+ * l - ptr to the logical LCT packet representation to fill, and related wireshark stuffs
+ * f - ptr to the FEC infos to fill (EXT_FTI), and related wireshark stuffs
* tvb - buffer
* pinfo - packet info
* tree - tree where to add LCT header subtree
diff --git a/epan/dissectors/packet-rmt-lct.h b/epan/dissectors/packet-rmt-lct.h
index 64f623f578..d0dfa5f9bd 100644
--- a/epan/dissectors/packet-rmt-lct.h
+++ b/epan/dissectors/packet-rmt-lct.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -57,7 +57,7 @@ struct _lct
GArray *ext;
};
-/* Ethereal stuff */
+/* Wireshark stuff */
/* ============== */
/* LCT header field definitions */
diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c
index afd19896ff..4f99e4cebd 100644
--- a/epan/dissectors/packet-rmt-norm.c
+++ b/epan/dissectors/packet-rmt-norm.c
@@ -20,8 +20,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rmt-norm.h b/epan/dissectors/packet-rmt-norm.h
index adc40edcf8..de084b7443 100644
--- a/epan/dissectors/packet-rmt-norm.h
+++ b/epan/dissectors/packet-rmt-norm.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Extensive changes to decode more information Julian Onions
@@ -95,7 +95,7 @@ enum {
};
-/* Ethereal stuff */
+/* Wireshark stuff */
/* ============== */
/* NORM header field definitions*/
diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c
index badf7bb012..cf0b9e356b 100644
--- a/epan/dissectors/packet-rnsap.c
+++ b/epan/dissectors/packet-rnsap.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-rnsap.c */
/* ../../tools/asn2eth.py -e -p rnsap -c rnsap.cnf -s packet-rnsap-template rnsap.asn */
@@ -15,8 +15,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rnsap.h b/epan/dissectors/packet-rnsap.h
index 2f30212cf3..13eaf61785 100644
--- a/epan/dissectors/packet-rnsap.h
+++ b/epan/dissectors/packet-rnsap.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-rnsap.h */
/* ../../tools/asn2eth.py -X -e -p rnsap -c rnsap.cnf -s packet-rnsap-template rnsap.asn */
@@ -15,8 +15,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c
index b4f6102b67..5a99e8db0d 100644
--- a/epan/dissectors/packet-ros.c
+++ b/epan/dissectors/packet-ros.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-ros.c */
/* ../../tools/asn2eth.py -X -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -160,7 +160,7 @@ call_ros_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *p
proto_item *item=NULL;
proto_tree *next_tree=NULL;
- item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "ROS: Dissector for OID:%s not implemented. Contact Ethereal developers if you want this supported", oid);
+ item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "ROS: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid);
if(item){
next_tree=proto_item_add_subtree(item, ett_ros_unknown);
}
diff --git a/epan/dissectors/packet-ros.h b/epan/dissectors/packet-ros.h
index 1e725b9e49..658af8d0ed 100644
--- a/epan/dissectors/packet-ros.h
+++ b/epan/dissectors/packet-ros.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-ros.h */
/* ../../tools/asn2eth.py -X -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 81e7497e09..4e89de5057 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-smb.c
@@ -70,7 +70,7 @@ static gboolean rpc_desegment = TRUE;
static gboolean rpc_defragment = TRUE;
/* try to dissect RPC packets for programs that are not known
- * (proprietary ones) by ethereal.
+ * (proprietary ones) by wireshark.
*/
static gboolean rpc_dissect_unknown_programs = FALSE;
@@ -428,7 +428,7 @@ int rpc_prog_hf(guint32 prog, guint32 vers)
/* return the name associated with a previously registered program. This
should probably eventually be expanded to use the rpc YP/NIS map
- so that it can give names for programs not handled by ethereal */
+ so that it can give names for programs not handled by wireshark */
const char *rpc_prog_name(guint32 prog)
{
const char *progname = NULL;
@@ -1776,7 +1776,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
/* let the user be able to weaken the heuristics if he need
* to look at proprietary protocols not known
- * to ethereal.
+ * to wireshark.
*/
if(rpc_dissect_unknown_programs){
guint32 version;
@@ -3778,7 +3778,7 @@ proto_register_rpc(void)
prefs_register_bool_preference(rpc_module, "dissect_unknown_programs",
"Dissect unknown RPC program numbers",
- "Whether the RPC dissector should attempt to dissect RPC PDUs containing programs that are not known to Ethereal. This will make the heuristics significantly weaker and elevate the risk for falsely identifying and misdissecting packets significantly.",
+ "Whether the RPC dissector should attempt to dissect RPC PDUs containing programs that are not known to Wireshark. This will make the heuristics significantly weaker and elevate the risk for falsely identifying and misdissecting packets significantly.",
&rpc_dissect_unknown_programs);
prefs_register_bool_preference(rpc_module, "find_fragment_start",
diff --git a/epan/dissectors/packet-rpc.h b/epan/dissectors/packet-rpc.h
index e5bf566199..907f91728d 100644
--- a/epan/dissectors/packet-rpc.h
+++ b/epan/dissectors/packet-rpc.h
@@ -4,8 +4,8 @@
*
* (c) 1999 Uwe Girlich
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -172,7 +172,7 @@ typedef struct _rpc_prog_info_value {
} rpc_prog_info_value;
/* rpc_progs is also used in tap. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT GHashTable *rpc_progs;
@@ -189,7 +189,7 @@ typedef struct _rpc_proc_info_value {
} rpc_proc_info_value;
/* rpc_procs is also used in tap. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT GHashTable *rpc_procs;
diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c
index 8ed71b90ae..59d84ed822 100644
--- a/epan/dissectors/packet-rpl.c
+++ b/epan/dissectors/packet-rpl.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rquota.c b/epan/dissectors/packet-rquota.c
index 98f3fc7d62..f9421470f3 100644
--- a/epan/dissectors/packet-rquota.c
+++ b/epan/dissectors/packet-rquota.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-ypxfr.c
diff --git a/epan/dissectors/packet-rquota.h b/epan/dissectors/packet-rquota.h
index 3bfdaced7f..647f6e10bf 100644
--- a/epan/dissectors/packet-rquota.h
+++ b/epan/dissectors/packet-rquota.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c
index d972951b2a..dbbb441f82 100644
--- a/epan/dissectors/packet-rrlp.c
+++ b/epan/dissectors/packet-rrlp.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-rrlp.c */
/* ../../tools/asn2eth.py -u -e -p rrlp -c rrlp.cnf -s packet-rrlp-template rrlp.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rrlp.h b/epan/dissectors/packet-rrlp.h
index 88813688ae..f3a8c38e9e 100644
--- a/epan/dissectors/packet-rrlp.h
+++ b/epan/dissectors/packet-rrlp.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-rrlp.h */
/* ../../tools/asn2eth.py -u -e -p rrlp -c rrlp.cnf -s packet-rrlp-template rrlp.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rsh.c b/epan/dissectors/packet-rsh.c
index 856588a085..6b891a8413 100644
--- a/epan/dissectors/packet-rsh.c
+++ b/epan/dissectors/packet-rsh.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rstat.c b/epan/dissectors/packet-rstat.c
index 8401651576..7df2a77576 100644
--- a/epan/dissectors/packet-rstat.c
+++ b/epan/dissectors/packet-rstat.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c
index 095240f8fb..76a9891682 100644
--- a/epan/dissectors/packet-rsvp.c
+++ b/epan/dissectors/packet-rsvp.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -5199,7 +5199,7 @@ register_rsvp_prefs (void)
prefs_register_bool_preference(
rsvp_module, "process_bundle",
"Dissect sub-messages in BUNDLE message",
- "Specifies whether Ethereal should decode and display sub-messages within BUNDLE messages",
+ "Specifies whether Wireshark should decode and display sub-messages within BUNDLE messages",
&rsvp_bundle_dissect);
}
diff --git a/epan/dissectors/packet-rsvp.h b/epan/dissectors/packet-rsvp.h
index 28df2338af..ddaf4c3436 100644
--- a/epan/dissectors/packet-rsvp.h
+++ b/epan/dissectors/packet-rsvp.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c
index 77116ffccb..a9460f7dcd 100644
--- a/epan/dissectors/packet-rsync.c
+++ b/epan/dissectors/packet-rsync.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -273,7 +273,7 @@ dissect_rsync(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_rsync_encap(tvb, pinfo, tree, rsync_desegment);
}
-/* Register protocol with Ethereal. */
+/* Register protocol with Wireshark. */
void
proto_register_rsync(void)
{
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index d4cd32563c..7162207b93 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -12,8 +12,8 @@
*
* Copyright 2005, Nagarjuna Venna <nvenna@brixnet.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rtcp.h b/epan/dissectors/packet-rtcp.h
index 54a8420a49..d5d9013d28 100644
--- a/epan/dissectors/packet-rtcp.h
+++ b/epan/dissectors/packet-rtcp.h
@@ -8,8 +8,8 @@
* Copyright 2000, Philips Electronics N.V.
* Written by Andreas Sikkema <andreas.sikkema@philips.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c
index eb198fa4bc..8e3411d3ec 100644
--- a/epan/dissectors/packet-rtp-events.c
+++ b/epan/dissectors/packet-rtp-events.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rtp-events.h b/epan/dissectors/packet-rtp-events.h
index ea8c6d4fb4..4de373d5ba 100644
--- a/epan/dissectors/packet-rtp-events.h
+++ b/epan/dissectors/packet-rtp-events.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index ae67ba85a1..59ca3ebcf5 100644
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rtp.h b/epan/dissectors/packet-rtp.h
index 11341c06ad..e61b642480 100644
--- a/epan/dissectors/packet-rtp.h
+++ b/epan/dissectors/packet-rtp.h
@@ -8,8 +8,8 @@
* Copyright 2000, Philips Electronics N.V.
* Written by Andreas Sikkema <andreas.sikkema@philips.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c
index db8b638862..3e41b02658 100644
--- a/epan/dissectors/packet-rtps.c
+++ b/epan/dissectors/packet-rtps.c
@@ -14,8 +14,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-udp.c, packet-tftp.c, packet-x25.c
@@ -1942,7 +1942,7 @@ dissect_INFO_DST(tvbuff_t *tvb, gint offset, guint8 flags,
/* *********************************************************************** *
* *
- * Register the protocol with Ethereal *
+ * Register the protocol with Wireshark *
* *
* *********************************************************************** */
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c
index a4eaf6d273..662dd552f6 100644
--- a/epan/dissectors/packet-rtse.c
+++ b/epan/dissectors/packet-rtse.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-rtse.c */
/* ../../tools/asn2eth.py -X -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -164,7 +164,7 @@ call_rtse_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *
proto_item *item=NULL;
proto_tree *next_tree=NULL;
- item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "RTSE: Dissector for OID:%s not implemented. Contact Ethereal developers if you want this supported", oid);
+ item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "RTSE: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid);
if(item){
next_tree=proto_item_add_subtree(item, ett_rtse_unknown);
}
diff --git a/epan/dissectors/packet-rtse.h b/epan/dissectors/packet-rtse.h
index d759141462..29ecc90793 100644
--- a/epan/dissectors/packet-rtse.h
+++ b/epan/dissectors/packet-rtse.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-rtse.h */
/* ../../tools/asn2eth.py -X -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c
index 3587e22c6d..29085f55cd 100644
--- a/epan/dissectors/packet-rtsp.c
+++ b/epan/dissectors/packet-rtsp.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rwall.c b/epan/dissectors/packet-rwall.c
index 531bb0d80f..a8a4bf42b5 100644
--- a/epan/dissectors/packet-rwall.c
+++ b/epan/dissectors/packet-rwall.c
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rwall.h b/epan/dissectors/packet-rwall.h
index f63d3c88eb..4fd8e7c23f 100644
--- a/epan/dissectors/packet-rwall.h
+++ b/epan/dissectors/packet-rwall.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c
index 51ec9ad2b5..191c05db75 100644
--- a/epan/dissectors/packet-rx.c
+++ b/epan/dissectors/packet-rx.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-rx.h b/epan/dissectors/packet-rx.h
index 9824675b1f..40b931baed 100644
--- a/epan/dissectors/packet-rx.h
+++ b/epan/dissectors/packet-rx.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-s4406.c b/epan/dissectors/packet-s4406.c
index 1fbe73be0c..a8f5a602eb 100644
--- a/epan/dissectors/packet-s4406.c
+++ b/epan/dissectors/packet-s4406.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-s4406.c */
/* ../../tools/asn2eth.py -X -b -e -p s4406 -c s4406.cnf -s packet-s4406-template s4406.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-s4406.h b/epan/dissectors/packet-s4406.h
index 3d480b55a8..cec26101a7 100644
--- a/epan/dissectors/packet-s4406.h
+++ b/epan/dissectors/packet-s4406.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-s4406.h */
/* ../../tools/asn2eth.py -X -b -e -p s4406 -c s4406.cnf -s packet-s4406-template s4406.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c
index d8fad2b14d..2720b36bff 100644
--- a/epan/dissectors/packet-s5066.c
+++ b/epan/dissectors/packet-s5066.c
@@ -5,8 +5,8 @@
*
* Copyright (c) 2005 by Menno Andriesse <s5066 [AT] nc3a.nato.int>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sadmind.c b/epan/dissectors/packet-sadmind.c
index ffcf2a065c..6240477f90 100644
--- a/epan/dissectors/packet-sadmind.c
+++ b/epan/dissectors/packet-sadmind.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c
index 85d279f505..36d0617b01 100644
--- a/epan/dissectors/packet-sap.c
+++ b/epan/dissectors/packet-sap.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index fee35cc9ab..7812a8946d 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -14,8 +14,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-m2pa.c
@@ -2384,7 +2384,7 @@ static void init_sccp(void) {
reassembled_table_init(&sccp_xudt_msg_reassembled_table);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_sccp(void)
{
diff --git a/epan/dissectors/packet-sccp.h b/epan/dissectors/packet-sccp.h
index df7b1648b5..166dcd2e98 100644
--- a/epan/dissectors/packet-sccp.h
+++ b/epan/dissectors/packet-sccp.h
@@ -3,8 +3,8 @@
*
* $Id: $
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sccpmg.c b/epan/dissectors/packet-sccpmg.c
index 777617a671..ed9d7aaab0 100644
--- a/epan/dissectors/packet-sccpmg.c
+++ b/epan/dissectors/packet-sccpmg.c
@@ -14,8 +14,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -315,7 +315,7 @@ dissect_sccpmg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_sccpmg_message(tvb, pinfo, sccpmg_tree);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_sccpmg(void)
{
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index aa5e2b2038..9c4ab5fcf1 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2002 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@
* - The SCSI CDB is typically embedded inside the transport along with other
* header fields that have nothing to do with SCSI. So, it is required to be
- * - Originally, Ethereal couldn't do filtering on protocol trees that were not
+ * - Originally, Wireshark couldn't do filtering on protocol trees that were not
* on the top level.
*
* There are four main routines that are provided:
diff --git a/epan/dissectors/packet-scsi.h b/epan/dissectors/packet-scsi.h
index 123ff8d583..5dce31fb39 100644
--- a/epan/dissectors/packet-scsi.h
+++ b/epan/dissectors/packet-scsi.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2002 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index 4db3ca3a0e..77956c50c5 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -24,8 +24,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -2490,7 +2490,7 @@ dissect_sctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tap_queue_packet(sctp_tap, pinfo, &sctp_info);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_sctp(void)
{
diff --git a/epan/dissectors/packet-sctp.h b/epan/dissectors/packet-sctp.h
index 21a18be0b3..29927801a8 100644
--- a/epan/dissectors/packet-sctp.h
+++ b/epan/dissectors/packet-sctp.h
@@ -5,8 +5,8 @@
* $Id$
* Copyright 2004 Michael Tuexen <tuexen [AT] fh-muenster.de>
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c
index 79b6848b71..fccbf374ed 100644
--- a/epan/dissectors/packet-sdlc.c
+++ b/epan/dissectors/packet-sdlc.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index 666131e2d8..737090e7ac 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sdp.h b/epan/dissectors/packet-sdp.h
index 0c3cbe1a4d..403070771c 100644
--- a/epan/dissectors/packet-sdp.h
+++ b/epan/dissectors/packet-sdp.h
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c
index 7367921cc3..0508c25c67 100644
--- a/epan/dissectors/packet-sebek.c
+++ b/epan/dissectors/packet-sebek.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c
index b05b2401fa..022f39719b 100644
--- a/epan/dissectors/packet-ses.c
+++ b/epan/dissectors/packet-ses.c
@@ -6,8 +6,8 @@
*
* Yuriy Sidelnikov <YSidelnikov@hotmail.com>
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ses.h b/epan/dissectors/packet-ses.h
index b17d1d4634..200f61202a 100644
--- a/epan/dissectors/packet-ses.h
+++ b/epan/dissectors/packet-ses.h
@@ -6,8 +6,8 @@
*
* Yuriy Sidelnikov <YSidelnikov@hotmail.com>
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c
index 7f0af99e87..c67852a008 100644
--- a/epan/dissectors/packet-sflow.c
+++ b/epan/dissectors/packet-sflow.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -860,7 +860,7 @@ dissect_sflow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c
index 5f06192b51..ef8331e15d 100644
--- a/epan/dissectors/packet-sigcomp.c
+++ b/epan/dissectors/packet-sigcomp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -722,7 +722,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr
if ( result_code != 0 ){
- proto_tree_add_text(sigcomp_tree, tvb, 0, -1,"Failed to Access state Ethereal UDVM diagnostic: %s.",
+ proto_tree_add_text(sigcomp_tree, tvb, 0, -1,"Failed to Access state Wireshark UDVM diagnostic: %s.",
val_to_str(result_code, result_code_vals,"Unknown (%u)"));
g_free(buff);
return tvb_length(tvb);
@@ -2188,7 +2188,7 @@ tvb_raw_text_add(tvbuff_t *tvb, proto_tree *tree)
}
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* If this dissector uses sub-dissector registration add a registration routine.
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 872d9e72aa..0fb5b5eb6f 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -21,8 +21,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-cops.c
@@ -580,7 +580,7 @@ static guint sip_hash_func(gconstpointer v)
/* Initializes the hash table and the mem_chunk area each time a new
- * file is loaded or re-loaded in ethereal */
+ * file is loaded or re-loaded in wireshark */
static void
sip_init_protocol(void)
{
@@ -2365,7 +2365,7 @@ guint sip_is_packet_resend(packet_info *pinfo,
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void proto_register_sip(void)
{
diff --git a/epan/dissectors/packet-sip.h b/epan/dissectors/packet-sip.h
index dae72fb8b6..ffd36bc33d 100644
--- a/epan/dissectors/packet-sip.h
+++ b/epan/dissectors/packet-sip.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sipfrag.c b/epan/dissectors/packet-sipfrag.c
index d8f14a3de2..9ce488eabd 100644
--- a/epan/dissectors/packet-sipfrag.c
+++ b/epan/dissectors/packet-sipfrag.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c
index bb856bc685..0a5b971d23 100644
--- a/epan/dissectors/packet-skinny.c
+++ b/epan/dissectors/packet-skinny.c
@@ -6,15 +6,15 @@
*
* Paul E. Erkkila (pee@erkkila.org) - fleshed out the decode
* skeleton to report values for most message/message fields.
- * Much help from Guy Harris on figuring out the ethereal api.
+ * Much help from Guy Harris on figuring out the wireshark api.
*
* This file is based on packet-aim.c, which is
* Copyright 2000, Ralf Hoelzer <ralf@well.com>
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -2586,7 +2586,7 @@ dissect_skinny(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
get_skinny_pdu_len, dissect_skinny_pdu);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_skinny(void)
{
diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c
index 77e506de4c..13170c828a 100644
--- a/epan/dissectors/packet-slimp3.c
+++ b/epan/dissectors/packet-slimp3.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c
index 1f24276d05..71ff8087bf 100644
--- a/epan/dissectors/packet-sll.c
+++ b/epan/dissectors/packet-sll.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sll.h b/epan/dissectors/packet-sll.h
index e108e9f13d..bac77079af 100644
--- a/epan/dissectors/packet-sll.h
+++ b/epan/dissectors/packet-sll.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c
index d3f0dbaf88..4a54617cf5 100644
--- a/epan/dissectors/packet-slowprotocols.c
+++ b/epan/dissectors/packet-slowprotocols.c
@@ -6,8 +6,8 @@
* Copyright 2002 Steve Housley <steve_housley@3com.com>
* Copyright 2005 Dominique Bastien <dbastien@accedian.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -2357,7 +2357,7 @@ dissect_oampdu_vendor_specific(tvbuff_t *tvb, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_slow_protocols(void)
{
diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c
index 45c6de803e..d3073de549 100644
--- a/epan/dissectors/packet-slsk.c
+++ b/epan/dissectors/packet-slsk.c
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -2406,7 +2406,7 @@ static void dissect_slsk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_slsk(void)
diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c
index b97e3eae61..e8cdfd0bc4 100644
--- a/epan/dissectors/packet-smb-browse.c
+++ b/epan/dissectors/packet-smb-browse.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c
diff --git a/epan/dissectors/packet-smb-browse.h b/epan/dissectors/packet-smb-browse.h
index 20385fe949..69a13e4a13 100644
--- a/epan/dissectors/packet-smb-browse.h
+++ b/epan/dissectors/packet-smb-browse.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-smb-common.c b/epan/dissectors/packet-smb-common.c
index bad99e3807..14116b9543 100644
--- a/epan/dissectors/packet-smb-common.c
+++ b/epan/dissectors/packet-smb-common.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c
@@ -105,7 +105,7 @@ int display_unicode_string(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_i
/*
* XXX - this assumes the string is just ISO 8859-1; we need
- * to better handle multiple character sets in Ethereal,
+ * to better handle multiple character sets in Wireshark,
* including Unicode/ISO 10646, and multiple encodings of
* that character set (UCS-2, UTF-8, etc.).
*/
diff --git a/epan/dissectors/packet-smb-common.h b/epan/dissectors/packet-smb-common.h
index d31d80ae4b..5a89f0d7c2 100644
--- a/epan/dissectors/packet-smb-common.h
+++ b/epan/dissectors/packet-smb-common.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c
diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c
index e3094ffe8a..ce8f0a61e4 100644
--- a/epan/dissectors/packet-smb-logon.c
+++ b/epan/dissectors/packet-smb-logon.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c
diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c
index 74dd76db91..a6d89ab56f 100644
--- a/epan/dissectors/packet-smb-mailslot.c
+++ b/epan/dissectors/packet-smb-mailslot.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c
diff --git a/epan/dissectors/packet-smb-mailslot.h b/epan/dissectors/packet-smb-mailslot.h
index aa8cf9a9d7..2c59a53fbd 100644
--- a/epan/dissectors/packet-smb-mailslot.h
+++ b/epan/dissectors/packet-smb-mailslot.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index 72b066b295..a1469c80f5 100644
--- a/epan/dissectors/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
@@ -10,8 +10,8 @@ XXX Fixme : shouldnt show [malformed frame] for long packets
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c
diff --git a/epan/dissectors/packet-smb-pipe.h b/epan/dissectors/packet-smb-pipe.h
index 5df9511689..fcc7eda152 100644
--- a/epan/dissectors/packet-smb-pipe.h
+++ b/epan/dissectors/packet-smb-pipe.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c
index edaf793972..49386bc6ee 100644
--- a/epan/dissectors/packet-smb-sidsnooping.c
+++ b/epan/dissectors/packet-smb-sidsnooping.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-smb-sidsnooping.h b/epan/dissectors/packet-smb-sidsnooping.h
index b369b525fe..3000dc9cdd 100644
--- a/epan/dissectors/packet-smb-sidsnooping.h
+++ b/epan/dissectors/packet-smb-sidsnooping.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
#ifndef _PACKET_SMB_SID_SNOOPING_H_
#define _PACKET_SMB_SID_SNOOPING_H_
-/* With MSVC and a libethereal.dll, we need a
+/* With MSVC and a libwireshark.dll, we need a
* special declaration for sid_name_table.
*/
ETH_VAR_IMPORT GHashTable *sid_name_table;
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index 745d6880fc..869403c666 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c
@@ -15348,7 +15348,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
request in sip->cmd is not compatible with the current cmd.
This is to prevent matching errors such as if there were two
SMBs of different cmds but with identical MID and PID values and
- if ethereal lost the first reply and the second request.
+ if wireshark lost the first reply and the second request.
*/
g_hash_table_remove(si->ct->unmatched, GUINT_TO_POINTER(pid_mid));
sip=NULL; /* XXX should free it as well */
diff --git a/epan/dissectors/packet-smb.h b/epan/dissectors/packet-smb.h
index 04435916e5..6fe7a7d05a 100644
--- a/epan/dissectors/packet-smb.h
+++ b/epan/dissectors/packet-smb.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998, 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
ETH_VAR_IMPORT gboolean sid_name_snooping;
/* SMB command codes, from the SNIA CIFS spec. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT const value_string smb_cmd_vals[];
ETH_VAR_IMPORT const value_string trans2_cmd_vals[];
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c
index a41d008e50..3cc1705ea0 100644
--- a/epan/dissectors/packet-smb2.c
+++ b/epan/dissectors/packet-smb2.c
@@ -2,14 +2,14 @@
* Routines for smb2 packet dissection
* Ronnie Sahlberg 2005
*
- * See http://wiki.ethereal.com/SMB2 for documentation of
+ * See http://wiki.wireshark.org/SMB2 for documentation of
* this protocol.
* If you edit this file, keep the wiki updated as well.
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-smb2.h b/epan/dissectors/packet-smb2.h
index 94e5394412..73cfb444ac 100644
--- a/epan/dissectors/packet-smb2.h
+++ b/epan/dissectors/packet-smb2.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998, 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
#define __PACKET_SMB2_H__
/* SMB2 command codes. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT const value_string smb2_cmd_vals[];
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index 668783339a..171588479a 100644
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -13,8 +13,8 @@
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1808,7 +1808,7 @@ dissect_smpp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/*
* Dissect the PDU
*
- * If "tree" is NULL, Ethereal is only interested in creation
+ * If "tree" is NULL, Wireshark is only interested in creation
* of conversations, reassembly and subdissection but not in
* the detailed protocol tree.
* In the interest of speed, skip the generation of protocol tree
@@ -1958,7 +1958,7 @@ dissect_smpp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_smpp(void)
{
diff --git a/epan/dissectors/packet-smpp.h b/epan/dissectors/packet-smpp.h
index e3c5afbaee..ea6ccdafd6 100644
--- a/epan/dissectors/packet-smpp.h
+++ b/epan/dissectors/packet-smpp.h
@@ -13,8 +13,8 @@
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c
index 13074bcc2b..df13df5b80 100644
--- a/epan/dissectors/packet-smrse.c
+++ b/epan/dissectors/packet-smrse.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-smrse.c */
/* ../../tools/asn2eth.py -X -b -e -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-smrse.h b/epan/dissectors/packet-smrse.h
index e22355a7cd..c91d148b29 100644
--- a/epan/dissectors/packet-smrse.h
+++ b/epan/dissectors/packet-smrse.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-smrse.h */
/* ../../tools/asn2eth.py -X -b -e -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index 7c58f11de6..2f1bcf5216 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -5,8 +5,8 @@
*
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -101,7 +101,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* As there is no guarantee that we will only see frames in the
* the SMTP conversation once, and that we will see them in
- * order - in Ethereal, the user could randomly click on frames
+ * order - in Wireshark, the user could randomly click on frames
* in the conversation in any order in which they choose - we
* have to store information with each frame indicating whether
* it contains commands or data or an EOM indication.
diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c
index e652974f38..8835870694 100644
--- a/epan/dissectors/packet-sna.c
+++ b/epan/dissectors/packet-sna.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-snaeth.c b/epan/dissectors/packet-snaeth.c
index b5abe93acf..35e022355c 100644
--- a/epan/dissectors/packet-snaeth.c
+++ b/epan/dissectors/packet-snaeth.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c
index 2da84ea2b1..cf7504caa5 100644
--- a/epan/dissectors/packet-sndcp.c
+++ b/epan/dissectors/packet-sndcp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -382,7 +382,7 @@ dissect_sndcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal
+/* Register the protocol with Wireshark
this format is required because a script is used to build the C function
that calls all the protocol registration.
*/
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index f356da6dfc..bbc487fb7f 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-snmp.c */
/* ../../tools/asn2eth.py -X -b -e -p snmp -c snmp.cnf -s packet-snmp-template snmp.asn */
@@ -23,8 +23,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Some stuff from:
@@ -2829,7 +2829,7 @@ dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/*
* See if this looks like SNMP or not. if not, return 0 so
- * ethereal can try som other dissector instead.
+ * wireshark can try som other dissector instead.
*/
/* All SNMP packets are BER encoded and consist of a SEQUENCE
* that spans the entire PDU. The first item is an INTEGER that
@@ -2938,7 +2938,7 @@ process_prefs(void)
}
/*
- * Cannot check if MIBS is already set, as it could be set by Ethereal.
+ * Cannot check if MIBS is already set, as it could be set by Wireshark.
*
* If we have a list of modules to load, put that list in MIBS,
* otherwise clear MIBS.
@@ -2950,7 +2950,7 @@ process_prefs(void)
* Windows. Do the converse on non-Windows systems. This
* handles cases where we've copied a preferences file
* between a non-Windows box and a Windows box or upgraded
- * from an older version of Ethereal under Windows.
+ * from an older version of Wireshark under Windows.
*/
g_strdelimit(tmp_mib_modules, IMPORT_SEPARATOR, ENV_SEPARATOR_CHAR);
diff --git a/epan/dissectors/packet-snmp.h b/epan/dissectors/packet-snmp.h
index 2bb2c1c522..745e62fd5c 100644
--- a/epan/dissectors/packet-snmp.h
+++ b/epan/dissectors/packet-snmp.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-snmp.h */
/* ../../tools/asn2eth.py -X -b -e -p snmp -c snmp.cnf -s packet-snmp-template snmp.asn */
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c
index 1e893cfa09..8a18eb504f 100644
--- a/epan/dissectors/packet-socks.c
+++ b/epan/dissectors/packet-socks.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c
index 58e87c4633..5824eb09aa 100644
--- a/epan/dissectors/packet-spnego.c
+++ b/epan/dissectors/packet-spnego.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-spnego.c */
/* ../../tools/asn2eth.py -X -b -e -p spnego -c spnego.cnf -s packet-spnego-template spnego.asn */
@@ -17,8 +17,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* The heimdal code for decryption of GSSAPI wrappers using heimdal comes from
- Heimdal 1.6 and has been modified for ethereal's requirements.
+ Heimdal 1.6 and has been modified for wireshark's requirements.
*/
#ifdef HAVE_CONFIG_H
diff --git a/epan/dissectors/packet-spnego.h b/epan/dissectors/packet-spnego.h
index d03cf6a951..cbaae9eda4 100644
--- a/epan/dissectors/packet-spnego.h
+++ b/epan/dissectors/packet-spnego.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-spnego.h */
/* ../../tools/asn2eth.py -X -b -e -p spnego -c spnego.cnf -s packet-spnego-template spnego.asn */
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c
index 3ab9931153..fef1f0ff81 100644
--- a/epan/dissectors/packet-spp.c
+++ b/epan/dissectors/packet-spp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-spray.c b/epan/dissectors/packet-spray.c
index e2b74d3aee..61c8633710 100644
--- a/epan/dissectors/packet-spray.c
+++ b/epan/dissectors/packet-spray.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-spray.h b/epan/dissectors/packet-spray.h
index 68153ef672..8f37af4905 100644
--- a/epan/dissectors/packet-spray.h
+++ b/epan/dissectors/packet-spray.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sqloracle.c b/epan/dissectors/packet-sqloracle.c
index 9f9ced90af..c2bb11c0c3 100644
--- a/epan/dissectors/packet-sqloracle.c
+++ b/epan/dissectors/packet-sqloracle.c
@@ -1,13 +1,13 @@
/* packet-sqloracle.c
* Routines for SQL ORcle packet dissection
*
- * The initial Ethereal version of this file was imported from the
+ * The initial Wireshark version of this file was imported from the
* ClearSight source code package.
* No author/copyright given in the original file.
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
*
* 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/dissectors/packet-sqloracle.h b/epan/dissectors/packet-sqloracle.h
index acf34d4029..4b10603bdf 100644
--- a/epan/dissectors/packet-sqloracle.h
+++ b/epan/dissectors/packet-sqloracle.h
@@ -7,10 +7,10 @@
* Copyright (C) 2002 - 2002 AppDancer Networks, Inc. All rights reserved.
* Author: Charles Tai 01/28/2003
*
- * The initial Ethereal version of this file was imported from the
+ * The initial Wireshark version of this file was imported from the
* ClearSight source code package.
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
*
* 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/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c
index 409a35c74c..ffb9c80ec3 100644
--- a/epan/dissectors/packet-srvloc.c
+++ b/epan/dissectors/packet-srvloc.c
@@ -11,8 +11,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Service Location Protocol is RFC 2165
@@ -323,7 +323,7 @@ static const value_string srvloc_errs_v2[] = {
* what character set the terminal can handle (for tty-based code)
* or the GUI can handle (for GUI code)?
*
- * XXX - the Ethereal core really should be what does all the
+ * XXX - the Wireshark core really should be what does all the
* character set handling for strings, and it should be stuck with
* the task of figuring out how to properly handle them.
*/
@@ -1316,7 +1316,7 @@ dissect_srvloc_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_srvloc_pdu);
}
-/* Register protocol with Ethereal. */
+/* Register protocol with Wireshark. */
void
proto_register_srvloc(void)
diff --git a/epan/dissectors/packet-sscf-nni.c b/epan/dissectors/packet-sscf-nni.c
index cf9abf7ede..43217dd27a 100644
--- a/epan/dissectors/packet-sscf-nni.c
+++ b/epan/dissectors/packet-sscf-nni.c
@@ -2,10 +2,10 @@
* Routines for SSCF-NNI (Q.2140) frame disassembly
* Jeff Morriss <jeff.morriss[AT]ulticom.com>
*
- * $Id:$
+ * $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* Copied from packet-sscop.c
diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c
index 108a02f979..1c2069f5d8 100644
--- a/epan/dissectors/packet-sscop.c
+++ b/epan/dissectors/packet-sscop.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
*
diff --git a/epan/dissectors/packet-sscop.h b/epan/dissectors/packet-sscop.h
index f33d10ed22..8a702c27d9 100644
--- a/epan/dissectors/packet-sscop.h
+++ b/epan/dissectors/packet-sscop.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
*
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index 5c5092f8f9..54107f3e21 100644
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-mysql.c
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index b43a13dab3..a788c66c61 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1304,7 +1304,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* packets.
*
* Handling the single ssl record across multiple packets
- * may be possible using ethereal conversations, but
+ * may be possible using wireshark conversations, but
* probably not cleanly. May have to wait for tcp stream
* reassembly.
*/
@@ -3942,7 +3942,7 @@ ssl_looks_like_valid_pct_handshake(tvbuff_t *tvb, guint32 offset,
/*********************************************************************
*
- * Standard Ethereal Protocol Registration and housekeeping
+ * Standard Wireshark Protocol Registration and housekeeping
*
*********************************************************************/
void
diff --git a/epan/dissectors/packet-stat-notify.c b/epan/dissectors/packet-stat-notify.c
index ad5ff36189..36ecdd4ab4 100644
--- a/epan/dissectors/packet-stat-notify.c
+++ b/epan/dissectors/packet-stat-notify.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-stat-notify.h b/epan/dissectors/packet-stat-notify.h
index f0f5e791ca..99f6999cb8 100644
--- a/epan/dissectors/packet-stat-notify.h
+++ b/epan/dissectors/packet-stat-notify.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-stat.c b/epan/dissectors/packet-stat.c
index a631ef4519..646fd85ad3 100644
--- a/epan/dissectors/packet-stat.c
+++ b/epan/dissectors/packet-stat.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-smb.c
diff --git a/epan/dissectors/packet-stat.h b/epan/dissectors/packet-stat.h
index 8ad388feaa..3ff0f8cf51 100644
--- a/epan/dissectors/packet-stat.h
+++ b/epan/dissectors/packet-stat.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c
index 8782fceb9d..de9f533c60 100644
--- a/epan/dissectors/packet-stun.c
+++ b/epan/dissectors/packet-stun.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index 0b2158a400..8341631372 100644
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
@@ -1870,7 +1870,7 @@ dissect_sua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
dissect_sua_message(message_tvb, pinfo, sua_tree, tree);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_sua(void)
{
@@ -2008,7 +2008,7 @@ proto_register_sua(void)
sua_module = prefs_register_protocol(proto_sua, NULL);
prefs_register_obsolete_preference(sua_module, "sua_version");
- prefs_register_enum_preference(sua_module, "version", "SUA Version", "Version used by Ethereal", &version, options, FALSE);
+ prefs_register_enum_preference(sua_module, "version", "SUA Version", "Version used by Wireshark", &version, options, FALSE);
}
diff --git a/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c
index 95e584e2dc..49206ae914 100644
--- a/epan/dissectors/packet-symantec.c
+++ b/epan/dissectors/packet-symantec.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* 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/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c
index 54044459c4..055ddb6aba 100644
--- a/epan/dissectors/packet-synergy.c
+++ b/epan/dissectors/packet-synergy.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
*
diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c
index 852ec12e4f..2e4e55b1c7 100644
--- a/epan/dissectors/packet-syslog.c
+++ b/epan/dissectors/packet-syslog.c
@@ -1,12 +1,12 @@
/* packet-syslog.c
* Routines for syslog message dissection
*
- * Copyright 2000, Gerald Combs <gerald@ethereal.com>
+ * Copyright 2000, Gerald Combs <gerald@wireshark.org>
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -196,7 +196,7 @@ static void dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
return;
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void proto_register_syslog(void)
{
diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index 824c86eeb9..1a95e554bc 100644
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -2290,7 +2290,7 @@ void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, conver
-/* Ethereal Protocol Registration */
+/* Wireshark Protocol Registration */
void
proto_register_t38(void)
{
diff --git a/epan/dissectors/packet-t38.h b/epan/dissectors/packet-t38.h
index 5fe9257951..075523ce0d 100644
--- a/epan/dissectors/packet-t38.h
+++ b/epan/dissectors/packet-t38.h
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c
index baab1ca8f2..5a227821fb 100644
--- a/epan/dissectors/packet-tacacs.c
+++ b/epan/dissectors/packet-tacacs.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from old packet-tacacs.c
diff --git a/epan/dissectors/packet-tacacs.h b/epan/dissectors/packet-tacacs.h
index 0c8adc24c6..f7739dc1db 100644
--- a/epan/dissectors/packet-tacacs.h
+++ b/epan/dissectors/packet-tacacs.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-tali.c b/epan/dissectors/packet-tali.c
index 5e9fe3b0a7..f183d23b30 100644
--- a/epan/dissectors/packet-tali.c
+++ b/epan/dissectors/packet-tali.c
@@ -13,8 +13,8 @@
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 34deb34eb6..a4969ef35c 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-tcap.c */
/* ../../tools/asn2eth.py -X -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn */
@@ -12,8 +12,8 @@
* Built from the gsm-map dissector Copyright 2004 - 2005, Anders Broman <anders.broman@ericsson.com>
*
* $Id$
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-tcap.h b/epan/dissectors/packet-tcap.h
index 004e81269f..97cf104336 100644
--- a/epan/dissectors/packet-tcap.h
+++ b/epan/dissectors/packet-tcap.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-tcap.h */
/* ../../tools/asn2eth.py -X -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn */
@@ -12,8 +12,8 @@
*
* Copyright 2004, Tim Endean <endeant@hotmail.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index dc7edb1527..9ce41623ab 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-tcp.h b/epan/dissectors/packet-tcp.h
index 669b232e6e..bbebd6cd4e 100644
--- a/epan/dissectors/packet-tcp.h
+++ b/epan/dissectors/packet-tcp.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index 13576ea2a2..e3cb283128 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -79,7 +79,7 @@
*/
/*
- * Excerpts from Brian's posting to ethereal-dev:
+ * Excerpts from Brian's posting to wireshark-dev:
*
* The TDS Protocol is actually a protocol within a protocol. On the outside
* there is netlib which is not so much a encapsulation as a blocking of the
@@ -1954,7 +1954,7 @@ tds_init(void)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is required because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-teimanagement.c b/epan/dissectors/packet-teimanagement.c
index 0a6bc86c65..3a186e48be 100644
--- a/epan/dissectors/packet-teimanagement.c
+++ b/epan/dissectors/packet-teimanagement.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c
index 38a7ef7915..d149b44bc3 100644
--- a/epan/dissectors/packet-telnet.c
+++ b/epan/dissectors/packet-telnet.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c
diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c
index 174fbaff6a..05abd17d6e 100644
--- a/epan/dissectors/packet-teredo.c
+++ b/epan/dissectors/packet-teredo.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-text-media.c b/epan/dissectors/packet-text-media.c
index b2880729e1..4897d71ff6 100644
--- a/epan/dissectors/packet-text-media.c
+++ b/epan/dissectors/packet-text-media.c
@@ -11,8 +11,8 @@
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c
index dfebc77b23..d797154bbd 100644
--- a/epan/dissectors/packet-tftp.c
+++ b/epan/dissectors/packet-tftp.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-bootp.c
diff --git a/epan/dissectors/packet-time.c b/epan/dissectors/packet-time.c
index 6d74ef60e4..cf40c855e8 100644
--- a/epan/dissectors/packet-time.c
+++ b/epan/dissectors/packet-time.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c
index b2564b3e06..323b493c14 100644
--- a/epan/dissectors/packet-tipc.c
+++ b/epan/dissectors/packet-tipc.c
@@ -5,8 +5,8 @@
*
* Copyright 2005, Anders Broman <anders.broman@ericsson.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1632,7 +1632,7 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-/* Register TIPC with Ethereal */
+/* Register TIPC with Wireshark */
void
proto_register_tipc(void)
{
diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c
index 3a3ee76120..5fd3e23f15 100644
--- a/epan/dissectors/packet-tns.c
+++ b/epan/dissectors/packet-tns.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-tns.h b/epan/dissectors/packet-tns.h
index 26ea435704..a1c51d937a 100644
--- a/epan/dissectors/packet-tns.h
+++ b/epan/dissectors/packet-tns.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c
index 70218b3fd3..20cbd76cde 100644
--- a/epan/dissectors/packet-tpkt.c
+++ b/epan/dissectors/packet-tpkt.c
@@ -9,8 +9,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-tpkt.h b/epan/dissectors/packet-tpkt.h
index f4404e8f0e..60bb7e46e7 100644
--- a/epan/dissectors/packet-tpkt.h
+++ b/epan/dissectors/packet-tpkt.h
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c
index 4e0f03b3af..7c99e1bb31 100644
--- a/epan/dissectors/packet-tr.c
+++ b/epan/dissectors/packet-tr.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-tr.h b/epan/dissectors/packet-tr.h
index 910bd4799c..77bb2c3690 100644
--- a/epan/dissectors/packet-tr.h
+++ b/epan/dissectors/packet-tr.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c
index 91616dd202..2a2e0d7a6a 100644
--- a/epan/dissectors/packet-trmac.c
+++ b/epan/dissectors/packet-trmac.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-tsp.c b/epan/dissectors/packet-tsp.c
index 232b059f6e..579949155c 100644
--- a/epan/dissectors/packet-tsp.c
+++ b/epan/dissectors/packet-tsp.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-quake.c
diff --git a/epan/dissectors/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c
index 13fb017dfb..d0268a9f0c 100644
--- a/epan/dissectors/packet-tuxedo.c
+++ b/epan/dissectors/packet-tuxedo.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c
index 29bb63f7cc..f342f2757e 100644
--- a/epan/dissectors/packet-tzsp.c
+++ b/epan/dissectors/packet-tzsp.c
@@ -7,8 +7,8 @@
* Tazmen Sniffer Protocol for encapsulating the packets across a network
* from a remote packet sniffer. TZSP can encapsulate any other protocol.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c
index 172382f444..d9c567545f 100644
--- a/epan/dissectors/packet-ucp.c
+++ b/epan/dissectors/packet-ucp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1863,7 +1863,7 @@ dissect_ucp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
return;
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_ucp(void)
{
diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c
index 2fac3d829a..33ef6fd658 100644
--- a/epan/dissectors/packet-udp.c
+++ b/epan/dissectors/packet-udp.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Richard Sharpe, 13-Feb-1999, added dispatch table support and
diff --git a/epan/dissectors/packet-udp.h b/epan/dissectors/packet-udp.h
index a80aaa15a5..a612c7fe31 100644
--- a/epan/dissectors/packet-udp.h
+++ b/epan/dissectors/packet-udp.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c
index fcb5abe99b..9364481519 100644
--- a/epan/dissectors/packet-ulp.c
+++ b/epan/dissectors/packet-ulp.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-ulp.c */
/* ../../tools/asn2eth.py -u -e -p ulp -c ulp.cnf -s packet-ulp-template ULP.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ulp.h b/epan/dissectors/packet-ulp.h
index 447e941f37..4713748681 100644
--- a/epan/dissectors/packet-ulp.h
+++ b/epan/dissectors/packet-ulp.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* .\packet-ulp.h */
/* ../../tools/asn2eth.py -u -e -p ulp -c ulp.cnf -s packet-ulp-template ULP.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index 8ce397bbfd..6a426bac20 100644
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -1616,7 +1616,7 @@ dissect_uma_urlc_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* If this dissector uses sub-dissector registration add a registration routine.
This format is required because a script is used to find these routines and
create the code that calls these routines.
diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c
index f103bf0e21..c4219ed898 100644
--- a/epan/dissectors/packet-user_encap.c
+++ b/epan/dissectors/packet-user_encap.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
*
diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c
index c3a6398065..438c731965 100644
--- a/epan/dissectors/packet-v120.c
+++ b/epan/dissectors/packet-v120.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c
index c463e90957..7666d21522 100644
--- a/epan/dissectors/packet-vines.c
+++ b/epan/dissectors/packet-vines.c
@@ -5,8 +5,8 @@
*
* Don Lafontaine <lafont02@cn.ca>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
* Joerg Mayer <jmayer@loplof.de>
*
diff --git a/epan/dissectors/packet-vines.h b/epan/dissectors/packet-vines.h
index ff8a2c7a73..2a389d6919 100644
--- a/epan/dissectors/packet-vines.h
+++ b/epan/dissectors/packet-vines.h
@@ -5,8 +5,8 @@
*
* Don Lafontaine <lafont02@cn.ca>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
* Joerg Mayer <jmayer@loplof.de>
*
diff --git a/epan/dissectors/packet-vj.c b/epan/dissectors/packet-vj.c
index 79b2a60f61..8158ed84d2 100644
--- a/epan/dissectors/packet-vj.c
+++ b/epan/dissectors/packet-vj.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
*
* This file created by Irfan Khan <ikhan@qualcomm.com>
* Copyright (c) 2001 by QUALCOMM, Incorporated.
@@ -56,7 +56,7 @@
* - July 1995 Christos A. Polyzols
* Spotted bug in tcp option checking
* - Sep 2001 Irfan Khan
- * Rewrite to make the code work for ethereal.
+ * Rewrite to make the code work for wireshark.
*/
#ifdef HAVE_CONFIG_H
diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c
index 8367cab8d7..6d1f7497cb 100644
--- a/epan/dissectors/packet-vlan.c
+++ b/epan/dissectors/packet-vlan.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-vlan.h b/epan/dissectors/packet-vlan.h
index 356b01a7c2..414771f14c 100644
--- a/epan/dissectors/packet-vlan.h
+++ b/epan/dissectors/packet-vlan.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c
index a75771b1af..ae01b4b43a 100644
--- a/epan/dissectors/packet-vnc.c
+++ b/epan/dissectors/packet-vnc.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -93,17 +93,17 @@ dissect_vnc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
(a) Operational dissection
- In this mode, Ethereal is only interested in the way protocols
+ In this mode, Wireshark is only interested in the way protocols
interact, protocol conversations are created, packets are reassembled
and handed over to higher-level protocol dissectors.
- In this mode Ethereal does not build a so-called "protocol tree".
+ In this mode Wireshark does not build a so-called "protocol tree".
(b) Detailed dissection
- In this mode, Ethereal is also interested in all details of a given
+ In this mode, Wireshark is also interested in all details of a given
protocol, so a "protocol tree" is created.
- Ethereal distinguishes between the 2 modes with the proto_tree pointer:
+ Wireshark distinguishes between the 2 modes with the proto_tree pointer:
(a) <=> tree == NULL
(b) <=> tree != NULL
@@ -167,7 +167,7 @@ dissect_vnc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c
index fa82c84f98..21e346934d 100644
--- a/epan/dissectors/packet-vrrp.c
+++ b/epan/dissectors/packet-vrrp.c
@@ -6,8 +6,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c
index 0b82539b81..7fde6ae2dc 100644
--- a/epan/dissectors/packet-vtp.c
+++ b/epan/dissectors/packet-vtp.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-wap.c b/epan/dissectors/packet-wap.c
index f53db7b24c..3d9448f03b 100644
--- a/epan/dissectors/packet-wap.c
+++ b/epan/dissectors/packet-wap.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* WAP dissector based on original work by Ben Fowler
diff --git a/epan/dissectors/packet-wap.h b/epan/dissectors/packet-wap.h
index a28cdbf984..be0e4f7e8e 100644
--- a/epan/dissectors/packet-wap.h
+++ b/epan/dissectors/packet-wap.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* WAP dissector based on original work by Ben Fowler
diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c
index 63a4f37339..9b84796553 100644
--- a/epan/dissectors/packet-wbxml.c
+++ b/epan/dissectors/packet-wbxml.c
@@ -8,8 +8,8 @@
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* WAP Binary XML decoding functionality provided by Olivier Biot.
@@ -6570,7 +6570,7 @@ parse_wbxml_attribute_list (proto_tree *tree, tvbuff_t *tvb,
}
-/****************** Register the protocol with Ethereal ******************/
+/****************** Register the protocol with Wireshark ******************/
/* This format is required because a script is used to build the C function
diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c
index b6c68ac98b..36f8a01074 100644
--- a/epan/dissectors/packet-wccp.c
+++ b/epan/dissectors/packet-wccp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-wccp.h b/epan/dissectors/packet-wccp.h
index 7f3bf35c9a..4b86f26e9a 100644
--- a/epan/dissectors/packet-wccp.h
+++ b/epan/dissectors/packet-wccp.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c
index ef7a4fe708..1b99329952 100644
--- a/epan/dissectors/packet-wcp.c
+++ b/epan/dissectors/packet-wcp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c
index 0511b362ac..53baaa39b3 100644
--- a/epan/dissectors/packet-wfleet-hdlc.c
+++ b/epan/dissectors/packet-wfleet-hdlc.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c
index 1050ecb7a3..13c9b47f27 100644
--- a/epan/dissectors/packet-who.c
+++ b/epan/dissectors/packet-who.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c
index 832c52756c..4fd0caf3b4 100644
--- a/epan/dissectors/packet-windows-common.c
+++ b/epan/dissectors/packet-windows-common.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-windows-common.h b/epan/dissectors/packet-windows-common.h
index d4010066cd..9e51cac232 100644
--- a/epan/dissectors/packet-windows-common.h
+++ b/epan/dissectors/packet-windows-common.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c
index de57d1f0af..cb41c7b4be 100644
--- a/epan/dissectors/packet-winsrepl.c
+++ b/epan/dissectors/packet-winsrepl.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-wlancap.c b/epan/dissectors/packet-wlancap.c
index af236789cb..8f1c984a37 100644
--- a/epan/dissectors/packet-wlancap.c
+++ b/epan/dissectors/packet-wlancap.c
@@ -20,8 +20,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
diff --git a/epan/dissectors/packet-wlancap.h b/epan/dissectors/packet-wlancap.h
index 05c0990fcb..93d1a0265e 100644
--- a/epan/dissectors/packet-wlancap.h
+++ b/epan/dissectors/packet-wlancap.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c
index 832de81388..e25e5cd958 100644
--- a/epan/dissectors/packet-wlancertextn.c
+++ b/epan/dissectors/packet-wlancertextn.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-wlancertextn.c */
/* ../../tools/asn2eth.py -X -b -e -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-wlancertextn.h b/epan/dissectors/packet-wlancertextn.h
index 1e07cc4dd4..7136309f88 100644
--- a/epan/dissectors/packet-wlancertextn.h
+++ b/epan/dissectors/packet-wlancertextn.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-wlancertextn.h */
/* ../../tools/asn2eth.py -X -b -e -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index 7245f896fe..d054e3c2fa 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -7,8 +7,8 @@
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* WAP dissector based on original work by Ben Fowler
@@ -6040,7 +6040,7 @@ add_multipart_data (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo)
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_wsp(void)
{
@@ -7346,7 +7346,7 @@ proto_register_wsp(void)
/* Register the protocol name and description */
proto_wsp = proto_register_protocol(
- "Wireless Session Protocol", /* protocol name for use by ethereal */
+ "Wireless Session Protocol", /* protocol name for use by wireshark */
"WSP", /* short version of name */
"wsp" /* Abbreviated protocol name,
should Match IANA:
@@ -7399,7 +7399,7 @@ proto_reg_handoff_wsp(void)
* Session Initiation Request
*/
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_sir(void)
{
@@ -7512,7 +7512,7 @@ proto_register_sir(void)
/* Register the dissector */
proto_sir = proto_register_protocol(
- "WAP Session Initiation Request", /* protocol name for use by ethereal */
+ "WAP Session Initiation Request", /* protocol name for use by wireshark */
"WAP SIR", /* short version of name */
"wap-sir" /* Abbreviated protocol name,
should Match IANA:
diff --git a/epan/dissectors/packet-wsp.h b/epan/dissectors/packet-wsp.h
index cd3773e32e..0734e405ea 100644
--- a/epan/dissectors/packet-wsp.h
+++ b/epan/dissectors/packet-wsp.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* WAP dissector based on original work by Ben Fowler
@@ -38,7 +38,7 @@ extern const value_string vals_wsp_reason_codes[];
/*
* the following allows TAP code access to the messages
* without having to duplicate it. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT const value_string vals_pdu_type[];
ETH_VAR_IMPORT const value_string vals_status[];
diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c
index 9995cb6aa6..466c12a98a 100644
--- a/epan/dissectors/packet-wtls.c
+++ b/epan/dissectors/packet-wtls.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* WAP dissector based on original work by Ben Fowler
@@ -1095,7 +1095,7 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun
}
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_wtls(void)
{
@@ -1599,7 +1599,7 @@ proto_register_wtls(void)
/* Register the protocol name and description */
proto_wtls = proto_register_protocol(
- "Wireless Transport Layer Security", /* protocol name for use by ethereal */
+ "Wireless Transport Layer Security", /* protocol name for use by wireshark */
"WTLS", /* short version of name */
"wtls" /* Abbreviated protocol name, should Match IANA
< URL:http://www.iana.org/assignments/port-numbers/ >
diff --git a/epan/dissectors/packet-wtls.h b/epan/dissectors/packet-wtls.h
index d8acf91630..e6f94438bd 100644
--- a/epan/dissectors/packet-wtls.h
+++ b/epan/dissectors/packet-wtls.h
@@ -4,7 +4,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c
index 091e4b200b..28165795a0 100644
--- a/epan/dissectors/packet-wtp.c
+++ b/epan/dissectors/packet-wtp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* WAP dissector based on original work by Ben Fowler
@@ -686,11 +686,11 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->fragmented = TRUE;
fd_wtp = fragment_add_seq(tvb, dataOffset, pinfo, TID,
wtp_fragment_table, psn, dataLen, !fTTR);
- /* XXX - fragment_add_seq() yields NULL unless Ethereal knows
+ /* XXX - fragment_add_seq() yields NULL unless Wireshark knows
* that the packet is part of a reassembled whole. This means
- * that fd_wtp will be NULL as long as Ethereal did not encounter
+ * that fd_wtp will be NULL as long as Wireshark did not encounter
* (and process) the packet containing the last fragment.
- * This implies that Ethereal needs two passes over the data for
+ * This implies that Wireshark needs two passes over the data for
* correct reassembly. At the first pass, a capture containing
* three fragments plus a retransmssion of the last fragment
* will progressively show:
@@ -813,7 +813,7 @@ dissect_wtp_fromwtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_wtp_common(tvb, pinfo, tree);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_wtp(void)
{
@@ -1068,7 +1068,7 @@ proto_register_wtp(void)
/* Register the protocol name and description */
proto_wtp = proto_register_protocol(
- "Wireless Transaction Protocol", /* protocol name for use by ethereal */
+ "Wireless Transaction Protocol", /* protocol name for use by wireshark */
"WTP", /* short version of name */
"wtp" /* Abbreviated protocol name, should Match IANA
< URL:http://www.iana.org/assignments/port-numbers/ >
diff --git a/epan/dissectors/packet-wtp.h b/epan/dissectors/packet-wtp.h
index 552cff095c..10b582204c 100644
--- a/epan/dissectors/packet-wtp.h
+++ b/epan/dissectors/packet-wtp.h
@@ -4,7 +4,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-x11-keysymdef.h b/epan/dissectors/packet-x11-keysymdef.h
index c1e263e273..04cc87ebba 100644
--- a/epan/dissectors/packet-x11-keysymdef.h
+++ b/epan/dissectors/packet-x11-keysymdef.h
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c
index 06c3ffff30..fb16126f20 100644
--- a/epan/dissectors/packet-x11.c
+++ b/epan/dissectors/packet-x11.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from README.developer
@@ -5293,7 +5293,7 @@ dissect_x11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_x11_requests(tvb, pinfo, tree);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void proto_register_x11(void)
{
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index fb9fe77885..9705dd3640 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c
index eabde3108b..8271431d21 100644
--- a/epan/dissectors/packet-x29.c
+++ b/epan/dissectors/packet-x29.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c
index 5149535e0a..94b8f5bdb5 100644
--- a/epan/dissectors/packet-x411.c
+++ b/epan/dissectors/packet-x411.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-x411.c */
/* ../../tools/asn2eth.py -X -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-x411.h b/epan/dissectors/packet-x411.h
index 8edf6cb948..1ba8e09358 100644
--- a/epan/dissectors/packet-x411.h
+++ b/epan/dissectors/packet-x411.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-x411.h */
/* ../../tools/asn2eth.py -X -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c
index b812643f94..50920b9b40 100644
--- a/epan/dissectors/packet-x420.c
+++ b/epan/dissectors/packet-x420.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-x420.c */
/* ../../tools/asn2eth.py -X -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-x420.h b/epan/dissectors/packet-x420.h
index 3b522376b5..6588721b8b 100644
--- a/epan/dissectors/packet-x420.h
+++ b/epan/dissectors/packet-x420.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-x420.h */
/* ../../tools/asn2eth.py -X -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index a7bcd19532..604fa506d9 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-x509af.c */
/* ../../tools/asn2eth.py -X -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-x509af.h b/epan/dissectors/packet-x509af.h
index e78f63c7eb..74ced8197d 100644
--- a/epan/dissectors/packet-x509af.h
+++ b/epan/dissectors/packet-x509af.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-x509af.h */
/* ../../tools/asn2eth.py -X -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index b8af572e79..6cff673bb8 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-x509ce.c */
/* ../../tools/asn2eth.py -X -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-x509ce.h b/epan/dissectors/packet-x509ce.h
index c11f2a178a..b2abb784e6 100644
--- a/epan/dissectors/packet-x509ce.h
+++ b/epan/dissectors/packet-x509ce.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-x509ce.h */
/* ../../tools/asn2eth.py -X -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 65afeab670..951ca19b17 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-x509if.c */
/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-x509if.h b/epan/dissectors/packet-x509if.h
index 898b1bbbad..d0380915a0 100644
--- a/epan/dissectors/packet-x509if.h
+++ b/epan/dissectors/packet-x509if.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-x509if.h */
/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index d218e10b69..5e314e19dc 100644
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-x509sat.c */
/* ../../tools/asn2eth.py -X -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-x509sat.h b/epan/dissectors/packet-x509sat.h
index 3590d2cd42..6589a44c60 100644
--- a/epan/dissectors/packet-x509sat.h
+++ b/epan/dissectors/packet-x509sat.h
@@ -1,5 +1,5 @@
/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* ./packet-x509sat.h */
/* ../../tools/asn2eth.py -X -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c
index 6bf94692c7..1f48a97e07 100644
--- a/epan/dissectors/packet-xdmcp.c
+++ b/epan/dissectors/packet-xdmcp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -441,7 +441,7 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void proto_register_xdmcp(void)
{
/* Setup list of header fields */
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index 30dc18251e..c7a515398d 100644
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@@ -8,8 +8,8 @@
* Refer to the AUTHORS file or the AUTHORS section in the man page
* for contacting the author(s) of this file.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c
index 6f1febb4c2..2d9cf20fde 100644
--- a/epan/dissectors/packet-xot.c
+++ b/epan/dissectors/packet-xot.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -129,7 +129,7 @@ static int dissect_xot(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
return tvb_length(tvb);
}
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
void
proto_register_xot(void)
{
diff --git a/epan/dissectors/packet-xyplex.c b/epan/dissectors/packet-xyplex.c
index 9e75c3ef92..b63704594e 100644
--- a/epan/dissectors/packet-xyplex.c
+++ b/epan/dissectors/packet-xyplex.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-yhoo.c b/epan/dissectors/packet-yhoo.c
index d6acef4651..f6e711a697 100644
--- a/epan/dissectors/packet-yhoo.c
+++ b/epan/dissectors/packet-yhoo.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c
index 554835314d..26ff966b66 100644
--- a/epan/dissectors/packet-ymsg.c
+++ b/epan/dissectors/packet-ymsg.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ypbind.c b/epan/dissectors/packet-ypbind.c
index c66a503550..c443629d09 100644
--- a/epan/dissectors/packet-ypbind.c
+++ b/epan/dissectors/packet-ypbind.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-smb.c
diff --git a/epan/dissectors/packet-ypbind.h b/epan/dissectors/packet-ypbind.h
index 19ef71f84f..9c7eb0e4fb 100644
--- a/epan/dissectors/packet-ypbind.h
+++ b/epan/dissectors/packet-ypbind.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-yppasswd.c b/epan/dissectors/packet-yppasswd.c
index 2db6fe9644..c6aec42a6e 100644
--- a/epan/dissectors/packet-yppasswd.c
+++ b/epan/dissectors/packet-yppasswd.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-yppasswd.h b/epan/dissectors/packet-yppasswd.h
index 9e6f666c4c..34ffdd5d2b 100644
--- a/epan/dissectors/packet-yppasswd.h
+++ b/epan/dissectors/packet-yppasswd.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/packet-ypserv.c b/epan/dissectors/packet-ypserv.c
index bdaccb0c30..ab6755e658 100644
--- a/epan/dissectors/packet-ypserv.c
+++ b/epan/dissectors/packet-ypserv.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-smb.c
diff --git a/epan/dissectors/packet-ypserv.h b/epan/dissectors/packet-ypserv.h
index b528bf6493..c64f5a54db 100644
--- a/epan/dissectors/packet-ypserv.h
+++ b/epan/dissectors/packet-ypserv.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-ypxfr.c b/epan/dissectors/packet-ypxfr.c
index 706e68e636..5148207253 100644
--- a/epan/dissectors/packet-ypxfr.c
+++ b/epan/dissectors/packet-ypxfr.c
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-ypxfr.h b/epan/dissectors/packet-ypxfr.h
index 9a346806fa..ca39ac4671 100644
--- a/epan/dissectors/packet-ypxfr.h
+++ b/epan/dissectors/packet-ypxfr.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c
index 5e5bfaef2b..6b0e501e91 100644
--- a/epan/dissectors/packet-zebra.c
+++ b/epan/dissectors/packet-zebra.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/rpc_defrag.h b/epan/dissectors/rpc_defrag.h
index 3190221864..45052c22aa 100644
--- a/epan/dissectors/rpc_defrag.h
+++ b/epan/dissectors/rpc_defrag.h
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or