[gnunet] branch master updated (03943a61c -> b73aab5f1)

[gnunet]

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

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from 03943a61c -fix: handbook infos
     new 50f16c6a4 -fix: variable size in test
     new b73aab5f1 -fix: use non-experimental unix plugin as second entry

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/transport/gnunet-service-transport.c                             | 4 ++--
 .../test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf  | 2 +-
 .../test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf  | 2 +-
 src/transport/transport_api_core.c                                   | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/transport/gnunet-service-transport.c 
b/src/transport/gnunet-service-transport.c
index 9bdcd64be..207c17f2f 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -727,9 +727,9 @@ handle_send_transmit_continuation (void *cls,
                 stcc->uuid);
     send_ok_msg.header.size = htons (sizeof(send_ok_msg));
     send_ok_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK);
-    send_ok_msg.bytes_msg = htonl (bytes_payload);
+    send_ok_msg.bytes_msg = htons (bytes_payload);
     send_ok_msg.bytes_physical = htonl (bytes_on_wire);
-    send_ok_msg.success = htonl (success);
+    send_ok_msg.success = htons (success);
     send_ok_msg.peer = stcc->target;
     unicast (stcc->tc, &send_ok_msg.header, GNUNET_NO);
   }
diff --git 
a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf 
b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
index 30b82aebf..64fe7320c 100644
--- 
a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
+++ 
b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
@@ -3,7 +3,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
-PLUGINS = tcp udp
+PLUGINS = tcp unix
 
 #Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG
 #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
diff --git 
a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf 
b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
index 690eb3b76..ee67372e1 100644
--- 
a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
+++ 
b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
@@ -3,7 +3,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
-PLUGINS = tcp udp
+PLUGINS = tcp unix
 
 #Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG
 #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
diff --git a/src/transport/transport_api_core.c 
b/src/transport/transport_api_core.c
index 55647508d..7d4b415bd 100644
--- a/src/transport/transport_api_core.c
+++ b/src/transport/transport_api_core.c
@@ -622,13 +622,14 @@ handle_send_ok (void *cls, const struct SendOkMessage 
*okm)
   struct Neighbour *n;
   uint32_t bytes_msg;
   uint32_t bytes_physical;
+  uint16_t success =  ntohs (okm->success);
 
-  bytes_msg = ntohl (okm->bytes_msg);
+  bytes_msg = ntohs (okm->bytes_msg);
   bytes_physical = ntohl (okm->bytes_physical);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Receiving SEND_OK message, transmission to %s %s.\n",
        GNUNET_i2s (&okm->peer),
-       ntohl (okm->success) == GNUNET_OK ? "succeeded" : "failed");
+       success == GNUNET_OK ? "succeeded" : "failed");
   n = neighbour_find (h, &okm->peer);
   if (NULL == n)
   {

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