From: Alexander Nozdrin Date: April 7 2011 5:45pm Subject: bzr commit into mysql-trunk branch (alexander.nozdrin:3332) WL#5787 List-Archive: http://lists.mysql.com/commits/134972 Message-Id: <201104071745.p37HjsQf032191@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5250629951753373760==" --===============5250629951753373760== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/alik/MySQL/bzr/00/wl5787/mysql-trunk-wl5787/ based on revid:alexander.nozdrin@stripped 3332 Alexander Nozdrin 2011-04-07 Patch for WL#5787 (IPv6-capable INET_ATON and INET_NTOA functions). The patch introduces the following new functions: - INET6_ATON() - INET6_NTOA() - IS_IPV4() - IS_IPV6() - IS_IPV4_COMPAT() - IS_IPV4_MAPPED() modified: mysql-test/r/func_misc.result mysql-test/t/func_misc.test sql/item_create.cc sql/item_inetfunc.cc sql/item_inetfunc.h === modified file 'mysql-test/r/func_misc.result' --- a/mysql-test/r/func_misc.result 2010-12-17 14:02:56 +0000 +++ b/mysql-test/r/func_misc.result 2011-04-07 17:45:44 +0000 @@ -400,6 +400,483 @@ DROP TABLE t1; # # End of 5.5 tests # + +# -- +# -- WL#5787: IPv6-capable INET_ATON and INET_NTOA functions. +# -- + +# -- INET6_ATON: checking NULL, invalid types, out-of range values... + +SELECT INET6_ATON(NULL) IS NULL; +INET6_ATON(NULL) IS NULL +1 +SELECT INET6_ATON(123) IS NULL; +INET6_ATON(123) IS NULL +1 +SELECT INET6_ATON(123.45) IS NULL; +INET6_ATON(123.45) IS NULL +1 +SELECT INET6_ATON(NOW()) IS NULL; +INET6_ATON(NOW()) IS NULL +1 +SELECT INET6_ATON('1.2.3') IS NULL; +INET6_ATON('1.2.3') IS NULL +1 +SELECT INET6_ATON('1.2.3.') IS NULL; +INET6_ATON('1.2.3.') IS NULL +1 +SELECT INET6_ATON('1..3.4') IS NULL; +INET6_ATON('1..3.4') IS NULL +1 +SELECT INET6_ATON('-1.2.3.4') IS NULL; +INET6_ATON('-1.2.3.4') IS NULL +1 +SELECT INET6_ATON('1.2.3.256') IS NULL; +INET6_ATON('1.2.3.256') IS NULL +1 +SELECT INET6_ATON('1.2.3.4.5') IS NULL; +INET6_ATON('1.2.3.4.5') IS NULL +1 +SELECT INET6_ATON('0001.2.3.4') IS NULL; +INET6_ATON('0001.2.3.4') IS NULL +1 +SELECT INET6_ATON('0x1.2.3.4') IS NULL; +INET6_ATON('0x1.2.3.4') IS NULL +1 +SELECT INET6_ATON('a.2.3.4') IS NULL; +INET6_ATON('a.2.3.4') IS NULL +1 +SELECT INET6_ATON('1.2.3.4:80') IS NULL; +INET6_ATON('1.2.3.4:80') IS NULL +1 +SELECT INET6_ATON('1.2.3.4/32') IS NULL; +INET6_ATON('1.2.3.4/32') IS NULL +1 +SELECT INET6_ATON('mysql.com') IS NULL; +INET6_ATON('mysql.com') IS NULL +1 +SELECT INET6_ATON(':::') IS NULL; +INET6_ATON(':::') IS NULL +1 +SELECT INET6_ATON(':1:2:3') IS NULL; +INET6_ATON(':1:2:3') IS NULL +1 +SELECT INET6_ATON('::00001') IS NULL; +INET6_ATON('::00001') IS NULL +1 +SELECT INET6_ATON('::00001:2') IS NULL; +INET6_ATON('::00001:2') IS NULL +1 +SELECT INET6_ATON('::12345') IS NULL; +INET6_ATON('::12345') IS NULL +1 +SELECT INET6_ATON('1020::3040::5060') IS NULL; +INET6_ATON('1020::3040::5060') IS NULL +1 +SELECT INET6_ATON('::ABCZ') IS NULL; +INET6_ATON('::ABCZ') IS NULL +1 +SELECT INET6_ATON('::0x1.2.3.4') IS NULL; +INET6_ATON('::0x1.2.3.4') IS NULL +1 +SELECT INET6_ATON('::1.0x2.3.4') IS NULL; +INET6_ATON('::1.0x2.3.4') IS NULL +1 +SELECT INET6_ATON('::a.b.c.d') IS NULL; +INET6_ATON('::a.b.c.d') IS NULL +1 +SELECT INET6_ATON('::FFFF:0x1.2.3.4') IS NULL; +INET6_ATON('::FFFF:0x1.2.3.4') IS NULL +1 +SELECT INET6_ATON('::FFFF:1.0x2.3.4') IS NULL; +INET6_ATON('::FFFF:1.0x2.3.4') IS NULL +1 +SELECT INET6_ATON('::FFFF:a.b.c.d') IS NULL; +INET6_ATON('::FFFF:a.b.c.d') IS NULL +1 +SELECT INET6_ATON('::1.2.3.4:ABCD') IS NULL; +INET6_ATON('::1.2.3.4:ABCD') IS NULL +1 +# NOTE: such addresses are supported because getaddrinfo() supports them. +# This is just to record the current behaviour. +SELECT HEX(INET6_ATON('::ABCD:1.2.3.4')); +HEX(INET6_ATON('::ABCD:1.2.3.4')) +00000000000000000000ABCD01020304 + +# -- INET6_ATON: checking binary representation... + +SELECT HEX(INET6_ATON('0.0.0.0')); +HEX(INET6_ATON('0.0.0.0')) +00000000 +SELECT HEX(INET6_ATON('00.00.00.00')); +HEX(INET6_ATON('00.00.00.00')) +00000000 +SELECT HEX(INET6_ATON('000.000.000.000')); +HEX(INET6_ATON('000.000.000.000')) +00000000 +SELECT HEX(INET6_ATON('1.2.3.4')); +HEX(INET6_ATON('1.2.3.4')) +01020304 +SELECT HEX(INET6_ATON('01.02.03.04')); +HEX(INET6_ATON('01.02.03.04')) +01020304 +SELECT HEX(INET6_ATON('001.002.003.004')); +HEX(INET6_ATON('001.002.003.004')) +01020304 +SELECT HEX(INET6_ATON('255.255.255.255')); +HEX(INET6_ATON('255.255.255.255')) +FFFFFFFF +SELECT HEX(INET6_ATON('::')); +HEX(INET6_ATON('::')) +00000000000000000000000000000000 +SELECT HEX(INET6_ATON('0::0')); +HEX(INET6_ATON('0::0')) +00000000000000000000000000000000 +SELECT HEX(INET6_ATON('0::')); +HEX(INET6_ATON('0::')) +00000000000000000000000000000000 +SELECT HEX(INET6_ATON('::0')); +HEX(INET6_ATON('::0')) +00000000000000000000000000000000 +SELECT HEX(INET6_ATON('::1')); +HEX(INET6_ATON('::1')) +00000000000000000000000000000001 +SELECT HEX(INET6_ATON('0000:0000::0000:0001')); +HEX(INET6_ATON('0000:0000::0000:0001')) +00000000000000000000000000000001 +SELECT HEX(INET6_ATON('0000:0000:0000:0000:0000:0000:0000:0001')); +HEX(INET6_ATON('0000:0000:0000:0000:0000:0000:0000:0001')) +00000000000000000000000000000001 +SELECT HEX(INET6_ATON('::C0A8:0102')); +HEX(INET6_ATON('::C0A8:0102')) +000000000000000000000000C0A80102 +SELECT HEX(INET6_ATON('::c0a8:0102')); +HEX(INET6_ATON('::c0a8:0102')) +000000000000000000000000C0A80102 +SELECT HEX(INET6_ATON('::192.168.1.2')); +HEX(INET6_ATON('::192.168.1.2')) +000000000000000000000000C0A80102 +SELECT HEX(INET6_ATON('::FfFf:C0a8:0102')); +HEX(INET6_ATON('::FfFf:C0a8:0102')) +00000000000000000000FFFFC0A80102 +SELECT HEX(INET6_ATON('::ffff:c0a8:0102')); +HEX(INET6_ATON('::ffff:c0a8:0102')) +00000000000000000000FFFFC0A80102 +SELECT HEX(INET6_ATON('::ffff:192.168.1.2')); +HEX(INET6_ATON('::ffff:192.168.1.2')) +00000000000000000000FFFFC0A80102 +SELECT HEX(INET6_ATON('::01.2.3.4')); +HEX(INET6_ATON('::01.2.3.4')) +00000000000000000000000001020304 +SELECT HEX(INET6_ATON('::1.02.3.4')); +HEX(INET6_ATON('::1.02.3.4')) +00000000000000000000000001020304 +SELECT HEX(INET6_ATON('::1.2.03.4')); +HEX(INET6_ATON('::1.2.03.4')) +00000000000000000000000001020304 +SELECT HEX(INET6_ATON('::1.2.3.04')); +HEX(INET6_ATON('::1.2.3.04')) +00000000000000000000000001020304 +SELECT HEX(INET6_ATON('::1.2.3.00')); +HEX(INET6_ATON('::1.2.3.00')) +00000000000000000000000001020300 +SELECT HEX(INET6_ATON('::FFFF:01.2.3.4')); +HEX(INET6_ATON('::FFFF:01.2.3.4')) +00000000000000000000FFFF01020304 +SELECT HEX(INET6_ATON('::FFFF:1.02.3.4')); +HEX(INET6_ATON('::FFFF:1.02.3.4')) +00000000000000000000FFFF01020304 +SELECT HEX(INET6_ATON('::FFFF:1.2.03.4')); +HEX(INET6_ATON('::FFFF:1.2.03.4')) +00000000000000000000FFFF01020304 +SELECT HEX(INET6_ATON('::FFFF:1.2.3.04')); +HEX(INET6_ATON('::FFFF:1.2.3.04')) +00000000000000000000FFFF01020304 +SELECT HEX(INET6_ATON('::FFFF:1.2.3.00')); +HEX(INET6_ATON('::FFFF:1.2.3.00')) +00000000000000000000FFFF01020300 + +# -- INET6_ATON: checking the length is either 4 or 16... + +SELECT LENGTH(INET6_ATON('0.0.0.0')); +LENGTH(INET6_ATON('0.0.0.0')) +4 +SELECT LENGTH(INET6_ATON('255.255.255.255')); +LENGTH(INET6_ATON('255.255.255.255')) +4 +SELECT LENGTH(INET6_ATON('::')); +LENGTH(INET6_ATON('::')) +16 +SELECT LENGTH(INET6_ATON('1020:3040:5060:7080:90A0:B0C0:D0E0:F010')); +LENGTH(INET6_ATON('1020:3040:5060:7080:90A0:B0C0:D0E0:F010')) +16 + +# -- INET6_NTOA: checking NULL, invalid types, out-of range values... + +SELECT INET6_NTOA(NULL); +INET6_NTOA(NULL) +NULL +SELECT INET6_NTOA(123); +INET6_NTOA(123) +NULL +SELECT INET6_NTOA(123.456); +INET6_NTOA(123.456) +NULL +SELECT INET6_NTOA(NOW()); +INET6_NTOA(NOW()) +NULL +SELECT INET6_NTOA(UNHEX('C0A801')); +INET6_NTOA(UNHEX('C0A801')) +NULL +SELECT INET6_NTOA(UNHEX('C0A80102')); +INET6_NTOA(UNHEX('C0A80102')) +192.168.1.2 +SELECT INET6_NTOA(UNHEX('C0A8010203')); +INET6_NTOA(UNHEX('C0A8010203')) +NULL +SELECT INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F')); +INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F')) +NULL +SELECT INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F10')); +INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F10')) +102:304:506:708:90a:b0c:d0e:f10 +SELECT INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F1011')); +INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F1011')) +NULL +SELECT INET6_NTOA('1234'), INET6_NTOA(BINARY('1234')); +INET6_NTOA('1234') INET6_NTOA(BINARY('1234')) +NULL 49.50.51.52 +SELECT INET6_NTOA('0123456789abcdef'), INET6_NTOA(BINARY('0123456789abcdef')); +INET6_NTOA('0123456789abcdef') INET6_NTOA(BINARY('0123456789abcdef')) +NULL 3031:3233:3435:3637:3839:6162:6364:6566 + +# -- Checking double-conversion... + +SELECT INET6_NTOA(INET6_ATON('::')); +INET6_NTOA(INET6_ATON('::')) +:: +SELECT INET6_NTOA(INET6_ATON('0::0')); +INET6_NTOA(INET6_ATON('0::0')) +:: +SELECT INET6_NTOA(INET6_ATON('0::')); +INET6_NTOA(INET6_ATON('0::')) +:: +SELECT INET6_NTOA(INET6_ATON('::0')); +INET6_NTOA(INET6_ATON('::0')) +:: +SELECT INET6_NTOA(INET6_ATON('::1')); +INET6_NTOA(INET6_ATON('::1')) +::1 +SELECT INET6_NTOA(INET6_ATON('0000:0000::0000:0001')); +INET6_NTOA(INET6_ATON('0000:0000::0000:0001')) +::1 +SELECT INET6_NTOA(INET6_ATON('0000:0000:0000:0000:0000:0000:0000:0001')); +INET6_NTOA(INET6_ATON('0000:0000:0000:0000:0000:0000:0000:0001')) +::1 +SELECT INET6_NTOA(INET6_ATON('::C0A8:0102')); +INET6_NTOA(INET6_ATON('::C0A8:0102')) +::192.168.1.2 +SELECT INET6_NTOA(INET6_ATON('::c0a8:0102')); +INET6_NTOA(INET6_ATON('::c0a8:0102')) +::192.168.1.2 +SELECT INET6_NTOA(INET6_ATON('::192.168.1.2')); +INET6_NTOA(INET6_ATON('::192.168.1.2')) +::192.168.1.2 +SELECT INET6_NTOA(INET6_ATON('::FFFF:C0A8:0102')); +INET6_NTOA(INET6_ATON('::FFFF:C0A8:0102')) +::ffff:192.168.1.2 +SELECT INET6_NTOA(INET6_ATON('::ffff:c0a8:0102')); +INET6_NTOA(INET6_ATON('::ffff:c0a8:0102')) +::ffff:192.168.1.2 +SELECT INET6_NTOA(INET6_ATON('::ffff:192.168.1.2')); +INET6_NTOA(INET6_ATON('::ffff:192.168.1.2')) +::ffff:192.168.1.2 + +# -- Comparing INET_ATON() and INET6_ATON()... + +SELECT HEX(INET_ATON('192.168.1.2')); +HEX(INET_ATON('192.168.1.2')) +C0A80102 +SELECT HEX(INET6_ATON('192.168.1.2')); +HEX(INET6_ATON('192.168.1.2')) +C0A80102 +SELECT HEX(INET_ATON('255.255.255.255')); +HEX(INET_ATON('255.255.255.255')) +FFFFFFFF +SELECT HEX(INET6_ATON('255.255.255.255')); +HEX(INET6_ATON('255.255.255.255')) +FFFFFFFF +SELECT HEX(INET_ATON('192.168.08.2')); +HEX(INET_ATON('192.168.08.2')) +C0A80802 +SELECT HEX(INET6_ATON('192.168.08.2')); +HEX(INET6_ATON('192.168.08.2')) +C0A80802 +SELECT HEX(INET_ATON('192.168.0x8.2')); +HEX(INET_ATON('192.168.0x8.2')) +NULL +SELECT HEX(INET6_ATON('192.168.0x8.2')); +HEX(INET6_ATON('192.168.0x8.2')) +NULL +SELECT HEX(INET_ATON('1.2.255')); +HEX(INET_ATON('1.2.255')) +10200FF +SELECT HEX(INET6_ATON('1.2.255')); +HEX(INET6_ATON('1.2.255')) +NULL +SELECT HEX(INET_ATON('1.2.256')); +HEX(INET_ATON('1.2.256')) +NULL +SELECT HEX(INET6_ATON('1.2.256')); +HEX(INET6_ATON('1.2.256')) +NULL +SELECT HEX(INET_ATON('1.0002.3.4')); +HEX(INET_ATON('1.0002.3.4')) +1020304 +SELECT HEX(INET6_ATON('1.0002.3.4')); +HEX(INET6_ATON('1.0002.3.4')) +NULL +SELECT HEX(INET_ATON('1.2.3.4.5')); +HEX(INET_ATON('1.2.3.4.5')) +102030405 +SELECT HEX(INET6_ATON('1.2.3.4.5')); +HEX(INET6_ATON('1.2.3.4.5')) +NULL + +# -- Checking mix of INET- and INET6- functions... + +SELECT HEX(INET6_ATON(INET_NTOA(INET_ATON('1.2.3.4')))) AS x; +x +01020304 + +# -- Checking IS_IPV4() / IS_IPV6()... + +SELECT IS_IPV4(NULL); +IS_IPV4(NULL) +0 +SELECT IS_IPV4(1); +IS_IPV4(1) +0 +SELECT IS_IPV4(1.0); +IS_IPV4(1.0) +0 +SELECT IS_IPV4('1.2.3.4'); +IS_IPV4('1.2.3.4') +1 +SELECT IS_IPV4('001.02.000.255'); +IS_IPV4('001.02.000.255') +1 +SELECT IS_IPV4('::1.2.0.255'); +IS_IPV4('::1.2.0.255') +0 +SELECT IS_IPV4('::1'); +IS_IPV4('::1') +0 +SELECT IS_IPV4(BINARY('1.2.3.4')); +IS_IPV4(BINARY('1.2.3.4')) +1 +SELECT IS_IPV6(NULL); +IS_IPV6(NULL) +0 +SELECT IS_IPV6(1); +IS_IPV6(1) +0 +SELECT IS_IPV6(1.0); +IS_IPV6(1.0) +0 +SELECT IS_IPV6('1.2.3.4'); +IS_IPV6('1.2.3.4') +0 +SELECT IS_IPV6('001.02.000.255'); +IS_IPV6('001.02.000.255') +0 +SELECT IS_IPV6('::001.02.000.255'); +IS_IPV6('::001.02.000.255') +1 +SELECT IS_IPV6('::1.2.0.255'); +IS_IPV6('::1.2.0.255') +1 +SELECT IS_IPV6('::1'); +IS_IPV6('::1') +1 +SELECT IS_IPV6('0000:0000:0000:0000:0000:0000:0000:0001'); +IS_IPV6('0000:0000:0000:0000:0000:0000:0000:0001') +1 +SELECT IS_IPV6(BINARY('0000:0000:0000:0000:0000:0000:0000:0001')); +IS_IPV6(BINARY('0000:0000:0000:0000:0000:0000:0000:0001')) +1 + +# -- Checking IS_IPV4_MAPPED() and IS_IPV4_COMPAT()... + +SELECT IS_IPV4_MAPPED(INET6_ATON('1.2.3.4')), +IS_IPV4_COMPAT(INET6_ATON('1.2.3.4')); +IS_IPV4_MAPPED(INET6_ATON('1.2.3.4')) IS_IPV4_COMPAT(INET6_ATON('1.2.3.4')) +0 0 +SELECT IS_IPV4_MAPPED(INET6_ATON('::1.2.3.4')), +IS_IPV4_COMPAT(INET6_ATON('::1.2.3.4')); +IS_IPV4_MAPPED(INET6_ATON('::1.2.3.4')) IS_IPV4_COMPAT(INET6_ATON('::1.2.3.4')) +0 1 +SELECT IS_IPV4_MAPPED(INET6_ATON('::FFFF:1.2.3.4')), +IS_IPV4_COMPAT(INET6_ATON('::FFFF:1.2.3.4')); +IS_IPV4_MAPPED(INET6_ATON('::FFFF:1.2.3.4')) IS_IPV4_COMPAT(INET6_ATON('::FFFF:1.2.3.4')) +1 0 +SELECT IS_IPV4_MAPPED(INET6_ATON('::ABCD:1.2.3.4')), +IS_IPV4_COMPAT(INET6_ATON('::ABCD:1.2.3.4')); +IS_IPV4_MAPPED(INET6_ATON('::ABCD:1.2.3.4')) IS_IPV4_COMPAT(INET6_ATON('::ABCD:1.2.3.4')) +0 0 +SELECT IS_IPV4_MAPPED(INET6_ATON('::1')), +IS_IPV4_COMPAT(INET6_ATON('::1')); +IS_IPV4_MAPPED(INET6_ATON('::1')) IS_IPV4_COMPAT(INET6_ATON('::1')) +0 0 +SELECT IS_IPV4_MAPPED(INET6_ATON('::')), +IS_IPV4_COMPAT(INET6_ATON('::')); +IS_IPV4_MAPPED(INET6_ATON('::')) IS_IPV4_COMPAT(INET6_ATON('::')) +0 0 + +# -- Checking IS_IPV4_COMPAT()... + + +# -- Working with a table... + +DROP TABLE IF EXISTS t1; +DROP TABLE IF EXISTS t2; +CREATE TABLE t1(ip INT UNSIGNED); +CREATE TABLE t2(ip VARBINARY(16)); + +INSERT INTO t1 VALUES +(INET_ATON('1.2.3.4')), (INET_ATON('255.255.255.255')); +SELECT INET_NTOA(ip) FROM t1; +INET_NTOA(ip) +1.2.3.4 +255.255.255.255 + +INSERT INTO t2 SELECT INET6_ATON(INET_NTOA(ip)) FROM t1; +SELECT INET6_NTOA(ip), HEX(ip), LENGTH(ip) FROM t2; +INET6_NTOA(ip) HEX(ip) LENGTH(ip) +1.2.3.4 01020304 4 +255.255.255.255 FFFFFFFF 4 +DELETE FROM t2; + +INSERT INTO t2 VALUES +(INET6_ATON('1.2.3.4')), (INET6_ATON('255.255.255.255')), +(INET6_ATON('::1.2.3.4')), (INET6_ATON('::ffff:255.255.255.255')), +(INET6_ATON('::')), (INET6_ATON('::1')), +(INET6_ATON('1020:3040:5060:7080:90A0:B0C0:D0E0:F010')); +SELECT INET6_NTOA(ip), HEX(ip), LENGTH(ip) FROM t2; +INET6_NTOA(ip) HEX(ip) LENGTH(ip) +1.2.3.4 01020304 4 +255.255.255.255 FFFFFFFF 4 +::1.2.3.4 00000000000000000000000001020304 16 +::ffff:255.255.255.255 00000000000000000000FFFFFFFFFFFF 16 +:: 00000000000000000000000000000000 16 +::1 00000000000000000000000000000001 16 +1020:3040:5060:7080:90a0:b0c0:d0e0:f010 102030405060708090A0B0C0D0E0F010 16 + +DROP TABLE t1; +DROP TABLE t2; + +# -- Done. + # # End of tests # === modified file 'mysql-test/t/func_misc.test' --- a/mysql-test/t/func_misc.test 2010-12-17 14:02:56 +0000 +++ b/mysql-test/t/func_misc.test 2011-04-07 17:45:44 +0000 @@ -541,6 +541,262 @@ DROP TABLE t1; --echo # End of 5.5 tests --echo # +--echo +--echo # -- +--echo # -- WL#5787: IPv6-capable INET_ATON and INET_NTOA functions. +--echo # -- + +--echo +--echo # -- INET6_ATON: checking NULL, invalid types, out-of range values... +--echo + +SELECT INET6_ATON(NULL) IS NULL; +SELECT INET6_ATON(123) IS NULL; +SELECT INET6_ATON(123.45) IS NULL; +SELECT INET6_ATON(NOW()) IS NULL; + +SELECT INET6_ATON('1.2.3') IS NULL; +SELECT INET6_ATON('1.2.3.') IS NULL; +SELECT INET6_ATON('1..3.4') IS NULL; +SELECT INET6_ATON('-1.2.3.4') IS NULL; +SELECT INET6_ATON('1.2.3.256') IS NULL; +SELECT INET6_ATON('1.2.3.4.5') IS NULL; +SELECT INET6_ATON('0001.2.3.4') IS NULL; +SELECT INET6_ATON('0x1.2.3.4') IS NULL; +SELECT INET6_ATON('a.2.3.4') IS NULL; + +SELECT INET6_ATON('1.2.3.4:80') IS NULL; +SELECT INET6_ATON('1.2.3.4/32') IS NULL; + +SELECT INET6_ATON('mysql.com') IS NULL; + +SELECT INET6_ATON(':::') IS NULL; +SELECT INET6_ATON(':1:2:3') IS NULL; +SELECT INET6_ATON('::00001') IS NULL; +SELECT INET6_ATON('::00001:2') IS NULL; +SELECT INET6_ATON('::12345') IS NULL; +SELECT INET6_ATON('1020::3040::5060') IS NULL; +SELECT INET6_ATON('::ABCZ') IS NULL; + +SELECT INET6_ATON('::0x1.2.3.4') IS NULL; +SELECT INET6_ATON('::1.0x2.3.4') IS NULL; +SELECT INET6_ATON('::a.b.c.d') IS NULL; + +SELECT INET6_ATON('::FFFF:0x1.2.3.4') IS NULL; +SELECT INET6_ATON('::FFFF:1.0x2.3.4') IS NULL; +SELECT INET6_ATON('::FFFF:a.b.c.d') IS NULL; + +SELECT INET6_ATON('::1.2.3.4:ABCD') IS NULL; + +--echo # NOTE: such addresses are supported because getaddrinfo() supports them. +--echo # This is just to record the current behaviour. +SELECT HEX(INET6_ATON('::ABCD:1.2.3.4')); + +--echo +--echo # -- INET6_ATON: checking binary representation... +--echo + +SELECT HEX(INET6_ATON('0.0.0.0')); +SELECT HEX(INET6_ATON('00.00.00.00')); +SELECT HEX(INET6_ATON('000.000.000.000')); +SELECT HEX(INET6_ATON('1.2.3.4')); +SELECT HEX(INET6_ATON('01.02.03.04')); +SELECT HEX(INET6_ATON('001.002.003.004')); +SELECT HEX(INET6_ATON('255.255.255.255')); +SELECT HEX(INET6_ATON('::')); +SELECT HEX(INET6_ATON('0::0')); +SELECT HEX(INET6_ATON('0::')); +SELECT HEX(INET6_ATON('::0')); +SELECT HEX(INET6_ATON('::1')); +SELECT HEX(INET6_ATON('0000:0000::0000:0001')); +SELECT HEX(INET6_ATON('0000:0000:0000:0000:0000:0000:0000:0001')); +SELECT HEX(INET6_ATON('::C0A8:0102')); +SELECT HEX(INET6_ATON('::c0a8:0102')); +SELECT HEX(INET6_ATON('::192.168.1.2')); +SELECT HEX(INET6_ATON('::FfFf:C0a8:0102')); +SELECT HEX(INET6_ATON('::ffff:c0a8:0102')); +SELECT HEX(INET6_ATON('::ffff:192.168.1.2')); +SELECT HEX(INET6_ATON('::01.2.3.4')); +SELECT HEX(INET6_ATON('::1.02.3.4')); +SELECT HEX(INET6_ATON('::1.2.03.4')); +SELECT HEX(INET6_ATON('::1.2.3.04')); +SELECT HEX(INET6_ATON('::1.2.3.00')); +SELECT HEX(INET6_ATON('::FFFF:01.2.3.4')); +SELECT HEX(INET6_ATON('::FFFF:1.02.3.4')); +SELECT HEX(INET6_ATON('::FFFF:1.2.03.4')); +SELECT HEX(INET6_ATON('::FFFF:1.2.3.04')); +SELECT HEX(INET6_ATON('::FFFF:1.2.3.00')); + +--echo +--echo # -- INET6_ATON: checking the length is either 4 or 16... +--echo + +SELECT LENGTH(INET6_ATON('0.0.0.0')); +SELECT LENGTH(INET6_ATON('255.255.255.255')); +SELECT LENGTH(INET6_ATON('::')); +SELECT LENGTH(INET6_ATON('1020:3040:5060:7080:90A0:B0C0:D0E0:F010')); + +--echo +--echo # -- INET6_NTOA: checking NULL, invalid types, out-of range values... +--echo + +SELECT INET6_NTOA(NULL); +SELECT INET6_NTOA(123); +SELECT INET6_NTOA(123.456); +SELECT INET6_NTOA(NOW()); +SELECT INET6_NTOA(UNHEX('C0A801')); # 3 bytes -> NULL +SELECT INET6_NTOA(UNHEX('C0A80102')); # 4 bytes -> 192.168.1.2 +SELECT INET6_NTOA(UNHEX('C0A8010203')); # 5 bytes -> NULL +SELECT INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F')); # 15 bytes -> NULL +SELECT INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F10')); # 16 bytes -> IP +SELECT INET6_NTOA(UNHEX('0102030405060708090A0B0C0D0E0F1011')); # 17 bytes -> NULL + +SELECT INET6_NTOA('1234'), INET6_NTOA(BINARY('1234')); +SELECT INET6_NTOA('0123456789abcdef'), INET6_NTOA(BINARY('0123456789abcdef')); + +--echo +--echo # -- Checking double-conversion... +--echo + +SELECT INET6_NTOA(INET6_ATON('::')); +SELECT INET6_NTOA(INET6_ATON('0::0')); +SELECT INET6_NTOA(INET6_ATON('0::')); +SELECT INET6_NTOA(INET6_ATON('::0')); +SELECT INET6_NTOA(INET6_ATON('::1')); +SELECT INET6_NTOA(INET6_ATON('0000:0000::0000:0001')); +SELECT INET6_NTOA(INET6_ATON('0000:0000:0000:0000:0000:0000:0000:0001')); +SELECT INET6_NTOA(INET6_ATON('::C0A8:0102')); +SELECT INET6_NTOA(INET6_ATON('::c0a8:0102')); +SELECT INET6_NTOA(INET6_ATON('::192.168.1.2')); +SELECT INET6_NTOA(INET6_ATON('::FFFF:C0A8:0102')); +SELECT INET6_NTOA(INET6_ATON('::ffff:c0a8:0102')); +SELECT INET6_NTOA(INET6_ATON('::ffff:192.168.1.2')); + +--echo +--echo # -- Comparing INET_ATON() and INET6_ATON()... +--echo + +SELECT HEX(INET_ATON('192.168.1.2')); +SELECT HEX(INET6_ATON('192.168.1.2')); + +SELECT HEX(INET_ATON('255.255.255.255')); +SELECT HEX(INET6_ATON('255.255.255.255')); + +SELECT HEX(INET_ATON('192.168.08.2')); +SELECT HEX(INET6_ATON('192.168.08.2')); + +SELECT HEX(INET_ATON('192.168.0x8.2')); +SELECT HEX(INET6_ATON('192.168.0x8.2')); + +SELECT HEX(INET_ATON('1.2.255')); +SELECT HEX(INET6_ATON('1.2.255')); + +SELECT HEX(INET_ATON('1.2.256')); +SELECT HEX(INET6_ATON('1.2.256')); + +SELECT HEX(INET_ATON('1.0002.3.4')); +SELECT HEX(INET6_ATON('1.0002.3.4')); + +SELECT HEX(INET_ATON('1.2.3.4.5')); +SELECT HEX(INET6_ATON('1.2.3.4.5')); + +--echo +--echo # -- Checking mix of INET- and INET6- functions... +--echo + +SELECT HEX(INET6_ATON(INET_NTOA(INET_ATON('1.2.3.4')))) AS x; + +--echo +--echo # -- Checking IS_IPV4() / IS_IPV6()... +--echo + +SELECT IS_IPV4(NULL); +SELECT IS_IPV4(1); +SELECT IS_IPV4(1.0); +SELECT IS_IPV4('1.2.3.4'); +SELECT IS_IPV4('001.02.000.255'); +SELECT IS_IPV4('::1.2.0.255'); +SELECT IS_IPV4('::1'); +SELECT IS_IPV4(BINARY('1.2.3.4')); + +SELECT IS_IPV6(NULL); +SELECT IS_IPV6(1); +SELECT IS_IPV6(1.0); +SELECT IS_IPV6('1.2.3.4'); +SELECT IS_IPV6('001.02.000.255'); +SELECT IS_IPV6('::001.02.000.255'); +SELECT IS_IPV6('::1.2.0.255'); +SELECT IS_IPV6('::1'); +SELECT IS_IPV6('0000:0000:0000:0000:0000:0000:0000:0001'); +SELECT IS_IPV6(BINARY('0000:0000:0000:0000:0000:0000:0000:0001')); + +--echo +--echo # -- Checking IS_IPV4_MAPPED() and IS_IPV4_COMPAT()... +--echo + +SELECT IS_IPV4_MAPPED(INET6_ATON('1.2.3.4')), + IS_IPV4_COMPAT(INET6_ATON('1.2.3.4')); +SELECT IS_IPV4_MAPPED(INET6_ATON('::1.2.3.4')), + IS_IPV4_COMPAT(INET6_ATON('::1.2.3.4')); +SELECT IS_IPV4_MAPPED(INET6_ATON('::FFFF:1.2.3.4')), + IS_IPV4_COMPAT(INET6_ATON('::FFFF:1.2.3.4')); +SELECT IS_IPV4_MAPPED(INET6_ATON('::ABCD:1.2.3.4')), + IS_IPV4_COMPAT(INET6_ATON('::ABCD:1.2.3.4')); +SELECT IS_IPV4_MAPPED(INET6_ATON('::1')), + IS_IPV4_COMPAT(INET6_ATON('::1')); +SELECT IS_IPV4_MAPPED(INET6_ATON('::')), + IS_IPV4_COMPAT(INET6_ATON('::')); + +# NOTE: IS_IPV4_COMPAT() / IS_IPV4_MAPPED() could work with "regular strings in +# binary collation" too, but there is no way to create a "regular string" +# starting with \0. + +--echo +--echo # -- Checking IS_IPV4_COMPAT()... +--echo + +--echo +--echo # -- Working with a table... +--echo + +--disable_warnings +DROP TABLE IF EXISTS t1; +DROP TABLE IF EXISTS t2; +--enable_warnings + +CREATE TABLE t1(ip INT UNSIGNED); +CREATE TABLE t2(ip VARBINARY(16)); + +--echo + +INSERT INTO t1 VALUES + (INET_ATON('1.2.3.4')), (INET_ATON('255.255.255.255')); +SELECT INET_NTOA(ip) FROM t1; + +--echo + +INSERT INTO t2 SELECT INET6_ATON(INET_NTOA(ip)) FROM t1; +SELECT INET6_NTOA(ip), HEX(ip), LENGTH(ip) FROM t2; +DELETE FROM t2; + +--echo + +INSERT INTO t2 VALUES + (INET6_ATON('1.2.3.4')), (INET6_ATON('255.255.255.255')), + (INET6_ATON('::1.2.3.4')), (INET6_ATON('::ffff:255.255.255.255')), + (INET6_ATON('::')), (INET6_ATON('::1')), + (INET6_ATON('1020:3040:5060:7080:90A0:B0C0:D0E0:F010')); +SELECT INET6_NTOA(ip), HEX(ip), LENGTH(ip) FROM t2; + +--echo + +DROP TABLE t1; +DROP TABLE t2; + +--echo +--echo # -- Done. +--echo + --echo # --echo # End of tests --echo # === modified file 'sql/item_create.cc' --- a/sql/item_create.cc 2011-03-29 13:25:20 +0000 +++ b/sql/item_create.cc 2011-04-07 17:45:44 +0000 @@ -1204,6 +1204,84 @@ protected: }; +class Create_func_inet6_aton : public Create_func_arg1 +{ +public: + virtual Item *create(THD *thd, Item *arg1); + + static Create_func_inet6_aton s_singleton; + +protected: + Create_func_inet6_aton() {} + virtual ~Create_func_inet6_aton() {} +}; + + +class Create_func_inet6_ntoa : public Create_func_arg1 +{ +public: + virtual Item *create(THD *thd, Item *arg1); + + static Create_func_inet6_ntoa s_singleton; + +protected: + Create_func_inet6_ntoa() {} + virtual ~Create_func_inet6_ntoa() {} +}; + + +class Create_func_is_ipv4 : public Create_func_arg1 +{ +public: + virtual Item *create(THD *thd, Item *arg1); + + static Create_func_is_ipv4 s_singleton; + +protected: + Create_func_is_ipv4() {} + virtual ~Create_func_is_ipv4() {} +}; + + +class Create_func_is_ipv6 : public Create_func_arg1 +{ +public: + virtual Item *create(THD *thd, Item *arg1); + + static Create_func_is_ipv6 s_singleton; + +protected: + Create_func_is_ipv6() {} + virtual ~Create_func_is_ipv6() {} +}; + + +class Create_func_is_ipv4_compat : public Create_func_arg1 +{ +public: + virtual Item *create(THD *thd, Item *arg1); + + static Create_func_is_ipv4_compat s_singleton; + +protected: + Create_func_is_ipv4_compat() {} + virtual ~Create_func_is_ipv4_compat() {} +}; + + +class Create_func_is_ipv4_mapped : public Create_func_arg1 +{ +public: + virtual Item *create(THD *thd, Item *arg1); + + static Create_func_is_ipv4_mapped s_singleton; + +protected: + Create_func_is_ipv4_mapped() {} + virtual ~Create_func_is_ipv4_mapped() {} +}; + + class Create_func_instr : public Create_func_arg2 { public: @@ -3904,6 +3982,24 @@ Create_func_inet_ntoa::create(THD *thd, } +Create_func_inet6_aton Create_func_inet6_aton::s_singleton; + +Item* +Create_func_inet6_aton::create(THD *thd, Item *arg1) +{ + return new (thd->mem_root) Item_func_inet6_aton(arg1); +} + + +Create_func_inet6_ntoa Create_func_inet6_ntoa::s_singleton; + +Item* +Create_func_inet6_ntoa::create(THD *thd, Item *arg1) +{ + return new (thd->mem_root) Item_func_inet6_ntoa(arg1); +} + + Create_func_inet_aton Create_func_inet_aton::s_singleton; Item* @@ -3913,6 +4009,42 @@ Create_func_inet_aton::create(THD *thd, } +Create_func_is_ipv4 Create_func_is_ipv4::s_singleton; + +Item* +Create_func_is_ipv4::create(THD *thd, Item *arg1) +{ + return new (thd->mem_root) Item_func_is_ipv4(arg1); +} + + +Create_func_is_ipv6 Create_func_is_ipv6::s_singleton; + +Item* +Create_func_is_ipv6::create(THD *thd, Item *arg1) +{ + return new (thd->mem_root) Item_func_is_ipv6(arg1); +} + + +Create_func_is_ipv4_compat Create_func_is_ipv4_compat::s_singleton; + +Item* +Create_func_is_ipv4_compat::create(THD *thd, Item *arg1) +{ + return new (thd->mem_root) Item_func_is_ipv4_compat(arg1); +} + + +Create_func_is_ipv4_mapped Create_func_is_ipv4_mapped::s_singleton; + +Item* +Create_func_is_ipv4_mapped::create(THD *thd, Item *arg1) +{ + return new (thd->mem_root) Item_func_is_ipv4_mapped(arg1); +} + + Create_func_instr Create_func_instr::s_singleton; Item* @@ -5279,6 +5411,12 @@ static Native_func_registry func_array[] { { C_STRING_WITH_LEN("IFNULL") }, BUILDER(Create_func_ifnull)}, { { C_STRING_WITH_LEN("INET_ATON") }, BUILDER(Create_func_inet_aton)}, { { C_STRING_WITH_LEN("INET_NTOA") }, BUILDER(Create_func_inet_ntoa)}, + { { C_STRING_WITH_LEN("INET6_ATON") }, BUILDER(Create_func_inet6_aton)}, + { { C_STRING_WITH_LEN("INET6_NTOA") }, BUILDER(Create_func_inet6_ntoa)}, + { { C_STRING_WITH_LEN("IS_IPV4") }, BUILDER(Create_func_is_ipv4)}, + { { C_STRING_WITH_LEN("IS_IPV6") }, BUILDER(Create_func_is_ipv6)}, + { { C_STRING_WITH_LEN("IS_IPV4_COMPAT") }, BUILDER(Create_func_is_ipv4_compat)}, + { { C_STRING_WITH_LEN("IS_IPV4_MAPPED") }, BUILDER(Create_func_is_ipv4_mapped)}, { { C_STRING_WITH_LEN("INSTR") }, BUILDER(Create_func_instr)}, { { C_STRING_WITH_LEN("INTERIORRINGN") }, GEOM_BUILDER(Create_func_interiorringn)}, { { C_STRING_WITH_LEN("INTERSECTS") }, GEOM_BUILDER(Create_func_mbr_intersects)}, === modified file 'sql/item_inetfunc.cc' --- a/sql/item_inetfunc.cc 2011-04-06 20:03:33 +0000 +++ b/sql/item_inetfunc.cc 2011-04-07 17:45:44 +0000 @@ -14,10 +14,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "item_inetfunc.h" +#include "my_net.h" // struct in_addr +#include "log.h" // sql_print_warning() -#include "violite.h" // vio_getnameinfo() -#include "log.h" // sql_print_warning() +/////////////////////////////////////////////////////////////////////////// + +static const int IN_ADDR_SIZE= sizeof (in_addr); +static const int IN6_ADDR_SIZE= sizeof (in6_addr); +static const int IN6_ADDR_NUM_WORDS= IN6_ADDR_SIZE / 2; +static const char HEX_DIGITS[]= "0123456789abcdef"; /////////////////////////////////////////////////////////////////////////// @@ -133,3 +139,699 @@ String* Item_func_inet_ntoa::val_str(Str return str; } + +/////////////////////////////////////////////////////////////////////////// + +/** + Check the function argument, handle errors properly. + + @return The function value. +*/ + +longlong Item_func_inet_bool_base::val_int() +{ + DBUG_ASSERT(fixed); + + if (args[0]->result_type() != STRING_RESULT || // String argument expected + args[0]->null_value) // Not-NULL argument expected + return 0; + + String buffer; + String *arg_str= args[0]->val_str(&buffer); + + if (!arg_str) // Out-of memory happened. The error has been reported. + return 0; + + return calc_value(arg_str) ? 1 : 0; +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Check the function argument, handle errors properly. + + @param [out] buffer Buffer for string operations. + + @return The function value. +*/ + +String *Item_func_inet_str_base::val_str_ascii(String *buffer) +{ + DBUG_ASSERT(fixed); + + if (args[0]->result_type() != STRING_RESULT || // String argument expected + args[0]->null_value) // Not-NULL argument expected + { + null_value= true; + return NULL; + } + + String *arg_str= args[0]->val_str(buffer); + + if (!arg_str) // Out-of memory happened. The error has been reported. + { + null_value= true; + return NULL; + } + + null_value= !calc_value(arg_str, buffer); + + return null_value ? NULL : buffer; +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Tries to convert given string to binary IPv4-address representation. + This is a portable alternative to inet_pton(AF_INET). + + @param str String to convert. + @param str_len String length. + @param[out] ipv4_address Buffer to store IPv4-address. + + @return Completion status. + @retval false Given string does not represent an IPv4-address. + @retval true The string has been converted sucessfully. + + @note The problem with inet_pton() is that it treats leading zeros in + IPv4-part differently on different platforms. +*/ + +static bool str_to_ipv4(const char *str, int str_length, in_addr *ipv4_address) +{ + if (str_length < 7) + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): " + "invalid IPv4 address: too short.", + str_length, str)); + return false; + } + + if (str_length > 15) + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): " + "invalid IPv4 address: too long.", + str_length, str)); + return false; + } + + unsigned char *ipv4_bytes= (unsigned char *) ipv4_address; + const char *p= str; + int byte_value= 0; + int chars_in_group= 0; + int dot_count= 0; + char c; + + while (*p && ((p - str) < str_length)) + { + c= *p++; + + if (my_isdigit(&my_charset_latin1, c)) + { + ++chars_in_group; + + if (chars_in_group > 3) + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: " + "too many characters in a group.", + str_length, str)); + return false; + } + + byte_value= byte_value * 10 + (c - '0'); + + if (byte_value > 255) + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: " + "invalid byte value.", + str_length, str)); + return false; + } + } + else if (c == '.') + { + if (chars_in_group == 0) + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: " + "too few characters in a group.", + str_length, str)); + return false; + } + + ipv4_bytes[dot_count]= (unsigned char) byte_value; + + ++dot_count; + byte_value= 0; + chars_in_group= 0; + + if (dot_count > 3) + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: " + "too many dots.", str_length, str)); + return false; + } + } + else + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: " + "invalid character at pos %d.", + str_length, str, (int) (p - str))); + return false; + } + } + + if (c == '.') + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: " + "ending at '.'.", str_length, str)); + return false; + } + + if (dot_count != 3) + { + DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: " + "classful address (too few groups).", + str_length, str)); + return false; + } + + ipv4_bytes[3]= (unsigned char) byte_value; + + DBUG_PRINT("info", ("str_to_ipv4(%.*s): valid IPv4 address: %d.%d.%d.%d", + str_length, str, + ipv4_bytes[0], ipv4_bytes[1], + ipv4_bytes[2], ipv4_bytes[3])); + return true; +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Tries to convert given string to binary IPv6-address representation. + This is a portable alternative to inet_pton(AF_INET6). + + @param str String to convert. + @param str_len String length. + @param[out] ipv6_address Buffer to store IPv6-address. + + @return Completion status. + @retval false Given string does not represent an IPv6-address. + @retval true The string has been converted sucessfully. + + @note The problem with inet_pton() is that it treats leading zeros in + IPv4-part differently on different platforms. +*/ + +static bool str_to_ipv6(const char *str, int str_length, in6_addr *ipv6_address) +{ + if (str_length < 2) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: too short.", + str_length, str)); + return false; + } + + if (str_length > 8 * 4 + 7) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: too long.", + str_length, str)); + return false; + } + + bzero(ipv6_address, IN6_ADDR_SIZE); + + const char *p= str; + + if (*p == ':') + { + ++p; + + if (*p != ':') + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "can not start with ':x'.", str_length, str)); + return false; + } + } + + char *ipv6_bytes= (char *) ipv6_address; + char *ipv6_bytes_end= ipv6_bytes + IN6_ADDR_SIZE; + char *dst= ipv6_bytes; + char *gap_ptr= NULL; + const char *group_start_ptr= p; + int chars_in_group= 0; + int group_value= 0; + + while (*p && ((p - str) < str_length)) + { + char c= *p++; + + if (c == ':') + { + group_start_ptr= p; + + if (!chars_in_group) + { + if (gap_ptr) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "too many gaps(::).", str_length, str)); + return false; + } + + gap_ptr= dst; + continue; + } + + if (!*p || ((p - str) >= str_length)) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "ending at ':'.", str_length, str)); + return false; + } + + if (dst + 2 > ipv6_bytes_end) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "too many groups (1).", str_length, str)); + return false; + } + + dst[0]= (unsigned char) (group_value >> 8) & 0xff; + dst[1]= (unsigned char) group_value & 0xff; + dst += 2; + + chars_in_group= 0; + group_value= 0; + } + else if (c == '.') + { + if (dst + IN_ADDR_SIZE > ipv6_bytes_end) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "unexpected IPv4-part.", str_length, str)); + return false; + } + + if (!str_to_ipv4(group_start_ptr, + str + str_length - group_start_ptr, + (in_addr *) dst)) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "invalid IPv4-part.", str_length, str)); + return false; + } + + dst += IN_ADDR_SIZE; + chars_in_group= 0; + + break; + } + else + { + const char *hdp= strchr(HEX_DIGITS, my_tolower(&my_charset_latin1, c)); + + if (!hdp) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "invalid character at pos %d.", + str_length, str, (int) (p - str))); + return false; + } + + if (chars_in_group >= 4) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "too many digits in group.", + str_length, str)); + return false; + } + + group_value <<= 4; + group_value |= hdp - HEX_DIGITS; + + DBUG_ASSERT(group_value <= 0xffff); + + ++chars_in_group; + } + } + + if (chars_in_group > 0) + { + if (dst + 2 > ipv6_bytes_end) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "too many groups (2).", str_length, str)); + return false; + } + + dst[0]= (unsigned char) (group_value >> 8) & 0xff; + dst[1]= (unsigned char) group_value & 0xff; + dst += 2; + } + + if (gap_ptr) + { + if (dst == ipv6_bytes_end) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "no room for a gap (::).", str_length, str)); + return false; + } + + int bytes_to_move= dst - gap_ptr; + + for (int i= 1; i <= bytes_to_move; ++i) + { + ipv6_bytes_end[-i]= gap_ptr[bytes_to_move - i]; + gap_ptr[bytes_to_move - i]= 0; + } + + dst= ipv6_bytes_end; + } + + if (dst < ipv6_bytes_end) + { + DBUG_PRINT("error", ("str_to_ipv6(%.*s): invalid IPv6 address: " + "too few groups.", str_length, str)); + return false; + } + + return true; +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Converts IPv4-binary-address to a string. This function is a portable + alternative to inet_ntop(AF_INET). + + @param[in] ipv4 IPv4-address data (byte array) + @param[out] str A buffer to store string representation of IPv4-address. + It must be at least of INET_ADDRSTRLEN. + + @note The problem with inet_ntop() is that it is available starting from + Windows Vista, but out the minimum supported version is Windows 2000. +*/ + +static void ipv4_to_str(const in_addr *ipv4, char *str) +{ + const unsigned char *ipv4_bytes= (const unsigned char *) ipv4; + + sprintf(str, "%d.%d.%d.%d", + ipv4_bytes[0], ipv4_bytes[1], ipv4_bytes[2], ipv4_bytes[3]); +} +/////////////////////////////////////////////////////////////////////////// + +/** + Converts IPv6-binary-address to a string. This function is a portable + alternative to inet_ntop(AF_INET6). + + @param[in] ipv6 IPv6-address data (byte array) + @param[out] str A buffer to store string representation of IPv6-address. + It must be at least of INET6_ADDRSTRLEN. + + @note The problem with inet_ntop() is that it is available starting from + Windows Vista, but out the minimum supported version is Windows 2000. +*/ + +static void ipv6_to_str(const in6_addr *ipv6, char *str) +{ + struct Region + { + int pos; + int length; + }; + + const unsigned char *ipv6_bytes= (const unsigned char *) ipv6; + + // 1. Translate IPv6-address bytes to words. + // We can't just cast to short, because it's not guaranteed + // that sizeof (short) == 2. So, we have to make a copy. + + uint16 ipv6_words[IN6_ADDR_NUM_WORDS]; + + for (int i= 0; i < IN6_ADDR_NUM_WORDS; ++i) + ipv6_words[i]= (ipv6_bytes[2 * i] << 8) + ipv6_bytes[2 * i + 1]; + + // 2. Find "the gap" -- longest sequence of zeros in IPv6-address. + + Region gap= { -1, -1 }; + + { + Region rg= { -1, -1 }; + + for (int i = 0; i < IN6_ADDR_NUM_WORDS; ++i) + { + if (ipv6_words[i] != 0) + { + if (rg.pos >= 0) + { + if (rg.length > gap.length) + gap= rg; + + rg.pos= -1; + rg.length= -1; + } + } + else + { + if (rg.pos >= 0) + { + ++rg.length; + } + else + { + rg.pos= i; + rg.length= 1; + } + } + } + + if (rg.pos >= 0) + { + if (rg.length > gap.length) + gap= rg; + } + } + + // 3. Convert binary data to string. + + char *p= str; + + for (int i = 0; i < IN6_ADDR_NUM_WORDS; ++i) + { + if (i == gap.pos) + { + // We're at the gap position. We should put trailing ':' and jump to + // the end of the gap. + + if (i == 0) + { + // The gap starts from the beginning of the data -- leading ':' + // should be put additionally. + + *p= ':'; + ++p; + } + + *p= ':'; + ++p; + + i += gap.length - 1; + } + else if (i == 6 && gap.pos == 0 && + (gap.length == 6 || // IPv4-compatible + (gap.length == 5 && ipv6_words[5] == 0xffff) // IPv4-mapped + )) + { + // The data represents either IPv4-compatible or IPv4-mapped address. + // The IPv6-part (zeros or zeros + ffff) has been already put into + // the string (str). Now it's time to dump IPv4-part. + + ipv4_to_str((const in_addr *) (ipv6_bytes + 12), p); + return; + } + else + { + // Usual IPv6-address-field. Print it out using lower-case + // hex-letters without leading zeros (recommended IPv6-format). + // + // If it is not the last field, append closing ':'. + + p += sprintf(p, "%x", ipv6_words[i]); + + if (i != IN6_ADDR_NUM_WORDS - 1) + { + *p= ':'; + ++p; + } + } + } + + *p= 0; +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Converts IP-address-string to IP-address-data. + + @param arg IP-address-string. + @param [out] buffer Buffer to store IP-address-data. + + @return Completion status. + @retval false Given string does not represent an IP-address. + @retval true The string has been converted sucessfully. +*/ + +bool Item_func_inet6_aton::calc_value(String *arg, String *buffer) +{ + // ipv4-string -> varbinary(4) + // ipv6-string -> varbinary(16) + + in_addr ipv4_address; + in6_addr ipv6_address; + + if (str_to_ipv4(arg->ptr(), arg->length(), &ipv4_address)) + { + buffer->length(0); + buffer->append((char *) &ipv4_address, sizeof (in_addr), &my_charset_bin); + + return true; + } + + if (str_to_ipv6(arg->ptr(), arg->length(), &ipv6_address)) + { + buffer->length(0); + buffer->append((char *) &ipv6_address, sizeof (in6_addr), &my_charset_bin); + + return true; + } + + return false; +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Converts IP-address-data to IP-address-string. + + @param arg IP-address-data. + @param [out] buffer Buffer to store IP-address-string. + + @return Completion status. + @retval false The argument does not correspond to IP-address. + @retval true The string has been converted sucessfully. +*/ + +bool Item_func_inet6_ntoa::calc_value(String *arg, String *buffer) +{ + if (arg->charset() != &my_charset_bin) + return false; + + if ((int) arg->length() == IN_ADDR_SIZE) + { + char str[INET_ADDRSTRLEN]; + + ipv4_to_str((const in_addr *) arg->ptr(), str); + + buffer->length(0); + buffer->append(str, (uint32) strlen(str), &my_charset_latin1); + + return true; + } + else if ((int) arg->length() == IN6_ADDR_SIZE) + { + char str[INET6_ADDRSTRLEN]; + + ipv6_to_str((const in6_addr *) arg->ptr(), str); + + buffer->length(0); + buffer->append(str, (uint32) strlen(str), &my_charset_latin1); + + return true; + } + + DBUG_PRINT("info", + ("INET6_NTOA(): varbinary(4) or varbinary(16) expected.")); + return false; +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Checks if the passed string represents an IPv4-address. + + @param arg The string to check. + + @return Check status. + @retval false The passed string does not represent an IPv4-address. + @retval true The passed string represents an IPv4-address. +*/ + +bool Item_func_is_ipv4::calc_value(const String *arg) +{ + in_addr ipv4_address; + + return str_to_ipv4(arg->ptr(), arg->length(), &ipv4_address); +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Checks if the passed string represents an IPv6-address. + + @param arg The string to check. + + @return Check status. + @retval false The passed string does not represent an IPv6-address. + @retval true The passed string represents an IPv6-address. +*/ + +bool Item_func_is_ipv6::calc_value(const String *arg) +{ + in6_addr ipv6_address; + + return str_to_ipv6(arg->ptr(), arg->length(), &ipv6_address); +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Checks if the passed IPv6-address is an IPv4-compat IPv6-address. + + @param arg The IPv6-address to check. + + @return Check status. + @retval false The passed IPv6-address is not an IPv4-compatible IPv6-address. + @retval true The passed IPv6-address is an IPv4-compatible IPv6-address. +*/ + +bool Item_func_is_ipv4_compat::calc_value(const String *arg) +{ + if ((int) arg->length() != IN6_ADDR_SIZE || arg->charset() != &my_charset_bin) + return false; + + return IN6_IS_ADDR_V4COMPAT((struct in6_addr *) arg->ptr()); +} + +/////////////////////////////////////////////////////////////////////////// + +/** + Checks if the passed IPv6-address is an IPv4-mapped IPv6-address. + + @param arg The IPv6-address to check. + + @return Check status. + @retval false The passed IPv6-address is not an IPv4-mapped IPv6-address. + @retval true The passed IPv6-address is an IPv4-mapped IPv6-address. +*/ + +bool Item_func_is_ipv4_mapped::calc_value(const String *arg) +{ + if ((int) arg->length() != IN6_ADDR_SIZE || arg->charset() != &my_charset_bin) + return false; + + return IN6_IS_ADDR_V4MAPPED((struct in6_addr *) arg->ptr()); +} === modified file 'sql/item_inetfunc.h' --- a/sql/item_inetfunc.h 2011-03-29 13:25:20 +0000 +++ b/sql/item_inetfunc.h 2011-04-07 17:45:44 +0000 @@ -71,4 +71,185 @@ public: } }; + +/************************************************************************* + Item_func_inet_bool_base implements common code for INET6/IP-related + functions returning boolean value. +*************************************************************************/ + +class Item_func_inet_bool_base : public Item_bool_func +{ +public: + inline Item_func_inet_bool_base(Item *ip_addr) + : Item_bool_func(ip_addr) + { + null_value= false; + } + +public: + virtual longlong val_int(); + +protected: + virtual bool calc_value(const String *arg) = 0; +}; + + +/************************************************************************* + Item_func_inet_bool_base implements common code for INET6/IP-related + functions returning string value. +*************************************************************************/ + +class Item_func_inet_str_base : public Item_str_ascii_func +{ +public: + inline Item_func_inet_str_base(Item *arg) + : Item_str_ascii_func(arg) + { } + +public: + virtual String *val_str_ascii(String *buffer); + +protected: + virtual bool calc_value(String *arg, String *buffer) = 0; +}; + + +/************************************************************************* + Item_func_inet6_aton implements INET6_ATON() SQL-function. +*************************************************************************/ + +class Item_func_inet6_aton : public Item_func_inet_str_base +{ +public: + inline Item_func_inet6_aton(Item *ip_addr) + : Item_func_inet_str_base(ip_addr) + { } + +public: + virtual const char *func_name() const + { return "inet6_aton"; } + + virtual void fix_length_and_dec() + { + decimals= 0; + fix_length_and_charset(16, &my_charset_bin); + maybe_null= 1; + } + +protected: + virtual bool calc_value(String *arg, String *buffer); +}; + + +/************************************************************************* + Item_func_inet6_ntoa implements INET6_NTOA() SQL-function. +*************************************************************************/ + +class Item_func_inet6_ntoa : public Item_func_inet_str_base +{ +public: + inline Item_func_inet6_ntoa(Item *ip_addr) + : Item_func_inet_str_base(ip_addr) + { } + +public: + virtual const char *func_name() const + { return "inet6_ntoa"; } + + virtual void fix_length_and_dec() + { + decimals= 0; + + // max length: IPv6-address -- 16 bytes + // 16 bytes / 2 bytes per group == 8 groups => 7 delimiter + // 4 symbols per group + fix_length_and_charset(8 * 4 + 7, default_charset()); + + maybe_null= 1; + } + +protected: + virtual bool calc_value(String *arg, String *buffer); +}; + + +/************************************************************************* + Item_func_is_ipv4 implements IS_IPV4() SQL-function. +*************************************************************************/ + +class Item_func_is_ipv4 : public Item_func_inet_bool_base +{ +public: + inline Item_func_is_ipv4(Item *ip_addr) + : Item_func_inet_bool_base(ip_addr) + { } + +public: + virtual const char *func_name() const + { return "is_ipv4"; } + +protected: + virtual bool calc_value(const String *arg); +}; + + +/************************************************************************* + Item_func_is_ipv6 implements IS_IPV6() SQL-function. +*************************************************************************/ + +class Item_func_is_ipv6 : public Item_func_inet_bool_base +{ +public: + inline Item_func_is_ipv6(Item *ip_addr) + : Item_func_inet_bool_base(ip_addr) + { } + +public: + virtual const char *func_name() const + { return "is_ipv6"; } + +protected: + virtual bool calc_value(const String *arg); +}; + + +/************************************************************************* + Item_func_is_ipv4_compat implements IS_IPV4_COMPAT() SQL-function. +*************************************************************************/ + +class Item_func_is_ipv4_compat : public Item_func_inet_bool_base +{ +public: + inline Item_func_is_ipv4_compat(Item *ip_addr) + : Item_func_inet_bool_base(ip_addr) + { } + +public: + virtual const char *func_name() const + { return "is_ipv4_compat"; } + +protected: + virtual bool calc_value(const String *arg); +}; + + +/************************************************************************* + Item_func_is_ipv4_mapped implements IS_IPV4_MAPPED() SQL-function. +*************************************************************************/ + +class Item_func_is_ipv4_mapped : public Item_func_inet_bool_base +{ +public: + inline Item_func_is_ipv4_mapped(Item *ip_addr) + : Item_func_inet_bool_base(ip_addr) + { } + +public: + virtual const char *func_name() const + { return "is_ipv4_mapped"; } + +protected: + virtual bool calc_value(const String *arg); +}; + #endif // ITEM_INETFUNC_INCLUDED --===============5250629951753373760== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/alexander.nozdrin@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: alexander.nozdrin@stripped\ # eaja2u7t93s5mst2 # target_branch: file:///home/alik/MySQL/bzr/00/wl5787/mysql-trunk-\ # wl5787/ # testament_sha1: ad4171a36625fc6069579487ef5ad8db57e24efa # timestamp: 2011-04-07 21:45:48 +0400 # base_revision_id: alexander.nozdrin@stripped\ # 96ecwskvyzk8y2pp # # Begin bundle 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 YSIO --===============5250629951753373760==--