X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=7a987444114abf7890251bb10da7e82507b87b64;hp=8a190ddaa05100190761a7eecd918d78a546bb4d;hb=0c4bb93fbfc543cf2c5ff2acb6a7f7a824163b57;hpb=093dda1824631372587d107d64601389027c6187

diff --git a/net.c b/net.c
index 8a190dda..7a987444 100644
--- a/net.c
+++ b/net.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -48,7 +48,7 @@
  * \param netmask Value of the netmask part in \a cidr or the
  *		  default of 32 if not specified.
  *
- * \return Pointer to \a addr if succesful, NULL on error.
+ * \return Pointer to \a addr if successful, NULL on error.
  * \sa RFC 4632
  */
 char *parse_cidr(const char *cidr,
@@ -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);
 	}
@@ -601,7 +601,7 @@ static inline int estimated_header_overhead(const int af_type)
  *
  * \param sockfd The socket file descriptor.
  *
- * The socket must be connected. See RFC 1122, 3.3.3. If the protocol familiy
+ * The socket must be connected. See RFC 1122, 3.3.3. If the protocol family
  * could not be determined, \p AF_INET is assumed.
  *
  * \return The maximum message size of the address family type.
@@ -664,29 +664,12 @@ static char *__get_sock_name(int fd, typeof(getsockname) getname)
 }
 
 /**
- * Look up the local side of a connected socket structure.
+ * Look up the remote side of a connected socket structure.
  *
  * \param sockfd The file descriptor of the socket.
  *
  * \return A pointer to a static buffer containing hostname an port. This
  * buffer must not be freed by the caller.
- *
- * \sa remote_name().
- */
-char *local_name(int sockfd)
-{
-	return __get_sock_name(sockfd, getsockname);
-}
-
-/**
- * Look up the remote side of a connected socket structure.
- *
- * \param sockfd The file descriptor of the socket.
- *
- * \return Analogous to the return value of \ref local_name() but for the
- * remote side.
- *
- * \sa local_name().
  */
 char *remote_name(int sockfd)
 {
@@ -880,8 +863,7 @@ static int init_unix_addr(struct sockaddr_un *u, const char *name)
  * Prepare, create, and bind a socket for local communication.
  *
  * \param name The socket pathname.
- * \param unix_addr Pointer to the \p AF_UNIX socket structure.
- * \param mode The desired mode of the socket.
+ * \param mode The desired permissions of the socket.
  *
  * This function creates a local socket for sequenced, reliable,
  * two-way, connection-based byte streams.
@@ -892,19 +874,19 @@ static int init_unix_addr(struct sockaddr_un *u, const char *name)
  * \sa bind(2)
  * \sa chmod(2)
  */
-int create_local_socket(const char *name, struct sockaddr_un *unix_addr,
-		mode_t mode)
+int create_local_socket(const char *name, mode_t mode)
 {
+	struct sockaddr_un unix_addr;
 	int fd, ret;
 
-	ret = init_unix_addr(unix_addr, name);
+	ret = init_unix_addr(&unix_addr, name);
 	if (ret < 0)
 		return ret;
 	ret = socket(PF_UNIX, SOCK_STREAM, 0);
 	if (ret < 0)
 		return -ERRNO_TO_PARA_ERROR(errno);
 	fd = ret;
-	ret = bind(fd, (struct sockaddr *) unix_addr, UNIX_PATH_MAX);
+	ret = bind(fd, (struct sockaddr *)&unix_addr, UNIX_PATH_MAX);
 	if (ret < 0) {
 		ret = -ERRNO_TO_PARA_ERROR(errno);
 		goto err;