From e5d5d581727ce61e653fdfc9a30effb69799aac5 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 23 Jul 2010 12:48:01 +0200
Subject: [ticket/9091] Extract IPv4 address from addresses mapped into IPv6.

PHPBB3-9091
---
 phpBB/includes/session.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'phpBB/includes/session.php')

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index e157053e61..2ee9365631 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -285,6 +285,17 @@ class session
 				break;
 			}
 
+			// Quick check for IPv4-mapped address in IPv6
+			if (stripos($ip, '::ffff:') === 0)
+			{
+				$ipv4 = substr($ip, 7);
+
+				if (preg_match(get_preg_expression('ipv4'), $ipv4))
+				{
+					$ip = $ipv4;
+				}
+			}
+
 			// Use the last in chain
 			$this->ip = $ip;
 		}
-- 
cgit v1.2.1