sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NET: Rename uiplib/UIPLIB to netlib/NETLIB

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-02 16:04:25 -06:00
parent 79aa55183c
commit 2ee5041477
53 changed files with 109 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
examples/README.txt
View File

@ -182,7 +182,7 @@ examples/dhcpd
(as well as various other UDP-related
configuration settings)
CONFIG_NET_BROADCAST=y - UDP broadcast support is needed.
CONFIG_NETUTILS_UIPLIB=y - The UIP library is needed
CONFIG_NETUTILS_NETLIB=y - The UIP library is needed
CONFIG_EXAMPLES_DHCPD_NOMAC - (May be defined to use software assigned MAC)
CONFIG_EXAMPLES_DHCPD_IPADDR - Target IP address
@ -394,7 +394,7 @@ examples/ftpd
The following netutils libraries should be enabled in your defconfig
file:
CONFIG_NETUTILS_UIPLIB=y
CONFIG_NETUTILS_NETLIB=y
CONFIG_NETUTILS_TELNED=y
examples/hello
@ -489,7 +489,7 @@ examples/igmp
Network mask
* CONFIG_EXAMPLES_IGMP_GRPADDR
Multicast group address
* CONFIG_EXAMPLES_UIPLIB
* CONFIG_EXAMPLES_NETLIB
The UIP library is needed
examples/adc
@ -670,7 +670,7 @@ examples/nettest
functionality in a TCP/IP connection.
CONFIG_EXAMPLES_NETTEST=y - Enables the nettest example
CONFIG_EXAMPLES_UIPLIB=y - The UIP livrary in needed.
CONFIG_EXAMPLES_NETLIB=y - The UIP livrary in needed.
See also examples/tcpecho
@ -713,7 +713,7 @@ examples/nsh
And if networking is included:
CONFIG_NETUTILS_UIPLIB=y
CONFIG_NETUTILS_NETLIB=y
CONFIG_NETUTILS_DHCPC=y
CONFIG_NETUTILS_DNSCLIENT=y
CONFIG_NETUTILS_TFTPC=y
@ -1220,7 +1220,7 @@ examples/poll
provide the following definition in the defconfig file to enable the
UIP library:
CONFIG_NETUTILS_UIPLIB=y
CONFIG_NETUTILS_NETLIB=y
examples/posix_spawn
^^^^^^^^^^^^^^^^^^^^
@ -1451,7 +1451,7 @@ examples/sendmail
Applications using this example will need to enble the following
netutils libraries in their defconfig file:
CONFIG_NETUTILS_UIPLIB=y
CONFIG_NETUTILS_NETLIB=y
CONFIG_NETUTILS_SMTP=y
examples/serialblaster
@ -1552,7 +1552,7 @@ examples/telnetd
tiny shell and also supports telnetd.
CONFIG_EXAMPLES_TELNETD - Enable the Telnetd example
CONFIG_NETUTILS_UIPLIB, CONFIG_NETUTILS_TELNED - Enable netutils
CONFIG_NETUTILS_NETLIB, CONFIG_NETUTILS_TELNED - Enable netutils
libraries needed by the Telnetd example.
CONFIG_EXAMPLES_TELNETD_DAEMONPRIO - Priority of the Telnet daemon.
Default: SCHED_PRIORITY_DEFAULT
@ -1590,7 +1590,7 @@ examples/thttpd
Applications using this example will need to enable the following
netutils libraries in the defconfig file:
CONFIG_NETUTILS_UIPLIB=y
CONFIG_NETUTILS_NETLIB=y
CONFIG_NETUTILS_THTTPD=y
examples/tiff
@ -1668,7 +1668,7 @@ examples/udp
Applications using this example will need to enabled the following
netutils libraries in the defconfig file:
CONFIG_NETUTILS_UIPLIB=y
CONFIG_NETUTILS_NETLIB=y
examples/uip
^^^^^^^^^^^^
@ -1707,7 +1707,7 @@ examples/uip
Applications using this example will need to enable the following
netutils libraries in their defconfig file:
CONFIG_NETUTILS_UIPLIB=y
CONFIG_NETUTILS_NETLIB=y
CONFIG_NETUTILS_DHCPC=y
CONFIG_NETUTILS_DNSCLIENT=y
CONFIG_NETUTILS_WEBSERVER=y
@ -1930,7 +1930,7 @@ examples/wget
Applications using this example will need to enable the following netutils
libraries in the defconfig file:
CONFIG_NETUTILS_UIPLIB=y
CONFIG_NETUTILS_NETLIB=y
CONFIG_NETUTILS_DNSCLIENT=y
CONFIG_NETUTILS_WEBCLIENT=y

