X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod_command.c;h=6e2f8ee9e4aaf446267270e3be2398a4ee6d7c96;hb=9055c71be97f1095dcdbd83da305b600f204f763;hp=40f918569f389239b72d96b4968edde2b915334e;hpb=27879fbdef3653aa7ba66eda97dc7cd731f2ce26;p=paraslash.git

diff --git a/audiod_command.c b/audiod_command.c
index 40f91856..6e2f8ee9 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -114,7 +114,7 @@ static int stat_client_add(int fd, uint64_t mask, int parser_friendly)
 	ret = dup(fd);
 	if (ret < 0)
 		return -ERRNO_TO_PARA_ERROR(errno);
-	new_client = para_calloc(sizeof(*new_client));
+	new_client = zalloc(sizeof(*new_client));
 	new_client->fd = ret;
 	PARA_INFO_LOG("adding client on fd %d\n", new_client->fd);
 	new_client->item_mask = mask;
@@ -396,10 +396,9 @@ EXPORT_AUDIOD_CMD_HANDLER(version)
  * Handle arriving connections on the local socket.
  *
  * \param accept_fd The fd to accept connections on.
- * \param rfds If \a accept_fd is not set in \a rfds, do nothing.
  *
- * This is called in each iteration of the select loop. If there is an incoming
- * connection on \a accept_fd, this function reads the command sent by the peer,
+ * This is called in each iteration of the main loop of the scheduler. If there
+ * is an incoming connection, the function reads the command sent by the peer,
  * checks the connecting user's permissions by using unix socket credentials
  * (if supported by the OS) and calls the corresponding command handler if
  * permissions are OK.
@@ -408,8 +407,8 @@ EXPORT_AUDIOD_CMD_HANDLER(version)
  * connection to accept.
  *
  * \sa \ref para_accept(), \ref recv_cred_buffer().
- * */
-int handle_connect(int accept_fd, fd_set *rfds)
+ */
+int dispatch_local_connection(int accept_fd)
 {
 	int argc, ret, clifd;
 	char buf[MAXLINE], **argv = NULL;
@@ -420,7 +419,7 @@ int handle_connect(int accept_fd, fd_set *rfds)
 	char *errctx = NULL;
 	const struct audiod_command_info *aci;
 
-	ret = para_accept(accept_fd, rfds, &unix_addr, sizeof(struct sockaddr_un), &clifd);
+	ret = para_accept(accept_fd, &unix_addr, sizeof(struct sockaddr_un), &clifd);
 	if (ret <= 0)
 		return ret;
 	ret = recv_cred_buffer(clifd, buf, sizeof(buf) - 1);