X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fcontrol.c;h=b3cce92853d43764a7b8fd10c192a647ce76080a;hb=1fd1d5bd9330e02ab5dc32ad027f654ff2620099;hp=b72ea9eeb59778509c1aa8f368110163d8288928;hpb=01f47c46af514a9d7f39c143e4558a8426a0d3eb;p=tinc

diff --git a/src/control.c b/src/control.c
index b72ea9ee..b3cce928 100644
--- a/src/control.c
+++ b/src/control.c
@@ -30,25 +30,37 @@
 static int control_socket = -1;
 static struct event control_event;
 static splay_tree_t *control_socket_tree;
-extern char *controlfilename;
+extern char *controlsocketname;
 
-static void handle_control_data(int fd, short events, void *event) {
-	char buf[MAXBUFSIZE];
-	size_t inlen;
+static void handle_control_data(struct bufferevent *event, void *data) {
+	char *line = evbuffer_readline(event->input);
+	if(!line)
+		return;
+	
+	if(!strcasecmp(line, "stop")) {
+		logger(LOG_NOTICE, _("Got stop command"));
+		event_loopexit(NULL);
+		return;
+	}
 
-	inlen = read(fd, buf, sizeof buf);
+	logger(LOG_DEBUG, _("Malformed control command received"));
+	close(event->ev_read.ev_fd);
+	splay_delete(control_socket_tree, event);
+}
 
-	if(inlen <= 0) {
-		logger(LOG_DEBUG, _("Closing control socket"));
-		event_del(event);
-		splay_delete(control_socket_tree, event);
-		close(fd);
-	}
+static void handle_control_error(struct bufferevent *event, short what, void *data) {
+	if(what & EVBUFFER_EOF)
+		logger(LOG_DEBUG, _("Control socket connection closed by peer"));
+	else
+		logger(LOG_DEBUG, _("Error while reading from control socket: %s"), strerror(errno));
+
+	close(event->ev_read.ev_fd);
+	splay_delete(control_socket_tree, event);
 }
 
 static void handle_new_control_socket(int fd, short events, void *data) {
 	int newfd;
-	struct event *ev;
+	struct bufferevent *ev;
 
 	newfd = accept(fd, NULL, NULL);
 
@@ -58,9 +70,14 @@ static void handle_new_control_socket(int fd, short events, void *data) {
 		return;
 	}
 
-	ev = xmalloc(sizeof *ev);
-	event_set(ev, newfd, EV_READ | EV_PERSIST, handle_control_data, ev);
-	event_add(ev, NULL);
+	ev = bufferevent_new(newfd, handle_control_data, NULL, handle_control_error, NULL);
+	if(!ev) {
+		logger(LOG_ERR, _("Could not create bufferevent for new control connection: %s"), strerror(errno));
+		close(newfd);
+		return;
+	}
+
+	bufferevent_enable(ev, EV_READ);
 	splay_insert(control_socket_tree, ev);
 
 	logger(LOG_DEBUG, _("Control socket connection accepted"));
@@ -70,47 +87,67 @@ static int control_compare(const struct event *a, const struct event *b) {
 	return a < b ? -1 : a > b ? 1 : 0;
 }
 
-void init_control() {
+bool init_control() {
+	int result;
 	struct sockaddr_un addr;
 
-	control_socket_tree = splay_alloc_tree((splay_compare_t)control_compare, (splay_action_t)free);
-
-	if(strlen(controlfilename) >= sizeof addr.sun_path) {
+	if(strlen(controlsocketname) >= sizeof addr.sun_path) {
 		logger(LOG_ERR, _("Control socket filename too long!"));
-		return;
+		return false;
 	}
 
 	memset(&addr, 0, sizeof addr);
 	addr.sun_family = AF_UNIX;
-	strncpy(addr.sun_path, controlfilename, sizeof addr.sun_path - 1);
+	strncpy(addr.sun_path, controlsocketname, sizeof addr.sun_path - 1);
 
 	control_socket = socket(PF_UNIX, SOCK_STREAM, 0);
 
 	if(control_socket < 0) {
 		logger(LOG_ERR, _("Creating UNIX socket failed: %s"), strerror(errno));
-		return;
+		return false;
+	}
+
+	//unlink(controlsocketname);
+	result = bind(control_socket, (struct sockaddr *)&addr, sizeof addr);
+	
+	if(result < 0 && errno == EADDRINUSE) {
+		result = connect(control_socket, (struct sockaddr *)&addr, sizeof addr);
+		if(result < 0) {
+			logger(LOG_WARNING, _("Removing old control socket."));
+			unlink(controlsocketname);
+			result = bind(control_socket, (struct sockaddr *)&addr, sizeof addr);
+		} else {
+			close(control_socket);
+			if(netname)
+				logger(LOG_ERR, _("Another tincd is already running for net `%s'."), netname);
+			else
+				logger(LOG_ERR, _("Another tincd is already running."));
+			return false;
+		}
 	}
 
-	unlink(controlfilename);
-	if(bind(control_socket, (struct sockaddr *)&addr, sizeof addr) < 0) {
-		logger(LOG_ERR, _("Can't bind to %s: %s\n"), controlfilename, strerror(errno));
+	if(result < 0) {
+		logger(LOG_ERR, _("Can't bind to %s: %s\n"), controlsocketname, strerror(errno));
 		close(control_socket);
-		return;
+		return false;
 	}
 
 	if(listen(control_socket, 3) < 0) {
-		logger(LOG_ERR, _("Can't listen on %s: %s\n"), controlfilename, strerror(errno));
+		logger(LOG_ERR, _("Can't listen on %s: %s\n"), controlsocketname, strerror(errno));
 		close(control_socket);
-		return;
+		return false;
 	}
 
+	control_socket_tree = splay_alloc_tree((splay_compare_t)control_compare, (splay_action_t)bufferevent_free);
+
 	event_set(&control_event, control_socket, EV_READ | EV_PERSIST, handle_new_control_socket, NULL);
 	event_add(&control_event, NULL);
+
+	return true;
 }
 
 void exit_control() {
-	if(control_socket >= 0) {
-		event_del(&control_event);
-		close(control_socket);
-	}
+	event_del(&control_event);
+	close(control_socket);
+	unlink(controlsocketname);
 }