* net/tramp.el (tramp-ipv6-regexp): The regexp shall cover also

IPv4 mapped IPv6 addresses.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1cb1ccc80a821138575ae1b263ca84c5f513d9b..8a0bb2412ac323d2a6bd7811e930048e07d955d8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-19  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-ipv6-regexp): The regexp shall cover also
+       IPv4 mapped IPv6 addresses.
+
 2009-01-18  Juanma Barranquero  <lekktu@gmail.com>
 
        * textmodes/css-mode.el (css-backward-sexp): Stop once it reaches

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index b226f22ad98475ade1871e6fcffb1088e9c40f4c..5814810dd53662a6a1fca21302917d2ebb93e868 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1213,9 +1213,11 @@ Used in `tramp-make-tramp-file-name'.")
   "*Regexp matching left hand side of IPv6 addresses.
 Derived from `tramp-prefix-ipv6-format'.")
 
-;; The following regexp is a bit sloppy.  But it shall serve our purposes.
+;; The following regexp is a bit sloppy.  But it shall serve our
+;; purposes.  It covers also IPv4 mapped IPv6 addresses, like in
+;; "::ffff:192.168.0.1".
 (defconst tramp-ipv6-regexp
-  "\\(?:\\(?:[a-zA-Z0-9]+\\)?:\\)+[a-zA-Z0-9]+"
+  "\\(?:\\(?:[a-zA-Z0-9]+\\)?:\\)+[a-zA-Z0-9.]+"
   "*Regexp matching IPv6 addresses.")
 
 (defconst tramp-postfix-ipv6-format