X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fsptps.h;h=c91d3882b428d09ea5c4d4f9154941a83a0727ed;hp=11c0d2e66846390df29b12edf4b88a9c45c9ec79;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=61d9b04f66055e61f0afdf8955ff890f4da39288

diff --git a/src/sptps.h b/src/sptps.h
index 11c0d2e6..c91d3882 100644
--- a/src/sptps.h
+++ b/src/sptps.h
@@ -43,25 +43,38 @@ typedef bool (*send_data_t)(void *handle, uint8_t type, const void *data, size_t
 typedef bool (*receive_record_t)(void *handle, uint8_t type, const void *data, uint16_t len);
 
 typedef struct sptps {
+	// State
 	bool initiator;
 	bool datagram;
+	bool instate;
+	bool outstate;
+
 	int state;
 
+	// Main member variables
 	char *inbuf;
 	size_t buflen;
-	uint16_t reclen;
 
-	bool instate;
 	chacha_poly1305_ctx_t *incipher;
+	uint32_t replaywin;
 	uint32_t inseqno;
 	uint32_t received;
-	unsigned int replaywin;
-	char *late;
+	uint16_t reclen;
 
-	bool outstate;
 	chacha_poly1305_ctx_t *outcipher;
 	uint32_t outseqno;
 
+	char *late;
+
+	char *decrypted_buffer;
+	size_t decrypted_buffer_len;
+
+	// Callbacks
+	void *handle;
+	send_data_t send_data;
+	receive_record_t receive_record;
+
+	// Variables used for the authentication phase
 	ecdsa_t *mykey;
 	ecdsa_t *hiskey;
 	ecdh_t *ecdh;
@@ -72,20 +85,16 @@ typedef struct sptps {
 	char *label;
 	size_t labellen;
 
-	void *handle;
-	send_data_t send_data;
-	receive_record_t receive_record;
 } sptps_t;
 
-extern unsigned int sptps_replaywin;
 extern void sptps_log_quiet(sptps_t *s, int s_errno, const char *format, va_list ap);
 extern void sptps_log_stderr(sptps_t *s, int s_errno, const char *format, va_list ap);
 extern void (*sptps_log)(sptps_t *s, int s_errno, const char *format, va_list ap);
-extern bool sptps_start(sptps_t *s, void *handle, bool initiator, bool datagram, ecdsa_t *mykey, ecdsa_t *hiskey, const char *label, size_t labellen, send_data_t send_data, receive_record_t receive_record);
+extern bool sptps_start(sptps_t *s, void *handle, bool initiator, bool datagram, ecdsa_t *mykey, ecdsa_t *hiskey, const char *label, size_t labellen, send_data_t send_data, receive_record_t receive_record) __attribute__((__warn_unused_result__));
 extern bool sptps_stop(sptps_t *s);
 extern bool sptps_send_record(sptps_t *s, uint8_t type, const void *data, uint16_t len);
-extern bool sptps_receive_data(sptps_t *s, const void *data, size_t len);
-extern bool sptps_force_kex(sptps_t *s);
-extern bool sptps_verify_datagram(sptps_t *s, const void *data, size_t len);
+extern bool sptps_receive_data(sptps_t *s, const void *data, size_t len) __attribute__((__warn_unused_result__));
+extern bool sptps_force_kex(sptps_t *s) __attribute__((__warn_unused_result__));
+extern bool sptps_verify_datagram(sptps_t *s, const void *data, size_t len) __attribute__((__warn_unused_result__));
 
 #endif