projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refresh po/POTFILES.in.
[tinc]
/
src
/
protocol_misc.c
diff --git
a/src/protocol_misc.c
b/src/protocol_misc.c
index
66f8980
..
95a240e
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
/*
protocol_misc.c -- handle the meta-protocol, miscellaneous functions
- Copyright (C) 1999-200
3 Ivo Timmermans <ivo@o2w.nl>
,
- 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 1999-200
5 Ivo Timmermans
,
+ 2000-200
6 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
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id
: protocol_misc.c,v 1.1.4.13 2003/07/24 12:08:16 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
@@
-31,6
+31,8
@@
#include "protocol.h"
#include "utils.h"
#include "protocol.h"
#include "utils.h"
+int maxoutbufsize = 0;
+
/* Status and error notification routines */
bool send_status(connection_t *c, int statusno, const char *statusstring)
/* Status and error notification routines */
bool send_status(connection_t *c, int statusno, const char *statusstring)
@@
-43,14
+45,14
@@
bool send_status(connection_t *c, int statusno, const char *statusstring)
return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
}
return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
}
-bool status_h(connection_t *c)
+bool status_h(connection_t *c
, char *request
)
{
int statusno;
char statusstring[MAX_STRING_SIZE];
cp();
{
int statusno;
char statusstring[MAX_STRING_SIZE];
cp();
- if(sscanf(
c->buffer
, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
+ if(sscanf(
request
, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
logger(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
c->name, c->hostname);
return false;
logger(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
c->name, c->hostname);
return false;
@@
-72,14
+74,14
@@
bool send_error(connection_t *c, int err, const char *errstring)
return send_request(c, "%d %d %s", ERROR, err, errstring);
}
return send_request(c, "%d %d %s", ERROR, err, errstring);
}
-bool error_h(connection_t *c)
+bool error_h(connection_t *c
, char *request
)
{
int err;
char errorstring[MAX_STRING_SIZE];
cp();
{
int err;
char errorstring[MAX_STRING_SIZE];
cp();
- if(sscanf(
c->buffer
, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
+ if(sscanf(
request
, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
c->name, c->hostname);
return false;
logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
c->name, c->hostname);
return false;
@@
-88,9
+90,7
@@
bool error_h(connection_t *c)
ifdebug(ERROR) logger(LOG_NOTICE, _("Error message from %s (%s): %d: %s"),
c->name, c->hostname, err, errorstring);
ifdebug(ERROR) logger(LOG_NOTICE, _("Error message from %s (%s): %d: %s"),
c->name, c->hostname, err, errorstring);
- terminate_connection(c, c->status.active);
-
- return true;
+ return false;
}
bool send_termreq(connection_t *c)
}
bool send_termreq(connection_t *c)
@@
-100,13
+100,11
@@
bool send_termreq(connection_t *c)
return send_request(c, "%d", TERMREQ);
}
return send_request(c, "%d", TERMREQ);
}
-bool termreq_h(connection_t *c)
+bool termreq_h(connection_t *c
, char *request
)
{
cp();
{
cp();
- terminate_connection(c, c->status.active);
-
- return true;
+ return false;
}
bool send_ping(connection_t *c)
}
bool send_ping(connection_t *c)
@@
-114,12
+112,12
@@
bool send_ping(connection_t *c)
cp();
c->status.pinged = true;
cp();
c->status.pinged = true;
- c->last_ping_time =
now
;
+ c->last_ping_time =
time(NULL)
;
return send_request(c, "%d", PING);
}
return send_request(c, "%d", PING);
}
-bool ping_h(connection_t *c)
+bool ping_h(connection_t *c
, char *request
)
{
cp();
{
cp();
@@
-133,7
+131,7
@@
bool send_pong(connection_t *c)
return send_request(c, "%d", PONG);
}
return send_request(c, "%d", PONG);
}
-bool pong_h(connection_t *c)
+bool pong_h(connection_t *c
, char *request
)
{
cp();
{
cp();
@@
-153,21
+151,24
@@
bool send_tcppacket(connection_t *c, vpn_packet_t *packet)
{
cp();
{
cp();
- /* Evil hack. */
+ /* If there already is a lot of data in the outbuf buffer, discard this packet. */
+
+ if(c->buffer->output->off > maxoutbufsize)
+ return true;
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, packet->data, packet->len);
+ return send_meta(c,
(char *)
packet->data, packet->len);
}
}
-bool tcppacket_h(connection_t *c)
+bool tcppacket_h(connection_t *c
, char *request
)
{
short int len;
cp();
{
short int len;
cp();
- if(sscanf(
c->buffer
, "%*d %hd", &len) != 1) {
+ if(sscanf(
request
, "%*d %hd", &len) != 1) {
logger(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name,
c->hostname);
return false;
logger(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name,
c->hostname);
return false;