X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.h;h=b2bb47c9b40b43fe2eb7c8813e6ffa7364b0853e;hp=831cd3b8b72f2b3a7f90592c64f6a5f725c4b7d7;hb=ce9e297eb91a932a11f81890c800d0380b5bc9c9;hpb=a5927501e41fa3fca2975452617474e78ffecc48 diff --git a/net.h b/net.h index 831cd3b8..b2bb47c9 100644 --- a/net.h +++ b/net.h @@ -1,35 +1,56 @@ /* - * Copyright (C) 2006-2009 Andre Noll + * Copyright (C) 2006 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ -#include - /** \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 -/** \cond Userland defines for Linux DCCP support. */ +/* 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 */ -/* Per-connection CCID support (since v2.6.30-rc1) */ -#define DCCP_SOCKOPT_AVAILABLE_CCIDS 12 /* List of supported CCIDs */ -#define DCCP_SOCKOPT_CCID 13 /* Sets both TX/RX CCID */ -#define DCCP_SOCKOPT_TX_CCID 14 /* Set/get the TX CCID */ -#define DCCP_SOCKOPT_RX_CCID 15 /* Set/get the RX CCID */ +#define IPPROTO_DCCP 33 /**< IANA assigned value. */ +#endif + +#ifndef SOCK_DCCP +#define SOCK_DCCP 6 /**< Linux socket type. */ +#endif + +#ifndef DCCP_SOCKOPT_RX_CCID +/** Per-connection CCID support (set/get the RX CCID, since v2.6.30-rc1). */ +#define DCCP_SOCKOPT_RX_CCID 15 #endif -/** \endcond */ +#ifndef SOL_DCCP +#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 + +#ifndef DCCP_SOCKOPT_CCID +#define DCCP_SOCKOPT_CCID 13 /**< Sets both TX/RX CCID. */ +#endif + +#ifndef DCCP_SOCKOPT_TX_CCID +#define DCCP_SOCKOPT_TX_CCID 14 /**< Set/get the TX CCID. */ +#endif /** * Flowopts: Transport-layer independent encapsulation of socket options @@ -39,13 +60,10 @@ 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); +void flowopt_cleanup(struct flowopts *fo); /** 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. @@ -84,12 +102,17 @@ _static_inline_ bool is_valid_ipv6_address(const char *address) return inet_pton(AF_INET6, address, &test_it) != 0; } +int lookup_address(unsigned l4type, bool passive, const char *host, + int port_number, struct addrinfo **result); + /** * Generic socket creation (passive and active sockets). */ -extern int makesock(unsigned l4type, bool passive, - const char *host, uint16_t port_number, - struct flowopts *fo); +int makesock(unsigned l4type, bool passive, const char *host, + uint16_t port_number, struct flowopts *fo); + +int makesock_addrinfo(unsigned l4type, bool passive, struct addrinfo *ai, + struct flowopts *fo); static inline int para_connect_simple(unsigned l4type, const char *host, uint16_t port) @@ -97,7 +120,8 @@ 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); +bool sockaddr_equal(const struct sockaddr *sa1, const struct sockaddr *sa2); /** * Functions to support listening sockets. @@ -112,27 +136,27 @@ static inline int para_listen_simple(unsigned l4type, uint16_t port) } /** Pretty-printing of IPv4/6 socket addresses */ -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); -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 create_remote_socket(const char *name); +int para_accept(int fd, fd_set *rfds, void *addr, socklen_t size, int *new_fd); +int create_local_socket(const char *name, mode_t mode); +int connect_local_socket(const char *name); 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); /** * 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 const uint8_t *dccp_available_ccids(uint8_t *ccids, uint8_t *nccids); +extern int dccp_available_ccids(uint8_t **ccid_array);