From: michael Date: Fri, 26 Dec 2014 17:03:43 +0000 (+0000) Subject: - Removed inet_ntop related bloat X-Git-Tag: 1.0.0beta2~43 X-Git-Url: http://git.serene-ircd.net/?a=commitdiff_plain;h=bfa6e8af9493542e042ee38f60e8725f219f9d43;p=hopm.git - Removed inet_ntop related bloat git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/branches/1.0.x@5154 82007160-df01-0410-b94d-b575c5fd34c7 --- diff --git a/src/inet.c b/src/inet.c index 155b8c6..811dccb 100644 --- a/src/inet.c +++ b/src/inet.c @@ -62,285 +62,6 @@ along with this program; if not, write to: extern const unsigned char ToLowerTab[]; #define ToLower(c) (ToLowerTab[(unsigned char)(c)]) -/* - * From: Thomas Helvey - */ -#if 0 -static const char *IpQuadTab[] = - { - "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", "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", "52", "53", "54", "55", "56", "57", "58", "59", - "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", - "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", - "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", - "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", - "100", "101", "102", "103", "104", "105", "106", "107", "108", "109", - "110", "111", "112", "113", "114", "115", "116", "117", "118", "119", - "120", "121", "122", "123", "124", "125", "126", "127", "128", "129", - "130", "131", "132", "133", "134", "135", "136", "137", "138", "139", - "140", "141", "142", "143", "144", "145", "146", "147", "148", "149", - "150", "151", "152", "153", "154", "155", "156", "157", "158", "159", - "160", "161", "162", "163", "164", "165", "166", "167", "168", "169", - "170", "171", "172", "173", "174", "175", "176", "177", "178", "179", - "180", "181", "182", "183", "184", "185", "186", "187", "188", "189", - "190", "191", "192", "193", "194", "195", "196", "197", "198", "199", - "200", "201", "202", "203", "204", "205", "206", "207", "208", "209", - "210", "211", "212", "213", "214", "215", "216", "217", "218", "219", - "220", "221", "222", "223", "224", "225", "226", "227", "228", "229", - "230", "231", "232", "233", "234", "235", "236", "237", "238", "239", - "240", "241", "242", "243", "244", "245", "246", "247", "248", "249", - "250", "251", "252", "253", "254", "255" - }; -#endif - - -/* - * inetntoa - in_addr to string - * changed name to remove collision possibility and - * so behaviour is guaranteed to take a pointer arg. - * -avalon 23/11/92 - * inet_ntoa -- returned the dotted notation of a given - * internet number - * argv 11/90). - * inet_ntoa -- its broken on some Ultrix/Dynix too. -avalon - * - * XXX - This does not seem to be used anymore? - * -grifferz - */ - -#if 0 -static char *inetntoa(char *in) -{ - static char buf[16]; - register char *bufptr = buf; - register const unsigned char *a = (const unsigned char *) in; - register const char *n; - - n = IpQuadTab[*a++]; - while (*n) - *bufptr++ = *n++; - *bufptr++ = '.'; - n = IpQuadTab[*a++]; - while (*n) - *bufptr++ = *n++; - *bufptr++ = '.'; - n = IpQuadTab[*a++]; - while (*n) - *bufptr++ = *n++; - *bufptr++ = '.'; - n = IpQuadTab[*a]; - while (*n) - *bufptr++ = *n++; - *bufptr = '\0'; - return buf; -} -#endif - -/* - * Copyright (c) 1996-1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS - * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE - * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - */ - -/* - * WARNING: Don't even consider trying to compile this on a system where - * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. - */ - -/* - * XXX - Don't seem to be used anymore. - * -grifferz - */ -#if 0 -static const char *inet_ntop4(const unsigned char *src, char *dst, unsigned int size); -#endif -#ifdef IPV6 -static const char *inet_ntop6(const unsigned char *src, char *dst, unsigned int size); -#endif - -/* const char * - * inet_ntop4(src, dst, size) - * format an IPv4 address - * return: - * `dst' (as a const) - * notes: - * (1) uses no statics - * (2) takes a u_char* not an in_addr as input - * author: - * Paul Vixie, 1996. - * - * XXX - It seems this isn't used anywhere now? - * -grifferz - */ -#if 0 -static const char *inet_ntop4(const unsigned char *src, char *dst, unsigned int size) -{ - if (size < 15) - return NULL; - return strcpy(dst, inetntoa((char *) src)); -} -#endif - -/* const char * - * inet_ntop6(src, dst, size) - * convert IPv6 binary address into presentation (printable) format - * author: - * Paul Vixie, 1996. - */ -#ifdef IPV6 -static const char *inet_ntop6(const unsigned char *src, char *dst, unsigned int size) -{ - /* - * Note that int32_t and int16_t need only be "at least" large enough - * to contain a value of the specified size. On some systems, like - * Crays, there is no such thing as an integer variable with 16 bits. - * Keep this in mind if you think this function should have been coded - * to use pointer overlays. All the world's not a VAX. - */ - char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; - struct - { - int base, len; - } - best, cur; - u_int words[IN6ADDRSZ / INT16SZ]; - int i; - - /* - * Preprocess: - * Copy the input (bytewise) array into a wordwise array. - * Find the longest run of 0x00's in src[] for :: shorthanding. - */ - memset(words, '\0', sizeof words); - for (i = 0; i < IN6ADDRSZ; i += 2) - words[i / 2] = (src[i] << 8) | src[i + 1]; - best.base = -1; - cur.base = -1; - for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) - { - if (words[i] == 0) - { - if (cur.base == -1) - cur.base = i, cur.len = 1; - else - cur.len++; - } - else - { - if (cur.base != -1) - { - if (best.base == -1 || cur.len > best.len) - best = cur; - cur.base = -1; - } - } - } - if (cur.base != -1) - { - if (best.base == -1 || cur.len > best.len) - best = cur; - } - if (best.base != -1 && best.len < 2) - best.base = -1; - - /* - * Format the result. - */ - tp = tmp; - for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) - { - /* Are we inside the best run of 0x00's? */ - if (best.base != -1 && i >= best.base && i < (best.base + best.len)) - { - if (i == best.base) - *tp++ = ':'; - continue; - } - /* Are we following an initial run of 0x00s or any real hex? */ - if (i != 0) - *tp++ = ':'; - /* Is this address an encapsulated IPv4? */ - if (i == 6 && best.base == 0 && (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) - { - if (!inet_ntop4(src + 12, tp, sizeof tmp - (tp - tmp))) - return (NULL); - tp += strlen(tp); - break; - } - tp += sprintf(tp, "%x", words[i]); - } - /* Was it a trailing run of 0x00's? */ - if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ)) - *tp++ = ':'; - - *tp++ = '\0'; - - /* - * Check for overflow, copy, and we're done. - */ - - if ((tp - tmp) > size) - { - return (NULL); - } - return strcpy(dst, tmp); -} -#endif - -#if 0 -/* - * This code does not seem to be used anywhere currently? - * -grifferz - */ - -/* char * - * inetntop(af, src, dst, size) - * convert a network format address to presentation format. - * return: - * pointer to presentation format address (`dst'), or NULL (see errno). - * author: - * Paul Vixie, 1996. - */ -const char *inetntop(int af, const void *src, char *dst, unsigned int size) -{ - switch (af) - { - case AF_INET: - return (inet_ntop4(src, dst, size)); -#ifdef IPV6 - - case AF_INET6: - if (IN6_IS_ADDR_V4MAPPED((const struct in6_addr *) src) || - IN6_IS_ADDR_V4COMPAT((const struct in6_addr *) src)) - return (inet_ntop4 - ((unsigned char *) &((struct in6_addr *) src)->s6_addr[12], dst, size)); - else - return (inet_ntop6(src, dst, size)); - -#endif - - default: - return (NULL); - } - /* NOTREACHED */ -} -#endif - /* * WARNING: Don't even consider trying to compile this on a system where * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. diff --git a/src/inet.h b/src/inet.h index 7cf3dc2..74429c8 100644 --- a/src/inet.h +++ b/src/inet.h @@ -13,6 +13,4 @@ #ifndef HAVE_INET_PTON extern int bopm_inet_pton(int, const char *, void *); #endif -extern char *inetntop(int, const void *, char *, unsigned int); - #endif /* INET_H */ diff --git a/src/libopm/src/inet.c b/src/libopm/src/inet.c index 67611a1..f32ce07 100644 --- a/src/libopm/src/inet.c +++ b/src/libopm/src/inet.c @@ -70,270 +70,6 @@ along with this program; if not, write to extern const unsigned char ToLowerTab[]; #define ToLower(c) (ToLowerTab[(unsigned char)(c)]) -/* - * From: Thomas Helvey - */ -#if 0 -static const char *IpQuadTab[] = { - "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", "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", "52", "53", "54", "55", "56", "57", "58", "59", - "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", - "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", - "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", - "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", - "100", "101", "102", "103", "104", "105", "106", "107", "108", "109", - "110", "111", "112", "113", "114", "115", "116", "117", "118", "119", - "120", "121", "122", "123", "124", "125", "126", "127", "128", "129", - "130", "131", "132", "133", "134", "135", "136", "137", "138", "139", - "140", "141", "142", "143", "144", "145", "146", "147", "148", "149", - "150", "151", "152", "153", "154", "155", "156", "157", "158", "159", - "160", "161", "162", "163", "164", "165", "166", "167", "168", "169", - "170", "171", "172", "173", "174", "175", "176", "177", "178", "179", - "180", "181", "182", "183", "184", "185", "186", "187", "188", "189", - "190", "191", "192", "193", "194", "195", "196", "197", "198", "199", - "200", "201", "202", "203", "204", "205", "206", "207", "208", "209", - "210", "211", "212", "213", "214", "215", "216", "217", "218", "219", - "220", "221", "222", "223", "224", "225", "226", "227", "228", "229", - "230", "231", "232", "233", "234", "235", "236", "237", "238", "239", - "240", "241", "242", "243", "244", "245", "246", "247", "248", "249", - "250", "251", "252", "253", "254", "255" -}; -#endif - -/* - * inetntoa - in_addr to string - * changed name to remove collision possibility and - * so behaviour is guaranteed to take a pointer arg. - * -avalon 23/11/92 - * inet_ntoa -- returned the dotted notation of a given - * internet number - * argv 11/90). - * inet_ntoa -- its broken on some Ultrix/Dynix too. -avalon - * - * XXX - Again not used anywhere? - * -grifferz - */ - -#if 0 -static char *inetntoa(char *in) -{ - static char buf[16]; - register char *bufptr = buf; - register const unsigned char *a = (const unsigned char *) in; - register const char *n; - - n = IpQuadTab[*a++]; - while (*n) - *bufptr++ = *n++; - *bufptr++ = '.'; - n = IpQuadTab[*a++]; - while (*n) - *bufptr++ = *n++; - *bufptr++ = '.'; - n = IpQuadTab[*a++]; - while (*n) - *bufptr++ = *n++; - *bufptr++ = '.'; - n = IpQuadTab[*a]; - while (*n) - *bufptr++ = *n++; - *bufptr = '\0'; - return buf; -} -#endif - -/* - * Copyright (c) 1996-1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS - * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE - * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - */ - -/* - * WARNING: Don't even consider trying to compile this on a system where - * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. - */ - -/* - * XXX - this does not seem to be used anywhere currently. - * -grifferz - */ -#if 0 -static const char *inet_ntop4(const u_char *src, char *dst, unsigned int size); -#endif - -#ifdef IPV6 -static const char *inet_ntop6(const u_char *src, char *dst, unsigned int size); -#endif - -/* const char * - * inet_ntop4(src, dst, size) - * format an IPv4 address - * return: - * `dst' (as a const) - * notes: - * (1) uses no statics - * (2) takes a u_char* not an in_addr as input - * author: - * Paul Vixie, 1996. - * - * XXX - this does not seem to be used anywhere currently. - * -grifferz - */ -#if 0 -static const char *inet_ntop4(const unsigned char *src, char *dst, unsigned int size) -{ - if (size < 15) - return NULL; - return strcpy(dst, inetntoa((char *) src)); -} -#endif - -/* const char * - * inet_ntop6(src, dst, size) - * convert IPv6 binary address into presentation (printable) format - * author: - * Paul Vixie, 1996. - */ -#ifdef IPV6 -static const char *inet_ntop6(const unsigned char *src, char *dst, unsigned int size) -{ - /* - * Note that int32_t and int16_t need only be "at least" large enough - * to contain a value of the specified size. On some systems, like - * Crays, there is no such thing as an integer variable with 16 bits. - * Keep this in mind if you think this function should have been coded - * to use pointer overlays. All the world's not a VAX. - */ - char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; - struct { - int base, len; - } best, cur; - u_int words[IN6ADDRSZ / INT16SZ]; - int i; - - /* - * Preprocess: - * Copy the input (bytewise) array into a wordwise array. - * Find the longest run of 0x00's in src[] for :: shorthanding. - */ - memset(words, '\0', sizeof words); - for (i = 0; i < IN6ADDRSZ; i += 2) - words[i / 2] = (src[i] << 8) | src[i + 1]; - best.base = -1; - cur.base = -1; - for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { - if (words[i] == 0) { - if (cur.base == -1) - cur.base = i, cur.len = 1; - else - cur.len++; - } else { - if (cur.base != -1) { - if (best.base == -1 || cur.len > best.len) - best = cur; - cur.base = -1; - } - } - } - if (cur.base != -1) { - if (best.base == -1 || cur.len > best.len) - best = cur; - } - if (best.base != -1 && best.len < 2) - best.base = -1; - - /* - * Format the result. - */ - tp = tmp; - for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { - /* Are we inside the best run of 0x00's? */ - if (best.base != -1 && i >= best.base && i < (best.base + best.len)) { - if (i == best.base) - *tp++ = ':'; - continue; - } - /* Are we following an initial run of 0x00s or any real hex? */ - if (i != 0) - *tp++ = ':'; - /* Is this address an encapsulated IPv4? */ - if (i == 6 && best.base == 0 && (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) { - if (!inet_ntop4(src + 12, tp, sizeof tmp - (tp - tmp))) - return (NULL); - tp += strlen(tp); - break; - } - tp += sprintf(tp, "%x", words[i]); - } - /* Was it a trailing run of 0x00's? */ - if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ)) - *tp++ = ':'; - - *tp++ = '\0'; - - /* - * Check for overflow, copy, and we're done. - */ - - if ((tp - tmp) > size) { - return (NULL); - } - return strcpy(dst, tmp); -} -#endif - -#if 0 - -/* - * This code doesn't seem to be used anywhere currently? - * -grifferz - */ - -/* char * - * inetntop(af, src, dst, size) - * convert a network format address to presentation format. - * return: - * pointer to presentation format address (`dst'), or NULL (see errno). - * author: - * Paul Vixie, 1996. - */ -const char *inetntop(int af, const void *src, char *dst, unsigned int size) -{ - switch (af) { - case AF_INET: - return (inet_ntop4(src, dst, size)); -#ifdef IPV6 - case AF_INET6: - if (IN6_IS_ADDR_V4MAPPED((const struct in6_addr *) src) || - IN6_IS_ADDR_V4COMPAT((const struct in6_addr *) src)) - return (inet_ntop4 - ((unsigned char *) &((struct in6_addr *) src)->s6_addr[12], dst, size)); - else - return (inet_ntop6(src, dst, size)); - -#endif - default: - return (NULL); - } - /* NOTREACHED */ -} -#endif - /* * WARNING: Don't even consider trying to compile this on a system where * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. diff --git a/src/libopm/src/inet.h b/src/libopm/src/inet.h index 89a9b60..59ab856 100644 --- a/src/libopm/src/inet.h +++ b/src/libopm/src/inet.h @@ -33,5 +33,4 @@ struct _opm_inaddr { #ifndef HAVE_INET_PTON extern int inet_pton(int, const char *, void *); #endif -extern const char *inetntop(int, const void *, char *, unsigned int); #endif /* INET_H */