D26168.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D26168.diff
View Options

	Index: head/sbin/ggate/ggated/ggated.c
	===================================================================
	--- head/sbin/ggate/ggated/ggated.c
	+++ head/sbin/ggate/ggated/ggated.c
	@@ -349,6 +349,16 @@
	flags = O_WRONLY;
	else
	flags = O_RDWR;
	+ if (conn->c_diskfd != -1) {
	+ if (strcmp(conn->c_path, ex->e_path) != 0) {
	+ g_gate_log(LOG_ERR, "old %s and new %s: "
	+ "Path mismatch during handshakes.",
	+ conn->c_path, ex->e_path);
	+ return (EPERM);
	+ }
	+ return (0);
	+ }
	+
	conn->c_diskfd = open(ex->e_path, flags);
	if (conn->c_diskfd == -1) {
	error = errno;
	@@ -455,7 +465,7 @@
	conn->c_token = cinit->gc_token;
	ip = htonl(((struct sockaddr_in )(void )s)->sin_addr.s_addr);
	conn->c_srcip = ip;
	- conn->c_sendfd = conn->c_recvfd = -1;
	+ conn->c_diskfd = conn->c_sendfd = conn->c_recvfd = -1;
	if ((cinit->gc_flags & GGATE_FLAG_SEND) != 0)
	conn->c_sendfd = sfd;
	else
	@@ -510,6 +520,8 @@
	LIST_REMOVE(conn, c_next);
	g_gate_log(LOG_DEBUG, "Connection removed [%s %s].",
	ip2str(conn->c_srcip), conn->c_path);
	+ if (conn->c_diskfd != -1)
	+ close(conn->c_diskfd);
	if (conn->c_sendfd != -1)
	close(conn->c_sendfd);
	if (conn->c_recvfd != -1)