along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: protocol.c,v 1.28.4.53 2000/10/29 22:55:14 guus Exp $
+ $Id: protocol.c,v 1.28.4.58 2000/11/04 22:57:32 guus Exp $
*/
#include "config.h"
int id_h(conn_list_t *cl)
{
conn_list_t *old;
- config_t *cfg;
+ config_t const *cfg;
cp
if(sscanf(cl->buffer, "%*d %as %d %lx %hd", &cl->name, &cl->protocol_version, &cl->options, &cl->port) != 4)
{
}
}
cp
- if((cfg = get_config_val(cl->config, publickey)))
+ if((cfg = get_config_val(cl->config, config_publickey)))
{
cl->rsa_key = RSA_new();
BN_hex2bn(&cl->rsa_key->n, cfg->data.ptr);
if(cl->status.outgoing)
cl->allow_request = ACK;
+ setup_vpn_connection(cl);
+
x = send_request(cl, "%d", ACK);
cl->status.encryptout = 1;
cp
{
conn_list_t *old, *new;
conn_list_t *p;
+
cp
new = new_conn_list();
new->nexthop = cl;
new->status.active = 1;
+ new->cipher_pkttype = EVP_bf_cfb();
+ new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
cp
return 0;
int send_ping(conn_list_t *cl)
{
+cp
cl->status.pinged = 1;
+ cl->last_ping_time = time(NULL);
cp
return send_request(cl, "%d", PING);
}
int pong_h(conn_list_t *cl)
{
cp
- cl->status.got_pong = 1;
+ cl->status.pinged = 0;
cp
return 0;
}
return -1;
}
- /* Update origin's packet key */
+ /* Check correctness of packet key */
keylength = strlen(pktkey);
return -1;
}
- if(from->cipher_pktkey)
- free(from->cipher_pktkey);
+ /* Forward it if necessary */
- keylength /= 2;
- hex2bin(pktkey, pktkey, keylength);
- pktkey[keylength] = '\0';
- from->cipher_pktkey = pktkey;
-
- from->status.validkey = 1;
- from->status.waitingforkey = 0;
-
if(strcmp(to_id, myself->name))
{
if(!(to = lookup_id(to_id)))
send_ans_key(from, to, pktkey);
}
+ /* Update our copy of the origin's packet key */
+
+ if(from->cipher_pktkey)
+ free(from->cipher_pktkey);
+
+ keylength /= 2;
+ hex2bin(pktkey, pktkey, keylength);
+ pktkey[keylength] = '\0';
+ from->cipher_pktkey = pktkey;
+
+ from->status.validkey = 1;
+ from->status.waitingforkey = 0;
+
free(from_id); free(to_id);
cp
return 0;