X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Futils.c;h=0f7b00cc7949807aa1ce4d2a39577049c3e4dc6e;hb=43ed5b9a5d739c50317d5d24898de07526a9297f;hp=cf46221280cd42113a265e2e17dcad2abf5bf61b;hpb=40c28589328a2aa96c2ce1419c5d90616c758b3d;p=meshlink diff --git a/src/utils.c b/src/utils.c index cf462212..0f7b00cc 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,7 +1,6 @@ /* utils.c -- gathering of some stupid small functions - Copyright (C) 1999-2005 Ivo Timmermans - 2000-2009 Guus Sliepen + Copyright (C) 2014 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,7 +23,26 @@ #include "utils.h" static const char hexadecimals[] = "0123456789ABCDEF"; -static const char base64imals[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +static const char base64_original[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +static const char base64_urlsafe[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; +static const char base64_decode[256] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, 62, -1, 63, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, 63, + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +}; static int charhex2bin(char c) { if(isdigit(c)) @@ -33,29 +51,17 @@ static int charhex2bin(char c) { return toupper(c) - 'A' + 10; } -static int charb64decode(char c) { - if(c >= 'a') - return c - 'a' + 26; - else if(c >= 'A') - return c - 'A'; - else if(c >= '0') - return c - '0' + 52; - else if(c == '+') - return 62; - else - return 63; -} - -int hex2bin(const char *src, char *dst, int length) { +int hex2bin(const char *src, void *vdst, int length) { + uint8_t *dst = vdst; int i; - for(i = 0; i < length && src[i * 2] && src[i * 2 + 1]; i++) + for(i = 0; i < length && isxdigit(src[i * 2]) && isxdigit(src[i * 2 + 1]); i++) dst[i] = charhex2bin(src[i * 2]) * 16 + charhex2bin(src[i * 2 + 1]); return i; } -int bin2hex(const char *src, char *dst, int length) { - int i; - for(i = length - 1; i >= 0; i--) { +int bin2hex(const void *vsrc, char *dst, int length) { + const uint8_t *src = vsrc; + for(int i = length - 1; i >= 0; i--) { dst[i * 2 + 1] = hexadecimals[(unsigned char) src[i] & 15]; dst[i * 2] = hexadecimals[(unsigned char) src[i] >> 4]; } @@ -63,14 +69,16 @@ int bin2hex(const char *src, char *dst, int length) { return length * 2; } -int b64decode(const char *src, char *dst, int length) { +int b64decode(const char *src, void *dst, int length) { int i; uint32_t triplet = 0; - unsigned char *udst = (unsigned char *)dst; + unsigned char *udst = dst; for(i = 0; i < length / 3 * 4 && src[i]; i++) { - triplet |= charb64decode(src[i]) << (6 * (i & 3)); + triplet |= base64_decode[src[i] & 0xff] << (6 * (i & 3)); if((i & 3) == 3) { + if(triplet & 0xff000000U) + return 0; udst[0] = triplet & 0xff; triplet >>= 8; udst[1] = triplet & 0xff; triplet >>= 8; udst[2] = triplet; @@ -78,6 +86,8 @@ int b64decode(const char *src, char *dst, int length) { udst += 3; } } + if(triplet & 0xff000000U) + return 0; if((i & 3) == 3) { udst[0] = triplet & 0xff; triplet >>= 8; udst[1] = triplet & 0xff; @@ -90,25 +100,25 @@ int b64decode(const char *src, char *dst, int length) { } } -int b64encode(const char *src, char *dst, int length) { +static int b64encode_internal(const void *src, char *dst, int length, const char *alphabet) { uint32_t triplet; - const unsigned char *usrc = (unsigned char *)src; + const unsigned char *usrc = src; int si = length / 3 * 3; int di = length / 3 * 4; switch(length % 3) { - case 2: + case 2: triplet = usrc[si] | usrc[si + 1] << 8; - dst[di] = base64imals[triplet & 63]; triplet >>= 6; - dst[di + 1] = base64imals[triplet & 63]; triplet >>= 6; - dst[di + 2] = base64imals[triplet]; + dst[di] = alphabet[triplet & 63]; triplet >>= 6; + dst[di + 1] = alphabet[triplet & 63]; triplet >>= 6; + dst[di + 2] = alphabet[triplet]; dst[di + 3] = 0; length = di + 2; break; case 1: triplet = usrc[si]; - dst[di] = base64imals[triplet & 63]; triplet >>= 6; - dst[di + 1] = base64imals[triplet]; + dst[di] = alphabet[triplet & 63]; triplet >>= 6; + dst[di + 1] = alphabet[triplet]; dst[di + 2] = 0; length = di + 1; break; @@ -122,30 +132,40 @@ int b64encode(const char *src, char *dst, int length) { di -= 4; si -= 3; triplet = usrc[si] | usrc[si + 1] << 8 | usrc[si + 2] << 16; - dst[di] = base64imals[triplet & 63]; triplet >>= 6; - dst[di + 1] = base64imals[triplet & 63]; triplet >>= 6; - dst[di + 2] = base64imals[triplet & 63]; triplet >>= 6; - dst[di + 3] = base64imals[triplet]; + dst[di] = alphabet[triplet & 63]; triplet >>= 6; + dst[di + 1] = alphabet[triplet & 63]; triplet >>= 6; + dst[di + 2] = alphabet[triplet & 63]; triplet >>= 6; + dst[di + 3] = alphabet[triplet]; } return length; } +int b64encode(const void *src, char *dst, int length) { + return b64encode_internal(src, dst, length, base64_original); +} + +int b64encode_urlsafe(const void *src, char *dst, int length) { + return b64encode_internal(src, dst, length, base64_urlsafe); +} + #if defined(HAVE_MINGW) || defined(HAVE_CYGWIN) #ifdef HAVE_CYGWIN #include #endif const char *winerror(int err) { - static char buf[1024], *newline; + static char buf[1024], *ptr; + + ptr = buf + sprintf(buf, "(%d) ", err); if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, sizeof(buf), NULL)) { + NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), ptr, sizeof(buf) - (ptr - buf), NULL)) { strncpy(buf, "(unable to format errormessage)", sizeof(buf)); }; - if((newline = strchr(buf, '\r'))) - *newline = '\0'; + if((ptr = strchr(buf, '\r'))) + *ptr = '\0'; return buf; } @@ -158,3 +178,51 @@ unsigned int bitfield_to_int(const void *bitfield, size_t size) { memcpy(&value, bitfield, size); return value; } + +/* Write IP address from sockaddr to string. + * Returns NULL on error. + */ +char *get_ip_str(const struct sockaddr *sa, char *s, size_t maxlen) +{ + switch(sa->sa_family) { + case AF_INET: + inet_ntop(AF_INET, &(((struct sockaddr_in *)sa)->sin_addr), + s, maxlen); + break; + + case AF_INET6: + inet_ntop(AF_INET6, &(((struct sockaddr_in6 *)sa)->sin6_addr), + s, maxlen); + break; + + default: + strncpy(s, "Unknown AF", maxlen); + return NULL; + } + + return s; +} + +/* Write port from sockaddr to string. + * Returns NULL on error. + */ +char *get_port_str(const struct sockaddr *sa, char *s, size_t maxlen) +{ + switch(sa->sa_family) { + case AF_INET: + snprintf(s, maxlen, "%d", + ntohs(((struct sockaddr_in*)sa)->sin_port)); + break; + + case AF_INET6: + snprintf(s, maxlen, "%d", + ntohs(((struct sockaddr_in6*)sa)->sin6_port)); + break; + + default: + strncpy(s, "Unknown AF", maxlen); + return NULL; + } + + return s; +}