From 93a7049287b355892c9ed732f5cb3b9406ba687e Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Tue, 27 Jun 2023 18:31:07 +0530
Subject: [PATCH] Use l3_device for IP diagnotics tools

---
 libbbfdm/scripts/download        | 2 +-
 libbbfdm/scripts/ipping          | 2 +-
 libbbfdm/scripts/serverselection | 4 ++--
 libbbfdm/scripts/traceroute      | 2 +-
 libbbfdm/scripts/udpecho         | 2 +-
 libbbfdm/scripts/upload          | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libbbfdm/scripts/download b/libbbfdm/scripts/download
index 9bc08a73..3c2173b9 100755
--- a/libbbfdm/scripts/download
+++ b/libbbfdm/scripts/download
@@ -57,7 +57,7 @@ download_launch() {
 	fi
 
 	# Assign default value
-	[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.device) || device=$(route -n | grep 'UG[ \t]' | awk '{print $8}')
+	[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.l3_device) || device=$(route -n | grep 'UG[ \t]' | awk '{print $8}')
 	ip_addr_used=$(get_ip_addr_used "${ip_proto}" "${iface}")
 	if [ "$ip_proto" = "IPv4" ]; then ip_proto="--ipv4"; elif [ "$ip_proto" = "IPv6" ]; then ip_proto="--ipv6"; else ip_proto=""; fi
 
diff --git a/libbbfdm/scripts/ipping b/libbbfdm/scripts/ipping
index 8bf908e5..38a0a508 100755
--- a/libbbfdm/scripts/ipping
+++ b/libbbfdm/scripts/ipping
@@ -54,7 +54,7 @@ ipping_launch() {
 	# Assign default value
 	[ -z "${nbr_of_rep}" ] && nbr_of_rep=3
 	[ -z "${dsize}" ] && dsize=64
-	[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.device) && device="-I $device" || device=""
+	[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.l3_device) && device="-I $device" || device=""
 	ip_addr_used=$(get_ip_addr_used "${ip_proto}" "${iface}")
 	if [ "$ip_proto" = "IPv4" ]; then ip_proto="-4"; elif [ "$ip_proto" = "IPv6" ]; then ip_proto="-6"; else ip_proto=""; fi
 	[ -z "${timeout}" ] && timeout=1 || timeout=$((timeout/1000))
diff --git a/libbbfdm/scripts/serverselection b/libbbfdm/scripts/serverselection
index 56b5d84b..7caf5e83 100755
--- a/libbbfdm/scripts/serverselection
+++ b/libbbfdm/scripts/serverselection
@@ -66,7 +66,7 @@ serverselection_launch() {
 
 	for host in $(echo "$hostlist" | tr "," "\n"); do
 		if [ "$protocol_used" = "ICMP" ]; then
-			[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.device) && device="-I $device" || device=""
+			[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.l3_device) && device="-I $device" || device=""
 			
 			while [ $i -lt "$nbr_of_rep" ]; do
 				i=$((i+1))
@@ -113,7 +113,7 @@ serverselection_launch() {
 			done
 		else
 			[[ "$host" == *"."* ]] && ip_proto="4" || ip_proto="6"
-			[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.device) && device="-i $device" || device=""
+			[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.l3_device) && device="-i $device" || device=""
 			
 			while [ $i -lt "$nbr_of_rep" ]; do
 				i=$((i+1))
diff --git a/libbbfdm/scripts/traceroute b/libbbfdm/scripts/traceroute
index 269d8df6..f542c065 100755
--- a/libbbfdm/scripts/traceroute
+++ b/libbbfdm/scripts/traceroute
@@ -57,7 +57,7 @@ traceroute_launch() {
 	# Assign default value
 	[ -z "${cnt}" ] && cnt=1
 	[ -z "${maxhop}" ] && maxhop=30
-	[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.device) && device="-i $device" || device=""
+	[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.l3_device) && device="-i $device" || device=""
 	ip_addr_used=$(get_ip_addr_used "${ip_proto}" "${iface}")
 	if [ "$ip_proto" = "IPv4" ]; then ip_proto="-4"; elif [ "$ip_proto" = "IPv6" ]; then ip_proto="-6"; else ip_proto=""; fi
 	[ -z "${timeout}" ] && timeout=5 || timeout=$((timeout/1000))
diff --git a/libbbfdm/scripts/udpecho b/libbbfdm/scripts/udpecho
index 749d6b34..1ff6bbd4 100755
--- a/libbbfdm/scripts/udpecho
+++ b/libbbfdm/scripts/udpecho
@@ -52,7 +52,7 @@ udpecho_launch() {
 	[ -z "${port}" ] && port=7
 	[ -z "${dsize}" ] && dsize=24
 	[ -z "${dscp}" ] && dscp=0
-	[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.device) && device="-i $device" || device=""
+	[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.l3_device) && device="-i $device" || device=""
 	ip_addr_used=$(get_ip_addr_used "${ip_proto}" "${iface}")
 	if [ "$ip_proto" = "IPv4" ]; then ip_proto="4"; elif [ "$ip_proto" = "IPv6" ]; then ip_proto="6"; else ip_proto="4"; fi
 	[ -z "${timeout}" ] && timeout=1 || timeout=$((timeout/1000))
diff --git a/libbbfdm/scripts/upload b/libbbfdm/scripts/upload
index 85f30035..49229ce0 100755
--- a/libbbfdm/scripts/upload
+++ b/libbbfdm/scripts/upload
@@ -58,7 +58,7 @@ upload_launch() {
 	fi
 
 	# Assign default value
-	[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.device) || device=$(route -n | grep 'UG[ \t]' | awk '{print $8}')
+	[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.l3_device) || device=$(route -n | grep 'UG[ \t]' | awk '{print $8}')
 	ip_addr_used=$(get_ip_addr_used "${ip_proto}" "${iface}")
 	if [ "$ip_proto" = "IPv4" ]; then ip_proto="--ipv4"; elif [ "$ip_proto" = "IPv6" ]; then ip_proto="--ipv6"; else ip_proto=""; fi