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

Move netutils header files from include/net/uip to include/apps/netutils

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3399 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-03-19 16:54:35 +00:00
parent f5b52450bc
commit 32046718f4
50 changed files with 166 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/dhcpd/target.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* examples/dhcpd/target.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -43,8 +43,9 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <net/if.h>
#include <net/uip/uip-lib.h>
#include <net/uip/dhcpd.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/dhcpd.h>
/****************************************************************************
* Preprocessor Definitions

6
examples/igmp/igmp.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* examples/igmp/igmp.c
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -46,8 +46,8 @@
#include <net/if.h>
#include <net/uip/uip.h>
#include <net/uip/uip-lib.h>
#include <net/uip/ipmsfilter.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/ipmsfilter.h>
#include "igmp.h"

4
examples/nettest/nettest.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* examples/nettest/nettest.c
*
* Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -45,7 +45,7 @@
#include <net/if.h>
#include <net/uip/uip.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/uiplib.h>
#include "nettest.h"

4
examples/poll/net_listener.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* examples/poll/net_listener.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -54,7 +54,7 @@
#include <debug.h>
#include <net/if.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/uiplib.h>
#include "poll_internal.h"

4
examples/poll/net_reader.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* examples/poll/net_reader.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -54,7 +54,7 @@
#include <debug.h>
#include <net/if.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/uiplib.h>
#include "poll_internal.h"

4
examples/sendmail/host.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* examples/sendmail/host.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -43,7 +43,7 @@
#include <string.h>
#include <errno.h>
#include <net/uip/smtp.h>
#include <apps/netutils/smtp.h>
/****************************************************************************
* Private Data

6
examples/sendmail/target.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* examples/sendmail/target.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009. 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -45,8 +45,8 @@
#include <errno.h>
#include <net/if.h>
#include <net/uip/uip-lib.h>
#include <net/uip/smtp.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/smtp.h>
/****************************************************************************
* Pre-processor Defintitions

7
examples/thttpd/main.c
View File

@ -49,11 +49,12 @@
#include <debug.h>
#include <net/if.h>
#include <net/uip/thttpd.h>
#include <net/uip/uip-arp.h>
#include <net/uip/uip-lib.h>
#include <netinet/ether.h>
#include <net/uip/uip-arp.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/thttpd.h>
#include <nuttx/ramdisk.h>
#include <nuttx/binfmt.h>
#include <nuttx/nxflat.h>

6
examples/udp/target.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* examples/udp/nettest.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -14,7 +14,7 @@
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name Gregory Nutt nor the names of its contributors may be
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
@ -42,7 +42,7 @@
#include <debug.h>
#include <net/uip/uip.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/uiplib.h>
#include "udp-internal.h"

12
examples/uip/main.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* examples/uip/main.c
*
* Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Based on uIP which also has a BSD style license:
@ -56,7 +56,9 @@
#include <net/if.h>
#include <net/uip/uip.h>
#include <net/uip/uip-arp.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/uiplib.h>
#ifdef CONFIG_EXAMPLE_UIP_DHCPC
#include <arpa/inet.h>
#endif
@ -68,13 +70,13 @@
/* DHCPC may be used in conjunction with any other feature (or not) */
#ifdef CONFIG_EXAMPLE_UIP_DHCPC
# include <net/uip/resolv.h>
# include <net/uip/dhcpc.h>
# include <apps/netutils/resolv.h>
# include <apps/netutils/dhcpc.h>
#endif
/* Include uIP webserver definitions */
#include <net/uip/httpd.h>
#include <apps/netutils/httpd.h>
/****************************************************************************
* Definitions

14
examples/wget/Makefile.host
View File

@ -50,14 +50,14 @@ all: $(BIN)
$(OBJS): %.o1: %.c
$(HOSTCC) -c $(HOSTCFLAGS) $< -o $@
net/uip:
@mkdir -p net/uip
apps/netutils:
@mkdir -p apps/netutils
net/uip/webclient.h: net/uip $(TOPDIR)/include/net/uip/webclient.h
@cp -a $(TOPDIR)/include/net/uip/webclient.h net/uip/.
apps/netutils/webclient.h: apps/netutils $(TOPDIR)/include/apps/netutils/webclient.h
@cp -a $(TOPDIR)/include/apps/netutils/webclient.h apps/netutils/.
net/uip/uip-lib.h: net/uip $(TOPDIR)/include/net/uip/uip-lib.h
@cp -a $(TOPDIR)/include/net/uip/uip-lib.h net/uip/.
apps/netutils/uiplib.h: apps/netutils $(TOPDIR)/include/apps/netutils/uiplib.h
@cp -a $(TOPDIR)/include/apps/netutils/uiplib.h apps/netutils/.
nuttx:
@mkdir nuttx
@ -65,7 +65,7 @@ nuttx:
nuttx/config.h: nuttx
@touch nuttx/config.h
headers: net/uip/webclient.h net/uip/uip-lib.h nuttx/config.h
headers: apps/netutils/webclient.h apps/netutils/uiplib.h nuttx/config.h
$(BIN): headers $(OBJS)
$(HOSTCC) $(HOSTLDFLAGS) $(OBJS) -o $@

3
examples/wget/host.c
View File

@ -37,13 +37,14 @@
* Included Files
****************************************************************************/
#include <net/uip/webclient.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <apps/netutils/webclient.h>
/****************************************************************************
* Private Data
****************************************************************************/

