# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1368799858 -7200
# Node ID 671d640390f2c1aec13f2dc4ec5a3bc1448fa38c
# Parent  55f379f0a650ab99963ae3cb2bd270f99c4f7b8a
Removed/changed some debug/test code in salty protocol

diff -r 55f379f0a650 -r 671d640390f2 src/proto.salty.c
--- a/src/proto.salty.c	Fri May 17 16:09:49 2013 +0200
+++ b/src/proto.salty.c	Fri May 17 16:10:58 2013 +0200
@@ -245,8 +245,6 @@
 	if (!randombytes(enckey->privatekey, PRIVATEKEYBYTES)) return false;
 	crypto_scalarmult_curve25519_base(enckey->publickey, enckey->privatekey);
 	memset(enckey->nonce + 20, 0, 4);
-	enckey->nonce[20] = 0x0F; //debugging
-	enckey->nonce[21] = 0xFF; //debugging
 	if (debug) dumphex("New public key", enckey->publickey, 32);
 	if (debug) dumphex("New base nonce", enckey->nonce, 24);
 	initdecoder(&d->datadecoders[(d->dataremotekeyid << 1) | d->datalocalkeynextid], d->dataremotekey, enckey->privatekey, d->dataremotenonce);
@@ -257,9 +255,9 @@
 static void beginkeyupdateifnecessary(struct qtsession* sess) {
 	struct qt_proto_data_salty* d = (struct qt_proto_data_salty*)sess->protocol_data;
 	time_t t = time(NULL);
-	if (t - d->lastkeyupdate > 10) {
+	if (t - d->lastkeyupdate > 300) {
 		beginkeyupdate(sess);
-	} else if (d->datalocalkeynextid != -1 && t - d->lastkeyupdatesent > 0) {
+	} else if (d->datalocalkeynextid != -1 && t - d->lastkeyupdatesent > 1) {
 		sendkeyupdate(sess, false);
 	}
 }
@@ -303,7 +301,7 @@
 	d->dataremotekeyid = 0;
 	beginkeyupdate(sess);
 	d->datalocalkeyid = d->datalocalkeynextid;
-	sess->poll_timeout = 1000;
+	sess->poll_timeout = 5000;
 	return 0;
 }