along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: protocol.c,v 1.28.4.136 2002/09/09 21:24:41 guus Exp $
+ $Id: protocol.c,v 1.28.4.142 2003/07/22 20:55:20 guus Exp $
*/
-#include "config.h"
+#include "system.h"
-#include <sys/types.h>
+#include "conf.h"
+#include "connection.h"
+#include "logger.h"
+#include "meta.h"
+#include "protocol.h"
+#include "utils.h"
+#include "xalloc.h"
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
+/* Jumptable for the request handlers */
-#include <utils.h>
-#include <xalloc.h>
+static bool (*request_handlers[])(connection_t *) = {
+ id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
+ status_h, error_h, termreq_h,
+ ping_h, pong_h,
+ add_subnet_h, del_subnet_h,
+ add_edge_h, del_edge_h,
+ key_changed_h, req_key_h, ans_key_h, tcppacket_h,
+};
-#include "conf.h"
-#include "protocol.h"
-#include "meta.h"
-#include "connection.h"
+/* Request names */
-#include "system.h"
+static char (*request_name[]) = {
+ "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK",
+ "STATUS", "ERROR", "TERMREQ",
+ "PING", "PONG",
+ "ADD_SUBNET", "DEL_SUBNET",
+ "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET",
+};
-avl_tree_t *past_request_tree;
+static avl_tree_t *past_request_tree;
-int check_id(char *id)
+bool check_id(char *id)
{
int i;
for(i = 0; i < strlen(id); i++)
if(!isalnum(id[i]) && id[i] != '_')
- return -1;
+ return false;
- return 0;
+ return true;
}
/* Generic request routines - takes care of logging and error
detection as well */
-int send_request(connection_t * c, const char *format, ...)
+bool send_request(connection_t *c, const char *format, ...)
{
va_list args;
char buffer[MAXBUFSIZE];
va_end(args);
if(len < 0 || len > MAXBUFSIZE - 1) {
- syslog(LOG_ERR, _("Output buffer overflow while sending request to %s (%s)"),
+ logger(LOG_ERR, _("Output buffer overflow while sending request to %s (%s)"),
c->name, c->hostname);
- return -1;
+ return false;
}
- if(debug_lvl >= DEBUG_PROTOCOL) {
+ ifdebug(PROTOCOL) {
sscanf(buffer, "%d", &request);
- if(debug_lvl >= DEBUG_META)
- syslog(LOG_DEBUG, _("Sending %s to %s (%s): %s"),
+ ifdebug(META)
+ logger(LOG_DEBUG, _("Sending %s to %s (%s): %s"),
request_name[request], c->name, c->hostname, buffer);
else
- syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request],
+ logger(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request],
c->name, c->hostname);
}
buffer[len++] = '\n';
- if(c == broadcast)
- return broadcast_meta(NULL, buffer, len);
- else
+ if(c == broadcast) {
+ broadcast_meta(NULL, buffer, len);
+ return true;
+ } else
return send_meta(c, buffer, len);
}
-int forward_request(connection_t * from)
+void forward_request(connection_t *from)
{
int request;
- cp();
cp();
- if(debug_lvl >= DEBUG_PROTOCOL) {
+ ifdebug(PROTOCOL) {
sscanf(from->buffer, "%d", &request);
- if(debug_lvl >= DEBUG_META)
- syslog(LOG_DEBUG, _("Forwarding %s from %s (%s): %s"),
+ ifdebug(META)
+ logger(LOG_DEBUG, _("Forwarding %s from %s (%s): %s"),
request_name[request], from->name, from->hostname,
from->buffer);
else
- syslog(LOG_DEBUG, _("Forwarding %s from %s (%s)"),
+ logger(LOG_DEBUG, _("Forwarding %s from %s (%s)"),
request_name[request], from->name, from->hostname);
}
from->buffer[from->reqlen - 1] = '\n';
- return broadcast_meta(from, from->buffer, from->reqlen);
+ broadcast_meta(from, from->buffer, from->reqlen);
}
-int receive_request(connection_t * c)
+bool receive_request(connection_t *c)
{
int request;
if(sscanf(c->buffer, "%d", &request) == 1) {
if((request < 0) || (request >= LAST) || !request_handlers[request]) {
- if(debug_lvl >= DEBUG_META)
- syslog(LOG_DEBUG, _("Unknown request from %s (%s): %s"),
+ ifdebug(META)
+ logger(LOG_DEBUG, _("Unknown request from %s (%s): %s"),
c->name, c->hostname, c->buffer);
else
- syslog(LOG_ERR, _("Unknown request from %s (%s)"),
+ logger(LOG_ERR, _("Unknown request from %s (%s)"),
c->name, c->hostname);
- return -1;
+ return false;
} else {
- if(debug_lvl >= DEBUG_PROTOCOL) {
- if(debug_lvl >= DEBUG_META)
- syslog(LOG_DEBUG, _("Got %s from %s (%s): %s"),
+ ifdebug(PROTOCOL) {
+ ifdebug(META)
+ logger(LOG_DEBUG, _("Got %s from %s (%s): %s"),
request_name[request], c->name, c->hostname,
c->buffer);
else
- syslog(LOG_DEBUG, _("Got %s from %s (%s)"),
+ logger(LOG_DEBUG, _("Got %s from %s (%s)"),
request_name[request], c->name, c->hostname);
}
}
if((c->allow_request != ALL) && (c->allow_request != request)) {
- syslog(LOG_ERR, _("Unauthorized request from %s (%s)"), c->name,
+ logger(LOG_ERR, _("Unauthorized request from %s (%s)"), c->name,
c->hostname);
- return -1;
+ return false;
}
- if(request_handlers[request] (c))
+ if(!request_handlers[request](c)) {
/* Something went wrong. Probably scriptkiddies. Terminate. */
- {
- syslog(LOG_ERR, _("Error while processing %s from %s (%s)"),
+
+ logger(LOG_ERR, _("Error while processing %s from %s (%s)"),
request_name[request], c->name, c->hostname);
- return -1;
+ return false;
}
} else {
- syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
+ logger(LOG_ERR, _("Bogus data received from %s (%s)"),
c->name, c->hostname);
- return -1;
+ return false;
}
- return 0;
+ return true;
}
-int past_request_compare(past_request_t * a, past_request_t * b)
+static int past_request_compare(past_request_t *a, past_request_t *b)
{
return strcmp(a->request, b->request);
}
-void free_past_request(past_request_t * r)
+static void free_past_request(past_request_t *r)
{
cp();
avl_delete_tree(past_request_tree);
}
-int seen_request(char *request)
+bool seen_request(char *request)
{
past_request_t p, *new;
p.request = request;
if(avl_search(past_request_tree, &p)) {
- if(debug_lvl >= DEBUG_SCARY_THINGS)
- syslog(LOG_DEBUG, _("Already seen request"));
- return 1;
+ ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Already seen request"));
+ return true;
} else {
new = (past_request_t *) xmalloc(sizeof(*new));
new->request = xstrdup(request);
new->firstseen = now;
avl_insert(past_request_tree, new);
- return 0;
+ return false;
}
}
left++;
}
- if(debug_lvl >= DEBUG_SCARY_THINGS && left + deleted)
- syslog(LOG_DEBUG, _("Aging past requests: deleted %d, left %d\n"),
+ if(left || deleted)
+ ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Aging past requests: deleted %d, left %d\n"),
deleted, left);
}
-
-/* Jumptable for the request handlers */
-
-int (*request_handlers[]) (connection_t *) = {
- id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
- status_h, error_h, termreq_h,
- ping_h, pong_h,
- add_subnet_h, del_subnet_h,
- add_edge_h, del_edge_h,
- key_changed_h, req_key_h, ans_key_h, tcppacket_h,
-};
-
-/* Request names */
-
-char (*request_name[]) = {
- "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK",
- "STATUS", "ERROR", "TERMREQ",
- "PING", "PONG",
- "ADD_SUBNET", "DEL_SUBNET",
- "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET",
-};
projects / tinc / blobdiff