9
examples/wget/target.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* examples/wget/target.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -47,9 +47,10 @@
#include <net/if.h>
#include <net/uip/uip.h>
#include <net/uip/uip-lib.h>
#include <net/uip/resolv.h>
#include <net/uip/webclient.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/resolv.h>
#include <apps/netutils/webclient.h>
/****************************************************************************
* Preprocessor Definitions

10
include/net/uip/dhcpc.h → include/apps/netutils/dhcpc.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* net/uip/dhcpc.n
* apps/netutils/dhcpc.n
*
* Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* This logic was leveraged from uIP which also has a BSD-style license:
@ -35,8 +35,8 @@
* SUCH DAMAGE.
*/
#ifndef __NET_UIP_DHCPC_H
#define __NET_UIP_DHCPC_H
#ifndef __APPS_NETUTILS_DHCPC_H
#define __APPS_NETUTILS_DHCPC_H
/****************************************************************************
* Included Files
@ -82,4 +82,4 @@ EXTERN void dhcpc_close(void *handle);
}
#endif
#endif /* __NET_UIP_DHCPC_H */
#endif /* __APPS_NETUTILS_DHCPC_H */

10
include/net/uip/dhcpd.h → include/apps/netutils/dhcpd.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* net/uipt/dhcpd.h
* apps/netutils/dhcpd.h
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* This logic was leveraged from uIP which also has a BSD-style license:
@ -35,8 +35,8 @@
* SUCH DAMAGE.
*/
#ifndef __NET_UIP_DHCPD_H
#define __NET_UIP_DHCPD_H
#ifndef __APPS_NETUTILS_DHCPD_H
#define __APPS_NETUTILS_DHCPD_H
/****************************************************************************
* Included Files
@ -68,4 +68,4 @@ EXTERN int dhcpd_run(void);
}
#endif
#endif /* __NET_UIP_DHCPD_H */
#endif /* __APPS_NETUTILS_DHCPD_H */

10
include/net/uip/httpd.h → include/apps/netutils/httpd.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* net/uip/httpd.h
* apps/netutils/httpd.h
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Based on uIP which also has a BSD style license:
@ -37,8 +37,8 @@
*
****************************************************************************/
#ifndef _NET_UIP_HTTPD_H
#define _NET_UIP_HTTPD_H
#ifndef __APPS_NETUTILS_HTTPD_H
#define __APPS_NETUTILS_HTTPD_H
/****************************************************************************
* Included Files
@ -51,4 +51,4 @@
extern void httpd_init(void);
extern int httpd_listen(void);
#endif /* _NET_UIP_HTTPD_H */
#endif /* __APPS_NETUTILS_HTTPD_H */

