return false;
}
- char s4req[9 + (proxyuser ? strlen(proxyuser) : 0)];
+ uint8_t s4req[9 + (proxyuser ? strlen(proxyuser) : 0)];
s4req[0] = 4;
s4req[1] = 1;
memcpy(s4req + 2, &c->address.in.sin_port, 2);
}
case PROXY_SOCKS5: {
- int len = 3 + 6 + (c->address.sa.sa_family == AF_INET ? 4 : 16);
+ size_t len = 3 + 6 + (c->address.sa.sa_family == AF_INET ? 4 : 16);
c->tcplen = 2;
if(proxypass) {
len += 3 + strlen(proxyuser) + strlen(proxypass);
}
- char s5req[len];
- int i = 0;
+ uint8_t s5req[len];
+ size_t i = 0;
s5req[i++] = 5;
s5req[i++] = 1;
if(bypass_security) {
if(!c->config_tree) {
- init_configuration(&c->config_tree);
+ c->config_tree = create_configuration();
}
c->allow_request = ACK;
}
if(!c->config_tree) {
- init_configuration(&c->config_tree);
+ c->config_tree = create_configuration();
if(!read_host_config(c->config_tree, c->name, false)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s had unknown identity (%s)", c->hostname, c->name);
by Cipher.
*/
- int keylen = cipher_keylength(myself->incipher);
+ size_t keylen = cipher_keylength(myself->incipher);
if(keylen <= 16) {
c->outcipher = cipher_open_by_name("aes-128-cfb");
c->outcipher = cipher_open_by_name("aes-256-cfb");
}
- if(!c) {
- return false;
- }
-
c->outbudget = cipher_budget(c->outcipher);
- if(!(c->outdigest = digest_open_by_name("sha256", -1))) {
+ if(!(c->outdigest = digest_open_by_name("sha256", DIGEST_ALGO_SIZE))) {
return false;
}
c->inbudget = cipher_budget(c->incipher);
if(digest) {
- if(!(c->indigest = digest_open_by_nid(digest, -1))) {
+ if(!(c->indigest = digest_open_by_nid(digest, DIGEST_ALGO_SIZE))) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
return false;
}
/* Estimate weight */
gettimeofday(&now, NULL);
- c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000;
+ c->estimated_weight = (int)((now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000);
/* Check some options */
}
if(!get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight)) {
- get_config_int(lookup_config(config_tree, "Weight"), &c->estimated_weight);
+ get_config_int(lookup_config(&config_tree, "Weight"), &c->estimated_weight);
}
return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (experimental ? (PROT_MINOR << 24) : 0));
}
if(tunnelserver) {
- for splay_each(subnet_t, s, myself->subnet_tree) {
+ for splay_each(subnet_t, s, &myself->subnet_tree) {
send_add_subnet(c, s);
}
return;
}
- for splay_each(node_t, n, node_tree) {
- for splay_each(subnet_t, s, n->subnet_tree) {
+ for splay_each(node_t, n, &node_tree) {
+ for splay_each(subnet_t, s, &n->subnet_tree) {
send_add_subnet(c, s);
}
- for splay_each(edge_t, e, n->edge_tree) {
+ for splay_each(edge_t, e, &n->edge_tree) {
send_add_edge(c, e);
}
}
n->mtu = mtu;
}
- if(get_config_int(lookup_config(config_tree, "PMTU"), &mtu) && mtu < n->mtu) {
+ if(get_config_int(lookup_config(&config_tree, "PMTU"), &mtu) && mtu < n->mtu) {
n->mtu = mtu;
}