Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-09-05 08:28:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

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