X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.h;h=2256f376497b89d3382e2bf80ce09725ef64ab02;hp=bb2540ddc855224060fe51c37c48a5a4037066af;hb=HEAD;hpb=f167629b3191c57a6b691cd2a6af04a45a74ccb0 diff --git a/net.h b/net.h index bb2540dd..33acfc89 100644 --- a/net.h +++ b/net.h @@ -1,106 +1,32 @@ -/* - * Copyright (C) 2006 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2006 Andre Noll , see file COPYING. */ /** \file net.h exported symbols from net.c */ -/** - * 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. 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 (sizeof(((struct sockaddr_un *)0)->sun_path)) -#endif - /* Userland defines for Linux DCCP support. */ -#ifndef IPPROTO_DCCP -#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 - #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 +/** The maximum length of the host component in an URL. */ +#define MAX_HOSTLEN 256 -#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 - * that need to be registered prior to setting up a connection. - */ +/* Opaque, only known to net.c. */ struct flowopts; -extern struct flowopts *flowopt_new(void); -extern void flowopt_add(struct flowopts *fo, int level, int opt, +struct flowopts *flowopt_new(void); +void flowopt_add(struct flowopts *fo, int level, int opt, 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) /** * Functions to parse and validate (parts of) URLs. */ -extern char *parse_cidr(const char *cidr, - char *addr, ssize_t addrlen, int32_t *netmask); -extern char *parse_url(const char *url, - char *host, ssize_t hostlen, int32_t *port); -extern const char *stringify_port(int port, const char *transport); -/** - * Ensure that string conforms to the IPv4 address format. - * - * \param address The address string to check. - * - * \return 1 if \a address conforms to the IPv4 address format, else 0. - */ -_static_inline_ bool is_valid_ipv4_address(const char *address) -{ - struct in_addr test_it; - - return inet_pton(AF_INET, address, &test_it) != 0; -} - -/** - * Ensure that string conforms to IPv6 address format. - * - * \param address The address string to check. - * - * \return 1 if string has a valid IPv6 address syntax, 0 if not. - * \sa RFC 4291 - */ -_static_inline_ bool is_valid_ipv6_address(const char *address) -{ - struct in6_addr test_it; - - return inet_pton(AF_INET6, address, &test_it) != 0; -} +char *parse_cidr(const char *cidr, + char *addr, ssize_t addrlen, int32_t *netmask); +char *parse_url(const char *url, + char *host, ssize_t hostlen, int32_t *port); +__malloc char *format_url(const char *url, int default_port); +const char *stringify_port(int port, const char *transport); int lookup_address(unsigned l4type, bool passive, const char *host, int port_number, struct addrinfo **result); @@ -114,10 +40,9 @@ int makesock(unsigned l4type, bool passive, const char *host, 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) +static inline int para_connect(unsigned l4type, const char *host, uint16_t port) { - return makesock(l4type, 0, host, port, NULL); + return makesock(l4type, false, host, port, NULL); } void extract_v4_addr(const struct sockaddr_storage *ss, struct in_addr *ia); @@ -128,27 +53,23 @@ bool sockaddr_equal(const struct sockaddr *sa1, const struct sockaddr *sa2); */ /** How many pending connections queue of a listening server will hold. */ #define BACKLOG 10 -extern int para_listen(unsigned l4type, uint16_t port, struct flowopts *fo); -static inline int para_listen_simple(unsigned l4type, uint16_t port) -{ - return para_listen(l4type, port, NULL); -} +int para_listen(unsigned l4type, const char *addr, uint16_t port); +int para_listen_simple(unsigned l4type, uint16_t port); /** Pretty-printing of IPv4/6 socket addresses */ -extern char *remote_name(int sockfd); +char *remote_name(int sockfd); /** * Determining maximum payload (packet) size */ -extern int generic_max_transport_msg_size(int sockfd); +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 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 para_accept(int fd, void *addr, socklen_t size, int *new_fd); +int create_local_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*); @@ -156,8 +77,6 @@ ssize_t send_cred_buffer(int, char*); /** * Functions and definitions to support \p IPPROTO_DCCP */ -/** 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); +int dccp_available_ccids(uint8_t **ccid_array);