projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More fixes for Windows.
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
189ead9
..
1244bfd
100644
(file)
--- a/
src/meta.c
+++ b/
src/meta.c
@@
-1,6
+1,6
@@
/*
meta.c -- handle the meta communication
/*
meta.c -- handle the meta communication
- Copyright (C) 2000-20
09
Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2000-20
12
Guus Sliepen <guus@tinc-vpn.org>,
2000-2005 Ivo Timmermans
2006 Scott Lamb <slamb@slamb.org>
2000-2005 Ivo Timmermans
2006 Scott Lamb <slamb@slamb.org>
@@
-39,7
+39,7
@@
bool send_meta_sptps(void *handle, uint8_t type, const char *buffer, size_t leng
}
buffer_add(&c->outbuf, buffer, length);
}
buffer_add(&c->outbuf, buffer, length);
-
event_add(&c->outevent, NULL
);
+
io_set(&c->io, IO_READ | IO_WRITE
);
return true;
}
return true;
}
@@
-65,12
+65,11
@@
bool send_meta(connection_t *c, const char *buffer, int length) {
c->name, c->hostname);
return false;
}
c->name, c->hostname);
return false;
}
-
} else {
buffer_add(&c->outbuf, buffer, length);
}
} else {
buffer_add(&c->outbuf, buffer, length);
}
-
event_add(&c->outevent, NULL
);
+
io_set(&c->io, IO_READ | IO_WRITE
);
return true;
}
return true;
}
@@
-109,6
+108,11
@@
bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t l
return true;
}
return true;
}
+ /* Change newline to null byte, just like non-SPTPS requests */
+
+ if(data[length - 1] == '\n')
+ ((char *)data)[length - 1] = 0;
+
/* Otherwise we are waiting for a request */
return receive_request(c, data);
/* Otherwise we are waiting for a request */
return receive_request(c, data);
@@
-189,7
+193,7
@@
bool receive_meta(connection_t *c) {
logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected");
return false;
}
logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected");
return false;
}
- } else
+ } else
receive_tcppacket(c, tcpbuffer, c->tcplen);
c->tcplen = 0;
continue;
receive_tcppacket(c, tcpbuffer, c->tcplen);
c->tcplen = 0;
continue;