From faf8419e1566ade4c0516b41b0559f99e242a0ef Mon Sep 17 00:00:00 2001 From: olt Date: Mon, 13 Jul 2009 09:28:55 -0400 Subject: [FIX] fix ftp host address on Windows Vista bzr revid: olt@tinyerp.com-20090713132855-do36xyiee2l048dv --- addons/document/ftpserver/__init__.py | 42 ++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) (limited to 'addons/document/ftpserver/__init__.py') diff --git a/addons/document/ftpserver/__init__.py b/addons/document/ftpserver/__init__.py index 7895755da5f..e31b1f5e5bd 100644 --- a/addons/document/ftpserver/__init__.py +++ b/addons/document/ftpserver/__init__.py @@ -35,23 +35,59 @@ if len(pps) == 2: PASSIVE_PORTS = int(pps[0]), int(pps[1]) class ftp_server(threading.Thread): - def log(self, level, message): + def log(self, level, message): logger = netsvc.Logger() logger.notifyChannel('FTP', level, message) + def detect_ip_addr(self): + def _detect_ip_addr(): + from array import array + import socket + from struct import pack, unpack + + try: + import fcntl + except ImportError: + fcntl = None + + if not fcntl: # not UNIX: + hostname = socket.gethostname() + ip_addr = socket.gethostbyname(hostname) + else: # UNIX: + # get all interfaces: + nbytes = 128 * 32 + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + names = array('B', '\0' * nbytes) + outbytes = unpack('iL', fcntl.ioctl( s.fileno(), 0x8912, pack('iL', nbytes, names.buffer_info()[0])))[0] + namestr = names.tostring() + ifaces = [namestr[i:i+32].split('\0', 1)[0] for i in range(0, outbytes, 32)] + + for ifname in [iface for iface in ifaces if iface != 'lo']: + ip_addr = socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, pack('256s', ifname[:15]))[20:24]) + break + return ip_addr + + try: + ip_addr = _detect_ip_addr() + except: + ip_addr = 'localhost' + return ip_addr + + def run(self): - autho = authorizer.authorizer() + autho = authorizer.authorizer() ftpserver.FTPHandler.authorizer = autho ftpserver.max_cons = 300 ftpserver.max_cons_per_ip = 50 ftpserver.FTPHandler.abstracted_fs = abstracted_fs.abstracted_fs if PASSIVE_PORTS: ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS - + ftpserver.log = lambda msg: self.log(netsvc.LOG_INFO, msg) ftpserver.logline = lambda msg: None ftpserver.logerror = lambda msg: self.log(netsvc.LOG_ERROR, msg) + HOST = self.detect_ip_addr() address = (HOST, PORT) ftpd = ftpserver.FTPServer(address, ftpserver.FTPHandler) ftpd.serve_forever() -- cgit v1.2.3 From 7e1a6139e3c8bb1450711e22d3c107b210590776 Mon Sep 17 00:00:00 2001 From: olt Date: Tue, 11 Aug 2009 08:40:04 -0400 Subject: [FIX] document: set default address to '' instead of 'localhost' bzr revid: olt@tinyerp.com-20090811124004-70qdwfbnh1g8iby7 --- addons/document/ftpserver/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/document/ftpserver/__init__.py') diff --git a/addons/document/ftpserver/__init__.py b/addons/document/ftpserver/__init__.py index e31b1f5e5bd..7a68a7e5821 100644 --- a/addons/document/ftpserver/__init__.py +++ b/addons/document/ftpserver/__init__.py @@ -70,7 +70,7 @@ class ftp_server(threading.Thread): try: ip_addr = _detect_ip_addr() except: - ip_addr = 'localhost' + ip_addr = '' return ip_addr -- cgit v1.2.3