10
include/net/uip/ipmsfilter.h → include/apps/netutils/ipmsfilter.h
View File

@ -1,8 +1,8 @@
/****************************************************************************
* net/uip/ipmsfilter.h
* apps/netutils/ipmsfilter.h
* User interface to add/remove IP multicast address
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -34,8 +34,8 @@
*
****************************************************************************/
#ifndef __NET_UIP_IPMSFILTER_H
#define __NET_UIP_IPMSFILTER_H
#ifndef __APPS_NETUTILS_IPMSFILTER_H
#define __APPS_NETUTILS_IPMSFILTER_H
/****************************************************************************
* Included Files
@ -98,4 +98,4 @@ EXTERN int ipmsfilter(FAR const char *ifname,
#endif
#endif /* CONFIG_NET_IGMP */
#endif /* __NET_UIP_IPMSFILTER_H */
#endif /* __APPS_NETUTILS_IPMSFILTER_H */

8
include/net/uip/resolv.h → include/apps/netutils/resolv.h
View File

@ -1,4 +1,4 @@
/* resolv.h
/* includes/apps/netutils/resolv.h
* DNS resolver code header file.
* Authtor Adam Dunkels <adam@dunkels.com>
*
@ -30,8 +30,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef __UIP_RESOLV_H__
#define __UIP_RESOLV_H__
#ifndef __APPS_NETUTILS_RESOLVE_H
#define __APPS_NETUTILS_RESOLVE_H
#include <net/uip/uipopt.h>
@ -62,4 +62,4 @@ EXTERN int resolv_query(const char *name, struct sockaddr_in *addr);
}
#endif
#endif /* __UIP_RESOLV_H__ */
#endif /* __APPS_NETUTILS_RESOLVE_H */

10
include/net/uip/smtp.h → include/apps/netutils/smtp.h
View File

@ -1,8 +1,8 @@
/****************************************************************************
* smtp.h
* include/apps/netutils/smtp.h
* SMTP header file
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Heavily leveraged from uIP 1.0 which also has a BSD-like license:
@ -37,8 +37,8 @@
*
****************************************************************************/
#ifndef __SMTP_H__
#define __SMTP_H__
#ifndef __APPS_NETUTILS_SMTP_H
#define __APPS_NETUTILS_SMTP_H
/****************************************************************************
* Included Files
@ -63,4 +63,4 @@ extern int smtp_send(void *handle, const char *to, const char *cc,
const char *msg, int msglen);
extern void smtp_close(void *handle);
#endif /* __SMTP_H__ */
#endif /* __APPS_NETUTILS_SMTP_H */

10
include/net/uip/telnetd.h → include/apps/netutils/telnetd.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* include/net/uip/telnetd.h
* include/apps/netutils/telnetd.h
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* This is a leverage of similar logic from uIP:
@ -36,8 +36,8 @@
* SUCH DAMAGE.
****************************************************************************/
#ifndef __NET_UIP_TELNETD_H
#define __NET_UIP_TELNETD_H
#ifndef __APPS_NETUTILS_TELNETD_H
#define __APPS_NETUTILS_TELNETD_H
/****************************************************************************
* Included Files
@ -67,4 +67,4 @@ EXTERN void telnetd_init(void);
}
#endif
#endif /* __NET_UIP_TELNETD_H */
#endif /* __APPS_NETUTILS_TELNETD_H */

10
include/net/uip/tftp.h → include/apps/netutils/tftp.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* include/net/uip/tftp.h
* include/apps/netutils/tftp.h
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __NET_UIP_TFTP_H
#define __NET_UIP_TFTP_H
#ifndef __APPS_NETUTILS_TFTP_H
#define __APPS_NETUTILS_TFTP_H
/****************************************************************************
* Included Files
@ -70,4 +70,4 @@ EXTERN int tftpput(const char *local, const char *remote, in_addr_t addr, bool b
}
#endif
#endif /* __NET_UIP_TFTP_H */
#endif /* __APPS_NETUTILS_TFTP_H */

