Skip to content

Add -u and -U options, for setting UDP socket receive buffer sizes, for IPv4 and IPv6 respectively #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mateusz-Laczny wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add -u and -U options, for setting UDP socket receive buffer sizes, for IPv4 and IPv6 respectively #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion src/sflowtool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ typedef struct _SFFieldList {
typedef struct _SFConfig {
/* sflow(R) options */
uint16_t sFlowInputPort;
int sFlowSocketBufferSizeIpv4;
int sFlowSocketBufferSizeIpv6;
/* netflow(TM) options */
uint16_t netFlowOutputPort;
SFLAddress netFlowOutputIP;
Expand Down Expand Up @@ -5811,6 +5813,13 @@ static int openInputUDPSocket(char *address, uint16_t port)
return -1;
}

if (sfConfig.sFlowSocketBufferSizeIpv4 != -1) {
if ((setsockopt(soc, SOL_SOCKET, SO_RCVBUF, &sfConfig.sFlowSocketBufferSizeIpv4, (socklen_t) sizeof(sfConfig.sFlowSocketBufferSizeIpv4))) == -1) {
fprintf(ERROUT, "v4 setsockopt( SO_RCVBUF ) failed, %s\n", strerror(errno));
return -1;
}
}

/* make socket non-blocking */
int save_fd = fcntl(soc, F_GETFL);
save_fd |= O_NONBLOCK;
Expand Down Expand Up @@ -5852,6 +5861,13 @@ static int openInputUDP6Socket(char *address, uint16_t port)
exit(-6);
}

if (sfConfig.sFlowSocketBufferSizeIpv6 != -1) {
if ((setsockopt(soc, SOL_SOCKET, SO_RCVBUF, &sfConfig.sFlowSocketBufferSizeIpv6, (socklen_t) sizeof(sfConfig.sFlowSocketBufferSizeIpv6))) == -1) {
fprintf(ERROUT, "v6 setsockopt( SO_RCVBUF ) failed, %s\n", strerror(errno));
return -1;
}
}

/* make socket non-blocking */
int save_fd = fcntl(soc, F_GETFL);
save_fd |= O_NONBLOCK;
Expand Down Expand Up @@ -6475,6 +6491,10 @@ static void instructions(char *command)
fprintf(ERROUT,"general:\n");
fprintf(ERROUT, " -k - keep going on non-signal errors rather than aborting\n");
fprintf(ERROUT, " -D - allow hosts to be referenced by DNS name\n");
fprintf(ERROUT, " -u - set IPv4 UDP socket buffer size\n");
fprintf(ERROUT, " (has no effect if sflowtool doesn't listen on IPv4 socket)\n");
fprintf(ERROUT, " -U - set IPv6 UDP socket buffer size\n");
fprintf(ERROUT, " (has no effect if sflowtool doesn't listen on IPv6 socket)\n");
fprintf(ERROUT,"\n");
fprintf(ERROUT,"forwarding:\n");
fprintf(ERROUT, " -f host/port - forward sflow to IP (or hostname if -D added)\n");
Expand Down Expand Up @@ -6539,6 +6559,8 @@ static void process_command_line(int argc, char *argv[])
sfConfig.listen4 = NO;
sfConfig.listen6 = YES;
sfConfig.keepGoing = NO;
sfConfig.sFlowSocketBufferSizeIpv4 = -1;
sfConfig.sFlowSocketBufferSizeIpv6 = -1;

/* change "+v" to "-V"
and "+4" to "-A"
Expand Down Expand Up @@ -6584,6 +6606,8 @@ static void process_command_line(int argc, char *argv[])
// ==== argument required ====
{ "fields", required_argument, NULL, 'L' },
{ "port", required_argument, NULL, 'p' },
{ "socket-buffer-size-ipv4", required_argument, NULL, 'u' },
{ "socket-buffer-size-ipv6", required_argument, NULL, 'U' },
{ "read-pcap", required_argument, NULL, 'r' },
{ "read-pcap-sampling", required_argument, NULL, 'R' },
{ "read-pcap-playback", required_argument, NULL, 'P' },
Expand All @@ -6599,7 +6623,7 @@ static void process_command_line(int argc, char *argv[])

in = getopt_long(argc,
argv,
"ljJgtTM<HxesSD46Akh?zL:p:r:R:P:c:d:N:f:v:V:b:",
"ljJgtTM<HxesSD46Akh?zL:p:u:U:r:R:P:c:d:N:f:v:V:b:",
long_options,
&option_index);

Expand All @@ -6608,6 +6632,20 @@ static void process_command_line(int argc, char *argv[])

switch(in) {
case 'p': sfConfig.sFlowInputPort = atoi(optarg); break;
case 'u':
sfConfig.sFlowSocketBufferSizeIpv4 = atoi(optarg);
if (sfConfig.sFlowSocketBufferSizeIpv4 <= 0) {
fprintf(ERROUT, "invalid IPv4 socket buffer size %d\n", sfConfig.sFlowSocketBufferSizeIpv4);
exit(-1);
}
break;
case 'U':
sfConfig.sFlowSocketBufferSizeIpv6 = atoi(optarg);
if (sfConfig.sFlowSocketBufferSizeIpv6 <= 0) {
fprintf(ERROUT, "invalid IPv6 socket buffer size %d\n", sfConfig.sFlowSocketBufferSizeIpv6);
exit(-1);
}
break;
case 't': sfConfig.outputFormat = SFLFMT_PCAP; break;
case 'T': sfConfig.outputFormat = SFLFMT_PCAP_DISCARD; break;
case 'M': sfConfig.outputFormat = SFLFMT_PCAP_DGRAM; break;
Expand Down