X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.h;h=8fdaa3eebf0285dc490470186093fbe8f4529ebe;hp=1399a24d0d5b63d9919f09196d941ed466b74de3;hb=74d8b443aba528dc65af874a81c53be26aaace9e;hpb=ae0e4594c6a0312c5b4b4c0bde86f9c12253d11b

diff --git a/net.h b/net.h
index 1399a24d..8fdaa3ee 100644
--- a/net.h
+++ b/net.h
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2006-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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file net.h exported symbols from net.c */
@@ -34,16 +22,15 @@ typedef void crypt_function(unsigned long len,
 
 #include <netdb.h> /* hostent */
 int get_host_info(char *host, struct hostent **ret);
-int get_socket(void);
+int get_stream_socket(int domain);
 void init_sockaddr(struct sockaddr_in*, int, const struct hostent*);
-int para_connect(int, struct sockaddr_in *);
 int send_buffer(int, const char *);
 int send_bin_buffer(int, const char *, size_t);
-int send_va_buffer(int, const char *, ...);
+__printf_2_3 int send_va_buffer(int fd, const char *fmt, ...);
 int recv_buffer(int fd, char *buf, size_t size);
 int recv_bin_buffer(int fd, char *buf, size_t size);
 int para_accept(int, void *addr, socklen_t size);
-int create_pf_socket(const char *name, struct sockaddr_un *unix_addr,
+int create_local_socket(const char *name, struct sockaddr_un *unix_addr,
 	mode_t mode);
 int init_unix_addr(struct sockaddr_un *, const char *);
 int recv_cred_buffer(int, char *, size_t);
@@ -54,3 +41,24 @@ void enable_crypt(int fd, crypt_function *recv_f, crypt_function *send_f,
 	void *private_data);
 void disable_crypt(int fd);
 
+/**
+ * A wrapper around connect(2).
+ *
+ * \param fd The file descriptor.
+ * \param their_addr The address to connect.
+ *
+ * This should not be called directly. Always use the PARA_CONNECT macro.
+ *
+ * \return \p -E_CONNECT on errors, 1 on success.
+ *
+ * \sa connect(2), PARA_CONNECT.
+ */
+_static_inline_ int _para_connect(int fd, void *addr, socklen_t len)
+{
+	if (connect(fd, (struct sockaddr *)addr, len) == -1)
+		return -E_CONNECT;
+	return 1;
+}
+
+/** A macro for connect() which does not need a \a len parameter. */
+#define PARA_CONNECT(fd, addr) _para_connect(fd, addr, sizeof(*(addr)))