Rename mesh_mutex to mutex.

[meshlink] / src / sptps.h

diff --git a/src/sptps.h b/src/sptps.h
index ab163442a18afc19605dee842e2b12bbbb17fd5a..66ac564a4a3d6bf6fbfc31d35f926c37af6cd71b 100644 (file)
--- a/src/sptps.h
+++ b/src/sptps.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_SPTPS_H
+#define MESHLINK_SPTPS_H
+
 /*
     sptps.h -- Simple Peer-to-Peer Security
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __SPTPS_H__
-#define __SPTPS_H__
-
 #include "system.h"
 
 #include "chacha-poly1305/chacha-poly1305.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,12 +85,8 @@ 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);