d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update pfkey_open() function to set socket's write buffer size to

Browse Source 
128k and receive buffer size to 2MB. In case if system has bigger
default values, do not lower them.

This should partially solve the problem, when setkey(8) returns
EAGAIN error on systems with many SAs or SPs.

PR:		88336
Obtained from:	NetBSD/ipsec-tools
MFC after:	2 weeks
This commit is contained in:
Andrey V. Elsukov 2018-03-11 19:26:34 +00:00
parent 86051be993
commit d570044ce1
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/libipsec/pfkey.c
View File

@ -1595,10 +1595,12 @@ pfkey_send_x5(so, type, spid)
* others : success and return value of socket.
*/
int
pfkey_open()
pfkey_open(void)
{
int so;
const int bufsiz = 128 * 1024; /*is 128K enough?*/
int bufsiz_current, bufsiz_wanted;
int ret;
socklen_t len;
if ((so = socket(PF_KEY, SOCK_RAW, PF_KEY_V2)) < 0) {
__ipsec_set_strerror(strerror(errno));
@ -1609,8 +1611,28 @@ pfkey_open()
* This is a temporary workaround for KAME PR 154.
* Don't really care even if it fails.
*/
(void)setsockopt(so, SOL_SOCKET, SO_SNDBUF, &bufsiz, sizeof(bufsiz));
(void)setsockopt(so, SOL_SOCKET, SO_RCVBUF, &bufsiz, sizeof(bufsiz));
/* Try to have 128k. If we have more, do not lower it. */
bufsiz_wanted = 128 * 1024;
len = sizeof(bufsiz_current);
ret = getsockopt(so, SOL_SOCKET, SO_SNDBUF,
&bufsiz_current, &len);
if ((ret < 0) || (bufsiz_current < bufsiz_wanted))
(void)setsockopt(so, SOL_SOCKET, SO_SNDBUF,
&bufsiz_wanted, sizeof(bufsiz_wanted));
/* Try to have have at least 2MB. If we have more, do not lower it. */
bufsiz_wanted = 2 * 1024 * 1024;
len = sizeof(bufsiz_current);
ret = getsockopt(so, SOL_SOCKET, SO_RCVBUF,
&bufsiz_current, &len);
if (ret < 0)
bufsiz_current = 128 * 1024;
for (; bufsiz_wanted > bufsiz_current; bufsiz_wanted /= 2) {
if (setsockopt(so, SOL_SOCKET, SO_RCVBUF,
&bufsiz_wanted, sizeof(bufsiz_wanted)) == 0)
break;
}
__ipsec_errcode = EIPSEC_NO_ERROR;
return so;