NET: Rename uiplib/UIPLIB to netlib/NETLIB

20 files changed, 34 insertions, 34 deletions

diff --git a/apps/examples/README.txt b/apps/examples/README.txt
index 1352d4455..c743c38a9 100644
--- a/apps/examples/README.txt
+++ b/apps/examples/README.txt
@@ -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
 
diff --git a/apps/examples/cc3000/shell.c b/apps/examples/cc3000/shell.c
index f28d3f0ed..084302b7a 100644
--- a/apps/examples/cc3000/shell.c
+++ b/apps/examples/cc3000/shell.c
@@ -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>
diff --git a/apps/examples/cc3000/telnetd_daemon.c b/apps/examples/cc3000/telnetd_daemon.c
index a149f7abe..68bcbfbca 100644
--- a/apps/examples/cc3000/telnetd_daemon.c
+++ b/apps/examples/cc3000/telnetd_daemon.c
@@ -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"
 
diff --git a/apps/examples/dhcpd/target.c b/apps/examples/dhcpd/target.c
index 1434ae287..974970913 100644
--- a/apps/examples/dhcpd/target.c
+++ b/apps/examples/dhcpd/target.c
@@ -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>
 
 /****************************************************************************
diff --git a/apps/examples/discover/discover_main.c b/apps/examples/discover/discover_main.c
index 50f8dccc4..4d90ca96f 100644
--- a/apps/examples/discover/discover_main.c
+++ b/apps/examples/discover/discover_main.c
@@ -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
diff --git a/apps/examples/ftpd/ftpd_main.c b/apps/examples/ftpd/ftpd_main.c
index a6f8506f9..69e806ec9 100644
--- a/apps/examples/ftpd/ftpd_main.c
+++ b/apps/examples/ftpd/ftpd_main.c
@@ -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"
diff --git a/apps/examples/igmp/igmp.c b/apps/examples/igmp/igmp.c
index cb8feb002..f378f38f0 100644
--- a/apps/examples/igmp/igmp.c
+++ b/apps/examples/igmp/igmp.c
@@ -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"
diff --git a/apps/examples/nettest/nettest.c b/apps/examples/nettest/nettest.c
index 770d282d3..320a87cb2 100644
--- a/apps/examples/nettest/nettest.c
+++ b/apps/examples/nettest/nettest.c
@@ -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"
 
diff --git a/apps/examples/poll/net_listener.c b/apps/examples/poll/net_listener.c
index 3ec02704f..a71b03942 100644
--- a/apps/examples/poll/net_listener.c
+++ b/apps/examples/poll/net_listener.c
@@ -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"
 
diff --git a/apps/examples/poll/net_reader.c b/apps/examples/poll/net_reader.c
index 2f23bab3c..0b0c108d8 100644
--- a/apps/examples/poll/net_reader.c
+++ b/apps/examples/poll/net_reader.c
@@ -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"
 
diff --git a/apps/examples/sendmail/target.c b/apps/examples/sendmail/target.c
index e9e189da7..ac2fe7313 100644
--- a/apps/examples/sendmail/target.c
+++ b/apps/examples/sendmail/target.c
@@ -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>
 
 /****************************************************************************
diff --git a/apps/examples/tcpecho/tcpecho_main.c b/apps/examples/tcpecho/tcpecho_main.c
index 831f1f483..df8c6983d 100644
--- a/apps/examples/tcpecho/tcpecho_main.c
+++ b/apps/examples/tcpecho/tcpecho_main.c
@@ -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>
diff --git a/apps/examples/telnetd/telnetd.c b/apps/examples/telnetd/telnetd.c
index 351f466c6..6afabc2dc 100644
--- a/apps/examples/telnetd/telnetd.c
+++ b/apps/examples/telnetd/telnetd.c
@@ -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"
 
diff --git a/apps/examples/thttpd/thttpd_main.c b/apps/examples/thttpd/thttpd_main.c
index da040a218..fbd32bb15 100644
--- a/apps/examples/thttpd/thttpd_main.c
+++ b/apps/examples/thttpd/thttpd_main.c
@@ -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>
diff --git a/apps/examples/udp/target.c b/apps/examples/udp/target.c
index 229dc261b..8fd6a4c13 100644
--- a/apps/examples/udp/target.c
+++ b/apps/examples/udp/target.c
@@ -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"
 
diff --git a/apps/examples/uip/uip_main.c b/apps/examples/uip/uip_main.c
index 03da23df3..ebd67d095 100644
--- a/apps/examples/uip/uip_main.c
+++ b/apps/examples/uip/uip_main.c
@@ -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>
diff --git a/apps/examples/wget/Makefile.host b/apps/examples/wget/Makefile.host
index 3895835d8..ebd5f54e7 100644
--- a/apps/examples/wget/Makefile.host
+++ b/apps/examples/wget/Makefile.host
@@ -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 $@
diff --git a/apps/examples/wget/target.c b/apps/examples/wget/target.c
index 9c795d1e2..0a59a451d 100644
--- a/apps/examples/wget/target.c
+++ b/apps/examples/wget/target.c
@@ -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>
 
diff --git a/apps/examples/wgetjson/wgetjson_main.c b/apps/examples/wgetjson/wgetjson_main.c
index 8f82d1fca..ac7062577 100644
--- a/apps/examples/wgetjson/wgetjson_main.c
+++ b/apps/examples/wgetjson/wgetjson_main.c
@@ -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>
 
diff --git a/apps/examples/xmlrpc/xmlrpc_main.c b/apps/examples/xmlrpc/xmlrpc_main.c
index e115bb0ae..8c0fa2bcf 100644
--- a/apps/examples/xmlrpc/xmlrpc_main.c
+++ b/apps/examples/xmlrpc/xmlrpc_main.c
@@ -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