Merge remote-tracking branch 'guus/1.1' into thkr-20170131-merge

2017-01-31 15:44:02 +01:00 · 2017-01-31 15:44:02 +01:00 · 4b3c0aea78
commit 4b3c0aea78
parent 8e0e0aea5f d3cc96b027
28 changed files with 518 additions and 177 deletions
--- a/src/connection.h
+++ b/src/connection.h
@ -81,6 +81,8 @@ typedef struct connection_t {
 	cipher_t *outcipher;            /* Cipher we will use to send data to him */
 	digest_t *indigest;
 	digest_t *outdigest;
+	uint64_t inbudget;
+	uint64_t outbudget;
 #endif

 	ecdsa_t *ecdsa;                 /* his public ECDSA key */