Use if_nametoindex and if_nametoindex from lwip

if_nametoindex and if_nametoindex are currently subbed. We
remove the stubs and use the implementation from lwip.

Signed-off-by: Vlad-Andrei BĂDOIU <vlad_andrei.badoiu@stud.acs.upb.ro>
Reviewed-by: Felipe Huici <felipe.huici@neclab.eu>

diff --git a/Makefile.uk b/Makefile.uk
index 5054ef4ba70e0f16c542f5aa1918bd480434a993..d3c6c9c8334facf80824a66839c46ae2f9847060 100644 (file)
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -86,7 +86,6 @@ LIBLWIP_SRCS-$(CONFIG_LWIP_THREADS) += $(LIBLWIP_BASE)/mutex.c|unikraft
 LIBLWIP_SRCS-$(CONFIG_LWIP_THREADS) += $(LIBLWIP_BASE)/semaphore.c|unikraft
 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)/ifname.c|unikraft
 LIBLWIP_SRCS-y += $(LIBLWIP_BASE)/init.c|unikraft
 LIBLWIP_SRCS-y += $(LIBLWIP_BASE)/time.c|unikraft
 LIBLWIP_SRCS-y += $(LIBLWIP_BASE)/sendfile.c|unikraft
@@ -120,6 +119,7 @@ LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/api/netbuf.c
 LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/api/netdb.c
 LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/api/netifapi.c
 LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/api/tcpip.c
+LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/api/if_api.c
 LIBLWIP_SRCS-$(CONFIG_LWIP_SOCKET) += $(LIBLWIP_EXTRACTED)/api/sockets.c
 
 ################################################################################

diff --git a/ifname.c b/ifname.c
deleted file mode 100644 (file)
index f622a3f..0000000
--- a/ifname.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-/*
- * Copyright (c) 2019, NEC Laboratories Europe GmbH, NEC Corporation.
- *                     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 <net/if.h>
-
-char *if_indextoname(unsigned index, char *name)
-{
-  return 0;
-}

diff --git a/sockets.c b/sockets.c
index 8fde21a425cd28f5af456778a3030b992215d0e1..a013225809306a75125571551f1694d0ef9de4ed 100644 (file)
--- a/sockets.c
+++ b/sockets.c
@@ -50,6 +50,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <lwip/sockets.h>
+#include <lwip/if_api.h>
 
 #define SOCK_NET_SET_ERRNO(errcode) \
        (errno = -(errcode))
@@ -899,3 +900,23 @@ int socketpair(int domain, int type, int protocol, int sv[2])
        errno = ENOTSUP;
        return -1;
 }
+
+#ifdef LWIP_SOCKET
+unsigned int if_nametoindex(const char *ifname)
+{
+       int ret;
+
+       ret = lwip_if_nametoindex(ifname);
+
+       return ret;
+}
+
+char *if_indextoname(unsigned int ifindex, char *ifname)
+{
+       char *ret;
+
+       ret = lwip_if_indextoname(ifindex, ifname);
+
+       return ret;
+}
+#endif