projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mingw: fix static linking with recent ncurses
[tinc]
/
src
/
net_socket.c
diff --git
a/src/net_socket.c
b/src/net_socket.c
index
af1bec2
..
5d72471
100644
(file)
--- a/
src/net_socket.c
+++ b/
src/net_socket.c
@@
-456,9
+456,12
@@
static void do_outgoing_pipe(connection_t *c, const char *command) {
sockaddr2str(&c->address, &host, &port);
setenv("REMOTEADDRESS", host, true);
setenv("REMOTEPORT", port, true);
sockaddr2str(&c->address, &host, &port);
setenv("REMOTEADDRESS", host, true);
setenv("REMOTEPORT", port, true);
- setenv("NODE", c->name, true);
setenv("NAME", myself->name, true);
setenv("NAME", myself->name, true);
+ if(c->name) {
+ setenv("NODE", c->name, true);
+ }
+
if(netname) {
setenv("NETNAME", netname, true);
}
if(netname) {
setenv("NETNAME", netname, true);
}
@@
-649,7
+652,6
@@
begin:
c->status.connecting = true;
c->name = xstrdup(outgoing->node->name);
c->outmaclength = myself->connection->outmaclength;
c->status.connecting = true;
c->name = xstrdup(outgoing->node->name);
c->outmaclength = myself->connection->outmaclength;
- c->outcompression = myself->connection->outcompression;
c->last_ping_time = now.tv_sec;
connection_add(c);
c->last_ping_time = now.tv_sec;
connection_add(c);
@@
-758,7
+760,6
@@
void handle_new_meta_connection(void *data, int flags) {
c = new_connection();
c->name = xstrdup("<unknown>");
c->outmaclength = myself->connection->outmaclength;
c = new_connection();
c->name = xstrdup("<unknown>");
c->outmaclength = myself->connection->outmaclength;
- c->outcompression = myself->connection->outcompression;
c->address = sa;
c->hostname = sockaddr2hostname(&sa);
c->address = sa;
c->hostname = sockaddr2hostname(&sa);