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

netutils/netcat: implemented NETUTILS_NETCAT_BUFSIZE option.

Browse Source 
This option can be used for the performance optimization if sendfile() is not applicable.
This commit is contained in:
Alexander Lunev 2022-01-24 18:09:32 +03:00 committed by Xiang Xiao
parent 8506078624
commit d595ba2b25
2 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netutils/netcat/Kconfig
View File

@ -59,4 +59,12 @@ config NETUTILS_NETCAT_SENDFILE
Using sendfile() provides a higher performance compared to
the combination of read() and write().
config NETUTILS_NETCAT_BUFSIZE
int "netcat I/O buffer size"
default 256
---help---
The I/O buffer is used in the netcat server mode.
The I/O buffer is also used in the netcat client mode only if
sendfile() is not applicable.
endif

47
netutils/netcat/netcat_main.c
View File

@ -44,23 +44,21 @@
# define NETCAT_PORT 31337
#endif
#ifndef NETCAT_IOBUF_SIZE
# define NETCAT_IOBUF_SIZE 256
#endif
/****************************************************************************
* Public Functions
****************************************************************************/
int do_io(int infd, int outfd)
int do_io(int infd,
int outfd,
char *buf,
size_t buf_size)
{
ssize_t avail;
ssize_t written;
char buf[NETCAT_IOBUF_SIZE];
while (true)
{
avail = read(infd, buf, NETCAT_IOBUF_SIZE);
avail = read(infd, buf, buf_size);
if (avail == 0)
{
break;
@ -120,6 +118,7 @@ int netcat_server(int argc, char * argv[])
int result = EXIT_SUCCESS;
int conn;
socklen_t addrlen;
char *preallocated_iobuf = NULL;
if ((1 < argc) && (0 == strcmp("-l", argv[1])))
{
@ -141,6 +140,14 @@ int netcat_server(int argc, char * argv[])
}
}
preallocated_iobuf = (char *)malloc(CONFIG_NETUTILS_NETCAT_BUFSIZE);
if (preallocated_iobuf == NULL)
{
perror("error: malloc: Failed to allocate I/O buffer\n");
result = 2;
goto out;
}
id = socket(AF_INET , SOCK_STREAM , 0);
if (0 > id)
{
@ -169,7 +176,8 @@ int netcat_server(int argc, char * argv[])
if ((conn = accept(id, (struct sockaddr *)&client, &addrlen)) != -1)
{
result = do_io(conn, outfd);
result = do_io(conn, outfd,
preallocated_iobuf, CONFIG_NETUTILS_NETCAT_BUFSIZE);
}
if (0 > conn)
@ -185,6 +193,11 @@ out:
close(id);
}
if (preallocated_iobuf != NULL)
{
free(preallocated_iobuf);
}
if (outfd != STDOUT_FILENO)
{
close(outfd);
@ -201,6 +214,7 @@ int netcat_client(int argc, char * argv[])
int port = NETCAT_PORT;
int result = EXIT_SUCCESS;
struct sockaddr_in server;
char *preallocated_iobuf = NULL;
#ifdef CONFIG_NETUTILS_NETCAT_SENDFILE
struct stat stat_buf;
#endif
@ -269,7 +283,17 @@ int netcat_client(int argc, char * argv[])
else
#endif
{
result = do_io(infd, id);
preallocated_iobuf = (char *)malloc(CONFIG_NETUTILS_NETCAT_BUFSIZE);
if (preallocated_iobuf == NULL)
{
perror("error: malloc: Failed to allocate I/O buffer\n");
result = 2;
goto out;
}
result = do_io(infd, id,
preallocated_iobuf, CONFIG_NETUTILS_NETCAT_BUFSIZE);
}
out:
@ -278,6 +302,11 @@ out:
close(id);
}
if (preallocated_iobuf != NULL)
{
free(preallocated_iobuf);
}
if (infd != STDIN_FILENO)
{
close(infd);