taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

proposed fix for #6667

Browse Source
This commit is contained in:
Christian Grothoff 2020-12-31 21:23:33 +01:00
parent 25ce6506d1
commit 3399ece8c3
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 62 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/util/taler-helper-crypto-eddsa.c
View File

@ -432,7 +432,13 @@ free_key (struct Key *key)
/** /**
* Send a message starting with @a hdr to @a client. * Send a message starting with @a hdr to @a client. We expect that
* the client is mostly able to handle everything at whatever speed
* we have (after all, the crypto should be the slow part). However,
* especially on startup when we send all of our keys, it is possible
* that the client cannot keep up. In that case, we throttle when
* sending fails. This does not work with poll() as we cannot specify
* the sendto() target address with poll(). So we nanosleep() instead.
* *
* @param addr address where to send the message * @param addr address where to send the message
* @param addr_size number of bytes in @a addr * @param addr_size number of bytes in @a addr
@ -446,18 +452,32 @@ transmit (const struct sockaddr_un *addr,
{ {
ssize_t ret; ssize_t ret;
ret = GNUNET_NETWORK_socket_sendto (unix_sock, for (unsigned int i = 0; i<100; i++)
hdr,
ntohs (hdr->size),
(const struct sockaddr *) addr,
addr_size);
if (ret != ntohs (hdr->size))
{ {
GNUNET_log_strerror (GNUNET_ERROR_TYPE_INFO, ret = GNUNET_NETWORK_socket_sendto (unix_sock,
"sendto"); hdr,
return GNUNET_SYSERR; ntohs (hdr->size),
(const struct sockaddr *) addr,
addr_size);
if ( (-1 == ret) &&
(EAGAIN == errno) )
{
/* Wait a bit, in case client is just too slow */
struct timespec req = {
.tv_sec = 0,
.tv_nsec = 1000
};
nanosleep (&req, NULL);
continue;
}
if (ret == ntohs (hdr->size))
return GNUNET_OK;
if (ret != ntohs (hdr->size))
break;
} }
return GNUNET_OK; GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
"sendto");
return GNUNET_SYSERR;
} }

42
src/util/taler-helper-crypto-rsa.c
View File

@ -498,7 +498,13 @@ free_dk (struct DenominationKey *dk)
/** /**
* Send a message starting with @a hdr to @a client. * Send a message starting with @a hdr to @a client. We expect that
* the client is mostly able to handle everything at whatever speed
* we have (after all, the crypto should be the slow part). However,
* especially on startup when we send all of our keys, it is possible
* that the client cannot keep up. In that case, we throttle when
* sending fails. This does not work with poll() as we cannot specify
* the sendto() target address with poll(). So we nanosleep() instead.
* *
* @param addr address where to send the message * @param addr address where to send the message
* @param addr_size number of bytes in @a addr * @param addr_size number of bytes in @a addr
@ -512,18 +518,32 @@ transmit (const struct sockaddr_un *addr,
{ {
ssize_t ret; ssize_t ret;
ret = GNUNET_NETWORK_socket_sendto (unix_sock, for (unsigned int i = 0; i<100; i++)
hdr,
ntohs (hdr->size),
(const struct sockaddr *) addr,
addr_size);
if (ret != ntohs (hdr->size))
{ {
GNUNET_log_strerror (GNUNET_ERROR_TYPE_INFO, ret = GNUNET_NETWORK_socket_sendto (unix_sock,
"sendto"); hdr,
return GNUNET_SYSERR; ntohs (hdr->size),
(const struct sockaddr *) addr,
addr_size);
if ( (-1 == ret) &&
(EAGAIN == errno) )
{
/* Wait a bit, in case client is just too slow */
struct timespec req = {
.tv_sec = 0,
.tv_nsec = 1000
};
nanosleep (&req, NULL);
continue;
}
if (ret == ntohs (hdr->size))
return GNUNET_OK;
if (ret != ntohs (hdr->size))
break;
} }
return GNUNET_OK; GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
"sendto");
return GNUNET_SYSERR;
} }