X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=drm-lease-manager%2Flease-server.c;h=8820305174c73a0644047d95bc4dee51dac49def;hb=refs%2Fchanges%2F81%2F27381%2F3;hp=ac4dd01a2a2dd587ae5c172cb3a7d296da5f3d40;hpb=abb27e7774e3cd12bd3cfe3d4858bbe590e59be0;p=src%2Fdrm-lease-manager.git

diff --git a/drm-lease-manager/lease-server.c b/drm-lease-manager/lease-server.c
index ac4dd01..8820305 100644
--- a/drm-lease-manager/lease-server.c
+++ b/drm-lease-manager/lease-server.c
@@ -266,15 +266,16 @@ struct ls *ls_create(struct lease_handle **lease_handles, int count)
 		return NULL;
 	}
 
-	ls->servers = calloc(count, sizeof(struct ls_server));
-	if (!ls->servers) {
-		DEBUG_LOG("Memory allocation failed: %s\n", strerror(errno));
-		goto err;
-	}
-
 	ls->epoll_fd = epoll_create1(0);
 	if (ls->epoll_fd < 0) {
 		DEBUG_LOG("epoll_create failed: %s\n", strerror(errno));
+		free(ls);
+		return NULL;
+	}
+
+	ls->servers = calloc(count, sizeof(struct ls_server));
+	if (!ls->servers) {
+		DEBUG_LOG("Memory allocation failed: %s\n", strerror(errno));
 		goto err;
 	}
 
@@ -329,7 +330,7 @@ bool ls_get_request(struct ls *ls, struct ls_req *req)
 			request = parse_client_request(sock);
 
 		if (request < 0 && (ev.events & POLLHUP))
-			request = LS_REQ_RELEASE_LEASE;
+			request = LS_REQ_CLIENT_DISCONNECT;
 
 		struct ls_client *client = sock->client;
 		struct ls_server *server = client->serv;
@@ -346,39 +347,21 @@ bool ls_send_fd(struct ls *ls, struct ls_client *client, int fd)
 	assert(ls);
 	assert(client);
 
+	struct ls_server *serv = client->serv;
+
 	if (fd < 0)
 		return false;
 
-	char data[1];
-	struct iovec iov = {
-	    .iov_base = data,
-	    .iov_len = sizeof(data),
-	};
-
-	char ctrl_buf[CMSG_SPACE(sizeof(int))] = {0};
-
-	struct msghdr msg = {
-	    .msg_iov = &iov,
-	    .msg_iovlen = 1,
-	    .msg_controllen = sizeof(ctrl_buf),
-	    .msg_control = ctrl_buf,
-	};
-
-	struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg);
-	cmsg->cmsg_level = SOL_SOCKET;
-	cmsg->cmsg_type = SCM_RIGHTS;
-	cmsg->cmsg_len = CMSG_LEN(sizeof(int));
-	*((int *)CMSG_DATA(cmsg)) = fd;
-
-	struct ls_server *serv = client->serv;
-
-	if (sendmsg(client->socket.fd, &msg, 0) < 0) {
+	if (!send_lease_fd(client->socket.fd, fd)) {
 		DEBUG_LOG("sendmsg failed on %s: %s\n", serv->address.sun_path,
 			  strerror(errno));
 		return false;
 	}
 
-	INFO_LOG("Lease request granted on %s\n", serv->address.sun_path);
+	if (fd > 0)
+		INFO_LOG("Lease request granted on %s\n",
+			 serv->address.sun_path);
+
 	return true;
 }