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.55 2000/11/04 16:39:19 guus Exp $
+ $Id: protocol.c,v 1.28.4.61 2000/11/15 13:33:27 guus Exp $
*/
#include "config.h"
#include <sys/socket.h>
#include <unistd.h>
#include <stdio.h>
+#include <stdarg.h>
#include <utils.h>
#include <xalloc.h>
#include <netinet/in.h>
-#include <openssl/sha.h>
-#include <openssl/rand.h>
-#include <openssl/evp.h>
+#ifdef HAVE_OPENSSL_SHA_H
+# include <openssl/sha.h>
+#else
+# include <sha.h>
+#endif
+
+#ifdef HAVE_OPENSSL_RAND_H
+# include <openssl/rand.h>
+#else
+# include <rand.h>
+#endif
+
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
+
#include "conf.h"
#include "net.h"
}
}
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
new->cipher_pkttype = EVP_bf_cfb();
new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
+ /* Okay this is a bit ugly... it would be better to setup UDP sockets dynamically, or
+ * perhaps just one UDP socket... but then again, this has benefits too...
+ */
+
+ setup_vpn_connection(new);
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);
-
- keylength /= 2;
- hex2bin(pktkey, pktkey, keylength);
- pktkey[keylength] = '\0';
- from->cipher_pktkey = pktkey;
+ /* Forward it if necessary */
- 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;