[GNUnet-SVN] r36853 - gnunet/src/fragmentation

[gnunet]

Author: grothoff
Date: 2016-01-21 09:32:29 +0100 (Thu, 21 Jan 2016)
New Revision: 36853

Modified:
   gnunet/src/fragmentation/fragmentation.c
Log:
force 1 to be 64-bit integer, due to shift by up to 63 bits

Modified: gnunet/src/fragmentation/fragmentation.c
===================================================================
--- gnunet/src/fragmentation/fragmentation.c    2016-01-20 18:25:05 UTC (rev 
36852)
+++ gnunet/src/fragmentation/fragmentation.c    2016-01-21 08:32:29 UTC (rev 
36853)
@@ -262,7 +262,7 @@
     delay = GNUNET_TIME_UNIT_ZERO;
   delay = GNUNET_TIME_relative_max (delay,
                                    GNUNET_TIME_relative_multiply 
(fc->msg_delay,
-                                                                  (1 << 
fc->num_rounds)));
+                                                                  (1ULL << 
fc->num_rounds)));
   if (wrap)
   {
     /* full round transmitted wait 2x delay for ACK before going again */
@@ -420,10 +420,10 @@
     snd_cnt = 0;
     for (i=0;i<64;i++)
     {
-      if (1 == (fc->acks_mask & (1 << i)))
+      if (1 == (fc->acks_mask & (1ULL << i)))
       {
        snd_cnt++;
-       if (0 == (abits & (1 << i)))
+       if (0 == (abits & (1ULL << i)))
          ack_cnt++;
       }
     }