projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Provide all missing IPv6 definitions in lib/ipv6.h.
[tinc]
/
src
/
protocol_misc.c
diff --git
a/src/protocol_misc.c
b/src/protocol_misc.c
index
4dcdd92
..
18155e9
100644
(file)
--- a/
src/protocol_misc.c
+++ b/
src/protocol_misc.c
@@
-17,14
+17,13
@@
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.
6 2002/09/09 21:25:02
guus Exp $
+ $Id: protocol_misc.c,v 1.1.4.
9 2003/07/06 23:16:29
guus Exp $
*/
#include "config.h"
#include <stdlib.h>
#include <string.h>
*/
#include "config.h"
#include <stdlib.h>
#include <string.h>
-#include <syslog.h>
#include <stdio.h>
#include <stdarg.h>
#include <errno.h>
#include <stdio.h>
#include <stdarg.h>
#include <errno.h>
@@
-37,12
+36,25
@@
#include "protocol.h"
#include "meta.h"
#include "connection.h"
#include "protocol.h"
#include "meta.h"
#include "connection.h"
+#include "logger.h"
#include "system.h"
#include "system.h"
+/* Status strings */
+
+static char (*status_text[]) = {
+ "Warning",
+};
+
+/* Error strings */
+
+static char (*error_text[]) = {
+ "Error",
+};
+
/* Status and error notification routines */
/* Status and error notification routines */
-int send_status(connection_t *
c, int statusno, char *statusstring)
+int send_status(connection_t *c, int statusno, char *statusstring)
{
cp();
{
cp();
@@
-52,7
+64,7
@@
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)
+int status_h(connection_t *c)
{
int statusno;
char statusstring[MAX_STRING_SIZE];
{
int statusno;
char statusstring[MAX_STRING_SIZE];
@@
-60,20
+72,18
@@
int status_h(connection_t * c)
cp();
if(sscanf(c->buffer, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
cp();
if(sscanf(c->buffer, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
-
syslog(
LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
+
logger(DEBUG_ALWAYS,
LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
c->name, c->hostname);
return -1;
}
c->name, c->hostname);
return -1;
}
- if(debug_lvl >= DEBUG_STATUS) {
- syslog(LOG_NOTICE, _("Status message from %s (%s): %s: %s"),
+ logger(DEBUG_STATUS, LOG_NOTICE, _("Status message from %s (%s): %s: %s"),
c->name, c->hostname, status_text[statusno], statusstring);
c->name, c->hostname, status_text[statusno], statusstring);
- }
return 0;
}
return 0;
}
-int send_error(connection_t *
c, int err, char *errstring)
+int send_error(connection_t *c, int err, char *errstring)
{
cp();
{
cp();
@@
-83,7
+93,7
@@
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)
+int error_h(connection_t *c)
{
int err;
char errorstring[MAX_STRING_SIZE];
{
int err;
char errorstring[MAX_STRING_SIZE];
@@
-91,29
+101,27
@@
int error_h(connection_t * c)
cp();
if(sscanf(c->buffer, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
cp();
if(sscanf(c->buffer, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
-
syslog(
LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
+
logger(DEBUG_ALWAYS,
LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
c->name, c->hostname);
return -1;
}
c->name, c->hostname);
return -1;
}
- if(debug_lvl >= DEBUG_ERROR) {
- syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"),
+ logger(DEBUG_ERROR, LOG_NOTICE, _("Error message from %s (%s): %s: %s"),
c->name, c->hostname, strerror(err), errorstring);
c->name, c->hostname, strerror(err), errorstring);
- }
terminate_connection(c, c->status.active);
return 0;
}
terminate_connection(c, c->status.active);
return 0;
}
-int send_termreq(connection_t *
c)
+int 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)
+int termreq_h(connection_t *c)
{
cp();
{
cp();
@@
-122,7
+130,7
@@
int termreq_h(connection_t * c)
return 0;
}
return 0;
}
-int send_ping(connection_t *
c)
+int send_ping(connection_t *c)
{
cp();
{
cp();
@@
-132,21
+140,21
@@
int send_ping(connection_t * c)
return send_request(c, "%d", PING);
}
return send_request(c, "%d", PING);
}
-int ping_h(connection_t *
c)
+int ping_h(connection_t *c)
{
cp();
return send_pong(c);
}
{
cp();
return send_pong(c);
}
-int send_pong(connection_t *
c)
+int 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)
+int pong_h(connection_t *c)
{
cp();
{
cp();
@@
-162,7
+170,7
@@
int pong_h(connection_t * c)
/* Sending and receiving packets via TCP */
/* Sending and receiving packets via TCP */
-int send_tcppacket(connection_t *
c, vpn_packet_t *
packet)
+int send_tcppacket(connection_t *
c, vpn_packet_t *
packet)
{
int x;
{
int x;
@@
-178,14
+186,14
@@
int send_tcppacket(connection_t * c, vpn_packet_t * packet)
return send_meta(c, packet->data, packet->len);
}
return send_meta(c, packet->data, packet->len);
}
-int tcppacket_h(connection_t *
c)
+int tcppacket_h(connection_t *c)
{
short int len;
cp();
if(sscanf(c->buffer, "%*d %hd", &len) != 1) {
{
short int len;
cp();
if(sscanf(c->buffer, "%*d %hd", &len) != 1) {
-
syslog(
LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name,
+
logger(DEBUG_ALWAYS,
LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name,
c->hostname);
return -1;
}
c->hostname);
return -1;
}
@@
-196,15
+204,3
@@
int tcppacket_h(connection_t * c)
return 0;
}
return 0;
}
-
-/* Status strings */
-
-char (*status_text[]) = {
- "Warning",
-};
-
-/* Error strings */
-
-char (*error_text[]) = {
- "Error",
-};