Import Upstream version 1.0.3
This commit is contained in:
Guus Sliepen
parent
ed8d36a434
commit
c12028eeaa
196 changed files with 43077 additions and 32886 deletions
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
protocol_misc.c -- handle the meta-protocol, miscellaneous functions
|
||||
Copyright (C) 1999-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
|
||||
2000-2002 Guus Sliepen <guus@sliepen.warande.net>
|
||||
Copyright (C) 1999-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
|
||||
2000-2004 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
|
||||
|
|
@ -17,182 +17,165 @@
|
|||
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.3 2002/03/23 20:21:10 guus Exp $
|
||||
$Id: protocol_misc.c 1374 2004-03-21 14:21:22Z guus $
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <syslog.h>
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <utils.h>
|
||||
|
||||
#include "conf.h"
|
||||
#include "net.h"
|
||||
#include "netutl.h"
|
||||
#include "protocol.h"
|
||||
#include "meta.h"
|
||||
#include "connection.h"
|
||||
|
||||
#include "system.h"
|
||||
|
||||
#include "conf.h"
|
||||
#include "connection.h"
|
||||
#include "logger.h"
|
||||
#include "meta.h"
|
||||
#include "net.h"
|
||||
#include "netutl.h"
|
||||
#include "protocol.h"
|
||||
#include "utils.h"
|
||||
|
||||
/* 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
|
||||
if(!statusstring)
|
||||
statusstring = status_text[statusno];
|
||||
cp
|
||||
return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
|
||||
cp();
|
||||
|
||||
if(!statusstring)
|
||||
statusstring = "Status";
|
||||
|
||||
return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
|
||||
}
|
||||
|
||||
int status_h(connection_t *c)
|
||||
bool status_h(connection_t *c)
|
||||
{
|
||||
int statusno;
|
||||
char statusstring[MAX_STRING_SIZE];
|
||||
cp
|
||||
if(sscanf(c->buffer, "%*d %d "MAX_STRING, &statusno, statusstring) != 2)
|
||||
{
|
||||
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
|
||||
c->name, c->hostname);
|
||||
return -1;
|
||||
}
|
||||
int statusno;
|
||||
char statusstring[MAX_STRING_SIZE];
|
||||
|
||||
if(debug_lvl >= DEBUG_STATUS)
|
||||
{
|
||||
syslog(LOG_NOTICE, _("Status message from %s (%s): %s: %s"),
|
||||
c->name, c->hostname, status_text[statusno], statusstring);
|
||||
}
|
||||
cp();
|
||||
|
||||
cp
|
||||
return 0;
|
||||
if(sscanf(c->buffer, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
|
||||
logger(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
|
||||
c->name, c->hostname);
|
||||
return false;
|
||||
}
|
||||
|
||||
ifdebug(STATUS) logger(LOG_NOTICE, _("Status message from %s (%s): %d: %s"),
|
||||
c->name, c->hostname, statusno, statusstring);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
int send_error(connection_t *c, int err, char *errstring)
|
||||
bool send_error(connection_t *c, int err, const char *errstring)
|
||||
{
|
||||
cp
|
||||
if(!errstring)
|
||||
errstring = strerror(err);
|
||||
return send_request(c, "%d %d %s", ERROR, err, errstring);
|
||||
cp();
|
||||
|
||||
if(!errstring)
|
||||
errstring = "Error";
|
||||
|
||||
return send_request(c, "%d %d %s", ERROR, err, errstring);
|
||||
}
|
||||
|
||||
int error_h(connection_t *c)
|
||||
bool error_h(connection_t *c)
|
||||
{
|
||||
int err;
|
||||
char errorstring[MAX_STRING_SIZE];
|
||||
cp
|
||||
if(sscanf(c->buffer, "%*d %d "MAX_STRING, &err, errorstring) != 2)
|
||||
{
|
||||
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
|
||||
c->name, c->hostname);
|
||||
return -1;
|
||||
}
|
||||
int err;
|
||||
char errorstring[MAX_STRING_SIZE];
|
||||
|
||||
if(debug_lvl >= DEBUG_ERROR)
|
||||
{
|
||||
syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"),
|
||||
c->name, c->hostname, strerror(err), errorstring);
|
||||
}
|
||||
cp();
|
||||
|
||||
terminate_connection(c, c->status.active);
|
||||
cp
|
||||
return 0;
|
||||
if(sscanf(c->buffer, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
|
||||
logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
|
||||
c->name, c->hostname);
|
||||
return false;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
cp
|
||||
terminate_connection(c, c->status.active);
|
||||
cp
|
||||
return 0;
|
||||
cp();
|
||||
|
||||
terminate_connection(c, c->status.active);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
int send_ping(connection_t *c)
|
||||
bool send_ping(connection_t *c)
|
||||
{
|
||||
cp
|
||||
c->status.pinged = 1;
|
||||
c->last_ping_time = now;
|
||||
cp
|
||||
return send_request(c, "%d", PING);
|
||||
cp();
|
||||
|
||||
c->status.pinged = true;
|
||||
c->last_ping_time = now;
|
||||
|
||||
return send_request(c, "%d", PING);
|
||||
}
|
||||
|
||||
int ping_h(connection_t *c)
|
||||
bool ping_h(connection_t *c)
|
||||
{
|
||||
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)
|
||||
{
|
||||
cp
|
||||
c->status.pinged = 0;
|
||||
cp();
|
||||
|
||||
/* Succesful connection, reset timeout if this is an outgoing connection. */
|
||||
|
||||
if(c->outgoing)
|
||||
c->outgoing->timeout = 0;
|
||||
cp
|
||||
return 0;
|
||||
c->status.pinged = false;
|
||||
|
||||
/* Succesful connection, reset timeout if this is an outgoing connection. */
|
||||
|
||||
if(c->outgoing)
|
||||
c->outgoing->timeout = 0;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 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
|
||||
/* Evil hack. */
|
||||
cp();
|
||||
|
||||
x = send_request(c, "%d %hd", PACKET, packet->len);
|
||||
/* Evil hack. */
|
||||
|
||||
if(x)
|
||||
return x;
|
||||
cp
|
||||
return send_meta(c, packet->data, packet->len);
|
||||
if(!send_request(c, "%d %hd", PACKET, packet->len))
|
||||
return false;
|
||||
|
||||
return send_meta(c, packet->data, packet->len);
|
||||
}
|
||||
|
||||
int tcppacket_h(connection_t *c)
|
||||
bool tcppacket_h(connection_t *c)
|
||||
{
|
||||
short int len;
|
||||
cp
|
||||
if(sscanf(c->buffer, "%*d %hd", &len) != 1)
|
||||
{
|
||||
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name, c->hostname);
|
||||
return -1;
|
||||
}
|
||||
short int len;
|
||||
|
||||
/* Set reqlen to len, this will tell receive_meta() that a tcppacket is coming. */
|
||||
cp();
|
||||
|
||||
c->tcplen = len;
|
||||
cp
|
||||
return 0;
|
||||
if(sscanf(c->buffer, "%*d %hd", &len) != 1) {
|
||||
logger(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name,
|
||||
c->hostname);
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Set reqlen to len, this will tell receive_meta() that a tcppacket is coming. */
|
||||
|
||||
c->tcplen = len;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Status strings */
|
||||
|
||||
char (*status_text[]) = {
|
||||
"Warning",
|
||||
};
|
||||
|
||||
/* Error strings */
|
||||
|
||||
char (*error_text[]) = {
|
||||
"Error",
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue