05_DCCP-Remove-Unused.diff

[paraslash.git] / net.h

diff --git a/net.h b/net.h
index 8fdaa3eebf0285dc490470186093fbe8f4529ebe..7499ce6267b5f9174e9556a23f82c7707e14dc40 100644 (file)
--- a/net.h
+++ b/net.h
@@ -16,14 +16,37 @@
 #define UNIX_PATH_MAX 108
 #endif
 
 #define UNIX_PATH_MAX 108
 #endif
 

+/** \cond Userland defines for Linux DCCP support. */
+#ifndef IPPROTO_DCCP
+#define IPPROTO_DCCP   33      /**< IANA assigned value */
+#define SOCK_DCCP      6       /**< Linux socket type   */
+#define SOL_DCCP        269    /**< Linux socket level  */
+#endif
+/** \endcond */
+
+/**
+ * Generic socket creation (passive and active sockets).
+ */
+extern int makesock(unsigned l3type, unsigned l4type, int passive,
+                   const char *host, unsigned short port_number);
+
+/**
+ * Functions to support listening sockets.
+ */
+/** How many pending connections queue of a listening server will hold. */
+#define BACKLOG        10
+extern int para_listen(unsigned l3type, unsigned l4type, unsigned short port);
+
+/** Pretty-printing of IPv4/6 socket addresses */
+extern char *host_and_port(struct sockaddr *sa, socklen_t len);
+extern char *local_name(int sockfd);
+extern char *remote_name(int sockfd);
+

 /** 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);
 
 /** 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);
 int get_stream_socket(int domain);

-void init_sockaddr(struct sockaddr_in*, int, const struct hostent*);

 int send_buffer(int, const char *);
 int send_bin_buffer(int, const char *, size_t);
 __printf_2_3 int send_va_buffer(int fd, const char *fmt, ...);
 int send_buffer(int, const char *);
 int send_bin_buffer(int, const char *, size_t);
 __printf_2_3 int send_va_buffer(int fd, const char *fmt, ...);


@@ -36,7 +59,6 @@ int init_unix_addr(struct sockaddr_un *, const char *);
 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 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);
 void enable_crypt(int fd, crypt_function *recv_f, crypt_function *send_f,
        void *private_data);
 void disable_crypt(int fd);


@@ -45,7 +67,8 @@ void disable_crypt(int fd);
  * A wrapper around connect(2).
  *
  * \param fd The file descriptor.
  * A wrapper around connect(2).
  *
  * \param fd The file descriptor.

- * \param their_addr The address to connect.
+ * \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.
  *
  *
  * This should not be called directly. Always use the PARA_CONNECT macro.
  *


@@ -53,7 +76,7 @@ void disable_crypt(int fd);
  *
  * \sa connect(2), PARA_CONNECT.
  */
  *
  * \sa connect(2), PARA_CONNECT.
  */

-_static_inline_ int _para_connect(int fd, void *addr, socklen_t len)
+static inline int _para_connect(int fd, void *addr, socklen_t len)

 {
        if (connect(fd, (struct sockaddr *)addr, len) == -1)
                return -E_CONNECT;
 {
        if (connect(fd, (struct sockaddr *)addr, len) == -1)
                return -E_CONNECT;