X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.h;h=d42031e84b4f68c3ef79905f5c99c76b3d5ea3dc;hp=ebb3983ab7e4b09d32ca5f36a7872b397d3ebb0a;hb=74cfed2536a16ca85bc0ce97f6bf307c96ae0d3d;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623

diff --git a/net.h b/net.h
index ebb3983a..d42031e8 100644
--- a/net.h
+++ b/net.h
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * 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 */
@@ -28,20 +16,50 @@
 #define UNIX_PATH_MAX 108
 #endif
 
-struct hostent *get_host_info(char *);
-int get_socket(void);
+/** used to crypt the communication between para_server and para_client */
+typedef void crypt_function(unsigned long len,
+	const unsigned char *indata, unsigned char *outdata, void *private_data);
+
+#include <netdb.h> /* hostent */
+int get_host_info(char *host, struct hostent **ret);
+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, char *, ...);
-int recv_buffer(int, char *, ssize_t);
-int recv_bin_buffer(int, char *, ssize_t);
-int para_accept(int, void *addr, size_t size);
-int create_pf_socket(const char *, struct sockaddr_un *, int mod);
+__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_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, struct ucred *);
+int recv_cred_buffer(int, char *, size_t);
 ssize_t send_cred_buffer(int, char*);
 int recv_pattern(int fd, const char *pattern, size_t bufsize);
 int init_tcp_socket(int port);
+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 addr The address to connect.
+ * \param len The size of \a addr.
+ *
+ * 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)))