2
examples/cc3000/shell.c
View File

@ -48,7 +48,7 @@
#include <arpa/inet.h>
#include <apps/netutils/telnetd.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include "shell.h"
#include <apps/nsh.h>

2
examples/cc3000/telnetd_daemon.c
View File

@ -54,7 +54,7 @@
#include <netinet/in.h>
#include <apps/netutils/telnetd.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include "telnetd.h"

2
examples/dhcpd/target.c
View File

@ -44,7 +44,7 @@
#include <arpa/inet.h>
#include <net/if.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include <apps/netutils/dhcpd.h>
/****************************************************************************

2
examples/discover/discover_main.c
View File

@ -51,7 +51,7 @@
#include <nuttx/net/uip.h>
#include <nuttx/net/arp.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include <apps/netutils/discover.h>
#ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC

2
examples/ftpd/ftpd_main.c
View File

@ -45,7 +45,7 @@
#include <netinet/in.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include <apps/netutils/ftpd.h>
#include "ftpd.h"

2
examples/igmp/igmp.c
View File

@ -46,7 +46,7 @@
#include <net/if.h>
#include <nuttx/net/uip.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include <apps/netutils/ipmsfilter.h>
#include "igmp.h"

2
examples/nettest/nettest.c
View File

@ -45,7 +45,7 @@
#include <net/if.h>
#include <nuttx/net/uip.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include "nettest.h"

2
examples/poll/net_listener.c
View File

@ -54,7 +54,7 @@
#include <debug.h>
#include <net/if.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include "poll_internal.h"

2
examples/poll/net_reader.c
View File

@ -54,7 +54,7 @@
#include <debug.h>
#include <net/if.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include "poll_internal.h"

2
examples/sendmail/target.c
View File

@ -45,7 +45,7 @@
#include <errno.h>
#include <net/if.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include <apps/netutils/smtp.h>
/****************************************************************************

2
examples/tcpecho/tcpecho_main.c
View File

@ -57,7 +57,7 @@
#include <nuttx/net/uip.h>
#include <nuttx/net/arp.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#ifdef CONFIG_EXAMPLES_TCPECHO_DHCPC
# include <arpa/inet.h>

2
examples/telnetd/telnetd.c
View File

@ -48,7 +48,7 @@
#include <arpa/inet.h>
#include <apps/netutils/telnetd.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include "telnetd.h"

2
examples/thttpd/thttpd_main.c
View File

@ -52,7 +52,7 @@
#include <netinet/ether.h>
#include <nuttx/net/arp.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include <apps/netutils/thttpd.h>
#include <nuttx/fs/ramdisk.h>

2
examples/udp/target.c
View File

@ -42,7 +42,7 @@
#include <debug.h>
#include <nuttx/net/uip.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include "udp-internal.h"

2
examples/uip/uip_main.c
View File

@ -57,7 +57,7 @@
#include <nuttx/net/uip.h>
#include <nuttx/net/arp.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#ifdef CONFIG_EXAMPLES_UIP_DHCPC
#include <arpa/inet.h>

8
examples/wget/Makefile.host
View File

@ -42,7 +42,7 @@ BIN = wget
HOSTCFLAGS += -DCONFIG_WEBCLIENT_HOST=1
HOSTCFLAGS += -I. -include hostdefs.h
VPATH = $(TOPDIR)/netutils/webclient:$(TOPDIR)/netutils/uiplib:.
VPATH = $(TOPDIR)/netutils/webclient:$(TOPDIR)/netutils/netlib:.
all: $(BIN)
.PHONY: clean context clean_context distclean
@ -56,8 +56,8 @@ apps/netutils:
apps/netutils/webclient.h: apps/netutils $(TOPDIR)/include/apps/netutils/webclient.h
@cp -a $(TOPDIR)/include/apps/netutils/webclient.h apps/netutils/.
apps/netutils/uiplib.h: apps/netutils $(TOPDIR)/include/apps/netutils/uiplib.h
@cp -a $(TOPDIR)/include/apps/netutils/uiplib.h apps/netutils/.
apps/netutils/netlib.h: apps/netutils $(TOPDIR)/include/apps/netutils/netlib.h
@cp -a $(TOPDIR)/include/apps/netutils/netlib.h apps/netutils/.
nuttx:
@mkdir nuttx
@ -65,7 +65,7 @@ nuttx:
nuttx/config.h: nuttx
@touch nuttx/config.h
headers: apps/netutils/webclient.h apps/netutils/uiplib.h nuttx/config.h
headers: apps/netutils/webclient.h apps/netutils/netlib.h nuttx/config.h
$(BIN): headers $(OBJS)
$(HOSTCC) $(HOSTLDFLAGS) $(OBJS) -o $@

2
examples/wget/target.c
View File

@ -48,7 +48,7 @@
#include <nuttx/net/uip.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include <apps/netutils/dnsclient.h>
#include <apps/netutils/webclient.h>

2
examples/wgetjson/wgetjson_main.c
View File

@ -49,7 +49,7 @@
#include <errno.h>
#include <debug.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include <apps/netutils/webclient.h>
#include <apps/netutils/cJSON.h>

2
examples/xmlrpc/xmlrpc_main.c
View File

@ -66,7 +66,7 @@
#include <nuttx/net/uip.h>
#include <nuttx/net/arp.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include <apps/netutils/xmlrpc.h>
#ifdef CONFIG_EXAMPLES_XMLRPC_DHCPC

2
include/netutils/ipmsfilter.h
View File

@ -75,7 +75,7 @@ extern "C" {
*
* Description:
* Add or remove an IP address from a multicast filter set.
* (See netutils/uiplib/uip_ipmsfilter.c)
* (See netutils/netlib/uip_ipmsfilter.c)
*
* Parameters:
* ifname The name of the interface to use, size must less than IMSFNAMSIZ

16
include/netutils/uiplib.h → include/netutils/netlib.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/include/netutils/uiplib.h
* apps/include/netutils/netlib.h
* Various non-standard APIs to support netutils. All non-standard and
* intended only for internal use.
*
@ -42,8 +42,8 @@
*
****************************************************************************/
#ifndef __APPS_INCLUDE_NETUTILS_UIPLIB_H
#define __APPS_INCLUDE_NETUTILS_UIPLIB_H
#ifndef __APPS_INCLUDE_NETUTILS_NETLIB_H
#define __APPS_INCLUDE_NETUTILS_NETLIB_H
/****************************************************************************
* Included Files
@ -68,9 +68,9 @@
*/
#ifdef CONFIG_NET_UDP
# define UIPLIB_SOCK_IOCTL SOCK_DGRAM
# define NETLIB_SOCK_IOCTL SOCK_DGRAM
#else
# define UIPLIB_SOCK_IOCTL SOCK_STREAM
# define NETLIB_SOCK_IOCTL SOCK_STREAM
#endif
/****************************************************************************
@ -102,8 +102,8 @@ extern "C"
* Return: Non-zero If the IP address was parsed.
*/
bool uiplib_ipaddrconv(FAR const char *addrstr, uint8_t *addr);
bool uiplib_hwmacconv(FAR const char *hwstr, uint8_t *hw);
bool netlib_ipaddrconv(FAR const char *addrstr, uint8_t *addr);
bool netlib_hwmacconv(FAR const char *hwstr, uint8_t *hw);
/* Get and set IP/MAC addresses (Ethernet L2 only) */
@ -147,4 +147,4 @@ int uip_ifdown(FAR const char *ifname);
}
#endif
#endif /* __APPS_INCLUDE_NETUTILS_UIPLIB_H */
#endif /* __APPS_INCLUDE_NETUTILS_NETLIB_H */

