#At file:///home/alik/MySQL/bzr/00/wl5787/mysql-trunk-wl5787/ based on revid:alexander.nozdrin@stripped
3330 Alexander Nozdrin 2011-03-29
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()
- MAKE_IPV4_COMPAT()
- MAKE_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-03-29 13:32:03 +0000
@@ -400,6 +400,513 @@ 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);
+INET6_ATON(NULL)
+NULL
+SELECT INET6_ATON(123);
+INET6_ATON(123)
+NULL
+SELECT INET6_ATON(123.45);
+INET6_ATON(123.45)
+NULL
+SELECT INET6_ATON(NOW());
+INET6_ATON(NOW())
+NULL
+SELECT INET6_ATON('1.2.3');
+INET6_ATON('1.2.3')
+NULL
+SELECT INET6_ATON('1.2.3.');
+INET6_ATON('1.2.3.')
+NULL
+SELECT INET6_ATON('1..3.4');
+INET6_ATON('1..3.4')
+NULL
+SELECT INET6_ATON('-1.2.3.4');
+INET6_ATON('-1.2.3.4')
+NULL
+SELECT INET6_ATON('1.2.3.256');
+INET6_ATON('1.2.3.256')
+NULL
+SELECT INET6_ATON('1.2.3.4.5');
+INET6_ATON('1.2.3.4.5')
+NULL
+SELECT INET6_ATON('0001.2.3.4');
+INET6_ATON('0001.2.3.4')
+NULL
+SELECT INET6_ATON('0x1.2.3.4');
+INET6_ATON('0x1.2.3.4')
+NULL
+SELECT INET6_ATON('a.2.3.4');
+INET6_ATON('a.2.3.4')
+NULL
+SELECT INET6_ATON('1.2.3.4:80');
+INET6_ATON('1.2.3.4:80')
+NULL
+SELECT INET6_ATON('1.2.3.4/32');
+INET6_ATON('1.2.3.4/32')
+NULL
+SELECT INET6_ATON('mysql.com');
+INET6_ATON('mysql.com')
+NULL
+SELECT INET6_ATON(':::');
+INET6_ATON(':::')
+NULL
+SELECT INET6_ATON('::c0a80102');
+INET6_ATON('::c0a80102')
+NULL
+SELECT INET6_ATON('1020::3040::5060');
+INET6_ATON('1020::3040::5060')
+NULL
+SELECT INET6_ATON('::ABCZ');
+INET6_ATON('::ABCZ')
+NULL
+SELECT INET6_ATON('::01.2.3.4');
+INET6_ATON('::01.2.3.4')
+NULL
+SELECT INET6_ATON('::1.02.3.4');
+INET6_ATON('::1.02.3.4')
+NULL
+SELECT INET6_ATON('::1.2.03.4');
+INET6_ATON('::1.2.03.4')
+NULL
+SELECT INET6_ATON('::1.2.3.04');
+INET6_ATON('::1.2.3.04')
+NULL
+SELECT INET6_ATON('::1.2.3.00');
+INET6_ATON('::1.2.3.00')
+NULL
+SELECT INET6_ATON('::0x1.2.3.4');
+INET6_ATON('::0x1.2.3.4')
+NULL
+SELECT INET6_ATON('::1.0x2.3.4');
+INET6_ATON('::1.0x2.3.4')
+NULL
+SELECT INET6_ATON('::a.b.c.d');
+INET6_ATON('::a.b.c.d')
+NULL
+SELECT INET6_ATON('::FFFF:01.2.3.4');
+INET6_ATON('::FFFF:01.2.3.4')
+NULL
+SELECT INET6_ATON('::FFFF:1.02.3.4');
+INET6_ATON('::FFFF:1.02.3.4')
+NULL
+SELECT INET6_ATON('::FFFF:1.2.03.4');
+INET6_ATON('::FFFF:1.2.03.4')
+NULL
+SELECT INET6_ATON('::FFFF:1.2.3.04');
+INET6_ATON('::FFFF:1.2.3.04')
+NULL
+SELECT INET6_ATON('::FFFF:1.2.3.00');
+INET6_ATON('::FFFF:1.2.3.00')
+NULL
+SELECT INET6_ATON('::FFFF:0x1.2.3.4');
+INET6_ATON('::FFFF:0x1.2.3.4')
+NULL
+SELECT INET6_ATON('::FFFF:1.0x2.3.4');
+INET6_ATON('::FFFF:1.0x2.3.4')
+NULL
+SELECT INET6_ATON('::FFFF:a.b.c.d');
+INET6_ATON('::FFFF:a.b.c.d')
+NULL
+SELECT INET6_ATON('::1.2.3.4:ABCD');
+INET6_ATON('::1.2.3.4:ABCD')
+NULL
+# 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
+
+# -- 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')
+0
+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 MAKE_IPV4_COMPAT() and MAKE_IPV4_MAPPED()...
+
+SELECT HEX(MAKE_IPV4_COMPAT(INET6_ATON('1.2.3.4')));
+HEX(MAKE_IPV4_COMPAT(INET6_ATON('1.2.3.4')))
+00000000000000000000000001020304
+SELECT INET6_NTOA(MAKE_IPV4_COMPAT(INET6_ATON('1.2.3.4')));
+INET6_NTOA(MAKE_IPV4_COMPAT(INET6_ATON('1.2.3.4')))
+::1.2.3.4
+SELECT IS_IPV4_COMPAT(MAKE_IPV4_COMPAT(INET6_ATON('1.2.3.4')));
+IS_IPV4_COMPAT(MAKE_IPV4_COMPAT(INET6_ATON('1.2.3.4')))
+1
+SELECT IS_IPV4_MAPPED(MAKE_IPV4_COMPAT(INET6_ATON('1.2.3.4')));
+IS_IPV4_MAPPED(MAKE_IPV4_COMPAT(INET6_ATON('1.2.3.4')))
+0
+SELECT HEX(MAKE_IPV4_MAPPED(INET6_ATON('1.2.3.4')));
+HEX(MAKE_IPV4_MAPPED(INET6_ATON('1.2.3.4')))
+00000000000000000000FFFF01020304
+SELECT INET6_NTOA(MAKE_IPV4_MAPPED(INET6_ATON('1.2.3.4')));
+INET6_NTOA(MAKE_IPV4_MAPPED(INET6_ATON('1.2.3.4')))
+::ffff:1.2.3.4
+SELECT IS_IPV4_COMPAT(MAKE_IPV4_MAPPED(INET6_ATON('1.2.3.4')));
+IS_IPV4_COMPAT(MAKE_IPV4_MAPPED(INET6_ATON('1.2.3.4')))
+0
+SELECT IS_IPV4_MAPPED(MAKE_IPV4_MAPPED(INET6_ATON('1.2.3.4')));
+IS_IPV4_MAPPED(MAKE_IPV4_MAPPED(INET6_ATON('1.2.3.4')))
+1
+SELECT INET6_NTOA(MAKE_IPV4_COMPAT('1234'));
+INET6_NTOA(MAKE_IPV4_COMPAT('1234'))
+NULL
+SELECT INET6_NTOA(MAKE_IPV4_COMPAT(BINARY('1234')));
+INET6_NTOA(MAKE_IPV4_COMPAT(BINARY('1234')))
+::49.50.51.52
+SELECT INET6_NTOA(MAKE_IPV4_MAPPED('1234'));
+INET6_NTOA(MAKE_IPV4_MAPPED('1234'))
+NULL
+SELECT INET6_NTOA(MAKE_IPV4_MAPPED(BINARY('1234')));
+INET6_NTOA(MAKE_IPV4_MAPPED(BINARY('1234')))
+::ffff:49.50.51.52
+
+# -- 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-03-29 13:32:03 +0000
@@ -541,6 +541,279 @@ 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);
+SELECT INET6_ATON(123);
+SELECT INET6_ATON(123.45);
+SELECT INET6_ATON(NOW());
+
+SELECT INET6_ATON('1.2.3');
+SELECT INET6_ATON('1.2.3.');
+SELECT INET6_ATON('1..3.4');
+SELECT INET6_ATON('-1.2.3.4');
+SELECT INET6_ATON('1.2.3.256');
+SELECT INET6_ATON('1.2.3.4.5');
+SELECT INET6_ATON('0001.2.3.4');
+SELECT INET6_ATON('0x1.2.3.4');
+SELECT INET6_ATON('a.2.3.4');
+
+SELECT INET6_ATON('1.2.3.4:80');
+SELECT INET6_ATON('1.2.3.4/32');
+
+SELECT INET6_ATON('mysql.com');
+
+SELECT INET6_ATON(':::');
+SELECT INET6_ATON('::c0a80102');
+SELECT INET6_ATON('1020::3040::5060');
+SELECT INET6_ATON('::ABCZ');
+
+SELECT INET6_ATON('::01.2.3.4');
+SELECT INET6_ATON('::1.02.3.4');
+SELECT INET6_ATON('::1.2.03.4');
+SELECT INET6_ATON('::1.2.3.04');
+SELECT INET6_ATON('::1.2.3.00');
+SELECT INET6_ATON('::0x1.2.3.4');
+SELECT INET6_ATON('::1.0x2.3.4');
+SELECT INET6_ATON('::a.b.c.d');
+
+SELECT INET6_ATON('::FFFF:01.2.3.4');
+SELECT INET6_ATON('::FFFF:1.02.3.4');
+SELECT INET6_ATON('::FFFF:1.2.03.4');
+SELECT INET6_ATON('::FFFF:1.2.3.04');
+SELECT INET6_ATON('::FFFF:1.2.3.00');
+SELECT INET6_ATON('::FFFF:0x1.2.3.4');
+SELECT INET6_ATON('::FFFF:1.0x2.3.4');
+SELECT INET6_ATON('::FFFF:a.b.c.d');
+
+SELECT INET6_ATON('::1.2.3.4:ABCD');
+
+--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'));
+
+--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 MAKE_IPV4_COMPAT() and MAKE_IPV4_MAPPED()...
+--echo
+
+SELECT HEX(MAKE_IPV4_COMPAT(INET6_ATON('1.2.3.4')));
+SELECT INET6_NTOA(MAKE_IPV4_COMPAT(INET6_ATON('1.2.3.4')));
+SELECT IS_IPV4_COMPAT(MAKE_IPV4_COMPAT(INET6_ATON('1.2.3.4')));
+SELECT IS_IPV4_MAPPED(MAKE_IPV4_COMPAT(INET6_ATON('1.2.3.4')));
+
+SELECT HEX(MAKE_IPV4_MAPPED(INET6_ATON('1.2.3.4')));
+SELECT INET6_NTOA(MAKE_IPV4_MAPPED(INET6_ATON('1.2.3.4')));
+SELECT IS_IPV4_COMPAT(MAKE_IPV4_MAPPED(INET6_ATON('1.2.3.4')));
+SELECT IS_IPV4_MAPPED(MAKE_IPV4_MAPPED(INET6_ATON('1.2.3.4')));
+
+SELECT INET6_NTOA(MAKE_IPV4_COMPAT('1234'));
+SELECT INET6_NTOA(MAKE_IPV4_COMPAT(BINARY('1234')));
+
+SELECT INET6_NTOA(MAKE_IPV4_MAPPED('1234'));
+SELECT INET6_NTOA(MAKE_IPV4_MAPPED(BINARY('1234')));
+
+--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-03-29 13:32:03 +0000
@@ -1204,6 +1204,110 @@ 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_make_ipv4_compat : public Create_func_arg1
+{
+public:
+ virtual Item *create(THD *thd, Item *arg1);
+
+ static Create_func_make_ipv4_compat s_singleton;
+
+protected:
+ Create_func_make_ipv4_compat() {}
+ virtual ~Create_func_make_ipv4_compat() {}
+};
+
+
+class Create_func_make_ipv4_mapped : public Create_func_arg1
+{
+public:
+ virtual Item *create(THD *thd, Item *arg1);
+
+ static Create_func_make_ipv4_mapped s_singleton;
+
+protected:
+ Create_func_make_ipv4_mapped() {}
+ virtual ~Create_func_make_ipv4_mapped() {}
+};
+
+
class Create_func_instr : public Create_func_arg2
{
public:
@@ -3904,6 +4008,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 +4035,60 @@ 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_make_ipv4_compat Create_func_make_ipv4_compat::s_singleton;
+
+Item*
+Create_func_make_ipv4_compat::create(THD *thd, Item *arg1)
+{
+ return new (thd->mem_root) Item_func_make_ipv4_compat(arg1);
+}
+
+
+Create_func_make_ipv4_mapped Create_func_make_ipv4_mapped::s_singleton;
+
+Item*
+Create_func_make_ipv4_mapped::create(THD *thd, Item *arg1)
+{
+ return new (thd->mem_root) Item_func_make_ipv4_mapped(arg1);
+}
+
+
Create_func_instr Create_func_instr::s_singleton;
Item*
@@ -5279,6 +5455,14 @@ 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("MAKE_IPV4_COMPAT") }, BUILDER(Create_func_make_ipv4_compat)},
+ { { C_STRING_WITH_LEN("MAKE_IPV4_MAPPED") }, BUILDER(Create_func_make_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-03-29 13:25:20 +0000
+++ b/sql/item_inetfunc.cc 2011-03-29 13:32:03 +0000
@@ -123,3 +123,485 @@ 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.
+
+ @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.
+*/
+
+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));
+ return false;
+ }
+
+ if (str_length > 15)
+ {
+ DBUG_PRINT("error", ("str_to_ipv4(%s): "
+ "invalid IPv4 address: too long.", 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 (c >= '0' && c <= '9')
+ {
+ ++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));
+ 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));
+ 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));
+ 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));
+ return false;
+ }
+ }
+ else
+ {
+ DBUG_PRINT("error", ("str_to_ipv4(%s): invalid IPv4 address: "
+ "invalid character at pos %d.",
+ str, (int) (p - str)));
+ return false;
+ }
+ }
+
+ if (c == '.')
+ {
+ DBUG_PRINT("error", ("str_to_ipv4(%s): invalid IPv4 address: "
+ "ending at '.'.", str));
+ return false;
+ }
+
+ if (dot_count != 3)
+ {
+ DBUG_PRINT("error", ("str_to_ipv4(%s): invalid IPv4 address: "
+ "classful address (too few groups).", 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, ipv4_bytes[0], ipv4_bytes[1],
+ ipv4_bytes[2], ipv4_bytes[3]));
+ return true;
+}
+
+///////////////////////////////////////////////////////////////////////////
+
+/**
+ Tries to convert given string to binary IPv6-address representation.
+
+ @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.
+*/
+
+static bool str_to_ipv6(const char *str, int str_length, in6_addr *ipv6_address)
+{
+ struct addrinfo hints;
+ bzero(&hints, sizeof (hints));
+ hints.ai_flags = AI_NUMERICHOST;
+ hints.ai_family = AF_INET6;
+
+ struct addrinfo *result;
+
+ int err_code= getaddrinfo(str, NULL, &hints, &result);
+
+ if (err_code)
+ {
+ DBUG_PRINT("error", ("str_to_ipv6(%s): getaddrinfo() failed with %d: %s",
+ str, err_code, gai_strerror(err_code)));
+ return false;
+ }
+
+ if (!result)
+ {
+ sql_print_warning("str_to_ipv6(%s): getaddrinfo() succeeded, "
+ "but returned NULL.", str);
+ return false;
+ }
+
+ memcpy(ipv6_address,
+ &((sockaddr_in6 *) result->ai_addr)->sin6_addr,
+ sizeof (struct in6_addr));
+
+ freeaddrinfo(result);
+
+ DBUG_PRINT("info", ("str_to_ipv6(%s): valid IPv6 address.", str));
+ return true;
+}
+
+///////////////////////////////////////////////////////////////////////////
+
+/**
+ 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 (arg->length() == 4)
+ {
+ sockaddr_in ip4;
+ bzero(&ip4, sizeof (ip4));
+ ip4.sin_family = AF_INET;
+ memcpy(&ip4.sin_addr, arg->ptr(), 4);
+
+ char ip4_string[INET_ADDRSTRLEN];
+
+ int err_code= vio_getnameinfo((const sockaddr *) &ip4,
+ ip4_string, sizeof (ip4_string),
+ NULL, 0,
+ NI_NUMERICHOST);
+
+ if (err_code)
+ {
+ sql_print_warning("INET6_NTOA(): getnameinfo() failed with %d: %s",
+ err_code, gai_strerror(err_code));
+ return false;
+ }
+
+ buffer->length(0);
+ buffer->append(ip4_string, strlen(ip4_string), &my_charset_latin1);
+
+ return true;
+ }
+ else if (arg->length() == 16)
+ {
+ sockaddr_in6 ip6;
+ bzero(&ip6, sizeof (ip6));
+ ip6.sin6_family = AF_INET6;
+ memcpy(&ip6.sin6_addr, arg->ptr(), 16);
+
+ char ip6_string[INET6_ADDRSTRLEN];
+
+ int err_code= vio_getnameinfo((const sockaddr *) &ip6,
+ ip6_string, sizeof (ip6_string),
+ NULL, 0,
+ NI_NUMERICHOST);
+
+ if (err_code)
+ {
+ sql_print_warning("INET6_NTOA(): getnameinfo() failed with %d: %s",
+ err_code, gai_strerror(err_code));
+ return false;
+ }
+
+ buffer->length(0);
+ buffer->append(ip6_string, strlen(ip6_string), &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 (arg->length() != 16 || arg->charset() != &my_charset_bin)
+ return false;
+
+ return IN6_IS_ADDR_V4COMPAT(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 (arg->length() != 16 || arg->charset() != &my_charset_bin)
+ return false;
+
+ return IN6_IS_ADDR_V4MAPPED(arg->ptr());
+}
+
+///////////////////////////////////////////////////////////////////////////
+
+/**
+ Makes an IPv4-compatible IPv6-address address out of IPv4-address.
+
+ @param arg The IPv4-address.
+ @param [out] buffer Buffer to store IPv6-address-data.
+
+ @return Completion status.
+ @retval false The passed data does not represent an IPv4-address.
+ @retval true The passed IPv4-address has been converted successfully.
+*/
+
+bool Item_func_make_ipv4_compat::calc_value(String *arg, String *buffer)
+{
+ if (arg->length() != 4 || arg->charset() != &my_charset_bin)
+ return false;
+
+ char ip6_bytes[16];
+
+ bzero(ip6_bytes, sizeof (ip6_bytes));
+ ip6_bytes[12]= arg->ptr()[0];
+ ip6_bytes[13]= arg->ptr()[1];
+ ip6_bytes[14]= arg->ptr()[2];
+ ip6_bytes[15]= arg->ptr()[3];
+
+ buffer->length(0);
+ buffer->append(ip6_bytes, 16, &my_charset_bin);
+
+ return true;
+}
+
+///////////////////////////////////////////////////////////////////////////
+
+/**
+ Makes an IPv4-mapped IPv6-address address out of IPv4-address.
+
+ @param arg The IPv4-address.
+ @param [out] buffer Buffer to store IPv6-address-data.
+
+ @return Completion status.
+ @retval false The passed data does not represent an IPv4-address.
+ @retval true The passed IPv4-address has been converted successfully.
+*/
+
+bool Item_func_make_ipv4_mapped::calc_value(String *arg, String *buffer)
+{
+ if (arg->length() != 4 || arg->charset() != &my_charset_bin)
+ return false;
+
+ char ip6_bytes[16];
+
+ bzero(ip6_bytes, sizeof (ip6_bytes));
+ ip6_bytes[10]= 0xFF;
+ ip6_bytes[11]= 0xFF;
+ ip6_bytes[12]= arg->ptr()[0];
+ ip6_bytes[13]= arg->ptr()[1];
+ ip6_bytes[14]= arg->ptr()[2];
+ ip6_bytes[15]= arg->ptr()[3];
+
+ buffer->length(0);
+ buffer->append(ip6_bytes, 16, &my_charset_bin);
+
+ return true;
+}
=== modified file 'sql/item_inetfunc.h'
--- a/sql/item_inetfunc.h 2011-03-29 13:25:20 +0000
+++ b/sql/item_inetfunc.h 2011-03-29 13:32:03 +0000
@@ -71,4 +71,239 @@ 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);
+};
+
+
+/*************************************************************************
+ Item_func_make_ipv4_compat implements MAKE_IPV4_COMPAT() SQL-function.
+*************************************************************************/
+
+class Item_func_make_ipv4_compat : public Item_func_inet_str_base
+{
+public:
+ inline Item_func_make_ipv4_compat(Item *ip_addr)
+ : Item_func_inet_str_base(ip_addr)
+ { }
+
+public:
+ virtual const char *func_name() const
+ { return "make_ipv4_compat"; }
+
+ 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_make_ipv4_mapped implements MAKE_IPV4_COMPAT() SQL-function.
+*************************************************************************/
+
+class Item_func_make_ipv4_mapped : public Item_func_inet_str_base
+{
+public:
+ inline Item_func_make_ipv4_mapped(Item *ip_addr)
+ : Item_func_inet_str_base(ip_addr)
+ { }
+
+public:
+ virtual const char *func_name() const
+ { return "make_ipv4_mapped"; }
+
+ virtual void fix_length_and_dec()
+ {
+ decimals= 0;
+ fix_length_and_charset(16, &my_charset_bin);
+ maybe_null= 1;
+ }
+
+public:
+ virtual bool calc_value(String *arg, String *buffer);
+};
+
#endif // ITEM_INETFUNC_INCLUDED
Attachment: [text/bzr-bundle] bzr/alexander.nozdrin@oracle.com-20110329133203-qt4wbnqr252mywrw.bundle
