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

Changing NuttX fixed size type names to C99 standard names -- things will be broken for awhile

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2347 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-12-15 16:37:20 +00:00
parent 05d9fdd61e
commit 9ba9db7e9d
35 changed files with 1343 additions and 1329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
netutils/dhcpc/dhcpc.c
View File

@ -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;

43
netutils/dhcpd/dhcpd.c
View File

@ -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;

44
netutils/resolv/resolv.c
View File

@ -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 */

13
netutils/smtp/smtp.c
View File

@ -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;

24
netutils/telnetd/telnetd.c
View File

@ -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)
{

29
netutils/tftpc/tftpc_get.c
View File

@ -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");

18
netutils/tftpc/tftpc_internal.h
View File

@ -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);

19
netutils/tftpc/tftpc_packets.c
View File

@ -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)

35
netutils/tftpc/tftpc_put.c
View File

@ -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");

2
netutils/thttpd/cgi-src/redirect.c
View File

@ -71,8 +71,6 @@
* Public Functions
****************************************************************************/
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

3
netutils/thttpd/config.h
View File

@ -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. */

4
netutils/thttpd/fdwatch.c
View File

@ -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;

12
netutils/thttpd/fdwatch.h
View File

@ -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 */
};
/****************************************************************************

42
netutils/thttpd/libhttpd.c
View File

@ -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;
}
}

19
netutils/thttpd/libhttpd.h
View File

@ -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;
/****************************************************************************

2
netutils/thttpd/mime_types.h
View File

@ -44,6 +44,8 @@
* Included Files
****************************************************************************/
#include <sys/types.h>
/****************************************************************************
* Private Types
****************************************************************************/

2
netutils/thttpd/tdate_parse.c
View File

@ -38,7 +38,7 @@
* Included Files
****************************************************************************/
#include <sys/types.h>
#include <nuttx/config.h>
#include <stdio.h>
#include <stdlib.h>

9
netutils/thttpd/thttpd.c
View File

@ -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)
{

2158
netutils/thttpd/thttpd_cgi.c
View File

File diff suppressed because it is too large Load Diff

1
netutils/thttpd/thttpd_cgi.h
View File

@ -42,7 +42,6 @@
****************************************************************************/
#include <nuttx/config.h>
#include <sys/types.h>
#include "config.h"
#include "libhttpd.h"

1
netutils/thttpd/timers.c
View File

@ -38,7 +38,6 @@
* Included Files
****************************************************************************/
#include <sys/types.h>
#include <sys/time.h>
#include <stdlib.h>

5
netutils/uiplib/uip_gethostaddr.c
View File

@ -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
****************************************************************************/
/****************************************************************************

7
netutils/uiplib/uip_getmacaddr.c
View File

@ -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)

6
netutils/uiplib/uip_parsehttpurl.c
View File

@ -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')

8
netutils/uiplib/uip_server.c
View File

@ -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

3
netutils/uiplib/uip_setdraddr.c
View File

@ -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>

3
netutils/uiplib/uip_sethostaddr.c
View File

@ -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>

9
netutils/uiplib/uip_setmacaddr.c
View File

@ -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)

4
netutils/uiplib/uip_setnetmask.c
View File

@ -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>

12
netutils/uiplib/uiplib.c
View File

@ -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;
}

19
netutils/webclient/webclient.c
View File

@ -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;
}

7
netutils/webserver/httpd.c
View File

@ -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)

20
netutils/webserver/httpd.h
View File

@ -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 */

14
netutils/webserver/httpd_fs.c
View File

@ -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;

10
netutils/webserver/httpd_fsdata.h
View File

@ -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 */
};