Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash/

[paraslash.git] / audiod_command.c

diff --git a/audiod_command.c b/audiod_command.c
index 5d40125122ee0035be7ae845a112afc79aa7f2f0..349480ff1f34f5a9bfebe57f26ddad6f0aef93ce 100644 (file)
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <noll@mathematik.tu-darmstadt.de>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -176,7 +176,7 @@ int com_help(int fd, int argc, char **argv)
                        "DESCRIPTION\n%s\n",
                        argv[1],
                        audiod_cmds[i].description,
-                       audiod_cmds[i].synopsis,
+                       audiod_cmds[i].usage,
                        audiod_cmds[i].help
                );
                ret = client_write(fd, buf);
@@ -406,6 +406,21 @@ static int check_perms(uid_t uid)
        return -E_UCRED_PERM;
 }
 
+/**
+ * handle arriving connections on the local socket
+ *
+ * \param accept_fd the fd to call accept() on
+ *
+ * This is called whenever para_audiod's main task detects an incoming
+ * connection by the readability of \a accept_fd. This 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.
+ *
+ * \return positive on success, negative on errors
+ *
+ * \sa para_accept(), recv_cred_buffer()
+ * */
 int handle_connect(int accept_fd)
 {
        int i, argc, ret, clifd = -1;