X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Finclude%2Fgnunet_strings_lib.h;h=897f9f16171ca013a01e7b523c3877dbde8c37f8;hb=a67bd3630046d3a52195a13cbd4b4631c283d68d;hp=7927ade30a61ac53bf9b9e36add49ea249a42440;hpb=8657dfcfcf8d1c4c9861e414a793d9759dd5c4c0;p=oweals%2Fgnunet.git diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h index 7927ade30..897f9f161 100644 --- a/src/include/gnunet_strings_lib.h +++ b/src/include/gnunet_strings_lib.h @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2012 Christian Grothoff (and other contributing authors) + Copyright (C) 2001-2013 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,20 +14,23 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** - * @file include/gnunet_strings_lib.h - * @brief strings and string handling functions (including malloc - * and string tokenizing) - * * @author Christian Grothoff * @author Krista Bennett * @author Gerd Knorr * @author Ioana Patrascu * @author Tzvetan Horozov + * + * @file + * Strings and string handling functions + * + * @defgroup strings Strings library + * Strings and string handling functions, including malloc and string tokenizing. + * @{ */ #ifndef GNUNET_STRINGS_LIB_H @@ -108,7 +111,7 @@ GNUNET_STRINGS_byte_size_fancy (unsigned long long size); * @param input input string * @param len number of bytes in @a input * @param input_charset character set used for @a input - * @param ouptut_charset desired character set for the return value + * @param output_charset desired character set for the return value * @return the converted string (0-terminated), * if conversion fails, a copy of the orignal * string is returned. @@ -153,27 +156,27 @@ GNUNET_STRINGS_from_utf8 (const char *input, /** - * Convert the utf-8 input string to lowercase - * Output needs to be allocated appropriately + * Convert the utf-8 input string to lower case. + * Output needs to be allocated appropriately. * * @param input input string * @param output output buffer */ void -GNUNET_STRINGS_utf8_tolower (const char* input, - char** output); +GNUNET_STRINGS_utf8_tolower (const char *input, + char *output); /** - * Convert the utf-8 input string to lowercase - * Output needs to be allocated appropriately + * Convert the utf-8 input string to upper case. + * Output needs to be allocated appropriately. * * @param input input string * @param output output buffer */ void -GNUNET_STRINGS_utf8_toupper (const char* input, - char** output); +GNUNET_STRINGS_utf8_toupper (const char *input, + char *output); /** @@ -219,7 +222,7 @@ GNUNET_STRINGS_buffer_fill (char *buffer, * in the buffer and assign the count (varargs) of type "const char**" * to the locations of the respective strings in the buffer. * - * @param buffer the buffer to parse + * @param buffer the buffer to parse FIXME: not 'const', is it? * @param size size of the @a buffer * @param count number of strings to locate * @param ... pointers to where to store the strings @@ -278,10 +281,7 @@ GNUNET_STRINGS_get_short_name (const char *filename); /** - * Convert binary data to ASCII encoding. The ASCII encoding is rather - * GNUnet specific. It was chosen such that it only uses characters - * in [0-9A-V], can be produced without complex arithmetics and uses a - * small number of characters. The GNUnet encoding uses 103 characters. + * Convert binary data to ASCII encoding using CrockfordBase32. * Does not append 0-terminator, but returns a pointer to the place where * it should be placed, if needed. * @@ -300,11 +300,26 @@ GNUNET_STRINGS_data_to_string (const void *data, /** - * Convert ASCII encoding back to data - * out_size must match exactly the size of the data before it was encoded. + * Return the base32crockford encoding of the given buffer. + * + * The returned string will be freshly allocated, and must be free'd + * with #GNUNET_free(). + * + * @param buf buffer with data + * @param size size of the buffer @a buf + * @return freshly allocated, null-terminated string + */ +char * +GNUNET_STRINGS_data_to_string_alloc (const void *buf, + size_t size); + + +/** + * Convert CrockfordBase32 encoding back to data. + * @a out_size must match exactly the size of the data before it was encoded. * * @param enc the encoding - * @param enclen number of characters in 'enc' (without 0-terminator, which can be missing) + * @param enclen number of characters in @a enc (without 0-terminator, which can be missing) * @param out location where to store the decoded data * @param out_size size of the output buffer @a out * @return #GNUNET_OK on success, #GNUNET_SYSERR if result has the wrong encoding @@ -316,17 +331,57 @@ GNUNET_STRINGS_string_to_data (const char *enc, size_t out_size); +/** + * Encode into Base64. + * + * @param data the data to encode + * @param len the length of the input + * @param output where to write the output (*output should be NULL, + * is allocated) + * @return the size of the output + */ +size_t +GNUNET_STRINGS_base64_encode (const char *data, size_t len, char **output); + + +/** + * Decode from Base64. + * + * @param data the data to encode + * @param len the length of the input + * @param[out] output where to write the output (*output should be NULL, + * is allocated) + * @return the size of the output + */ +size_t +GNUNET_STRINGS_base64_decode (const char *data, + size_t len, + char **output); + + +/** + * Convert a peer path to a human-readable string. + * + * @param pids array of PIDs to convert to a string + * @param num_pids length of the @a pids array + * @return string representing the array of @a pids + */ +char * +GNUNET_STRINGS_pp2s (const struct GNUNET_PeerIdentity *pids, + unsigned int num_pids); + + /** * Parse a path that might be an URI. * * @param path path to parse. Must be NULL-terminated. - * @param scheme_part a pointer to 'char *' where a pointer to a string that + * @param[out] scheme_part pointer to a string that * represents the URI scheme will be stored. Can be NULL. The string is * allocated by the function, and should be freed by GNUNET_free() when * it is no longer needed. * @param path_part a pointer to 'const char *' where a pointer to the path * part of the URI will be stored. Can be NULL. Points to the same block - * of memory as 'path', and thus must not be freed. Might point to '\0', + * of memory as @a path, and thus must not be freed. Might point to '\0', * if path part is zero-length. * @return #GNUNET_YES if it's an URI, #GNUNET_NO otherwise. If 'path' is not * an URI, '* scheme_part' and '*path_part' will remain unchanged @@ -392,8 +447,8 @@ enum GNUNET_STRINGS_FilenameCheck * * @param filename file to check * @param checks checks to perform - * @return GNUNET_YES if all checks pass, GNUNET_NO if at least one of them - * fails, GNUNET_SYSERR when a check can't be performed + * @return #GNUNET_YES if all checks pass, #GNUNET_NO if at least one of them + * fails, #GNUNET_SYSERR when a check can't be performed */ int GNUNET_STRINGS_check_filename (const char *filename, @@ -433,6 +488,21 @@ GNUNET_STRINGS_to_address_ipv4 (const char *zt_addr, struct sockaddr_in *r_buf); +/** + * Parse an address given as a string into a + * `struct sockaddr`. + * + * @param addr the address + * @param[out] af set to the parsed address family (i.e. AF_INET) + * @param[out] sa set to the parsed address + * @return 0 on error, otherwise number of bytes in @a sa + */ +size_t +GNUNET_STRINGS_parse_socket_addr (const char *addr, + uint8_t *af, + struct sockaddr **sa); + + /** * Tries to convert @a addr string to an IP (v4 or v6) address. * Will automatically decide whether to treat 'addr' as v4 or v6 address. @@ -469,6 +539,107 @@ GNUNET_STRINGS_get_utf8_args (int argc, char *const **u8argv); +/* ***************** IPv4/IPv6 parsing ****************** */ + +struct GNUNET_STRINGS_PortPolicy +{ + + /** + * Starting port range (0 if none given). + */ + uint16_t start_port; + + /** + * End of port range (0 if none given). + */ + uint16_t end_port; + + /** + * #GNUNET_YES if the port range should be negated + * ("!" in policy). + */ + int negate_portrange; + +}; + + +/** + * @brief IPV4 network in CIDR notation. + */ +struct GNUNET_STRINGS_IPv4NetworkPolicy +{ + /** + * IPv4 address. + */ + struct in_addr network; + + /** + * IPv4 netmask. + */ + struct in_addr netmask; + + /** + * Policy for port access. + */ + struct GNUNET_STRINGS_PortPolicy pp; + +}; + + +/** + * @brief network in CIDR notation for IPV6. + */ +struct GNUNET_STRINGS_IPv6NetworkPolicy +{ + /** + * IPv6 address. + */ + struct in6_addr network; + + /** + * IPv6 netmask. + */ + struct in6_addr netmask; + + /** + * Policy for port access. + */ + struct GNUNET_STRINGS_PortPolicy pp; + +}; + + +/** + * Parse an IPv4 network policy. The argument specifies a list of + * subnets. The format is (network[/netmask][:[!]SPORT-DPORT];)* + * (no whitespace, must be terminated with a semicolon). The network + * must be given in dotted-decimal notation. The netmask can be given + * in CIDR notation (/16) or in dotted-decimal (/255.255.0.0). + * + * @param routeListX a string specifying the IPv4 subnets + * @return the converted list, terminated with all zeros; + * NULL if the synatx is flawed + */ +struct GNUNET_STRINGS_IPv4NetworkPolicy * +GNUNET_STRINGS_parse_ipv4_policy (const char *routeListX); + + +/** + * Parse an IPv6 network policy. The argument specifies a list of + * subnets. The format is (network[/netmask[:[!]SPORT[-DPORT]]];)* + * (no whitespace, must be terminated with a semicolon). The network + * must be given in colon-hex notation. The netmask must be given in + * CIDR notation (/16) or can be omitted to specify a single host. + * Note that the netmask is mandatory if ports are specified. + * + * @param routeListX a string specifying the policy + * @return the converted list, 0-terminated, NULL if the synatx is flawed + */ +struct GNUNET_STRINGS_IPv6NetworkPolicy * +GNUNET_STRINGS_parse_ipv6_policy (const char *routeListX); + + + #if 0 /* keep Emacsens' auto-indent happy */ { #endif @@ -476,7 +647,9 @@ GNUNET_STRINGS_get_utf8_args (int argc, } #endif - /* ifndef GNUNET_UTIL_STRING_H */ #endif + +/** @} */ /* end of group */ + /* end of gnunet_util_string.h */