Move the routing header out of the SPTPS payload.

[meshlink] / src / sptps.h

diff --git a/src/sptps.h b/src/sptps.h
index 3f3d0945b1d5046530955778db41c1599e464b69..ba37733eb9c2803721143eced63711c4e6ef7787 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) 2011-2013 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,13 +20,9 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __SPTPS_H__
-#define __SPTPS_H__
-
 #include "system.h"
 
-#include "cipher.h"
-#include "digest.h"
+#include "chacha-poly1305/chacha-poly1305.h"
 #include "ecdh.h"
 #include "ecdsa.h"
 
@@ -33,6 +32,7 @@
 #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_UNENCRYPTED 131 // Unencrypted data
 
 // Key exchange states
 #define SPTPS_KEX 1           // Waiting for the first Key EXchange record
@@ -40,30 +40,30 @@
 #define SPTPS_SIG 3           // Waiting for a SIGnature record
 #define SPTPS_ACK 4           // Waiting for an ACKnowledgement record
 
-typedef bool (*send_data_t)(void *handle, uint8_t type, const char *data, size_t len);
-typedef bool (*receive_record_t)(void *handle, uint8_t type, const char *data, uint16_t len);
+typedef bool (*send_data_t)(void *handle, uint8_t type, const void *data, size_t len);
+typedef bool (*receive_record_t)(void *handle, uint8_t type, const void *data, uint16_t len);
 
 typedef struct sptps {
        bool initiator;
        bool datagram;
+
+       bool instate;
+       bool passthrough;
+
        int state;
 
        char *inbuf;
        size_t buflen;
        uint16_t reclen;
 
-       bool instate;
-       cipher_t *incipher;
-       digest_t *indigest;
+       chacha_poly1305_ctx_t *incipher;
        uint32_t inseqno;
        uint32_t received;
        unsigned int replaywin;
-       unsigned int farfuture;
        char *late;
 
        bool outstate;
-       cipher_t *outcipher;
-       digest_t *outdigest;
+       chacha_poly1305_ctx_t *outcipher;
        uint32_t outseqno;
 
        ecdsa_t *mykey;
@@ -87,9 +87,11 @@ extern void sptps_log_stderr(sptps_t *s, int s_errno, const char *format, va_lis
 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_stop(sptps_t *s);
-extern bool sptps_send_record(sptps_t *s, uint8_t type, const char *data, uint16_t len);
-extern bool sptps_receive_data(sptps_t *s, const char *data, size_t len);
+extern bool sptps_send_record(sptps_t *s, uint8_t type, const void *data, uint16_t len);
+extern bool sptps_send_unencrypted(sptps_t *s, const void *data, uint16_t len);
+extern bool sptps_expect_unencrypted(sptps_t *s, 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 char *data, size_t len);
+extern bool sptps_verify_datagram(sptps_t *s, const void *data, size_t len);
 
 #endif