rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-18 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

uxsockrcvr: add timeout

Browse Source 
The program times out after some time.
Default is 60 seconds and can be changed with the parameter -t.

closes https://github.com/rsyslog/rsyslog/issues/2905
This commit is contained in:
PascalWithopf 2018-08-27 11:28:12 +02:00
parent c517af7b24
commit 7c141425dc
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/uxsock_simple.sh
View File

@ -25,7 +25,7 @@ $template outfmt,"%msg:F,58:2%\n"
$OMUXSockSocket rsyslog-testbench-dgram-uxsock
:msg, contains, "msgnum:" :omuxsock:;outfmt
'
timeout 1m ./uxsockrcvr -srsyslog-testbench-dgram-uxsock -o $RSYSLOG_OUT_LOG &
./uxsockrcvr -srsyslog-testbench-dgram-uxsock -o $RSYSLOG_OUT_LOG -t 60 &
BGPROCESS=$!
echo background uxsockrcvr process id is $BGPROCESS

39
tests/uxsockrcvr.c
View File

@ -5,6 +5,7 @@
* -s name of socket (required)
* -o name of output file (stdout if not given)
* -l add newline after each message received (default: do not add anything)
* -t timeout in seconds (default 60)
*
* Part of the testbench for rsyslog.
*
@ -36,10 +37,14 @@
#include <getopt.h>
#include <sys/un.h>
#include <netdb.h>
#include <poll.h>
#include <errno.h>
#if defined(__FreeBSD__)
#include <sys/socket.h>
#endif
#define DFLT_TIMEOUT 60
char *sockName = NULL;
int sock;
int addNL = 0;
@ -78,18 +83,20 @@ main(int argc, char *argv[])
{
int opt;
int rlen;
int timeout = DFLT_TIMEOUT;
FILE *fp = stdout;
unsigned char data[128*1024];
struct sockaddr_un addr; /* address of server */
struct sockaddr from;
socklen_t fromlen;
struct pollfd fds[1];
if(argc < 2) {
fprintf(stderr, "error: too few arguments!\n");
usage();
}
while((opt = getopt(argc, argv, "s:o:l")) != EOF) {
while((opt = getopt(argc, argv, "s:o:lt:")) != EOF) {
switch((char)opt) {
case 'l':
addNL = 1;
@ -103,10 +110,15 @@ main(int argc, char *argv[])
exit(1);
}
break;
case 't':
timeout = atoi(optarg);
break;
default:usage();
}
}
timeout = timeout * 1000;
if(sockName == NULL) {
fprintf(stderr, "error: -s /socket/name must be specified!\n");
exit(1);
@ -140,19 +152,32 @@ main(int argc, char *argv[])
exit(1);
}
fds[0].fd = sock;
fds[0].events = POLLIN;
/* we now run in an endless loop. We do not check who sends us
* data. This should be no problem for our testbench use.
*/
while(1) {
fromlen = sizeof(from);
rlen = recvfrom(sock, data, 2000, 0, &from, &fromlen);
rlen = poll(fds, 1, timeout);
if(rlen == -1) {
perror("uxsockrcvr : recv\n");
exit(1);
perror("uxsockrcvr : poll\n");
exit(1);
} else if(rlen == 0) {
fprintf(stderr, "Socket timed out - nothing to receive\n");
exit(1);
} else {
fwrite(data, 1, rlen, fp);
if(addNL)
fputc('\n', fp);
rlen = recvfrom(sock, data, 2000, 0, &from, &fromlen);
if(rlen == -1) {
perror("uxsockrcvr : recv\n");
exit(1);
} else {
fwrite(data, 1, rlen, fp);
if(addNL)
fputc('\n', fp);
}
}
}