ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.h
(Generate patch)

Comparing gvpe/src/connection.h (file contents):
Revision 1.28 by pcg, Sat Nov 10 05:14:22 2007 UTC vs.
Revision 1.37 by root, Tue Jul 16 16:44:36 2013 UTC

1/* 1/*
2 connection.h -- header for connection.C 2 connection.h -- header for connection.C
3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,2013 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#ifndef GVPE_CONNECTION_H__ 32#ifndef GVPE_CONNECTION_H__
23#define GVPE_CONNECTION_H__ 33#define GVPE_CONNECTION_H__
24 34
27#include "global.h" 37#include "global.h"
28#include "conf.h" 38#include "conf.h"
29#include "sockinfo.h" 39#include "sockinfo.h"
30#include "util.h" 40#include "util.h"
31#include "device.h" 41#include "device.h"
42#include "curve25519.h"
32 43
33struct vpn; 44struct vpn;
34 45
35// called after HUP etc. to (re-)initialize global data structures 46// called after HUP etc. to (re-)initialize global data structures
36void connection_init (); 47void connection_init ();
37 48
49typedef curve25519_key ecdh_key;
50
38struct rsaid { 51struct rsa_data
39 u8 id[RSA_IDLEN]; // the challenge id 52{
53 u32 seqno;
54 u8 auth_key[AUTH_SIZE];
55 u8 mac_key[MAC_KEYSIZE]; // used to generate hmac key
56 u8 cipher_key[CIPHER_KEYSIZE]; // used to generate cipher key
57 u8 hkdf_salt[HKDF_SALT]; // used as hkdf salt
58 u8 ikm[IKM_SIZE]; // used as additional keying material for both sides
59 u8 pad[
60 (RSABITS >> 3)
61 - 41 // OAEP
62 - sizeof (u32) // seqno
63 - AUTH_SIZE
64 - MAC_KEYSIZE
65 - CIPHER_KEYSIZE
66 - HKDF_SALT
67 - IKM_SIZE
68 - 3 // struct alignment...
69 ];
40}; 70};
41 71
42typedef rsaclear rsachallenge; // challenge data; 72struct auth_data
43typedef rsacrypt rsaencrdata; // encrypted challenge 73{
44typedef u8 rsaresponse[RSA_RESLEN]; // the encrypted ripemd160 hash 74 rsa_data rsa;
75 ecdh_key ecdh;
76};
77
78typedef u8 rsa_crypt[RSA_KEYLEN]; // encrypted challenge
79
80struct auth_encr
81{
82 rsa_crypt rsa;
83 ecdh_key ecdh;
84};
85
86typedef u8 auth_mac[AUTH_SIZE];
87
88struct auth_response
89{
90 auth_mac mac;
91 ecdh_key ecdh;
92};
45 93
46//////////////////////////////////////////////////////////////////////////////////////// 94////////////////////////////////////////////////////////////////////////////////////////
47 95
48struct crypto_ctx; 96struct crypto_ctx;
49 97
59 107
60 void hmac_gen (crypto_ctx * ctx); 108 void hmac_gen (crypto_ctx * ctx);
61}; 109};
62 110
63struct vpn_packet : hmac_packet 111struct vpn_packet : hmac_packet
64 { 112{
65 enum ptype 113 enum ptype
66 { 114 {
67 PT_RESET = 0, 115 PT_RESET = 0,
68 PT_DATA_UNCOMPRESSED, 116 PT_DATA_UNCOMPRESSED,
69 PT_DATA_COMPRESSED, 117 PT_DATA_COMPRESSED,
70 PT_PING, PT_PONG, // wasting namespace space? ;) 118 PT_PING, PT_PONG, // wasting namespace space? ;)
71 PT_AUTH_REQ, // authentification request 119 PT_AUTH_REQ, // authentification request
72 PT_AUTH_RES, // authentification response 120 PT_AUTH_RES, // authentification response
73 PT_CONNECT_REQ, // want other node to contact me 121 PT_CONNECT_REQ, // want other node to contact me
74 PT_CONNECT_INFO, // request connection to some node 122 PT_CONNECT_INFO, // request connection to some node
75 PT_DATA_BRIDGED, // uncompressed packet with foreign mac pot. larger than path mtu 123 PT_DATA_BRIDGED, // uncompressed packet with foreign mac pot. larger than path mtu (NYI)
76 PT_MAX 124 PT_MAX
77 };
78
79 u8 type;
80 u8 srcdst, src1, dst1;
81
82 void set_hdr (ptype type_, unsigned int dst);
83
84 unsigned int src () const
85 {
86 return src1 | ((srcdst >> 4) << 8);
87 }
88
89 unsigned int dst () const
90 {
91 return dst1 | ((srcdst & 0xf) << 8);
92 }
93
94 ptype typ () const
95 {
96 return (ptype) type;
97 }
98 }; 125 };
126
127 u8 type;
128 u8 srcdst, src1, dst1;
129
130 void set_hdr (ptype type_, unsigned int dst);
131
132 unsigned int src () const
133 {
134 return src1 | ((srcdst >> 4) << 8);
135 }
136
137 unsigned int dst () const
138 {
139 return dst1 | ((srcdst & 0xf) << 8);
140 }
141
142 ptype typ () const
143 {
144 return (ptype) type;
145 }
146};
99 147
100//////////////////////////////////////////////////////////////////////////////////////// 148////////////////////////////////////////////////////////////////////////////////////////
101 149
102// a very simple fifo pkt-queue 150// a very simple fifo pkt-queue
103class pkt_queue 151class pkt_queue
104 { 152{
105 net_packet *queue[QUEUEDEPTH];
106 int i, j; 153 int i, j;
154 int max_queue;
155 double max_ttl;
107 156
157 struct pkt {
158 ev_tstamp tstamp;
159 net_packet *pkt;
160 } *queue;
161
162 void expire_cb (ev::timer &w, int revents); ev::timer expire;
163
108 public: 164public:
109 165
110 void put (net_packet *p); 166 void put (net_packet *p);
111 net_packet *get (); 167 net_packet *get ();
112 168
113 pkt_queue (); 169 bool empty ()
170 {
171 return i == j;
172 }
173
174 pkt_queue (double max_ttl, int max_queue);
114 ~pkt_queue (); 175 ~pkt_queue ();
115 }; 176};
116 177
117enum 178enum
118 { 179{
119 FEATURE_COMPRESSION = 0x01, 180 FEATURE_COMPRESSION = 0x01,
120 FEATURE_ROHC = 0x02, 181 FEATURE_ROHC = 0x02,
121 FEATURE_BRIDGING = 0x04, 182 FEATURE_BRIDGING = 0x04,
122 }; 183};
123 184
124struct connection 185struct connection
125 { 186{
126 conf_node *conf; 187 conf_node *conf;
127 struct vpn *vpn; 188 struct vpn *vpn;
128 189
129 sockinfo si; // the current(!) destination ip to send packets to 190 sockinfo si; // the current(!) destination ip to send packets to
130 int retry_cnt; 191 int retry_cnt;
131 192
132 tstamp last_activity; // time of last packet received 193 tstamp last_activity; // time of last packet received
194 tstamp last_establish_attempt;
195 //tstamp last_si_change; // time we last changed the socket address
133 196
134 u32 oseqno; 197 u32 oseqno;
135 sliding_window iseqno; 198 sliding_window iseqno;
136 199
137 u8 protocol; 200 u8 protocol;
138 u8 features; 201 u8 features;
202 bool is_direct; // current connection (si) is direct?
139 203
140 pkt_queue data_queue, vpn_queue; 204 pkt_queue data_queue, vpn_queue;
141 205
142 crypto_ctx *octx, *ictx; 206 crypto_ctx *octx, *ictx;
207
208 void generate_auth_data ();
209
210 ev_tstamp auth_expire; // when the snd_* and *_ecdh values expire
211
212 // send auth data - used for octx
213 auth_data snd_auth;
214 auth_mac snd_auth_mac; // expected response mac
215 ecdh_key snd_ecdh_a; // the secret ecdh key we used for our request
216 ecdh_key snd_ecdh_b; // the public ecdh key we received in the response
217 bool have_snd_auth; // received response for our req
218
219 // receive auth data - used for ictx
220 auth_data rcv_auth;
221 ecdh_key rcv_ecdh_a; // the secret ecdh key we used for our response
222 ecdh_key rcv_ecdh_b; // the public ecdh key we sent in our response
223 bool have_rcv_auth; // received auth from other side
143 224
144#if ENABLE_DNS 225#if ENABLE_DNS
145 struct dns_connection *dns; 226 struct dns_connection *dns;
146
147 void dnsv4_reset_connection ();
148#endif 227#endif
149 228
150 enum conf_node::connectmode connectmode; 229 enum conf_node::connectmode connectmode;
151 u8 prot_minor; // minor number of other side 230 u8 prot_minor; // minor number of other side
152 231
153 void reset_si (); 232 void reset_si ();
154 const sockinfo &forward_si (const sockinfo &si) const; 233 const sockinfo &forward_si (const sockinfo &si) const;
155 234
156 void shutdown (); 235 void shutdown ();
157 void connection_established (); 236 void connection_established (const sockinfo &rsi);
158 void reset_connection (); 237 void reset_connection ();
159 238
160 void establish_connection_cb (ev::timer &w, int revents); ev::timer establish_connection; 239 void establish_connection_cb (ev::timer &w, int revents); ev::timer establish_connection;
161 void rekey_cb (ev::timer &w, int revents); ev::timer rekey; // next rekying (actually current reset + reestablishing) 240 void rekey_cb (ev::timer &w, int revents); ev::timer rekey; // next rekying (actually current reset + reestablishing)
162 void keepalive_cb (ev::timer &w, int revents); ev::timer keepalive; // next keepalive probe 241 void keepalive_cb (ev::timer &w, int revents); ev::timer keepalive; // next keepalive probe
163 242
164 void send_connect_request (int id); 243 void send_connect_request (int id);
165 void send_auth_request (const sockinfo &si, bool initiate); 244 void send_auth_request (const sockinfo &si, bool initiate);
166 void send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg); 245 void send_auth_response (const sockinfo &si);
167 void send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols); 246 void send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols);
168 void send_reset (const sockinfo &dsi); 247 void send_reset (const sockinfo &dsi);
169 void send_ping (const sockinfo &dsi, u8 pong = 0); 248 void send_ping (const sockinfo &dsi, u8 pong = 0);
170 void send_data_packet (tap_packet *pkt); 249 void send_data_packet (tap_packet *pkt);
171 250
251 void post_inject_queue ();
172 void inject_data_packet (tap_packet *pkt, bool broadcast = false); 252 void inject_data_packet (tap_packet *pkt);
173 void inject_vpn_packet (vpn_packet *pkt, int tos = 0); // for forwarding 253 void inject_vpn_packet (vpn_packet *pkt, int tos = 0); // for forwarding
174 254
175 void recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi); 255 void recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi);
176 void send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos = 0); 256 void send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos = 0);
177 257
178 void script_init_env (const char *ext); 258 void script_init_env (const char *ext);
179 void script_init_connect_env (); 259 void script_init_connect_env ();
180 const char *script_node_up (); 260 const char *script_node_up ();
261 const char *script_node_change ();
181 const char *script_node_down (); 262 const char *script_node_down ();
182 263
183 void dump_status (); 264 void dump_status ();
184 265
185 connection (struct vpn *vpn, conf_node *conf); 266 connection (struct vpn *vpn, conf_node *conf);
186 ~connection (); 267 ~connection ();
187 }; 268};
188 269
189#endif 270#endif
190 271

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines