Releasing 1.1pre5.

[tinc] / src / sptps.h

diff --git a/src/sptps.h b/src/sptps.h
index 51de575..1fead07 100644 (file)
--- a/src/sptps.h
+++ b/src/sptps.h
@@ -1,6 +1,6 @@
 /*
     sptps.h -- Simple Peer-to-Peer Security
-    Copyright (C) 2011 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2011-2013 Guus Sliepen <guus@tinc-vpn.org>,
 
     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,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"
@@ -37,20 +40,26 @@
 #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 (*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 struct sptps {
        bool initiator;
+       bool datagram;
        int state;
 
        char *inbuf;
        size_t buflen;
+       uint16_t reclen;
 
        bool instate;
        cipher_t incipher;
        digest_t indigest;
        uint32_t inseqno;
+       uint32_t received;
+       unsigned int replaywin;
+       unsigned int farfuture;
+       char *late;
 
        bool outstate;
        cipher_t outcipher;
@@ -72,8 +81,15 @@ typedef struct sptps {
        receive_record_t receive_record;
 } sptps_t;
 
-extern bool start_sptps(sptps_t *s, void *handle, bool initiator, ecdsa_t mykey, ecdsa_t hiskey, const char *label, size_t labellen, send_data_t send_data, receive_record_t receive_record);
-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);
+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_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_force_kex(sptps_t *s);
+extern bool sptps_verify_datagram(sptps_t *s, const char *data, size_t len);
+
+#endif