]> git.meshlink.io Git - meshlink/commitdiff
Don't try to handle incoming data if sptps_start() has not been called yet.
authorGuus Sliepen <guus@tinc-vpn.org>
Sun, 12 May 2013 11:39:22 +0000 (13:39 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sun, 12 May 2013 11:39:22 +0000 (13:39 +0200)
src/sptps.c
src/sptps.h

index 03a1e9aac468fd638d28cea2d4582c42060c8f18..720693408eda950437a8aac4d6b2b7f813f67def 100644 (file)
@@ -520,6 +520,9 @@ static bool sptps_receive_data_datagram(sptps_t *s, const char *data, size_t len
 
 // Receive incoming data. Check if it contains a complete record, if so, handle it.
 bool sptps_receive_data(sptps_t *s, const char *data, size_t len) {
+       if(!s->state)
+               return error(s, EIO, "Invalid session state");
+
        if(s->datagram)
                return sptps_receive_data_datagram(s, data, len);
 
index ee41f46f6257bfd573e6838448286c3967ac7b88..3a8e65f7a7630853dc890426b1efff8693430482 100644 (file)
 #define SPTPS_CLOSE 130       // Application closed the connection
 
 // Key exchange states
-#define SPTPS_KEX 0           // Waiting for the first Key EXchange record
-#define SPTPS_SECONDARY_KEX 1 // Ready to receive a secondary Key EXchange record
-#define SPTPS_SIG 2           // Waiting for a SIGnature record
-#define SPTPS_ACK 3           // Waiting for an ACKnowledgement record
+#define SPTPS_KEX 1           // Waiting for the first Key EXchange record
+#define SPTPS_SECONDARY_KEX 2 // Ready to receive a secondary Key EXchange record
+#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);