diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-15 16:37:20 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-15 16:37:20 +0000 |
commit | 2c0247a19db16916e3fdc831ee5396c75ad852c2 (patch) | |
tree | 2029ba80749910081bbbdbd90439e1f27092d6ef | |
parent | de5703237a8973502fdd4c87e993a998be192863 (diff) | |
download | nuttx-2c0247a19db16916e3fdc831ee5396c75ad852c2.tar.gz nuttx-2c0247a19db16916e3fdc831ee5396c75ad852c2.tar.bz2 nuttx-2c0247a19db16916e3fdc831ee5396c75ad852c2.zip |
Changing NuttX fixed size type names to C99 standard names -- things will be broken for awhile
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2347 42af7a65-404d-4744-a932-0658087f49c3
35 files changed, 1343 insertions, 1329 deletions
diff --git a/nuttx/netutils/dhcpc/dhcpc.c b/nuttx/netutils/dhcpc/dhcpc.c index 670b2256c..e35b0a116 100644 --- a/nuttx/netutils/dhcpc/dhcpc.c +++ b/nuttx/netutils/dhcpc/dhcpc.c @@ -1,7 +1,7 @@ /**************************************************************************** * netutils/dhcpc/dhcpc.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Based heavily on portions of uIP: @@ -45,6 +45,7 @@ #include <sys/socket.h> #include <stdlib.h> +#include <stdint.h> #include <string.h> #include <unistd.h> #include <time.h> @@ -100,23 +101,23 @@ struct dhcp_msg { - uint8 op; - uint8 htype; - uint8 hlen; - uint8 hops; - uint8 xid[4]; - uint16 secs; - uint16 flags; - uint8 ciaddr[4]; - uint8 yiaddr[4]; - uint8 siaddr[4]; - uint8 giaddr[4]; - uint8 chaddr[16]; + uint8_t op; + uint8_t htype; + uint8_t hlen; + uint8_t hops; + uint8_t xid[4]; + uint16_t secs; + uint16_t flags; + uint8_t ciaddr[4]; + uint8_t yiaddr[4]; + uint8_t siaddr[4]; + uint8_t giaddr[4]; + uint8_t chaddr[16]; #ifndef CONFIG_NET_DHCP_LIGHT - uint8 sname[64]; - uint8 file[128]; + uint8_t sname[64]; + uint8_t file[128]; #endif - uint8 options[312]; + uint8_t options[312]; }; struct dhcpc_state_s @@ -134,8 +135,8 @@ struct dhcpc_state_s * Private Data ****************************************************************************/ -static const uint8 xid[4] = {0xad, 0xde, 0x12, 0x23}; -static const uint8 magic_cookie[4] = {99, 130, 83, 99}; +static const uint8_t xid[4] = {0xad, 0xde, 0x12, 0x23}; +static const uint8_t magic_cookie[4] = {99, 130, 83, 99}; /**************************************************************************** * Private Functions @@ -145,7 +146,7 @@ static const uint8 magic_cookie[4] = {99, 130, 83, 99}; * Name: dhcpc_add<option> ****************************************************************************/ -static uint8 *dhcpc_addmsgtype(uint8 *optptr, uint8 type) +static uint8_t *dhcpc_addmsgtype(uint8_t *optptr, uint8_t type) { *optptr++ = DHCP_OPTION_MSG_TYPE; *optptr++ = 1; @@ -153,7 +154,7 @@ static uint8 *dhcpc_addmsgtype(uint8 *optptr, uint8 type) return optptr; } -static uint8 *dhcpc_addserverid(struct in_addr *serverid, uint8 *optptr) +static uint8_t *dhcpc_addserverid(struct in_addr *serverid, uint8_t *optptr) { *optptr++ = DHCP_OPTION_SERVER_ID; *optptr++ = 4; @@ -161,7 +162,7 @@ static uint8 *dhcpc_addserverid(struct in_addr *serverid, uint8 *optptr) return optptr + 4; } -static uint8 *dhcpc_addreqipaddr(struct in_addr *ipaddr, uint8 *optptr) +static uint8_t *dhcpc_addreqipaddr(struct in_addr *ipaddr, uint8_t *optptr) { *optptr++ = DHCP_OPTION_REQ_IPADDR; *optptr++ = 4; @@ -169,7 +170,7 @@ static uint8 *dhcpc_addreqipaddr(struct in_addr *ipaddr, uint8 *optptr) return optptr + 4; } -static uint8 *dhcpc_addreqoptions(uint8 *optptr) +static uint8_t *dhcpc_addreqoptions(uint8_t *optptr) { *optptr++ = DHCP_OPTION_REQ_LIST; *optptr++ = 3; @@ -179,7 +180,7 @@ static uint8 *dhcpc_addreqoptions(uint8 *optptr) return optptr; } -static uint8 *dhcpc_addend(uint8 *optptr) +static uint8_t *dhcpc_addend(uint8_t *optptr) { *optptr++ = DHCP_OPTION_END; return optptr; @@ -193,7 +194,7 @@ static int dhcpc_sendmsg(struct dhcpc_state_s *pdhcpc, struct dhcpc_state *presult, int msgtype) { struct sockaddr_in addr; - uint8 *pend; + uint8_t *pend; in_addr_t serverid = INADDR_BROADCAST; int len; @@ -246,7 +247,7 @@ static int dhcpc_sendmsg(struct dhcpc_state_s *pdhcpc, } pend = dhcpc_addend(pend); - len = pend - (uint8*)&pdhcpc->packet; + len = pend - (uint8_t*)&pdhcpc->packet; /* Send the request */ @@ -262,10 +263,10 @@ static int dhcpc_sendmsg(struct dhcpc_state_s *pdhcpc, * Name: dhcpc_parseoptions ****************************************************************************/ -static uint8 dhcpc_parseoptions(struct dhcpc_state *presult, uint8 *optptr, int len) +static uint8_t dhcpc_parseoptions(struct dhcpc_state *presult, uint8_t *optptr, int len) { - uint8 *end = optptr + len; - uint8 type = 0; + uint8_t *end = optptr + len; + uint8_t type = 0; while (optptr < end) { @@ -302,7 +303,7 @@ static uint8 dhcpc_parseoptions(struct dhcpc_state *presult, uint8 *optptr, int * Name: dhcpc_parsemsg ****************************************************************************/ -static uint8 dhcpc_parsemsg(struct dhcpc_state_s *pdhcpc, int buflen, +static uint8_t dhcpc_parsemsg(struct dhcpc_state_s *pdhcpc, int buflen, struct dhcpc_state *presult) { if (pdhcpc->packet.op == DHCP_REPLY && @@ -330,8 +331,8 @@ void *dhcpc_open(const void *macaddr, int maclen) struct timeval tv; dbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", - ((uint8*)macaddr)[0], ((uint8*)macaddr)[1], ((uint8*)macaddr)[2], - ((uint8*)macaddr)[3], ((uint8*)macaddr)[4], ((uint8*)macaddr)[5]); + ((uint8_t*)macaddr)[0], ((uint8_t*)macaddr)[1], ((uint8_t*)macaddr)[2], + ((uint8_t*)macaddr)[3], ((uint8_t*)macaddr)[4], ((uint8_t*)macaddr)[5]); /* Allocate an internal DHCP structure */ @@ -404,7 +405,7 @@ int dhcpc_request(void *handle, struct dhcpc_state *presult) struct in_addr oldaddr; struct in_addr newaddr; ssize_t result; - uint8 msgtype; + uint8_t msgtype; int retries; int state; diff --git a/nuttx/netutils/dhcpd/dhcpd.c b/nuttx/netutils/dhcpd/dhcpd.c index 4ae10bcd7..cbe6c8883 100644 --- a/nuttx/netutils/dhcpd/dhcpd.c +++ b/nuttx/netutils/dhcpd/dhcpd.c @@ -39,10 +39,6 @@ #ifdef CONFIG_NETUTILS_DHCPD_HOST # include <stdio.h> -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -typedef unsigned char bool; # define HTONS(a) htons(a) # define HTONL(a) htonl(a) @@ -53,8 +49,6 @@ typedef unsigned char bool; # define ndbg(...) printf(__VA_ARGS__) # define nvdbg(...) printf(__VA_ARGS__) -# define TRUE (1) -# define FALSE (0) # define ERROR (-1) # define OK (0) #else @@ -70,6 +64,7 @@ typedef unsigned char bool; #include <sys/ioctl.h> #include <stdint.h> +#include <stdbool.h> #include <string.h> #include <unistd.h> #include <time.h> @@ -320,16 +315,16 @@ static inline bool dhcpd_leaseexpired(struct lease_s *lease) { if (lease->expiry < dhcpd_time()) { - return FALSE; + return false; } else { memset(lease, 0, sizeof(struct lease_s)); - return TRUE; + return true; } } #else -# define dhcpd_leaseexpired(lease) (FALSE) +# define dhcpd_leaseexpired(lease) (false) #endif /**************************************************************************** @@ -345,7 +340,7 @@ struct lease_s *dhcpd_setlease(const uint8_t *mac, in_addr_t ipaddr, time_t expi { ret = &g_state.ds_leases[ndx]; memcpy(ret->mac, mac, DHCP_HLEN_ETHERNET); - ret->allocated = TRUE; + ret->allocated = true; #ifdef HAVE_LEASE_TIME ret->expiry = dhcpd_time() + expiry; #endif @@ -424,7 +419,7 @@ in_addr_t dhcpd_allocipaddr(void) # warning " to verify that there is no other user of this IP address" #endif memset(g_state.ds_leases[ipaddr - CONFIG_NETUTILS_DHCPD_STARTIP].mac, 0, DHCP_HLEN_ETHERNET); - g_state.ds_leases[ipaddr - CONFIG_NETUTILS_DHCPD_STARTIP].allocated = TRUE; + g_state.ds_leases[ipaddr - CONFIG_NETUTILS_DHCPD_STARTIP].allocated = true; #ifdef HAVE_LEASE_TIME g_state.ds_leases[ipaddr - CONFIG_NETUTILS_DHCPD_STARTIP].expiry = dhcpd_time() + CONFIG_NETUTILS_DHCPD_OFFERTIME; #endif @@ -455,7 +450,7 @@ static inline bool dhcpd_parseoptions(void) /* Bad magic number... skip g_state.ds_outpacket */ ndbg("Bad magic: %d,%d,%d,%d\n", ptr[0], ptr[1], ptr[2], ptr[3]); - return FALSE; + return false; } /* Set up to parse the options */ @@ -532,11 +527,11 @@ static inline bool dhcpd_parseoptions(void) } else { - return TRUE; + return true; } break; #else - return TRUE; + return true; #endif case DHCP_OPTION_REQ_IPADDR: /* Requested IP Address */ @@ -587,7 +582,7 @@ static inline bool dhcpd_parseoptions(void) remaining -= optlen; } while (remaining > 0); - return FALSE; + return false; } /**************************************************************************** @@ -611,10 +606,10 @@ static inline bool dhcpd_verifyreqip(void) lease = dhcpd_findbyipaddr(g_state.ds_optreqip); if (!lease || dhcpd_leaseexpired(lease)) { - return TRUE; + return true; } } - return FALSE; + return false; } /**************************************************************************** @@ -643,9 +638,9 @@ static inline bool dhcpd_verifyreqleasetime(uint32_t *leasetime) /* Return the clipped lease time */ *leasetime = tmp; - return TRUE; + return true; } - return FALSE; + return false; } /**************************************************************************** @@ -946,9 +941,9 @@ static inline int dhcpd_sendoffer(in_addr_t ipaddr, uint32_t leasetime) /* Send the offer response */ #ifdef CONFIG_NETUTILS_DHCPD_IGNOREBROADCAST - return dhcpd_sendpacket(TRUE); + return dhcpd_sendpacket(true); #else - return dhcpd_sendpacket(FALSE); + return dhcpd_sendpacket(false); #endif } @@ -962,7 +957,7 @@ static int dhcpd_sendnak(void) dhcpd_initpacket(DHCPNAK); memcpy(g_state.ds_outpacket.ciaddr, g_state.ds_inpacket.ciaddr, 4); - return dhcpd_sendpacket(TRUE); + return dhcpd_sendpacket(true); } /**************************************************************************** @@ -991,9 +986,9 @@ int dhcpd_sendack(in_addr_t ipaddr) dhcpd_addoption32(DHCP_OPTION_LEASE_TIME, htonl(leasetime)); #ifdef CONFIG_NETUTILS_DHCPD_IGNOREBROADCAST - if (dhcpd_sendpacket(TRUE) < 0) + if (dhcpd_sendpacket(true) < 0) #else - if (dhcpd_sendpacket(FALSE) < 0) + if (dhcpd_sendpacket(false) < 0) #endif { return ERROR; diff --git a/nuttx/netutils/resolv/resolv.c b/nuttx/netutils/resolv/resolv.c index aac9ee49e..60da2015b 100644 --- a/nuttx/netutils/resolv/resolv.c +++ b/nuttx/netutils/resolv/resolv.c @@ -12,7 +12,7 @@ * the resolver code calls a callback function called resolv_found() * that must be implemented by the module that uses the resolver. * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Based heavily on portions of uIP: @@ -51,7 +51,9 @@ * Included Files ****************************************************************************/ -#include <sys/types.h> +#include <nuttx/config.h> + +#include <stdint.h> #include <string.h> #include <unistd.h> #include <time.h> @@ -110,12 +112,12 @@ struct dns_hdr { - uint16 id; - uint8 flags1, flags2; - uint16 numquestions; - uint16 numanswers; - uint16 numauthrr; - uint16 numextrarr; + uint16_t id; + uint8_t flags1, flags2; + uint16_t numquestions; + uint16_t numanswers; + uint16_t numauthrr; + uint16_t numextrarr; }; /* The DNS answer message structure */ @@ -126,10 +128,10 @@ struct dns_answer * to a name already present somewhere in the packet. */ - uint16 type; - uint16 class; - uint16 ttl[2]; - uint16 len; + uint16_t type; + uint16_t class; + uint16_t ttl[2]; + uint16_t len; #ifdef CONFIG_NET_IPv6 struct in6_addr ipaddr; #else @@ -139,11 +141,11 @@ struct dns_answer struct namemap { - uint8 state; - uint8 tmr; - uint8 retries; - uint8 seqno; - uint8 err; + uint8_t state; + uint8_t tmr; + uint8_t retries; + uint8_t seqno; + uint8_t err; char name[32]; #ifdef CONFIG_NET_IPv6 struct in6_addr ipaddr; @@ -156,7 +158,7 @@ struct namemap * Private Data ****************************************************************************/ -static uint8 g_seqno; +static uint8_t g_seqno; static int g_sockfd = -1; #ifdef CONFIG_NET_IPv6 static struct sockaddr_in6 g_dnsserver; @@ -202,7 +204,7 @@ static int send_query(const char *name, struct sockaddr_in *addr) char *query; char *nptr; const char *nameptr; - uint8 seqno = g_seqno++; + uint8_t seqno = g_seqno++; static unsigned char endquery[] = {0, 0, 1, 0, 1}; char buffer[SEND_BUFFER_SIZE]; int n; @@ -246,8 +248,8 @@ int recv_response(struct sockaddr_in *addr) char buffer[RECV_BUFFER_SIZE]; struct dns_answer *ans; struct dns_hdr *hdr; - uint8 nquestions; - uint8 nanswers; + uint8_t nquestions; + uint8_t nanswers; int ret; /* Receive the response */ diff --git a/nuttx/netutils/smtp/smtp.c b/nuttx/netutils/smtp/smtp.c index 2827a0d94..cd0b6b1e0 100644 --- a/nuttx/netutils/smtp/smtp.c +++ b/nuttx/netutils/smtp/smtp.c @@ -2,7 +2,7 @@ * smtp.c * smtp SMTP E-mail sender * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009 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: @@ -46,7 +46,10 @@ * Included Files ****************************************************************************/ -#include <sys/types.h> +#include <nuttx/config.h> + +#include <stdint.h> +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -81,8 +84,8 @@ struct smtp_state { - uint8 state; - boolean connected; + uint8_t state; + bool connected; sem_t sem; uip_ipaddr_t smtpserver; const char *localhostname; @@ -308,7 +311,7 @@ int smtp_send(void *handle, const char *to, const char *cc, const char *from, /* Setup */ - psmtp->connected = TRUE; + psmtp->connected = true; psmtp->to = to; psmtp->cc = cc; psmtp->from = from; diff --git a/nuttx/netutils/telnetd/telnetd.c b/nuttx/netutils/telnetd/telnetd.c index fb5c2c8e2..00151713c 100644 --- a/nuttx/netutils/telnetd/telnetd.c +++ b/nuttx/netutils/telnetd/telnetd.c @@ -1,7 +1,7 @@ /**************************************************************************** * netutils/telnetd/telnetd.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * This is a leverage of similar logic from uIP: @@ -44,7 +44,7 @@ #include <sys/types.h> #include <sys/socket.h> - +#include <stdint.h> #include <stdio.h> #include <unistd.h> #include <stdlib.h> @@ -107,11 +107,11 @@ struct telnetd_s { - int tn_sockfd; - char tn_iobuffer[CONFIG_NETUTILS_IOBUFFER_SIZE]; - char tn_cmd[CONFIG_NETUTILS_CMD_SIZE]; - uint8 tn_bufndx; - uint8 tn_state; + int tn_sockfd; + char tn_iobuffer[CONFIG_NETUTILS_IOBUFFER_SIZE]; + char tn_cmd[CONFIG_NETUTILS_CMD_SIZE]; + uint8_t tn_bufndx; + uint8_t tn_state; }; /**************************************************************************** @@ -133,7 +133,7 @@ static inline void telnetd_dumpbuffer(FAR const char *msg, FAR const char *buffe * defined or the following does nothing. */ - nvdbgdumpbuffer(msg, (FAR const ubyte*)buffer, nbytes); + nvdbgdumpbuffer(msg, (FAR const uint8_t*)buffer, nbytes); } #else # define telnetd_dumpbuffer(msg,buffer,nbytes) @@ -147,7 +147,7 @@ static inline void telnetd_dumpbuffer(FAR const char *msg, FAR const char *buffe * ****************************************************************************/ -static void telnetd_putchar(struct telnetd_s *pstate, uint8 ch) +static void telnetd_putchar(struct telnetd_s *pstate, uint8_t ch) { /* Ignore carriage returns */ @@ -187,9 +187,9 @@ static void telnetd_putchar(struct telnetd_s *pstate, uint8 ch) * ****************************************************************************/ -static void telnetd_sendopt(struct telnetd_s *pstate, uint8 option, uint8 value) +static void telnetd_sendopt(struct telnetd_s *pstate, uint8_t option, uint8_t value) { - uint8 optbuf[4]; + uint8_t optbuf[4]; optbuf[0] = TELNET_IAC; optbuf[1] = option; optbuf[2] = value; @@ -213,7 +213,7 @@ static void telnetd_sendopt(struct telnetd_s *pstate, uint8 option, uint8 value) static int telnetd_receive(struct telnetd_s *pstate, size_t len) { char *ptr = pstate->tn_iobuffer; - uint8 ch; + uint8_t ch; while (len > 0) { diff --git a/nuttx/netutils/tftpc/tftpc_get.c b/nuttx/netutils/tftpc/tftpc_get.c index b48c657c1..39040cd7d 100644 --- a/nuttx/netutils/tftpc/tftpc_get.c +++ b/nuttx/netutils/tftpc/tftpc_get.c @@ -1,7 +1,7 @@ /**************************************************************************** * netuils/tftp/tftpc_get.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -41,7 +41,8 @@ #include <sys/types.h> #include <sys/stat.h> - +#include <stdint.h> +#include <stdbool.h> #include <stdlib.h> #include <unistd.h> #include <fcntl.h> @@ -57,7 +58,7 @@ #if defined(CONFIG_NET) && defined(CONFIG_NET_UDP) && CONFIG_NFILE_DESCRIPTORS > 0 /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ #define TFTP_RETRIES 3 @@ -70,7 +71,7 @@ * Name: tftp_write ****************************************************************************/ -static inline ssize_t tftp_write(int fd, const ubyte *buf, size_t len) +static inline ssize_t tftp_write(int fd, const uint8_t *buf, size_t len) { size_t left = len; ssize_t nbyteswritten; @@ -108,13 +109,13 @@ static inline ssize_t tftp_write(int fd, const ubyte *buf, size_t len) * Name: tftp_parsedatapacket ****************************************************************************/ -static inline int tftp_parsedatapacket(const ubyte *packet, - uint16 *opcode, uint16 *blockno) +static inline int tftp_parsedatapacket(const uint8_t *packet, + uint16_t *opcode, uint16_t *blockno) { - *opcode = (uint16)packet[0] << 8 | (uint16)packet[1]; + *opcode = (uint16_t)packet[0] << 8 | (uint16_t)packet[1]; if (*opcode == TFTP_DATA) { - *blockno = (uint16)packet[2] << 8 | (uint16)packet[3]; + *blockno = (uint16_t)packet[2] << 8 | (uint16_t)packet[3]; return OK; } #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_NET) @@ -143,14 +144,14 @@ static inline int tftp_parsedatapacket(const ubyte *packet, * ****************************************************************************/ -int tftpget(const char *remote, const char *local, in_addr_t addr, boolean binary) +int tftpget(const char *remote, const char *local, in_addr_t addr, bool binary) { struct sockaddr_in server; /* The address of the TFTP server */ struct sockaddr_in from; /* The address the last UDP message recv'd from */ - ubyte *packet; /* Allocated memory to hold one packet */ - uint16 blockno = 0; /* The current transfer block number */ - uint16 opcode; /* Received opcode */ - uint16 rblockno; /* Received block number */ + uint8_t *packet; /* Allocated memory to hold one packet */ + uint16_t blockno = 0; /* The current transfer block number */ + uint16_t opcode; /* Received opcode */ + uint16_t rblockno; /* Received block number */ int len; /* Generic length */ int sd; /* Socket descriptor for socket I/O */ int fd; /* File descriptor for file I/O */ @@ -162,7 +163,7 @@ int tftpget(const char *remote, const char *local, in_addr_t addr, boolean binar /* Allocate the buffer to used for socket/disk I/O */ - packet = (ubyte*)zalloc(TFTP_IOBUFSIZE); + packet = (uint8_t*)zalloc(TFTP_IOBUFSIZE); if (!packet) { ndbg("packet memory allocation failure\n"); diff --git a/nuttx/netutils/tftpc/tftpc_internal.h b/nuttx/netutils/tftpc/tftpc_internal.h index 214f7306d..ffaecdb13 100644 --- a/nuttx/netutils/tftpc/tftpc_internal.h +++ b/nuttx/netutils/tftpc/tftpc_internal.h @@ -1,7 +1,7 @@ /**************************************************************************** * netutils/tftoc/tftpc_internal.h * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -41,12 +41,16 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/compiler.h> + +#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> + #include <net/uip/uipopt.h> /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* Verify TFTP configuration settings ***************************************/ @@ -150,11 +154,11 @@ /* Defined in tftp_packet.c *************************************************/ extern int tftp_sockinit(struct sockaddr_in *server, in_addr_t addr); -extern int tftp_mkreqpacket(ubyte *buffer, int opcode, const char *path, boolean binary); -extern int tftp_mkackpacket(ubyte *buffer, uint16 blockno); -extern int tftp_mkerrpacket(ubyte *buffer, uint16 errorcode, const char *errormsg); +extern int tftp_mkreqpacket(uint8_t *buffer, int opcode, const char *path, bool binary); +extern int tftp_mkackpacket(uint8_t *buffer, uint16_t blockno); +extern int tftp_mkerrpacket(uint8_t *buffer, uint16_t errorcode, const char *errormsg); #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_NET) -extern int tftp_parseerrpacket(const ubyte *packet); +extern int tftp_parseerrpacket(const uint8_t *packet); #endif extern ssize_t tftp_recvfrom(int sd, void *buf, size_t len, struct sockaddr_in *from); diff --git a/nuttx/netutils/tftpc/tftpc_packets.c b/nuttx/netutils/tftpc/tftpc_packets.c index d190c4f1a..169f068cc 100644 --- a/nuttx/netutils/tftpc/tftpc_packets.c +++ b/nuttx/netutils/tftpc/tftpc_packets.c @@ -41,7 +41,8 @@ #include <sys/types.h> #include <sys/socket.h> - +#include <stdint.h> +#include <stdbool.h> #include <stdio.h> #include <string.h> #include <time.h> @@ -59,7 +60,7 @@ #if defined(CONFIG_NET) && defined(CONFIG_NET_UDP) && CONFIG_NFILE_DESCRIPTORS > 0 /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** @@ -74,7 +75,7 @@ * Name: tftp_mode ****************************************************************************/ -static inline const char *tftp_mode(boolean binary) +static inline const char *tftp_mode(bool binary) { return binary ? "octet" : "netascii"; } @@ -143,7 +144,7 @@ int tftp_sockinit(struct sockaddr_in *server, in_addr_t addr) * ****************************************************************************/ -int tftp_mkreqpacket(ubyte *buffer, int opcode, const char *path, boolean binary) +int tftp_mkreqpacket(uint8_t *buffer, int opcode, const char *path, bool binary) { buffer[0] = opcode >> 8; buffer[1] = opcode & 0xff; @@ -161,7 +162,7 @@ int tftp_mkreqpacket(ubyte *buffer, int opcode, const char *path, boolean binary * ****************************************************************************/ -int tftp_mkackpacket(ubyte *buffer, uint16 blockno) +int tftp_mkackpacket(uint8_t *buffer, uint16_t blockno) { buffer[0] = TFTP_ACK >> 8; buffer[1] = TFTP_ACK & 0xff; @@ -183,7 +184,7 @@ int tftp_mkackpacket(ubyte *buffer, uint16 blockno) * ****************************************************************************/ -int tftp_mkerrpacket(ubyte *buffer, uint16 errorcode, const char *errormsg) +int tftp_mkerrpacket(uint8_t *buffer, uint16_t errorcode, const char *errormsg) { buffer[0] = TFTP_ERR >> 8; buffer[1] = TFTP_ERR & 0xff; @@ -207,10 +208,10 @@ int tftp_mkerrpacket(ubyte *buffer, uint16 errorcode, const char *errormsg) ****************************************************************************/ #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_NET) -int tftp_parseerrpacket(const ubyte *buffer) +int tftp_parseerrpacket(const uint8_t *buffer) { - uint16 opcode = (uint16)buffer[0] << 8 | (uint16)buffer[1]; - uint16 errcode = (uint16)buffer[2] << 8 | (uint16)buffer[3]; + uint16_t opcode = (uint16_t)buffer[0] << 8 | (uint16_t)buffer[1]; + uint16_t errcode = (uint16_t)buffer[2] << 8 | (uint16_t)buffer[3]; const char *errmsg = (const char *)&buffer[4]; if (opcode == TFTP_ERR) diff --git a/nuttx/netutils/tftpc/tftpc_put.c b/nuttx/netutils/tftpc/tftpc_put.c index c62f8e17d..d16fc95bd 100644 --- a/nuttx/netutils/tftpc/tftpc_put.c +++ b/nuttx/netutils/tftpc/tftpc_put.c @@ -1,7 +1,7 @@ /**************************************************************************** * netuils/tftp/tftpc_put.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -41,7 +41,8 @@ #include <sys/types.h> #include <sys/stat.h> - +#include <stdint.h> +#include <stdbool.h> #include <stdlib.h> #include <unistd.h> #include <fcntl.h> @@ -57,7 +58,7 @@ #if defined(CONFIG_NET) && defined(CONFIG_NET_UDP) && CONFIG_NFILE_DESCRIPTORS > 0 /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ #define TFTP_RETRIES 3 @@ -74,7 +75,7 @@ * Name: tftp_read ****************************************************************************/ -static inline ssize_t tftp_read(int fd, ubyte *buf, size_t buflen) +static inline ssize_t tftp_read(int fd, uint8_t *buf, size_t buflen) { ssize_t nbytesread; ssize_t totalread = 0; @@ -139,7 +140,7 @@ static inline ssize_t tftp_read(int fd, ubyte *buf, size_t buflen) * ****************************************************************************/ -int tftp_mkdatapacket(int fd, off_t offset, ubyte *packet, uint16 blockno) +int tftp_mkdatapacket(int fd, off_t offset, uint8_t *packet, uint16_t blockno) { off_t tmp; int nbytesread; @@ -191,13 +192,13 @@ int tftp_mkdatapacket(int fd, off_t offset, ubyte *packet, uint16 blockno) * ****************************************************************************/ -static int tftp_rcvack(int sd, ubyte *packet, struct sockaddr_in *server, - uint16 *port, uint16 *blockno) +static int tftp_rcvack(int sd, uint8_t *packet, struct sockaddr_in *server, + uint16_t *port, uint16_t *blockno) { struct sockaddr_in from; /* The address the last UDP message recv'd from */ ssize_t nbytes; /* The number of bytes received. */ - uint16 opcode; /* The received opcode */ - uint16 rblockno; /* The received block number */ + uint16_t opcode; /* The received opcode */ + uint16_t rblockno; /* The received block number */ int packetlen; /* Packet length */ int retry; /* Retry counter */ @@ -253,8 +254,8 @@ static int tftp_rcvack(int sd, ubyte *packet, struct sockaddr_in *server, /* Parse the error message */ - opcode = (uint16)packet[0] << 8 | (uint16)packet[1]; - rblockno = (uint16)packet[2] << 8 | (uint16)packet[3]; + opcode = (uint16_t)packet[0] << 8 | (uint16_t)packet[1]; + rblockno = (uint16_t)packet[2] << 8 | (uint16_t)packet[3]; /* Verify that the message that we received is an ACK for the * expected block number. @@ -312,14 +313,14 @@ static int tftp_rcvack(int sd, ubyte *packet, struct sockaddr_in *server, * ****************************************************************************/ -int tftpput(const char *local, const char *remote, in_addr_t addr, boolean binary) +int tftpput(const char *local, const char *remote, in_addr_t addr, bool binary) { struct sockaddr_in server; /* The address of the TFTP server */ - ubyte *packet; /* Allocated memory to hold one packet */ + uint8_t *packet; /* Allocated memory to hold one packet */ off_t offset; /* Offset into source file */ - uint16 blockno; /* The current transfer block number */ - uint16 rblockno; /* The ACK'ed block number */ - uint16 port = 0; /* This is the port number for the transfer */ + uint16_t blockno; /* The current transfer block number */ + uint16_t rblockno; /* The ACK'ed block number */ + uint16_t port = 0; /* This is the port number for the transfer */ int packetlen; /* The length of the data packet */ int sd; /* Socket descriptor for socket I/O */ int fd; /* File descriptor for file I/O */ @@ -329,7 +330,7 @@ int tftpput(const char *local, const char *remote, in_addr_t addr, boolean binar /* Allocate the buffer to used for socket/disk I/O */ - packet = (ubyte*)zalloc(TFTP_IOBUFSIZE); + packet = (uint8_t*)zalloc(TFTP_IOBUFSIZE); if (!packet) { ndbg("packet memory allocation failure\n"); diff --git a/nuttx/netutils/thttpd/cgi-src/redirect.c b/nuttx/netutils/thttpd/cgi-src/redirect.c index 8177b8df9..84f3b8712 100644 --- a/nuttx/netutils/thttpd/cgi-src/redirect.c +++ b/nuttx/netutils/thttpd/cgi-src/redirect.c @@ -71,8 +71,6 @@ * Public Functions ****************************************************************************/ -#include <sys/types.h> - #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/nuttx/netutils/thttpd/config.h b/nuttx/netutils/thttpd/config.h index dbbddaec2..1b5764c29 100644 --- a/nuttx/netutils/thttpd/config.h +++ b/nuttx/netutils/thttpd/config.h @@ -42,6 +42,7 @@ #include <nuttx/config.h> #include <nuttx/compiler.h> +#include <stdint.h> /**************************************************************************** * Pre-processor Definitions @@ -165,7 +166,7 @@ # endif # if CONFIG_THTTPD_IOBUFFERSIZE > 65535 -# error "Can't use uint16 for buffer size" +# error "Can't use uint16_t for buffer size" # endif /* A list of index filenames to check. The files are searched for in this order. */ diff --git a/nuttx/netutils/thttpd/fdwatch.c b/nuttx/netutils/thttpd/fdwatch.c index c59ce7799..24ea7a1e0 100644 --- a/nuttx/netutils/thttpd/fdwatch.c +++ b/nuttx/netutils/thttpd/fdwatch.c @@ -39,8 +39,8 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <stdlib.h> #include <debug.h> #include <poll.h> @@ -180,7 +180,7 @@ struct fdwatch_s *fdwatch_initialize(int nfds) goto errout_with_allocations; } - fw->ready = (uint8*)httpd_malloc(sizeof(uint8) * nfds); + fw->ready = (uint8_t*)httpd_malloc(sizeof(uint8_t) * nfds); if (!fw->ready) { goto errout_with_allocations; diff --git a/nuttx/netutils/thttpd/fdwatch.h b/nuttx/netutils/thttpd/fdwatch.h index 3aa701c14..e60727db1 100644 --- a/nuttx/netutils/thttpd/fdwatch.h +++ b/nuttx/netutils/thttpd/fdwatch.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> /**************************************************************************** * Pre-Processor Definitions @@ -63,11 +63,11 @@ struct fdwatch_s { struct pollfd *pollfds; /* Poll data (allocated) */ void **client; /* Client data (allocated) */ - uint8 *ready; /* The list of fds with activity (allocated) */ - uint8 nfds; /* The configured maximum number of fds */ - uint8 nwatched; /* The number of fds currently watched */ - uint8 nactive; /* The number of fds with activity */ - uint8 next; /* The index to the next client data */ + uint8_t *ready; /* The list of fds with activity (allocated) */ + uint8_t nfds; /* The configured maximum number of fds */ + uint8_t nwatched; /* The number of fds currently watched */ + uint8_t nactive; /* The number of fds with activity */ + uint8_t next; /* The index to the next client data */ }; /**************************************************************************** diff --git a/nuttx/netutils/thttpd/libhttpd.c b/nuttx/netutils/thttpd/libhttpd.c index de5a13b26..f258b81ed 100644 --- a/nuttx/netutils/thttpd/libhttpd.c +++ b/nuttx/netutils/thttpd/libhttpd.c @@ -39,10 +39,12 @@ ****************************************************************************/ #include <nuttx/config.h> + #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> - +#include <stdint.h> +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -145,7 +147,7 @@ static int httpd_tilde_map2(httpd_conn *hc); #ifdef CONFIG_THTTPD_VHOST static int vhost_map(httpd_conn *hc); #endif -static char *expand_filename(char *path, char **restP, boolean tildemapped); +static char *expand_filename(char *path, char **restP, bool tildemapped); static char *bufgets(httpd_conn *hc); static void de_dotdot(char *file); static void init_mime(void); @@ -333,7 +335,7 @@ static void send_mime(httpd_conn *hc, int status, const char *title, const char else { partial_content = 0; - hc->got_range = FALSE; + hc->got_range = false; } gettimeofday(&now, NULL); @@ -536,7 +538,7 @@ static void send_authenticate(httpd_conn *hc, char *realm) if (hc->method == METHOD_POST) { - hc->should_linger = TRUE; + hc->should_linger = true; } } @@ -952,7 +954,7 @@ static int httpd_tilde_map2(httpd_conn *hc) (void)strcat(hc->altdir, postfix); } - alt = expand_filename(hc->altdir, &rest, TRUE); + alt = expand_filename(hc->altdir, &rest, true); if (rest[0] != '\0') { return 0; @@ -968,7 +970,7 @@ static int httpd_tilde_map2(httpd_conn *hc) /* For this type of tilde mapping, we want to defeat vhost mapping. */ - hc->tildemapped = TRUE; + hc->tildemapped = true; return 1; } #endif @@ -1092,7 +1094,7 @@ static int vhost_map(httpd_conn *hc) * parts of the path that don't exist. */ -static char *expand_filename(char *path, char **restP, boolean tildemapped) +static char *expand_filename(char *path, char **restP, bool tildemapped) { static char *checked; static char *rest; @@ -1783,7 +1785,7 @@ static void ls_child(int argc, char **argv) /* And print. */ (void)fprintf(fp, "%s %3ld %10lld %s <A HREF=\"/%.500s%s\">%s</A>%s%s%s\n", - modestr, (long)lsb.st_nlink, (sint16) lsb.st_size, + modestr, (long)lsb.st_nlink, (int16_t) lsb.st_size, timestr, encrname, S_ISDIR(sb.st_mode) ? "/" : "", nameptrs[i], linkprefix, link, fileclass); } @@ -1890,7 +1892,7 @@ static int ls(httpd_conn *hc) #endif hc->bytes_sent = CONFIG_THTTPD_CGI_BYTECOUNT; - hc->should_linger = FALSE; + hc->should_linger = false; } else { @@ -2372,14 +2374,14 @@ int httpd_get_conn(httpd_server *hs, int listen_fd, httpd_conn *hc) #ifdef CONFIG_THTTPD_VHOST hc->vhostname = NULL; #endif - hc->mime_flag = TRUE; - hc->one_one = FALSE; - hc->got_range = FALSE; - hc->tildemapped = FALSE; + hc->mime_flag = true; + hc->one_one = false; + hc->got_range = false; + hc->tildemapped = false; hc->range_start = 0; hc->range_end = -1; - hc->keep_alive = FALSE; - hc->should_linger = FALSE; + hc->keep_alive = false; + hc->should_linger = false; hc->file_fd = -1; nvdbg("New connection accepted on %d\n", hc->conn_fd); @@ -2631,7 +2633,7 @@ int httpd_parse_request(httpd_conn *hc) if (!protocol) { protocol = "HTTP/0.9"; - hc->mime_flag = FALSE; + hc->mime_flag = false; } else { @@ -2647,7 +2649,7 @@ int httpd_parse_request(httpd_conn *hc) if (strcasecmp(protocol, "HTTP/1.0") != 0) { - hc->one_one = TRUE; + hc->one_one = true; } } } @@ -2868,7 +2870,7 @@ int httpd_parse_request(httpd_conn *hc) if (cp_dash != NULL && cp_dash != cp + 1) { *cp_dash = '\0'; - hc->got_range = TRUE; + hc->got_range = true; hc->range_start = atoll(cp + 1); if (hc->range_start < 0) { @@ -2918,7 +2920,7 @@ int httpd_parse_request(httpd_conn *hc) cp += strspn(cp, " \t"); if (strcasecmp(cp, "keep-alive") == 0) { - hc->keep_alive = TRUE; + hc->keep_alive = true; } } #ifdef LOG_UNKNOWN_HEADERS @@ -2980,7 +2982,7 @@ int httpd_parse_request(httpd_conn *hc) if (hc->keep_alive) { - hc->should_linger = TRUE; + hc->should_linger = true; } } diff --git a/nuttx/netutils/thttpd/libhttpd.h b/nuttx/netutils/thttpd/libhttpd.h index 68d356d12..f2e39e04d 100644 --- a/nuttx/netutils/thttpd/libhttpd.h +++ b/nuttx/netutils/thttpd/libhttpd.h @@ -42,8 +42,11 @@ ****************************************************************************/ #include <nuttx/config.h> + #include <sys/types.h> #include <sys/socket.h> +#include <stdint.h> +#include <stdbool.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -213,12 +216,12 @@ typedef struct #ifdef CONFIG_THTTPD_VHOST char *vhostname; /* not malloc()ed */ #endif - boolean mime_flag; - boolean one_one; /* HTTP/1.1 or better */ - boolean got_range; - boolean tildemapped; /* this connection got tilde-mapped */ - boolean keep_alive; - boolean should_linger; + bool mime_flag; + bool one_one; /* HTTP/1.1 or better */ + bool got_range; + bool tildemapped; /* this connection got tilde-mapped */ + bool keep_alive; + bool should_linger; int conn_fd; /* Connection to the client */ int file_fd; /* Descriptor for open, outgoing file */ off_t range_start; /* File range start from Range= */ @@ -227,8 +230,8 @@ typedef struct /* This is the I/O buffer that is used to buffer portions of outgoing files */ - uint16 buflen; /* Index to first valid data in buffer */ - ubyte buffer[CONFIG_THTTPD_IOBUFFERSIZE]; + uint16_t buflen; /* Index to first valid data in buffer */ + uint8_t buffer[CONFIG_THTTPD_IOBUFFERSIZE]; } httpd_conn; /**************************************************************************** diff --git a/nuttx/netutils/thttpd/mime_types.h b/nuttx/netutils/thttpd/mime_types.h index 531605b66..cd0c514a8 100644 --- a/nuttx/netutils/thttpd/mime_types.h +++ b/nuttx/netutils/thttpd/mime_types.h @@ -44,6 +44,8 @@ * Included Files ****************************************************************************/ +#include <sys/types.h> + /**************************************************************************** * Private Types ****************************************************************************/ diff --git a/nuttx/netutils/thttpd/tdate_parse.c b/nuttx/netutils/thttpd/tdate_parse.c index 2403ea6ca..7864f8765 100644 --- a/nuttx/netutils/thttpd/tdate_parse.c +++ b/nuttx/netutils/thttpd/tdate_parse.c @@ -38,7 +38,7 @@ * Included Files ****************************************************************************/ -#include <sys/types.h> +#include <nuttx/config.h> #include <stdio.h> #include <stdlib.h> diff --git a/nuttx/netutils/thttpd/thttpd.c b/nuttx/netutils/thttpd/thttpd.c index 84507bce9..cd2092fa8 100644 --- a/nuttx/netutils/thttpd/thttpd.c +++ b/nuttx/netutils/thttpd/thttpd.c @@ -43,6 +43,7 @@ #include <sys/stat.h> #include <sys/time.h> +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -97,7 +98,7 @@ struct connect_s Timer *linger_timer; off_t end_offset; /* The final offset+1 of the file to send */ off_t offset; /* The current offset into the file to send */ - boolean eof; /* Set TRUE when length==0 read from file */ + bool eof; /* Set true when length==0 read from file */ }; /**************************************************************************** @@ -331,7 +332,7 @@ static void handle_read(struct connect_s *conn, struct timeval *tv) /* Set up the file offsets to read */ - conn->eof = FALSE; + conn->eof = false; if (hc->got_range) { conn->offset = hc->range_start; @@ -407,7 +408,7 @@ static inline int read_buffer(struct connect_s *conn) /* Reading zero bytes means we are at the end of file */ conn->end_offset = conn->offset; - conn->eof = TRUE; + conn->eof = true; } else if (nread > 0) { @@ -542,7 +543,7 @@ static void clear_connection(struct connect_s *conn, struct timeval *tv) tmr_cancel(conn->linger_timer); conn->linger_timer = NULL; - conn->hc->should_linger = FALSE; + conn->hc->should_linger = false; } else if (conn->hc->should_linger) { diff --git a/nuttx/netutils/thttpd/thttpd_cgi.c b/nuttx/netutils/thttpd/thttpd_cgi.c index d6d8eab09..6220df939 100755 --- a/nuttx/netutils/thttpd/thttpd_cgi.c +++ b/nuttx/netutils/thttpd/thttpd_cgi.c @@ -1,1078 +1,1080 @@ -/****************************************************************************
- * netutils/thttpd/thttpd_cgi.c
- * CGI support
- *
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
- *
- * Derived from the file libhttpd.c in the original THTTPD package:
- *
- * Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer <jef@mail.acme.com>.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
-#include <libgen.h>
-#include <errno.h>
-#include <debug.h>
-
-#include <nuttx/symtab.h>
-#include <nuttx/binfmt.h>
-#include <net/uip/thttpd.h>
-
-#include "config.h"
-#include "libhttpd.h"
-#include "thttpd_alloc.h"
-#include "thttpd_strings.h"
-#include "timers.h"
-#include "fdwatch.h"
-
-#if defined(CONFIG_THTTPD) && defined(CONFIG_THTTPD_CGI_PATTERN)
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* CONFIG_THTTPD_CGIDUMP will dump the contents of each transfer to and from the CGI task. */
-
-#ifdef CONFIG_THTTPD_CGIDUMP
-# define cgi_dumpbuffer(m,a,n) lib_dumpbuffer(m,(FAR const ubyte*)a,n)
-#else
-# define cgi_dumpbuffer(m,a,n)
-#endif
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-enum cgi_outbuffer_e
-{
- CGI_OUTBUFFER_READHEADER = 0, /* Reading header from HTTP client */
- CGI_OUTBUFFER_HEADERREAD, /* Header has been read */
- CGI_OUTBUFFER_HEADERSENT, /* Header has been sent to the CGI program */
- CGI_OUTBUFFER_READDATA, /* Transferring data from CGI to client */
- CGI_OUTBUFFER_DONE, /* Finished */
-};
-
-struct cgi_outbuffer_s
-{
- enum cgi_outbuffer_e state; /* State of the transfer */
- char *buffer; /* Allocated I/O buffer */
- size_t size; /* Size of the allocation */
- size_t len; /* Amount of valid data in the allocated buffer */
-};
-
-struct cgi_inbuffer_s
-{
- int contentlength; /* Size of content to send to CGI task */
- int nbytes; /* Number of bytes sent */
- char buffer[CONFIG_THTTPD_CGIINBUFFERSIZE]; /* Fixed size input buffer */
-};
-
-struct cgi_conn_s
-{
- /* Descriptors */
-
- int connfd; /* Socket connect to CGI client */
- int rdfd; /* Pipe read fd */
- int wrfd; /* Pipe write fd */
-
- /* Buffering */
-
- struct cgi_outbuffer_s outbuf; /* Dynamically sized output buffer */
- struct cgi_inbuffer_s inbuf; /* Fixed size input buffer */
-};
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-static void create_environment(httpd_conn *hc);
-static char **make_argp(httpd_conn *hc);
-static inline int cgi_interpose_input(struct cgi_conn_s *cc);
-static inline int cgi_interpose_output(struct cgi_conn_s *cc);
-static int cgi_child(int argc, char **argv);
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/* Used to hold off the main task until the CGI tasks have been configured */
-
-static sem_t g_cgisem;
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/* semaphore helpers */
-
-static inline void cgi_semtake(void)
-{
- while (sem_wait(&g_cgisem) != 0)
- {
- /* The only case that an error should occr here is if the wait was\
- * awakened by a signal.
- */
-
- ASSERT(*get_errno_ptr() == EINTR);
- }
-}
-
-static inline void cgi_semgive(void)
-{
- sem_post(&g_cgisem);
-}
-
-/* Set up environment variables. Be real careful here to avoid
- * letting malicious clients overrun a buffer. We don't have
- * to worry about freeing stuff since we're a sub-task.
- */
-
-static void create_environment(httpd_conn *hc)
-{
- char *cp;
- char buf[256];
-
- setenv("PATH", CONFIG_THTTPD_CGI_PATH, TRUE);
-#ifdef CGI_LD_LIBRARY_PATH
- setenv("LD_LIBRARY_PATH", CGI_LD_LIBRARY_PATH, TRUE);
-#endif /* CGI_LD_LIBRARY_PATH */
-
- setenv("SERVER_SOFTWARE", CONFIG_THTTPD_SERVER_SOFTWARE, TRUE);
-
- /* If vhosting, use that server-name here. */
-#ifdef CONFIG_THTTPD_VHOST
- if (hc->vhostname)
- {
- cp = hc->vhostname;
- }
- else
-#endif
- {
- cp = hc->hs->hostname;
- }
-
- if (cp)
- {
- setenv("SERVER_NAME", cp, TRUE);
- }
-
- setenv("GATEWAY_INTERFACE", "CGI/1.1", TRUE);
- setenv("SERVER_PROTOCOL", hc->protocol, TRUE);
-
- (void)snprintf(buf, sizeof(buf), "%d", (int)CONFIG_THTTPD_PORT);
- setenv("SERVER_PORT", buf, TRUE);
-
- setenv("REQUEST_METHOD", httpd_method_str(hc->method), TRUE);
-
- if (hc->pathinfo[0] != '\0')
- {
- char *cp2;
- size_t l;
-
- (void)snprintf(buf, sizeof(buf), "/%s", hc->pathinfo);
- setenv("PATH_INFO", buf, TRUE);
-
- l = strlen(httpd_root) + strlen(hc->pathinfo) + 1;
- cp2 = NEW(char, l);
- if (cp2)
- {
- (void)snprintf(cp2, l, "%s%s", httpd_root, hc->pathinfo);
- setenv("PATH_TRANSLATED", cp2, TRUE);
- }
- }
-
- (void)snprintf(buf, sizeof(buf), "/%s",strcmp(hc->origfilename, ".") == 0 ? "" : hc->origfilename);
- setenv("SCRIPT_NAME", buf, TRUE);
-
- if (hc->query[0] != '\0')
- {
- setenv("QUERY_STRING", hc->query, TRUE);
- }
-
- setenv("REMOTE_ADDR", httpd_ntoa(&hc->client_addr), TRUE);
- if (hc->referer[0] != '\0')
- {
- setenv("HTTP_REFERER", hc->referer, TRUE);
- }
-
- if (hc->useragent[0] != '\0')
- {
- setenv("HTTP_USER_AGENT", hc->useragent, TRUE);
- }
-
- if (hc->accept[0] != '\0')
- {
- setenv("HTTP_ACCEPT", hc->accept, TRUE);
- }
-
- if (hc->accepte[0] != '\0')
- {
- setenv("HTTP_ACCEPT_ENCODING", hc->accepte, TRUE);
- }
-
- if (hc->acceptl[0] != '\0')
- {
- setenv("HTTP_ACCEPT_LANGUAGE", hc->acceptl, TRUE);
- }
-
- if (hc->cookie[0] != '\0')
- {
- setenv("HTTP_COOKIE", hc->cookie, TRUE);
- }
-
- if (hc->contenttype[0] != '\0')
- {
- setenv("CONTENT_TYPE", hc->contenttype, TRUE);
- }
-
- if (hc->hdrhost[0] != '\0')
- {
- setenv("HTTP_HOST", hc->hdrhost, TRUE);
- }
-
- if (hc->contentlength != -1)
- {
- (void)snprintf(buf, sizeof(buf), "%lu", (unsigned long)hc->contentlength);
- setenv("CONTENT_LENGTH", buf, TRUE);
- }
-
- if (hc->remoteuser[0] != '\0')
- {
- setenv("REMOTE_USER", hc->remoteuser, TRUE);
- }
-
- if (hc->authorization[0] != '\0')
- {
- setenv("AUTH_TYPE", "Basic", TRUE);
- }
-
- /* We only support Basic auth at the moment. */
-
- if (getenv("TZ") != NULL)
- {
- setenv("TZ", getenv("TZ"), TRUE);
- }
-
- setenv("CGI_PATTERN", CONFIG_THTTPD_CGI_PATTERN, TRUE);
-}
-
-/* Set up argument vector */
-
-static FAR char **make_argp(httpd_conn *hc)
-{
- FAR char **argp;
- int argn;
- char *cp1;
- char *cp2;
-
- /* By allocating an arg slot for every character in the query, plus one
- * for the filename and one for the NULL, we are guaranteed to have
- * enough. We could actually use strlen/2.
- */
-
- argp = NEW(char *, strlen(hc->query) + 2);
- if (!argp)
- {
- return NULL;
- }
-
- argp[0] = strrchr(hc->expnfilename, '/');
- if (argp[0])
- {
- ++argp[0];
- }
- else
- {
- argp[0] = hc->expnfilename;
- }
- argn = 1;
-
- /* According to the CGI spec at http://hoohoo.ncsa.uiuc.edu/cgi/cl.html,
- * "The server should search the query information for a non-encoded =
- * character to determine if the command line is to be used, if it finds
- * one, the command line is not to be used."
- */
-
- if (strchr(hc->query, '=') == NULL)
- {
- for (cp1 = cp2 = hc->query; *cp2 != '\0'; ++cp2)
- {
- if (*cp2 == '+')
- {
- *cp2 = '\0';
- httpd_strdecode(cp1, cp1);
- argp[argn++] = cp1;
- cp1 = cp2 + 1;
- }
- }
-
- if (cp2 != cp1)
- {
- httpd_strdecode(cp1, cp1);
- argp[argn++] = cp1;
- }
- }
-
- argp[argn] = NULL;
- return argp;
-}
-
-/* Data is available from the client socket. This routine is used only for POST
- * requests. It reads the data from the client and sends it to the child thread.
- */
-
-static inline int cgi_interpose_input(struct cgi_conn_s *cc)
-{
- ssize_t nbytes_read;
- ssize_t nbytes_written;
-
- nllvdbg("nbytes: %d contentlength: %d\n", cc->inbuf.nbytes, cc->inbuf.contentlength);
- if (cc->inbuf.nbytes < cc->inbuf.contentlength)
- {
- do
- {
- nbytes_read = read(cc->connfd, cc->inbuf.buffer,
- MIN(CONFIG_THTTPD_CGIINBUFFERSIZE, cc->inbuf.contentlength - cc->inbuf.nbytes));
- nllvdbg("nbytes_read: %d\n", nbytes_read);
- if (nbytes_read < 0)
- {
- if (errno != EINTR)
- {
- nlldbg("read failed: %d\n", errno);
- return 1;
- }
- }
- }
- while (nbytes_read < 0);
-
- if (nbytes_read > 0)
- {
- nbytes_written = httpd_write(cc->wrfd, cc->inbuf.buffer, nbytes_read);
- nllvdbg("nbytes_written: %d\n", nbytes_written);
- if (nbytes_written != nbytes_read)
- {
- nlldbg("httpd_write failed\n");
- return 1;
- }
- cgi_dumpbuffer("Sent to CGI:", cc->inbuf.buffer, nbytes_written);
- }
-
- cc->inbuf.nbytes += nbytes_read;
- }
-
- if (cc->inbuf.nbytes >= cc->inbuf.contentlength)
- {
- /* Special hack to deal with broken browsers that send a LF or CRLF
- * after POST data, causing TCP resets - we just read and discard up
- * to 2 bytes. Unfortunately this doesn't fix the problem for CGIs
- * which avoid the interposer task due to their POST data being
- * short. Creating an interposer task for all POST CGIs is
- * unacceptably expensive. The eventual fix will come when interposing
- * gets integrated into the main loop as a tasklet instead of a task.
- */
-
- /* Turn on no-delay mode in case we previously cleared it. */
-
- httpd_set_ndelay(cc->connfd);
-
- /* And read up to 2 bytes. */
-
- (void)read(cc->connfd, cc->inbuf.buffer, CONFIG_THTTPD_CGIINBUFFERSIZE);
- return 1;
- }
- return 0;
-}
-
-/* This routine is used for parsed-header CGIs. The idea here is that the
- * CGI can return special headers such as "Status:" and "Location:" which
- * change the return status of the response. Since the return status has to
- * be the very first line written out, we have to accumulate all the headers
- * and check for the special ones before writing the status. Then we write
- * out the saved headers and proceed to echo the rest of the response.
- */
-
-static inline int cgi_interpose_output(struct cgi_conn_s *cc)
-{
- ssize_t nbytes_read;
- char *br = NULL;
- int status;
- const char *title;
- char *cp;
-
- /* Make sure the connection is in blocking mode. It should already be
- * blocking, but we might as well be sure.
- */
-
- httpd_clear_ndelay(cc->connfd);
-
- /* Loop while there are things we can do without waiting for more input */
-
- nllvdbg("state: %d\n", cc->outbuf.state);
- switch (cc->outbuf.state)
- {
- case CGI_OUTBUFFER_READHEADER:
- {
- /* Slurp in all headers as they become available from the client. */
-
- do
- {
- /* Read until we successfully read data or until an error occurs.
- * EAGAIN is not an error, but it is still cause to return.
- */
-
- nbytes_read = read(cc->rdfd, cc->inbuf.buffer, CONFIG_THTTPD_CGIINBUFFERSIZE);
- nllvdbg("Read %d bytes from fd %d\n", nbytes_read, cc->rdfd);
-
- if (nbytes_read < 0)
- {
- if (errno != EINTR)
- {
- if (errno != EAGAIN)
- {
- nlldbg("read: %d\n", errno);
- }
- return 1;
- }
- }
- else
- {
- cgi_dumpbuffer("Received from CGI:", cc->inbuf.buffer, nbytes_read);
- }
- }
- while (nbytes_read < 0);
-
- /* Check for end-of-file */
-
- if (nbytes_read <= 0)
- {
- nllvdbg("End-of-file\n");
- br = &(cc->outbuf.buffer[cc->outbuf.len]);
- cc->outbuf.state = CGI_OUTBUFFER_HEADERREAD;
- }
- else
- {
- /* Accumulate more header data */
-
- httpd_realloc_str(&cc->outbuf.buffer, &cc->outbuf.size, cc->outbuf.len + nbytes_read);
- (void)memcpy(&(cc->outbuf.buffer[cc->outbuf.len]), cc->inbuf.buffer, nbytes_read);
- cc->outbuf.len += nbytes_read;
- cc->outbuf.buffer[cc->outbuf.len] = '\0';
- nllvdbg("Header bytes accumulated: %d\n", cc->outbuf.len);
-
- /* Check for end of header */
-
- if ((br = strstr(cc->outbuf.buffer, "\r\n\r\n")) != NULL ||
- (br = strstr(cc->outbuf.buffer, "\012\012")) != NULL)
- {
- nllvdbg("End-of-header\n");
- cc->outbuf.state = CGI_OUTBUFFER_HEADERREAD;
- }
- else
- {
- /* All of the headers have not yet been read ... Return. We
- * will be called again when more data is available in the pipe
- * connected to the CGI task.
- */
-
- return 0;
- }
- }
- }
-
- /* Otherwise, fall through and parse status in the HTTP headers */
-
- case CGI_OUTBUFFER_HEADERREAD:
- {
- /* If there were no headers, bail. */
-
- if (cc->outbuf.buffer[0] == '\0')
- {
- cc->outbuf.state = CGI_OUTBUFFER_DONE;
- return 1;
- }
-
- /* Figure out the status. Look for a Status: or Location: header; else if
- * there's an HTTP header line, get it from there; else default to 200.
- */
-
- status = 200;
- if (strncmp(cc->outbuf.buffer, "HTTP/", 5) == 0)
- {
- cp = cc->outbuf.buffer;
- cp += strcspn(cp, " \t");
- status = atoi(cp);
- }
-
- if ((cp = strstr(cc->outbuf.buffer, "Status:")) != NULL &&
- cp < br && (cp == cc->outbuf.buffer || *(cp - 1) == '\012'))
- {
- cp += 7;
- cp += strspn(cp, " \t");
- status = atoi(cp);
- }
-
- if ((cp = strstr(cc->outbuf.buffer, "Location:")) != NULL &&
- cp < br && (cp == cc->outbuf.buffer || *(cp - 1) == '\012'))
- {
- status = 302;
- }
-
- /* Write the status line. */
-
- nllvdbg("Status: %d\n", status);
- switch (status)
- {
- case 200:
- title = ok200title;
- break;
-
- case 302:
- title = err302title;
- break;
-
- case 304:
- title = err304title;
- break;
-
- case 400:
- BADREQUEST("status");
- title = httpd_err400title;
- break;
-
-#ifdef CONFIG_THTTPD_AUTH_FILE
- case 401:
- title = err401title;
- break;
-#endif
-
- case 403:
- title = err403title;
- break;
-
- case 404:
- title = err404title;
- break;
-
- case 408:
- title = httpd_err408title;
- break;
-
- case 500:
- INTERNALERROR("status");
- title = err500title;
- break;
-
- case 501:
- NOTIMPLEMENTED("status");
- title = err501title;
- break;
-
- case 503:
- title = httpd_err503title;
- break;
-
- default:
- title = "Something";
- break;
- }
-
- (void)snprintf(cc->inbuf.buffer, CONFIG_THTTPD_CGIINBUFFERSIZE, "HTTP/1.0 %d %s\r\n", status, title);
- (void)httpd_write(cc->connfd, cc->inbuf.buffer, strlen(cc->inbuf.buffer));
-
- /* Write the saved cc->outbuf.buffer to the client. */
-
- (void)httpd_write(cc->connfd, cc->outbuf.buffer, cc->outbuf.len);
- }
-
- /* Then set up to read the data following the header from the CGI program and
- * pass it back to the client. We return now; we will be called again when
- * data is available on the pipe.
- */
-
- cc->outbuf.state = CGI_OUTBUFFER_READDATA;
- return 0;
-
- case CGI_OUTBUFFER_READDATA:
- {
- /* Read data from the pipe. */
-
- do
- {
- /* Read until we successfully read data or until an error occurs.
- * EAGAIN is not an error, but it is still cause to return.
- */
-
- nbytes_read = read(cc->rdfd, cc->inbuf.buffer, CONFIG_THTTPD_CGIINBUFFERSIZE);
- nllvdbg("Read %d bytes from fd %d\n", nbytes_read, cc->rdfd);
-
- if (nbytes_read < 0)
- {
- if (errno != EINTR)
- {
- if (errno != EAGAIN)
- {
- nlldbg("read: %d\n", errno);
- }
- return 1;
- }
- }
- else
- {
- cgi_dumpbuffer("Received from CGI:", cc->inbuf.buffer, nbytes_read);
- }
- }
- while (nbytes_read < 0);
-
- /* Check for end of file */
-
- if (nbytes_read == 0)
- {
- nllvdbg("End-of-file\n");
- cc->outbuf.state = CGI_OUTBUFFER_DONE;
- return 1;
- }
- else
- {
- /* Forward the data from the CGI program to the client */
-
- (void)httpd_write(cc->connfd, cc->inbuf.buffer, nbytes_read);
- }
- }
- break;
-
- case CGI_OUTBUFFER_DONE:
- default:
- return 1;
- }
- return 0;
-}
-
-/* CGI child task. */
-
-static int cgi_child(int argc, char **argv)
-{
- FAR httpd_conn *hc = (FAR httpd_conn*)strtoul(argv[1], NULL, 16);
-#if CONFIG_THTTPD_CGI_TIMELIMIT > 0
- ClientData client_data;
-#endif
- FAR char **argp;
- FAR struct cgi_conn_s *cc;
- FAR struct fdwatch_s *fw;
- FAR char *directory;
- FAR char *dupname;
- boolean indone;
- boolean outdone;
- int child;
- int pipefd[2];
- int nbytes;
- int fd;
- int ret;
- int err = 1;
-
- /* Use low-level debug out (because the low-level output may survive closing
- * all file descriptors
- */
-
- nllvdbg("Started: %s\n", argv[1]);
-
- /* Allocate memory and initialize memory for interposing */
-
- cc = (FAR struct cgi_conn_s*)httpd_malloc(sizeof(struct cgi_conn_s));
- if (!cc)
- {
- nlldbg("cgi_conn allocation failed\n");
- close(hc->conn_fd);
- goto errout;
- }
-
- cc->connfd = hc->conn_fd;
- cc->wrfd = -1;
- cc->rdfd = -1;
- memset(&cc->outbuf, 0, sizeof(struct cgi_outbuffer_s));
-
- /* Update all of the environment variable settings, these will be inherited
- * by the CGI task.
- */
-
- create_environment(hc);
-
- /* Make the argument vector. */
-
- argp = make_argp(hc);
-
- /* Close all file descriptors EXCEPT for stdin, stdout, stderr and
- * hc->conn_fd. We'll keep stderr open for error reporting; stdin and
- * stdout will be closed later by dup2(). Keeping stdin and stdout open
- * now prevents re-use of fd=0 and 1 by pipe().
- */
-
- nllvdbg("Closing descriptors\n");
- for (fd = 3; fd < (CONFIG_NFILE_DESCRIPTORS + CONFIG_NSOCKET_DESCRIPTORS); fd++)
- {
- /* Keep hc->conn_fd open for obvious reasons */
-
- if (fd != hc->conn_fd)
- {
- close(fd);
- }
- }
-
- /* Create pipes that will be interposed between the CGI task's stdin or
- * stdout and the socket.
- *
- * Setup up the STDIN pipe - a pipe to transfer data received on the
- * socket to the CGI program.
- */
-
- nllvdbg("Create STDIN pipe\n");
- ret = pipe(pipefd);
- if (ret < 0)
- {
- nlldbg("STDIN pipe: %d\n", errno);
- goto errout_with_cgiconn;
- }
- else
- {
- /* Then map the receiving end the pipe to stdin, save the sending end, and
- * closing the original receiving end
- */
-
- ret = dup2(pipefd[0], 0);
-
- cc->wrfd = pipefd[1];
- close(pipefd[0]);
-
- if (ret < 0)
- {
- nlldbg("STDIN dup2: %d\n", errno);
- goto errout_with_descriptors;
- }
- }
-
- /* Set up the STDOUT pipe - a pipe to transfer data received from the CGI program
- * to the client.
- */
-
- if (ret == 0)
- {
- nllvdbg("Create STDOUT pipe\n");
- ret = pipe(pipefd);
- if (ret < 0)
- {
- nlldbg("STDOUT pipe: %d\n", errno);
- goto errout_with_descriptors;
- }
- else
- {
- /* Then map the sending end the pipe to stdout, save the receiving end, and
- * closing the original sending end
- */
-
- ret = dup2(pipefd[1], 1);
-
- cc->rdfd = pipefd[0];
- close(pipefd[1]);
-
- if (ret < 0)
- {
- nlldbg("STDOUT dup2: %d\n", errno);
- goto errout_with_descriptors;
- }
- }
- }
-
- /* chdir to the directory containing the binary. This isn't in the CGI 1.1
- * spec, but it's what other HTTP servers do.
- */
-
- dupname = httpd_strdup(hc->expnfilename);
- if (dupname)
- {
- directory = dirname(dupname);
- if (directory)
- {
- (void)chdir(directory); /* ignore errors */
- }
- httpd_free(dupname);
- }
-
- /* Allocate memory for output buffering */
-
- httpd_realloc_str(&cc->outbuf.buffer, &cc->outbuf.size, CONFIG_THTTPD_CGIOUTBUFFERSIZE);
- if (!cc->outbuf.buffer)
- {
- nlldbg("hdr allocation failed\n");
- goto errout_with_descriptors;
- }
-
- /* Create fdwatch structures */
-
- fw = fdwatch_initialize(2);
- if (!fw)
- {
- nlldbg("fdwatch allocation failed\n");
- goto errout_with_outbuffer;
- }
-
- /* Run the CGI program. */
-
- nllvdbg("Starting CGI: %s\n", hc->expnfilename);
- child = exec(hc->expnfilename, (FAR const char **)argp, g_thttpdsymtab, g_thttpdnsymbols);
- if (child < 0)
- {
- /* Something went wrong. */
-
- nlldbg("execve %s: %d\n", hc->expnfilename, errno);
- goto errout_with_watch;
- }
-
- /* Schedule a kill for the child task in case it runs too long. */
-
-#if CONFIG_THTTPD_CGI_TIMELIMIT > 0
- client_data.i = child;
- if (tmr_create(NULL, cgi_kill, client_data, CONFIG_THTTPD_CGI_TIMELIMIT * 1000L, 0) == NULL)
- {
- nlldbg("tmr_create(cgi_kill child) failed\n");
- goto errout_with_watch;
- }
-#endif
-
- /* Add the read descriptors to the watch */
-
- fdwatch_add_fd(fw, cc->connfd, NULL);
- fdwatch_add_fd(fw, cc->rdfd, NULL);
-
- /* Send any data that is already buffer to the CGI task */
-
- nbytes = hc->read_idx - hc->checked_idx;
- nllvdbg("nbytes: %d contentlength: %d\n", nbytes, hc->contentlength);
- if (nbytes > 0)
- {
- if (httpd_write(cc->wrfd, &(hc->read_buf[hc->checked_idx]), nbytes) != nbytes)
- {
- nlldbg("httpd_write failed\n");
- return 1;
- }
- }
-
- cc->inbuf.contentlength = hc->contentlength;
- cc->inbuf.nbytes = nbytes;
-
- /* Then perform the interposition */
-
- indone = FALSE;
- outdone = FALSE;
-
- nllvdbg("Interposing\n");
- cgi_semgive(); /* Not safe to reference hc after this point */
- do
- {
- (void)fdwatch(fw, 1000);
-
- /* Check for incoming data from the remote client to the CGI task */
-
- if (!indone && fdwatch_check_fd(fw, cc->connfd))
- {
- /* Transfer data from the client to the CGI program (POST) */
-
- nllvdbg("Interpose input\n");
- indone = cgi_interpose_input(cc);
- if (indone)
- {
- fdwatch_del_fd(fw, cc->connfd);
- }
- }
-
- /* Check for outgoing data from the CGI task to the remote client */
-
- if (fdwatch_check_fd(fw, cc->rdfd))
- {
- /* Handle receipt of headers and CGI program response (GET) */
-
- nllvdbg("Interpose output\n");
- outdone = cgi_interpose_output(cc);
- }
-
- /* No outgoing data... is the child task still running? Use kill()
- * kill() with signal number == 0 does not actually send a signal, but
- * can be used to check if the target task exists. If the task exists
- * but is hung, then you might enable CONFIG_THTTPD_CGI_TIMELIMIT to
- * kill the task. However, killing the task could cause other problems
- * (consider resetting the microprocessor instead).
- */
-
- else if (kill(child, 0) != 0)
- {
- nllvdbg("CGI no longer running: %d\n", errno);
- outdone = TRUE;
- }
- }
- while (!outdone);
- err = 0;
-
- /* Get rid of watch structures */
-
-errout_with_watch:
- fdwatch_uninitialize(fw);
-
- /* Free output buffer memory */
-
-errout_with_outbuffer:
- httpd_free(cc->outbuf.buffer);
-
- /* Close all descriptors */
-
-errout_with_descriptors:
- close(cc->wrfd);
- close(cc->rdfd);
-
-errout_with_cgiconn:
- close(cc->connfd);
- httpd_free(cc);
-
-errout:
- nllvdbg("Return %d\n", err);
- if (err != 0)
- {
- INTERNALERROR("errout");
- httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
- httpd_write_response(hc);
- cgi_semgive();
- }
- return err;
-}
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-int cgi(httpd_conn *hc)
-{
- char arg[16];
- char *argv[1];
- pid_t child;
- int retval = ERROR;
-
- /* Set up a semaphore to hold off the make THTTPD thread until the CGI
- * threads are configured (basically until the file descriptors are all
- * dup'ed and can be closed by the main thread.
- */
-
- sem_init(&g_cgisem, 0, 0);
-
- if (hc->method == METHOD_GET || hc->method == METHOD_POST)
- {
-#ifdef CONFIG_THTTPD_CGILIMIT
- if (hc->hs->cgi_count >= CONFIG_THTTPD_CGILIMIT)
- {
- httpd_send_err(hc, 503, httpd_err503title, "", httpd_err503form,
- hc->encodedurl);
- goto errout_with_sem;
- }
-#endif
- ++hc->hs->cgi_count;
- httpd_clear_ndelay(hc->conn_fd);
-
- /* Start the child task. We use a trampoline task here so that we can
- * safely muck with the file descriptors before actually started the CGI
- * task.
- */
-
- snprintf(arg, 16, "%p", hc); /* task_create doesn't handle binary arguments. */
- argv[0] = arg;
-
-#ifndef CONFIG_CUSTOM_STACK
- child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY,
- CONFIG_THTTPD_CGI_STACKSIZE,
- (main_t)cgi_child, (const char **)argv);
-#else
- child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY,
- (main_t)cgi_child, (const char **)argv);
-#endif
- if (child < 0)
- {
- ndbg("task_create: %d\n", errno);
- INTERNALERROR("task_create");
- httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl);
- goto errout_with_sem;
- }
-
- ndbg("Started CGI task %d for file '%s'\n", child, hc->expnfilename);
-
- /* Wait for the CGI threads to become initialized */
-
- cgi_semtake();
-
- hc->bytes_sent = CONFIG_THTTPD_CGI_BYTECOUNT;
- hc->should_linger = FALSE;
- }
- else
- {
- NOTIMPLEMENTED("CGI");
- httpd_send_err(hc, 501, err501title, "", err501form, httpd_method_str(hc->method));
- goto errout_with_sem;
- }
-
- /* Successfully started */
-
- retval = OK;
-
-errout_with_sem:
- sem_destroy(&g_cgisem);
- return retval;
-}
-
-#if CONFIG_THTTPD_CGI_TIMELIMIT > 0
-static void cgi_kill(ClientData client_data, struct timeval *nowP)
-{
- pid_t pid = (pid_t)client_data.i;
-
- /* task_delete() is a very evil API. It can leave memory stranded! */
-
- nlldbg("Killing CGI child: %d\n", pid);
- if (task_delete(pid) != 0)
- {
- nlldbg("task_delete() failed: %d\n", errno);
- }
-}
-#endif
-
-#endif /* CONFIG_THTTPD && CONFIG_THTTPD_CGI_PATTERN */
-
+/**************************************************************************** + * netutils/thttpd/thttpd_cgi.c + * CGI support + * + * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * Derived from the file libhttpd.c in the original THTTPD package: + * + * Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer <jef@mail.acme.com>. + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <sys/types.h> +#include <sys/stat.h> +#include <stdint.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <signal.h> +#include <libgen.h> +#include <errno.h> +#include <debug.h> + +#include <nuttx/symtab.h> +#include <nuttx/binfmt.h> +#include <net/uip/thttpd.h> + +#include "config.h" +#include "libhttpd.h" +#include "thttpd_alloc.h" +#include "thttpd_strings.h" +#include "timers.h" +#include "fdwatch.h" + +#if defined(CONFIG_THTTPD) && defined(CONFIG_THTTPD_CGI_PATTERN) + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/* CONFIG_THTTPD_CGIDUMP will dump the contents of each transfer to and from the CGI task. */ + +#ifdef CONFIG_THTTPD_CGIDUMP +# define cgi_dumpbuffer(m,a,n) lib_dumpbuffer(m,(FAR const uint8_t*)a,n) +#else +# define cgi_dumpbuffer(m,a,n) +#endif + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +enum cgi_outbuffer_e +{ + CGI_OUTBUFFER_READHEADER = 0, /* Reading header from HTTP client */ + CGI_OUTBUFFER_HEADERREAD, /* Header has been read */ + CGI_OUTBUFFER_HEADERSENT, /* Header has been sent to the CGI program */ + CGI_OUTBUFFER_READDATA, /* Transferring data from CGI to client */ + CGI_OUTBUFFER_DONE, /* Finished */ +}; + +struct cgi_outbuffer_s +{ + enum cgi_outbuffer_e state; /* State of the transfer */ + char *buffer; /* Allocated I/O buffer */ + size_t size; /* Size of the allocation */ + size_t len; /* Amount of valid data in the allocated buffer */ +}; + +struct cgi_inbuffer_s +{ + int contentlength; /* Size of content to send to CGI task */ + int nbytes; /* Number of bytes sent */ + char buffer[CONFIG_THTTPD_CGIINBUFFERSIZE]; /* Fixed size input buffer */ +}; + +struct cgi_conn_s +{ + /* Descriptors */ + + int connfd; /* Socket connect to CGI client */ + int rdfd; /* Pipe read fd */ + int wrfd; /* Pipe write fd */ + + /* Buffering */ + + struct cgi_outbuffer_s outbuf; /* Dynamically sized output buffer */ + struct cgi_inbuffer_s inbuf; /* Fixed size input buffer */ +}; + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +static void create_environment(httpd_conn *hc); +static char **make_argp(httpd_conn *hc); +static inline int cgi_interpose_input(struct cgi_conn_s *cc); +static inline int cgi_interpose_output(struct cgi_conn_s *cc); +static int cgi_child(int argc, char **argv); + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/* Used to hold off the main task until the CGI tasks have been configured */ + +static sem_t g_cgisem; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/* semaphore helpers */ + +static inline void cgi_semtake(void) +{ + while (sem_wait(&g_cgisem) != 0) + { + /* The only case that an error should occr here is if the wait was\ + * awakened by a signal. + */ + + ASSERT(*get_errno_ptr() == EINTR); + } +} + +static inline void cgi_semgive(void) +{ + sem_post(&g_cgisem); +} + +/* Set up environment variables. Be real careful here to avoid + * letting malicious clients overrun a buffer. We don't have + * to worry about freeing stuff since we're a sub-task. + */ + +static void create_environment(httpd_conn *hc) +{ + char *cp; + char buf[256]; + + setenv("PATH", CONFIG_THTTPD_CGI_PATH, TRUE); +#ifdef CGI_LD_LIBRARY_PATH + setenv("LD_LIBRARY_PATH", CGI_LD_LIBRARY_PATH, TRUE); +#endif /* CGI_LD_LIBRARY_PATH */ + + setenv("SERVER_SOFTWARE", CONFIG_THTTPD_SERVER_SOFTWARE, TRUE); + + /* If vhosting, use that server-name here. */ +#ifdef CONFIG_THTTPD_VHOST + if (hc->vhostname) + { + cp = hc->vhostname; + } + else +#endif + { + cp = hc->hs->hostname; + } + + if (cp) + { + setenv("SERVER_NAME", cp, TRUE); + } + + setenv("GATEWAY_INTERFACE", "CGI/1.1", TRUE); + setenv("SERVER_PROTOCOL", hc->protocol, TRUE); + + (void)snprintf(buf, sizeof(buf), "%d", (int)CONFIG_THTTPD_PORT); + setenv("SERVER_PORT", buf, TRUE); + + setenv("REQUEST_METHOD", httpd_method_str(hc->method), TRUE); + + if (hc->pathinfo[0] != '\0') + { + char *cp2; + size_t l; + + (void)snprintf(buf, sizeof(buf), "/%s", hc->pathinfo); + setenv("PATH_INFO", buf, TRUE); + + l = strlen(httpd_root) + strlen(hc->pathinfo) + 1; + cp2 = NEW(char, l); + if (cp2) + { + (void)snprintf(cp2, l, "%s%s", httpd_root, hc->pathinfo); + setenv("PATH_TRANSLATED", cp2, TRUE); + } + } + + (void)snprintf(buf, sizeof(buf), "/%s",strcmp(hc->origfilename, ".") == 0 ? "" : hc->origfilename); + setenv("SCRIPT_NAME", buf, TRUE); + + if (hc->query[0] != '\0') + { + setenv("QUERY_STRING", hc->query, TRUE); + } + + setenv("REMOTE_ADDR", httpd_ntoa(&hc->client_addr), TRUE); + if (hc->referer[0] != '\0') + { + setenv("HTTP_REFERER", hc->referer, TRUE); + } + + if (hc->useragent[0] != '\0') + { + setenv("HTTP_USER_AGENT", hc->useragent, TRUE); + } + + if (hc->accept[0] != '\0') + { + setenv("HTTP_ACCEPT", hc->accept, TRUE); + } + + if (hc->accepte[0] != '\0') + { + setenv("HTTP_ACCEPT_ENCODING", hc->accepte, TRUE); + } + + if (hc->acceptl[0] != '\0') + { + setenv("HTTP_ACCEPT_LANGUAGE", hc->acceptl, TRUE); + } + + if (hc->cookie[0] != '\0') + { + setenv("HTTP_COOKIE", hc->cookie, TRUE); + } + + if (hc->contenttype[0] != '\0') + { + setenv("CONTENT_TYPE", hc->contenttype, TRUE); + } + + if (hc->hdrhost[0] != '\0') + { + setenv("HTTP_HOST", hc->hdrhost, TRUE); + } + + if (hc->contentlength != -1) + { + (void)snprintf(buf, sizeof(buf), "%lu", (unsigned long)hc->contentlength); + setenv("CONTENT_LENGTH", buf, TRUE); + } + + if (hc->remoteuser[0] != '\0') + { + setenv("REMOTE_USER", hc->remoteuser, TRUE); + } + + if (hc->authorization[0] != '\0') + { + setenv("AUTH_TYPE", "Basic", TRUE); + } + + /* We only support Basic auth at the moment. */ + + if (getenv("TZ") != NULL) + { + setenv("TZ", getenv("TZ"), TRUE); + } + + setenv("CGI_PATTERN", CONFIG_THTTPD_CGI_PATTERN, TRUE); +} + +/* Set up argument vector */ + +static FAR char **make_argp(httpd_conn *hc) +{ + FAR char **argp; + int argn; + char *cp1; + char *cp2; + + /* By allocating an arg slot for every character in the query, plus one + * for the filename and one for the NULL, we are guaranteed to have + * enough. We could actually use strlen/2. + */ + + argp = NEW(char *, strlen(hc->query) + 2); + if (!argp) + { + return NULL; + } + + argp[0] = strrchr(hc->expnfilename, '/'); + if (argp[0]) + { + ++argp[0]; + } + else + { + argp[0] = hc->expnfilename; + } + argn = 1; + + /* According to the CGI spec at http://hoohoo.ncsa.uiuc.edu/cgi/cl.html, + * "The server should search the query information for a non-encoded = + * character to determine if the command line is to be used, if it finds + * one, the command line is not to be used." + */ + + if (strchr(hc->query, '=') == NULL) + { + for (cp1 = cp2 = hc->query; *cp2 != '\0'; ++cp2) + { + if (*cp2 == '+') + { + *cp2 = '\0'; + httpd_strdecode(cp1, cp1); + argp[argn++] = cp1; + cp1 = cp2 + 1; + } + } + + if (cp2 != cp1) + { + httpd_strdecode(cp1, cp1); + argp[argn++] = cp1; + } + } + + argp[argn] = NULL; + return argp; +} + +/* Data is available from the client socket. This routine is used only for POST + * requests. It reads the data from the client and sends it to the child thread. + */ + +static inline int cgi_interpose_input(struct cgi_conn_s *cc) +{ + ssize_t nbytes_read; + ssize_t nbytes_written; + + nllvdbg("nbytes: %d contentlength: %d\n", cc->inbuf.nbytes, cc->inbuf.contentlength); + if (cc->inbuf.nbytes < cc->inbuf.contentlength) + { + do + { + nbytes_read = read(cc->connfd, cc->inbuf.buffer, + MIN(CONFIG_THTTPD_CGIINBUFFERSIZE, cc->inbuf.contentlength - cc->inbuf.nbytes)); + nllvdbg("nbytes_read: %d\n", nbytes_read); + if (nbytes_read < 0) + { + if (errno != EINTR) + { + nlldbg("read failed: %d\n", errno); + return 1; + } + } + } + while (nbytes_read < 0); + + if (nbytes_read > 0) + { + nbytes_written = httpd_write(cc->wrfd, cc->inbuf.buffer, nbytes_read); + nllvdbg("nbytes_written: %d\n", nbytes_written); + if (nbytes_written != nbytes_read) + { + nlldbg("httpd_write failed\n"); + return 1; + } + cgi_dumpbuffer("Sent to CGI:", cc->inbuf.buffer, nbytes_written); + } + + cc->inbuf.nbytes += nbytes_read; + } + + if (cc->inbuf.nbytes >= cc->inbuf.contentlength) + { + /* Special hack to deal with broken browsers that send a LF or CRLF + * after POST data, causing TCP resets - we just read and discard up + * to 2 bytes. Unfortunately this doesn't fix the problem for CGIs + * which avoid the interposer task due to their POST data being + * short. Creating an interposer task for all POST CGIs is + * unacceptably expensive. The eventual fix will come when interposing + * gets integrated into the main loop as a tasklet instead of a task. + */ + + /* Turn on no-delay mode in case we previously cleared it. */ + + httpd_set_ndelay(cc->connfd); + + /* And read up to 2 bytes. */ + + (void)read(cc->connfd, cc->inbuf.buffer, CONFIG_THTTPD_CGIINBUFFERSIZE); + return 1; + } + return 0; +} + +/* This routine is used for parsed-header CGIs. The idea here is that the + * CGI can return special headers such as "Status:" and "Location:" which + * change the return status of the response. Since the return status has to + * be the very first line written out, we have to accumulate all the headers + * and check for the special ones before writing the status. Then we write + * out the saved headers and proceed to echo the rest of the response. + */ + +static inline int cgi_interpose_output(struct cgi_conn_s *cc) +{ + ssize_t nbytes_read; + char *br = NULL; + int status; + const char *title; + char *cp; + + /* Make sure the connection is in blocking mode. It should already be + * blocking, but we might as well be sure. + */ + + httpd_clear_ndelay(cc->connfd); + + /* Loop while there are things we can do without waiting for more input */ + + nllvdbg("state: %d\n", cc->outbuf.state); + switch (cc->outbuf.state) + { + case CGI_OUTBUFFER_READHEADER: + { + /* Slurp in all headers as they become available from the client. */ + + do + { + /* Read until we successfully read data or until an error occurs. + * EAGAIN is not an error, but it is still cause to return. + */ + + nbytes_read = read(cc->rdfd, cc->inbuf.buffer, CONFIG_THTTPD_CGIINBUFFERSIZE); + nllvdbg("Read %d bytes from fd %d\n", nbytes_read, cc->rdfd); + + if (nbytes_read < 0) + { + if (errno != EINTR) + { + if (errno != EAGAIN) + { + nlldbg("read: %d\n", errno); + } + return 1; + } + } + else + { + cgi_dumpbuffer("Received from CGI:", cc->inbuf.buffer, nbytes_read); + } + } + while (nbytes_read < 0); + + /* Check for end-of-file */ + + if (nbytes_read <= 0) + { + nllvdbg("End-of-file\n"); + br = &(cc->outbuf.buffer[cc->outbuf.len]); + cc->outbuf.state = CGI_OUTBUFFER_HEADERREAD; + } + else + { + /* Accumulate more header data */ + + httpd_realloc_str(&cc->outbuf.buffer, &cc->outbuf.size, cc->outbuf.len + nbytes_read); + (void)memcpy(&(cc->outbuf.buffer[cc->outbuf.len]), cc->inbuf.buffer, nbytes_read); + cc->outbuf.len += nbytes_read; + cc->outbuf.buffer[cc->outbuf.len] = '\0'; + nllvdbg("Header bytes accumulated: %d\n", cc->outbuf.len); + + /* Check for end of header */ + + if ((br = strstr(cc->outbuf.buffer, "\r\n\r\n")) != NULL || + (br = strstr(cc->outbuf.buffer, "\012\012")) != NULL) + { + nllvdbg("End-of-header\n"); + cc->outbuf.state = CGI_OUTBUFFER_HEADERREAD; + } + else + { + /* All of the headers have not yet been read ... Return. We + * will be called again when more data is available in the pipe + * connected to the CGI task. + */ + + return 0; + } + } + } + + /* Otherwise, fall through and parse status in the HTTP headers */ + + case CGI_OUTBUFFER_HEADERREAD: + { + /* If there were no headers, bail. */ + + if (cc->outbuf.buffer[0] == '\0') + { + cc->outbuf.state = CGI_OUTBUFFER_DONE; + return 1; + } + + /* Figure out the status. Look for a Status: or Location: header; else if + * there's an HTTP header line, get it from there; else default to 200. + */ + + status = 200; + if (strncmp(cc->outbuf.buffer, "HTTP/", 5) == 0) + { + cp = cc->outbuf.buffer; + cp += strcspn(cp, " \t"); + status = atoi(cp); + } + + if ((cp = strstr(cc->outbuf.buffer, "Status:")) != NULL && + cp < br && (cp == cc->outbuf.buffer || *(cp - 1) == '\012')) + { + cp += 7; + cp += strspn(cp, " \t"); + status = atoi(cp); + } + + if ((cp = strstr(cc->outbuf.buffer, "Location:")) != NULL && + cp < br && (cp == cc->outbuf.buffer || *(cp - 1) == '\012')) + { + status = 302; + } + + /* Write the status line. */ + + nllvdbg("Status: %d\n", status); + switch (status) + { + case 200: + title = ok200title; + break; + + case 302: + title = err302title; + break; + + case 304: + title = err304title; + break; + + case 400: + BADREQUEST("status"); + title = httpd_err400title; + break; + +#ifdef CONFIG_THTTPD_AUTH_FILE + case 401: + title = err401title; + break; +#endif + + case 403: + title = err403title; + break; + + case 404: + title = err404title; + break; + + case 408: + title = httpd_err408title; + break; + + case 500: + INTERNALERROR("status"); + title = err500title; + break; + + case 501: + NOTIMPLEMENTED("status"); + title = err501title; + break; + + case 503: + title = httpd_err503title; + break; + + default: + title = "Something"; + break; + } + + (void)snprintf(cc->inbuf.buffer, CONFIG_THTTPD_CGIINBUFFERSIZE, "HTTP/1.0 %d %s\r\n", status, title); + (void)httpd_write(cc->connfd, cc->inbuf.buffer, strlen(cc->inbuf.buffer)); + + /* Write the saved cc->outbuf.buffer to the client. */ + + (void)httpd_write(cc->connfd, cc->outbuf.buffer, cc->outbuf.len); + } + + /* Then set up to read the data following the header from the CGI program and + * pass it back to the client. We return now; we will be called again when + * data is available on the pipe. + */ + + cc->outbuf.state = CGI_OUTBUFFER_READDATA; + return 0; + + case CGI_OUTBUFFER_READDATA: + { + /* Read data from the pipe. */ + + do + { + /* Read until we successfully read data or until an error occurs. + * EAGAIN is not an error, but it is still cause to return. + */ + + nbytes_read = read(cc->rdfd, cc->inbuf.buffer, CONFIG_THTTPD_CGIINBUFFERSIZE); + nllvdbg("Read %d bytes from fd %d\n", nbytes_read, cc->rdfd); + + if (nbytes_read < 0) + { + if (errno != EINTR) + { + if (errno != EAGAIN) + { + nlldbg("read: %d\n", errno); + } + return 1; + } + } + else + { + cgi_dumpbuffer("Received from CGI:", cc->inbuf.buffer, nbytes_read); + } + } + while (nbytes_read < 0); + + /* Check for end of file */ + + if (nbytes_read == 0) + { + nllvdbg("End-of-file\n"); + cc->outbuf.state = CGI_OUTBUFFER_DONE; + return 1; + } + else + { + /* Forward the data from the CGI program to the client */ + + (void)httpd_write(cc->connfd, cc->inbuf.buffer, nbytes_read); + } + } + break; + + case CGI_OUTBUFFER_DONE: + default: + return 1; + } + return 0; +} + +/* CGI child task. */ + +static int cgi_child(int argc, char **argv) +{ + FAR httpd_conn *hc = (FAR httpd_conn*)strtoul(argv[1], NULL, 16); +#if CONFIG_THTTPD_CGI_TIMELIMIT > 0 + ClientData client_data; +#endif + FAR char **argp; + FAR struct cgi_conn_s *cc; + FAR struct fdwatch_s *fw; + FAR char *directory; + FAR char *dupname; + bool indone; + bool outdone; + int child; + int pipefd[2]; + int nbytes; + int fd; + int ret; + int err = 1; + + /* Use low-level debug out (because the low-level output may survive closing + * all file descriptors + */ + + nllvdbg("Started: %s\n", argv[1]); + + /* Allocate memory and initialize memory for interposing */ + + cc = (FAR struct cgi_conn_s*)httpd_malloc(sizeof(struct cgi_conn_s)); + if (!cc) + { + nlldbg("cgi_conn allocation failed\n"); + close(hc->conn_fd); + goto errout; + } + + cc->connfd = hc->conn_fd; + cc->wrfd = -1; + cc->rdfd = -1; + memset(&cc->outbuf, 0, sizeof(struct cgi_outbuffer_s)); + + /* Update all of the environment variable settings, these will be inherited + * by the CGI task. + */ + + create_environment(hc); + + /* Make the argument vector. */ + + argp = make_argp(hc); + + /* Close all file descriptors EXCEPT for stdin, stdout, stderr and + * hc->conn_fd. We'll keep stderr open for error reporting; stdin and + * stdout will be closed later by dup2(). Keeping stdin and stdout open + * now prevents re-use of fd=0 and 1 by pipe(). + */ + + nllvdbg("Closing descriptors\n"); + for (fd = 3; fd < (CONFIG_NFILE_DESCRIPTORS + CONFIG_NSOCKET_DESCRIPTORS); fd++) + { + /* Keep hc->conn_fd open for obvious reasons */ + + if (fd != hc->conn_fd) + { + close(fd); + } + } + + /* Create pipes that will be interposed between the CGI task's stdin or + * stdout and the socket. + * + * Setup up the STDIN pipe - a pipe to transfer data received on the + * socket to the CGI program. + */ + + nllvdbg("Create STDIN pipe\n"); + ret = pipe(pipefd); + if (ret < 0) + { + nlldbg("STDIN pipe: %d\n", errno); + goto errout_with_cgiconn; + } + else + { + /* Then map the receiving end the pipe to stdin, save the sending end, and + * closing the original receiving end + */ + + ret = dup2(pipefd[0], 0); + + cc->wrfd = pipefd[1]; + close(pipefd[0]); + + if (ret < 0) + { + nlldbg("STDIN dup2: %d\n", errno); + goto errout_with_descriptors; + } + } + + /* Set up the STDOUT pipe - a pipe to transfer data received from the CGI program + * to the client. + */ + + if (ret == 0) + { + nllvdbg("Create STDOUT pipe\n"); + ret = pipe(pipefd); + if (ret < 0) + { + nlldbg("STDOUT pipe: %d\n", errno); + goto errout_with_descriptors; + } + else + { + /* Then map the sending end the pipe to stdout, save the receiving end, and + * closing the original sending end + */ + + ret = dup2(pipefd[1], 1); + + cc->rdfd = pipefd[0]; + close(pipefd[1]); + + if (ret < 0) + { + nlldbg("STDOUT dup2: %d\n", errno); + goto errout_with_descriptors; + } + } + } + + /* chdir to the directory containing the binary. This isn't in the CGI 1.1 + * spec, but it's what other HTTP servers do. + */ + + dupname = httpd_strdup(hc->expnfilename); + if (dupname) + { + directory = dirname(dupname); + if (directory) + { + (void)chdir(directory); /* ignore errors */ + } + httpd_free(dupname); + } + + /* Allocate memory for output buffering */ + + httpd_realloc_str(&cc->outbuf.buffer, &cc->outbuf.size, CONFIG_THTTPD_CGIOUTBUFFERSIZE); + if (!cc->outbuf.buffer) + { + nlldbg("hdr allocation failed\n"); + goto errout_with_descriptors; + } + + /* Create fdwatch structures */ + + fw = fdwatch_initialize(2); + if (!fw) + { + nlldbg("fdwatch allocation failed\n"); + goto errout_with_outbuffer; + } + + /* Run the CGI program. */ + + nllvdbg("Starting CGI: %s\n", hc->expnfilename); + child = exec(hc->expnfilename, (FAR const char **)argp, g_thttpdsymtab, g_thttpdnsymbols); + if (child < 0) + { + /* Something went wrong. */ + + nlldbg("execve %s: %d\n", hc->expnfilename, errno); + goto errout_with_watch; + } + + /* Schedule a kill for the child task in case it runs too long. */ + +#if CONFIG_THTTPD_CGI_TIMELIMIT > 0 + client_data.i = child; + if (tmr_create(NULL, cgi_kill, client_data, CONFIG_THTTPD_CGI_TIMELIMIT * 1000L, 0) == NULL) + { + nlldbg("tmr_create(cgi_kill child) failed\n"); + goto errout_with_watch; + } +#endif + + /* Add the read descriptors to the watch */ + + fdwatch_add_fd(fw, cc->connfd, NULL); + fdwatch_add_fd(fw, cc->rdfd, NULL); + + /* Send any data that is already buffer to the CGI task */ + + nbytes = hc->read_idx - hc->checked_idx; + nllvdbg("nbytes: %d contentlength: %d\n", nbytes, hc->contentlength); + if (nbytes > 0) + { + if (httpd_write(cc->wrfd, &(hc->read_buf[hc->checked_idx]), nbytes) != nbytes) + { + nlldbg("httpd_write failed\n"); + return 1; + } + } + + cc->inbuf.contentlength = hc->contentlength; + cc->inbuf.nbytes = nbytes; + + /* Then perform the interposition */ + + indone = false; + outdone = false; + + nllvdbg("Interposing\n"); + cgi_semgive(); /* Not safe to reference hc after this point */ + do + { + (void)fdwatch(fw, 1000); + + /* Check for incoming data from the remote client to the CGI task */ + + if (!indone && fdwatch_check_fd(fw, cc->connfd)) + { + /* Transfer data from the client to the CGI program (POST) */ + + nllvdbg("Interpose input\n"); + indone = cgi_interpose_input(cc); + if (indone) + { + fdwatch_del_fd(fw, cc->connfd); + } + } + + /* Check for outgoing data from the CGI task to the remote client */ + + if (fdwatch_check_fd(fw, cc->rdfd)) + { + /* Handle receipt of headers and CGI program response (GET) */ + + nllvdbg("Interpose output\n"); + outdone = cgi_interpose_output(cc); + } + + /* No outgoing data... is the child task still running? Use kill() + * kill() with signal number == 0 does not actually send a signal, but + * can be used to check if the target task exists. If the task exists + * but is hung, then you might enable CONFIG_THTTPD_CGI_TIMELIMIT to + * kill the task. However, killing the task could cause other problems + * (consider resetting the microprocessor instead). + */ + + else if (kill(child, 0) != 0) + { + nllvdbg("CGI no longer running: %d\n", errno); + outdone = true; + } + } + while (!outdone); + err = 0; + + /* Get rid of watch structures */ + +errout_with_watch: + fdwatch_uninitialize(fw); + + /* Free output buffer memory */ + +errout_with_outbuffer: + httpd_free(cc->outbuf.buffer); + + /* Close all descriptors */ + +errout_with_descriptors: + close(cc->wrfd); + close(cc->rdfd); + +errout_with_cgiconn: + close(cc->connfd); + httpd_free(cc); + +errout: + nllvdbg("Return %d\n", err); + if (err != 0) + { + INTERNALERROR("errout"); + httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl); + httpd_write_response(hc); + cgi_semgive(); + } + return err; +} + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +int cgi(httpd_conn *hc) +{ + char arg[16]; + char *argv[1]; + pid_t child; + int retval = ERROR; + + /* Set up a semaphore to hold off the make THTTPD thread until the CGI + * threads are configured (basically until the file descriptors are all + * dup'ed and can be closed by the main thread. + */ + + sem_init(&g_cgisem, 0, 0); + + if (hc->method == METHOD_GET || hc->method == METHOD_POST) + { +#ifdef CONFIG_THTTPD_CGILIMIT + if (hc->hs->cgi_count >= CONFIG_THTTPD_CGILIMIT) + { + httpd_send_err(hc, 503, httpd_err503title, "", httpd_err503form, + hc->encodedurl); + goto errout_with_sem; + } +#endif + ++hc->hs->cgi_count; + httpd_clear_ndelay(hc->conn_fd); + + /* Start the child task. We use a trampoline task here so that we can + * safely muck with the file descriptors before actually started the CGI + * task. + */ + + snprintf(arg, 16, "%p", hc); /* task_create doesn't handle binary arguments. */ + argv[0] = arg; + +#ifndef CONFIG_CUSTOM_STACK + child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY, + CONFIG_THTTPD_CGI_STACKSIZE, + (main_t)cgi_child, (const char **)argv); +#else + child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY, + (main_t)cgi_child, (const char **)argv); +#endif + if (child < 0) + { + ndbg("task_create: %d\n", errno); + INTERNALERROR("task_create"); + httpd_send_err(hc, 500, err500title, "", err500form, hc->encodedurl); + goto errout_with_sem; + } + + ndbg("Started CGI task %d for file '%s'\n", child, hc->expnfilename); + + /* Wait for the CGI threads to become initialized */ + + cgi_semtake(); + + hc->bytes_sent = CONFIG_THTTPD_CGI_BYTECOUNT; + hc->should_linger = false; + } + else + { + NOTIMPLEMENTED("CGI"); + httpd_send_err(hc, 501, err501title, "", err501form, httpd_method_str(hc->method)); + goto errout_with_sem; + } + + /* Successfully started */ + + retval = OK; + +errout_with_sem: + sem_destroy(&g_cgisem); + return retval; +} + +#if CONFIG_THTTPD_CGI_TIMELIMIT > 0 +static void cgi_kill(ClientData client_data, struct timeval *nowP) +{ + pid_t pid = (pid_t)client_data.i; + + /* task_delete() is a very evil API. It can leave memory stranded! */ + + nlldbg("Killing CGI child: %d\n", pid); + if (task_delete(pid) != 0) + { + nlldbg("task_delete() failed: %d\n", errno); + } +} +#endif + +#endif /* CONFIG_THTTPD && CONFIG_THTTPD_CGI_PATTERN */ + diff --git a/nuttx/netutils/thttpd/thttpd_cgi.h b/nuttx/netutils/thttpd/thttpd_cgi.h index 5653a7ecf..2d98e25ec 100755 --- a/nuttx/netutils/thttpd/thttpd_cgi.h +++ b/nuttx/netutils/thttpd/thttpd_cgi.h @@ -42,7 +42,6 @@ ****************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
#include "config.h"
#include "libhttpd.h"
diff --git a/nuttx/netutils/thttpd/timers.c b/nuttx/netutils/thttpd/timers.c index 0e19d1df2..8edd7b21b 100644 --- a/nuttx/netutils/thttpd/timers.c +++ b/nuttx/netutils/thttpd/timers.c @@ -38,7 +38,6 @@ * Included Files ****************************************************************************/ -#include <sys/types.h> #include <sys/time.h> #include <stdlib.h> diff --git a/nuttx/netutils/uiplib/uip_gethostaddr.c b/nuttx/netutils/uiplib/uip_gethostaddr.c index abbdc7b72..a04df437c 100644 --- a/nuttx/netutils/uiplib/uip_gethostaddr.c +++ b/nuttx/netutils/uiplib/uip_gethostaddr.c @@ -1,7 +1,7 @@ /**************************************************************************** * netutils/uiplib/uip_gethostaddr.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -40,7 +40,6 @@ #include <nuttx/config.h> #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -#include <sys/types.h> #include <sys/socket.h> #include <sys/ioctl.h> @@ -53,7 +52,7 @@ #include <net/uip/uip-lib.h> /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/netutils/uiplib/uip_getmacaddr.c b/nuttx/netutils/uiplib/uip_getmacaddr.c index d4deff15e..05dbf34f4 100644 --- a/nuttx/netutils/uiplib/uip_getmacaddr.c +++ b/nuttx/netutils/uiplib/uip_getmacaddr.c @@ -1,7 +1,7 @@ /**************************************************************************** * netutils/uiplib/uip_getmacaddr.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -40,10 +40,9 @@ #include <nuttx/config.h> #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -#include <sys/types.h> #include <sys/socket.h> #include <sys/ioctl.h> - +#include <stdint.h> #include <string.h> #include <errno.h> @@ -71,7 +70,7 @@ * ****************************************************************************/ -int uip_getmacaddr(const char *ifname, uint8 *macaddr) +int uip_getmacaddr(const char *ifname, uint8_t *macaddr) { int ret = ERROR; if (ifname && macaddr) diff --git a/nuttx/netutils/uiplib/uip_parsehttpurl.c b/nuttx/netutils/uiplib/uip_parsehttpurl.c index de9efe58c..22fcf0e5f 100644 --- a/nuttx/netutils/uiplib/uip_parsehttpurl.c +++ b/nuttx/netutils/uiplib/uip_parsehttpurl.c @@ -38,7 +38,7 @@ *****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <string.h> #include <errno.h> #include <net/uip/uip-lib.h> @@ -58,7 +58,7 @@ const char g_http[] = "http://"; * Name: uip_parsehttpurl ****************************************************************************/ -int uip_parsehttpurl(const char *url, uint16 *port, +int uip_parsehttpurl(const char *url, uint16_t *port, char *hostname, int hostlen, char *filename, int namelen) { @@ -108,7 +108,7 @@ int uip_parsehttpurl(const char *url, uint16 *port, if (*src == ':') { - uint16 accum = 0; + uint16_t accum = 0; src++; /* Skip over the colon */ while (*src >= '0' && *src <= '9') diff --git a/nuttx/netutils/uiplib/uip_server.c b/nuttx/netutils/uiplib/uip_server.c index e8a31ef5a..ca062d4dd 100644 --- a/nuttx/netutils/uiplib/uip_server.c +++ b/nuttx/netutils/uiplib/uip_server.c @@ -37,15 +37,17 @@ * Included Files ****************************************************************************/ +#include <nuttx/config.h> + #include <sys/types.h> #include <sys/socket.h> -#include <netinet/in.h> - +#include <stdint.h> #include <stdio.h> #include <unistd.h> #include <pthread.h> #include <errno.h> #include <debug.h> +#include <netinet/in.h> #include <net/uip/uip-lib.h> @@ -74,7 +76,7 @@ * ****************************************************************************/ -void uip_server(uint16 portno, pthread_startroutine_t handler, int stacksize) +void uip_server(uint16_t portno, pthread_startroutine_t handler, int stacksize) { struct sockaddr_in myaddr; #ifdef CONFIG_NET_HAVE_SOLINGER diff --git a/nuttx/netutils/uiplib/uip_setdraddr.c b/nuttx/netutils/uiplib/uip_setdraddr.c index cfff9ebfd..36a9c34e1 100644 --- a/nuttx/netutils/uiplib/uip_setdraddr.c +++ b/nuttx/netutils/uiplib/uip_setdraddr.c @@ -1,7 +1,7 @@ /**************************************************************************** * netutils/uiplib/uip_setdraddr.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -40,7 +40,6 @@ #include <nuttx/config.h> #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -#include <sys/types.h> #include <sys/socket.h> #include <sys/ioctl.h> diff --git a/nuttx/netutils/uiplib/uip_sethostaddr.c b/nuttx/netutils/uiplib/uip_sethostaddr.c index 3c28ee02f..d06b22075 100644 --- a/nuttx/netutils/uiplib/uip_sethostaddr.c +++ b/nuttx/netutils/uiplib/uip_sethostaddr.c @@ -1,7 +1,7 @@ /**************************************************************************** * netutils/uiplib/uip_sethostaddr.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -40,7 +40,6 @@ #include <nuttx/config.h> #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -#include <sys/types.h> #include <sys/socket.h> #include <sys/ioctl.h> diff --git a/nuttx/netutils/uiplib/uip_setmacaddr.c b/nuttx/netutils/uiplib/uip_setmacaddr.c index 7e817cb3a..f1bf0d71b 100644 --- a/nuttx/netutils/uiplib/uip_setmacaddr.c +++ b/nuttx/netutils/uiplib/uip_setmacaddr.c @@ -1,7 +1,7 @@ /**************************************************************************** * netutils/uiplib/uip_setmacaddr.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -40,10 +40,9 @@ #include <nuttx/config.h> #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -#include <sys/types.h> #include <sys/socket.h> #include <sys/ioctl.h> - +#include <stdint.h> #include <unistd.h> #include <string.h> #include <errno.h> @@ -54,7 +53,7 @@ #include <net/uip/uip-lib.h> /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ #ifdef CONFIG_NET_IPv6 @@ -82,7 +81,7 @@ * ****************************************************************************/ -int uip_setmacaddr(const char *ifname, const uint8 *macaddr) +int uip_setmacaddr(const char *ifname, const uint8_t *macaddr) { int ret = ERROR; if (ifname && macaddr) diff --git a/nuttx/netutils/uiplib/uip_setnetmask.c b/nuttx/netutils/uiplib/uip_setnetmask.c index 4c77cf22a..837bdc1e3 100644 --- a/nuttx/netutils/uiplib/uip_setnetmask.c +++ b/nuttx/netutils/uiplib/uip_setnetmask.c @@ -1,7 +1,7 @@ /**************************************************************************** * netutils/uiplib/uip_setnetmask.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -40,10 +40,8 @@ #include <nuttx/config.h> #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -#include <sys/types.h> #include <sys/socket.h> #include <sys/ioctl.h> - #include <unistd.h> #include <string.h> #include <errno.h> diff --git a/nuttx/netutils/uiplib/uiplib.c b/nuttx/netutils/uiplib/uiplib.c index 4dd2e31da..b45527f45 100644 --- a/nuttx/netutils/uiplib/uiplib.c +++ b/nuttx/netutils/uiplib/uiplib.c @@ -2,7 +2,7 @@ * netutils/uiplib/uiplib.c * Various uIP library functions. * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Based on uIP which also has a BSD style license: @@ -43,10 +43,12 @@ * Included Files ****************************************************************************/ +#include <stdint.h> +#include <stdbool.h> #include <net/uip/uip.h> #include <net/uip/uip-lib.h> -boolean uiplib_ipaddrconv(const char *addrstr, ubyte *ipaddr) +bool uiplib_ipaddrconv(const char *addrstr, uint8_t *ipaddr) { unsigned char tmp; char c; @@ -64,7 +66,7 @@ boolean uiplib_ipaddrconv(const char *addrstr, ubyte *ipaddr) ++j; if (j > 4) { - return FALSE; + return false; } if (c == '.' || c == 0) { @@ -78,11 +80,11 @@ boolean uiplib_ipaddrconv(const char *addrstr, ubyte *ipaddr) } else { - return FALSE; + return false; } ++addrstr; } while(c != '.' && c != 0); } - return TRUE; + return true; } diff --git a/nuttx/netutils/webclient/webclient.c b/nuttx/netutils/webclient/webclient.c index c939108ee..8b5ba107c 100644 --- a/nuttx/netutils/webclient/webclient.c +++ b/nuttx/netutils/webclient/webclient.c @@ -54,8 +54,9 @@ # include <debug.h> #endif -#include <sys/types.h> #include <sys/socket.h> +#include <stdint.h> +#include <stdbool.h> #include <unistd.h> #include <string.h> #include <errno.h> @@ -99,10 +100,10 @@ struct wget_s { /* Internal status */ - ubyte state; - ubyte httpstatus; + uint8_t state; + uint8_t httpstatus; - uint16 port; /* The port number to use in the connection */ + uint16_t port; /* The port number to use in the connection */ /* These describe the just-received buffer of data */ @@ -184,7 +185,7 @@ static inline int wget_resolvehost(const char *hostname, in_addr_t *ipaddr) return ERROR; } - nvdbg("Using IP address %04x%04x\n", (uint16)he->h_addr[1], (uint16)he->h_addr[0]); + nvdbg("Using IP address %04x%04x\n", (uint16_t)he->h_addr[1], (uint16_t)he->h_addr[0]); memcpy(ipaddr, he->h_addr, sizeof(in_addr_t)); return OK; @@ -198,7 +199,7 @@ static inline int wget_resolvehost(const char *hostname, in_addr_t *ipaddr) /* First check if the host is an IP address. */ - if (!uiplib_ipaddrconv(hostname, (ubyte*)ipaddr)) + if (!uiplib_ipaddrconv(hostname, (uint8_t*)ipaddr)) { /* 'host' does not point to a valid address string. Try to resolve * the host name to an IP address. @@ -409,7 +410,7 @@ int wget(FAR const char *url, FAR char *buffer, int buflen, { struct sockaddr_in server; struct wget_s ws; - boolean redirected; + bool redirected; char *dest; int sockfd; int len; @@ -513,7 +514,7 @@ int wget(FAR const char *url, FAR char *buffer, int buflen, */ ws.state = WEBCLIENT_STATE_STATUSLINE; - redirected = FALSE; + redirected = false; for(;;) { ws.datend = recv(sockfd, ws.buffer, ws.buflen, 0); @@ -564,7 +565,7 @@ int wget(FAR const char *url, FAR char *buffer, int buflen, } else { - redirected = TRUE; + redirected = true; close(sockfd); break; } diff --git a/nuttx/netutils/webserver/httpd.c b/nuttx/netutils/webserver/httpd.c index c37958c3d..91519e1dd 100644 --- a/nuttx/netutils/webserver/httpd.c +++ b/nuttx/netutils/webserver/httpd.c @@ -47,8 +47,9 @@ #include <nuttx/config.h> +#include <sys/types.h> #include <sys/socket.h> - +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -65,7 +66,7 @@ #include "httpd_cgi.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ #define ISO_nl 0x0a @@ -121,7 +122,7 @@ static void httpd_dumpbuffer(FAR const char *msg, FAR const char *buffer, unsign * defined or the following does nothing. */ - nvdbgdumpbuffer(msg, (FAR const ubyte*)buffer, nbytes); + nvdbgdumpbuffer(msg, (FAR const uint8_t*)buffer, nbytes); } #else # define httpd_dumpbuffer(msg,buffer,nbytes) diff --git a/nuttx/netutils/webserver/httpd.h b/nuttx/netutils/webserver/httpd.h index cc43bea4c..52073765c 100644 --- a/nuttx/netutils/webserver/httpd.h +++ b/nuttx/netutils/webserver/httpd.h @@ -45,12 +45,12 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <net/uip/uip.h> #include <net/uip/uipopt.h> /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* As threads are created to handle each request, a stack must be allocated @@ -91,13 +91,13 @@ struct httpd_fs_file struct httpd_state { - char ht_buffer[HTTPD_IOBUFFER_SIZE]; /* recv()/send() buffer */ - char ht_filename[HTTPD_MAX_FILENAME]; /* filename from GET command */ - struct httpd_fs_file ht_file; /* Fake file data to send */ - int ht_sockfd; /* The socket descriptor from accept() */ - char *ht_scriptptr; - uint16 ht_scriptlen; - uint16 ht_sndlen; + char ht_buffer[HTTPD_IOBUFFER_SIZE]; /* recv()/send() buffer */ + char ht_filename[HTTPD_MAX_FILENAME]; /* filename from GET command */ + struct httpd_fs_file ht_file; /* Fake file data to send */ + int ht_sockfd; /* The socket descriptor from accept() */ + char *ht_scriptptr; + uint16_t ht_scriptlen; + uint16_t ht_sndlen; }; /**************************************************************************** @@ -106,7 +106,7 @@ struct httpd_state #ifdef CONFIG_NETUTILS_HTTPDFSSTATS #if CONFIG_NETUTILS_HTTPDFSSTATS == 1 -extern uint16 httpd_fs_count(char *name); +extern uint16_t httpd_fs_count(char *name); #endif /* CONFIG_NETUTILS_HTTPDFSSTATS */ #endif /* CONFIG_NETUTILS_HTTPDFSSTATS */ diff --git a/nuttx/netutils/webserver/httpd_fs.c b/nuttx/netutils/webserver/httpd_fs.c index 0fe93c849..f6403fa37 100644 --- a/nuttx/netutils/webserver/httpd_fs.c +++ b/nuttx/netutils/webserver/httpd_fs.c @@ -41,7 +41,7 @@ * Included Header Files ****************************************************************************/ -#include <sys/types.h> +#include <stdint.h> #include <net/uip/httpd.h> @@ -63,14 +63,14 @@ #include "httpd_fsdata.c" #if CONFIG_NETUTILS_HTTPDFSSTATS -static uint16 count[HTTPD_FS_NUMFILES]; +static uint16_t count[HTTPD_FS_NUMFILES]; #endif /* CONFIG_NETUTILS_HTTPDFSSTATS */ /**************************************************************************** * Private Functions ****************************************************************************/ -static uint8 httpd_fs_strcmp(const char *str1, const char *str2) +static uint8_t httpd_fs_strcmp(const char *str1, const char *str2) { int i; @@ -98,7 +98,7 @@ static uint8 httpd_fs_strcmp(const char *str1, const char *str2) int httpd_fs_open(const char *name, struct httpd_fs_file *file) { #if CONFIG_NETUTILS_HTTPDFSSTATS - uint16 i = 0; + uint16_t i = 0; #endif /* CONFIG_NETUTILS_HTTPDFSSTATS */ struct httpd_fsdata_file_noconst *f; @@ -125,7 +125,7 @@ int httpd_fs_open(const char *name, struct httpd_fs_file *file) void httpd_fs_init(void) { #if CONFIG_NETUTILS_HTTPDFSSTATS - uint16 i; + uint16_t i; for(i = 0; i < HTTPD_FS_NUMFILES; i++) { count[i] = 0; @@ -134,10 +134,10 @@ void httpd_fs_init(void) } #if CONFIG_NETUTILS_HTTPDFSSTATS -uint16 httpd_fs_count(char *name) +uint16_t httpd_fs_count(char *name) { struct httpd_fsdata_file_noconst *f; - uint16 i; + uint16_t i; i = 0; for(f = (struct httpd_fsdata_file_noconst *)HTTPD_FS_ROOT; diff --git a/nuttx/netutils/webserver/httpd_fsdata.h b/nuttx/netutils/webserver/httpd_fsdata.h index 473eb755e..d0a69affa 100644 --- a/nuttx/netutils/webserver/httpd_fsdata.h +++ b/nuttx/netutils/webserver/httpd_fsdata.h @@ -43,7 +43,7 @@ * Included Files ****************************************************************************/ -#include <sys/types.h> +#include <stdint.h> #include <net/uip/uip.h> /**************************************************************************** @@ -53,12 +53,12 @@ struct httpd_fsdata_file { const struct httpd_fsdata_file *next; - FAR const ubyte *name; - FAR const ubyte *data; + FAR const uint8_t *name; + FAR const uint8_t *data; int len; #ifdef CONFIG_NETUTILS_HTTPDFSSTATS #if CONFIG_NETUTILS_HTTPDFSSTATS == 1 - uint16 count; + uint16_t count; #endif /* CONFIG_NETUTILS_HTTPDFSSTATS */ #endif /* CONFIG_NETUTILS_HTTPDFSSTATS */ }; @@ -71,7 +71,7 @@ struct httpd_fsdata_file_noconst int len; #ifdef CONFIG_NETUTILS_HTTPDFSSTATS #if CONFIG_NETUTILS_HTTPDFSSTATS == 1 - uint16 count; + uint16_t count; #endif /* CONFIG_NETUTILS_HTTPDFSSTATS */ #endif /* CONFIG_NETUTILS_HTTPDFSSTATS */ }; |