projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Really fix byte budget calculation.
[tinc]
/
src
/
protocol_misc.c
diff --git
a/src/protocol_misc.c
b/src/protocol_misc.c
index
2e610cb
..
05afbce
100644
(file)
--- a/
src/protocol_misc.c
+++ b/
src/protocol_misc.c
@@
-1,7
+1,7
@@
/*
protocol_misc.c -- handle the meta-protocol, miscellaneous functions
Copyright (C) 1999-2005 Ivo Timmermans,
/*
protocol_misc.c -- handle the meta-protocol, miscellaneous functions
Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-20
09
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-20
12
Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-33,59
+33,47
@@
int maxoutbufsize = 0;
/* Status and error notification routines */
/* Status and error notification routines */
-bool send_status(connection_t *c, int statusno, const char *statusstring)
-{
- cp();
-
+bool send_status(connection_t *c, int statusno, const char *statusstring) {
if(!statusstring)
statusstring = "Status";
return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
}
if(!statusstring)
statusstring = "Status";
return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
}
-bool status_h(connection_t *c)
-{
+bool status_h(connection_t *c) {
int statusno;
char statusstring[MAX_STRING_SIZE];
int statusno;
char statusstring[MAX_STRING_SIZE];
- cp();
-
if(sscanf(c->buffer, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
if(sscanf(c->buffer, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
- logger(LOG_ERR,
_("Got bad %s from %s (%s)")
, "STATUS",
+ logger(LOG_ERR,
"Got bad %s from %s (%s)"
, "STATUS",
c->name, c->hostname);
return false;
}
c->name, c->hostname);
return false;
}
- ifdebug(STATUS) logger(LOG_NOTICE,
_("Status message from %s (%s): %d: %s")
,
+ ifdebug(STATUS) logger(LOG_NOTICE,
"Status message from %s (%s): %d: %s"
,
c->name, c->hostname, statusno, statusstring);
return true;
}
c->name, c->hostname, statusno, statusstring);
return true;
}
-bool send_error(connection_t *c, int err, const char *errstring)
-{
- cp();
-
+bool send_error(connection_t *c, int err, const char *errstring) {
if(!errstring)
errstring = "Error";
return send_request(c, "%d %d %s", ERROR, err, errstring);
}
if(!errstring)
errstring = "Error";
return send_request(c, "%d %d %s", ERROR, err, errstring);
}
-bool error_h(connection_t *c)
-{
+bool error_h(connection_t *c) {
int err;
char errorstring[MAX_STRING_SIZE];
int err;
char errorstring[MAX_STRING_SIZE];
- cp();
-
if(sscanf(c->buffer, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
if(sscanf(c->buffer, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
- logger(LOG_ERR,
_("Got bad %s from %s (%s)")
, "ERROR",
+ logger(LOG_ERR,
"Got bad %s from %s (%s)"
, "ERROR",
c->name, c->hostname);
return false;
}
c->name, c->hostname);
return false;
}
- ifdebug(ERROR) logger(LOG_NOTICE,
_("Error message from %s (%s): %d: %s")
,
+ ifdebug(ERROR) logger(LOG_NOTICE,
"Error message from %s (%s): %d: %s"
,
c->name, c->hostname, err, errorstring);
terminate_connection(c, c->status.active);
c->name, c->hostname, err, errorstring);
terminate_connection(c, c->status.active);
@@
-93,66
+81,51
@@
bool error_h(connection_t *c)
return true;
}
return true;
}
-bool send_termreq(connection_t *c)
-{
- cp();
-
+bool send_termreq(connection_t *c) {
return send_request(c, "%d", TERMREQ);
}
return send_request(c, "%d", TERMREQ);
}
-bool termreq_h(connection_t *c)
-{
- cp();
-
+bool termreq_h(connection_t *c) {
terminate_connection(c, c->status.active);
return true;
}
terminate_connection(c, c->status.active);
return true;
}
-bool send_ping(connection_t *c)
-{
- cp();
-
+bool send_ping(connection_t *c) {
c->status.pinged = true;
c->last_ping_time = now;
return send_request(c, "%d", PING);
}
c->status.pinged = true;
c->last_ping_time = now;
return send_request(c, "%d", PING);
}
-bool ping_h(connection_t *c)
-{
- cp();
-
+bool ping_h(connection_t *c) {
return send_pong(c);
}
return send_pong(c);
}
-bool send_pong(connection_t *c)
-{
- cp();
-
+bool send_pong(connection_t *c) {
return send_request(c, "%d", PONG);
}
return send_request(c, "%d", PONG);
}
-bool pong_h(connection_t *c)
-{
- cp();
-
+bool pong_h(connection_t *c) {
c->status.pinged = false;
/* Succesful connection, reset timeout if this is an outgoing connection. */
c->status.pinged = false;
/* Succesful connection, reset timeout if this is an outgoing connection. */
- if(c->outgoing)
+ if(c->outgoing)
{
c->outgoing->timeout = 0;
c->outgoing->timeout = 0;
+ c->outgoing->cfg = NULL;
+ if(c->outgoing->ai)
+ freeaddrinfo(c->outgoing->ai);
+ c->outgoing->ai = NULL;
+ c->outgoing->aip = NULL;
+ }
return true;
}
/* Sending and receiving packets via TCP */
return true;
}
/* Sending and receiving packets via TCP */
-bool send_tcppacket(connection_t *c, vpn_packet_t *packet)
-{
- cp();
-
+bool send_tcppacket(connection_t *c, const vpn_packet_t *packet) {
/* If there already is a lot of data in the outbuf buffer, discard this packet.
We use a very simple Random Early Drop algorithm. */
/* If there already is a lot of data in the outbuf buffer, discard this packet.
We use a very simple Random Early Drop algorithm. */
@@
-162,17
+135,14
@@
bool send_tcppacket(connection_t *c, vpn_packet_t *packet)
if(!send_request(c, "%d %hd", PACKET, packet->len))
return false;
if(!send_request(c, "%d %hd", PACKET, packet->len))
return false;
- return send_meta(c, (char *)packet->data, packet->len);
+ return send_meta(c, (char *)packet->data, packet->len)
&& flush_meta(c)
;
}
}
-bool tcppacket_h(connection_t *c)
-{
+bool tcppacket_h(connection_t *c) {
short int len;
short int len;
- cp();
-
if(sscanf(c->buffer, "%*d %hd", &len) != 1) {
if(sscanf(c->buffer, "%*d %hd", &len) != 1) {
- logger(LOG_ERR,
_("Got bad %s from %s (%s)")
, "PACKET", c->name,
+ logger(LOG_ERR,
"Got bad %s from %s (%s)"
, "PACKET", c->name,
c->hostname);
return false;
}
c->hostname);
return false;
}