X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.h;h=0003fa9d57d22ad4a6ce39f530ec12348008aebb;hp=457c24dc92380fca0e8af10c9e63781246c58604;hb=820ae21f7a453408dca3faa9ff1d28ca94d60009;hpb=8dab386f87d2998fd26126600ca7faf56d5a35d1

diff --git a/net.h b/net.h
index 457c24dc..0003fa9d 100644
--- a/net.h
+++ b/net.h
@@ -1,20 +1,20 @@
 /*
- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
-#include <stdbool.h>
-
 /** \file net.h exported symbols from net.c */
 
 /**
- * the buffer size of the sun_path component of struct sockaddr_un
+ * The buffer size of the sun_path component of struct sockaddr_un.
  *
- * While glibc doesn't define \p UNIX_PATH_MAX, it
- * documents it has being limited to 108 bytes.
+ * While glibc doesn't define \p UNIX_PATH_MAX, it documents it has being
+ * limited to 108 bytes. On NetBSD it is only 104 bytes though. We trust \p
+ * UNIX_PATH_MAX if it is defined and use the size of the ->sun_path member
+ * otherwise. This should be safe everywhere.
  */
 #ifndef UNIX_PATH_MAX
-#define UNIX_PATH_MAX 108
+#define UNIX_PATH_MAX (sizeof(((struct sockaddr_un *)0)->sun_path))
 #endif
 
 /* Userland defines for Linux DCCP support. */
@@ -36,6 +36,10 @@
 #define SOL_DCCP 269 /**< Linux socket level. */
 #endif
 
+#ifndef DCCP_SOCKOPT_GET_CUR_MPS
+#define DCCP_SOCKOPT_GET_CUR_MPS  5 /**< Max packet size, RFC 4340, 14. */
+#endif
+
 #ifndef DCCP_SOCKOPT_AVAILABLE_CCIDS
 #define DCCP_SOCKOPT_AVAILABLE_CCIDS 12 /**< List of supported CCIDs. */
 #endif
@@ -56,13 +60,9 @@ struct flowopts;
 
 extern struct flowopts *flowopt_new(void);
 extern void flowopt_add(struct flowopts *fo, int level, int opt,
-			char *name, const void *val, int len);
-extern void flowopt_add_bool(struct flowopts *fo, int lev, int opt,
-			     char *optname, bool on_or_off);
+		const char *name, const void *val, int len);
 /** Flowopt shortcut macros */
 #define OPT_ADD(fo, lev, opt, val, len)	flowopt_add(fo, lev, opt, #opt, val, len)
-#define OPT_ENABLE(fo, lev, opt)	flowopt_add_bool(fo, lev, opt, #opt, 1)
-#define OPT_DISABLE(fo, lev, opt)	flowopt_add_bool(fo, lev, opt, #opt, 0)
 
 /**
  * Functions to parse and validate (parts of) URLs.
@@ -114,7 +114,7 @@ static inline int para_connect_simple(unsigned l4type,
 	return makesock(l4type, 0, host, port, NULL);
 }
 
-extern struct in_addr extract_v4_addr(const struct sockaddr_storage *ss);
+void extract_v4_addr(const struct sockaddr_storage *ss, struct in_addr *ia);
 
 /**
  * Functions to support listening sockets.
@@ -132,9 +132,10 @@ static inline int para_listen_simple(unsigned l4type, uint16_t port)
 extern char *local_name(int sockfd);
 extern char *remote_name(int sockfd);
 
-int send_bin_buffer(int, const char *, size_t);
-int send_buffer(int, const char *);
-__printf_2_3 int send_va_buffer(int fd, const char *fmt, ...);
+/**
+ * Determining maximum payload (packet) size
+ */
+extern int generic_max_transport_msg_size(int sockfd);
 
 int recv_bin_buffer(int fd, char *buf, size_t size);
 int recv_buffer(int fd, char *buf, size_t size);
@@ -142,13 +143,15 @@ int recv_buffer(int fd, char *buf, size_t size);
 int para_accept(int fd, fd_set *rfds, void *addr, socklen_t size, int *new_fd);
 int create_local_socket(const char *name, struct sockaddr_un *unix_addr,
 	mode_t mode);
-int create_remote_socket(const char *name);
+int connect_local_socket(const char *name);
 int recv_cred_buffer(int, char *, size_t);
 ssize_t send_cred_buffer(int, char*);
 
 /**
  * Functions and definitions to support \p IPPROTO_DCCP
  */
-/** Hardcoded maximum number of separate CCID modules compiled into a host */
+/** Estimated worst-case length of a DCCP header including options. */
+#define DCCP_MAX_HEADER		128
+/** Hardcoded maximum number of separate CCID modules compiled into a host. */
 #define DCCP_MAX_HOST_CCIDS	20
 extern int dccp_available_ccids(uint8_t **ccid_array);