sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try to ignore the usual value restrictions of sockopt SO_RCVBUF when running 

as root (with CAP_NET_ADMIN) by using SO_RCVBUFFORCE if possible.
pull/7/head
Oliver Hartkopp 2010-01-15 19:15:08 +00:00
parent 3c019ea611
commit 9327499121
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
candump.c
View File

@ -355,7 +355,7 @@ int main(int argc, char **argv)
if (silent == SILENT_INI) { if (silent == SILENT_INI) {
if (log) { if (log) {
fprintf(stderr, "\nDisabled standard output while logging."); fprintf(stderr, "Disabled standard output while logging.\n");
silent = SILENT_ON; /* disable output on stdout */ silent = SILENT_ON; /* disable output on stdout */
} else } else
silent = SILENT_OFF; /* default output */ silent = SILENT_OFF; /* default output */
@ -482,23 +482,30 @@ int main(int argc, char **argv)
int curr_rcvbuf_size; int curr_rcvbuf_size;
socklen_t curr_rcvbuf_size_len = sizeof(curr_rcvbuf_size); socklen_t curr_rcvbuf_size_len = sizeof(curr_rcvbuf_size);
if (setsockopt(s[i], SOL_SOCKET, SO_RCVBUF, /* try SO_RCVBUFFORCE first, if we run with CAP_NET_ADMIN */
if (setsockopt(s[i], SOL_SOCKET, SO_RCVBUFFORCE,
&rcvbuf_size, sizeof(rcvbuf_size)) < 0) { &rcvbuf_size, sizeof(rcvbuf_size)) < 0) {
perror("setsockopt SO_RCVBUF"); #ifdef DEBUG
return 1; printf("SO_RCVBUFFORCE failed so try SO_RCVBUF ...\n");
} #endif
if (setsockopt(s[i], SOL_SOCKET, SO_RCVBUF,
&rcvbuf_size, sizeof(rcvbuf_size)) < 0) {
perror("setsockopt SO_RCVBUF");
return 1;
}
if (getsockopt(s[i], SOL_SOCKET, SO_RCVBUF, if (getsockopt(s[i], SOL_SOCKET, SO_RCVBUF,
&curr_rcvbuf_size, &curr_rcvbuf_size_len) < 0) { &curr_rcvbuf_size, &curr_rcvbuf_size_len) < 0) {
perror("getsockopt SO_RCVBUF"); perror("getsockopt SO_RCVBUF");
return 1; return 1;
} }
/* Only print a warning the first time we detect the adjustment */ /* Only print a warning the first time we detect the adjustment */
/* n.b.: The wanted size is doubled in Linux in net/sore/sock.c */ /* n.b.: The wanted size is doubled in Linux in net/sore/sock.c */
if (!i && curr_rcvbuf_size < rcvbuf_size*2) if (!i && curr_rcvbuf_size < rcvbuf_size*2)
fprintf(stderr, "The socket receive buffer size was " fprintf(stderr, "The socket receive buffer size was "
"adjusted due to /proc/sys/net/core/rmem_max.\n"); "adjusted due to /proc/sys/net/core/rmem_max.\n");
}
} }
if (timestamp || log || logfrmt) { if (timestamp || log || logfrmt) {