2
netutils/Kconfig
View File

@ -16,7 +16,7 @@ source "$APPSDIR/netutils/smtp/Kconfig"
source "$APPSDIR/netutils/telnetd/Kconfig"
source "$APPSDIR/netutils/tftpc/Kconfig"
source "$APPSDIR/netutils/thttpd/Kconfig"
source "$APPSDIR/netutils/uiplib/Kconfig"
source "$APPSDIR/netutils/netlib/Kconfig"
source "$APPSDIR/netutils/webclient/Kconfig"
source "$APPSDIR/netutils/webserver/Kconfig"
source "$APPSDIR/netutils/ntpclient/Kconfig"

4
netutils/Make.defs
View File

@ -82,8 +82,8 @@ ifeq ($(CONFIG_NETUTILS_THTTPD),y)
CONFIGURED_APPS += netutils/thttpd
endif
ifeq ($(CONFIG_NETUTILS_UIPLIB),y)
CONFIGURED_APPS += netutils/uiplib
ifeq ($(CONFIG_NETUTILS_NETLIB),y)
CONFIGURED_APPS += netutils/netlib
endif
ifeq ($(CONFIG_NETUTILS_WEBCLIENT),y)

2
netutils/Makefile
View File

@ -39,7 +39,7 @@
SUBDIRS = json codecs
ifeq ($(CONFIG_NET),y)
SUBDIRS += uiplib dhcpc dhcpd discover dnsclient ftpc ftpd smtp telnetd
SUBDIRS += netlib dhcpc dhcpd discover dnsclient ftpc ftpd smtp telnetd
SUBDIRS += webclient webserver tftpc thttpd xmlrpc
endif