10
include/net/uip/thttpd.h → include/apps/netutils/thttpd.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* net/uip/thttpd.h
* apps/netutils/thttpd.h
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __NET_UIP_THTTPD_H
#define __NET_UIP_THTTPD_H
#ifndef __APPS_NETUTILS_THTTPD_H
#define __APPS_NETUTILS_THTTPD_H
/****************************************************************************
* Included Files
@ -98,4 +98,4 @@ EXTERN int thttpd_main(int argc, char **argv);
}
#endif
#endif /* __NET_UIP_THTTPD_H */
#endif /* __APPS_NETUTILS_THTTPD_H */

8
include/net/uip/uip-lib.h → include/apps/netutils/uiplib.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* net/uip/uiplib.h
* apps/netutils/uiplib.h
* Various non-standard APIs to support netutils. All non-standard and
* intended only for internal use.
*
@ -42,8 +42,8 @@
*
****************************************************************************/
#ifndef __NET_UIP_UIP_LIB_H
#define __NET_UIP_UIP_LIB_H
#ifndef __APPS_NETUTILS_UIPLIB_H
#define __APPS_NETUTILS_UIPLIB_H
/****************************************************************************
* Included Files
@ -126,4 +126,4 @@ extern int uip_parsehttpurl(const char *url, uint16_t *port,
extern void uip_server(uint16_t portno, pthread_startroutine_t handler, int stacksize);
#endif /* __NET_UIP_UIP_LIB_H */
#endif /* __APPS_NETUTILS_UIPLIB_H */

10
include/net/uip/webclient.h → include/apps/netutils/webclient.h
View File

@ -1,8 +1,8 @@
/****************************************************************************
* include/net/uip/webclient.h
* include/apps/netutils/webclient.h
* Header file for the HTTP client
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Based remotely on the uIP webclient which also has a BSD style license:
@ -39,8 +39,8 @@
*
****************************************************************************/
#ifndef __NET_UIP_WEBCLIENT_H
#define __NET_UIP_WEBCLIENT_H
#ifndef __APPS_NETUTILS_WEBCLIENT_H
#define __APPS_NETUTILS_WEBCLIENT_H
/****************************************************************************
* Included Files
@ -146,4 +146,4 @@ EXTERN int wget(FAR const char *url, FAR char *buffer, int buflen,
}
#endif
#endif /* __NET_UIP_WEBCLIENT_H */
#endif /* __APPS_NETUTILS_WEBCLIENT_H */

6
netutils/dhcpc/dhcpc.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/dhcpc/dhcpc.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Based heavily on portions of uIP:
@ -53,8 +53,8 @@
#include <debug.h>
#include <net/uip/uip.h>
#include <net/uip/dhcpc.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/dhcpc.h>
#include <apps/netutils/uiplib.h>
/****************************************************************************
* Definitions

12
netutils/dhcpd/dhcpd.c
View File

@ -52,12 +52,12 @@
# define ERROR (-1)
# define OK (0)
#else
# include <nuttx/config.h> /* NuttX configuration */
# include <debug.h> /* For ndbg, vdbg */
# include <nuttx/compiler.h> /* For CONFIG_CPP_HAVE_WARNING */
# include <arch/irq.h> /* For irqstore() and friends -- REVISIT */
# include <net/uip/uip-arp.h> /* For low-level ARP interfaces -- REVISIT */
# include <net/uip/dhcpd.h> /* Advertised DHCPD APIs */
# include <nuttx/config.h> /* NuttX configuration */
# include <debug.h> /* For ndbg, vdbg */
# include <nuttx/compiler.h> /* For CONFIG_CPP_HAVE_WARNING */
# include <arch/irq.h> /* For irqstore() and friends -- REVISIT */
# include <net/uip/uip-arp.h> /* For low-level ARP interfaces -- REVISIT */
# include <apps/netutils/dhcpd.h> /* Advertised DHCPD APIs */
#endif
#include <sys/socket.h>

2
netutils/resolv/resolv.c
View File

