Add inet_ntop(), inet_pton() functions

Signed-off-by: Bogdan Lascu <lascu.bogdan96@gmail.com>
Signed-off-by: Costin Lupu <costin.lupu@cs.pub.ro>
Reviewed-by: Felipe Huici <felipe.huici@neclab.eu>

diff --git a/Makefile.uk b/Makefile.uk
index 7b301461affb9d62a65c8e0013ef68803fa9c55f..cfca555de7059e7aa970646ce4f280d6fa4ad5f5 100644 (file)
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -79,6 +79,7 @@ LIBLWIP_SRCS-$(CONFIG_LWIP_THREADS) += $(LIBLWIP_BASE)/mailbox.c|unikraft
 LIBLWIP_SRCS-$(CONFIG_LWIP_THREADS) += $(LIBLWIP_BASE)/threads.c|unikraft
 LIBLWIP_SRCS-y += $(LIBLWIP_BASE)/init.c|unikraft
 LIBLWIP_SRCS-y += $(LIBLWIP_BASE)/time.c|unikraft
+LIBLWIP_SRCS-y += $(LIBLWIP_BASE)/inet.c|unikraft
 LIBLWIP_SRCS-$(CONFIG_LWIP_SOCKET) += $(LIBLWIP_BASE)/sockets.c|unikraft
 LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/core/init.c
 LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/core/def.c

diff --git a/exportsyms.uk b/exportsyms.uk
index 10c1ab852e7d43a61abe235060304f65c6aa2151..ca0a748a38deb60a52249370eca36d09fdf54cf0 100644 (file)
--- a/exportsyms.uk
+++ b/exportsyms.uk
@@ -33,3 +33,5 @@ getprotobynumber
 gethostbyaddr
 getservbyname
 getservbyport
+inet_ntop
+inet_pton

diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index c2fc6c300ffe43b9052d1235e2b7c660f1c16611..a1201a28bd0b938f3d00206ee06e68f71d9bc95b 100644 (file)
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -1 +1,5 @@
 #include <compat/posix/arpa/inet.h>
+
+const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
+int inet_pton(int af, const char *src, void *dst);
+

diff --git a/inet.c b/inet.c
new file mode 100644 (file)
index 0000000..07dafe6
--- /dev/null
+++ b/inet.c
@@ -0,0 +1,45 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+/*
+ * Authors: Bogdan Lascu <lascu.bogdan96@gmail.com>
+ *
+ * Copyright (c) 2019, University Politehnica of Bucharest. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
+ */
+#include <netdb.h>
+
+
+const char *inet_ntop(int af, const void *src, char *dst, socklen_t size)
+{
+       return lwip_inet_ntop(af, src, dst, size);
+}
+
+int inet_pton(int af, const char *src, void *dst)
+{
+       return lwip_inet_pton(af, src, dst);
+}