fix dns name sending to clients, and put some debug messages on debug mode only

1 files changed, 6 insertions, 6 deletions

diff --git a/glougloud/user.c b/glougloud/user.c
index 3ed8798..799bf63 100644
--- a/glougloud/user.c
+++ b/glougloud/user.c
@@ -127,6 +127,7 @@ struct packet {
 		struct name {
 			u_int32_t	addr;
 			u_int8_t	len;
+			u_char		fqdn[DNSNAME_MAX];
 		} name;
 	} pdat;
 #define newconn_id	pdat.newconn.id
@@ -139,8 +140,7 @@ struct packet {
 #define data_size	pdat.data.size
 #define name_addr	pdat.name.addr
 #define name_len	pdat.name.len
-
-	u_char		extra[PACKET_EXTRA_SIZEMAX];
+#define name_fqdn	pdat.name.fqdn
 };
 
 struct phandler {
@@ -408,7 +408,7 @@ sendto_all(struct packet *p, int size)
 {
 	struct user *usr;
 
-	log_tmp("SEND PACKET (size %.2d): %x %x", size, p->ver, p->type);
+	log_debug("SEND PACKET (size %.2d): %x %x", size, p->ver, p->type);
 
 	LIST_FOREACH(usr, &usr_list, entry) {
 		if (sendto(net_socket, p, size, 0,
@@ -700,7 +700,7 @@ ev_timer(int fd, short why, void *data)
 	struct node *n;
 	int i, to;
 
-	log_tmp("ev_timer");
+	log_debug("ev_timer");
 	cap->time = time(NULL);
 
 	i = 0;
@@ -730,7 +730,7 @@ ev_timer(int fd, short why, void *data)
 		}
 	}
 
-	log_tmp("user: ev_timer leaving with %d active connections and %d active nodes", i, cap->node_count);
+	log_debug("user: ev_timer leaving with %d active connections and %d active nodes", i, cap->node_count);
 	if (event_add(&cap->conntimer_ev, &cap->conntimer_tv) == -1)
 		fatal("user: event_add conntimer failed : %s", strerror(errno));
 }
@@ -802,7 +802,7 @@ usrdns(struct imsgev *iev, struct imsg *imsg)
 	p.type = PACKET_NAME;
 	p.name_addr = htonl(n->addr.s_addr);
 	p.name_len = n->namelen;
-	strncpy(p.extra, n->name, sizeof(p.extra));
+	strncpy(p.name_fqdn, n->name, sizeof(p.name_fqdn));
 	sendto_all(&p, PACKET_NAME_SIZE + p.name_len);
 }