projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Encrypt network packets in CBC mode instead of CFB mode.
[tinc]
/
src
/
connection.h
diff --git
a/src/connection.h
b/src/connection.h
index
195cb1b
..
eef6338
100644
(file)
--- a/
src/connection.h
+++ b/
src/connection.h
@@
-1,7
+1,7
@@
/*
connection.h -- header for connection.c
/*
connection.h -- header for connection.c
- Copyright (C) 2000 Guus Sliepen <guus@sliepen.warande.net>,
- 2000 Ivo Timmermans <itimmermans@bigfoot.com>
+ Copyright (C) 2000
,2001
Guus Sliepen <guus@sliepen.warande.net>,
+ 2000
,2001
Ivo Timmermans <itimmermans@bigfoot.com>
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
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
+17,14
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: connection.h,v 1.1.2.
4 2001/01/05 23:53:4
9 guus Exp $
+ $Id: connection.h,v 1.1.2.
7 2001/01/07 20:19:2
9 guus Exp $
*/
#ifndef __TINC_CONNECTION_H__
#define __TINC_CONNECTION_H__
#include <avl_tree.h>
*/
#ifndef __TINC_CONNECTION_H__
#define __TINC_CONNECTION_H__
#include <avl_tree.h>
+#include <list.h>
#include "config.h"
#include "config.h"
@@
-58,9
+59,8
@@
typedef struct status_bits_t {
int unused:18;
} status_bits_t;
int unused:18;
} status_bits_t;
-typedef struct option_bits_t {
- int unused:32;
-} option_bits_t;
+#define OPTION_INDIRECT 0x0001
+#define OPTION_TCPONLY 0x0002
typedef struct connection_t {
char *name; /* name of this connection */
typedef struct connection_t {
char *name; /* name of this connection */
@@
-68,22
+68,18
@@
typedef struct connection_t {
char *hostname; /* the hostname of its real ip */
int protocol_version; /* used protocol */
short unsigned int port; /* port number for UDP traffic */
char *hostname; /* the hostname of its real ip */
int protocol_version; /* used protocol */
short unsigned int port; /* port number for UDP traffic */
- long
unsigned int options;
/* options turned on for this connection */
+ long
int options;
/* options turned on for this connection */
int flags; /* his flags */
int socket; /* our udp vpn socket */
int meta_socket; /* our tcp meta socket */
status_bits_t status; /* status info */
int flags; /* his flags */
int socket; /* our udp vpn socket */
int meta_socket; /* our tcp meta socket */
status_bits_t status; /* status info */
- packet_queue_t *sq; /* pending outgoing packets */
- packet_queue_t *rq; /* pending incoming packets (they have no
- valid key to be decrypted with) */
- RSA *rsa_key; /* the public/private key */
+ RSA *rsa_key; /* the public/private key */
EVP_CIPHER_CTX *cipher_inctx; /* Context of encrypted meta data that will come from him to us */
EVP_CIPHER_CTX *cipher_outctx; /* Context of encrypted meta data that will be sent from us to him */
char *cipher_inkey; /* His symmetric meta key */
char *cipher_outkey; /* Our symmetric meta key */
EVP_CIPHER_CTX *cipher_inctx; /* Context of encrypted meta data that will come from him to us */
EVP_CIPHER_CTX *cipher_outctx; /* Context of encrypted meta data that will be sent from us to him */
char *cipher_inkey; /* His symmetric meta key */
char *cipher_outkey; /* Our symmetric meta key */
-
EVP_CIPHER *cipher_pkttype; /* Cipher type for encrypted vpn packets */
char *cipher_pktkey; /* Cipher key and iv */
int cipher_pktkeylength; /* Cipher key and iv length*/
EVP_CIPHER *cipher_pkttype; /* Cipher type for encrypted vpn packets */
char *cipher_pktkey; /* Cipher key and iv */
int cipher_pktkeylength; /* Cipher key and iv length*/
@@
-95,6
+91,8
@@
typedef struct connection_t {
time_t last_ping_time; /* last time we saw some activity from the other end */
time_t last_ping_time; /* last time we saw some activity from the other end */
+ list_t *queue; /* Queue for packets awaiting to be encrypted */
+
char *mychallenge; /* challenge we received from him */
char *hischallenge; /* challenge we sent to him */
char *mychallenge; /* challenge we received from him */
char *hischallenge; /* challenge we sent to him */