[taler-exchange] branch master updated (ad3d0a89 -> adb48b61)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository exchange.

    from ad3d0a89 improve logging
     new e6f44e22 use blocking sendto() call to possibly eliminate need for 
nanosleep()
     new adb48b61 use shorter PATHs, 
/home/grothoff/research/taler/exchange/src/util may be too much for UNIXPATH

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/util/taler-helper-crypto-eddsa.c | 15 ++++++++-------
 src/util/taler-helper-crypto-rsa.c   | 15 ++++++++-------
 src/util/test_helper_eddsa.conf      |  6 +++---
 src/util/test_helper_rsa.conf        |  6 +++---
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/util/taler-helper-crypto-eddsa.c 
b/src/util/taler-helper-crypto-eddsa.c
index 8e05302c..7839ac84 100644
--- a/src/util/taler-helper-crypto-eddsa.c
+++ b/src/util/taler-helper-crypto-eddsa.c
@@ -450,18 +450,19 @@ transmit (const struct sockaddr_un *addr,
           socklen_t addr_size,
           const struct GNUNET_MessageHeader *hdr)
 {
-  ssize_t ret;
-
   for (unsigned int i = 0; i<100; i++)
   {
-    ret = GNUNET_NETWORK_socket_sendto (unix_sock,
-                                        hdr,
-                                        ntohs (hdr->size),
-                                        (const struct sockaddr *) addr,
-                                        addr_size);
+    ssize_t ret = sendto (GNUNET_NETWORK_get_fd (unix_sock),
+                          hdr,
+                          ntohs (hdr->size),
+                          0 /* no flags => blocking! */,
+                          (const struct sockaddr *) addr,
+                          addr_size);
     if ( (-1 == ret) &&
          (EAGAIN == errno) )
     {
+      /* _Maybe_ with blocking sendto(), this should no
+         longer be needed; still keeping it just in case. */
       /* Wait a bit, in case client is just too slow */
       struct timespec req = {
         .tv_sec = 0,
diff --git a/src/util/taler-helper-crypto-rsa.c 
b/src/util/taler-helper-crypto-rsa.c
index 9539277c..ae75e5a2 100644
--- a/src/util/taler-helper-crypto-rsa.c
+++ b/src/util/taler-helper-crypto-rsa.c
@@ -516,18 +516,19 @@ transmit (const struct sockaddr_un *addr,
           socklen_t addr_size,
           const struct GNUNET_MessageHeader *hdr)
 {
-  ssize_t ret;
-
   for (unsigned int i = 0; i<100; i++)
   {
-    ret = GNUNET_NETWORK_socket_sendto (unix_sock,
-                                        hdr,
-                                        ntohs (hdr->size),
-                                        (const struct sockaddr *) addr,
-                                        addr_size);
+    ssize_t ret = sendto (GNUNET_NETWORK_get_fd (unix_sock),
+                          hdr,
+                          ntohs (hdr->size),
+                          0 /* no flags => blocking! */,
+                          (const struct sockaddr *) addr,
+                          addr_size);
     if ( (-1 == ret) &&
          (EAGAIN == errno) )
     {
+      /* _Maybe_ with blocking sendto(), this should no
+         longer be needed; still keeping it just in case. */
       /* Wait a bit, in case client is just too slow */
       struct timespec req = {
         .tv_sec = 0,
diff --git a/src/util/test_helper_eddsa.conf b/src/util/test_helper_eddsa.conf
index de2231cb..9529ec57 100644
--- a/src/util/test_helper_eddsa.conf
+++ b/src/util/test_helper_eddsa.conf
@@ -1,11 +1,11 @@
 [PATHS]
 # Persistent data storage for the testcase
 TALER_TEST_HOME = test_helper_eddsa_home/
-TALER_RUNTIME_DIR = test_helper_eddsa_home/tmp/
+TALER_RUNTIME_DIR = /tmp/${USER}/test_helper_eddsa/
 
 [taler-helper-crypto-eddsa]
 LOOKAHEAD_SIGN = 5 minutes
 OVERLAP_DURATION = 1 s
 DURATION = 1 minute
-KEY_DIR = ${TALER_RUNTIME_DIR}/test_helper_eddsa/
-UNIXPATH = ${TALER_RUNTIME_DIR}test_helper_eddsa.unix
+KEY_DIR = ${TALER_RUNTIME_DIR}keydir/
+UNIXPATH = ${TALER_RUNTIME_DIR}helper.unix
diff --git a/src/util/test_helper_rsa.conf b/src/util/test_helper_rsa.conf
index c02b08a3..bba7f657 100644
--- a/src/util/test_helper_rsa.conf
+++ b/src/util/test_helper_rsa.conf
@@ -1,7 +1,7 @@
 [PATHS]
 # Persistent data storage for the testcase
 TALER_TEST_HOME = test_helper_rsa_home/
-TALER_RUNTIME_DIR = test_helper_eddsa_home/tmp/
+TALER_RUNTIME_DIR = /tmp/${USER}/test_helper_rsa/
 
 
 [coin_1]
@@ -11,5 +11,5 @@ RSA_KEYSIZE = 2048
 [taler-helper-crypto-rsa]
 LOOKAHEAD_SIGN = 5 minutes
 OVERLAP_DURATION = 1 s
-KEY_DIR = ${TALER_RUNTIME_DIR}/test_helper_rsa/
-UNIXPATH = ${TALER_RUNTIME_DIR}test_helper_rsa.unix
+KEY_DIR = ${TALER_RUNTIME_DIR}/keydir/
+UNIXPATH = ${TALER_RUNTIME_DIR}helper.unix

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.