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

netutils/netcat: sendfile related code refactoring + small fixes

Browse Source
This commit is contained in:
Alexander Lunev 2022-01-18 03:29:03 +03:00 committed by Xiang Xiao
parent c7e96dbe32
commit 371beb2a0f
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
netutils/netcat/netcat_main.c
View File

@ -78,6 +78,33 @@ int do_io(int infd, int outfd)
return EXIT_SUCCESS;
}
#ifdef CONFIG_NETUTILS_NETCAT_SENDFILE
int do_io_over_sendfile(int infd, int outfd, ssize_t len)
{
off_t offset = 0;
ssize_t written;
while (len > 0)
{
written = sendfile(outfd, infd, &offset, len);
if (written == -1 && errno == EAGAIN)
{
continue;
}
else if (written == -1)
{
perror("do_io: sendfile error");
return 5;
}
len -= written;
}
return EXIT_SUCCESS;
}
#endif
int netcat_server(int argc, char * argv[])
{
int id = -1;
@ -170,8 +197,6 @@ int netcat_client(int argc, char * argv[])
int result = EXIT_SUCCESS;
#ifdef CONFIG_NETUTILS_NETCAT_SENDFILE
struct stat stat_buf;
off_t offset;
ssize_t len;
#endif
if (argc > 1)
@ -198,7 +223,7 @@ int netcat_client(int argc, char * argv[])
#ifdef CONFIG_NETUTILS_NETCAT_SENDFILE
if (fstat(infd, &stat_buf) == -1)
{
perror("fstat");
perror("error: fstat: Could not get the input file size");
infd = STDIN_FILENO;
result = 1;
goto out;
@ -234,25 +259,7 @@ int netcat_client(int argc, char * argv[])
#ifdef CONFIG_NETUTILS_NETCAT_SENDFILE
if (argc > 3)
{
len = stat_buf.st_size;
offset = 0;
while (len > 0)
{
result = sendfile(id, infd, &offset, len);
if (result == -1 && errno == EAGAIN)
{
continue;
}
else if (result == -1)
{
perror("sendfile error");
break;
}
len -= result;
}
result = do_io_over_sendfile(infd, id, stat_buf.st_size);
}
else
#endif