mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows

Browse source
This commit is contained in:
Georg Brandl 2005-08-26 08:34:00 +00:00
parent 4550b8db56
commit d2e3ba7a35
3 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_socket.py
View file

@ -380,10 +380,12 @@ class GeneralModuleTests(unittest.TestCase):
self.assertEquals('\xff\x00\xff\x00', f('255.0.255.0')) self.assertEquals('\xff\x00\xff\x00', f('255.0.255.0'))
self.assertEquals('\xaa\xaa\xaa\xaa', f('170.170.170.170')) self.assertEquals('\xaa\xaa\xaa\xaa', f('170.170.170.170'))
self.assertEquals('\x01\x02\x03\x04', f('1.2.3.4')) self.assertEquals('\x01\x02\x03\x04', f('1.2.3.4'))
self.assertEquals('\xff\xff\xff\xff', f('255.255.255.255'))
self.assertEquals('\x00\x00\x00\x00', g('0.0.0.0')) self.assertEquals('\x00\x00\x00\x00', g('0.0.0.0'))
self.assertEquals('\xff\x00\xff\x00', g('255.0.255.0')) self.assertEquals('\xff\x00\xff\x00', g('255.0.255.0'))
self.assertEquals('\xaa\xaa\xaa\xaa', g('170.170.170.170')) self.assertEquals('\xaa\xaa\xaa\xaa', g('170.170.170.170'))
self.assertEquals('\xff\xff\xff\xff', g('255.255.255.255'))
def testIPv6toString(self): def testIPv6toString(self):
if not hasattr(socket, 'inet_pton'): if not hasattr(socket, 'inet_pton'):

7
Misc/NEWS
View file

@ -133,9 +133,12 @@ Core and builtins
Extension Modules Extension Modules
----------------- -----------------
- Bug #1191043: Fix bz2.BZ2File.seek() for 64-bit file offsets. - Patch #756021: Special-case socket.inet_aton('255.255.255.255') for
platforms that don't have inet_aton().
- Bug #1215928: Fix bz2.BZ2File.(x)readlines for files containing one - Bug #1215928: Fix bz2.BZ2File.seek() for 64-bit file offsets.
- Bug #1191043: Fix bz2.BZ2File.(x)readlines for files containing one
line without newlines. line without newlines.
- Bug #728515: mmap.resize() now resizes the file on Unix as it did - Bug #728515: mmap.resize() now resizes the file on Unix as it did

19
Modules/socketmodule.c
View file

@ -3238,14 +3238,19 @@ socket_inet_aton(PyObject *self, PyObject *args)
return NULL; return NULL;
#else /* ! HAVE_INET_ATON */ #else /* ! HAVE_INET_ATON */
/* XXX Problem here: inet_aton('255.255.255.255') raises /* special-case this address as inet_addr might return INADDR_NONE
an exception while it should be a valid address. */ * for this */
packed_addr = inet_addr(ip_addr); if (strcmp(ip_addr, "255.255.255.255") == 0) {
packed_addr = 0xFFFFFFFF;
} else {
packed_addr = inet_addr(ip_addr);
if (packed_addr == INADDR_NONE) { /* invalid address */ if (packed_addr == INADDR_NONE) { /* invalid address */
PyErr_SetString(socket_error, PyErr_SetString(socket_error,
"illegal IP address string passed to inet_aton"); "illegal IP address string passed to inet_aton");
return NULL; return NULL;
}
} }
return PyString_FromStringAndSize((char *) &packed_addr, return PyString_FromStringAndSize((char *) &packed_addr,
sizeof(packed_addr)); sizeof(packed_addr));