diff options
38 files changed, 252 insertions, 198 deletions
diff --git a/epan/charsets.c b/epan/charsets.c index 9441bf336c..eb32e3730f 100644 --- a/epan/charsets.c +++ b/epan/charsets.c @@ -24,14 +24,14 @@ #define UNREPL 0xFFFD /* - * Wikipedia's "Character encoding" template, giving a pile of character encodings and - * Wikipedia pages for them: + * Wikipedia's "Character encoding" template, giving a pile of character + * encodings and Wikipedia pages for them: * * http://en.wikipedia.org/wiki/Template:Character_encoding * * Unicode character encoding model: * - * http://www.unicode.org/reports/tr17/ + * https://www.unicode.org/reports/tr17/ * * International Components for Unicode character set mapping tables: * @@ -39,7 +39,7 @@ * * MSDN information on code pages: * - * http://msdn.microsoft.com/en-us/library/dd317752(v=VS.85).aspx + * https://docs.microsoft.com/en-us/windows/win32/intl/code-pages * * ASCII-based code pages, from IBM: * @@ -48,6 +48,10 @@ * EBCDIC code pages, from IBM: * * http://www-03.ibm.com/systems/i/software/globalization/codepages.html + * + * The IBM pages are no longer available; the versions archived on the + * Wayback Machine are, but the links to the PDF and text versions of + * the code pages don't all work (do *any* work?). */ /* @@ -172,7 +176,7 @@ get_8859_1_string(wmem_allocator_t *scope, const guint8 *ptr, gint length) * Basic Multilingual Plane. */ -/* ISO-8859-2 (http://en.wikipedia.org/wiki/ISO/IEC_8859-2#Code_page_layout) */ +/* ISO-8859-2 (https://en.wikipedia.org/wiki/ISO/IEC_8859-2#Code_page_layout) */ const gunichar2 charset_table_iso_8859_2[0x80] = { 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, /* 0x80 - */ 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, /* - 0x8F */ @@ -232,7 +236,7 @@ const gunichar2 charset_table_iso_8859_4[0x80] = { 0x00f8, 0x0173, 0x00fa, 0x00fb, 0x00fc, 0x0169, 0x016b, 0x02d9, /* - 0xFF */ }; -/* ISO-8859-5 (http://en.wikipedia.org/wiki/ISO/IEC_8859-5#Code_page_layout) */ +/* ISO-8859-5 (https://en.wikipedia.org/wiki/ISO/IEC_8859-5#Code_page_layout) */ const gunichar2 charset_table_iso_8859_5[0x80] = { 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, /* 0x80 - */ 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, /* - 0x8F */ @@ -312,7 +316,7 @@ const gunichar2 charset_table_iso_8859_8[0x80] = { 0x05e8, 0x05e9, 0x05ea, UNREPL, UNREPL, 0x200e, 0x200f, UNREPL, /* - 0xFF */ }; -/* ISO-8859-9 (http://en.wikipedia.org/wiki/ISO/IEC_8859-9#Code_page_layout) */ +/* ISO-8859-9 (https://en.wikipedia.org/wiki/ISO/IEC_8859-9#Code_page_layout) */ const gunichar2 charset_table_iso_8859_9[0x80] = { 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, /* 0x80 - */ 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, /* - 0x8F */ @@ -456,7 +460,7 @@ const gunichar2 charset_table_iso_8859_16[0x80] = { * Windows-1250 * * See: - * https://en.wikipedia.org/wiki/Windows-1250) + * httpss://en.wikipedia.org/wiki/Windows-1250) * https://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1250.TXT */ const gunichar2 charset_table_cp1250[0x80] = { @@ -1058,7 +1062,7 @@ get_ascii_7bits_string(wmem_allocator_t *scope, const guint8 *ptr, } /* ASCII/EBCDIC conversion tables from - * http://www.room42.com/store/computer_center/code_tables.shtml + * https://web.archive.org/web/20060813174742/http://www.room42.com/store/computer_center/code_tables.shtml */ #if 0 static const guint8 ASCII_translate_EBCDIC [ 256 ] = { @@ -1274,7 +1278,7 @@ get_nonascii_unichar2_string(wmem_allocator_t *scope, const guint8 *ptr, gint le } /* T.61 to UTF-8 conversion table from OpenLDAP project - * http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=blob;f=libraries/libldap/t61.c;hb=HEAD + * https://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=blob;f=libraries/libldap/t61.c;hb=HEAD */ static const gunichar2 t61_tab[] = { 0x000, 0x001, 0x002, 0x003, 0x004, 0x005, 0x006, 0x007, diff --git a/epan/dissectors/asn1/kerberos/k5.asn b/epan/dissectors/asn1/kerberos/k5.asn index 400eb6fa27..a5b8acf18d 100644 --- a/epan/dissectors/asn1/kerberos/k5.asn +++ b/epan/dissectors/asn1/kerberos/k5.asn @@ -159,7 +159,7 @@ CKSUMTYPE ::= INTEGER { cKSUMTYPE-HMAC-MD5-ENC(-1138) -- even more unofficial } ---enctypes http://www.iana.org/assignments/kerberos-parameters/kerberos-parameters.xhtml#kerberos-parameters-1 +--enctypes https://www.iana.org/assignments/kerberos-parameters/kerberos-parameters.xhtml#kerberos-parameters-1 ENCTYPE ::= INTEGER { eTYPE-NULL(0), eTYPE-DES-CBC-CRC(1), @@ -828,15 +828,15 @@ PA-ServerReferralData ::= SEQUENCE { referral-valid-until [3] KerberosTime OPTIONAL, ... } --- WS put extensions found elsewere here --- http://msdn.microsoft.com/en-us/library/cc206948.aspx --- +-- WS put extensions found elsewhere here +-- MS-KILE: https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-kile +-- MS-SFU: https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-sfu + KERB-PA-PAC-REQUEST ::= SEQUENCE { include-pac[0] BOOLEAN --If TRUE, and no pac present, include PAC. --If FALSE, and PAC present, remove PAC } --- based on MS-KILE and MS-SFU PAC-OPTIONS-FLAGS ::= BIT STRING { claims(0), branch-aware(1), diff --git a/epan/dissectors/asn1/kerberos/packet-kerberos-template.c b/epan/dissectors/asn1/kerberos/packet-kerberos-template.c index 46b148b81c..836dd7b089 100644 --- a/epan/dissectors/asn1/kerberos/packet-kerberos-template.c +++ b/epan/dissectors/asn1/kerberos/packet-kerberos-template.c @@ -11,15 +11,15 @@ * See RFC 1510, and various I-Ds and other documents showing additions, * e.g. ones listed under * - * http://www.isi.edu/people/bcn/krb-revisions/ + * http://clifford.neuman.name/krb-revisions/ * * and * - * http://www.ietf.org/internet-drafts/draft-ietf-krb-wg-kerberos-clarifications-07.txt + * https://tools.ietf.org/html/draft-ietf-krb-wg-kerberos-clarifications-07 * * and * - * http://www.ietf.org/internet-drafts/draft-ietf-krb-wg-kerberos-referrals-05.txt + * https://tools.ietf.org/html/draft-ietf-krb-wg-kerberos-referrals-05 * * Some structures from RFC2630 * @@ -825,7 +825,7 @@ decrypt_krb5_data(proto_tree *tree, packet_info *pinfo, /* * For KERB_ENCTYPE_RC4_HMAC and KERB_ENCTYPE_RC4_HMAC_EXP, see * - * http://www.ietf.org/internet-drafts/draft-brezak-win2k-krb-rc4-hmac-04.txt + * https://tools.ietf.org/html/draft-brezak-win2k-krb-rc4-hmac-04 * * unless it's expired. */ diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c index 43c5465f9d..1891589424 100644 --- a/epan/dissectors/asn1/ldap/packet-ldap-template.c +++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c @@ -402,8 +402,8 @@ ldap_info_equal_unmatched(gconstpointer k1, gconstpointer k2) } - /* These are the NtVer flags - http://msdn.microsoft.com/en-us/library/cc201035.aspx +/* These are the NtVer flags from MS-ADTS section 6.3.1.1 + * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-adts */ static const true_false_string tfs_ntver_v1 = { @@ -596,7 +596,7 @@ attribute_types_reset_cb(void) deregister_attribute_types(); } -/* MS-ADTS specification, section 7.3.1.1, NETLOGON_NT_VERSION Options Bits */ +/* MS-ADTS specification, section 6.3.1.1, NETLOGON_NT_VERSION Options Bits */ static int dissect_mscldap_ntver_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset) { static const int * flags[] = { @@ -1494,7 +1494,7 @@ static int dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre break; case LOGON_SAM_LOGON_RESPONSE_EX: - /* MS-ADTS 7.3.1.9 */ + /* MS-ADTS 6.3.1.9 */ offset += 2; /* Skip over "Sbz" field (MUST be set to 0) */ /* Flags */ @@ -1595,7 +1595,7 @@ static int dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre offset = len - 8; - /* NETLOGON_NT_VERISON Options (MS-ADTS 7.3.1.1) */ + /* NETLOGON_NT_VERISON Options (MS-ADTS 6.3.1.1) */ offset = dissect_mscldap_ntver_flags(tree, tvb, offset); /* LM Token */ @@ -2004,43 +2004,43 @@ void proto_register_ldap(void) { { &hf_mscldap_ntver_flags_v1, { "V1", "mscldap.ntver.searchflags.v1", FT_BOOLEAN, 32, - TFS(&tfs_ntver_v1), 0x00000001, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_v1), 0x00000001, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_v5, { "V5", "mscldap.ntver.searchflags.v5", FT_BOOLEAN, 32, - TFS(&tfs_ntver_v5), 0x00000002, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_v5), 0x00000002, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_v5ex, { "V5EX", "mscldap.ntver.searchflags.v5ex", FT_BOOLEAN, 32, - TFS(&tfs_ntver_v5ex), 0x00000004, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_v5ex), 0x00000004, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_v5ep, { "V5EP", "mscldap.ntver.searchflags.v5ep", FT_BOOLEAN, 32, - TFS(&tfs_ntver_v5ep), 0x00000008, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_v5ep), 0x00000008, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_vcs, { "VCS", "mscldap.ntver.searchflags.vcs", FT_BOOLEAN, 32, - TFS(&tfs_ntver_vcs), 0x00000010, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_vcs), 0x00000010, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_vnt4, { "VNT4", "mscldap.ntver.searchflags.vnt4", FT_BOOLEAN, 32, - TFS(&tfs_ntver_vnt4), 0x01000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_vnt4), 0x01000000, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_vpdc, { "VPDC", "mscldap.ntver.searchflags.vpdc", FT_BOOLEAN, 32, - TFS(&tfs_ntver_vpdc), 0x10000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_vpdc), 0x10000000, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_vip, { "VIP", "mscldap.ntver.searchflags.vip", FT_BOOLEAN, 32, - TFS(&tfs_ntver_vip), 0x20000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_vip), 0x20000000, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_vl, { "VL", "mscldap.ntver.searchflags.vl", FT_BOOLEAN, 32, - TFS(&tfs_ntver_vl), 0x40000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_vl), 0x40000000, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_vgc, { "VGC", "mscldap.ntver.searchflags.vgc", FT_BOOLEAN, 32, - TFS(&tfs_ntver_vgc), 0x80000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_vgc), 0x80000000, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_netlogon_flags_pdc, diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index a1c10e8158..9bf6cf3bc9 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -11,14 +11,15 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -/* The DCE RPC specification can be found at: +/* The DCE RPC 1.1 specification can be found at: * - * http://www.opengroup.org/dce/ - * https://www2.opengroup.org/ogsys/catalog/c706 + * https://publications.opengroup.org/c706 + * https://pubs.opengroup.org/onlinepubs/009629399/ * * Microsoft extensions can be found at: * - * https://msdn.microsoft.com/en-us/library/jj652470.aspx + * MS-WPO section 7.3.1 "RPC": + * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-wpo/7d2df784-557e-4fde-9281-9509653a0f17 */ #include "config.h" @@ -54,7 +55,7 @@ static e_guid_t uuid_data_repr_proto = { 0x8a885d04, 0x1ceb, 0x11c9, static e_guid_t uuid_ndr64 = { 0x71710533, 0xbeba, 0x4937, { 0x83, 0x19, 0xb5, 0xdb, 0xef, 0x9c, 0xcc, 0x36 } }; -/* see [MS-OXRPC] Appendix A: Full IDL, http://msdn.microsoft.com/en-us/library/ee217991%28v=exchg.80%29.aspx */ +/* see [MS-OXRPC] Appendix A: Full IDL, https://docs.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-oxcrpc/70adbb71-85a1-4023-bfdb-41e32ff37bf1 */ static e_guid_t uuid_asyncemsmdb = { 0x5261574a, 0x4572, 0x206e, { 0xb2, 0x68, 0x6b, 0x19, 0x92, 0x13, 0xb4, 0xe4 } }; @@ -301,9 +302,9 @@ static const value_string reject_status_vals[] = { { 0x1c010014, "nca_server_too_busy" }, { 0x1c010017, "nca_unsupported_type" }, /* MS Windows specific values - * see: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/debug/base/system_error_codes__1700-3999_.asp - * and: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/seccrypto/security/common_hresult_values.asp - * and: http://www.megos.ch/support/doserrors.txt + * see: https://docs.microsoft.com/en-us/windows/win32/debug/system-error-codes--1700-3999- + * and: https://docs.microsoft.com/en-us/windows/win32/seccrypto/common-hresult-values + * and: https://web.archive.org/web/20150825015741/http://www.megos.ch/support/doserrors.txt * * XXX - we might need a way to dynamically add entries here, as higher layer protocols use these values too, * at least MS protocols (like DCOM) do it that way ... */ diff --git a/epan/dissectors/packet-dcerpc.h b/epan/dissectors/packet-dcerpc.h index 4b034f75e0..744a75e08a 100644 --- a/epan/dissectors/packet-dcerpc.h +++ b/epan/dissectors/packet-dcerpc.h @@ -476,7 +476,7 @@ WS_DLL_PUBLIC void dcerpc_set_transport_salt(guint64 dcetransportsalt, packet_in /* * For MS-specific SSPs (Security Service Provider), see * - * http://msdn.microsoft.com/library/en-us/rpc/rpc/authentication_level_constants.asp + * https://docs.microsoft.com/en-us/windows/win32/rpc/authentication-level-constants */ #define DCE_C_RPC_AUTHN_PROTOCOL_NONE 0 diff --git a/epan/dissectors/packet-dcom-dispatch.c b/epan/dissectors/packet-dcom-dispatch.c index 7ea79538c7..00ca1fb9c8 100644 --- a/epan/dissectors/packet-dcom-dispatch.c +++ b/epan/dissectors/packet-dcom-dispatch.c @@ -75,10 +75,16 @@ static gint ett_dispatch = -1; static int proto_dispatch = -1; -/* from MSDN "Locale Identifiers" */ -/* see: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/intl/nls_8sj7.asp */ -/* values from cygwin's winnls.h and: */ -/* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/intl/nls_238z.asp */ +/* + * See: + * + * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/a9eac961-e77d-41a6-90a5-ce1a8b0cdb9c + * https://docs.microsoft.com/en-us/windows/win32/intl/locale-user-default + * https://docs.microsoft.com/en-us/windows/win32/intl/locale-system-default + * https://docs.microsoft.com/en-us/previous-versions/commerce-server/ee796949(v%3Dcs.20) + * + * and values from cygwin's winnls.h + */ static const value_string dcom_lcid_vals[] = { { 0x0000, "Language neutral" }, { 0x0400, "LOCALE_USER_DEFAULT" }, diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c index bf9e495a93..3ab58ab954 100644 --- a/epan/dissectors/packet-dhcp.c +++ b/epan/dissectors/packet-dhcp.c @@ -61,28 +61,27 @@ * RFC 7618: Dynamic Allocation of Shared IPv4 Addresses * RFC 7710: Captive-Portal Identification Using DHCP or Router Advertisements (RAs) * draft-ietf-dhc-fqdn-option-07.txt - * TFTP Server Address Option for DHCPv4 [draft-raj-dhc-tftp-addr-option-06.txt: http://tools.ietf.org/html/draft-raj-dhc-tftp-addr-option-06] + * TFTP Server Address Option for DHCPv4 [draft-raj-dhc-tftp-addr-option-06.txt: https://tools.ietf.org/html/draft-raj-dhc-tftp-addr-option-06] * BOOTP and DHCP Parameters - * http://www.iana.org/assignments/bootp-dhcp-parameters + * https://www.iana.org/assignments/bootp-dhcp-parameters * DOCSIS(TM) 2.0 Radio Frequency Interface Specification - * http://www.cablelabs.com/specifications/CM-SP-RFI2.0-I11-060602.pdf + * https://specification-search.cablelabs.com/radio-frequency-interface-specification-2 * DOCSIS(TM) 3.0 MAC and Upper Layer Protocols Interface Specification - * http://www.cablelabs.com/specifications/CM-SP-MULPIv3.0-I20-121113.pdf + * https://specification-search.cablelabs.com/CM-SP-MULPIv3.0 * PacketCable(TM) 1.0 MTA Device Provisioning Specification - * http://www.cablelabs.com/packetcable/downloads/specs/PKT-SP-PROV-I11-050812.pdf - * http://www.cablelabs.com/specifications/archives/PKT-SP-PROV-I05-021127.pdf (superseded by above) + * https://specification-search.cablelabs.com/packetcable-mta-device-provisioning-specification * PacketCable(TM) 1.5 MTA Device Provisioning Specification - * http://www.cablelabs.com/packetcable/downloads/specs/PKT-SP-PROV1.5-I02-050812.pdf - * PacketCable(TM) 2.0 EUE Device Provisioning Specification - * http://www.cablelabs.com/specifications/PKT-SP-EUE-DATA-I03-090528.pdf + * https://specification-search.cablelabs.com/packetcable-1-5-mta-device-provisioning-specification + * PacketCable(TM) 2.0 E-UE Device Provisioning Data Model Specification + * https://specification-search.cablelabs.com/e-ue-provisioning-data-model-specification * Business Services over DOCSIS(R) Layer 2 Virtual Private Networks - * http://www.cablelabs.com/specifications/CM-SP-L2VPN-I09-100611.pdf + * https://specification-search.cablelabs.com/business-services-over-docsis-layer-2-virtual-private-networks * CableHome(TM) 1.1 Specification - * http://www.cablelabs.com/projects/cablehome/downloads/specs/CH-SP-CH1.1-I11-060407.pdf + * https://web.archive.org/web/20060628173459/http://www.cablelabs.com/projects/cablehome/downloads/specs/CH-SP-CH1.1-I11-060407.pdf * Broadband Forum TR-111 - * http://www.broadband-forum.org/technical/download/TR-111.pdf + * https://web.archive.org/web/20150307135117/http://www.broadband-forum.org/technical/download/TR-111.pdf * Boot Server Discovery Protocol (BSDP) - * http://opensource.apple.com/source/bootp/bootp-198.1/Documentation/BSDP.doc + * https://opensource.apple.com/source/bootp/bootp-198.1/Documentation/BSDP.doc * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1120,7 +1119,7 @@ static void dissect_docsis_cm_cap(proto_tree *v_tree, tvbuff_t *tvb, #define ARUBA_AP "ArubaAP" #define OPT53_DISCOVER "Discover" -/* http://www.iana.org/assignments/bootp-dhcp-parameters */ +/* https://www.iana.org/assignments/bootp-dhcp-parameters */ static const value_string opt53_text[] = { { 1, OPT53_DISCOVER }, { 2, "Offer" }, @@ -1176,7 +1175,7 @@ static const value_string dhcp_nbnt_vals[] = { /* * There is confusion around some Client Architecture IDs: RFC 4578 section 2.1 * lists *requested* architecture IDs, however the actual assigned IDs - * (http://www.ietf.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xml#processor-architecture) + * (https://www.ietf.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xml#processor-architecture) * differ. Specifically, * * EFI Byte Code (EFI BC, EBC) was 7 in RFC 4578, but is assigned 9 by IETF. @@ -2247,7 +2246,7 @@ dissect_dhcpopt_client_identifier(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* We *MAY* use hwtype/hwaddr. If we have 7 bytes, I'll guess that the first is the hwtype, and the last 6 are the hw addr */ - /* See http://www.iana.org/assignments/arp-parameters */ + /* See https://www.iana.org/assignments/arp-parameters */ /* RFC2132 9.14 Client-identifier has the following to say: A hardware type of 0 (zero) should be used when the value field contains an identifier other than a hardware address @@ -2360,7 +2359,10 @@ dissect_dhcpopt_user_class_information(tvbuff_t *tvb, packet_info *pinfo, proto_ o77_v_tree = proto_item_add_subtree(vtix, ett_dhcp_option77_instance); if (!tvb_strneql(tvb, offset, "RRAS.Microsoft", 14)) { - /* MS have this non-conformant option https://msdn.microsoft.com/en-us/library/dd358019.aspx?f=255&MSPPError=-2147217396 */ + /* MS have this non-conformant option: + * + * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-dhcpe/a7be26f5-659d-4912-b715-0481b9d84e95 + */ class_length = 14; proto_item *expert_ti = proto_tree_add_item(o77_v_tree, hf_dhcp_option77_user_class_text, tvb, offset, class_length, ENC_ASCII|ENC_NA); expert_add_info(pinfo, expert_ti, &ei_dhcp_nonstd_option_data); @@ -2662,7 +2664,7 @@ dissect_dhcpopt_client_identifier_uuid(tvbuff_t *tvb, packet_info *pinfo _U_, pr /* We *MAY* use hwtype/hwaddr. If we have 7 bytes, I'll guess that the first is the hwtype, and the last 6 are the hw addr */ - /* See http://www.iana.org/assignments/arp-parameters */ + /* See https://www.iana.org/assignments/arp-parameters */ /* RFC2132 9.14 Client-identifier has the following to say: A hardware type of 0 (zero) should be used when the value field contains an identifier other than a hardware address @@ -3963,7 +3965,12 @@ dissect_vendor_avaya_param(proto_tree *tree, packet_info *pinfo, proto_item *vti } } -/* RFC3825Decoder: http://www.enum.at/rfc3825encoder.529.0.html */ +/* RFC3825Decoder: + * + * https://web.archive.org/web/20100312054301/http://www.enum.at/rfc3825encoder.529.0.html + * + * The code is no longer available. + */ static void rfc3825_lci_to_fixpoint(const unsigned char lci[16], struct rfc3825_location_fixpoint_t *fixpoint) { @@ -4011,7 +4018,12 @@ rfc3825_lci_to_fixpoint(const unsigned char lci[16], struct rfc3825_location_fix } -/* RFC3825Decoder: http://www.enum.at/rfc3825encoder.529.0.html */ +/* RFC3825Decoder: + * + * https://web.archive.org/web/20100312054301/http://www.enum.at/rfc3825encoder.529.0.html + * + * The code is no longer available. + */ static int rfc3825_fixpoint_to_decimal(struct rfc3825_location_fixpoint_t *fixpoint, struct rfc3825_location_decimal_t *decimal) { diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index 7b692383d3..ce0813ac0a 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -9,11 +9,11 @@ * SPDX-License-Identifier: GPL-2.0-or-later * * References: - * http://www.ietf.org/rfc/rfc3984.txt?number=3984 Obsolete - * http://www.ietf.org/rfc/rfc6184.txt?number=6184 - * http://www.ietf.org/rfc/rfc6190.txt?number=6190 - * http://www.itu.int/rec/T-REC-H.264/en - * MS-H264PF http://msdn.microsoft.com/en-us/library/hh659565.aspx + * https://tools.ietf.org/html/rfc3984 Obsolete + * https://tools.ietf.org/html/rfc6184 + * https://tools.ietf.org/html/rfc6190 + * https://www.itu.int/rec/T-REC-H.264/en + * MS-H264PF https://docs.microsoft.com/en-us/openspecs/office_protocols/ms-h264pf */ #include "config.h" diff --git a/epan/dissectors/packet-ieee80211-netmon.c b/epan/dissectors/packet-ieee80211-netmon.c index 1b31a4f500..3d3564e166 100644 --- a/epan/dissectors/packet-ieee80211-netmon.c +++ b/epan/dissectors/packet-ieee80211-netmon.c @@ -35,7 +35,7 @@ static int proto_netmon_802_11 = -1; /* * Augmented with phy types from * - * https://msdn.microsoft.com/en-us/library/windows/hardware/ff548741(v=vs.85).aspx + * https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/content/windot11/ne-windot11-_dot11_phy_type */ #define PHY_TYPE_UNKNOWN 0 #define PHY_TYPE_FHSS 1 @@ -109,11 +109,11 @@ dissect_netmon_802_11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void /* * XXX - is this the NDIS_OBJECT_HEADER structure: * - * https://msdn.microsoft.com/en-us/library/windows/hardware/ff566588(v=vs.85).aspx + * https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/content/ntddndis/ns-ntddndis-_ndis_object_header * * at the beginning of a DOT11_EXTSTA_RECV_CONTEXT structure: * - * https://msdn.microsoft.com/en-us/library/windows/hardware/ff548626(v=vs.85).aspx + * https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/content/windot11/ns-windot11-dot11_extsta_recv_context * * If so, the byte at an offset of 0 would be the appropriate type for the * structure following it, i.e. NDIS_OBJECT_TYPE_DEFAULT. diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 9b68de4efa..6493a285da 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -19,15 +19,15 @@ * See RFC 1510, and various I-Ds and other documents showing additions, * e.g. ones listed under * - * http://www.isi.edu/people/bcn/krb-revisions/ + * http://clifford.neuman.name/krb-revisions/ * * and * - * http://www.ietf.org/internet-drafts/draft-ietf-krb-wg-kerberos-clarifications-07.txt + * https://tools.ietf.org/html/draft-ietf-krb-wg-kerberos-clarifications-07 * * and * - * http://www.ietf.org/internet-drafts/draft-ietf-krb-wg-kerberos-referrals-05.txt + * https://tools.ietf.org/html/draft-ietf-krb-wg-kerberos-referrals-05 * * Some structures from RFC2630 * @@ -1133,7 +1133,7 @@ decrypt_krb5_data(proto_tree *tree, packet_info *pinfo, /* * For KERB_ENCTYPE_RC4_HMAC and KERB_ENCTYPE_RC4_HMAC_EXP, see * - * http://www.ietf.org/internet-drafts/draft-brezak-win2k-krb-rc4-hmac-04.txt + * https://tools.ietf.org/html/draft-brezak-win2k-krb-rc4-hmac-04 * * unless it's expired. */ @@ -4611,7 +4611,7 @@ dissect_kerberos_EncryptedChallenge(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ /*--- End of included file: packet-kerberos-fn.c ---*/ -#line 1878 "./asn1/kerberos/packet-kerberos-template.c" +#line 1876 "./asn1/kerberos/packet-kerberos-template.c" /* Make wrappers around exported functions for now */ int @@ -5813,7 +5813,7 @@ void proto_register_kerberos(void) { NULL, HFILL }}, /*--- End of included file: packet-kerberos-hfarr.c ---*/ -#line 2259 "./asn1/kerberos/packet-kerberos-template.c" +#line 2257 "./asn1/kerberos/packet-kerberos-template.c" }; /* List of subtrees */ @@ -5903,7 +5903,7 @@ void proto_register_kerberos(void) { &ett_kerberos_KrbFastArmoredRep, /*--- End of included file: packet-kerberos-ettarr.c ---*/ -#line 2275 "./asn1/kerberos/packet-kerberos-template.c" +#line 2273 "./asn1/kerberos/packet-kerberos-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 118a53e5e9..bb0aba6a8c 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -616,8 +616,8 @@ ldap_info_equal_unmatched(gconstpointer k1, gconstpointer k2) } - /* These are the NtVer flags - http://msdn.microsoft.com/en-us/library/cc201035.aspx +/* These are the NtVer flags from MS-ADTS section 6.3.1.1 + * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-adts */ static const true_false_string tfs_ntver_v1 = { @@ -810,7 +810,7 @@ attribute_types_reset_cb(void) deregister_attribute_types(); } -/* MS-ADTS specification, section 7.3.1.1, NETLOGON_NT_VERSION Options Bits */ +/* MS-ADTS specification, section 6.3.1.1, NETLOGON_NT_VERSION Options Bits */ static int dissect_mscldap_ntver_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset) { static const int * flags[] = { @@ -4404,7 +4404,7 @@ static int dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre break; case LOGON_SAM_LOGON_RESPONSE_EX: - /* MS-ADTS 7.3.1.9 */ + /* MS-ADTS 6.3.1.9 */ offset += 2; /* Skip over "Sbz" field (MUST be set to 0) */ /* Flags */ @@ -4505,7 +4505,7 @@ static int dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre offset = len - 8; - /* NETLOGON_NT_VERISON Options (MS-ADTS 7.3.1.1) */ + /* NETLOGON_NT_VERISON Options (MS-ADTS 6.3.1.1) */ offset = dissect_mscldap_ntver_flags(tree, tvb, offset); /* LM Token */ @@ -4914,43 +4914,43 @@ void proto_register_ldap(void) { { &hf_mscldap_ntver_flags_v1, { "V1", "mscldap.ntver.searchflags.v1", FT_BOOLEAN, 32, - TFS(&tfs_ntver_v1), 0x00000001, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_v1), 0x00000001, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_v5, { "V5", "mscldap.ntver.searchflags.v5", FT_BOOLEAN, 32, - TFS(&tfs_ntver_v5), 0x00000002, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_v5), 0x00000002, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_v5ex, { "V5EX", "mscldap.ntver.searchflags.v5ex", FT_BOOLEAN, 32, - TFS(&tfs_ntver_v5ex), 0x00000004, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_v5ex), 0x00000004, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_v5ep, { "V5EP", "mscldap.ntver.searchflags.v5ep", FT_BOOLEAN, 32, - TFS(&tfs_ntver_v5ep), 0x00000008, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_v5ep), 0x00000008, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_vcs, { "VCS", "mscldap.ntver.searchflags.vcs", FT_BOOLEAN, 32, - TFS(&tfs_ntver_vcs), 0x00000010, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_vcs), 0x00000010, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_vnt4, { "VNT4", "mscldap.ntver.searchflags.vnt4", FT_BOOLEAN, 32, - TFS(&tfs_ntver_vnt4), 0x01000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_vnt4), 0x01000000, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_vpdc, { "VPDC", "mscldap.ntver.searchflags.vpdc", FT_BOOLEAN, 32, - TFS(&tfs_ntver_vpdc), 0x10000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_vpdc), 0x10000000, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_vip, { "VIP", "mscldap.ntver.searchflags.vip", FT_BOOLEAN, 32, - TFS(&tfs_ntver_vip), 0x20000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_vip), 0x20000000, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_vl, { "VL", "mscldap.ntver.searchflags.vl", FT_BOOLEAN, 32, - TFS(&tfs_ntver_vl), 0x40000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_vl), 0x40000000, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_ntver_flags_vgc, { "VGC", "mscldap.ntver.searchflags.vgc", FT_BOOLEAN, 32, - TFS(&tfs_ntver_vgc), 0x80000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }}, + TFS(&tfs_ntver_vgc), 0x80000000, "See section 6.3.1.1 of MS-ADTS specification", HFILL }}, { &hf_mscldap_netlogon_flags_pdc, @@ -5636,7 +5636,7 @@ void proto_register_ldap(void) { NULL, HFILL }}, /*--- End of included file: packet-ldap-hfarr.c ---*/ -#line 2167 "./asn1/ldap/packet-ldap-template.c" +#line 2161 "./asn1/ldap/packet-ldap-template.c" }; /* List of subtrees */ @@ -5710,7 +5710,7 @@ void proto_register_ldap(void) { &ett_ldap_T_warning, /*--- End of included file: packet-ldap-ettarr.c ---*/ -#line 2181 "./asn1/ldap/packet-ldap-template.c" +#line 2175 "./asn1/ldap/packet-ldap-template.c" }; /* UAT for header fields */ static uat_field_t custom_attribute_types_uat_fields[] = { @@ -5899,7 +5899,7 @@ proto_reg_handoff_ldap(void) /*--- End of included file: packet-ldap-dis-tab.c ---*/ -#line 2353 "./asn1/ldap/packet-ldap-template.c" +#line 2347 "./asn1/ldap/packet-ldap-template.c" dissector_add_uint_range_with_preference("tcp.port", TCP_PORT_RANGE_LDAP, ldap_handle); } diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index d754c666ff..db1d2cc2fa 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -4,7 +4,7 @@ * * See * - * http://msdn.microsoft.com/en-us/library/cc234711.aspx + * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-mmsp * * for the [MS-MMSP] specification. * diff --git a/epan/dissectors/packet-mswsp.c b/epan/dissectors/packet-mswsp.c index c10966c67a..7591603d2a 100644 --- a/epan/dissectors/packet-mswsp.c +++ b/epan/dissectors/packet-mswsp.c @@ -3050,7 +3050,10 @@ static int parse_guid(tvbuff_t *tvb, int offset, proto_tree *tree, e_guid_t *gui return offset; } -/*Language Code ID: http://msdn.microsoft.com/en-us/library/cc233968(v=prot.20).aspx */ +/* Language Code ID - MS-LCID section 2.2 "LCID Structure": + * + * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/63d3d639-7fd2-4afb-abbe-0d5b5551eef8 + */ static int parse_lcid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, const char *text) { proto_item *item; diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index 924830a710..ad01bb823f 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -14,12 +14,12 @@ * SPDX-License-Identifier: GPL-2.0-or-later * * References for "media-type multipart/mixed : - * http://www.iana.org/assignments/media-types/index.html - * http://www.ietf.org/rfc/rfc2045.txt?number=2045 - * http://www.rfc-editor.org/rfc/rfc2046.txt - * http://www.rfc-editor.org/rfc/rfc2047.txt - * http://www.rfc-editor.org/rfc/rfc2048.txt - * http://www.rfc-editor.org/rfc/rfc2049.txt + * https://www.iana.org/assignments/media-types/index.html + * https://tools.ietf.org/html/rfc2045 + * https://tools.ietf.org/html/rfc2046 + * https://tools.ietf.org/html/rfc2047 + * https://tools.ietf.org/html/rfc2048 + * https://tools.ietf.org/html/rfc2049 * * Part of the code is modeled from the SIP and HTTP dissectors * @@ -725,9 +725,16 @@ process_body_part(proto_tree *tree, tvbuff_t *tvb, { gint body_len = boundary_start - body_start; tvbuff_t *tmp_tvb = tvb_new_subset_length(tvb, body_start, body_len); - /* if multipart subtype is encrypted the protcol string was set */ - /* see: https://msdn.microsoft.com/en-us/library/cc251581.aspx */ - /* there are only 2 body parts possible and each part has specific content types */ + /* + * If multipart subtype is encrypted the protcol string was set. + * + * See MS-WSMV section 2.2.9.1.2.1 "HTTP Headers": + * + * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-wsmv/b79927c2-96be-4801-aa68-180db95593f9 + * + * There are only 2 body parts possible, and each part has specific + * content types. + */ if(m_info->protocol && idx == 1 && is_raw_data) { gssapi_encrypt_info_t encrypt; diff --git a/epan/dissectors/packet-netmon.c b/epan/dissectors/packet-netmon.c index 38ab0b1f18..3dc3f27ec2 100644 --- a/epan/dissectors/packet-netmon.c +++ b/epan/dissectors/packet-netmon.c @@ -9,7 +9,7 @@ * * Network Event Tracing event taken from: * - * http://msdn.microsoft.com/en-us/library/aa363759(VS.85).aspx + * https://docs.microsoft.com/en-us/windows/win32/api/evntcons/ns-evntcons-event_header */ #include "config.h" diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index 11c4de55f4..9564fcd513 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -13,7 +13,7 @@ /* The official Documentation for the Peer Name Resolution Protocol * ([MS-PNRP]) can be found at * - * http://msdn.microsoft.com/en-us/library/cc239047.aspx + * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-pnrp * * This dissector is based on Revision 6.1.2 */ diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index c632daca41..fe46c86614 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -1119,7 +1119,7 @@ static const value_string dce_mode_vals[] = { #define CI_COMPOUND_FRAMES 15 /* DEPRECATED (Compound Frames) [RFC1570] */ #define CI_NOMDATAENCAP 16 /* DEPRECATED (Nominal Data Encapsulation) */ /* NOTE: IANA lists CI_NOMDATAENCAP as 16, but it is listed as 14 in - * http://tools.ietf.org/html/draft-ietf-pppext-dataencap-03. + * https://tools.ietf.org/html/draft-ietf-pppext-dataencap-03. * Which is correct is anyone's guess. */ #define CI_MULTILINK_MRRU 17 /* Multilink MRRU [RFC1990] */ #define CI_MULTILINK_SSNH 18 /* Multilink Short Sequence Number Header @@ -1411,12 +1411,12 @@ static const range_string chap_alg_rvals[] = { /* * Options. (IPCP) - * http://tools.ietf.org/html/rfc1172 - * http://tools.ietf.org/html/rfc1332 - * http://tools.ietf.org/html/rfc1877 - * http://tools.ietf.org/html/rfc2290 - * http://tools.ietf.org/html/rfc3241 - * http://tools.ietf.org/html/rfc3545 + * https://tools.ietf.org/html/rfc1172 + * https://tools.ietf.org/html/rfc1332 + * https://tools.ietf.org/html/rfc1877 + * https://tools.ietf.org/html/rfc2290 + * https://tools.ietf.org/html/rfc3241 + * https://tools.ietf.org/html/rfc3545 */ #define CI_ADDRS 1 /* IP Addresses (deprecated) (RFC 1172) */ #define CI_COMPRESS_PROTO 2 /* Compression Protocol (RFC 1332) */ @@ -1487,7 +1487,7 @@ static const value_string ipcp_iphc_parameter_vals[] = { /* ROHC suboptions */ #define IPCP_ROHC_PROFILES 1 -/* From http://tools.ietf.org/html/rfc3095 */ +/* From https://tools.ietf.org/html/rfc3095 */ static const value_string ipcp_rohc_profile_vals[] = { {0x0000, "ROHC uncompressed -- no compression"}, {0x0002, "ROHC UDP -- non-RTP UDP/IP compression"}, @@ -1546,7 +1546,7 @@ static int hf_osinlcp_opt_alignment = -1; #define CI_CCP_MVRCA 24 /* MVRCA (Magnalink) (RFC1975) */ #define CI_CCP_DCE 25 /* DCE (RFC1976) */ #define CI_CCP_DEFLATE 26 /* Deflate (RFC1979) */ -#define CI_CCP_V44LZJH 27 /* V.44/LZJH (http://www.watersprings.org/pub/id/draft-heath-ppp-v44-01.txt) */ +#define CI_CCP_V44LZJH 27 /* V.44/LZJH (https://tools.ietf.org/html/draft-heath-ppp-v44-01) */ #define CI_CCP_RESERVED 255 /* Reserved (RFC1962) */ static int hf_ccp_opt_type = -1; @@ -2121,12 +2121,12 @@ dissect_lcp_numbered_mode_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre return tvb_captured_length(tvb); } -/* http://tools.ietf.org/html/rfc1570#section-2.3 only lists 0-4, but - * http://tools.ietf.org/html/draft-ietf-pppext-callback-ds-02 lists 5 as +/* https://tools.ietf.org/html/rfc1570#section-2.3 only lists 0-4, but + * https://tools.ietf.org/html/draft-ietf-pppext-callback-ds-02 lists 5 as * "E.165 number", rather than "unassigned", and - * http://msdn.microsoft.com/en-us/library/ff632847%28v=prot.10%29.aspx does - * indicate 6 as below. Since 5 is only mentioned in the draft, leave it as - * "unassigned"? + * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-cbcp/efee6372-3251-471e-a141-71d1e7fef21f + * does indicate 6 as below. Since 5 is only mentioned in the draft, leave it + * as "unassigned"? */ static const value_string callback_op_vals[] = { {0, "Location is determined by user authentication"}, @@ -2175,7 +2175,7 @@ dissect_lcp_nomdataencap_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree return dissect_lcp_simple_opt(tvb, pinfo, tree, proto_lcp_option_nomdataencap, ett_lcp_nomdataencap_opt); } -/* http://tools.ietf.org/html/rfc1990#section-5.1.1 */ +/* https://tools.ietf.org/html/rfc1990#section-5.1.1 */ static int dissect_lcp_multilink_mrru_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { @@ -2359,7 +2359,7 @@ dissect_lcp_bacp_link_discriminator_opt(tvbuff_t *tvb, packet_info *pinfo, proto } /* Assuming it's this one: - * http://tools.ietf.org/html/draft-ietf-pppext-link-negot-00 + * https://tools.ietf.org/html/draft-ietf-pppext-link-negot-00 */ static int dissect_lcp_auth_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) @@ -2390,7 +2390,7 @@ dissect_lcp_auth_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* } /* Assuming it's this one: - * http://tools.ietf.org/html/draft-ietf-pppext-cobs-00 + * https://tools.ietf.org/html/draft-ietf-pppext-cobs-00 */ static int dissect_lcp_cobs_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) @@ -2474,7 +2474,7 @@ dissect_lcp_multilink_hdr_fmt_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree } -/* Character sets from http://www.iana.org/assignments/character-sets. */ +/* Character sets from https://www.iana.org/assignments/character-sets. */ static const value_string charset_vals[] = { {3, "ANSI_X3.4-1968"}, {4, "ISO_8859-1:1987"}, @@ -2789,7 +2789,7 @@ dissect_ipcp_fixed_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return TRUE; } -/* http://tools.ietf.org/html/rfc1172#section-5.1 */ +/* https://tools.ietf.org/html/rfc1172#section-5.1 */ static int dissect_ipcp_addrs_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { @@ -2813,7 +2813,7 @@ static const true_false_string tfs_comp_slot_id = { "The slot identifier must not be compressed" }; -/* http://tools.ietf.org/html/rfc1332#section-3.2 */ +/* https://tools.ietf.org/html/rfc1332#section-3.2 */ static int dissect_ipcp_compress_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { @@ -3507,7 +3507,7 @@ dissect_ccp_var_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } -/* http://tools.ietf.org/html/rfc1962 */ +/* https://tools.ietf.org/html/rfc1962 */ static int dissect_ccp_oui_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *field_tree; @@ -3531,7 +3531,7 @@ static int dissect_ccp_oui_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } /* The following configuration option types are mentioned at - * http://www.iana.org/assignments/ppp-numbers as referencing RFC1962; however, + * https://www.iana.org/assignments/ppp-numbers as referencing RFC1962; however, * RFC1962 only mentions Proprietary Compression OUI in section 4.1. These * others are therefore being treated as section 4.2 "Other Compression Types", * in terms of how they are dissected: @@ -3581,7 +3581,7 @@ static int dissect_ccp_hpppc_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree * return dissect_ccp_other_opt(tvb, pinfo, tree, proto_ccp_option_hpppc, ett_ccp_hpppc_opt); } -/* http://tools.ietf.org/html/rfc1974 */ +/* https://tools.ietf.org/html/rfc1974 */ static int dissect_ccp_stac_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { @@ -3654,8 +3654,8 @@ static const true_false_string ccp_mppe_c_tfs = { "No desire to negotiate MPPC" }; -/* http://tools.ietf.org/html/rfc2118, - * http://tools.ietf.org/html/rfc3078 */ +/* https://tools.ietf.org/html/rfc2118, + * https://tools.ietf.org/html/rfc3078 */ static int dissect_ccp_mppe_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { @@ -3682,7 +3682,7 @@ dissect_ccp_mppe_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* return tvb_captured_length(tvb); } -/* http://tools.ietf.org/html/rfc1993 */ +/* https://tools.ietf.org/html/rfc1993 */ static int dissect_ccp_gfza_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *field_tree; @@ -3709,7 +3709,7 @@ static int dissect_ccp_v42bis_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree return dissect_ccp_other_opt(tvb, pinfo, tree, proto_ccp_option_v42bis, ett_ccp_v42bis_opt); } -/* http://tools.ietf.org/html/rfc1977 */ +/* https://tools.ietf.org/html/rfc1977 */ static int dissect_ccp_bsdcomp_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { @@ -3731,7 +3731,7 @@ dissect_ccp_bsdcomp_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi return tvb_captured_length(tvb); } -/* http://tools.ietf.org/html/rfc1967 */ +/* https://tools.ietf.org/html/rfc1967 */ static int dissect_ccp_lzsdcp_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { @@ -3752,7 +3752,7 @@ dissect_ccp_lzsdcp_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void return tvb_captured_length(tvb); } -/* http://tools.ietf.org/html/rfc1975 */ +/* https://tools.ietf.org/html/rfc1975 */ static int dissect_ccp_mvrca_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { @@ -3773,7 +3773,7 @@ dissect_ccp_mvrca_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* return tvb_captured_length(tvb); } -/* http://tools.ietf.org/html/rfc1976 */ +/* https://tools.ietf.org/html/rfc1976 */ static int dissect_ccp_dce_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { @@ -3800,7 +3800,7 @@ static const value_string deflate_chk_vals[] = { {0, NULL} }; -/* http://tools.ietf.org/html/rfc1979 */ +/* https://tools.ietf.org/html/rfc1979 */ static int dissect_ccp_deflate_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { @@ -3835,7 +3835,7 @@ static const range_string v44lzjh_mode_dict_rvals[] = { {0, 0, NULL} }; -/* http://www.watersprings.org/pub/id/draft-heath-ppp-v44-01.txt */ +/* https://tools.ietf.org/html/draft-heath-ppp-v44-01 */ static int dissect_ccp_v44lzjh_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *field_tree; @@ -5057,7 +5057,7 @@ dissect_ccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* * Callback Control Protocol - see * - * http://www.linet.gr.jp/~manabe/PPxP/doc/Standards/draft-gidwani-ppp-callback-cp-00.txt + * https://tools.ietf.org/html/draft-gidwani-ppp-callback-cp-00 */ static int dissect_cbcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) @@ -6025,7 +6025,7 @@ dissect_ppp_usb( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data * In some cases, the 0x03 normally in byte 3 is escaped so we must look * for the 2 byte sequence of 0x7d23 instead of 0x03. The 0x23 is * generated by 0x20^0x03 per section 4.2 of: - * http://tools.ietf.org/html/rfc1662.html. + * https://tools.ietf.org/html/rfc1662.html. */ const guchar buf1[3] = {0x7e, 0xff, 0x03}; const guchar buf2[4] = {0x7e, 0xff, 0x7d, 0x23}; @@ -6056,7 +6056,7 @@ dissect_ppp_usb( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data } else if (tvb_get_guint8(tvb, 0) == 0x7e) { /* Well, let's guess that since the 1st byte is 0x7e that it really is * a PPP frame, and the address and control bytes are compressed (NULL) - * per http://tools.ietf.org/html/rfc1662, section 3.2, which means + * per https://tools.ietf.org/html/rfc1662, section 3.2, which means * that they're omitted from the packet. */ next_tvb = tvb_new_subset_remaining(tvb, 1); dissect_ppp_hdlc_common(next_tvb, pinfo, tree); diff --git a/epan/dissectors/packet-rsvd.c b/epan/dissectors/packet-rsvd.c index fef00006bc..e24c2f9b1f 100644 --- a/epan/dissectors/packet-rsvd.c +++ b/epan/dissectors/packet-rsvd.c @@ -334,7 +334,11 @@ dissect_RSVD_TUNNEL_SCSI(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_t offset += cdb_length; if (cdb_length < 16) { /* - * CDBBuffer is always 16 bytes - see https://msdn.microsoft.com/en-us/library/dn393496.aspx + * CDBBuffer is always 16 bytes - see MS-RSVD section 2.2.4.7 + * "SVHDX_TUNNEL_SCSI_REQUEST Structure": + * + * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-rsvd/e8bcb003-97b3-41ef-9689-cd2d1668a9cc + * * If CDB is actually smaller, we need to define padding bytes */ guint32 cdb_padding_length = 16 - cdb_length; diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 72ffc4e610..5acd01e157 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -28,16 +28,18 @@ * port number, but there is a registered port available, port 5005 * See Annex B of ITU-T Recommendation H.225.0, section B.7 * - * Information on PoC can be found from http://www.openmobilealliance.org/ + * Information on PoC can be found from + * https://www.omaspecworks.org (OMA SpecWorks, formerly the Open + * Mobile Alliance - http://www.openmobilealliance.org/) * * RTCP XR is specified in RFC 3611. * - * See also http://www.iana.org/assignments/rtp-parameters + * See also https://www.iana.org/assignments/rtp-parameters * * RTCP FB is specified in RFC 4585 and extended by RFC 5104 * - * MS-RTP: Real-time Transport Protocol (RTP) Extensions http://msdn.microsoft.com/en-us/library/office/cc431492.aspx - * + * MS-RTP: Real-time Transport Protocol (RTP) Extensions + * https://docs.microsoft.com/en-us/openspecs/office_protocols/ms-rtp */ /* @@ -45,9 +47,9 @@ * Torsten Loebner (loebnert@googlemail.com) in the context of a graduation * project with the research organization TNO in Delft, Netherland. * The extension is based on the RTCP XR block specified in - * ETSI TS 182 063 v3.5.2 Annex W (http://www.etsi.org/deliver/etsi_ts/183000_183099/183063/), + * ETSI TS 182 063 v3.5.2 Annex W (https://www.etsi.org/deliver/etsi_ts/183000_183099/183063/), * which was registered by IANA as RTCP XR Block Type 12 - * (http://www.iana.org/assignments/rtcp-xr-block-types/rtcp-xr-block-types.xml). + * (https://www.iana.org/assignments/rtcp-xr-block-types/rtcp-xr-block-types.xml). */ #include "config.h" @@ -101,7 +103,7 @@ static const value_string rtcp_version_vals[] = #define RTCP_SMPTETC 194 #define RTCP_IJ 195 /* RTCP packet types according to Section A.11.1 */ -/* And http://www.iana.org/assignments/rtp-parameters */ +/* And https://www.iana.org/assignments/rtp-parameters/rtp-parameters.xhtml */ #define RTCP_SR 200 #define RTCP_RR 201 #define RTCP_SDES 202 @@ -166,7 +168,7 @@ static const value_string rtcp_sdes_type_vals[] = }; /* RTCP XR Blocks (Section 4, RTC 3611) - * or http://www.iana.org/assignments/rtcp-xr-block-types */ + * or https://www.iana.org/assignments/rtcp-xr-block-types */ #define RTCP_XR_LOSS_RLE 1 #define RTCP_XR_DUP_RLE 2 #define RTCP_XR_PKT_RXTIMES 3 @@ -193,7 +195,7 @@ static const value_string rtcp_xr_type_vals[] = { RTCP_XR_TI_VOIP, "Texas Instruments Extended VoIP Quality Block" }, { RTCP_XR_PR_LOSS_RLE, "Post-repair Loss RLE Report Block" }, { RTCP_XR_MC_ACQ, "Multicast Acquisition Report Block" }, - { RTCP_XR_IDMS, "Inter-destination Media Synchronization Block" }, /* [http://www.etsi.org/deliver/etsi_ts/183000_183099/183063/][ETSI 183 063][Miguel_Angel_Reina_Ortega] */ + { RTCP_XR_IDMS, "Inter-destination Media Synchronization Block" }, /* [https://www.etsi.org/deliver/etsi_ts/183000_183099/183063/][ETSI 183 063][Miguel_Angel_Reina_Ortega] */ { 0, NULL} }; @@ -1636,7 +1638,7 @@ dissect_rtcp_psfb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, * * REMB (Receiver Estimated Maximum Bitrate) is, according * to section 2.3 "Signaling of use of this extension" of - * http://tools.ietf.org/html/draft-alvestrand-rmcat-remb-03, + * https://tools.ietf.org/html/draft-alvestrand-rmcat-remb-03, * indicated as an SDP option when the session is set up. * * MS-RTP is, according to MS-RTP and according to MS-SDPEXT @@ -1650,7 +1652,7 @@ dissect_rtcp_psfb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, guint32 magic_value = tvb_get_ntohl( tvb, offset); /* look for string literal 'REMB' which is 0x52454d42 hex */ if (magic_value == 0x52454d42) { - /* Handle REMB (Receiver Estimated Maximum Bitrate) - http://tools.ietf.org/html/draft-alvestrand-rmcat-remb-00 */ + /* Handle REMB (Receiver Estimated Maximum Bitrate) - https://tools.ietf.org/html/draft-alvestrand-rmcat-remb-00 */ offset = dissect_rtcp_psfb_remb(tvb, offset, rtcp_tree, top_item, counter, &read_fci); } else { /* Handle MS Application Layer Feedback Messages - MS-RTP */ diff --git a/epan/dissectors/packet-smp.c b/epan/dissectors/packet-smp.c index 40aef82764..70b900b4db 100644 --- a/epan/dissectors/packet-smp.c +++ b/epan/dissectors/packet-smp.c @@ -11,9 +11,10 @@ /* * References: - * https://web.archive.org/web/20171009015219/https://msdn.microsoft.com/en-us/library/cc219643.aspx - * https://web.archive.org/web/20171223021159/https://msdn.microsoft.com/en-us/library/dd304523.aspx - * https://web.archive.org/web/20171005092351/https://docs.microsoft.com/en-us/sql/relational-databases/native-client/features/using-multiple-active-result-sets-mars + * + * MC-SMP - https://docs.microsoft.com/en-us/openspecs/windows_protocols/mc-smp + * MS-TDS - https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-tds + * https://docs.microsoft.com/en-us/sql/relational-databases/native-client/features/using-multiple-active-result-sets-mars * * 0 1 2 3 * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 diff --git a/epan/dissectors/packet-sstp.c b/epan/dissectors/packet-sstp.c index 6326e002ba..cc7bbfad2b 100644 --- a/epan/dissectors/packet-sstp.c +++ b/epan/dissectors/packet-sstp.c @@ -1,9 +1,11 @@ /* packet-sstp.c * routines for sstp packet dissasembly - * - http://msdn.microsoft.com/en-us/library/cc247338(v=prot.20).aspx + * - MS-SSTP: + * + * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-sstp * * Created as part of a semester project at the University of Applied Sciences Hagenberg - * (http://www.fh-ooe.at/en/hagenberg-campus/) + * (https://www.fh-ooe.at/en/hagenberg-campus/) * * Copyright (c) 2013: * Hofer Manuel (manuel@mnlhfr.at) @@ -420,7 +422,11 @@ proto_register_sstp(void) NULL, HFILL } }, /* Undocumented Data in SSTP_MSG_CALL_CONNECT_REQUEST - see also: http://msdn.microsoft.com/en-us/library/cc247340.aspx */ + see also MS-SSTP section 2.2.9 "Call Connect Request Message + (SSTP_MSG_CALL_CONNECT_REQUEST)": + + https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-sstp/e73ced14-7bef-407b-a85b-a6f624324dd1 + */ { &hf_sstp_data_unknown, { "Unknown Data", "sstp.dataunknown", FT_BYTES, BASE_NONE, diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index 9e2f30e623..24f4723aed 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -23,10 +23,10 @@ * - RFC 6544 * * From MS (Lync) - * MS-TURN: Traversal Using Relay NAT (TURN) Extensions http://msdn.microsoft.com/en-us/library/cc431507.aspx - * MS-ICE2BWN: Interactive Connectivity Establishment (ICE) 2.0 Bandwidth Management Extensions http://msdn.microsoft.com/en-us/library/ff595756.aspx - * MS-TURNBWM: Traversal using Relay NAT (TURN) Bandwidth Management Extensions http://msdn.microsoft.com/en-us/library/ff595670.aspx - * MS-ICE2: Interactive Connectivity Establishment ICE Extensions 2.0 http://msdn.microsoft.com/en-us/library/office/cc431504.aspx + * MS-TURN: Traversal Using Relay NAT (TURN) Extensions https://docs.microsoft.com/en-us/openspecs/office_protocols/ms-turn + * MS-ICE2BWN: Interactive Connectivity Establishment (ICE) 2.0 Bandwidth Management Extensions https://docs.microsoft.com/en-us/openspecs/office_protocols/ms-ice2bwm + * MS-TURNBWM: Traversal using Relay NAT (TURN) Bandwidth Management Extensions https://docs.microsoft.com/en-us/openspecs/office_protocols/ms-turnbwm + * MS-ICE2: Interactive Connectivity Establishment ICE Extensions 2.0 https://docs.microsoft.com/en-us/openspecs/office_protocols/ms-ice2 */ #include "config.h" @@ -377,7 +377,7 @@ static const value_string attributes_family[] = { {0x0002, "IPv6"}, {0x00, NULL} }; -/* http://www.iana.org/assignments/stun-parameters/stun-parameters.xhtml#stun-parameters-6 (2015-06-12)*/ +/* https://www.iana.org/assignments/stun-parameters/stun-parameters.xhtml#stun-parameters-6 (2015-06-12)*/ static const value_string error_code[] = { {274, "Disable Candidate"}, /* MS-ICE2BWN */ diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c index 547e03034a..ca7c136681 100644 --- a/epan/dissectors/packet-windows-common.c +++ b/epan/dissectors/packet-windows-common.c @@ -122,7 +122,11 @@ value_string_ext DOS_errors_ext = VALUE_STRING_EXT_INIT(DOS_errors); * * From * - * http://www.wildpackets.com/elements/misc/SMB_NT_Status_Codes.txt + * https://web.archive.org/web/20100503121824/http://www.wildpackets.com/elements/misc/SMB_NT_Status_Codes.txt + * + * See also MS-ERREF section 2.3.1 "NTSTATUS Values": + * + * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-erref/596a1078-e883-4972-9bbc-49e60bebca55 */ const value_string NT_errors[] = { { 0x00000000, "STATUS_SUCCESS" }, @@ -997,7 +1001,7 @@ value_string_ext NT_errors_ext = VALUE_STRING_EXT_INIT(NT_errors); /* These are the MS country codes from - http://www.unicode.org/unicode/onlinedat/countries.html + https://web.archive.org/web/20081224015707/http://www.unicode.org/unicode/onlinedat/countries.html For countries that share the same number, I choose to use only the name of the largest country. Apologies for this. If this offends you, @@ -1220,8 +1224,10 @@ dissect_nt_64bit_time(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_date) return dissect_nt_64bit_time_opt(tvb, tree, offset, hf_date, FALSE); } -/* Well-known SIDs defined in http://support.microsoft.com/kb/243330 */ +/* Well-known SIDs defined in + https://support.microsoft.com/en-us/help/243330/well-known-security-identifiers-in-windows-operating-systems +*/ static const sid_strings well_known_sids[] = { {"S-1-0", "Null Authority"}, {"S-1-0-0", "Nobody"}, @@ -1320,8 +1326,10 @@ match_wkwn_sids(const char* sid) { /* For SIDs in the form 'S-1-5-21-X-Y-Z-<RID>', '21-X-Y-Z' is referred to as the "domain SID" (NT domain) or "machine SID" (local machine). The following are well-known RIDs which are appended to domain/machine SIDs - as defined in http://support.microsoft.com/kb/243330. */ + as defined in + https://support.microsoft.com/en-us/help/243330/well-known-security-identifiers-in-windows-operating-systems +*/ static const value_string wkwn_S_1_5_21_rids[] = { {498, "Enterprise Read-only Domain Controllers"}, {500, "Administrator"}, @@ -1612,12 +1620,11 @@ dissect_nt_sid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, return offset; } -/* Dissect an access mask. All this stuff is kind of explained at MSDN: +/* Dissect an access mask. All this stuff is kind of explained at -http://msdn.microsoft.com/library/default.asp?url=/library/en-us/security/security/windows_2000_windows_nt_access_mask_format.asp + https://docs.microsoft.com/en-us/windows/win32/secauthz/access-mask-format */ - static gint ett_nt_access_mask = -1; static gint ett_nt_access_mask_generic = -1; static gint ett_nt_access_mask_standard = -1; @@ -2140,7 +2147,7 @@ dissect_nt_acl(tvbuff_t *tvb, int offset_a, packet_info *pinfo, /* * XXX - is this *really* 2 bytes? The page at * - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/secauthz/security/acl.asp + * https://docs.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-_acl * * indicates that it's one byte of revision and one byte of * zero padding, which means the code that used to be here diff --git a/epan/export_object.c b/epan/export_object.c index c16699ff95..2978c3c595 100644 --- a/epan/export_object.c +++ b/epan/export_object.c @@ -111,7 +111,7 @@ eo_massage_str(const gchar *in_str, gsize maxlen, int dupn) { gchar *tmp_ptr; /* The characters in "reject" come from: - * http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx. + * https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#naming-conventions. * Add to the list as necessary for other OS's. */ const gchar *reject = "<>:\"/\\|?*" diff --git a/epan/maxmind_db.c b/epan/maxmind_db.c index e0424acc6e..5b044ecdbb 100644 --- a/epan/maxmind_db.c +++ b/epan/maxmind_db.c @@ -37,7 +37,7 @@ static mmdb_lookup_t mmdb_not_found; // To do: // - Add RBL lookups? Along with the "is this a spammer" information that most RBL databases -// provide, you can also fetch AS information: http://www.team-cymru.org/IP-ASN-mapping.html +// provide, you can also fetch AS information: https://www.team-cymru.com/IP-ASN-mapping.html // - Switch to a different format? I was going to use g_key_file_* to parse // the mmdbresolve output, but it was easier to just parse it directly. @@ -52,7 +52,7 @@ static char mmdbr_stop_sentinel[] = "\x04"; // ASCII EOT. Could be anything. // https://gitlab.gnome.org/GNOME/glib/blob/master/glib/gthread-win32.c#L206 // and SRW locks "cannot be acquired recursively" // https://docs.microsoft.com/en-us/windows/desktop/Sync/slim-reader-writer--srw--locks -// https://blogs.msdn.microsoft.com/oldnewthing/20160506-00/?p=93416 +// https://devblogs.microsoft.com/oldnewthing/?p=93416 static GRWLock mmdbr_pipe_mtx; // Hashes of mmdb_lookup_t diff --git a/image/file_dlg_win32.rc b/image/file_dlg_win32.rc index ffc679f795..71c0b19e8d 100644 --- a/image/file_dlg_win32.rc +++ b/image/file_dlg_win32.rc @@ -3,7 +3,7 @@ #include "../ui/win32/file_dlg_win32.h" // We should probably ensure that we're meeting the MS layout guidelines: -// https://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx +// https://docs.microsoft.com/en-us/windows/win32/uxguide/vis-layout // Outer margin: 11px WIRESHARK_OPENFILENAME_TEMPLATE DIALOGEX 0, 0, 425, 47 diff --git a/packaging/portableapps/CMakeLists.txt b/packaging/portableapps/CMakeLists.txt index 9d0a84770b..6d7f06db0d 100644 --- a/packaging/portableapps/CMakeLists.txt +++ b/packaging/portableapps/CMakeLists.txt @@ -36,7 +36,7 @@ macro( ADD_PORTABLEAPPS_PACKAGE_TARGET ) add_custom_target(portableapps_app_dir # We "Deploy using XCopy," which is described at - # https://msdn.microsoft.com/en-us/library/ms235291.aspx + # https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2008/ms235291(v=vs.90) # We also assume that the project has been built at this point. COMMAND ${CMAKE_COMMAND} -E remove_directory ${_portableapps_app_dir} COMMAND ${CMAKE_COMMAND} -E make_directory ${_portableapps_app_dir} diff --git a/packaging/wix/WiresharkOptionsDlg.wxs b/packaging/wix/WiresharkOptionsDlg.wxs index 1b55dbb61a..0790ccd2d5 100644 --- a/packaging/wix/WiresharkOptionsDlg.wxs +++ b/packaging/wix/WiresharkOptionsDlg.wxs @@ -4,7 +4,8 @@ <UI> <!-- Recommended control sizing and spacing: - https://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing + https://docs.microsoft.com/en-us/windows/win32/uxguide/vis-layout#control-sizing + https://docs.microsoft.com/en-us/windows/win32/uxguide/vis-layout#spacing The recommended spacing between unrelated controls is 7, but 10 looks better. --> <Dialog Id="WiresharkOptionsDlg" Width="370" Height="270" Title="!(loc.LicenseAgreementDlg_Title)"> diff --git a/tools/textify.ps1 b/tools/textify.ps1 index a33b3918ee..78d8d6431c 100755 --- a/tools/textify.ps1 +++ b/tools/textify.ps1 @@ -77,7 +77,7 @@ foreach ($src_file in Get-ChildItem $SourceFiles) { $contents = Get-Content -Encoding UTF8 $src_file # We might want to write this out with a BOM in order to improve # the chances of Notepad's UTF-8 heuristics. - # https://blogs.msdn.microsoft.com/oldnewthing/20070417-00/?p=27223 + # https://devblogs.microsoft.com/oldnewthing/?p=27223 [System.IO.File]::WriteAllLines($dst_file, $contents, $no_bom_encoding) Write-Host "Textified $src_file to $dst_file" } else { diff --git a/ui/qt/models/profile_model.cpp b/ui/qt/models/profile_model.cpp index 750efb00e5..d06cabbfb1 100644 --- a/ui/qt/models/profile_model.cpp +++ b/ui/qt/models/profile_model.cpp @@ -828,7 +828,7 @@ bool ProfileModel::checkNameValidity(QString name, QString *msg) QString msgChars; #ifdef _WIN32 - /* According to https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file */ + /* According to https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#naming-conventions */ QString invalid_dir_chars = "<>:\"/\\|?*"; #else QString invalid_dir_chars = QDir::separator(); diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index c7760dcbca..6b82e8b7f2 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -155,7 +155,7 @@ static char *g_dfilter_str = NULL; static unsigned int g_format_type = WTAP_TYPE_AUTO; /* - * According to https://docs.microsoft.com/en-us/previous-versions/windows/desktop/legacy/bb776913(v=vs.85) + * According to https://docs.microsoft.com/en-us/windows/win32/shell/common-file-dialog * we should use IFileOpenDialog and IFileSaveDialog on Windows Vista * and later. */ diff --git a/version_info.c b/version_info.c index 124553d613..928214a8c0 100644 --- a/version_info.c +++ b/version_info.c @@ -255,7 +255,7 @@ get_compiler_info(GString *str) #define COMPILER_BUILD_NUMBER (_MSC_FULL_VER % 100000) /* - * From https://blogs.msdn.microsoft.com/vcblog/2014/11/17/c111417-features-in-vs-2015-preview/ + * From https://web.archive.org/web/20190125151548/https://blogs.msdn.microsoft.com/vcblog/2014/11/17/c111417-features-in-vs-2015-preview/ * * Bakersfield: DevDiv's upper management determines the scheduling * of new major versions. They also decided to increment the product @@ -271,7 +271,7 @@ get_compiler_info(GString *str) #if VCPP_MAJOR_VERSION == 14 /* - * From https://blogs.msdn.microsoft.com/vcblog/2017/11/15/side-by-side-minor-version-msvc-toolsets-in-visual-studio-2017/: + * From https://devblogs.microsoft.com/cppblog/side-by-side-minor-version-msvc-toolsets-in-visual-studio-2017/ * * We've been delivering improvements to Visual Studio 2017 more * frequently than ever before. Since its first release in March @@ -420,7 +420,7 @@ get_runtime_version_info(void (*additional_info)(GString *)) * * On Windows get_locale returns the full language, country * name, and code page, e.g. "English_United States.1252": - * https://msdn.microsoft.com/en-us/library/x99tb11d.aspx + * https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/setlocale-wsetlocale?view=vs-2019 */ if ((lang = get_locale()) != NULL) { g_string_append_printf(str, ", with locale %s", lang); diff --git a/wiretap/netmon.c b/wiretap/netmon.c index 89412c227c..6aa5bd373f 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -170,7 +170,7 @@ typedef struct { * * See * - * https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396#maxpath + * https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#maximum-path-length-limitation * * The NetMon 3.4 "Capture File Format" documentation says "PathSize must be * greater than 0, and less than MAX_PATH (260 characters)", but, as per that @@ -1300,7 +1300,7 @@ netmon_process_record(wtap *wth, FILE_T fh, wtap_rec *rec, /* * Event Tracing event. * - * http://msdn.microsoft.com/en-us/library/aa363759(VS.85).aspx + * https://docs.microsoft.com/en-us/windows/win32/api/evntcons/ns-evntcons-event_header */ pkt_encap = WTAP_ENCAP_NETMON_NET_NETEVENT; break; diff --git a/wsutil/bits_count_ones.h b/wsutil/bits_count_ones.h index 97f8e50226..c194cd3abf 100644 --- a/wsutil/bits_count_ones.h +++ b/wsutil/bits_count_ones.h @@ -17,7 +17,7 @@ * The variable-precision SWAR algorithm is an interesting way to count * the number of bits set in an integer: * - * http://playingwithpointers.com/swar.html + * https://www.playingwithpointers.com/blog/swar.html * * See * @@ -28,7 +28,7 @@ * * See * - * https://msdn.microsoft.com/en-us/library/bb385231.aspx + * https://docs.microsoft.com/en-us/cpp/intrinsics/popcnt16-popcnt-popcnt64 * * for MSVC's population count intrinsics. * diff --git a/wsutil/cpu_info.c b/wsutil/cpu_info.c index e043104305..810b48628c 100644 --- a/wsutil/cpu_info.c +++ b/wsutil/cpu_info.c @@ -26,7 +26,7 @@ get_cpu_info(GString *str) char CPUBrandString[0x40]; unsigned nExIds; - /* http://msdn.microsoft.com/en-us/library/hskdteyh(v=vs.100).aspx */ + /* https://docs.microsoft.com/en-us/cpp/intrinsics/cpuid-cpuidex */ /* Calling __cpuid with 0x80000000 as the InfoType argument */ /* gets the number of valid extended IDs. */ diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c index f23e2226b2..b25f4a5448 100644 --- a/wsutil/tempfile.c +++ b/wsutil/tempfile.c @@ -118,7 +118,7 @@ create_tempfile(char **namebuf, const char *pfx, const char *sfx) gchar sep[2] = {0, 0}; /* The characters in "delimiters" come from: - * http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx. + * https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#naming-conventions. * Add to the list as necessary for other OS's. */ const gchar *delimiters = "<>:\"/\\|?*" diff --git a/wsutil/win32-utils.c b/wsutil/win32-utils.c index 50e74a2738..eed56d851d 100644 --- a/wsutil/win32-utils.c +++ b/wsutil/win32-utils.c @@ -190,7 +190,7 @@ win32strexception(DWORD exception) } // This appears to be the closest equivalent to SIGPIPE on Windows. -// https://blogs.msdn.microsoft.com/oldnewthing/20131209-00/?p=2433 +// https://devblogs.microsoft.com/oldnewthing/?p=2433 // https://stackoverflow.com/a/53214/82195 static void win32_kill_child_on_exit(HANDLE child_handle) { |