summaryrefslogtreecommitdiff
path: root/apps/examples/udp
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-10-08 08:33:00 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-10-08 08:33:00 -0600
commitfdb1d0a4df496e7a3232a950d5c72231363cf67a (patch)
tree5d18c1b4f9241f17396ec663ff4425bf21e6b57a /apps/examples/udp
parent1753a0251a941fa4d1a5b95aec631209e9957670 (diff)
downloadnuttx-fdb1d0a4df496e7a3232a950d5c72231363cf67a.tar.gz
nuttx-fdb1d0a4df496e7a3232a950d5c72231363cf67a.tar.bz2
nuttx-fdb1d0a4df496e7a3232a950d5c72231363cf67a.zip
Remove non-portable references to syslog from apps/examples
Diffstat (limited to 'apps/examples/udp')
-rw-r--r--apps/examples/udp/udp-client.c12
-rw-r--r--apps/examples/udp/udp-internal.h19
-rw-r--r--apps/examples/udp/udp-server.c30
3 files changed, 21 insertions, 40 deletions
diff --git a/apps/examples/udp/udp-client.c b/apps/examples/udp/udp-client.c
index 297cde5f5..04ba5aaee 100644
--- a/apps/examples/udp/udp-client.c
+++ b/apps/examples/udp/udp-client.c
@@ -88,7 +88,7 @@ void send_client(void)
sockfd = socket(PF_INET, SOCK_DGRAM, 0);
if (sockfd < 0)
{
- message("client socket failure %d\n", errno);
+ printf("client socket failure %d\n", errno);
exit(1);
}
@@ -106,21 +106,21 @@ void send_client(void)
server.sin_port = HTONS(PORTNO);
server.sin_addr.s_addr = HTONL(CONFIG_EXAMPLES_UDP_SERVERIP);
- message("client: %d. Sending %d bytes\n", offset, SENDSIZE);
+ printf("client: %d. Sending %d bytes\n", offset, SENDSIZE);
nbytes = sendto(sockfd, outbuf, SENDSIZE, 0,
(struct sockaddr*)&server, sizeof(struct sockaddr_in));
- message("client: %d. Sent %d bytes\n", offset, nbytes);
+ printf("client: %d. Sent %d bytes\n", offset, nbytes);
if (nbytes < 0)
{
- message("client: %d. sendto failed: %d\n", offset, errno);
+ printf("client: %d. sendto failed: %d\n", offset, errno);
close(sockfd);
exit(-1);
}
else if (nbytes != SENDSIZE)
{
- message("client: %d. Bad send length: %d Expected: %d\n",
- offset, nbytes, SENDSIZE);
+ printf("client: %d. Bad send length: %d Expected: %d\n",
+ offset, nbytes, SENDSIZE);
close(sockfd);
exit(-1);
}
diff --git a/apps/examples/udp/udp-internal.h b/apps/examples/udp/udp-internal.h
index 49439aedb..9dee4162d 100644
--- a/apps/examples/udp/udp-internal.h
+++ b/apps/examples/udp/udp-internal.h
@@ -56,25 +56,6 @@
# define HTONS(a) htons(a)
# define HTONL(a) htonl(a)
-
- /* Used printf for debug output */
-
-# define message(...) printf(__VA_ARGS__)
-
- /* Have SO_LINGER */
-
-#else
-
- /* If debug is enabled, use the synchronous lowsyslog so that the
- * program output does not get disassociated in the debug output.
- */
-
-# ifdef CONFIG_DEBUG
-# define message(...) lowsyslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-
#endif
#define PORTNO 5471
diff --git a/apps/examples/udp/udp-server.c b/apps/examples/udp/udp-server.c
index e16449b8d..f06e67593 100644
--- a/apps/examples/udp/udp-server.c
+++ b/apps/examples/udp/udp-server.c
@@ -69,7 +69,7 @@ static inline int check_buffer(unsigned char *buf)
}
if (buf[j] != ch)
{
- message("server: Buffer content error for offset=%d, index=%d\n", offset, j);
+ printf("server: Buffer content error for offset=%d, index=%d\n", offset, j);
ret = 0;
}
}
@@ -97,7 +97,7 @@ void recv_server(void)
sockfd = socket(PF_INET, SOCK_DGRAM, 0);
if (sockfd < 0)
{
- message("server: socket failure: %d\n", errno);
+ printf("server: socket failure: %d\n", errno);
exit(1);
}
@@ -106,7 +106,7 @@ void recv_server(void)
optval = 1;
if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (void*)&optval, sizeof(int)) < 0)
{
- message("server: setsockopt SO_REUSEADDR failure: %d\n", errno);
+ printf("server: setsockopt SO_REUSEADDR failure: %d\n", errno);
exit(1);
}
@@ -118,7 +118,7 @@ void recv_server(void)
if (bind(sockfd, (struct sockaddr*)&server, sizeof(struct sockaddr_in)) < 0)
{
- message("server: bind failure: %d\n", errno);
+ printf("server: bind failure: %d\n", errno);
exit(1);
}
@@ -126,47 +126,47 @@ void recv_server(void)
for (offset = 0; offset < 256; offset++)
{
- message("server: %d. Receiving up 1024 bytes\n", offset);
+ printf("server: %d. Receiving up 1024 bytes\n", offset);
addrlen = sizeof(struct sockaddr_in);
nbytes = recvfrom(sockfd, inbuf, 1024, 0,
(struct sockaddr*)&client, &addrlen);
tmpaddr = ntohl(client.sin_addr.s_addr);
- message("server: %d. Received %d bytes from %d.%d.%d.%d:%d\n",
- offset, nbytes,
- tmpaddr >> 24, (tmpaddr >> 16) & 0xff,
- (tmpaddr >> 8) & 0xff, tmpaddr & 0xff,
- ntohs(client.sin_port));
+ printf("server: %d. Received %d bytes from %d.%d.%d.%d:%d\n",
+ offset, nbytes,
+ tmpaddr >> 24, (tmpaddr >> 16) & 0xff,
+ (tmpaddr >> 8) & 0xff, tmpaddr & 0xff,
+ ntohs(client.sin_port));
if (nbytes < 0)
{
- message("server: %d. recv failed: %d\n", offset, errno);
+ printf("server: %d. recv failed: %d\n", offset, errno);
close(sockfd);
exit(-1);
}
if (nbytes != SENDSIZE)
{
- message("server: %d. recv size incorrect: %d vs %d\n", offset, nbytes, SENDSIZE);
+ printf("server: %d. recv size incorrect: %d vs %d\n", offset, nbytes, SENDSIZE);
close(sockfd);
exit(-1);
}
if (offset < inbuf[0])
{
- message("server: %d. %d packets lost, resetting offset\n", offset, inbuf[0] - offset);
+ printf("server: %d. %d packets lost, resetting offset\n", offset, inbuf[0] - offset);
offset = inbuf[0];
}
else if (offset > inbuf[0])
{
- message("server: %d. Bad offset in buffer: %d\n", offset, inbuf[0]);
+ printf("server: %d. Bad offset in buffer: %d\n", offset, inbuf[0]);
close(sockfd);
exit(-1);
}
if (!check_buffer(inbuf))
{
- message("server: %d. Bad buffer contents\n", offset);
+ printf("server: %d. Bad buffer contents\n", offset);
close(sockfd);
exit(-1);
}