along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: node.c,v 1.1.2.23 2003/07/17 15:06:26 guus Exp $
+ $Id: node.c,v 1.1.2.25 2003/07/29 10:50:15 guus Exp $
*/
#include "system.h"
node_t *myself;
-static int node_compare(node_t *a, node_t *b)
+static int node_compare(const node_t *a, const node_t *b)
{
return strcmp(a->name, b->name);
}
-static int node_udp_compare(node_t *a, node_t *b)
+static int node_udp_compare(const node_t *a, const node_t *b)
{
int result;
node_t *lookup_node(char *name)
{
- node_t n;
+ node_t n = {
+ .name = name,
+ };
+
cp();
- n.name = name;
+
return avl_search(node_tree, &n);
}
-node_t *lookup_node_udp(sockaddr_t *sa)
+node_t *lookup_node_udp(const sockaddr_t *sa)
{
- node_t n;
+ node_t n = {
+ .address = *sa,
+ .name = NULL,
+ };
+
cp();
- n.address = *sa;
- n.name = NULL;
return avl_search(node_udp_tree, &n);
}
logger(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s"),
n->name, n->hostname, n->cipher ? n->cipher->nid : 0,
n->digest ? n->digest->type : 0, n->maclength, n->compression,
- n->options, n->status, n->nexthop ? n->nexthop->name : "-",
+ n->options, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-",
n->via ? n->via->name : "-");
}