public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Adriano Cordova <adrianox@gmail.com>
To: u-boot@lists.denx.de
Cc: joe.hershberger@ni.com, rfried.dev@gmail.com,
	jerome.forissier@linaro.org, xypron.glpk@gmx.de,
	ilias.apalodimas@linaro.org, Adriano Cordova <adrianox@gmail.com>
Subject: [PATCH v3 01/15] net: net_utils: Move ip_to_string to lib/net_utils.c
Date: Mon, 11 Nov 2024 18:09:45 -0300	[thread overview]
Message-ID: <20241111210959.560738-2-adrianox@gmail.com> (raw)
In-Reply-To: <20241111210959.560738-1-adrianox@gmail.com>

The function string_to_ip is already in net_utils, which is
compiled unconditionally, but ip_to_string is currently only
accessible if the legacy network stack is selected. This
commit puts ip_to_string in net_utils.c and removes it from the
legacy network code.

Signed-off-by: Adriano Cordova <adrianox@gmail.com>
---

(no changes since v2)

 include/net-common.h | 10 ++++++++++
 lib/net_utils.c      | 11 +++++++++++
 net/net.c            | 11 -----------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/include/net-common.h b/include/net-common.h
index 3cd0f34374..b7a519e36d 100644
--- a/include/net-common.h
+++ b/include/net-common.h
@@ -426,6 +426,16 @@ void string_to_enetaddr(const char *addr, uint8_t *enetaddr);
  */
 struct in_addr string_to_ip(const char *s);
 
+/**
+ * ip_to_string() - Convert a string to ip address
+ *
+ * Implemented in lib/net_utils.c (built unconditionally)
+ *
+ * @x: Input ip to parse
+ * @s: string containing the parsed ip address
+ */
+void ip_to_string(struct in_addr x, char *s);
+
 /* copy a filename (allow for "..." notation, limit length) */
 void copy_filename(char *dst, const char *src, int size);
 
diff --git a/lib/net_utils.c b/lib/net_utils.c
index c70fef0d99..621f6512b6 100644
--- a/lib/net_utils.c
+++ b/lib/net_utils.c
@@ -152,6 +152,17 @@ out_err:
 }
 #endif
 
+void ip_to_string(struct in_addr x, char *s)
+{
+	x.s_addr = ntohl(x.s_addr);
+	sprintf(s, "%d.%d.%d.%d",
+		(int) ((x.s_addr >> 24) & 0xff),
+		(int) ((x.s_addr >> 16) & 0xff),
+		(int) ((x.s_addr >> 8) & 0xff),
+		(int) ((x.s_addr >> 0) & 0xff)
+	);
+}
+
 void string_to_enetaddr(const char *addr, uint8_t *enetaddr)
 {
 	char *end;
diff --git a/net/net.c b/net/net.c
index f47e9fbe33..ca35704f66 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1723,17 +1723,6 @@ int net_parse_bootfile(struct in_addr *ipaddr, char *filename, int max_len)
 	return 1;
 }
 
