Move the routing header out of the SPTPS payload.

[meshlink] / src / sptps.h

diff --git a/src/sptps.h b/src/sptps.h
index ab163442a18afc19605dee842e2b12bbbb17fd5a..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) 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"
@@ -32,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
@@ -45,13 +46,16 @@ typedef bool (*receive_record_t)(void *handle, uint8_t type, const void *data, u
 typedef struct sptps {
        bool initiator;
        bool datagram;
+
+       bool instate;
+       bool passthrough;
+
        int state;
 
        char *inbuf;
        size_t buflen;
        uint16_t reclen;
 
-       bool instate;
        chacha_poly1305_ctx_t *incipher;
        uint32_t inseqno;
        uint32_t received;
@@ -84,6 +88,8 @@ 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 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 void *data, size_t len);