From e0156bbe77534efb898882bfd81dce590b7be161 Mon Sep 17 00:00:00 2001
From: jiangjixiang <jiangjixiang@kylinos.cn>
Date: Thu, 22 Feb 2024 11:03:49 +0800
Subject: [PATCH] =?UTF-8?q?[bugfix]=E4=BF=AE=E5=A4=8D=E7=BB=84=E6=92=AD?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=AF=BC=E8=87=B4routel=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E6=8A=A5"shift=E8=B6=8A=E7=95=8C"=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	1.routel命令是一个脚本，以更友好的方式输出ip route命令得到的路由表；
	2.当前routel脚本不支持multicast路由，在有multicast路由的机器上会报错；
	3.修改routel脚本，添加对multicast的支持；
---
 ...tel-shift-bounds-error-due-multicast.patch | 33 +++++++++++++++++++
 iproute.spec                                  | 10 +++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 bugfix-routel-shift-bounds-error-due-multicast.patch

diff --git a/bugfix-routel-shift-bounds-error-due-multicast.patch b/bugfix-routel-shift-bounds-error-due-multicast.patch
new file mode 100644
index 0000000..3af36b2
--- /dev/null
+++ b/bugfix-routel-shift-bounds-error-due-multicast.patch
@@ -0,0 +1,33 @@
+From 74d88fe354864b73504d75aac50606b0e2e155af Mon Sep 17 00:00:00 2001
+From: jiangjixiang <jiangjixiang@kylinos.cn>
+Date: Mon, 19 Feb 2024 11:46:26 +0800
+Subject: [PATCH]Fix the issue of routel command reporting "shift out of bounds" due to multicast routing.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+	1.The routel command is a shell script that displays the kernel routing table obtained from
+	  ip route in a more user-friendly way;
+	2.The current routel command does not support multicast routing；
+
+Change-Id: Ib128c3a962c9f5b2b861ba8546d5f48258e60384
+---
+ ip/routel | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ip/routel b/source/ip/routel
+index 7056886..528e7b9 100755
+--- a/ip/routel
++++ b/ip/routel
+@@ -25,7 +25,7 @@ ip route list table "$@" |
+     src=""
+     table=""
+     case $network in
+-       broadcast|local|unreachable) via=$network
++       broadcast|local|unreachable|multicast) via=$network
+           network=$1
+           shift
+           ;;
+-- 
+2.25.1
+
diff --git a/iproute.spec b/iproute.spec
index ea6daab..651776d 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -1,7 +1,7 @@
 #needsrootforbuild
 Name:		iproute
 Version:	5.5.0
-Release:	17
+Release:	18
 Summary:	Linux network configuration utilities
 License:	GPLv2+ and Public Domain
 URL:		https://kernel.org/pub/linux/utils/net/iproute2/
@@ -48,6 +48,7 @@ Patch9003:  feature-iproute-add-support-for-ipvlan-l2e-mode.patch
 Patch9004:  feature-peer_notify_delay-renamed-to-peer_notif_delay.patch
 Patch9005:  bugfix-iproute-support-assume-default-route.patch
 Patch9006:  bugfix-iproute2-cancel-some-test-cases.patch
+Patch9007:  bugfix-routel-shift-bounds-error-due-multicast.patch
 
 Patch6031:  backport-devlink-fix-devlink-health-dump-command-without-arg.patch
 Patch6032:  backport-l2tp-fix-typo-in-AF_INET6-checksum-JSON-print.patch
@@ -136,6 +137,13 @@ install -m 0644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
 %{_mandir}/*
 
 %changelog
+* Mon 19 Feb 2024 jiangjixiang <jiangjixiang@kylinos.cn> - 5.5.0-18
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Fix the issue of multicast causing shift out of bounds in the
+       routel command report.
+
 * Wed Dec 27 2023 liubo <liubo335@huawei.com> - 5.5.0-17
 - Type:bugfix
 - ID:NA