-void ip_to_string(struct in_addr x, char *s)
-{
-	x.s_addr = ntohl(x.s_addr);
-	sprintf(s, "%d.%d.%d.%d",
-		(int) ((x.s_addr >> 24) & 0xff),
-		(int) ((x.s_addr >> 16) & 0xff),
-		(int) ((x.s_addr >> 8) & 0xff),
-		(int) ((x.s_addr >> 0) & 0xff)
-	);
-}
-
 void vlan_to_string(ushort x, char *s)
 {
 	x = ntohs(x);
-- 
2.43.0


  reply	other threads:[~2024-11-12  2:48 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-11 21:09 [PATCH v3 00/15] efi_loader: efi http and ipconfig drivers Adriano Cordova
2024-11-11 21:09 ` Adriano Cordova [this message]
2024-11-13  8:17   ` [PATCH v3 01/15] net: net_utils: Move ip_to_string to lib/net_utils.c Ilias Apalodimas
2024-11-16 20:56   ` Heinrich Schuchardt
2024-11-16 21:04   ` Heinrich Schuchardt
2024-11-11 21:09 ` [PATCH v3 02/15] net: wget: let wget_with_dns work with dns disabled Adriano Cordova
2024-11-16 21:12   ` Heinrich Schuchardt
2024-11-11 21:09 ` [PATCH v3 03/15] efi_loader: device_path: add definition of DEVICE_PATH_SUB_TYPE_MSG_IPV4 Adriano Cordova
2024-11-13 10:24   ` Ilias Apalodimas
2024-11-11 21:09 ` [PATCH v3 04/15] efi_loader: device_path: add efi_dp_from_ipv4 Adriano Cordova
2024-11-13 10:18   ` Ilias Apalodimas
2024-11-11 21:09 ` [PATCH v3 05/15] efi_loader: add IPv4() to device path to text protocol Adriano Cordova
2024-11-13 10:37   ` Ilias Apalodimas
2024-11-11 21:09 ` [PATCH v3 06/15] efi_api: add definitions for HTTP and IP4_CONFIG2 protocols Adriano Cordova
2024-11-18 12:08   ` Ilias Apalodimas
2024-11-11 21:09 ` [PATCH v3 07/15] efi_loader: efi_net: add efi_net_set_addr, efi_net_get_addr Adriano Cordova
2024-11-18 12:21   ` Ilias Apalodimas
2024-11-18 12:35     ` Adriano Córdova
2024-11-18 13:45       ` Jerome Forissier
2024-11-11 21:09 ` [PATCH v3 08/15] efi_loader: device_path: add support for HTTP device path Adriano Cordova
2024-11-13  8:15   ` Ilias Apalodimas
2024-11-13 12:51     ` Adriano Córdova
2024-11-11 21:09 ` [PATCH v3 09/15] efi_loader: net: set EFI bootdevice device path to HTTP when loaded from wget Adriano Cordova
2024-11-18 12:23   ` Ilias Apalodimas
2024-11-11 21:09 ` [PATCH v3 10/15] efi_loader: net: add support to send http requests and parse http headers Adriano Cordova
2024-11-12 13:51   ` Heinrich Schuchardt
2024-11-13 14:02     ` Adriano Córdova
2024-11-11 21:09 ` [PATCH v3 11/15] efi_loader: efi_net: add EFI_IP4_CONFIG2_PROTOCOL Adriano Cordova
2024-11-18 12:44   ` Ilias Apalodimas
2024-11-11 21:09 ` [PATCH v3 12/15] efi_loader: efi_net: add EFI_HTTP_PROTOCOL Adriano Cordova
2024-11-12 14:02   ` Heinrich Schuchardt
2024-11-11 21:09 ` [PATCH v3 13/15] lib: uuid: display HTTP and IPV4 Config II protocols Adriano Cordova
2024-11-13  8:09   ` Ilias Apalodimas
2024-11-11 21:09 ` [PATCH v3 14/15] efi_selftest: add test for HTTP protocol Adriano Cordova
2024-11-11 21:09 ` [PATCH v3 15/15] efi_selftest: add test for IPv4 Config2 protocol Adriano Cordova
2024-11-18 12:27   ` Ilias Apalodimas
2024-11-14 15:22 ` [PATCH v3 00/15] efi_loader: efi http and ipconfig drivers Ilias Apalodimas
2024-11-14 16:16   ` Adriano Córdova
2024-11-14 16:33     ` Heinrich Schuchardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241111210959.560738-2-adrianox@gmail.com \
    --to=adrianox@gmail.com \
    --cc=ilias.apalodimas@linaro.org \
    --cc=jerome.forissier@linaro.org \
    --cc=joe.hershberger@ni.com \
    --cc=rfried.dev@gmail.com \
    --cc=u-boot@lists.denx.de \
    --cc=xypron.glpk@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox