diff options
84 files changed, 218 insertions, 198 deletions
@@ -1,4 +1,4 @@ -See also https://wiki.wireshark.org/Development. +See also https://gitlab.com/wireshark/wireshark/-/wikis/Development. Installation ============ diff --git a/debian/README.Debian b/debian/README.Debian index eb553d7da9..f52ffe65bd 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -85,10 +85,10 @@ II. Installing SNMP MIBs from RFC authors [5]. - [1] https://wiki.wireshark.org/Development/PrivilegeSeparation - [2] https://wiki.wireshark.org/CaptureSetup/CapturePrivileges + [1] https://gitlab.com/wireshark/wireshark/-/wikis/Development/PrivilegeSeparation + [2] https://gitlab.com/wireshark/wireshark/-/wikis/CaptureSetup/CapturePrivileges [3] https://blog.wireshark.org/2010/02/running-wireshark-as-you - [4] https://wiki.wireshark.org/SNMP + [4] https://gitlab.com/wireshark/wireshark/-/wikis/SNMP [5] https://wiki.debian.org/NonFreeIETFDocuments [6] https://www.debian.org/doc/debian-policy/ch-archive.html#s-non-free [7] https://www.debian.org/doc/debian-policy/ch-archive.html#s-main @@ -3282,7 +3282,7 @@ capture_loop_dispatch(loop_data *ld, /* * WinPcap's remote capturing feature doesn't work with pcap_dispatch(), - * see https://wiki.wireshark.org/CaptureSetup/WinPcapRemote + * see https://gitlab.com/wireshark/wireshark/-/wikis/CaptureSetup/WinPcapRemote * This should be fixed in the WinPcap 4.0 alpha release. * * For reference, an example remote interface: diff --git a/epan/dissectors/asn1/atn-ulcs/atn-ulcs.asn b/epan/dissectors/asn1/atn-ulcs/atn-ulcs.asn index eea68b5592..de9b94e604 100644 --- a/epan/dissectors/asn1/atn-ulcs/atn-ulcs.asn +++ b/epan/dissectors/asn1/atn-ulcs/atn-ulcs.asn @@ -275,7 +275,7 @@ Application-context-name ::= OBJECT IDENTIFIER -- Application-entity title productions follow (not in alphabetical order) -- *************************************************************************** -- MG: asn2wrs cannot handle untagged CHOICEs within either a SET or a SEQUENCE. --- https://wiki.wireshark.org/Asn2wrs_Handmassaging_the_ASN_file +-- https://gitlab.com/wireshark/wireshark/-/wikis/Asn2wrs_Handmassaging_the_ASN_file AP-title ::= CHOICE { -- ATN: See encoding guidance in 2.5.11 -- "form2" is encoded as 0 and "form1" as 1 ap-title-form2 [0] IMPLICIT AP-title-form2, -- Object Identifier form diff --git a/epan/dissectors/packet-dcerpc-atsvc.c b/epan/dissectors/packet-dcerpc-atsvc.c index a3ae39b63d..908c7ba370 100644 --- a/epan/dissectors/packet-dcerpc-atsvc.c +++ b/epan/dissectors/packet-dcerpc-atsvc.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-atsvc.h b/epan/dissectors/packet-dcerpc-atsvc.h index 71fd13e6ff..f92561cfe7 100644 --- a/epan/dissectors/packet-dcerpc-atsvc.h +++ b/epan/dissectors/packet-dcerpc-atsvc.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #ifndef __PACKET_DCERPC_ATSVC_H diff --git a/epan/dissectors/packet-dcerpc-clusapi.c b/epan/dissectors/packet-dcerpc-clusapi.c index fdf3185dae..1c98a7452d 100644 --- a/epan/dissectors/packet-dcerpc-clusapi.c +++ b/epan/dissectors/packet-dcerpc-clusapi.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-clusapi.h b/epan/dissectors/packet-dcerpc-clusapi.h index 3f940cf20c..929cea57a5 100644 --- a/epan/dissectors/packet-dcerpc-clusapi.h +++ b/epan/dissectors/packet-dcerpc-clusapi.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #include "packet-dcerpc-winreg.h" diff --git a/epan/dissectors/packet-dcerpc-dfs.c b/epan/dissectors/packet-dcerpc-dfs.c index 59cd704c7b..759e173101 100644 --- a/epan/dissectors/packet-dcerpc-dfs.c +++ b/epan/dissectors/packet-dcerpc-dfs.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-dfs.h b/epan/dissectors/packet-dcerpc-dfs.h index 9d9261ac87..849528fa3c 100644 --- a/epan/dissectors/packet-dcerpc-dfs.h +++ b/epan/dissectors/packet-dcerpc-dfs.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #ifndef __PACKET_DCERPC_NETDFS_H diff --git a/epan/dissectors/packet-dcerpc-dnsserver.c b/epan/dissectors/packet-dcerpc-dnsserver.c index 91bd7d84b0..603757dd46 100644 --- a/epan/dissectors/packet-dcerpc-dnsserver.c +++ b/epan/dissectors/packet-dcerpc-dnsserver.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-dnsserver.h b/epan/dissectors/packet-dcerpc-dnsserver.h index 33ba20f250..5d38ba56fb 100644 --- a/epan/dissectors/packet-dcerpc-dnsserver.h +++ b/epan/dissectors/packet-dcerpc-dnsserver.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #ifndef __PACKET_DCERPC_DNSSERVER_H diff --git a/epan/dissectors/packet-dcerpc-dssetup.c b/epan/dissectors/packet-dcerpc-dssetup.c index 4c6783e308..e56fef59cb 100644 --- a/epan/dissectors/packet-dcerpc-dssetup.c +++ b/epan/dissectors/packet-dcerpc-dssetup.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-dssetup.h b/epan/dissectors/packet-dcerpc-dssetup.h index 9606d1228a..e3ee569f1e 100644 --- a/epan/dissectors/packet-dcerpc-dssetup.h +++ b/epan/dissectors/packet-dcerpc-dssetup.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #include "packet-dcerpc-misc.h" diff --git a/epan/dissectors/packet-dcerpc-efs.c b/epan/dissectors/packet-dcerpc-efs.c index f01b00ebb4..c6e12d28bd 100644 --- a/epan/dissectors/packet-dcerpc-efs.c +++ b/epan/dissectors/packet-dcerpc-efs.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-efs.h b/epan/dissectors/packet-dcerpc-efs.h index 7338a75c82..0ebad9499e 100644 --- a/epan/dissectors/packet-dcerpc-efs.h +++ b/epan/dissectors/packet-dcerpc-efs.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #ifndef __PACKET_DCERPC_EFS_H diff --git a/epan/dissectors/packet-dcerpc-eventlog.c b/epan/dissectors/packet-dcerpc-eventlog.c index cb39f57015..8342ae7874 100644 --- a/epan/dissectors/packet-dcerpc-eventlog.c +++ b/epan/dissectors/packet-dcerpc-eventlog.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-eventlog.h b/epan/dissectors/packet-dcerpc-eventlog.h index b129a6b853..5f1e7e0a8b 100644 --- a/epan/dissectors/packet-dcerpc-eventlog.h +++ b/epan/dissectors/packet-dcerpc-eventlog.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #ifndef __PACKET_DCERPC_EVENTLOG_H diff --git a/epan/dissectors/packet-dcerpc-frsrpc.c b/epan/dissectors/packet-dcerpc-frsrpc.c index 967a060d91..5d506f487b 100644 --- a/epan/dissectors/packet-dcerpc-frsrpc.c +++ b/epan/dissectors/packet-dcerpc-frsrpc.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-frsrpc.h b/epan/dissectors/packet-dcerpc-frsrpc.h index 7e8cd4e9f5..c12148de66 100644 --- a/epan/dissectors/packet-dcerpc-frsrpc.h +++ b/epan/dissectors/packet-dcerpc-frsrpc.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #include "packet-dcerpc-misc.h" diff --git a/epan/dissectors/packet-dcerpc-frstrans.c b/epan/dissectors/packet-dcerpc-frstrans.c index a4e497ce7c..e31358535c 100644 --- a/epan/dissectors/packet-dcerpc-frstrans.c +++ b/epan/dissectors/packet-dcerpc-frstrans.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-frstrans.h b/epan/dissectors/packet-dcerpc-frstrans.h index 1896e9322e..4ad64198a3 100644 --- a/epan/dissectors/packet-dcerpc-frstrans.h +++ b/epan/dissectors/packet-dcerpc-frstrans.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #ifndef __PACKET_DCERPC_FRSTRANS_H diff --git a/epan/dissectors/packet-dcerpc-fsrvp.c b/epan/dissectors/packet-dcerpc-fsrvp.c index 855c1de5fa..decb2160a7 100644 --- a/epan/dissectors/packet-dcerpc-fsrvp.c +++ b/epan/dissectors/packet-dcerpc-fsrvp.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-fsrvp.h b/epan/dissectors/packet-dcerpc-fsrvp.h index 6f4d281510..a1ccfad1f5 100644 --- a/epan/dissectors/packet-dcerpc-fsrvp.h +++ b/epan/dissectors/packet-dcerpc-fsrvp.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #ifndef __PACKET_DCERPC_FSRVP_H diff --git a/epan/dissectors/packet-dcerpc-initshutdown.c b/epan/dissectors/packet-dcerpc-initshutdown.c index 21ac2e9881..3478a7b51b 100644 --- a/epan/dissectors/packet-dcerpc-initshutdown.c +++ b/epan/dissectors/packet-dcerpc-initshutdown.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-initshutdown.h b/epan/dissectors/packet-dcerpc-initshutdown.h index e2adb25be0..e66e493bd2 100644 --- a/epan/dissectors/packet-dcerpc-initshutdown.h +++ b/epan/dissectors/packet-dcerpc-initshutdown.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #include "packet-dcerpc-lsa.h" diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c index d1868f9c98..e631a7307b 100644 --- a/epan/dissectors/packet-dcerpc-lsa.c +++ b/epan/dissectors/packet-dcerpc-lsa.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-lsa.h b/epan/dissectors/packet-dcerpc-lsa.h index d3f4e35f8d..12dc225117 100644 --- a/epan/dissectors/packet-dcerpc-lsa.h +++ b/epan/dissectors/packet-dcerpc-lsa.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #ifndef __PACKET_DCERPC_LSARPC_H diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c index 1f8e818cfc..bb340526b0 100644 --- a/epan/dissectors/packet-dcerpc-mapi.c +++ b/epan/dissectors/packet-dcerpc-mapi.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-mapi.h b/epan/dissectors/packet-dcerpc-mapi.h index 9972746091..643916d2b5 100644 --- a/epan/dissectors/packet-dcerpc-mapi.h +++ b/epan/dissectors/packet-dcerpc-mapi.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #ifndef __PACKET_DCERPC_MAPI_H diff --git a/epan/dissectors/packet-dcerpc-mdssvc.c b/epan/dissectors/packet-dcerpc-mdssvc.c index dd9bad17fa..581f652068 100644 --- a/epan/dissectors/packet-dcerpc-mdssvc.c +++ b/epan/dissectors/packet-dcerpc-mdssvc.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-mdssvc.h b/epan/dissectors/packet-dcerpc-mdssvc.h index ef4f6baf03..a8155367e7 100644 --- a/epan/dissectors/packet-dcerpc-mdssvc.h +++ b/epan/dissectors/packet-dcerpc-mdssvc.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #include "packet-dcerpc-misc.h" diff --git a/epan/dissectors/packet-dcerpc-misc.c b/epan/dissectors/packet-dcerpc-misc.c index b1ab5e5970..2c723b2edb 100644 --- a/epan/dissectors/packet-dcerpc-misc.c +++ b/epan/dissectors/packet-dcerpc-misc.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-misc.h b/epan/dissectors/packet-dcerpc-misc.h index 8cac3eed9b..672621ed32 100644 --- a/epan/dissectors/packet-dcerpc-misc.h +++ b/epan/dissectors/packet-dcerpc-misc.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #ifndef __PACKET_DCERPC_MISC_H diff --git a/epan/dissectors/packet-dcerpc-nspi.c b/epan/dissectors/packet-dcerpc-nspi.c index eebeeb209a..41c0439894 100644 --- a/epan/dissectors/packet-dcerpc-nspi.c +++ b/epan/dissectors/packet-dcerpc-nspi.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-nspi.h b/epan/dissectors/packet-dcerpc-nspi.h index 03c352bbf7..5bd2486202 100644 --- a/epan/dissectors/packet-dcerpc-nspi.h +++ b/epan/dissectors/packet-dcerpc-nspi.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #ifndef __PACKET_DCERPC_NSPI_H diff --git a/epan/dissectors/packet-dcerpc-rfr.c b/epan/dissectors/packet-dcerpc-rfr.c index ce908c475f..6cbd52d80d 100644 --- a/epan/dissectors/packet-dcerpc-rfr.c +++ b/epan/dissectors/packet-dcerpc-rfr.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-rfr.h b/epan/dissectors/packet-dcerpc-rfr.h index 4071fb4bb8..305cafa7a6 100644 --- a/epan/dissectors/packet-dcerpc-rfr.h +++ b/epan/dissectors/packet-dcerpc-rfr.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #ifndef __PACKET_DCERPC_RFR_H diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c index 099b1be893..c257e51300 100644 --- a/epan/dissectors/packet-dcerpc-samr.c +++ b/epan/dissectors/packet-dcerpc-samr.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-samr.h b/epan/dissectors/packet-dcerpc-samr.h index 003f5504bd..b591a1d391 100644 --- a/epan/dissectors/packet-dcerpc-samr.h +++ b/epan/dissectors/packet-dcerpc-samr.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #ifndef __PACKET_DCERPC_SAMR_H diff --git a/epan/dissectors/packet-dcerpc-srvsvc.c b/epan/dissectors/packet-dcerpc-srvsvc.c index 903ac4b799..7f47bdd3b1 100644 --- a/epan/dissectors/packet-dcerpc-srvsvc.c +++ b/epan/dissectors/packet-dcerpc-srvsvc.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-srvsvc.h b/epan/dissectors/packet-dcerpc-srvsvc.h index 855143676a..fb516bc6a0 100644 --- a/epan/dissectors/packet-dcerpc-srvsvc.h +++ b/epan/dissectors/packet-dcerpc-srvsvc.h @@ -7,7 +7,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-winreg.c b/epan/dissectors/packet-dcerpc-winreg.c index a6a3c64671..e313087467 100644 --- a/epan/dissectors/packet-dcerpc-winreg.c +++ b/epan/dissectors/packet-dcerpc-winreg.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-winreg.h b/epan/dissectors/packet-dcerpc-winreg.h index ed7614517b..c47622a4bd 100644 --- a/epan/dissectors/packet-dcerpc-winreg.h +++ b/epan/dissectors/packet-dcerpc-winreg.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #include "packet-dcerpc-misc.h" diff --git a/epan/dissectors/packet-dcerpc-winspool.c b/epan/dissectors/packet-dcerpc-winspool.c index 8b44db8266..53e77065fc 100644 --- a/epan/dissectors/packet-dcerpc-winspool.c +++ b/epan/dissectors/packet-dcerpc-winspool.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-winspool.h b/epan/dissectors/packet-dcerpc-winspool.h index 0d8a8a0847..c1a40966ed 100644 --- a/epan/dissectors/packet-dcerpc-winspool.h +++ b/epan/dissectors/packet-dcerpc-winspool.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #include "packet-dcerpc-misc.h" diff --git a/epan/dissectors/packet-dcerpc-witness.c b/epan/dissectors/packet-dcerpc-witness.c index 821ec951c1..e7a1275f7d 100644 --- a/epan/dissectors/packet-dcerpc-witness.c +++ b/epan/dissectors/packet-dcerpc-witness.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-witness.h b/epan/dissectors/packet-dcerpc-witness.h index eadbda7aca..37dd54858e 100644 --- a/epan/dissectors/packet-dcerpc-witness.h +++ b/epan/dissectors/packet-dcerpc-witness.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #include "packet-dcerpc-misc.h" diff --git a/epan/dissectors/packet-dcerpc-wkssvc.c b/epan/dissectors/packet-dcerpc-wkssvc.c index 0b248cfe62..8221ee1503 100644 --- a/epan/dissectors/packet-dcerpc-wkssvc.c +++ b/epan/dissectors/packet-dcerpc-wkssvc.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-wkssvc.h b/epan/dissectors/packet-dcerpc-wkssvc.h index c10801b61d..da85a2ad88 100644 --- a/epan/dissectors/packet-dcerpc-wkssvc.h +++ b/epan/dissectors/packet-dcerpc-wkssvc.h @@ -7,7 +7,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-wzcsvc.c b/epan/dissectors/packet-dcerpc-wzcsvc.c index 8c2df1c23c..85e0a149f5 100644 --- a/epan/dissectors/packet-dcerpc-wzcsvc.c +++ b/epan/dissectors/packet-dcerpc-wzcsvc.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-wzcsvc.h b/epan/dissectors/packet-dcerpc-wzcsvc.h index 634cdc55e3..e6be08f58f 100644 --- a/epan/dissectors/packet-dcerpc-wzcsvc.h +++ b/epan/dissectors/packet-dcerpc-wzcsvc.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ #ifndef __PACKET_DCERPC_WZCSVC_H diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 83a5d0336f..4536d7c007 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -11,7 +11,7 @@ /* This dissector supports DVB-CI as defined in EN50221 and * CI+ (www.ci-plus.com). - * For more details, see https://wiki.wireshark.org/DVB-CI. + * For more details, see https://gitlab.com/wireshark/wireshark/-/wikis/DVB-CI. * * The pcap input format for this dissector is documented at * http://www.kaiser.cx/pcap-dvbci.html. diff --git a/epan/dissectors/packet-mac-lte.h b/epan/dissectors/packet-mac-lte.h index 2b6e7576a0..eadbce2ffd 100644 --- a/epan/dissectors/packet-mac-lte.h +++ b/epan/dissectors/packet-mac-lte.h @@ -216,19 +216,19 @@ typedef struct mac_lte_tap_info { /* Accessor function to check if a frame was considered to be ReTx */ int is_mac_lte_frame_retx(packet_info *pinfo, guint8 direction); -/*****************************************************************/ -/* UDP framing format */ -/* ----------------------- */ -/* Several people have asked about dissecting MAC by framing */ -/* PDUs over IP. A suggested format over UDP has been created */ -/* and implemented by this dissector, using the definitions */ -/* below. A link to an example program showing you how to encode */ -/* these headers and send LTE MAC PDUs on a UDP socket is */ -/* provided at https://wiki.wireshark.org/MAC-LTE */ -/* */ -/* A heuristic dissector (enabled by a preference) will */ -/* recognise a signature at the beginning of these frames. */ -/*****************************************************************/ +/**********************************************************************/ +/* UDP framing format */ +/* ----------------------- */ +/* Several people have asked about dissecting MAC by framing */ +/* PDUs over IP. A suggested format over UDP has been created */ +/* and implemented by this dissector, using the definitions */ +/* below. A link to an example program showing you how to encode */ +/* these headers and send LTE MAC PDUs on a UDP socket is */ +/* provided at https://gitlab.com/wireshark/wireshark/-/wikis/MAC-LTE */ +/* */ +/* A heuristic dissector (enabled by a preference) will */ +/* recognise a signature at the beginning of these frames. */ +/**********************************************************************/ /* Signature. Rather than try to define a port for this, or make the diff --git a/epan/dissectors/packet-pdcp-lte.h b/epan/dissectors/packet-pdcp-lte.h index 0d00383008..2d43cdadf3 100644 --- a/epan/dissectors/packet-pdcp-lte.h +++ b/epan/dissectors/packet-pdcp-lte.h @@ -88,21 +88,21 @@ typedef struct pdcp_lte_info -/*****************************************************************/ -/* UDP framing format */ -/* ----------------------- */ -/* Several people have asked about dissecting PDCP by framing */ -/* PDUs over IP. A suggested format over UDP has been defined */ -/* and implemented by this dissector, using the definitions */ -/* below. A link to an example program showing you how to encode */ -/* these headers and send LTE PDCP PDUs on a UDP socket is */ -/* provided at https://wiki.wireshark.org/PDCP-LTE */ -/* */ -/* A heuristic dissecter (enabled by a preference) will */ -/* recognise a signature at the beginning of these frames. */ -/* Until someone is using this format, suggestions for changes */ -/* are welcome. */ -/*****************************************************************/ +/***********************************************************************/ +/* UDP framing format */ +/* ----------------------- */ +/* Several people have asked about dissecting PDCP by framing */ +/* PDUs over IP. A suggested format over UDP has been defined */ +/* and implemented by this dissector, using the definitions */ +/* below. A link to an example program showing you how to encode */ +/* these headers and send LTE PDCP PDUs on a UDP socket is */ +/* provided at https://gitlab.com/wireshark/wireshark/-/wikis/PDCP-LTE */ +/* */ +/* A heuristic dissecter (enabled by a preference) will */ +/* recognise a signature at the beginning of these frames. */ +/* Until someone is using this format, suggestions for changes */ +/* are welcome. */ +/***********************************************************************/ /* Signature. Rather than try to define a port for this, or make the diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 0a8ebd0c5f..a38790e7fe 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -6014,7 +6014,7 @@ dissect_ppp_raw_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* * matching first before calling dissect_ppp_raw_hdlc(). Otherwise, if we call * it directly for USB captures, some captures like the following will not be * dissected correctly: - * https://wiki.wireshark.org/SampleCaptures#head-886e340c31ca977f321c921f81cbec4c21bb7738 + * https://gitlab.com/wireshark/wireshark/-/wikis/SampleCaptures#head-886e340c31ca977f321c921f81cbec4c21bb7738 */ static gboolean dissect_ppp_usb( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ ) diff --git a/epan/dissectors/packet-rlc-lte.h b/epan/dissectors/packet-rlc-lte.h index 0d81b45c8c..22b0350cef 100644 --- a/epan/dissectors/packet-rlc-lte.h +++ b/epan/dissectors/packet-rlc-lte.h @@ -93,21 +93,21 @@ void set_rlc_lte_drb_pdcp_seqnum_length(packet_info *pinfo, guint16 ueid, guint8 /* Configure LI field for AM DRB channels. */ void set_rlc_lte_drb_li_field(packet_info *pinfo, guint16 ueid, guint8 drbid, gboolean ul_ext_li_field, gboolean dl_ext_li_field); -/*****************************************************************/ -/* UDP framing format */ -/* ----------------------- */ -/* Several people have asked about dissecting RLC by framing */ -/* PDUs over IP. A suggested format over UDP has been defined */ -/* and implemented by this dissector, using the definitions */ -/* below. A link to an example program showing you how to encode */ -/* these headers and send LTE RLC PDUs on a UDP socket is */ -/* provided at https://wiki.wireshark.org/RLC-LTE */ -/* */ -/* A heuristic dissector (enabled by a preference) will */ -/* recognise a signature at the beginning of these frames. */ -/* Until someone is using this format, suggestions for changes */ -/* are welcome. */ -/*****************************************************************/ +/**********************************************************************/ +/* UDP framing format */ +/* ----------------------- */ +/* Several people have asked about dissecting RLC by framing */ +/* PDUs over IP. A suggested format over UDP has been defined */ +/* and implemented by this dissector, using the definitions */ +/* below. A link to an example program showing you how to encode */ +/* these headers and send LTE RLC PDUs on a UDP socket is */ +/* provided at https://gitlab.com/wireshark/wireshark/-/wikis/RLC-LTE */ +/* */ +/* A heuristic dissector (enabled by a preference) will */ +/* recognise a signature at the beginning of these frames. */ +/* Until someone is using this format, suggestions for changes */ +/* are welcome. */ +/**********************************************************************/ /* Signature. Rather than try to define a port for this, or make the diff --git a/epan/dissectors/packet-skype.c b/epan/dissectors/packet-skype.c index 3dc0b21dde..97cbdce7f4 100644 --- a/epan/dissectors/packet-skype.c +++ b/epan/dissectors/packet-skype.c @@ -13,7 +13,8 @@ /* * Documentation that formed the basis of the packet decoding: * https://github.com/matthiasbock/OpenSkype/wiki/Skype's-UDP-Format - * For additional information see: https://wiki.wireshark.org/Skype + * For additional information see: + * https://gitlab.com/wireshark/wireshark/-/wikis/Skype * * TODO: * - Authentication @@ -22,7 +23,8 @@ * - Decryption (with given keys) * - Test CRC check (requires working decryption) * - Heuristics to reliably detect Skype traffic - most likely impossible - * to implement in Wireshark (see http://en.wikipedia.org/wiki/Skype) + * to implement in Wireshark (see + * https://gitlab.com/wireshark/wireshark/-/wikis/Skype) * - Improve tests */ diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 31ca2a7968..db02253aa2 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -6,7 +6,7 @@ * * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-smb2/ * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-fscc/ - * https://wiki.wireshark.org/SMB2 + * https://gitlab.com/wireshark/wireshark/-/wikis/SMB2 * * If you edit this file, keep the wiki updated as well. * diff --git a/epan/dissectors/packet-sml.c b/epan/dissectors/packet-sml.c index 9045a42dfa..821c1c4bf9 100644 --- a/epan/dissectors/packet-sml.c +++ b/epan/dissectors/packet-sml.c @@ -14,7 +14,8 @@ SML dissector is based on v1.03 (12.11.2008) specifications of "smart message la Link to specifications: http://www.vde.com/de/fnn/arbeitsgebiete/messwesen/Sym2/infomaterial/seiten/sml-spezifikation.aspx -Short description of the SML protocol on the SML Wireshark Wiki page: https://wiki.wireshark.org/SML +Short description of the SML protocol on the SML Wireshark Wiki page: + https://gitlab.com/wireshark/wireshark/-/wikis/SML */ #include "config.h" diff --git a/epan/dissectors/packet-umts_rlc.h b/epan/dissectors/packet-umts_rlc.h index 13752349ab..848363a6c7 100644 --- a/epan/dissectors/packet-umts_rlc.h +++ b/epan/dissectors/packet-umts_rlc.h @@ -56,7 +56,7 @@ void rlc_reset_channel(enum rlc_mode mode, guint8 rbid, guint8 dir, guint32 ueid /* and implemented by this dissector, using the definitions */ /* below. A link to an example program showing you how to encode */ /* these headers and send RLC PDUs on a UDP socket is provided */ -/* at https://wiki.wireshark.org/RLC */ +/* at https://gitlab.com/wireshark/wireshark/-/wikis/RLC */ /* */ /* A heuristic dissecter (enabled by a preference) will */ /* recognise a signature at the beginning of these frames. */ diff --git a/epan/expert.h b/epan/expert.h index 9a78f1df7c..019606ab7f 100644 --- a/epan/expert.h +++ b/epan/expert.h @@ -1,7 +1,8 @@ /* expert.h * Collecting of Expert information. * - * For further info, see: https://wiki.wireshark.org/Development/ExpertInfo + * For further info, see: + * https://gitlab.com/wireshark/wireshark/-/wikis/Development/ExpertInfo * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/epan/proto.h b/epan/proto.h index a4c59e148c..655a1e938f 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -904,7 +904,10 @@ typedef proto_node proto_item; /** The protocol field has been deprecated, usually PI_NOTE severity */ #define PI_DEPRECATED 0x0e000000 -/* add more, see https://wiki.wireshark.org/Development/ExpertInfo */ +/* + * add more, see + * https://gitlab.com/wireshark/wireshark/-/wikis/Development/ExpertInfo + */ /** Retrieve the field_info from a proto_node */ #define PNODE_FINFO(proto_node) ((proto_node)->finfo) diff --git a/epan/wslua/wslua_gui.c b/epan/wslua/wslua_gui.c index 17d72070c2..c5a0fc8f49 100644 --- a/epan/wslua/wslua_gui.c +++ b/epan/wslua/wslua_gui.c @@ -874,7 +874,7 @@ WSLUA_FUNCTION wslua_copy_to_clipboard(lua_State* L) { /* Copy a string into the WSLUA_FUNCTION wslua_open_capture_file(lua_State* L) { /* Open and display a capture file. Requires a GUI. */ #define WSLUA_ARG_open_capture_file_FILENAME 1 /* The name of the file to be opened. */ -#define WSLUA_ARG_open_capture_file_FILTER 2 /* The https://wiki.wireshark.org/DisplayFilters[display filter] to be applied once the file is opened. */ +#define WSLUA_ARG_open_capture_file_FILTER 2 /* The https://gitlab.com/wireshark/wireshark/-/wikis/DisplayFilters[display filter] to be applied once the file is opened. */ const char* fname = luaL_checkstring(L,WSLUA_ARG_open_capture_file_FILENAME); const char* filter = luaL_optstring(L,WSLUA_ARG_open_capture_file_FILTER,NULL); @@ -930,7 +930,7 @@ WSLUA_FUNCTION wslua_set_filter(lua_State* L) { /* Set the main filter text. */ } WSLUA_FUNCTION wslua_get_color_filter_slot(lua_State* L) { /* - Gets the current https://wiki.wireshark.org/ColoringRules[packet coloring rule] (by index) for the + Gets the current https://gitlab.com/wireshark/wireshark/-/wikis/ColoringRules[packet coloring rule] (by index) for the current session. Wireshark reserves 10 slots for these coloring rules. Requires a GUI. */ #define WSLUA_ARG_get_color_filter_slot_ROW 1 /* @@ -972,7 +972,7 @@ WSLUA_FUNCTION wslua_get_color_filter_slot(lua_State* L) { /* } WSLUA_FUNCTION wslua_set_color_filter_slot(lua_State* L) { /* - Sets a https://wiki.wireshark.org/ColoringRules[packet coloring rule] (by index) for the current session. + Sets a https://gitlab.com/wireshark/wireshark/-/wikis/ColoringRules[packet coloring rule] (by index) for the current session. Wireshark reserves 10 slots for these coloring rules. Requires a GUI. */ @@ -1007,7 +1007,7 @@ WSLUA_FUNCTION wslua_set_color_filter_slot(lua_State* L) { /* wireshark -o gui.colorized_frame.bg:ffc0c0,ffc0ff,e0c0e0,c0c0ff,c0e0e0,c0ffff,c0ffc0,ffffc0,e0e0c0,e0e0e0 -o gui.colorized_frame.fg:000000,000000,000000,000000,000000,000000,000000,000000 ---- */ -#define WSLUA_ARG_set_color_filter_slot_TEXT 2 /* The https://wiki.wireshark.org/DisplayFilters[display filter] for selecting packets to be colorized +#define WSLUA_ARG_set_color_filter_slot_TEXT 2 /* The https://gitlab.com/wireshark/wireshark/-/wikis/DisplayFilters[display filter] for selecting packets to be colorized . */ guint8 row = (guint8)luaL_checkinteger(L,WSLUA_ARG_set_color_filter_slot_ROW); const gchar* filter_str = luaL_checkstring(L,WSLUA_ARG_set_color_filter_slot_TEXT); @@ -52,6 +52,7 @@ #include "ui/simple_dialog.h" #include "ui/main_statusbar.h" #include "ui/progress_dlg.h" +#include "ui/urls.h" #include "ui/ws_ui_util.h" /* Needed for addrinfo */ @@ -634,7 +635,7 @@ cf_read(capture_file *cf, gboolean reloading) CATCH(OutOfMemoryError) { simple_message_box(ESD_TYPE_ERROR, NULL, "More information and workarounds can be found at\n" - "https://wiki.wireshark.org/KnownBugs/OutOfMemory", + WS_WIKI_URL("KnownBugs/OutOfMemory"), "Sorry, but Wireshark has run out of memory and has to terminate now."); #if 0 /* Could we close the current capture and free up memory from that? */ @@ -812,7 +813,7 @@ cf_continue_tail(capture_file *cf, volatile int to_read, wtap_rec *rec, CATCH(OutOfMemoryError) { simple_message_box(ESD_TYPE_ERROR, NULL, "More information and workarounds can be found at\n" - "https://wiki.wireshark.org/KnownBugs/OutOfMemory", + WS_WIKI_URL("KnownBugs/OutOfMemory"), "Sorry, but Wireshark has run out of memory and has to terminate now."); #if 0 /* Could we close the current capture and free up memory from that? */ diff --git a/packaging/nsis/NpcapPage.ini b/packaging/nsis/NpcapPage.ini index ce7f2ab5c1..78d09fd45c 100644 --- a/packaging/nsis/NpcapPage.ini +++ b/packaging/nsis/NpcapPage.ini @@ -58,4 +58,4 @@ Right=290 Top=127 Bottom=135 Text=Learn more about Npcap and WinPcap -State=https://wiki.wireshark.org/WinPcap +State=https://gitlab.com/wireshark/wireshark/-/wikis/WinPcap diff --git a/pdml2html.xsl b/pdml2html.xsl index 8bac7f1aee..37f70e213c 100644 --- a/pdml2html.xsl +++ b/pdml2html.xsl @@ -2,7 +2,8 @@ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <!-- This XSLT will convert a PDML file, saved by Wireshark, into HTML. The HTML page should look similar to Wireshark. See - https://wiki.wireshark.org/PDML how to generate such a HTML file from PDML. + https://gitlab.com/wireshark/wireshark/-/wikis/PDML for information + on how to generate such a HTML file from PDML. For questions contact Dirk Jagdmann (doj@cubic.org). Version: 2010-06-09 diff --git a/test/lua/acme_file.lua b/test/lua/acme_file.lua index 2595d53fe4..66d12d6c6d 100644 --- a/test/lua/acme_file.lua +++ b/test/lua/acme_file.lua @@ -31,10 +31,9 @@ To-do: - make it use Struct.tohex/fromhex now that we have the Struct library in Wireshark - - make it use a linux cooked-mode pseudo-header (see https://wiki.wireshark.org/SLL) + - make it use a linux cooked-mode pseudo-header (see https://gitlab.com/wireshark/wireshark/-/wikis/SLL) - make it use preferences, once I write C-code for Wireshark to do that :) - - rewrite some of the pattern searches to use real regex/PCRE instead? It's not in Wireshark yet, - but it's coming (see https://code.wireshark.org/review/#/c/332/) + - rewrite some of the pattern searches to use real regex/PCRE instead? Example SIP over UDP message: Aug 26 19:25:10.685 On [5:0]2.1.1.1:5060 received from 2.1.2.115:5060 diff --git a/test/suite_decryption.py b/test/suite_decryption.py index 9768d0b64c..a366620adb 100644 --- a/test/suite_decryption.py +++ b/test/suite_decryption.py @@ -25,7 +25,7 @@ import fixtures class case_decrypt_80211(subprocesstest.SubprocessTestCase): def test_80211_wpa_psk(self, cmd_tshark, capture_file): '''IEEE 802.11 WPA PSK''' - # https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=view&target=wpa-Induction.pcap + # https://gitlab.com/wireshark/wireshark/-/wikis/SampleCaptures?action=AttachFile&do=view&target=wpa-Induction.pcap self.assertRun((cmd_tshark, '-o', 'wlan.enable_decryption: TRUE', '-Tfields', @@ -289,7 +289,7 @@ class case_decrypt_dtls(subprocesstest.SubprocessTestCase): '''DTLS''' if not features.have_gnutls: self.skipTest('Requires GnuTLS.') - # https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=view&target=snakeoil.tgz + # https://gitlab.com/wireshark/wireshark/-/wikis/SampleCaptures?action=AttachFile&do=view&target=snakeoil.tgz self.assertRun((cmd_tshark, '-r', capture_file('snakeoil-dtls.pcap'), '-Tfields', @@ -339,7 +339,7 @@ class case_decrypt_tls(subprocesstest.SubprocessTestCase): '''TLS using the server's private RSA key.''' if not features.have_gnutls: self.skipTest('Requires GnuTLS.') - # https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=view&target=snakeoil2_070531.tgz + # https://gitlab.com/wireshark/wireshark/-/wikis/SampleCaptures?action=AttachFile&do=view&target=snakeoil2_070531.tgz self.assertRun((cmd_tshark, '-r', capture_file('rsasnakeoil2.pcap'), '-Tfields', @@ -953,7 +953,7 @@ main(int argc, char *argv[]) "Sorry, but TFShark has to terminate now.\n" "\n" "Some infos / workarounds can be found at:\n" - "https://wiki.wireshark.org/KnownBugs/OutOfMemory\n"); + WS_WIKI_URL("KnownBugs/OutOfMemory") "\n"); success = FALSE; } ENDTRY; diff --git a/tools/macos-setup.sh b/tools/macos-setup.sh index 66ad0e22fa..3b3486b06e 100755 --- a/tools/macos-setup.sh +++ b/tools/macos-setup.sh @@ -2933,7 +2933,7 @@ else fi echo echo "Make sure you are allowed capture access to the network devices" -echo "See: https://wiki.wireshark.org/CaptureSetup/CapturePrivileges" +echo "See: https://gitlab.com/wireshark/wireshark/-/wikis/CaptureSetup/CapturePrivileges" echo exit 0 diff --git a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm index 4307b812eb..973fd5a455 100644 --- a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm +++ b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm @@ -1155,7 +1155,7 @@ sub Parse($$$$$) Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at https://wiki.wireshark.org/Pidl + found at https://gitlab.com/wireshark/wireshark/-/wikis/Pidl */ "; diff --git a/tools/pidl/pidl b/tools/pidl/pidl index 7883414478..e8e6941fb3 100755 --- a/tools/pidl/pidl +++ b/tools/pidl/pidl @@ -382,7 +382,7 @@ usesgetlasterror, vararg, vi_progid, wire_marshal. =head1 SEE ALSO L<https://msdn.microsoft.com/en-us/library/windows/desktop/aa373864%28v=vs.85%29.aspx> -L<https://wiki.wireshark.org/DCE/RPC>, +L<https://gitlab.com/wireshark/wireshark/-/wikis/DCE/RPC>, L<https://www.samba.org/>, L<yapp(1)> @@ -43,6 +43,7 @@ #include <ui/clopts_common.h> #include <ui/cmdarg_err.h> +#include <ui/urls.h> #include <wsutil/filesystem.h> #include <wsutil/file_util.h> #include <wsutil/socket.h> @@ -2064,7 +2065,7 @@ main(int argc, char *argv[]) "Sorry, but TShark has to terminate now.\n" "\n" "More information and workarounds can be found at\n" - "https://wiki.wireshark.org/KnownBugs/OutOfMemory\n"); + WS_WIKI_URL("KnownBugs/OutOfMemory") "\n"); status = PROCESS_FILE_ERROR; } ENDTRY; @@ -2573,7 +2574,7 @@ capture(void) "Sorry, but TShark has to terminate now.\n" "\n" "More information and workarounds can be found at\n" - "https://wiki.wireshark.org/KnownBugs/OutOfMemory\n"); + WS_WIKI_URL("KnownBugs/OutOfMemory") "\n"); abort(); } ENDTRY; diff --git a/ui/capture.c b/ui/capture.c index 5d89ad1ec4..0113c68298 100644 --- a/ui/capture.c +++ b/ui/capture.c @@ -27,6 +27,7 @@ #include "ui/capture_info.h" #include "ui/capture_ui_utils.h" #include "ui/util.h" +#include "ui/urls.h" #include "caputils/capture-pcap-util.h" #include <epan/prefs.h> @@ -258,6 +259,8 @@ capture_input_read_all(capture_session *cap_session, gboolean is_tempfile, return FALSE; } +#define BITEME "https://gitlab.com/wireshark/wireshark/-/wikis" + /* if we didn't capture even a single packet, close the file again */ if(cap_session->count == 0 && !capture_opts->restart) { simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK, @@ -268,7 +271,7 @@ capture_input_read_all(capture_session *cap_session, gboolean is_tempfile, "\n" "Help about capturing can be found at\n" "\n" - " https://wiki.wireshark.org/CaptureSetup" + " " WS_WIKI_URL("CaptureSetup") #ifdef _WIN32 "\n\n" "Wireless (Wi-Fi/WLAN):\n" @@ -731,7 +734,7 @@ capture_input_closed(capture_session *cap_session, gchar *msg) "\n" "Help about capturing can be found at\n" "\n" - " https://wiki.wireshark.org/CaptureSetup" + " " WS_WIKI_URL("CaptureSetup") #ifdef _WIN32 "\n\n" "Wireless (Wi-Fi/WLAN):\n" diff --git a/ui/help_url.c b/ui/help_url.c index 37699748c1..1f0da61404 100644 --- a/ui/help_url.c +++ b/ui/help_url.c @@ -16,6 +16,7 @@ #include <glib.h> #include "help_url.h" +#include "urls.h" #include "wsutil/filesystem.h" #ifdef HHC_DIR @@ -28,54 +29,6 @@ // - Automatically generate part or all of this, e.g. by parsing // the DocBook XML or the chunked HTML. -const char * -topic_online_url(topic_action_e action) -{ - switch(action) { - case(ONLINEPAGE_HOME): - return "https://www.wireshark.org"; - break; - case(ONLINEPAGE_WIKI): - return "https://wiki.wireshark.org"; - break; - case(ONLINEPAGE_DOWNLOAD): - return "https://www.wireshark.org/download.html"; - break; - case(ONLINEPAGE_DOCS): - return "https://www.wireshark.org/docs/"; - break; - case(ONLINEPAGE_USERGUIDE): - return "https://www.wireshark.org/docs/wsug_html_chunked/"; - break; - case(ONLINEPAGE_FAQ): - return "https://www.wireshark.org/faq.html"; - break; - case(ONLINEPAGE_ASK): - return "https://ask.wireshark.org"; - break; - case(ONLINEPAGE_SAMPLE_FILES): - return "https://wiki.wireshark.org/SampleCaptures"; - break; - case(ONLINEPAGE_CAPTURE_SETUP): - return "https://wiki.wireshark.org/CaptureSetup"; - break; - case(ONLINEPAGE_NETWORK_MEDIA): - return "https://wiki.wireshark.org/CaptureSetup/NetworkMedia"; - break; - case(ONLINEPAGE_SAMPLE_CAPTURES): - return "https://wiki.wireshark.org/SampleCaptures"; - break; - case(ONLINEPAGE_SECURITY): - return "https://wiki.wireshark.org/Security"; - break; - case(ONLINEPAGE_CHIMNEY): - return "https://wiki.wireshark.org/CaptureSetup/Offloading#chimney"; - break; - default: - return NULL; - } -} - /* * Open the help dialog and show a specific HTML help page. */ @@ -111,7 +64,7 @@ user_guide_url(const gchar *page) { } else { #endif /* ifdef DOC_DIR */ /* try to open the HTML page from wireshark.org instead */ - g_string_printf(url, "https://www.wireshark.org/docs/wsug_html_chunked/%s", page); + g_string_printf(url, WS_DOCS_URL "/wsug_html_chunked/%s", page); #ifdef DOC_DIR } #endif /* ifdef DOC_DIR */ @@ -125,13 +78,48 @@ topic_action_url(topic_action_e action) { gchar *url; + switch(action) { /* pages online at www.wireshark.org */ - url = g_strdup(topic_online_url(action)); - if(url != NULL) { - return url; - } + case(ONLINEPAGE_HOME): + return WS_HOME_PAGE_URL; + break; + case(ONLINEPAGE_WIKI): + return WS_WIKI_HOME_URL; + break; + case(ONLINEPAGE_DOWNLOAD): + return WS_DOWNLOAD_URL; + break; + case(ONLINEPAGE_DOCS): + return WS_DOCS_URL; + break; + case(ONLINEPAGE_USERGUIDE): + return WS_DOCS_URL "/wsug_html_chunked/"; + break; + case(ONLINEPAGE_FAQ): + return WS_FAQ_URL; + break; + case(ONLINEPAGE_ASK): + return WS_Q_AND_A_URL; + break; + case(ONLINEPAGE_SAMPLE_FILES): + return WS_WIKI_URL("SampleCaptures"); + break; + case(ONLINEPAGE_CAPTURE_SETUP): + return WS_WIKI_URL("CaptureSetup"); + break; + case(ONLINEPAGE_NETWORK_MEDIA): + return WS_WIKI_URL("CaptureSetup/NetworkMedia"); + break; + case(ONLINEPAGE_SAMPLE_CAPTURES): + return WS_WIKI_URL("SampleCaptures"); + break; + case(ONLINEPAGE_SECURITY): + return WS_WIKI_URL("Security"); + break; + case(ONLINEPAGE_CHIMNEY): + return WS_WIKI_URL("CaptureSetup/Offloading#chimney"); + break; - switch(action) { /* local manual pages */ case(LOCALPAGE_MAN_WIRESHARK): url = data_file_url("wireshark.html"); diff --git a/ui/help_url.h b/ui/help_url.h index c6dab1789f..ab8248534a 100644 --- a/ui/help_url.h +++ b/ui/help_url.h @@ -109,13 +109,6 @@ typedef enum { HELP_TELEPHONY_RTP_PLAYER_DIALOG } topic_action_e; -/** Given a topic action return its online (www.wireshark.org) URL or NULL. - * - * @param action Topic action, e.g. ONLINEPAGE_HOME or ONLINEPAGE_ASK. - * @return A static URL or NULL. MUST NOT be freed. - */ -const char *topic_online_url(topic_action_e action); - /** Given a page in the Wireshark User's Guide return its URL. On Windows * an attempt will be made to open User Guide URLs with HTML Help. If * the attempt succeeds NULL will be returned. diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 489c1d3ccf..c6bd5a129c 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -30,6 +30,7 @@ #include <ui/clopts_common.h> #include <ui/cmdarg_err.h> +#include <ui/urls.h> #include <wsutil/filesystem.h> #include <wsutil/privileges.h> #include <wsutil/socket.h> @@ -336,7 +337,7 @@ check_and_warn_user_startup() "This could be dangerous.\n\n" "If you're running Wireshark this way in order to perform live capture, " "you may want to be aware that there is a better way documented at\n" - "https://wiki.wireshark.org/CaptureSetup/CapturePrivileges", cur_user, cur_group); + WS_WIKI_URL("CaptureSetup/CapturePrivileges"), cur_user, cur_group); g_free(cur_user); g_free(cur_group); } diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index db9be1db94..716674ed25 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -37,6 +37,8 @@ DIAG_ON(frame-larger-than=) #include "ui/commandline.h" +#include "ui/urls.h" + #include "epan/color_filters.h" #include "epan/export_object.h" @@ -3917,7 +3919,7 @@ void MainWindow::on_actionContextWikiProtocolPage_triggered() if (ret != QMessageBox::Yes) return; - QUrl wiki_url = QString("https://wiki.wireshark.org/Protocols/%1").arg(proto_abbrev); + QUrl wiki_url = QString(WS_WIKI_HOME_URL "/" "/Protocols/%1").arg(proto_abbrev); QDesktopServices::openUrl(wiki_url); } @@ -3932,7 +3934,7 @@ void MainWindow::on_actionContextFilterFieldReference_triggered() const QString proto_abbrev = proto_registrar_get_abbrev(field_id); - QUrl dfref_url = QString("https://www.wireshark.org/docs/dfref/%1/%2") + QUrl dfref_url = QString(WS_DOCS_URL "/dfref/%1/%2") .arg(proto_abbrev[0]) .arg(proto_abbrev); QDesktopServices::openUrl(dfref_url); diff --git a/ui/qt/proto_tree.cpp b/ui/qt/proto_tree.cpp index 1864cd83e9..95add43eb2 100644 --- a/ui/qt/proto_tree.cpp +++ b/ui/qt/proto_tree.cpp @@ -27,6 +27,7 @@ #include <ui/qt/filter_action.h> #include <ui/all_files_wildcard.h> #include <ui/alert_box.h> +#include <ui/urls.h> #include "wireshark_application.h" #include <QApplication> @@ -216,11 +217,11 @@ void ProtoTree::ctxOpenUrlWiki() if (ret != QMessageBox::Yes) return; - url = QString("https://wiki.wireshark.org/Protocols/%1").arg(proto_abbrev); + url = QString(WS_WIKI_HOME_URL "/Protocols/%1").arg(proto_abbrev); } else { - url = QString("https://www.wireshark.org/docs/dfref/%1/%2") + url = QString(WS_DOCS_URL "/dfref/%1/%2") .arg(proto_abbrev[0]) .arg(proto_abbrev); } diff --git a/ui/qt/welcome_page.cpp b/ui/qt/welcome_page.cpp index 7a49984cd1..8db18899b2 100644 --- a/ui/qt/welcome_page.cpp +++ b/ui/qt/welcome_page.cpp @@ -14,7 +14,7 @@ #include <epan/prefs.h> #include "ui/capture_globals.h" -#include "ui/help_url.h" +#include "ui/urls.h" #include "version_info.h" @@ -416,7 +416,7 @@ void WelcomePage::on_captureLabel_clicked() void WelcomePage::on_helpLabel_clicked() { - QDesktopServices::openUrl(QUrl(topic_online_url(ONLINEPAGE_DOCS))); + QDesktopServices::openUrl(QUrl(WS_DOCS_URL)); } void WelcomePage::updateStyleSheets() diff --git a/ui/qt/welcome_page.ui b/ui/qt/welcome_page.ui index 366efb39be..86d36cc532 100644 --- a/ui/qt/welcome_page.ui +++ b/ui/qt/welcome_page.ui @@ -270,7 +270,7 @@ a:hover { <td style="padding-left: 8px; padding-right: 8px;">·</td> -<th><a href="https://wiki.wireshark.org/">Wiki</a></th> +<th><a href="https://gitlab.com/wireshark/wireshark/-/wikis/">Wiki</a></th> <td style="padding-left: 8px; padding-right: 8px;">·</td> diff --git a/ui/urls.h b/ui/urls.h new file mode 100644 index 0000000000..eb2cdbf841 --- /dev/null +++ b/ui/urls.h @@ -0,0 +1,23 @@ +/* urls.h + * + * Define URLs for various Wireshark sites, so that if they move, we only + * have to change the URLs here. + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 2000 Gerald Combs + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#define WS_HOME_PAGE_URL "https://www.wireshark.org"; +#define WS_DOWNLOAD_URL "https://www.wireshark.org/download.html" +#define WS_DOCS_URL "https://www.wireshark.org/docs/" +#define WS_FAQ_URL "https://www.wireshark.org/faq.html" +#define WS_Q_AND_A_URL "https://ask.wireshark.org" +#define WS_WIKI_HOME_URL "https://gitlab.com/wireshark/wireshark/-/wikis" + +/* + * Construct a wiki URL given the path to the wiki page. + */ +#define WS_WIKI_URL(path) WS_WIKI_HOME_URL "/" path diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index efa5e3119a..75399d09fb 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -12,7 +12,7 @@ /* File format specification: * https://github.com/pcapng/pcapng * Related Wiki page: - * https://wiki.wireshark.org/Development/PcapNg + * https://gitlab.com/wireshark/wireshark/-/wikis/Development/PcapNg */ #include "config.h" |