colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: net_utils: Move ip_to_string to lib/net_utils.c

Browse Source 
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>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Adriano Cordova
2024-11-11 18:09:45 -03:00
committed by Heinrich Schuchardt
parent 1327c2a8d6
commit 9063dba2d3
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/net-common.h
View File

@@ -426,6 +426,16 @@ void string_to_enetaddr(const char *addr, uint8_t *enetaddr);
*/ */
struct in_addr string_to_ip(const char *s); 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) */ /* copy a filename (allow for "..." notation, limit length) */
void copy_filename(char *dst, const char *src, int size); void copy_filename(char *dst, const char *src, int size);

11
lib/net_utils.c
View File

@@ -152,6 +152,17 @@ out_err:
} }
#endif #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) void string_to_enetaddr(const char *addr, uint8_t *enetaddr)
{ {
char *end; char *end;

11
net/net.c
View File

@@ -1723,17 +1723,6 @@ int net_parse_bootfile(struct in_addr *ipaddr, char *filename, int max_len)
return 1; 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) void vlan_to_string(ushort x, char *s)
{ {
x = ntohs(x); x = ntohs(x);