diff options
| author | Phil Davis <phil.davis@world.inf.org> | 2013-05-14 12:16:11 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@world.inf.org> | 2013-05-14 12:16:11 +0545 |
| commit | b4924d8608da270134fa72934e49cdb7514cd72f (patch) | |
| tree | 53433f9987237ee8694c70c87f5feb79e95be0f7 /etc/inc/IPv6.inc | |
| parent | 3341fcfc7d694034eb3d6cffa3a450f51f91474a (diff) | |
| download | pfsense-b4924d8608da270134fa72934e49cdb7514cd72f.zip pfsense-b4924d8608da270134fa72934e49cdb7514cd72f.tar.gz | |
Teach Net_IPv6:compress to handle a compressed address as input
Diffstat (limited to 'etc/inc/IPv6.inc')
| -rw-r--r-- | etc/inc/IPv6.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/etc/inc/IPv6.inc b/etc/inc/IPv6.inc index 453051e..7598226 100644 --- a/etc/inc/IPv6.inc +++ b/etc/inc/IPv6.inc @@ -580,6 +580,9 @@ class Net_IPv6 { $cip = preg_replace('/((^:)|(:$))/', '' ,$cip); $cip = preg_replace('/((^:)|(:$))/', '::' ,$cip); + } else { + // The input IP appears to be compressed already, give it back as-is to the caller. + $cip = $ip; } if ('' != $netmask) { |