4
netutils/README.txt
View File

@ -75,7 +75,7 @@ highly influenced by uIP) include:
defconfig file to select the appropriate netutils
libraries:
CONFIG_NETUTILS_UIPLIB=y
CONFIG_NETUTILS_NETLIB=y
CONFIG_NETUTILS_THTTPD=y
xmlrpc - The Embeddable Lightweight XML-RPC Server discussed at
@ -92,7 +92,7 @@ Telnetd into your custom applications.
To enable and link the Telnetd daemon, you need to include the following in
in your defconfig file:
CONFIG_NETUTILS_UIPLIB=y
CONFIG_NETUTILS_NETLIB=y
CONFIG_NETUTILS_TELNETD=y
Also if the Telnet console is enabled, make sure that you have the following

2
netutils/dhcpc/dhcpc.c
View File

@ -54,7 +54,7 @@
#include <nuttx/net/uip.h>
#include <apps/netutils/dhcpc.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
/****************************************************************************
* Definitions

2
netutils/discover/Kconfig
View File

@ -7,7 +7,7 @@ config NETUTILS_DISCOVER
bool "Network Discovery Utility"
default n
depends on NET_UDP
select NETUTILS_UIPLIB
select NETUTILS_NETLIB
---help---
Tool for discovering devices on the local network per UDP broadcast.

4
netutils/dnsclient/dns_socket.c
View File

@ -60,7 +60,7 @@
#include <arpa/inet.h>
#include <apps/netutils/dnsclient.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
/****************************************************************************
* Pre-processor Definitions
@ -515,7 +515,7 @@ int dns_query_sock(int sockfd, FAR const char *hostname, FAR in_addr_t *ipaddr)
/* First check if the host is an IP address. */
if (!uiplib_ipaddrconv(hostname, (uint8_t*)ipaddr))
if (!netlib_ipaddrconv(hostname, (uint8_t*)ipaddr))
{
/* 'host' does not point to a valid address string. Try to resolve
* the host name to an IP address.

0
netutils/uiplib/.gitignore → netutils/netlib/.gitignore vendored
View File

4
netutils/uiplib/Kconfig → netutils/netlib/Kconfig
View File

@ -3,11 +3,11 @@
# see misc/tools/kconfig-language.txt.
#
config NETUTILS_UIPLIB
config NETUTILS_NETLIB
bool "Network support library"
default n
---help---
Enable support for the network support library.
if NETUTILS_UIPLIB
if NETUTILS_NETLIB
endif

4
netutils/uiplib/Makefile → netutils/netlib/Makefile
View File

@ -1,5 +1,5 @@
############################################################################
# apps/netutils/uiplib/Makefile
# apps/netutils/netlib/Makefile
#
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs
# UIP Library
ASRCS =
CSRCS = uiplib.c uip_sethostaddr.c uip_gethostaddr.c uip_setdraddr.c \
CSRCS = netlib.c uip_sethostaddr.c uip_gethostaddr.c uip_setdraddr.c \
uip_setnetmask.c uip_parsehttpurl.c uip_setifflag.c \
uip_getifflag.c

8
netutils/uiplib/uiplib.c → netutils/netlib/netlib.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* netutils/uiplib/uiplib.c
* netutils/netlib/netlib.c
* Various uIP library functions.
*
* Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
@ -49,14 +49,14 @@
#include <debug.h>
#include <nuttx/net/uip.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
/****************************************************************************
* Public Functions
****************************************************************************/
bool uiplib_ipaddrconv(const char *addrstr, uint8_t *ipaddr)
bool netlib_ipaddrconv(const char *addrstr, uint8_t *ipaddr)
{
unsigned char tmp;
char c;
@ -98,7 +98,7 @@ bool uiplib_ipaddrconv(const char *addrstr, uint8_t *ipaddr)
return true;
}
bool uiplib_hwmacconv(const char *hwstr, uint8_t *hw)
bool netlib_hwmacconv(const char *hwstr, uint8_t *hw)
{
unsigned char tmp;
char c;

6
netutils/uiplib/uip_gethostaddr.c → netutils/netlib/uip_gethostaddr.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* netutils/uiplib/uip_gethostaddr.c
* netutils/netlib/uip_gethostaddr.c
*
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -50,7 +50,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
/****************************************************************************
* Pre-processor Definitions
@ -84,7 +84,7 @@ int uip_gethostaddr(const char *ifname, struct in_addr *addr)
int ret = ERROR;
if (ifname && addr)
{
int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
if (sockfd >= 0)
{
struct ifreq req;

6
netutils/uiplib/uip_getifflag.c → netutils/netlib/uip_getifflag.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* netutils/uiplib/uip_getifflag.c
* netutils/netlib/uip_getifflag.c
*
* Copyright (C) 2007-2009, 2011, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -51,7 +51,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
/****************************************************************************
* Global Functions
@ -79,7 +79,7 @@ int uip_getifstatus(FAR const char *ifname, FAR uint8_t *flags)
{
/* Get a socket (only so that we get access to the INET subsystem) */
int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
if (sockfd >= 0)
{
struct ifreq req;

6
netutils/uiplib/uip_getmacaddr.c → netutils/netlib/uip_getmacaddr.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* netutils/uiplib/uip_getmacaddr.c
* netutils/netlib/uip_getmacaddr.c
*
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -50,7 +50,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
/****************************************************************************
* Global Functions
@ -78,7 +78,7 @@ int uip_getmacaddr(const char *ifname, uint8_t *macaddr)
{
/* Get a socket (only so that we get access to the INET subsystem) */
int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
if (sockfd >= 0)
{
struct ifreq req;

6
netutils/uiplib/uip_ipmsfilter.c → netutils/netlib/uip_ipmsfilter.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* netutils/uiplib/uip_setmultiaddr.c
* netutils/netlib/uip_setmultiaddr.c
*
* Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -50,7 +50,7 @@
#include <netinet/in.h>
#include <sys/sockio.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include <apps/netutils/ipmsfilter.h>
#ifdef CONFIG_NET_IGMP
@ -90,7 +90,7 @@ int ipmsfilter(FAR const char *ifname, FAR const struct in_addr *multiaddr,
{
/* Get a socket (only so that we get access to the INET subsystem) */
int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
if (sockfd >= 0)
{
struct ip_msfilter imsf;

4
netutils/uiplib/uip_listenon.c → netutils/netlib/uip_listenon.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* netutils/uiplib/uip_listenon.c
* netutils/netlib/uip_listenon.c
*
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -48,7 +48,7 @@
#include <debug.h>
#include <netinet/in.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
/****************************************************************************
* Public Functions

4
netutils/uiplib/uip_parsehttpurl.c → netutils/netlib/uip_parsehttpurl.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* netutils/uiplib/uip_parsehttpurl.c
* netutils/netlib/uip_parsehttpurl.c
*
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -43,7 +43,7 @@
#include <string.h>
#include <errno.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
/****************************************************************************
* Private Data

4
netutils/uiplib/uip_server.c → netutils/netlib/uip_server.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* netutils/uiplib/uip_server.c
* netutils/netlib/uip_server.c
*
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -51,7 +51,7 @@
#include <netinet/in.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
/****************************************************************************
* Public Functions

6
netutils/uiplib/uip_setdraddr.c → netutils/netlib/uip_setdraddr.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* netutils/uiplib/uip_setdraddr.c
* netutils/netlib/uip_setdraddr.c
*
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -50,7 +50,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
/****************************************************************************
* Global Functions
@ -80,7 +80,7 @@ int uip_setdraddr(const char *ifname, const struct in_addr *addr)
int ret = ERROR;
if (ifname && addr)
{
int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
if (sockfd >= 0)
{
struct ifreq req;

6
netutils/uiplib/uip_sethostaddr.c → netutils/netlib/uip_sethostaddr.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* netutils/uiplib/uip_sethostaddr.c
* netutils/netlib/uip_sethostaddr.c
*
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -50,7 +50,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
/****************************************************************************
* Global Functions
@ -80,7 +80,7 @@ int uip_sethostaddr(const char *ifname, const struct in_addr *addr)
int ret = ERROR;
if (ifname && addr)
{
int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
if (sockfd >= 0)
{
struct ifreq req;

8
netutils/uiplib/uip_setifflag.c → netutils/netlib/uip_setifflag.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* netutils/uiplib/uip_setifflag.c
* netutils/netlib/uip_setifflag.c
*
* Copyright (C) 2007-2009, 2011, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -50,7 +50,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
/****************************************************************************
* Global Functions
@ -77,7 +77,7 @@ int uip_ifup(const char *ifname)
{
/* Get a socket (only so that we get access to the INET subsystem) */
int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
if (sockfd >= 0)
{
struct ifreq req;
@ -120,7 +120,7 @@ int uip_ifdown(const char *ifname)
{
/* Get a socket (only so that we get access to the INET subsystem) */
int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
if (sockfd >= 0)
{
struct ifreq req;

6
netutils/uiplib/uip_setmacaddr.c → netutils/netlib/uip_setmacaddr.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* netutils/uiplib/uip_setmacaddr.c
* netutils/netlib/uip_setmacaddr.c
*
* Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -50,7 +50,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
/****************************************************************************
* Pre-processor Definitions
@ -89,7 +89,7 @@ int uip_setmacaddr(const char *ifname, const uint8_t *macaddr)
{
/* Get a socket (only so that we get access to the INET subsystem) */
int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
if (sockfd >= 0)
{
struct ifreq req;

6
netutils/uiplib/uip_setnetmask.c → netutils/netlib/uip_setnetmask.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* netutils/uiplib/uip_setnetmask.c
* netutils/netlib/uip_setnetmask.c
*
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -49,7 +49,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
/****************************************************************************
* Global Functions
@ -79,7 +79,7 @@ int uip_setnetmask(const char *ifname, const struct in_addr *addr)
int ret = ERROR;
if (ifname && addr)
{
int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
if (sockfd >= 0)
{
struct ifreq req;

2
netutils/telnetd/telnetd_daemon.c
View File

@ -54,7 +54,7 @@
#include <netinet/in.h>
#include <apps/netutils/telnetd.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include "telnetd.h"

2
netutils/telnetd/telnetd_driver.c
View File

@ -62,7 +62,7 @@
#include <nuttx/net/net.h>
#include <apps/netutils/telnetd.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include "telnetd.h"

2
netutils/webclient/webclient.c
View File

@ -72,7 +72,7 @@
#include <netinet/in.h>
#include <nuttx/version.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include <apps/netutils/webclient.h>
#if defined(CONFIG_NETUTILS_CODECS)

2
netutils/webserver/httpd.c
View File

@ -62,7 +62,7 @@
#endif
#include <nuttx/net/uip.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include <apps/netutils/httpd.h>
#include "httpd.h"

2
netutils/xmlrpc/Kconfig
View File

@ -7,7 +7,7 @@ config NETUTILS_XMLRPC
bool "XML RPC library"
default n
depends on NET_TCP
select NETUTILS_UIPLIB
select NETUTILS_NETLIB
---help---
Enables the Embeddable Lightweight XML-RPC Server discussed at
http://www.drdobbs.com/web-development/an-embeddable-lightweight-xml-rpc-server/184405364

10
nshlib/nsh_netcmds.c
View File

@ -69,18 +69,18 @@
#if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \
!defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS)
# include <apps/netutils/uiplib.h>
# include <apps/netutils/netlib.h>
# include <apps/netutils/dnsclient.h>
#endif
#if defined(CONFIG_NET_UDP) && CONFIG_NFILE_DESCRIPTORS > 0
# include <apps/netutils/uiplib.h>
# include <apps/netutils/netlib.h>
# include <apps/netutils/tftp.h>
#endif
#if defined(CONFIG_NET_TCP) && CONFIG_NFILE_DESCRIPTORS > 0
# ifndef CONFIG_NSH_DISABLE_WGET
# include <apps/netutils/uiplib.h>
# include <apps/netutils/netlib.h>
# include <apps/netutils/webclient.h>
# endif
#endif
@ -364,7 +364,7 @@ int tftpc_parseargs(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv,
break;
case 'h':
if (!uiplib_ipaddrconv(optarg, (FAR unsigned char*)&args->ipaddr))
if (!netlib_ipaddrconv(optarg, (FAR unsigned char*)&args->ipaddr))
{
nsh_output(vtbl, g_fmtarginvalid, argv[0]);
badarg = true;
@ -672,7 +672,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
{
hw = argv[i+1];
i++;
badarg = !uiplib_hwmacconv(hw, mac);
badarg = !netlib_hwmacconv(hw, mac);
}
else
{

2
nshlib/nsh_netinit.c
View File

@ -46,7 +46,7 @@
#include <net/if.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS)
# include <apps/netutils/dnsclient.h>
# include <apps/netutils/dhcpc.h>

6
nshlib/nsh_routecmds.c
View File

@ -43,7 +43,7 @@
#include <string.h>
#include <net/route.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/netlib.h>
#include "nsh.h"
#include "nsh_console.h"
@ -108,7 +108,7 @@ int cmd_addroute(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
/* We need to have a socket (any socket) in order to perform the ioctl */
sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
if (sockfd < 0)
{
nsh_output(vtbl, g_fmtcmdfailed, argv[0], "socket", NSH_ERRNO);
@ -236,7 +236,7 @@ int cmd_delroute(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
/* We need to have a socket (any socket) in order to perform the ioctl */
sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
if (sockfd < 0)
{
nsh_output(vtbl, g_fmtcmdfailed, argv[0], "socket", NSH_ERRNO);