aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2015-06-10 12:08:19 +0000
committerBart Polot <bart@net.in.tum.de>2015-06-10 12:08:19 +0000
commit4f7ed80998cfe391c6453d57401becdc3598c9dd (patch)
tree0b965a524684502cf0deb121c466b0df32af4317 /src
parent43ed712bb791696cbcb80be93971879cdb4b2dfc (diff)
downloadgnunet-4f7ed80998cfe391c6453d57401becdc3598c9dd.tar.gz
gnunet-4f7ed80998cfe391c6453d57401becdc3598c9dd.zip
- fix returned buffer amount, to make sure channel bugs don't affect connections
Diffstat (limited to 'src')
-rw-r--r--src/cadet/gnunet-service-cadet_tunnel.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c
index fc095bfdd..0852394d0 100644
--- a/src/cadet/gnunet-service-cadet_tunnel.c
+++ b/src/cadet/gnunet-service-cadet_tunnel.c
@@ -44,6 +44,7 @@
44#endif 44#endif
45 45
46#define MIN_TUNNEL_BUFFER 8 46#define MIN_TUNNEL_BUFFER 8
47#define MAX_TUNNEL_BUFFER 64
47#define MAX_SKIPPED_KEYS 64 48#define MAX_SKIPPED_KEYS 64
48#define MAX_KEY_GAP 256 49#define MAX_KEY_GAP 256
49#define AX_HEADER_SIZE (sizeof (uint32_t) * 2\ 50#define AX_HEADER_SIZE (sizeof (uint32_t) * 2\
@@ -3889,6 +3890,12 @@ GCT_get_channels_buffer (struct CadetTunnel *t)
3889 } 3890 }
3890 if (MIN_TUNNEL_BUFFER > buffer) 3891 if (MIN_TUNNEL_BUFFER > buffer)
3891 return MIN_TUNNEL_BUFFER; 3892 return MIN_TUNNEL_BUFFER;
3893
3894 if (MAX_TUNNEL_BUFFER < buffer)
3895 {
3896 GNUNET_break (0);
3897 return MAX_TUNNEL_BUFFER;
3898 }
3892 return buffer; 3899 return buffer;
3893} 3900}
3894 3901