Use SPTPS when ExperimentalProtocol is enabled.

[tinc] / src / sptps.h

diff --git a/src/sptps.h b/src/sptps.h
index 6eb933c..17dfa9c 100644 (file)
--- a/src/sptps.h
+++ b/src/sptps.h
@@ -17,6 +17,9 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#ifndef __SPTPS_H__
+#define __SPTPS_H__
+
 #include "system.h"
 
 #include "cipher.h"
@@ -24,13 +27,18 @@
 #include "ecdh.h"
 #include "ecdsa.h"
 
-#define SPTPS_KEX 0
-#define SPTPS_SECONDARY_KEX 1 // Waiting for peer's ECDHE pubkey
-#define SPTPS_SIG 2 // Waiting for peer's ECDHE pubkey
-#define SPTPS_ACK 3 // Waiting for peer's acknowledgement of pubkey reception
+#define SPTPS_VERSION 0
+
+// Record types
+#define SPTPS_HANDSHAKE 128   // Key exchange and authentication
+#define SPTPS_ALERT 129       // Warning or error messages
+#define SPTPS_CLOSE 130       // Application closed the connection
 
-#define SPTPS_HANDSHAKE 128
-#define SPTPS_VERSION 128
+// Key exchange states
+#define SPTPS_KEX 0           // Waiting for the first Key EXchange record
+#define SPTPS_SECONDARY_KEX 1 // Ready to receive a secondary Key EXchange record
+#define SPTPS_SIG 2           // Waiting for a SIGnature record
+#define SPTPS_ACK 3           // Waiting for an ACKnowledgement record
 
 typedef bool (*send_data_t)(void *handle, const char *data, size_t len);
 typedef bool (*receive_record_t)(void *handle, uint8_t type, const char *data, uint16_t len);
@@ -41,6 +49,7 @@ typedef struct sptps {
 
        char *inbuf;
        size_t buflen;
+       uint16_t reclen;
 
        bool instate;
        cipher_t incipher;
@@ -72,3 +81,5 @@ extern bool stop_sptps(sptps_t *s);
 extern bool send_record(sptps_t *s, uint8_t type, const char *data, uint16_t len);
 extern bool receive_data(sptps_t *s, const char *data, size_t len);
 extern bool force_kex(sptps_t *s);
+
+#endif