[Python-checkins] CVS: python/dist/src/Lib BaseHTTPServer.py,1.15,1.16 SocketServer.py,1.25,1.26 ftplib.py,1.53,1.54 httplib.py,1.35,1.36 poplib.py,1.14,1.15 smtplib.py,1.36,1.37 telnetlib.py,1.11,1.12
Martin v. L?wis
loewis@users.sourceforge.net
2001年7月24日 13:34:10 -0700
Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv11791
Modified Files:
BaseHTTPServer.py SocketServer.py ftplib.py httplib.py
poplib.py smtplib.py telnetlib.py
Log Message:
Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients.
Index: BaseHTTPServer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/BaseHTTPServer.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** BaseHTTPServer.py 2001年02月09日 05:38:46 1.15
--- BaseHTTPServer.py 2001年07月24日 20:34:08 1.16
***************
*** 69,74 ****
--- 69,76 ----
import time
import socket # For gethostbyaddr()
+ import string
import mimetools
import SocketServer
+ import re
# Default error message
***************
*** 475,479 ****
httpd = ServerClass(server_address, HandlerClass)
! print "Serving HTTP on port", port, "..."
httpd.serve_forever()
--- 477,482 ----
httpd = ServerClass(server_address, HandlerClass)
! sa = httpd.socket.getsockname()
! print "Serving HTTP on", sa[0], "port", sa[1], "..."
httpd.serve_forever()
Index: SocketServer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/SocketServer.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** SocketServer.py 2001年07月10日 11:50:09 1.25
--- SocketServer.py 2001年07月24日 20:34:08 1.26
***************
*** 6,10 ****
- address family:
! - AF_INET: IP (Internet Protocol) sockets (default)
- AF_UNIX: Unix domain sockets
- others, e.g. AF_DECNET are conceivable (see <socket.h>
--- 6,10 ----
- address family:
! - AF_INET{,6}: IP (Internet Protocol) sockets (default)
- AF_UNIX: Unix domain sockets
- others, e.g. AF_DECNET are conceivable (see <socket.h>
Index: ftplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/ftplib.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** ftplib.py 2001年04月09日 04:31:50 1.53
--- ftplib.py 2001年07月24日 20:34:08 1.54
***************
*** 109,123 ****
if user: self.login(user, passwd, acct)
! def connect(self, host='', port=0):
! '''Connect to host. Arguments are:
! - host: hostname to connect to (string, default previous host)
! - port: port to connect to (integer, default previous port)'''
! if host: self.host = host
! if port: self.port = port
! self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! self.sock.connect((self.host, self.port))
! self.file = self.sock.makefile('rb')
! self.welcome = self.getresp()
! return self.welcome
def getwelcome(self):
--- 109,135 ----
if user: self.login(user, passwd, acct)
! def connect(self, host = '', port = 0):
! '''Connect to host. Arguments are:
! - host: hostname to connect to (string, default previous host)
! - port: port to connect to (integer, default previous port)'''
! if host: self.host = host
! if port: self.port = port
! self.passiveserver = 0
! for res in socket.getaddrinfo(self.host, self.port, 0, socket.SOCK_STREAM):
! af, socktype, proto, canonname, sa = res
! try:
! self.sock = socket.socket(af, socktype, proto)
! self.sock.connect(sa)
! except socket.error, msg:
! self.sock.close()
! self.sock = None
! continue
! break
! if not self.sock:
! raise socket.error, msg
! self.af = af
! self.file = self.sock.makefile('rb')
! self.welcome = self.getresp()
! return self.welcome
def getwelcome(self):
***************
*** 244,256 ****
return self.voidcmd(cmd)
def makeport(self):
! '''Create a new socket and send a PORT command for it.'''
! sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! sock.bind(('', 0))
! sock.listen(1)
! dummyhost, port = sock.getsockname() # Get proper port
! host, dummyport = self.sock.getsockname() # Get proper host
! resp = self.sendport(host, port)
! return sock
def ntransfercmd(self, cmd, rest=None):
--- 256,301 ----
return self.voidcmd(cmd)
+ def sendeprt(self, host, port):
+ '''Send a EPRT command with the current host and the given port number.'''
+ af = 0
+ if self.af == socket.AF_INET:
+ af = 1
+ if self.af == socket.AF_INET6:
+ af = 2
+ if af == 0:
+ raise error_proto, 'unsupported address family'
+ fields = ['', `af`, host, `port`, '']
+ cmd = 'EPRT ' + string.joinfields(fields, '|')
+ return self.voidcmd(cmd)
+
def makeport(self):
! '''Create a new socket and send a PORT command for it.'''
! for res in socket.getaddrinfo(None, 0, self.af, socket.SOCK_STREAM, 0, socket.AI_PASSIVE):
! af, socktype, proto, canonname, sa = res
! try:
! sock = socket.socket(af, socktype, proto)
! sock.bind(sa)
! except socket.error, msg:
! sock.close()
! sock = None
! continue
! break
! if not sock:
! raise socket.error, msg
! sock.listen(1)
! port = sock.getsockname()[1] # Get proper port
! host = self.sock.getsockname()[0] # Get proper host
! if self.af == socket.AF_INET:
! resp = self.sendport(host, port)
! else:
! resp = self.sendeprt(host, port)
! return sock
!
! def makepasv(self):
! if self.af == socket.AF_INET:
! host, port = parse227(self.sendcmd('PASV'))
! else:
! host, port = parse229(self.sendcmd('EPSV'), self.sock.getpeername())
! return host, port
def ntransfercmd(self, cmd, rest=None):
***************
*** 271,277 ****
size = None
if self.passiveserver:
! host, port = parse227(self.sendcmd('PASV'))
! conn=socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! conn.connect((host, port))
if rest is not None:
self.sendcmd("REST %s" % rest)
--- 316,323 ----
size = None
if self.passiveserver:
! host, port = self.makepasv()
! af, socktype, proto, canon, sa = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM)[0]
! conn = socket.socket(af, socktype, proto)
! conn.connect(sa)
if rest is not None:
self.sendcmd("REST %s" % rest)
***************
*** 521,524 ****
--- 567,592 ----
host = '.'.join(numbers[:4])
port = (int(numbers[4]) << 8) + int(numbers[5])
+ return host, port
+
+
+ def parse229(resp, peer):
+ '''Parse the '229' response for a EPSV request.
+ Raises error_proto if it does not contain '(|||port|)'
+ Return ('host.addr.as.numbers', port#) tuple.'''
+
+ if resp[:3] <> '229':
+ raise error_reply, resp
+ left = string.find(resp, '(')
+ if left < 0: raise error_proto, resp
+ right = string.find(resp, ')', left + 1)
+ if right < 0:
+ raise error_proto, resp # should contain '(|||port|)'
+ if resp[left + 1] <> resp[right - 1]:
+ raise error_proto, resp
+ parts = string.split(resp[left + 1:right], resp[left+1])
+ if len(parts) <> 5:
+ raise error_proto, resp
+ host = peer[0]
+ port = string.atoi(parts[3])
return host, port
Index: httplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/httplib.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** httplib.py 2001年06月01日 16:25:38 1.35
--- httplib.py 2001年07月24日 20:34:08 1.36
***************
*** 358,365 ****
def connect(self):
"""Connect to the host and port specified in __init__."""
! self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! if self.debuglevel > 0:
! print "connect: (%s, %s)" % (self.host, self.port)
! self.sock.connect((self.host, self.port))
def close(self):
--- 358,377 ----
def connect(self):
"""Connect to the host and port specified in __init__."""
! for res in socket.getaddrinfo(self.host, self.port, 0, socket.SOCK_STREAM):
! af, socktype, proto, canonname, sa = res
! try:
! self.sock = socket.socket(af, socktype, proto)
! if self.debuglevel > 0:
! print "connect: (%s, %s)" % (self.host, self.port)
! self.sock.connect(sa)
! except socket.error, msg:
! if self.debuglevel > 0:
! print 'connect fail:', (self.host, self.port)
! self.sock.close()
! self.sock = None
! continue
! break
! if not self.sock:
! raise socket.error, msg
def close(self):
Index: poplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/poplib.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** poplib.py 2001年02月12日 02:00:42 1.14
--- poplib.py 2001年07月24日 20:34:08 1.15
***************
*** 74,84 ****
def __init__(self, host, port = POP3_PORT):
! self.host = host
! self.port = port
! self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! self.sock.connect((self.host, self.port))
! self.file = self.sock.makefile('rb')
! self._debugging = 0
! self.welcome = self._getresp()
--- 74,94 ----
def __init__(self, host, port = POP3_PORT):
! self.host = host
! self.port = port
! for res in socket.getaddrinfo(self.host, self.port, 0, socket.SOCK_STREAM):
! af, socktype, proto, canonname, sa = res
! try:
! self.sock = socket.socket(af, socktype, proto)
! self.sock.connect(sa)
! except socket.error, msg:
! self.sock.close()
! self.sock = None
! continue
! break
! if not self.sock:
! raise socket.error, msg
! self.file = self.sock.makefile('rb')
! self._debugging = 0
! self.welcome = self._getresp()
Index: smtplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/smtplib.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** smtplib.py 2001年02月15日 22:15:13 1.36
--- smtplib.py 2001年07月24日 20:34:08 1.37
***************
*** 209,214 ****
"""
! if not port:
! i = host.find(':')
if i >= 0:
host, port = host[:i], host[i+1:]
--- 209,214 ----
"""
! if not port and (host.find(':') == host.rfind(':')):
! i = host.rfind(':')
if i >= 0:
host, port = host[:i], host[i+1:]
***************
*** 217,230 ****
raise socket.error, "nonnumeric port"
if not port: port = SMTP_PORT
! self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! if self.debuglevel > 0: print 'connect:', (host, port)
! try:
! self.sock.connect((host, port))
! except socket.error:
! self.close()
! raise
! (code,msg)=self.getreply()
! if self.debuglevel >0 : print "connect:", msg
! return (code,msg)
def send(self, str):
--- 217,238 ----
raise socket.error, "nonnumeric port"
if not port: port = SMTP_PORT
! if self.debuglevel > 0: print 'connect:', (host, port)
! for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
! af, socktype, proto, canonname, sa = res
! try:
! self.sock = socket.socket(af, socktype, proto)
! if self.debuglevel > 0: print 'connect:', (host, port)
! self.sock.connect(sa)
! except socket.error, msg:
! if self.debuglevel > 0: print 'connect fail:', (host, port)
! self.sock.close()
! self.sock = None
! continue
! break
! if not self.sock:
! raise socket.error, msg
! (code, msg) = self.getreply()
! if self.debuglevel > 0: print "connect:", msg
! return (code, msg)
def send(self, str):
Index: telnetlib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/telnetlib.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** telnetlib.py 2001年03月01日 04:27:19 1.11
--- telnetlib.py 2001年07月24日 20:34:08 1.12
***************
*** 137,142 ****
self.host = host
self.port = port
! self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! self.sock.connect((self.host, self.port))
def __del__(self):
--- 137,152 ----
self.host = host
self.port = port
! for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
! af, socktype, proto, canonname, sa = res
! try:
! self.sock = socket.socket(af, socktype, proto)
! self.sock.connect(sa)
! except socket.error, msg:
! self.sock.close()
! self.sock = None
! continue
! break
! if not self.sock:
! raise socket.error, msg
def __del__(self):