@ -63,7 +63,7 @@
#include <sys/socket.h>
#include <arpa/inet.h>
#include <net/uip/resolv.h>
#include <apps/netutils/resolv.h>
/****************************************************************************
* Definitions

6
netutils/smtp/smtp.c
View File

@ -1,8 +1,8 @@
/****************************************************************************
* smtp.c
* apps/netutitls/smtp/smtp.c
* smtp SMTP E-mail sender
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Heavily leveraged from uIP 1.0 which also has a BSD-like license:
@ -58,7 +58,7 @@
#include <sys/socket.h>
#include <net/uip/uip.h>
#include <net/uip/smtp.h>
#include <apps/netutils/smtp.h>
/****************************************************************************
* Definitions

6
netutils/telnetd/telnetd.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/telnetd/telnetd.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* This is a leverage of similar logic from uIP:
@ -53,8 +53,8 @@
#include <pthread.h>
#include <debug.h>
#include <net/uip/telnetd.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/telnetd.h>
#include <apps/netutils/uiplib.h>
#include "shell.h"

4
netutils/tftpc/tftpc_get.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netuils/tftp/tftpc_get.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -51,7 +51,7 @@
#include <net/uip/uipopt.h>
#include <net/uip/uip.h>
#include <net/uip/tftp.h>
#include <apps/netutils/tftp.h>
#include "tftpc_internal.h"

4
netutils/tftpc/tftpc_packets.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netuils/tftp/tftpc_packets.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -53,7 +53,7 @@
#include <net/uip/uipopt.h>
#include <net/uip/uip.h>
#include <net/uip/tftp.h>
#include <apps/netutils/tftp.h>
#include "tftpc_internal.h"

4
netutils/tftpc/tftpc_put.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netuils/tftp/tftpc_put.c
*
* Copyright (C) 2008-2009Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -51,7 +51,7 @@
#include <net/uip/uipopt.h>
#include <net/uip/uip.h>
#include <net/uip/tftp.h>
#include <apps/netutils/tftp.h>
#include "tftpc_internal.h"

4
netutils/thttpd/libhttpd.c
View File

@ -2,7 +2,7 @@
* netutils/thttpd/libhttpd.c
* HTTP Protocol Library
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Derived from the file of the same name in the original THTTPD package:
@ -59,7 +59,7 @@
#include <debug.h>
#include <nuttx/regex.h>
#include <net/uip/thttpd.h>
#include <apps/netutils/thttpd.h>
#include "config.h"
#include "libhttpd.h"

4
netutils/thttpd/thttpd.c
View File

@ -2,7 +2,7 @@
* netutils/thttpd/thttpd.c
* Tiny HTTP Server
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Derived from the file of the same name in the original THTTPD package:
@ -55,7 +55,7 @@
#include <nuttx/compiler.h>
#include <nuttx/symtab.h>
#include <net/uip/thttpd.h>
#include <apps/netutils/thttpd.h>
#include "config.h"
#include "fdwatch.h"

4
netutils/thttpd/thttpd_cgi.c
View File

@ -2,7 +2,7 @@
* netutils/thttpd/thttpd_cgi.c
* CGI support
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Derived from the file libhttpd.c in the original THTTPD package:
@ -55,7 +55,7 @@
#include <nuttx/symtab.h>
#include <nuttx/binfmt.h>
#include <net/uip/thttpd.h>
#include <apps/netutils/thttpd.h>
#include "config.h"
#include "libhttpd.h"

4
netutils/uiplib/uip_gethostaddr.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/uiplib/uip_gethostaddr.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -49,7 +49,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/uiplib.h>
/****************************************************************************
* Pre-processor Definitions

4
netutils/uiplib/uip_getmacaddr.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/uiplib/uip_getmacaddr.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -49,7 +49,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/uiplib.h>
/****************************************************************************
* Global Functions

6
netutils/uiplib/uip_ipmsfilter.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/uiplib/uip_setmultiaddr.c
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -50,8 +50,8 @@
#include <netinet/in.h>
#include <sys/sockio.h>
#include <net/uip/uip-lib.h>
#include <net/uip/ipmsfilter.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/ipmsfilter.h>
#ifdef CONFIG_NET_IGMP

6
netutils/uiplib/uip_parsehttpurl.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/uiplib/uip_parsehttpurl.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -38,10 +38,12 @@
*****************************************************************************/
#include <nuttx/config.h>
#include <stdint.h>
#include <string.h>
#include <errno.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/uiplib.h>
/****************************************************************************
* Private Data

4
netutils/uiplib/uip_server.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/uiplib/uip_server.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -49,7 +49,7 @@
#include <debug.h>
#include <netinet/in.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/uiplib.h>
/****************************************************************************
* Public Functions

4
netutils/uiplib/uip_setdraddr.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/uiplib/uip_setdraddr.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -50,7 +50,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/uiplib.h>
/****************************************************************************
* Global Functions

4
netutils/uiplib/uip_sethostaddr.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/uiplib/uip_sethostaddr.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -50,7 +50,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/uiplib.h>
/****************************************************************************
* Global Functions

4
netutils/uiplib/uip_setmacaddr.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/uiplib/uip_setmacaddr.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -50,7 +50,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/uiplib.h>
/****************************************************************************
* Pre-processor Definitions

4
netutils/uiplib/uip_setnetmask.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/uiplib/uip_setnetmask.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -49,7 +49,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/uiplib.h>
/****************************************************************************
* Global Functions

9
netutils/uiplib/uiplib.c
View File

@ -2,7 +2,7 @@
* netutils/uiplib/uiplib.c
* Various uIP library functions.
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Based on uIP which also has a BSD style license:
@ -45,8 +45,13 @@
#include <stdint.h>
#include <stdbool.h>
#include <net/uip/uip.h>
#include <net/uip/uip-lib.h>
#include <apps/netutils/uiplib.h>
/****************************************************************************
* Public Functions
****************************************************************************/
bool uiplib_ipaddrconv(const char *addrstr, uint8_t *ipaddr)
{

8
netutils/webclient/webclient.c
View File

@ -2,7 +2,7 @@
* netutils/webclient/webclient.c
* Implementation of the HTTP client.
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Based on uIP which also has a BSD style license:
@ -64,13 +64,13 @@
#ifdef CONFIG_HAVE_GETHOSTBYNAME
# include <netdb.h>
#else
# include <net/uip/resolv.h>
# include <apps/netutils/resolv.h>
#endif
#include <arpa/inet.h>
#include <netinet/in.h>
#include <net/uip/uip-lib.h>
#include <net/uip/webclient.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/webclient.h>
/****************************************************************************
* Definitions

6
netutils/webserver/httpd.c
View File

@ -2,7 +2,7 @@
* netutils/webserver/httpd.c
* httpd Web server
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* This is a leverage of similar logic from uIP:
@ -59,8 +59,8 @@
#include <debug.h>
#include <net/uip/uip.h>
#include <net/uip/uip-lib.h>
#include <net/uip/httpd.h>
#include <apps/netutils/uiplib.h>
#include <apps/netutils/httpd.h>
#include "httpd.h"
#include "httpd_cgi.h"

2
netutils/webserver/httpd_cgi.c
View File

@ -43,7 +43,7 @@
#include <nuttx/compiler.h>
#include <net/uip/uip.h>
#include <net/uip/httpd.h>
#include <apps/netutils/httpd.h>
#include "httpd_cgi.h"

2
netutils/webserver/httpd_cgi.h
View File

@ -33,7 +33,7 @@
#ifndef __HTTPD_CGI_H__
#define __HTTPD_CGI_H__
#include <net/uip/httpd.h>
#include <apps/netutils/httpd.h>
#include "httpd.h"

4
netutils/webserver/httpd_fs.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/webserver/httpd_fs.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Based on uIP which also has a BSD style license:
@ -43,7 +43,7 @@
#include <stdint.h>
#include <net/uip/httpd.h>
#include <apps/netutils/httpd.h>
#include "httpd.h"
#include "httpd_fsdata.h"