sockaddr2str(&c->address, &host, &port);
setenv("REMOTEADDRESS", host, true);
setenv("REMOTEPORT", port, true);
- setenv("NODE", c->name, true);
setenv("NAME", myself->name, true);
+ if(c->name) {
+ setenv("NODE", c->name, true);
+ }
+
if(netname) {
setenv("NETNAME", netname, true);
}
c->last_ping_time = time(NULL);
c->status.connecting = true;
c->name = xstrdup(outgoing->node->name);
-#ifndef DISABLE_LEGACY
- c->outcipher = myself->connection->outcipher;
- c->outdigest = myself->connection->outdigest;
-#endif
c->outmaclength = myself->connection->outmaclength;
- c->outcompression = myself->connection->outcompression;
c->last_ping_time = now.tv_sec;
connection_add(c);
if(n->connection) {
logger(DEBUG_CONNECTIONS, LOG_INFO, "Already connected to %s", n->name);
-
- if(!n->connection->outgoing) {
- n->connection->outgoing = outgoing;
- return;
- } else {
- goto remove;
- }
+ } else {
+ do_outgoing_connection(outgoing);
}
-
- do_outgoing_connection(outgoing);
- return;
-
-remove:
- list_delete(&outgoing_list, outgoing);
}
-/*
- accept a new tcp connect and create a
- new connection
-*/
-void handle_new_meta_connection(void *data, int flags) {
- (void)flags;
- listen_socket_t *l = data;
- connection_t *c;
- sockaddr_t sa;
- int fd;
- socklen_t len = sizeof(sa);
-
- fd = accept(l->tcp.fd, &sa.sa, &len);
-
- if(fd < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
- return;
- }
-
- sockaddrunmap(&sa);
-
+static bool check_tarpit(const sockaddr_t *sa, int fd) {
// Check if we get many connections from the same host
static sockaddr_t prev_sa;
- if(!sockaddrcmp_noport(&sa, &prev_sa)) {
+ if(!sockaddrcmp_noport(sa, &prev_sa)) {
static time_t samehost_burst;
static time_t samehost_burst_time;
if(samehost_burst > max_connection_burst) {
tarpit(fd);
- return;
+ return true;
}
}
if(connection_burst >= max_connection_burst) {
connection_burst = max_connection_burst;
tarpit(fd);
+ return true;
+ }
+
+ return false;
+}
+
+/*
+ accept a new tcp connect and create a
+ new connection
+*/
+void handle_new_meta_connection(void *data, int flags) {
+ (void)flags;
+ listen_socket_t *l = data;
+ connection_t *c;
+ sockaddr_t sa;
+ int fd;
+ socklen_t len = sizeof(sa);
+
+ fd = accept(l->tcp.fd, &sa.sa, &len);
+
+ if(fd < 0) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
+ return;
+ }
+
+ sockaddrunmap(&sa);
+
+ if(!is_local_connection(&sa) && check_tarpit(&sa, fd)) {
return;
}
c = new_connection();
c->name = xstrdup("<unknown>");
-#ifndef DISABLE_LEGACY
- c->outcipher = myself->connection->outcipher;
- c->outdigest = myself->connection->outdigest;
-#endif
c->outmaclength = myself->connection->outmaclength;
- c->outcompression = myself->connection->outcompression;
c->address = sa;
c->hostname = sockaddr2hostname(&sa);
node_t *n = lookup_node(name);
if(!n) {
- n = new_node();
- n->name = xstrdup(name);
+ n = new_node(name);
node_add(n);
}
- free(name);
-
outgoing->node = n;
list_insert_tail(&outgoing_list, outgoing);
setup_outgoing_connection(outgoing, true);
}
+
+ free(name);
}
/* Terminate any connections whose outgoing_t is to be deleted. */