From 194b3b406a691f27ec67a33960264f461eaa3286 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Tue, 15 Sep 2020 14:42:19 -0700 Subject: [PATCH] Update our issue tracker URL in some places. Replace bugs.wireshark.org links with their equivalent gitlab.com/wireshark/wireshark/issues links in the AsciiDoctor buglink macro and the please_report_bug function. Update the bug URLs in comments in the tools and test directories. --- .../wsbuglink-inline-macro/extension.rb | 6 +++--- docbook/attributes.adoc | 2 +- docbook/wsug_src/WSUG_chapter_mate.adoc | 4 ++-- test/suite_decryption.py | 16 ++++++++-------- test/suite_text2pcap.py | 2 +- tools/checkAPIs.pl | 2 +- tools/ws-coding-style.cfg | 6 +++--- wsutil/please_report_bug.c | 10 +++++----- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docbook/asciidoctor-macros/wsbuglink-inline-macro/extension.rb b/docbook/asciidoctor-macros/wsbuglink-inline-macro/extension.rb index 86df251285..b9781d0d56 100644 --- a/docbook/asciidoctor-macros/wsbuglink-inline-macro/extension.rb +++ b/docbook/asciidoctor-macros/wsbuglink-inline-macro/extension.rb @@ -18,9 +18,9 @@ class WSBugLinkInlineMacro < Extensions::InlineMacroProcessor parse_content_as :text name_positional_attributes 'bugtext' - def process(parent, bugnum, attrs) - bugtext = attrs['bugtext'] || %(Bug #{bugnum}) - target = %(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=#{bugnum}) + def process(parent, issueid, attrs) + bugtext = attrs['bugtext'] || %(Bug #{issueid}) + target = %(https://gitlab.com/wireshark/wireshark/-/issues/#{issueid}) create_doc_links(parent, target, bugtext) end end diff --git a/docbook/attributes.adoc b/docbook/attributes.adoc index 9a04c89d24..7d88ca31a9 100644 --- a/docbook/attributes.adoc +++ b/docbook/attributes.adoc @@ -16,7 +16,7 @@ // Wireshark top level URLs (sites) :wireshark-main-url: https://www.wireshark.org/ -:wireshark-bugs-url: https://bugs.wireshark.org/ +:wireshark-bugs-url: https://gitlab.com/wireshark/wireshark/issues :wireshark-code-review-url: https://code.wireshark.org/review :wireshark-qa-url: https://ask.wireshark.org/ :wireshark-wiki-url: https://wiki.wireshark.org/ diff --git a/docbook/wsug_src/WSUG_chapter_mate.adoc b/docbook/wsug_src/WSUG_chapter_mate.adoc index 745b7c06c3..bd826bfbdf 100644 --- a/docbook/wsug_src/WSUG_chapter_mate.adoc +++ b/docbook/wsug_src/WSUG_chapter_mate.adoc @@ -1763,7 +1763,7 @@ merge the result into <>'s AVPL. They may also be used in [NOTE] ==== As of current (2.0.1), Loose Match does not work as described here, see -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12184[Bug 12184]. Only use +https://gitlab.com/wireshark/wireshark/issues/12184[issue 12184]. Only use in Transforms and Criteria is effectively affected by the bug. ==== @@ -1787,7 +1787,7 @@ These may only be used in <> and <>s. [NOTE] ==== As of current (2.0.1), Loose Match does not work as described here, see -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12184[Bug 12184]. +https://gitlab.com/wireshark/wireshark/-/issues/12184[issue 12184]. ==== "Every" Match Examples diff --git a/test/suite_decryption.py b/test/suite_decryption.py index 45c8c99b77..e080de4701 100644 --- a/test/suite_decryption.py +++ b/test/suite_decryption.py @@ -545,7 +545,7 @@ class case_decrypt_tls(subprocesstest.SubprocessTestCase): class case_decrypt_zigbee(subprocesstest.SubprocessTestCase): def test_zigbee(self, cmd_tshark, capture_file): '''ZigBee''' - # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7022 + # https://gitlab.com/wireshark/wireshark/-/issues/7022 self.assertRun((cmd_tshark, '-r', capture_file('sample_control4_2012-03-24.pcap'), '-Tfields', @@ -560,7 +560,7 @@ class case_decrypt_zigbee(subprocesstest.SubprocessTestCase): class case_decrypt_ansi_c1222(subprocesstest.SubprocessTestCase): def test_ansi_c1222(self, cmd_tshark, capture_file): '''ANSI C12.22''' - # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9196 + # https://gitlab.com/wireshark/wireshark/-/issues/9196 self.assertRun((cmd_tshark, '-r', capture_file('c1222_std_example8.pcap'), '-o', 'c1222.decrypt: TRUE', @@ -577,7 +577,7 @@ class case_decrypt_dvb_ci(subprocesstest.SubprocessTestCase): def test_dvb_ci(self, cmd_tshark, capture_file): '''DVB-CI''' # simplified version of the sample capture in - # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6700 + # https://gitlab.com/wireshark/wireshark/-/issues/6700 self.assertRun((cmd_tshark, '-r', capture_file('dvb-ci_UV1_0000.pcap'), '-o', 'dvb-ci.sek: 00000000000000000000000000000000', @@ -593,7 +593,7 @@ class case_decrypt_dvb_ci(subprocesstest.SubprocessTestCase): class case_decrypt_ipsec(subprocesstest.SubprocessTestCase): def test_ipsec_esp(self, cmd_tshark, capture_file): '''IPsec ESP''' - # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12671 + # https://gitlab.com/wireshark/wireshark/-/issues/12671 self.assertRun((cmd_tshark, '-r', capture_file('esp-bug-12671.pcapng.gz'), '-o', 'esp.enable_encryption_decode: TRUE', @@ -608,7 +608,7 @@ class case_decrypt_ipsec(subprocesstest.SubprocessTestCase): class case_decrypt_ike_isakmp(subprocesstest.SubprocessTestCase): def test_ikev1_certs(self, cmd_tshark, capture_file): '''IKEv1 (ISAKMP) with certificates''' - # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7951 + # https://gitlab.com/wireshark/wireshark/-/issues/7951 self.assertRun((cmd_tshark, '-r', capture_file('ikev1-certs.pcap'), '-Tfields', @@ -618,7 +618,7 @@ class case_decrypt_ike_isakmp(subprocesstest.SubprocessTestCase): def test_ikev1_simultaneous(self, cmd_tshark, capture_file): '''IKEv1 (ISAKMP) simultaneous exchanges''' - # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12610 + # https://gitlab.com/wireshark/wireshark/-/issues/12610 self.assertRun((cmd_tshark, '-r', capture_file('ikev1-bug-12610.pcapng.gz'), '-Tfields', @@ -628,7 +628,7 @@ class case_decrypt_ike_isakmp(subprocesstest.SubprocessTestCase): def test_ikev1_unencrypted(self, cmd_tshark, capture_file): '''IKEv1 (ISAKMP) unencrypted phase 1''' - # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12620 + # https://gitlab.com/wireshark/wireshark/-/issues/12620 self.assertRun((cmd_tshark, '-r', capture_file('ikev1-bug-12620.pcapng.gz'), '-Tfields', @@ -1009,7 +1009,7 @@ class case_decrypt_wireguard(subprocesstest.SubprocessTestCase): class case_decrypt_knxip(subprocesstest.SubprocessTestCase): # Capture files for these tests contain single telegrams. # For realistic (live captured) KNX/IP telegram sequences, see: - # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14825 + # https://gitlab.com/wireshark/wireshark/-/issues/14825 def test_knxip_data_security_decryption_ok(self, cmd_tshark, capture_file): '''KNX/IP: Data Security decryption OK''' diff --git a/test/suite_text2pcap.py b/test/suite_text2pcap.py index 915109b2db..813d57403a 100644 --- a/test/suite_text2pcap.py +++ b/test/suite_text2pcap.py @@ -99,7 +99,7 @@ def check_text2pcap(cmd_tshark, cmd_text2pcap, capture_file): pre_cap_info = check_capinfos_info(self, cap_file) # Due to limitations of "tshark -x", the output might contain more than one # data source which is subsequently interpreted as additional frame data. - # See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14639 + # See https://gitlab.com/wireshark/wireshark/-/issues/14639 if expected_packets is not None: self.assertNotEqual(pre_cap_info['packets'], expected_packets) pre_cap_info['packets'] = expected_packets diff --git a/tools/checkAPIs.pl b/tools/checkAPIs.pl index 9e43fd401b..0f438334ff 100755 --- a/tools/checkAPIs.pl +++ b/tools/checkAPIs.pl @@ -73,7 +73,7 @@ my %APIs = ( # Windows doesn't have this; use g_ascii_strtoull() instead 'strtoull', ### non-portable: fails on Windows Wireshark built with VC newer than VC6 - # See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6695#c2 + # See https://gitlab.com/wireshark/wireshark/-/issues/6695#note_400659130 'g_fprintf', 'g_vfprintf', ### non-ANSI C diff --git a/tools/ws-coding-style.cfg b/tools/ws-coding-style.cfg index 6418ac7208..aabd05e368 100644 --- a/tools/ws-coding-style.cfg +++ b/tools/ws-coding-style.cfg @@ -1,4 +1,4 @@ -# Ref: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5924 +# Ref: https://gitlab.com/wireshark/wireshark/-/issues/5924 # # FF: uncrustify config file for Wireshark (based on cheese-indent.cfg and # linux.cfg... taken somewhere from the Net) @@ -6,7 +6,7 @@ # typical usage: # # uncrustify -c ../../tools/ws-coding-style.cfg --replace packet-dccp.c -# +# # The number of columns to indent per level. # Usually 2, 3, 4, or 8. @@ -16,7 +16,7 @@ indent_columns = 4 # number, FF: 8 on linux # 0=spaces only # 1=indent with tabs, align with spaces # 2=indent and align with tabs -indent_with_tabs = 0 # number, FF: spaces only, questionable... as +indent_with_tabs = 0 # number, FF: spaces only, questionable... as # everything about this topic :-) # Spaces to indent '{' from level diff --git a/wsutil/please_report_bug.c b/wsutil/please_report_bug.c index b23df9f61a..82520fb227 100644 --- a/wsutil/please_report_bug.c +++ b/wsutil/please_report_bug.c @@ -17,10 +17,10 @@ const char * please_report_bug(void) { - return - "Please report this to the Wireshark developers as a bug.\n" - "https://bugs.wireshark.org/\n" - "(This is not a crash; please do not say, in your report, that it is a crash.)"; + return + "Please report this to the Wireshark developers as a bug.\n" + "https://gitlab.com/wireshark/wireshark/issues\n" + "(This is not a crash; please do not say, in your report, that it is a crash.)"; } /* @@ -29,5 +29,5 @@ please_report_bug(void) const char * please_report_bug_short(void) { - return "Please report this to the Wireshark developers."; + return "Please report this to the Wireshark developers."; }