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
d5c9aeb
..
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,32
+17,25
@@
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.10 2003/07/12 17:41:47 guus Exp
$
+ $Id$
*/
*/
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include <utils.h>
+#include "system.h"
#include "conf.h"
#include "conf.h"
+#include "connection.h"
+#include "logger.h"
+#include "meta.h"
#include "net.h"
#include "netutl.h"
#include "protocol.h"
#include "net.h"
#include "netutl.h"
#include "protocol.h"
-#include "meta.h"
-#include "connection.h"
-#include "logger.h"
+#include "utils.h"
-#include "system.h"
+int maxoutbufsize = 0;
/* Status and error notification routines */
/* Status and error notification routines */
-
int send_status(connection_t *c, int statusno,
char *statusstring)
+
bool send_status(connection_t *c, int statusno, const
char *statusstring)
{
cp();
{
cp();
@@
-52,26
+45,26
@@
int send_status(connection_t *c, int statusno, char *statusstring)
return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
}
return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
}
-
int 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);
logger(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
c->name, c->hostname);
- return
-1
;
+ return
false
;
}
ifdebug(STATUS) logger(LOG_NOTICE, _("Status message from %s (%s): %d: %s"),
c->name, c->hostname, statusno, statusstring);
}
ifdebug(STATUS) logger(LOG_NOTICE, _("Status message from %s (%s): %d: %s"),
c->name, c->hostname, statusno, statusstring);
- return
0
;
+ return
true
;
}
}
-
int send_error(connection_t *c, int err,
char *errstring)
+
bool send_error(connection_t *c, int err, const
char *errstring)
{
cp();
{
cp();
@@
-81,114
+74,109
@@
int send_error(connection_t *c, int err, char *errstring)
return send_request(c, "%d %d %s", ERROR, err, errstring);
}
return send_request(c, "%d %d %s", ERROR, err, errstring);
}
-
int 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);
logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
c->name, c->hostname);
- return
-1
;
+ return
false
;
}
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 0;
+ return false;
}
}
-
int
send_termreq(connection_t *c)
+
bool
send_termreq(connection_t *c)
{
cp();
return send_request(c, "%d", TERMREQ);
}
{
cp();
return send_request(c, "%d", TERMREQ);
}
-
int termreq_h(connection_t *c
)
+
bool termreq_h(connection_t *c, char *request
)
{
cp();
{
cp();
- terminate_connection(c, c->status.active);
-
- return 0;
+ return false;
}
}
-
int
send_ping(connection_t *c)
+
bool
send_ping(connection_t *c)
{
cp();
{
cp();
- c->status.pinged =
1
;
- c->last_ping_time =
now
;
+ c->status.pinged =
true
;
+ c->last_ping_time =
time(NULL)
;
return send_request(c, "%d", PING);
}
return send_request(c, "%d", PING);
}
-
int ping_h(connection_t *c
)
+
bool ping_h(connection_t *c, char *request
)
{
cp();
return send_pong(c);
}
{
cp();
return send_pong(c);
}
-
int
send_pong(connection_t *c)
+
bool
send_pong(connection_t *c)
{
cp();
return send_request(c, "%d", PONG);
}
{
cp();
return send_request(c, "%d", PONG);
}
-
int pong_h(connection_t *c
)
+
bool pong_h(connection_t *c, char *request
)
{
cp();
{
cp();
- c->status.pinged =
0
;
+ c->status.pinged =
false
;
/* Succesful connection, reset timeout if this is an outgoing connection. */
if(c->outgoing)
c->outgoing->timeout = 0;
/* Succesful connection, reset timeout if this is an outgoing connection. */
if(c->outgoing)
c->outgoing->timeout = 0;
- return
0
;
+ return
true
;
}
/* Sending and receiving packets via TCP */
}
/* Sending and receiving packets via TCP */
-
int
send_tcppacket(connection_t *c, vpn_packet_t *packet)
+
bool
send_tcppacket(connection_t *c, vpn_packet_t *packet)
{
{
- int x;
-
cp();
cp();
- /*
Evil hack
. */
+ /*
If there already is a lot of data in the outbuf buffer, discard this packet
. */
- x = send_request(c, "%d %hd", PACKET, packet->len);
+ if(c->buffer->output->off > maxoutbufsize)
+ return true;
- if(
x
)
- return
x
;
+ 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);
}
}
-
int 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);
logger(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name,
c->hostname);
- return
-1
;
+ return
false
;
}
/* Set reqlen to len, this will tell receive_meta() that a tcppacket is coming. */
c->tcplen = len;
}
/* Set reqlen to len, this will tell receive_meta() that a tcppacket is coming. */
c->tcplen = len;
- return
0
;
+ return
true
;
}
}