From e588bba06d298245c46fc9c622ad34484ec93edb Mon Sep 17 00:00:00 2001
From: Robert Lubos <robert.lubos@nordicsemi.no>
Date: Thu, 3 Oct 2024 16:26:11 +0200
Subject: [PATCH] samples: net: telnet: Remove redundant code

The sample uses net_config library, so there's no need for the sample to
configure unicast IP addresses manually.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
---
 samples/net/telnet/src/telnet.c | 112 +-------------------------------
 1 file changed, 3 insertions(+), 109 deletions(-)

diff --git a/samples/net/telnet/src/telnet.c b/samples/net/telnet/src/telnet.c
index 6ad77c4f7d31b1..f8df416e39ae0f 100644
--- a/samples/net/telnet/src/telnet.c
+++ b/samples/net/telnet/src/telnet.c
@@ -18,111 +18,13 @@ LOG_MODULE_REGISTER(net_telnet_sample, LOG_LEVEL_DBG);
 
 #include "net_sample_common.h"
 
-#if defined(CONFIG_NET_DHCPV4)
-static struct net_mgmt_event_callback mgmt_cb;
-
-static void ipv4_addr_add_handler(struct net_mgmt_event_callback *cb,
-				  uint32_t mgmt_event,
-				  struct net_if *iface)
-{
-	char hr_addr[NET_IPV4_ADDR_LEN];
-	int i = 0;
-
-	if (mgmt_event != NET_EVENT_IPV4_ADDR_ADD) {
-		/* Spurious callback. */
-		return;
-	}
-
-	for (i = 0; i < NET_IF_MAX_IPV4_ADDR; i++) {
-		struct net_if_addr *if_addr =
-			&iface->config.ip.ipv4->unicast[i];
-
-		if (if_addr->addr_type != NET_ADDR_DHCP || !if_addr->is_used) {
-			continue;
-		}
-
-		LOG_INF("IPv4 address: %s",
-			net_addr_ntop(AF_INET,
-				      &if_addr->address.in_addr,
-				      hr_addr, NET_IPV4_ADDR_LEN));
-		LOG_INF("Lease time: %u seconds",
-			 iface->config.dhcpv4.lease_time);
-		LOG_INF("Subnet: %s",
-			net_addr_ntop(AF_INET,
-				      &iface->config.ip.ipv4->netmask,
-				      hr_addr, NET_IPV4_ADDR_LEN));
-		LOG_INF("Router: %s",
-			net_addr_ntop(AF_INET,
-				      &iface->config.ip.ipv4->gw,
-				      hr_addr, NET_IPV4_ADDR_LEN));
-		break;
-	}
-}
-
-static void setup_dhcpv4(struct net_if *iface)
-{
-	LOG_INF("Running dhcpv4 client...");
-
-	net_mgmt_init_event_callback(&mgmt_cb, ipv4_addr_add_handler,
-				     NET_EVENT_IPV4_ADDR_ADD);
-	net_mgmt_add_event_callback(&mgmt_cb);
-
-	net_dhcpv4_start(iface);
-}
-
-#else
-#define setup_dhcpv4(...)
-#endif /* CONFIG_NET_DHCPV4 */
-
-#if defined(CONFIG_NET_IPV4) && !defined(CONFIG_NET_DHCPV4)
-
-#if !defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR)
-#error "You need to define an IPv4 Address or enable DHCPv4!"
-#endif
-
-static void setup_ipv4(struct net_if *iface)
-{
-	char hr_addr[NET_IPV4_ADDR_LEN];
-	struct in_addr addr;
-
-	if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &addr)) {
-		LOG_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV4_ADDR);
-		return;
-	}
-
-	net_if_ipv4_addr_add(iface, &addr, NET_ADDR_MANUAL, 0);
-
-	LOG_INF("IPv4 address: %s",
-		net_addr_ntop(AF_INET, &addr, hr_addr,
-			      NET_IPV4_ADDR_LEN));
-}
-
-#else
-#define setup_ipv4(...)
-#endif /* CONFIG_NET_IPV4 && !CONFIG_NET_DHCPV4 */
-
 #if defined(CONFIG_NET_IPV6)
-
 #define MCAST_IP6ADDR "ff84::2"
 
-#ifndef CONFIG_NET_CONFIG_MY_IPV6_ADDR
-#error "You need to define an IPv6 Address!"
-#endif
-
-static void setup_ipv6(struct net_if *iface)
+static void setup_ipv6(void)
 {
-	char hr_addr[NET_IPV6_ADDR_LEN];
 	struct in6_addr addr;
-
-	if (net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR, &addr)) {
-		LOG_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV6_ADDR);
-		return;
-	}
-
-	net_if_ipv6_addr_add(iface, &addr, NET_ADDR_MANUAL, 0);
-
-	LOG_INF("IPv6 address: %s",
-		net_addr_ntop(AF_INET6, &addr, hr_addr, NET_IPV6_ADDR_LEN));
+	struct net_if *iface = net_if_get_default();
 
 	if (net_addr_pton(AF_INET6, MCAST_IP6ADDR, &addr)) {
 		LOG_ERR("Invalid address: %s", MCAST_IP6ADDR);
@@ -131,23 +33,15 @@ static void setup_ipv6(struct net_if *iface)
 
 	net_if_ipv6_maddr_add(iface, &addr);
 }
-
 #else
 #define setup_ipv6(...)
 #endif /* CONFIG_NET_IPV6 */
 
 int main(void)
 {
-	struct net_if *iface = net_if_get_default();
-
 	LOG_INF("Starting Telnet sample");
 
 	wait_for_network();
-
-	setup_ipv4(iface);
-
-	setup_dhcpv4(iface);
-
-	setup_ipv6(iface);
+	setup_ipv6();
 	return 0;
 }