X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=aa3fcbb9e991652b9c77d5d1a07b438a91e4c651;hp=986660fa8f12fd11649d9bd4b3310b01837811dc;hb=c560bc7384fce57898044c77274e9701bc47acec;hpb=bb4e94595a1e57e66deacd4efc3512d947f16f19

diff --git a/net.c b/net.c
index 986660fa..aa3fcbb9 100644
--- a/net.c
+++ b/net.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -208,7 +208,7 @@ const char *stringify_port(int port, const char *transport)
 		struct servent *se = getservbyport(htons(port), transport);
 
 		if (se == NULL)
-			snprintf(service, sizeof(service), "%u", port);
+			snprintf(service, sizeof(service), "%d", port);
 		else
 			snprintf(service, sizeof(service), "%s", se->s_name);
 	}
@@ -963,16 +963,18 @@ int recv_cred_buffer(int fd, char *buf, size_t size)
 	return recv_buffer(fd, buf, size) > 0? 1 : -E_RECVMSG;
 }
 #else /* HAVE_UCRED */
+
 /**
- * Send \p NULL-terminated buffer and Unix credentials of the current process.
+ * Send a buffer and the credentials of the current process to a socket.
  *
- * \param sock The socket file descriptor.
- * \param buf The buffer to be sent.
+ * \param sock The file descriptor of the sending socket.
+ * \param buf The zero-terminated buffer to send.
  *
- * \return On success, this call returns the number of characters sent.  On
- * error, \p -E_SENDMSG is returned.
+ * \return On success, this call returns the number of bytes sent. On errors,
+ * \p -E_SENDMSG is returned.
  *
- * \sa sendmsg(2), okir's Black Hats Manual.
+ * \sa \ref recv_cred_buffer, sendmsg(2), socket(7), unix(7), okir's Black Hats
+ * Manual.
  */
 ssize_t send_cred_buffer(int sock, char *buf)
 {
@@ -985,7 +987,7 @@ ssize_t send_cred_buffer(int sock, char *buf)
 
 	/* Response data */
 	iov.iov_base = buf;
-	iov.iov_len  = strlen(buf);
+	iov.iov_len = strlen(buf);
 	c.pid = getpid();
 	c.uid = getuid();
 	c.gid = getgid();
@@ -1003,7 +1005,7 @@ ssize_t send_cred_buffer(int sock, char *buf)
 	*(struct ucred *)CMSG_DATA(cmsg) = c;
 	msg.msg_controllen = cmsg->cmsg_len;
 	ret = sendmsg(sock, &msg, 0);
-	if (ret  < 0)
+	if (ret < 0)
 		ret = -E_SENDMSG;
 	return ret;
 }
@@ -1019,13 +1021,13 @@ static void dispose_fds(int *fds, unsigned num)
 /**
  * Receive a buffer and the Unix credentials of the sending process.
  *
- * \param fd the socket file descriptor.
- * \param buf the buffer to store the message.
- * \param size the size of \a buffer.
+ * \param fd The file descriptor of the receiving socket.
+ * \param buf The buffer to store the received message.
+ * \param size The length of \a buf in bytes.
  *
- * \return negative on errors, the user id on success.
+ * \return Negative on errors, the user id of the sending process on success.
  *
- * \sa recvmsg(2), okir's Black Hats Manual.
+ * \sa \ref send_cred_buffer and the references given there.
  */
 int recv_cred_buffer(int fd, char *buf, size_t size)
 {
@@ -1058,7 +1060,7 @@ int recv_cred_buffer(int fd, char *buf, size_t size)
 		} else
 			if (cmsg->cmsg_level == SOL_SOCKET
 					&& cmsg->cmsg_type == SCM_RIGHTS) {
-				dispose_fds((int *) CMSG_DATA(cmsg),
+				dispose_fds((int *)CMSG_DATA(cmsg),
 					(cmsg->cmsg_len - CMSG_LEN(0))
 					/ sizeof(int));
 			}