mirror of
https://github.com/python/cpython.git
synced 2024-12-04 23:34:42 +08:00
89f507fe8c
Merged revisions 51434-53004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51434 | neal.norwitz | 2006-08-21 20:20:10 +0200 (Mon, 21 Aug 2006) | 1 line Fix a couple of ssize-t issues reported by Alexander Belopolsky on python-dev ........ r51439 | neal.norwitz | 2006-08-21 21:47:08 +0200 (Mon, 21 Aug 2006) | 6 lines Patch #1542451: disallow continue anywhere under a finally I'm undecided if this should be backported to 2.5 or 2.5.1. Armin suggested to wait (I'm of the same opinion). Thomas W thinks it's fine to go in 2.5. ........ r51443 | neal.norwitz | 2006-08-21 22:16:24 +0200 (Mon, 21 Aug 2006) | 4 lines Handle a few more error conditions. Klocwork 301 and 302. Will backport. ........ r51450 | neal.norwitz | 2006-08-22 00:21:19 +0200 (Tue, 22 Aug 2006) | 5 lines Patch #1541585: fix buffer overrun when performing repr() on a unicode string in a build with wide unicode (UCS-4) support. This code could be improved, so add an XXX comment. ........ r51456 | neal.norwitz | 2006-08-22 01:44:48 +0200 (Tue, 22 Aug 2006) | 1 line Try to get the windows bots working again with the new peephole.c ........ r51461 | anthony.baxter | 2006-08-22 09:36:59 +0200 (Tue, 22 Aug 2006) | 1 line patch for documentation for recent uuid changes (from ping) ........ r51473 | neal.norwitz | 2006-08-22 15:56:56 +0200 (Tue, 22 Aug 2006) | 1 line Alexander Belopolsky pointed out that pos is a size_t ........ r51489 | jeremy.hylton | 2006-08-22 22:46:00 +0200 (Tue, 22 Aug 2006) | 2 lines Expose column offset information in parse trees. ........ r51497 | andrew.kuchling | 2006-08-23 01:13:43 +0200 (Wed, 23 Aug 2006) | 1 line Move functional howto into trunk ........ r51515 | jeremy.hylton | 2006-08-23 20:37:43 +0200 (Wed, 23 Aug 2006) | 2 lines Baby steps towards better tests for tokenize ........ r51525 | alex.martelli | 2006-08-23 22:42:02 +0200 (Wed, 23 Aug 2006) | 6 lines x**2 should about equal x*x (including for a float x such that the result is inf) but didn't; added a test to test_float to verify that, and ignored the ERANGE value for errno in the pow operation to make the new test pass (with help from Marilyn Davis at the Google Python Sprint -- thanks!). ........ r51526 | jeremy.hylton | 2006-08-23 23:14:03 +0200 (Wed, 23 Aug 2006) | 20 lines Bug fixes large and small for tokenize. Small: Always generate a NL or NEWLINE token following a COMMENT token. The old code did not generate an NL token if the comment was on a line by itself. Large: The output of untokenize() will now match the input exactly if it is passed the full token sequence. The old, crufty output is still generated if a limited input sequence is provided, where limited means that it does not include position information for tokens. Remaining bug: There is no CONTINUATION token (\) so there is no way for untokenize() to handle such code. Also, expanded the number of doctests in hopes of eventually removing the old-style tests that compare against a golden file. Bug fix candidate for Python 2.5.1. (Sigh.) ........ r51527 | jeremy.hylton | 2006-08-23 23:26:46 +0200 (Wed, 23 Aug 2006) | 5 lines Replace dead code with an assert. Now that COMMENT tokens are reliably followed by NL or NEWLINE, there is never a need to add extra newlines in untokenize. ........ r51530 | alex.martelli | 2006-08-24 00:17:59 +0200 (Thu, 24 Aug 2006) | 7 lines Reverting the patch that tried to fix the issue whereby x**2 raises OverflowError while x*x succeeds and produces infinity; apparently these inconsistencies cannot be fixed across ``all'' platforms and there's a widespread feeling that therefore ``every'' platform should keep suffering forevermore. Ah well. ........ r51565 | thomas.wouters | 2006-08-24 20:40:20 +0200 (Thu, 24 Aug 2006) | 6 lines Fix SF bug #1545837: array.array borks on deepcopy. array.__deepcopy__() needs to take an argument, even if it doesn't actually use it. Will backport to 2.5 and 2.4 (if applicable.) ........ r51580 | martin.v.loewis | 2006-08-25 02:03:34 +0200 (Fri, 25 Aug 2006) | 3 lines Patch #1545507: Exclude ctypes package in Win64 MSI file. Will backport to 2.5. ........ r51589 | neal.norwitz | 2006-08-25 03:52:49 +0200 (Fri, 25 Aug 2006) | 1 line importing types is not necessary if we use isinstance ........ r51604 | thomas.heller | 2006-08-25 09:27:33 +0200 (Fri, 25 Aug 2006) | 3 lines Port _ctypes.pyd to win64 on AMD64. ........ r51605 | thomas.heller | 2006-08-25 09:34:51 +0200 (Fri, 25 Aug 2006) | 3 lines Add missing file for _ctypes.pyd port to win64 on AMD64. ........ r51606 | thomas.heller | 2006-08-25 11:26:33 +0200 (Fri, 25 Aug 2006) | 6 lines Build _ctypes.pyd for win AMD64 into the MSVC project file. Since MSVC doesn't know about .asm files, a helper batch file is needed to find ml64.exe in predefined locations. The helper script hardcodes the path to the MS Platform SDK. ........ r51608 | armin.rigo | 2006-08-25 14:44:28 +0200 (Fri, 25 Aug 2006) | 4 lines The regular expression engine in '_sre' can segfault when interpreting bogus bytecode. It is unclear whether this is a real bug or a "won't fix" case like bogus_code_obj.py. ........ r51617 | tim.peters | 2006-08-26 00:05:39 +0200 (Sat, 26 Aug 2006) | 2 lines Whitespace normalization. ........ r51618 | tim.peters | 2006-08-26 00:06:44 +0200 (Sat, 26 Aug 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51619 | tim.peters | 2006-08-26 00:26:21 +0200 (Sat, 26 Aug 2006) | 3 lines A new test here relied on preserving invisible trailing whitespace in expected output. Stop that. ........ r51624 | jack.diederich | 2006-08-26 20:42:06 +0200 (Sat, 26 Aug 2006) | 4 lines - Move functions common to all path modules into genericpath.py and have the OS speicifc path modules import them. - Have os2emxpath import common functions fron ntpath instead of using copies ........ r51642 | neal.norwitz | 2006-08-29 07:40:58 +0200 (Tue, 29 Aug 2006) | 1 line Fix a couple of typos. ........ r51647 | marc-andre.lemburg | 2006-08-29 12:34:12 +0200 (Tue, 29 Aug 2006) | 5 lines Fix a buglet in the error reporting (SF bug report #1546372). This should probably go into Python 2.5 or 2.5.1 as well. ........ r51663 | armin.rigo | 2006-08-31 10:51:06 +0200 (Thu, 31 Aug 2006) | 3 lines Doc fix: hashlib objects don't always return a digest of 16 bytes. Backport candidate for 2.5. ........ r51664 | nick.coghlan | 2006-08-31 14:00:43 +0200 (Thu, 31 Aug 2006) | 1 line Fix the wrongheaded implementation of context management in the decimal module and add unit tests. (python-dev discussion is ongoing regarding what we do about Python 2.5) ........ r51665 | nick.coghlan | 2006-08-31 14:51:25 +0200 (Thu, 31 Aug 2006) | 1 line Remove the old decimal context management tests from test_contextlib (guess who didn't run the test suite before committing...) ........ r51669 | brett.cannon | 2006-08-31 20:54:26 +0200 (Thu, 31 Aug 2006) | 4 lines Make sure memory is properly cleaned up in file_init. Backport candidate. ........ r51671 | brett.cannon | 2006-08-31 23:47:52 +0200 (Thu, 31 Aug 2006) | 2 lines Fix comment about indentation level in C files. ........ r51674 | brett.cannon | 2006-09-01 00:42:37 +0200 (Fri, 01 Sep 2006) | 3 lines Have pre-existing C files use 8 spaces indents (to match old PEP 7 style), but have all new files use 4 spaces (to match current PEP 7 style). ........ r51676 | fred.drake | 2006-09-01 05:57:19 +0200 (Fri, 01 Sep 2006) | 3 lines - SF patch #1550263: Enhance and correct unittest docs - various minor cleanups for improved consistency ........ r51677 | georg.brandl | 2006-09-02 00:30:52 +0200 (Sat, 02 Sep 2006) | 2 lines evalfile() should be execfile(). ........ r51681 | neal.norwitz | 2006-09-02 04:43:17 +0200 (Sat, 02 Sep 2006) | 1 line SF #1547931, fix typo (missing and). Will backport to 2.5 ........ r51683 | neal.norwitz | 2006-09-02 04:50:35 +0200 (Sat, 02 Sep 2006) | 1 line Bug #1548092: fix curses.tparm seg fault on invalid input. Needs backport to 2.5.1 and earlier. ........ r51684 | neal.norwitz | 2006-09-02 04:58:13 +0200 (Sat, 02 Sep 2006) | 4 lines Bug #1550714: fix SystemError from itertools.tee on negative value for n. Needs backport to 2.5.1 and earlier. ........ r51685 | nick.coghlan | 2006-09-02 05:54:17 +0200 (Sat, 02 Sep 2006) | 1 line Make decimal.ContextManager a private implementation detail of decimal.localcontext() ........ r51686 | nick.coghlan | 2006-09-02 06:04:18 +0200 (Sat, 02 Sep 2006) | 1 line Further corrections to the decimal module context management documentation ........ r51688 | raymond.hettinger | 2006-09-02 19:07:23 +0200 (Sat, 02 Sep 2006) | 1 line Fix documentation nits for decimal context managers. ........ r51690 | neal.norwitz | 2006-09-02 20:51:34 +0200 (Sat, 02 Sep 2006) | 1 line Add missing word in comment ........ r51691 | neal.norwitz | 2006-09-02 21:40:19 +0200 (Sat, 02 Sep 2006) | 7 lines Hmm, this test has failed at least twice recently on the OpenBSD and Debian sparc buildbots. Since this goes through a lot of tests and hits the disk a lot it could be slow (especially if NFS is involved). I'm not sure if that's the problem, but printing periodic msgs shouldn't hurt. The code was stolen from test_compiler. ........ r51693 | nick.coghlan | 2006-09-03 03:02:00 +0200 (Sun, 03 Sep 2006) | 1 line Fix final documentation nits before backporting decimal module fixes to 2.5 ........ r51694 | nick.coghlan | 2006-09-03 03:06:07 +0200 (Sun, 03 Sep 2006) | 1 line Typo fix for decimal docs ........ r51697 | nick.coghlan | 2006-09-03 03:20:46 +0200 (Sun, 03 Sep 2006) | 1 line NEWS entry on trunk for decimal module changes ........ r51704 | raymond.hettinger | 2006-09-04 17:32:48 +0200 (Mon, 04 Sep 2006) | 1 line Fix endcase for str.rpartition() ........ r51716 | tim.peters | 2006-09-05 04:18:09 +0200 (Tue, 05 Sep 2006) | 12 lines "Conceptual" merge of rev 51711 from the 2.5 branch. i_divmod(): As discussed on Python-Dev, changed the overflow checking to live happily with recent gcc optimizations that assume signed integer arithmetic never overflows. This differs from the corresponding change on the 2.5 and 2.4 branches, using a less obscure approach, but one that /may/ tickle platform idiocies in their definitions of LONG_MIN. The 2.4 + 2.5 change avoided introducing a dependence on LONG_MIN, at the cost of substantially goofier code. ........ r51717 | tim.peters | 2006-09-05 04:21:19 +0200 (Tue, 05 Sep 2006) | 2 lines Whitespace normalization. ........ r51719 | tim.peters | 2006-09-05 04:22:17 +0200 (Tue, 05 Sep 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51720 | neal.norwitz | 2006-09-05 04:24:03 +0200 (Tue, 05 Sep 2006) | 2 lines Fix SF bug #1546288, crash in dict_equal. ........ r51721 | neal.norwitz | 2006-09-05 04:25:41 +0200 (Tue, 05 Sep 2006) | 1 line Fix SF #1552093, eval docstring typo (3 ps in mapping) ........ r51724 | neal.norwitz | 2006-09-05 04:35:08 +0200 (Tue, 05 Sep 2006) | 1 line This was found by Guido AFAIK on p3yk (sic) branch. ........ r51725 | neal.norwitz | 2006-09-05 04:36:20 +0200 (Tue, 05 Sep 2006) | 1 line Add a NEWS entry for str.rpartition() change ........ r51728 | neal.norwitz | 2006-09-05 04:57:01 +0200 (Tue, 05 Sep 2006) | 1 line Patch #1540470, for OpenBSD 4.0. Backport candidate for 2.[34]. ........ r51729 | neal.norwitz | 2006-09-05 05:53:08 +0200 (Tue, 05 Sep 2006) | 12 lines Bug #1520864 (again): unpacking singleton tuples in list comprehensions and generator expressions (x for x, in ... ) works again. Sigh, I only fixed for loops the first time, not list comps and genexprs too. I couldn't find any more unpacking cases where there is a similar bug lurking. This code should be refactored to eliminate the duplication. I'm sure the listcomp/genexpr code can be refactored. I'm not sure if the for loop can re-use any of the same code though. Will backport to 2.5 (the only place it matters). ........ r51731 | neal.norwitz | 2006-09-05 05:58:26 +0200 (Tue, 05 Sep 2006) | 1 line Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. ........ r51732 | neal.norwitz | 2006-09-05 06:00:12 +0200 (Tue, 05 Sep 2006) | 1 line M-x untabify ........ r51737 | hyeshik.chang | 2006-09-05 14:07:09 +0200 (Tue, 05 Sep 2006) | 7 lines Fix a few bugs on cjkcodecs found by Oren Tirosh: - gbk and gb18030 codec now handle U+30FB KATAKANA MIDDLE DOT correctly. - iso2022_jp_2 codec now encodes into G0 for KS X 1001, GB2312 codepoints to conform the standard. - iso2022_jp_3 and iso2022_jp_2004 codec can encode JIS X 2013:2 codepoints now. ........ r51738 | hyeshik.chang | 2006-09-05 14:14:57 +0200 (Tue, 05 Sep 2006) | 2 lines Fix a typo: 2013 -> 0213 ........ r51740 | georg.brandl | 2006-09-05 14:44:58 +0200 (Tue, 05 Sep 2006) | 3 lines Bug #1552618: change docs of dict.has_key() to reflect recommendation to use "in". ........ r51742 | andrew.kuchling | 2006-09-05 15:02:40 +0200 (Tue, 05 Sep 2006) | 1 line Rearrange example a bit, and show rpartition() when separator is not found ........ r51744 | andrew.kuchling | 2006-09-05 15:15:41 +0200 (Tue, 05 Sep 2006) | 1 line [Bug #1525469] SimpleXMLRPCServer still uses the sys.exc_{value,type} module-level globals instead of calling sys.exc_info(). Reported by Russell Warren ........ r51745 | andrew.kuchling | 2006-09-05 15:19:18 +0200 (Tue, 05 Sep 2006) | 3 lines [Bug #1526834] Fix crash in pdb when you do 'b f('; the function name was placed into a regex pattern and the unbalanced paren caused re.compile() to report an error ........ r51751 | kristjan.jonsson | 2006-09-05 19:58:12 +0200 (Tue, 05 Sep 2006) | 6 lines Update the PCBuild8 solution. Facilitate cross-compilation by having binaries in separate Win32 and x64 directories. Rationalized configs by making proper use of platforms/configurations. Remove pythoncore_pgo project. Add new PGIRelease and PGORelease configurations to perform Profile Guided Optimisation. Removed I64 support, but this can be easily added by copying the x64 platform settings. ........ r51758 | gustavo.niemeyer | 2006-09-06 03:58:52 +0200 (Wed, 06 Sep 2006) | 3 lines Fixing #1531862: Do not close standard file descriptors in the subprocess module. ........ r51760 | neal.norwitz | 2006-09-06 05:58:34 +0200 (Wed, 06 Sep 2006) | 1 line Revert 51758 because it broke all the buildbots ........ r51762 | georg.brandl | 2006-09-06 08:03:59 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1551427: fix a wrong NULL pointer check in the win32 version of os.urandom(). ........ r51765 | georg.brandl | 2006-09-06 08:09:31 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1550983: emit better error messages for erroneous relative imports (if not in package and if beyond toplevel package). ........ r51767 | neal.norwitz | 2006-09-06 08:28:06 +0200 (Wed, 06 Sep 2006) | 1 line with and as are now keywords. There are some generated files I can't recreate. ........ r51770 | georg.brandl | 2006-09-06 08:50:05 +0200 (Wed, 06 Sep 2006) | 5 lines Bug #1542051: Exceptions now correctly call PyObject_GC_UnTrack. Also make sure that every exception class has __module__ set to 'exceptions'. ........ r51785 | georg.brandl | 2006-09-06 22:05:58 +0200 (Wed, 06 Sep 2006) | 2 lines Fix missing import of the types module in logging.config. ........ r51789 | marc-andre.lemburg | 2006-09-06 22:40:22 +0200 (Wed, 06 Sep 2006) | 3 lines Add news item for bug fix of SF bug report #1546372. ........ r51797 | gustavo.niemeyer | 2006-09-07 02:48:33 +0200 (Thu, 07 Sep 2006) | 3 lines Fixed subprocess bug #1531862 again, after removing tests offending buildbot ........ r51798 | raymond.hettinger | 2006-09-07 04:42:48 +0200 (Thu, 07 Sep 2006) | 1 line Fix refcounts and add error checks. ........ r51803 | nick.coghlan | 2006-09-07 12:50:34 +0200 (Thu, 07 Sep 2006) | 1 line Fix the speed regression in inspect.py by adding another cache to speed up getmodule(). Patch #1553314 ........ r51805 | ronald.oussoren | 2006-09-07 14:03:10 +0200 (Thu, 07 Sep 2006) | 2 lines Fix a glaring error and update some version numbers. ........ r51814 | andrew.kuchling | 2006-09-07 15:56:23 +0200 (Thu, 07 Sep 2006) | 1 line Typo fix ........ r51815 | andrew.kuchling | 2006-09-07 15:59:38 +0200 (Thu, 07 Sep 2006) | 8 lines [Bug #1552726] Avoid repeatedly polling in interactive mode -- only put a timeout on the select() if an input hook has been defined. Patch by Richard Boulton. This select() code is only executed with readline 2.1, or if READLINE_CALLBACKS is defined. Backport candidate for 2.5, 2.4, probably earlier versions too. ........ r51816 | armin.rigo | 2006-09-07 17:06:00 +0200 (Thu, 07 Sep 2006) | 2 lines Add a warning notice on top of the generated grammar.txt. ........ r51819 | thomas.heller | 2006-09-07 20:56:28 +0200 (Thu, 07 Sep 2006) | 5 lines Anonymous structure fields that have a bit-width specified did not work, and they gave a strange error message from PyArg_ParseTuple: function takes exactly 2 arguments (3 given). With tests. ........ r51820 | thomas.heller | 2006-09-07 21:09:54 +0200 (Thu, 07 Sep 2006) | 4 lines The cast function did not accept c_char_p or c_wchar_p instances as first argument, and failed with a 'bad argument to internal function' error message. ........ r51827 | nick.coghlan | 2006-09-08 12:04:38 +0200 (Fri, 08 Sep 2006) | 1 line Add missing NEWS entry for rev 51803 ........ r51828 | andrew.kuchling | 2006-09-08 15:25:23 +0200 (Fri, 08 Sep 2006) | 1 line Add missing word ........ r51829 | andrew.kuchling | 2006-09-08 15:35:49 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51830 | andrew.kuchling | 2006-09-08 15:36:36 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51832 | andrew.kuchling | 2006-09-08 16:02:45 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51833 | andrew.kuchling | 2006-09-08 16:03:01 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51835 | andrew.kuchling | 2006-09-08 16:05:10 +0200 (Fri, 08 Sep 2006) | 1 line Fix typo in example ........ r51837 | brett.cannon | 2006-09-09 09:11:46 +0200 (Sat, 09 Sep 2006) | 6 lines Remove the __unicode__ method from exceptions. Allows unicode() to be called on exception classes. Would require introducing a tp_unicode slot to make it work otherwise. Fixes bug #1551432 and will be backported. ........ r51854 | neal.norwitz | 2006-09-11 06:24:09 +0200 (Mon, 11 Sep 2006) | 8 lines Forward port of 51850 from release25-maint branch. As mentioned on python-dev, reverting patch #1504333 because it introduced an infinite loop in rev 47154. This patch also adds a test to prevent the regression. ........ r51855 | neal.norwitz | 2006-09-11 06:28:16 +0200 (Mon, 11 Sep 2006) | 5 lines Properly handle a NULL returned from PyArena_New(). (Also fix some whitespace) Klocwork #364. ........ r51856 | neal.norwitz | 2006-09-11 06:32:57 +0200 (Mon, 11 Sep 2006) | 1 line Add a "crasher" taken from the sgml bug report referenced in the comment ........ r51858 | georg.brandl | 2006-09-11 11:38:35 +0200 (Mon, 11 Sep 2006) | 12 lines Forward-port of rev. 51857: Building with HP's cc on HP-UX turned up a couple of problems. _PyGILState_NoteThreadState was declared as static inconsistently. Make it static as it's not necessary outside of this module. Some tests failed because errno was reset to 0. (I think the tests that failed were at least: test_fcntl and test_mailbox). Ensure that errno doesn't change after a call to Py_END_ALLOW_THREADS. This only affected debug builds. ........ r51865 | martin.v.loewis | 2006-09-12 21:49:20 +0200 (Tue, 12 Sep 2006) | 2 lines Forward-port 51862: Add sgml_input.html. ........ r51866 | andrew.kuchling | 2006-09-12 22:50:23 +0200 (Tue, 12 Sep 2006) | 1 line Markup typo fix ........ r51867 | andrew.kuchling | 2006-09-12 23:09:02 +0200 (Tue, 12 Sep 2006) | 1 line Some editing, markup fixes ........ r51868 | andrew.kuchling | 2006-09-12 23:21:51 +0200 (Tue, 12 Sep 2006) | 1 line More wordsmithing ........ r51877 | andrew.kuchling | 2006-09-14 13:22:18 +0200 (Thu, 14 Sep 2006) | 1 line Make --help mention that -v can be supplied multiple times ........ r51878 | andrew.kuchling | 2006-09-14 13:28:50 +0200 (Thu, 14 Sep 2006) | 1 line Rewrite help message to remove some of the parentheticals. (There were a lot of them.) ........ r51883 | ka-ping.yee | 2006-09-15 02:34:19 +0200 (Fri, 15 Sep 2006) | 2 lines Fix grammar errors and improve clarity. ........ r51885 | georg.brandl | 2006-09-15 07:22:24 +0200 (Fri, 15 Sep 2006) | 3 lines Correct elementtree module index entry. ........ r51889 | fred.drake | 2006-09-15 17:18:04 +0200 (Fri, 15 Sep 2006) | 4 lines - fix module name in links in formatted documentation - minor markup cleanup (forward-ported from release25-maint revision 51888) ........ r51891 | fred.drake | 2006-09-15 18:11:27 +0200 (Fri, 15 Sep 2006) | 3 lines revise explanation of returns_unicode to reflect bool values and to include the default value (merged from release25-maint revision 51890) ........ r51897 | martin.v.loewis | 2006-09-16 19:36:37 +0200 (Sat, 16 Sep 2006) | 2 lines Patch #1557515: Add RLIMIT_SBSIZE. ........ r51903 | ronald.oussoren | 2006-09-17 20:42:53 +0200 (Sun, 17 Sep 2006) | 2 lines Port of revision 51902 in release25-maint to the trunk ........ r51904 | ronald.oussoren | 2006-09-17 21:23:27 +0200 (Sun, 17 Sep 2006) | 3 lines Tweak Mac/Makefile in to ensure that pythonw gets rebuild when the major version of python changes (2.5 -> 2.6). Bug #1552935. ........ r51913 | guido.van.rossum | 2006-09-18 23:36:16 +0200 (Mon, 18 Sep 2006) | 2 lines Make this thing executable. ........ r51920 | gregory.p.smith | 2006-09-19 19:35:04 +0200 (Tue, 19 Sep 2006) | 5 lines Fixes a bug with bsddb.DB.stat where the flags and txn keyword arguments are transposed. (reported by Louis Zechtzer) ..already committed to release24-maint ..needs committing to release25-maint ........ r51926 | brett.cannon | 2006-09-20 20:34:28 +0200 (Wed, 20 Sep 2006) | 3 lines Accidentally didn't commit Misc/NEWS entry on when __unicode__() was removed from exceptions. ........ r51927 | brett.cannon | 2006-09-20 20:43:13 +0200 (Wed, 20 Sep 2006) | 6 lines Allow exceptions to be directly sliced again (e.g., ``BaseException(1,2,3)[0:2]``). Discovered in Python 2.5.0 by Thomas Heller and reported to python-dev. This should be backported to 2.5 . ........ r51928 | brett.cannon | 2006-09-20 21:28:35 +0200 (Wed, 20 Sep 2006) | 2 lines Make python.vim output more deterministic. ........ r51949 | walter.doerwald | 2006-09-21 17:09:55 +0200 (Thu, 21 Sep 2006) | 2 lines Fix typo. ........ r51950 | jack.diederich | 2006-09-21 19:50:26 +0200 (Thu, 21 Sep 2006) | 5 lines * regression bug, count_next was coercing a Py_ssize_t to an unsigned Py_size_t which breaks negative counts * added test for negative numbers will backport to 2.5.1 ........ r51953 | jack.diederich | 2006-09-21 22:34:49 +0200 (Thu, 21 Sep 2006) | 1 line added itertools.count(-n) fix ........ r51971 | neal.norwitz | 2006-09-22 10:16:26 +0200 (Fri, 22 Sep 2006) | 10 lines Fix %zd string formatting on Mac OS X so it prints negative numbers. In addition to testing positive numbers, verify negative numbers work in configure. In order to avoid compiler warnings on OS X 10.4, also change the order of the check for the format character to use (PY_FORMAT_SIZE_T) in the sprintf format for Py_ssize_t. This patch changes PY_FORMAT_SIZE_T from "" to "l" if it wasn't defined at configure time. Need to verify the buildbot results. Backport candidate (if everyone thinks this patch can't be improved). ........ r51972 | neal.norwitz | 2006-09-22 10:18:10 +0200 (Fri, 22 Sep 2006) | 7 lines Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). These tests should be improved. Hopefully this fixes variations when flipping back and forth between fpdef and fplist. Backport candidate. ........ r51975 | neal.norwitz | 2006-09-22 10:47:23 +0200 (Fri, 22 Sep 2006) | 4 lines Mostly revert this file to the same version as before. Only force setting of PY_FORMAT_SIZE_T to "l" for Mac OSX. I don't know a better define to use. This should get rid of the warnings on other platforms and Mac too. ........ r51986 | fred.drake | 2006-09-23 02:26:31 +0200 (Sat, 23 Sep 2006) | 1 line add boilerplate "What's New" document so the docs will build ........ r51987 | neal.norwitz | 2006-09-23 06:11:38 +0200 (Sat, 23 Sep 2006) | 1 line Remove extra semi-colons reported by Johnny Lee on python-dev. Backport if anyone cares. ........ r51989 | neal.norwitz | 2006-09-23 20:11:58 +0200 (Sat, 23 Sep 2006) | 1 line SF Bug #1563963, add missing word and cleanup first sentance ........ r51990 | brett.cannon | 2006-09-23 21:53:20 +0200 (Sat, 23 Sep 2006) | 3 lines Make output on test_strptime() be more verbose in face of failure. This is in hopes that more information will help debug the failing test on HPPA Ubuntu. ........ r51991 | georg.brandl | 2006-09-24 12:36:01 +0200 (Sun, 24 Sep 2006) | 2 lines Fix webbrowser.BackgroundBrowser on Windows. ........ r51993 | georg.brandl | 2006-09-24 14:35:36 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in the parser's future statement handling that led to "with" not being recognized as a keyword after, e.g., this statement: from __future__ import division, with_statement ........ r51995 | georg.brandl | 2006-09-24 14:50:24 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in traceback.format_exception_only() that led to an error being raised when print_exc() was called without an exception set. In version 2.4, this printed "None", restored that behavior. ........ r52000 | armin.rigo | 2006-09-25 17:16:26 +0200 (Mon, 25 Sep 2006) | 2 lines Another crasher. ........ r52011 | brett.cannon | 2006-09-27 01:38:24 +0200 (Wed, 27 Sep 2006) | 2 lines Make the error message for when the time data and format do not match clearer. ........ r52014 | andrew.kuchling | 2006-09-27 18:37:30 +0200 (Wed, 27 Sep 2006) | 1 line Add news item for rev. 51815 ........ r52018 | andrew.kuchling | 2006-09-27 21:23:05 +0200 (Wed, 27 Sep 2006) | 1 line Make examples do error checking on Py_InitModule ........ r52032 | brett.cannon | 2006-09-29 00:10:14 +0200 (Fri, 29 Sep 2006) | 2 lines Very minor grammatical fix in a comment. ........ r52048 | george.yoshida | 2006-09-30 07:14:02 +0200 (Sat, 30 Sep 2006) | 4 lines SF bug #1567976 : fix typo Will backport to 2.5. ........ r52051 | gregory.p.smith | 2006-09-30 08:08:20 +0200 (Sat, 30 Sep 2006) | 2 lines wording change ........ r52053 | georg.brandl | 2006-09-30 09:24:48 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1567375: a minor logical glitch in example description. ........ r52056 | georg.brandl | 2006-09-30 09:31:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1565661: in webbrowser, split() the command for the default GNOME browser in case it is a command with args. ........ r52058 | georg.brandl | 2006-09-30 10:43:30 +0200 (Sat, 30 Sep 2006) | 4 lines Patch #1567691: super() and new.instancemethod() now don't accept keyword arguments any more (previously they accepted them, but didn't use them). ........ r52061 | georg.brandl | 2006-09-30 11:03:42 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566800: make sure that EnvironmentError can be called with any number of arguments, as was the case in Python 2.4. ........ r52063 | georg.brandl | 2006-09-30 11:06:45 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1566663: remove obsolete example from datetime docs. ........ r52065 | georg.brandl | 2006-09-30 11:13:21 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566602: correct failure of posixpath unittest when $HOME ends with a slash. ........ r52068 | georg.brandl | 2006-09-30 12:58:01 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1457823: cgi.(Sv)FormContentDict's constructor now takes keep_blank_values and strict_parsing keyword arguments. ........ r52069 | georg.brandl | 2006-09-30 13:06:47 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1560617: in pyclbr, return full module name not only for classes, but also for functions. ........ r52072 | georg.brandl | 2006-09-30 13:17:34 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1556784: allow format strings longer than 127 characters in datetime's strftime function. ........ r52075 | georg.brandl | 2006-09-30 13:22:28 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1446043: correctly raise a LookupError if an encoding name given to encodings.search_function() contains a dot. ........ r52078 | georg.brandl | 2006-09-30 14:02:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1546052: clarify that PyString_FromString(AndSize) copies the string pointed to by its parameter. ........ r52080 | georg.brandl | 2006-09-30 14:16:03 +0200 (Sat, 30 Sep 2006) | 3 lines Convert test_import to unittest. ........ r52083 | kurt.kaiser | 2006-10-01 23:16:45 +0200 (Sun, 01 Oct 2006) | 5 lines Some syntax errors were being caught by tokenize during the tabnanny check, resulting in obscure error messages. Do the syntax check first. Bug 1562716, 1562719 ........ r52084 | kurt.kaiser | 2006-10-01 23:54:37 +0200 (Sun, 01 Oct 2006) | 3 lines Add comment explaining that error msgs may be due to user code when running w/o subprocess. ........ r52086 | martin.v.loewis | 2006-10-02 16:55:51 +0200 (Mon, 02 Oct 2006) | 3 lines Fix test for uintptr_t. Fixes #1568842. Will backport. ........ r52089 | martin.v.loewis | 2006-10-02 17:20:37 +0200 (Mon, 02 Oct 2006) | 3 lines Guard uintptr_t test with HAVE_STDINT_H, test for stdint.h. Will backport. ........ r52100 | vinay.sajip | 2006-10-03 20:02:37 +0200 (Tue, 03 Oct 2006) | 1 line Documentation omitted the additional parameter to LogRecord.__init__ which was added in 2.5. (See SF #1569622). ........ r52101 | vinay.sajip | 2006-10-03 20:20:26 +0200 (Tue, 03 Oct 2006) | 1 line Documentation clarified to mention optional parameters. ........ r52102 | vinay.sajip | 2006-10-03 20:21:56 +0200 (Tue, 03 Oct 2006) | 1 line Modified LogRecord.__init__ to make the func parameter optional. (See SF #1569622). ........ r52121 | brett.cannon | 2006-10-03 23:58:55 +0200 (Tue, 03 Oct 2006) | 2 lines Fix minor typo in a comment. ........ r52123 | brett.cannon | 2006-10-04 01:23:14 +0200 (Wed, 04 Oct 2006) | 2 lines Convert test_imp over to unittest. ........ r52128 | barry.warsaw | 2006-10-04 04:06:36 +0200 (Wed, 04 Oct 2006) | 3 lines decode_rfc2231(): As Christian Robottom Reis points out, it makes no sense to test for parts > 3 when we use .split(..., 2). ........ r52129 | jeremy.hylton | 2006-10-04 04:24:52 +0200 (Wed, 04 Oct 2006) | 9 lines Fix for SF bug 1569998: break permitted inside try. The compiler was checking that there was something on the fblock stack, but not that there was a loop on the stack. Fixed that and added a test for the specific syntax error. Bug fix candidate. ........ r52130 | martin.v.loewis | 2006-10-04 07:47:34 +0200 (Wed, 04 Oct 2006) | 4 lines Fix integer negation and absolute value to not rely on undefined behaviour of the C compiler anymore. Will backport to 2.5 and 2.4. ........ r52135 | martin.v.loewis | 2006-10-04 11:21:20 +0200 (Wed, 04 Oct 2006) | 1 line Forward port r52134: Add uuids for 2.4.4. ........ r52137 | armin.rigo | 2006-10-04 12:23:57 +0200 (Wed, 04 Oct 2006) | 3 lines Compilation problem caused by conflicting typedefs for uint32_t (unsigned long vs. unsigned int). ........ r52139 | armin.rigo | 2006-10-04 14:17:45 +0200 (Wed, 04 Oct 2006) | 23 lines Forward-port of r52136,52138: a review of overflow-detecting code. * unified the way intobject, longobject and mystrtoul handle values around -sys.maxint-1. * in general, trying to entierely avoid overflows in any computation involving signed ints or longs is extremely involved. Fixed a few simple cases where a compiler might be too clever (but that's all guesswork). * more overflow checks against bad data in marshal.c. * 2.5 specific: fixed a number of places that were still confusing int and Py_ssize_t. Some of them could potentially have caused "real-world" breakage. * list.pop(x): fixing overflow issues on x was messy. I just reverted to PyArg_ParseTuple("n"), which does the right thing. (An obscure test was trying to give a Decimal to list.pop()... doesn't make sense any more IMHO) * trying to write a few tests... ........ r52147 | andrew.kuchling | 2006-10-04 15:42:43 +0200 (Wed, 04 Oct 2006) | 6 lines Cause a PyObject_Malloc() failure to trigger a MemoryError, and then add 'if (PyErr_Occurred())' checks to various places so that NULL is returned properly. 2.4 backport candidate. ........ r52148 | martin.v.loewis | 2006-10-04 17:25:28 +0200 (Wed, 04 Oct 2006) | 1 line Add MSVC8 project files to create wininst-8.exe. ........ r52196 | brett.cannon | 2006-10-06 00:02:31 +0200 (Fri, 06 Oct 2006) | 7 lines Clarify what "re-initialization" means for init_builtin() and init_dynamic(). Also remove warning about re-initialization as possibly raising an execption as both call _PyImport_FindExtension() which pulls any module that was already imported from the Python process' extension cache and just copies the __dict__ into the module stored in sys.modules. ........ r52200 | fred.drake | 2006-10-06 02:03:45 +0200 (Fri, 06 Oct 2006) | 3 lines - update links - remove Sleepycat name now that they have been bought ........ r52204 | andrew.kuchling | 2006-10-06 12:41:01 +0200 (Fri, 06 Oct 2006) | 1 line Case fix ........ r52208 | georg.brandl | 2006-10-06 14:46:08 +0200 (Fri, 06 Oct 2006) | 3 lines Fix name. ........ r52211 | andrew.kuchling | 2006-10-06 15:18:26 +0200 (Fri, 06 Oct 2006) | 1 line [Bug #1545341] Allow 'classifier' parameter to be a tuple as well as a list. Will backport. ........ r52212 | armin.rigo | 2006-10-06 18:33:22 +0200 (Fri, 06 Oct 2006) | 4 lines A very minor bug fix: this code looks like it is designed to accept any hue value and do the modulo itself, except it doesn't quite do it in all cases. At least, the "cannot get here" comment was wrong. ........ r52213 | andrew.kuchling | 2006-10-06 20:51:55 +0200 (Fri, 06 Oct 2006) | 1 line Comment grammar ........ r52218 | skip.montanaro | 2006-10-07 13:05:02 +0200 (Sat, 07 Oct 2006) | 6 lines Note that the excel_tab class is registered as the "excel-tab" dialect. Fixes 1572471. Make a similar change for the excel class and clean up references to the Dialects and Formatting Parameters section in a few places. ........ r52221 | georg.brandl | 2006-10-08 09:11:54 +0200 (Sun, 08 Oct 2006) | 3 lines Add missing NEWS entry for rev. 52129. ........ r52223 | hyeshik.chang | 2006-10-08 15:48:34 +0200 (Sun, 08 Oct 2006) | 3 lines Bug #1572832: fix a bug in ISO-2022 codecs which may cause segfault when encoding non-BMP unicode characters. (Submitted by Ray Chason) ........ r52227 | ronald.oussoren | 2006-10-08 19:37:58 +0200 (Sun, 08 Oct 2006) | 4 lines Add version number to the link to the python documentation in /Developer/Documentation/Python, better for users that install multiple versions of python. ........ r52229 | ronald.oussoren | 2006-10-08 19:40:02 +0200 (Sun, 08 Oct 2006) | 2 lines Fix for bug #1570284 ........ r52233 | ronald.oussoren | 2006-10-08 19:49:52 +0200 (Sun, 08 Oct 2006) | 6 lines MacOSX: distutils changes the values of BASECFLAGS and LDFLAGS when using a universal build of python on OSX 10.3 to ensure that those flags can be used to compile code (the universal build uses compiler flags that aren't supported on 10.3). This patches gives the same treatment to CFLAGS, PY_CFLAGS and BLDSHARED. ........ r52236 | ronald.oussoren | 2006-10-08 19:51:46 +0200 (Sun, 08 Oct 2006) | 5 lines MacOSX: The universal build requires that users have the MacOSX10.4u SDK installed to build extensions. This patch makes distutils emit a warning when the compiler should use an SDK but that SDK is not installed, hopefully reducing some confusion. ........ r52238 | ronald.oussoren | 2006-10-08 20:18:26 +0200 (Sun, 08 Oct 2006) | 3 lines MacOSX: add more logic to recognize the correct startup file to patch to the shell profile patching post-install script. ........ r52242 | andrew.kuchling | 2006-10-09 19:10:12 +0200 (Mon, 09 Oct 2006) | 1 line Add news item for rev. 52211 change ........ r52245 | andrew.kuchling | 2006-10-09 20:05:19 +0200 (Mon, 09 Oct 2006) | 1 line Fix wording in comment ........ r52251 | georg.brandl | 2006-10-09 21:03:06 +0200 (Mon, 09 Oct 2006) | 2 lines Patch #1572724: fix typo ('=' instead of '==') in _msi.c. ........ r52255 | barry.warsaw | 2006-10-09 21:43:24 +0200 (Mon, 09 Oct 2006) | 2 lines List gc.get_count() in the module docstring. ........ r52257 | martin.v.loewis | 2006-10-09 22:44:25 +0200 (Mon, 09 Oct 2006) | 1 line Bug #1565150: Fix subsecond processing for os.utime on Windows. ........ r52268 | ronald.oussoren | 2006-10-10 09:55:06 +0200 (Tue, 10 Oct 2006) | 2 lines MacOSX: fix permission problem in the generated installer ........ r52293 | georg.brandl | 2006-10-12 09:38:04 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1575746: fix typo in property() docs. ........ r52295 | georg.brandl | 2006-10-12 09:57:21 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #813342: Start the IDLE subprocess with -Qnew if the parent is started with that option. ........ r52297 | georg.brandl | 2006-10-12 10:22:53 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1565919: document set types in the Language Reference. ........ r52299 | georg.brandl | 2006-10-12 11:20:33 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1550524: better heuristics to find correct class definition in inspect.findsource(). ........ r52301 | georg.brandl | 2006-10-12 11:47:12 +0200 (Thu, 12 Oct 2006) | 4 lines Bug #1548891: The cStringIO.StringIO() constructor now encodes unicode arguments with the system default encoding just like the write() method does, instead of converting it to a raw buffer. ........ r52303 | georg.brandl | 2006-10-12 13:14:40 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1546628: add a note about urlparse.urljoin() and absolute paths. ........ r52305 | georg.brandl | 2006-10-12 13:27:59 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1545497: when given an explicit base, int() did ignore NULs embedded in the string to convert. ........ r52307 | georg.brandl | 2006-10-12 13:41:11 +0200 (Thu, 12 Oct 2006) | 3 lines Add a note to fpectl docs that it's not built by default (bug #1556261). ........ r52309 | georg.brandl | 2006-10-12 13:46:57 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560114: the Mac filesystem does have accurate information about the case of filenames. ........ r52311 | georg.brandl | 2006-10-12 13:59:27 +0200 (Thu, 12 Oct 2006) | 2 lines Small grammar fix, thanks Sjoerd. ........ r52313 | georg.brandl | 2006-10-12 14:03:07 +0200 (Thu, 12 Oct 2006) | 2 lines Fix tarfile depending on buggy int('1\0', base) behavior. ........ r52315 | georg.brandl | 2006-10-12 14:33:07 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1283491: follow docstring convention wrt. keyword-able args in sum(). ........ r52316 | georg.brandl | 2006-10-12 15:08:16 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560179: speed up posixpath.(dir|base)name ........ r52327 | brett.cannon | 2006-10-14 08:36:45 +0200 (Sat, 14 Oct 2006) | 3 lines Clean up the language of a sentence relating to the connect() function and user-defined datatypes. ........ r52332 | neal.norwitz | 2006-10-14 23:33:38 +0200 (Sat, 14 Oct 2006) | 3 lines Update the peephole optimizer to remove more dead code (jumps after returns) and inline jumps to returns. ........ r52333 | martin.v.loewis | 2006-10-15 09:54:40 +0200 (Sun, 15 Oct 2006) | 4 lines Patch #1576954: Update VC6 build directory; remove redundant files in VC7. Will backport to 2.5. ........ r52335 | martin.v.loewis | 2006-10-15 10:43:33 +0200 (Sun, 15 Oct 2006) | 1 line Patch #1576166: Support os.utime for directories on Windows NT+. ........ r52336 | martin.v.loewis | 2006-10-15 10:51:22 +0200 (Sun, 15 Oct 2006) | 2 lines Patch #1577551: Add ctypes and ET build support for VC6. Will backport to 2.5. ........ r52338 | martin.v.loewis | 2006-10-15 11:35:51 +0200 (Sun, 15 Oct 2006) | 1 line Loosen the test for equal time stamps. ........ r52339 | martin.v.loewis | 2006-10-15 11:43:39 +0200 (Sun, 15 Oct 2006) | 2 lines Bug #1567666: Emulate GetFileAttributesExA for Win95. Will backport to 2.5. ........ r52341 | martin.v.loewis | 2006-10-15 13:02:07 +0200 (Sun, 15 Oct 2006) | 2 lines Round to int, because some systems support sub-second time stamps in stat, but not in utime. Also be consistent with modifying only mtime, not atime. ........ r52342 | martin.v.loewis | 2006-10-15 13:57:40 +0200 (Sun, 15 Oct 2006) | 2 lines Set the eol-style for project files to "CRLF". ........ r52343 | martin.v.loewis | 2006-10-15 13:59:56 +0200 (Sun, 15 Oct 2006) | 3 lines Drop binary property on dsp files, set eol-style to CRLF instead. ........ r52344 | martin.v.loewis | 2006-10-15 14:01:43 +0200 (Sun, 15 Oct 2006) | 2 lines Remove binary property, set eol-style to CRLF instead. ........ r52346 | martin.v.loewis | 2006-10-15 16:30:38 +0200 (Sun, 15 Oct 2006) | 2 lines Mention the bdist_msi module. Will backport to 2.5. ........ r52354 | brett.cannon | 2006-10-16 05:09:52 +0200 (Mon, 16 Oct 2006) | 3 lines Fix turtle so that you can launch the demo2 function on its own instead of only when the module is launched as a script. ........ r52356 | martin.v.loewis | 2006-10-17 17:18:06 +0200 (Tue, 17 Oct 2006) | 2 lines Patch #1457736: Update VC6 to use current PCbuild settings. Will backport to 2.5. ........ r52360 | martin.v.loewis | 2006-10-17 20:09:55 +0200 (Tue, 17 Oct 2006) | 2 lines Remove obsolete file. Will backport. ........ r52363 | martin.v.loewis | 2006-10-17 20:59:23 +0200 (Tue, 17 Oct 2006) | 4 lines Forward-port r52358: - Bug #1578513: Cross compilation was broken by a change to configure. Repair so that it's back to how it was in 2.4.3. ........ r52365 | thomas.heller | 2006-10-17 21:30:48 +0200 (Tue, 17 Oct 2006) | 6 lines ctypes callback functions only support 'fundamental' result types. Check this and raise an error when something else is used - before this change ctypes would hang or crash when such a callback was called. This is a partial fix for #1574584. Will backport to release25-maint. ........ r52377 | tim.peters | 2006-10-18 07:06:06 +0200 (Wed, 18 Oct 2006) | 2 lines newIobject(): repaired incorrect cast to quiet MSVC warning. ........ r52378 | tim.peters | 2006-10-18 07:09:12 +0200 (Wed, 18 Oct 2006) | 2 lines Whitespace normalization. ........ r52379 | tim.peters | 2006-10-18 07:10:28 +0200 (Wed, 18 Oct 2006) | 2 lines Add missing svn:eol-style to text files. ........ r52387 | martin.v.loewis | 2006-10-19 12:58:46 +0200 (Thu, 19 Oct 2006) | 3 lines Add check for the PyArg_ParseTuple format, and declare it if it is supported. ........ r52388 | martin.v.loewis | 2006-10-19 13:00:37 +0200 (Thu, 19 Oct 2006) | 3 lines Fix various minor errors in passing arguments to PyArg_ParseTuple. ........ r52389 | martin.v.loewis | 2006-10-19 18:01:37 +0200 (Thu, 19 Oct 2006) | 2 lines Restore CFLAGS after checking for __attribute__ ........ r52390 | andrew.kuchling | 2006-10-19 23:55:55 +0200 (Thu, 19 Oct 2006) | 1 line [Bug #1576348] Fix typo in example ........ r52414 | walter.doerwald | 2006-10-22 10:59:41 +0200 (Sun, 22 Oct 2006) | 2 lines Port test___future__ to unittest. ........ r52415 | ronald.oussoren | 2006-10-22 12:45:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580674: with this patch os.readlink uses the filesystem encoding to decode unicode objects and returns an unicode object when the argument is one. ........ r52416 | martin.v.loewis | 2006-10-22 12:46:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580872: Remove duplicate declaration of PyCallable_Check. Will backport to 2.5. ........ r52418 | martin.v.loewis | 2006-10-22 12:55:15 +0200 (Sun, 22 Oct 2006) | 4 lines - Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that ctypes isn't considered as requiring executable stacks. Will backport to 2.5. ........ r52420 | martin.v.loewis | 2006-10-22 15:45:13 +0200 (Sun, 22 Oct 2006) | 3 lines Remove passwd.adjunct.byname from list of maps for test_nis. Will backport to 2.5. ........ r52431 | georg.brandl | 2006-10-24 18:54:16 +0200 (Tue, 24 Oct 2006) | 2 lines Patch [ 1583506 ] tarfile.py: 100-char filenames are truncated ........ r52446 | andrew.kuchling | 2006-10-26 21:10:46 +0200 (Thu, 26 Oct 2006) | 1 line [Bug #1579796] Wrong syntax for PyDateTime_IMPORT in documentation. Reported by David Faure. ........ r52449 | andrew.kuchling | 2006-10-26 21:16:46 +0200 (Thu, 26 Oct 2006) | 1 line Typo fix ........ r52452 | martin.v.loewis | 2006-10-27 08:16:31 +0200 (Fri, 27 Oct 2006) | 3 lines Patch #1549049: Rewrite type conversion in structmember. Fixes #1545696 and #1566140. Will backport to 2.5. ........ r52454 | martin.v.loewis | 2006-10-27 08:42:27 +0200 (Fri, 27 Oct 2006) | 2 lines Check for values.h. Will backport. ........ r52456 | martin.v.loewis | 2006-10-27 09:06:52 +0200 (Fri, 27 Oct 2006) | 2 lines Get DBL_MAX from float.h not values.h. Will backport. ........ r52458 | martin.v.loewis | 2006-10-27 09:13:28 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1567274: Support SMTP over TLS. ........ r52459 | andrew.kuchling | 2006-10-27 13:33:29 +0200 (Fri, 27 Oct 2006) | 1 line Set svn:keywords property ........ r52460 | andrew.kuchling | 2006-10-27 13:36:41 +0200 (Fri, 27 Oct 2006) | 1 line Add item ........ r52461 | andrew.kuchling | 2006-10-27 13:37:01 +0200 (Fri, 27 Oct 2006) | 1 line Some wording changes and markup fixes ........ r52462 | andrew.kuchling | 2006-10-27 14:18:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1585690] Note that line_num was added in Python 2.5 ........ r52464 | andrew.kuchling | 2006-10-27 14:50:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1583946] Reword description of server and issuer ........ r52466 | andrew.kuchling | 2006-10-27 15:06:25 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1562583] Mention the set_reuse_addr() method ........ r52469 | andrew.kuchling | 2006-10-27 15:22:46 +0200 (Fri, 27 Oct 2006) | 4 lines [Bug #1542016] Report PCALL_POP value. This makes the return value of sys.callstats() match its docstring. Backport candidate. Though it's an API change, this is a pretty obscure portion of the API. ........ r52473 | andrew.kuchling | 2006-10-27 16:53:41 +0200 (Fri, 27 Oct 2006) | 1 line Point users to the subprocess module in the docs for os.system, os.spawn*, os.popen2, and the popen2 and commands modules ........ r52476 | andrew.kuchling | 2006-10-27 18:39:10 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1576241] Let functools.wraps work with built-in functions ........ r52478 | andrew.kuchling | 2006-10-27 18:55:34 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1575506] The _singlefileMailbox class was using the wrong file object in its flush() method, causing an error ........ r52480 | andrew.kuchling | 2006-10-27 19:06:16 +0200 (Fri, 27 Oct 2006) | 1 line Clarify docstring ........ r52481 | andrew.kuchling | 2006-10-27 19:11:23 +0200 (Fri, 27 Oct 2006) | 5 lines [Patch #1574068 by Scott Dial] urllib and urllib2 were using base64.encodestring() for encoding authentication data. encodestring() can include newlines for very long input, which produced broken HTTP headers. ........ r52483 | andrew.kuchling | 2006-10-27 20:13:46 +0200 (Fri, 27 Oct 2006) | 1 line Check db_setup_debug for a few print statements; change sqlite_setup_debug to False ........ r52484 | andrew.kuchling | 2006-10-27 20:15:02 +0200 (Fri, 27 Oct 2006) | 1 line [Patch #1503717] Tiny patch from Chris AtLee to stop a lengthy line from being printed ........ r52485 | thomas.heller | 2006-10-27 20:31:36 +0200 (Fri, 27 Oct 2006) | 5 lines WindowsError.str should display the windows error code, not the posix error code; with test. Fixes #1576174. Will backport to release25-maint. ........ r52487 | thomas.heller | 2006-10-27 21:05:53 +0200 (Fri, 27 Oct 2006) | 4 lines Modulefinder now handles absolute and relative imports, including tests. Will backport to release25-maint. ........ r52488 | georg.brandl | 2006-10-27 22:39:43 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1552024: add decorator support to unparse.py demo script. ........ r52492 | walter.doerwald | 2006-10-28 12:47:12 +0200 (Sat, 28 Oct 2006) | 2 lines Port test_bufio to unittest. ........ r52493 | georg.brandl | 2006-10-28 15:10:17 +0200 (Sat, 28 Oct 2006) | 6 lines Convert test_global, test_scope and test_grammar to unittest. I tried to enclose all tests which must be run at the toplevel (instead of inside a method) in exec statements. ........ r52494 | georg.brandl | 2006-10-28 15:11:41 +0200 (Sat, 28 Oct 2006) | 3 lines Update outstanding bugs test file. ........ r52495 | georg.brandl | 2006-10-28 15:51:49 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_math to unittest. ........ r52496 | georg.brandl | 2006-10-28 15:56:58 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_opcodes to unittest. ........ r52497 | georg.brandl | 2006-10-28 18:04:04 +0200 (Sat, 28 Oct 2006) | 2 lines Fix nth() itertool recipe. ........ r52500 | georg.brandl | 2006-10-28 22:25:09 +0200 (Sat, 28 Oct 2006) | 2 lines make test_grammar pass with python -O ........ r52501 | neal.norwitz | 2006-10-28 23:15:30 +0200 (Sat, 28 Oct 2006) | 6 lines Add some asserts. In sysmodule, I think these were to try to silence some warnings from Klokwork. They verify the assumptions of the format of svn version output. The assert in the thread module helped debug a problem on HP-UX. ........ r52502 | neal.norwitz | 2006-10-28 23:16:54 +0200 (Sat, 28 Oct 2006) | 5 lines Fix warnings with HP's C compiler. It doesn't recognize that infinite loops are, um, infinite. These conditions should not be able to happen. Will backport. ........ r52503 | neal.norwitz | 2006-10-28 23:17:51 +0200 (Sat, 28 Oct 2006) | 5 lines Fix crash in test on HP-UX. Apparently, it's not possible to delete a lock if it's held (even by the current thread). Will backport. ........ r52504 | neal.norwitz | 2006-10-28 23:19:07 +0200 (Sat, 28 Oct 2006) | 6 lines Fix bug #1565514, SystemError not raised on too many nested blocks. It seems like this should be a different error than SystemError, but I don't have any great ideas and SystemError was raised in 2.4 and earlier. Will backport. ........ r52505 | neal.norwitz | 2006-10-28 23:20:12 +0200 (Sat, 28 Oct 2006) | 4 lines Prevent crash if alloc of garbage fails. Found by Typo.pl. Will backport. ........ r52506 | neal.norwitz | 2006-10-28 23:21:00 +0200 (Sat, 28 Oct 2006) | 4 lines Don't inline Py_ADDRESS_IN_RANGE with gcc 4+ either. Will backport. ........ r52513 | neal.norwitz | 2006-10-28 23:56:49 +0200 (Sat, 28 Oct 2006) | 2 lines Fix test_modulefinder so it doesn't fail when run after test_distutils. ........ r52514 | neal.norwitz | 2006-10-29 00:12:26 +0200 (Sun, 29 Oct 2006) | 4 lines From SF 1557890, fix problem of using wrong type in example. Will backport. ........ r52517 | georg.brandl | 2006-10-29 09:39:22 +0100 (Sun, 29 Oct 2006) | 4 lines Fix codecs.EncodedFile which did not use file_encoding in 2.5.0, and fix all codecs file wrappers to work correctly with the "with" statement (bug #1586513). ........ r52519 | georg.brandl | 2006-10-29 09:47:08 +0100 (Sun, 29 Oct 2006) | 3 lines Clean up a leftover from old listcomp generation code. ........ r52520 | georg.brandl | 2006-10-29 09:53:06 +0100 (Sun, 29 Oct 2006) | 4 lines Bug #1586448: the compiler module now emits the same bytecode for list comprehensions as the builtin compiler, using the LIST_APPEND opcode. ........ r52521 | georg.brandl | 2006-10-29 10:01:01 +0100 (Sun, 29 Oct 2006) | 3 lines Remove trailing comma. ........ r52522 | georg.brandl | 2006-10-29 10:05:04 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1357915: allow all sequence types for shell arguments in subprocess. ........ r52524 | georg.brandl | 2006-10-29 10:16:12 +0100 (Sun, 29 Oct 2006) | 3 lines Patch #1583880: fix tarfile's problems with long names and posix/ GNU modes. ........ r52526 | georg.brandl | 2006-10-29 10:18:00 +0100 (Sun, 29 Oct 2006) | 3 lines Test assert if __debug__ is true. ........ r52527 | georg.brandl | 2006-10-29 10:32:16 +0100 (Sun, 29 Oct 2006) | 2 lines Fix the new EncodedFile test to work with big endian platforms. ........ r52529 | georg.brandl | 2006-10-29 15:39:09 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586613: fix zlib and bz2 codecs' incremental en/decoders. ........ r52532 | georg.brandl | 2006-10-29 19:01:08 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586773: extend hashlib docstring. ........ r52534 | neal.norwitz | 2006-10-29 19:30:10 +0100 (Sun, 29 Oct 2006) | 4 lines Update comments, remove commented out code. Move assembler structure next to assembler code to make it easier to move it to a separate file. ........ r52535 | georg.brandl | 2006-10-29 19:31:42 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1576657: when setting a KeyError for a tuple key, make sure that the tuple isn't used as the "exception arguments tuple". ........ r52537 | georg.brandl | 2006-10-29 20:13:40 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_mmap to unittest. ........ r52538 | georg.brandl | 2006-10-29 20:20:45 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_poll to unittest. ........ r52539 | georg.brandl | 2006-10-29 20:24:43 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_nis to unittest. ........ r52540 | georg.brandl | 2006-10-29 20:35:03 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_types to unittest. ........ r52541 | georg.brandl | 2006-10-29 20:51:16 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cookie to unittest. ........ r52542 | georg.brandl | 2006-10-29 21:09:12 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cgi to unittest. ........ r52543 | georg.brandl | 2006-10-29 21:24:01 +0100 (Sun, 29 Oct 2006) | 3 lines Completely convert test_httplib to unittest. ........ r52544 | georg.brandl | 2006-10-29 21:28:26 +0100 (Sun, 29 Oct 2006) | 2 lines Convert test_MimeWriter to unittest. ........ r52545 | georg.brandl | 2006-10-29 21:31:17 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_openpty to unittest. ........ r52546 | georg.brandl | 2006-10-29 21:35:12 +0100 (Sun, 29 Oct 2006) | 3 lines Remove leftover test output file. ........ r52547 | georg.brandl | 2006-10-29 22:54:18 +0100 (Sun, 29 Oct 2006) | 3 lines Move the check for openpty to the beginning. ........ r52548 | walter.doerwald | 2006-10-29 23:06:28 +0100 (Sun, 29 Oct 2006) | 2 lines Add tests for basic argument errors. ........ r52549 | walter.doerwald | 2006-10-30 00:02:27 +0100 (Mon, 30 Oct 2006) | 3 lines Add tests for incremental codecs with an errors argument. ........ r52550 | neal.norwitz | 2006-10-30 00:39:03 +0100 (Mon, 30 Oct 2006) | 1 line Fix refleak ........ r52552 | neal.norwitz | 2006-10-30 00:58:36 +0100 (Mon, 30 Oct 2006) | 1 line I'm assuming this is correct, it fixes the tests so they pass again ........ r52555 | vinay.sajip | 2006-10-31 18:32:37 +0100 (Tue, 31 Oct 2006) | 1 line Change to improve speed of _fixupChildren ........ r52556 | vinay.sajip | 2006-10-31 18:34:31 +0100 (Tue, 31 Oct 2006) | 1 line Added relativeCreated to Formatter doc (has been in the system for a long time - was unaccountably left out of the docs and not noticed until now). ........ r52588 | thomas.heller | 2006-11-02 20:48:24 +0100 (Thu, 02 Nov 2006) | 5 lines Replace the XXX marker in the 'Arrays and pointers' reference manual section with a link to the tutorial sections. Will backport to release25-maint. ........ r52592 | thomas.heller | 2006-11-02 21:22:29 +0100 (Thu, 02 Nov 2006) | 6 lines Fix a code example by adding a missing import. Fixes #1557890. Will backport to release25-maint. ........ r52598 | tim.peters | 2006-11-03 03:32:46 +0100 (Fri, 03 Nov 2006) | 2 lines Whitespace normalization. ........ r52619 | martin.v.loewis | 2006-11-04 19:14:06 +0100 (Sat, 04 Nov 2006) | 4 lines - Patch #1060577: Extract list of RPM files from spec file in bdist_rpm Will backport to 2.5. ........ r52621 | neal.norwitz | 2006-11-04 20:25:22 +0100 (Sat, 04 Nov 2006) | 4 lines Bug #1588287: fix invalid assertion for `1,2` in debug builds. Will backport ........ r52630 | andrew.kuchling | 2006-11-05 22:04:37 +0100 (Sun, 05 Nov 2006) | 1 line Update link ........ r52631 | skip.montanaro | 2006-11-06 15:34:52 +0100 (Mon, 06 Nov 2006) | 1 line note that user can control directory location even if default dir is used ........ r52644 | ronald.oussoren | 2006-11-07 16:53:38 +0100 (Tue, 07 Nov 2006) | 2 lines Fix a number of typos in strings and comments (sf#1589070) ........ r52647 | ronald.oussoren | 2006-11-07 17:00:34 +0100 (Tue, 07 Nov 2006) | 2 lines Whitespace changes to make the source more compliant with PEP8 (SF#1589070) ........ r52651 | thomas.heller | 2006-11-07 19:01:18 +0100 (Tue, 07 Nov 2006) | 3 lines Fix markup. Will backport to release25-maint. ........ r52653 | thomas.heller | 2006-11-07 19:20:47 +0100 (Tue, 07 Nov 2006) | 3 lines Fix grammatical error as well. Will backport to release25-maint. ........ r52657 | andrew.kuchling | 2006-11-07 21:39:16 +0100 (Tue, 07 Nov 2006) | 1 line Add missing word ........ r52662 | martin.v.loewis | 2006-11-08 07:46:37 +0100 (Wed, 08 Nov 2006) | 4 lines Correctly forward exception in instance_contains(). Fixes #1591996. Patch contributed by Neal Norwitz. Will backport. ........ r52664 | martin.v.loewis | 2006-11-08 07:48:36 +0100 (Wed, 08 Nov 2006) | 2 lines News entry for 52662. ........ r52665 | martin.v.loewis | 2006-11-08 08:35:55 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1351744: Add askyesnocancel helper for tkMessageBox. ........ r52666 | georg.brandl | 2006-11-08 08:45:59 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1592072: fix docs for return value of PyErr_CheckSignals. ........ r52668 | georg.brandl | 2006-11-08 11:04:29 +0100 (Wed, 08 Nov 2006) | 3 lines Bug #1592533: rename variable in heapq doc example, to avoid shadowing "sorted". ........ r52671 | andrew.kuchling | 2006-11-08 14:35:34 +0100 (Wed, 08 Nov 2006) | 1 line Add section on the functional module ........ r52672 | andrew.kuchling | 2006-11-08 15:14:30 +0100 (Wed, 08 Nov 2006) | 1 line Add section on operator module; make a few edits ........ r52673 | andrew.kuchling | 2006-11-08 15:24:03 +0100 (Wed, 08 Nov 2006) | 1 line Add table of contents; this required fixing a few headings. Some more smalle edits. ........ r52674 | andrew.kuchling | 2006-11-08 15:30:14 +0100 (Wed, 08 Nov 2006) | 1 line More edits ........ r52686 | martin.v.loewis | 2006-11-09 12:06:03 +0100 (Thu, 09 Nov 2006) | 3 lines Patch #838546: Make terminal become controlling in pty.fork(). Will backport to 2.5. ........ r52688 | martin.v.loewis | 2006-11-09 12:27:32 +0100 (Thu, 09 Nov 2006) | 2 lines Patch #1592250: Add elidge argument to Tkinter.Text.search. ........ r52690 | andrew.kuchling | 2006-11-09 14:27:07 +0100 (Thu, 09 Nov 2006) | 7 lines [Bug #1569790] mailbox.Maildir.get_folder() loses factory information Both the Maildir and MH classes had this bug; the patch fixes both classes and adds a test. Will backport to 25-maint. ........ r52692 | andrew.kuchling | 2006-11-09 14:51:14 +0100 (Thu, 09 Nov 2006) | 1 line [Patch #1514544 by David Watson] use fsync() to ensure data is really on disk ........ r52695 | walter.doerwald | 2006-11-09 17:23:26 +0100 (Thu, 09 Nov 2006) | 2 lines Replace C++ comment with C comment (fixes SF bug #1593525). ........ r52712 | andrew.kuchling | 2006-11-09 22:16:46 +0100 (Thu, 09 Nov 2006) | 11 lines [Patch #1514543] mailbox (Maildir): avoid losing messages on name clash Two changes: Where possible, use link()/remove() to move files into a directory; this makes it easier to avoid overwriting an existing file. Use _create_carefully() to create files in tmp/, which uses O_EXCL. Backport candidate. ........ r52716 | phillip.eby | 2006-11-10 01:33:36 +0100 (Fri, 10 Nov 2006) | 4 lines Fix SF#1566719: not creating site-packages (or other target directory) when installing .egg-info for a project that contains no modules or packages, while using --root (as in bdist_rpm). ........ r52719 | andrew.kuchling | 2006-11-10 14:14:01 +0100 (Fri, 10 Nov 2006) | 1 line Reword entry ........ r52725 | andrew.kuchling | 2006-11-10 15:39:01 +0100 (Fri, 10 Nov 2006) | 1 line [Feature request #1542920] Link to wsgi.org ........ r52731 | georg.brandl | 2006-11-11 19:29:11 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594742: wrong word in stringobject doc. ........ r52733 | georg.brandl | 2006-11-11 19:32:47 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594758: wording improvement for dict.update() docs. ........ r52736 | martin.v.loewis | 2006-11-12 11:32:47 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1065257: Support passing open files as body in HTTPConnection.request(). ........ r52737 | martin.v.loewis | 2006-11-12 11:41:39 +0100 (Sun, 12 Nov 2006) | 2 lines Patch #1355023: support whence argument for GzipFile.seek. ........ r52738 | martin.v.loewis | 2006-11-12 19:24:26 +0100 (Sun, 12 Nov 2006) | 2 lines Bug #1067760: Deprecate passing floats to file.seek. ........ r52739 | martin.v.loewis | 2006-11-12 19:48:13 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1359217: Ignore 2xx response before 150 response. Will backport to 2.5. ........ r52741 | martin.v.loewis | 2006-11-12 19:56:03 +0100 (Sun, 12 Nov 2006) | 4 lines Patch #1360200: Use unmangled_version RPM spec field to deal with file name mangling. Will backport to 2.5. ........ r52753 | walter.doerwald | 2006-11-15 17:23:46 +0100 (Wed, 15 Nov 2006) | 2 lines Fix typo. ........ r52754 | georg.brandl | 2006-11-15 18:42:03 +0100 (Wed, 15 Nov 2006) | 2 lines Bug #1594809: add a note to README regarding PYTHONPATH and make install. ........ r52762 | georg.brandl | 2006-11-16 16:05:14 +0100 (Thu, 16 Nov 2006) | 2 lines Bug #1597576: mention that the new base64 api has been introduced in py2.4. ........ r52764 | georg.brandl | 2006-11-16 17:50:59 +0100 (Thu, 16 Nov 2006) | 3 lines Bug #1597824: return the registered function from atexit.register() to facilitate usage as a decorator. ........ r52765 | georg.brandl | 2006-11-16 18:08:45 +0100 (Thu, 16 Nov 2006) | 4 lines Bug #1588217: don't parse "= " as a soft line break in binascii's a2b_qp() function, instead leave it in the string as quopri.decode() does. ........ r52776 | andrew.kuchling | 2006-11-17 14:30:25 +0100 (Fri, 17 Nov 2006) | 17 lines Remove file-locking in MH.pack() method. This change looks massive but it's mostly a re-indenting after removing some try...finally blocks. Also adds a test case that does a pack() while the mailbox is locked; this test would have turned up bugs in the original code on some platforms. In both nmh and GNU Mailutils' implementation of MH-format mailboxes, no locking is done of individual message files when renaming them. The original mailbox.py code did do locking, which meant that message files had to be opened. This code was buggy on certain platforms (found through reading the code); there were code paths that closed the file object and then called _unlock_file() on it. Will backport to 25-maint once I see how the buildbots react to this patch. ........ r52780 | martin.v.loewis | 2006-11-18 19:00:23 +0100 (Sat, 18 Nov 2006) | 5 lines Patch #1538878: Don't make tkSimpleDialog dialogs transient if the parent window is withdrawn. This mirrors what dialog.tcl does. Will backport to 2.5. ........ r52782 | martin.v.loewis | 2006-11-18 19:05:35 +0100 (Sat, 18 Nov 2006) | 4 lines Patch #1594554: Always close a tkSimpleDialog on ok(), even if an exception occurs. Will backport to 2.5. ........ r52784 | martin.v.loewis | 2006-11-18 19:42:11 +0100 (Sat, 18 Nov 2006) | 3 lines Patch #1472877: Fix Tix subwidget name resolution. Will backport to 2.5. ........ r52786 | andrew.kuchling | 2006-11-18 23:17:33 +0100 (Sat, 18 Nov 2006) | 1 line Expand checking in test_sha ........ r52787 | georg.brandl | 2006-11-19 09:48:30 +0100 (Sun, 19 Nov 2006) | 3 lines Patch [ 1586791 ] better error msgs for some TypeErrors ........ r52788 | martin.v.loewis | 2006-11-19 11:41:41 +0100 (Sun, 19 Nov 2006) | 4 lines Make cStringIO.truncate raise IOError for negative arguments (even for -1). Fixes the last bit of #1359365. ........ r52789 | andrew.kuchling | 2006-11-19 19:40:01 +0100 (Sun, 19 Nov 2006) | 1 line Add a test case of data w/ bytes > 127 ........ r52790 | martin.v.loewis | 2006-11-19 19:51:54 +0100 (Sun, 19 Nov 2006) | 3 lines Patch #1070046: Marshal new-style objects like InstanceType in xmlrpclib. ........ r52792 | neal.norwitz | 2006-11-19 22:26:53 +0100 (Sun, 19 Nov 2006) | 4 lines Speed up function calls into the math module by using METH_O. There should be no functional changes. However, the error msgs are slightly different. Also verified that the module dict is not NULL on init. ........ r52794 | george.yoshida | 2006-11-20 03:24:48 +0100 (Mon, 20 Nov 2006) | 2 lines markup fix ........ r52795 | georg.brandl | 2006-11-20 08:12:58 +0100 (Mon, 20 Nov 2006) | 3 lines Further markup fix. ........ r52800 | andrew.kuchling | 2006-11-20 14:39:37 +0100 (Mon, 20 Nov 2006) | 2 lines Jython compatibility fix: if uu.decode() opened its output file, be sure to close it. ........ r52811 | neal.norwitz | 2006-11-21 06:26:22 +0100 (Tue, 21 Nov 2006) | 9 lines Bug #1599782: Fix segfault on bsddb.db.DB().type(). The problem is that _DB_get_type() can't be called without the GIL because it calls a bunch of PyErr_* APIs when an error occurs. There were no other cases in this file that it was called without the GIL. Removing the BEGIN/END THREAD around _DB_get_type() made everything work. Will backport. ........ r52814 | neal.norwitz | 2006-11-21 06:51:51 +0100 (Tue, 21 Nov 2006) | 1 line Oops, convert tabs to spaces ........ r52815 | neal.norwitz | 2006-11-21 07:23:44 +0100 (Tue, 21 Nov 2006) | 1 line Fix SF #1599879, socket.gethostname should ref getfqdn directly. ........ r52817 | martin.v.loewis | 2006-11-21 19:20:25 +0100 (Tue, 21 Nov 2006) | 4 lines Conditionalize definition of _CRT_SECURE_NO_DEPRECATE and _CRT_NONSTDC_NO_DEPRECATE. Will backport. ........ r52821 | martin.v.loewis | 2006-11-22 09:50:02 +0100 (Wed, 22 Nov 2006) | 4 lines Patch #1362975: Rework CodeContext indentation algorithm to avoid hard-coding pixel widths. Also make the text's scrollbar a child of the text frame, not the top widget. ........ r52826 | walter.doerwald | 2006-11-23 06:03:56 +0100 (Thu, 23 Nov 2006) | 3 lines Change decode() so that it works with a buffer (i.e. unicode(..., 'utf-8-sig')) SF bug #1601501. ........ r52833 | georg.brandl | 2006-11-23 10:55:07 +0100 (Thu, 23 Nov 2006) | 2 lines Bug #1601630: little improvement to getopt docs ........ r52835 | michael.hudson | 2006-11-23 14:54:04 +0100 (Thu, 23 Nov 2006) | 3 lines a test for an error condition not covered by existing tests (noticed this when writing the equivalent code for pypy) ........ r52839 | raymond.hettinger | 2006-11-23 22:06:03 +0100 (Thu, 23 Nov 2006) | 1 line Fix and/add typo ........ r52840 | raymond.hettinger | 2006-11-23 22:35:19 +0100 (Thu, 23 Nov 2006) | 1 line ... and the number of the counting shall be three. ........ r52841 | thomas.heller | 2006-11-24 19:45:39 +0100 (Fri, 24 Nov 2006) | 1 line Fix bug #1598620: A ctypes structure cannot contain itself. ........ r52843 | martin.v.loewis | 2006-11-25 16:39:19 +0100 (Sat, 25 Nov 2006) | 3 lines Disable _XOPEN_SOURCE on NetBSD 1.x. Will backport to 2.5 ........ r52845 | georg.brandl | 2006-11-26 20:27:47 +0100 (Sun, 26 Nov 2006) | 2 lines Bug #1603321: make pstats.Stats accept Unicode file paths. ........ r52850 | georg.brandl | 2006-11-27 19:46:21 +0100 (Mon, 27 Nov 2006) | 2 lines Bug #1603789: grammatical error in Tkinter docs. ........ r52855 | thomas.heller | 2006-11-28 21:21:54 +0100 (Tue, 28 Nov 2006) | 7 lines Fix #1563807: _ctypes built on AIX fails with ld ffi error. The contents of ffi_darwin.c must be compiled unless __APPLE__ is defined and __ppc__ is not. Will backport. ........ r52862 | armin.rigo | 2006-11-29 22:59:22 +0100 (Wed, 29 Nov 2006) | 3 lines Forgot a case where the locals can now be a general mapping instead of just a dictionary. (backporting...) ........ r52872 | guido.van.rossum | 2006-11-30 20:23:13 +0100 (Thu, 30 Nov 2006) | 2 lines Update version. ........ r52890 | walter.doerwald | 2006-12-01 17:59:47 +0100 (Fri, 01 Dec 2006) | 3 lines Move xdrlib tests from the module into a separate test script, port the tests to unittest and add a few new tests. ........ r52900 | raymond.hettinger | 2006-12-02 03:00:39 +0100 (Sat, 02 Dec 2006) | 1 line Add name to credits (for untokenize). ........ r52905 | martin.v.loewis | 2006-12-03 10:54:46 +0100 (Sun, 03 Dec 2006) | 2 lines Move IDLE news into NEWS.txt. ........ r52906 | martin.v.loewis | 2006-12-03 12:23:45 +0100 (Sun, 03 Dec 2006) | 4 lines Patch #1544279: Improve thread-safety of the socket module by moving the sock_addr_t storage out of the socket object. Will backport to 2.5. ........ r52908 | martin.v.loewis | 2006-12-03 13:01:53 +0100 (Sun, 03 Dec 2006) | 3 lines Patch #1371075: Make ConfigParser accept optional dict type for ordering, sorting, etc. ........ r52910 | matthias.klose | 2006-12-03 18:16:41 +0100 (Sun, 03 Dec 2006) | 2 lines - Fix build failure on kfreebsd and on the hurd. ........ r52915 | george.yoshida | 2006-12-04 12:41:54 +0100 (Mon, 04 Dec 2006) | 2 lines fix a versionchanged tag ........ r52917 | george.yoshida | 2006-12-05 06:39:50 +0100 (Tue, 05 Dec 2006) | 3 lines Fix pickle doc typo Patch #1608758 ........ r52938 | georg.brandl | 2006-12-06 23:21:18 +0100 (Wed, 06 Dec 2006) | 2 lines Patch #1610437: fix a tarfile bug with long filename headers. ........ r52945 | brett.cannon | 2006-12-07 00:38:48 +0100 (Thu, 07 Dec 2006) | 3 lines Fix a bad assumption that all objects assigned to '__loader__' on a module will have a '_files' attribute. ........ r52951 | georg.brandl | 2006-12-07 10:30:06 +0100 (Thu, 07 Dec 2006) | 3 lines RFE #1592899: mention string.maketrans() in docs for str.translate, remove reference to the old regex module in the former's doc. ........ r52962 | raymond.hettinger | 2006-12-08 04:17:18 +0100 (Fri, 08 Dec 2006) | 1 line Eliminate two redundant calls to PyObject_Hash(). ........ r52963 | raymond.hettinger | 2006-12-08 05:24:33 +0100 (Fri, 08 Dec 2006) | 3 lines Port Armin's fix for a dict resize vulnerability (svn revision 46589, sf bug 1456209). ........ r52964 | raymond.hettinger | 2006-12-08 05:57:50 +0100 (Fri, 08 Dec 2006) | 4 lines Port Georg's dictobject.c fix keys that were tuples got unpacked on the way to setting a KeyError (svn revision 52535, sf bug 1576657). ........ r52966 | raymond.hettinger | 2006-12-08 18:35:25 +0100 (Fri, 08 Dec 2006) | 2 lines Add test for SF bug 1576657 ........ r52970 | georg.brandl | 2006-12-08 21:46:11 +0100 (Fri, 08 Dec 2006) | 3 lines #1577756: svnversion doesn't react to LANG=C, use LC_ALL=C to force English output. ........ r52972 | georg.brandl | 2006-12-09 10:08:29 +0100 (Sat, 09 Dec 2006) | 3 lines Patch #1608267: fix a race condition in os.makedirs() is the directory to be created is already there. ........ r52975 | matthias.klose | 2006-12-09 13:15:27 +0100 (Sat, 09 Dec 2006) | 2 lines - Fix the build of the library reference in info format. ........ r52994 | neal.norwitz | 2006-12-11 02:01:06 +0100 (Mon, 11 Dec 2006) | 1 line Fix a typo ........ r52996 | georg.brandl | 2006-12-11 08:56:33 +0100 (Mon, 11 Dec 2006) | 2 lines Move errno imports back to individual functions. ........ r52998 | vinay.sajip | 2006-12-11 15:07:16 +0100 (Mon, 11 Dec 2006) | 1 line Patch by Jeremy Katz (SF #1609407) ........ r53000 | vinay.sajip | 2006-12-11 15:26:23 +0100 (Mon, 11 Dec 2006) | 1 line Patch by "cuppatea" (SF #1503765) ........
5088 lines
126 KiB
C
5088 lines
126 KiB
C
/* Socket module */
|
|
|
|
/*
|
|
|
|
This module provides an interface to Berkeley socket IPC.
|
|
|
|
Limitations:
|
|
|
|
- Only AF_INET, AF_INET6 and AF_UNIX address families are supported in a
|
|
portable manner, though AF_PACKET and AF_NETLINK are supported under Linux.
|
|
- No read/write operations (use sendall/recv or makefile instead).
|
|
- Additional restrictions apply on some non-Unix platforms (compensated
|
|
for by socket.py).
|
|
|
|
Module interface:
|
|
|
|
- socket.error: exception raised for socket specific errors
|
|
- socket.gaierror: exception raised for getaddrinfo/getnameinfo errors,
|
|
a subclass of socket.error
|
|
- socket.herror: exception raised for gethostby* errors,
|
|
a subclass of socket.error
|
|
- socket.fromfd(fd, family, type[, proto]) --> new socket object (created
|
|
from an existing file descriptor)
|
|
- socket.gethostbyname(hostname) --> host IP address (string: 'dd.dd.dd.dd')
|
|
- socket.gethostbyaddr(IP address) --> (hostname, [alias, ...], [IP addr, ...])
|
|
- socket.gethostname() --> host name (string: 'spam' or 'spam.domain.com')
|
|
- socket.getprotobyname(protocolname) --> protocol number
|
|
- socket.getservbyname(servicename[, protocolname]) --> port number
|
|
- socket.getservbyport(portnumber[, protocolname]) --> service name
|
|
- socket.socket([family[, type [, proto]]]) --> new socket object
|
|
- socket.socketpair([family[, type [, proto]]]) --> (socket, socket)
|
|
- socket.ntohs(16 bit value) --> new int object
|
|
- socket.ntohl(32 bit value) --> new int object
|
|
- socket.htons(16 bit value) --> new int object
|
|
- socket.htonl(32 bit value) --> new int object
|
|
- socket.getaddrinfo(host, port [, family, socktype, proto, flags])
|
|
--> List of (family, socktype, proto, canonname, sockaddr)
|
|
- socket.getnameinfo(sockaddr, flags) --> (host, port)
|
|
- socket.AF_INET, socket.SOCK_STREAM, etc.: constants from <socket.h>
|
|
- socket.has_ipv6: boolean value indicating if IPv6 is supported
|
|
- socket.inet_aton(IP address) -> 32-bit packed IP representation
|
|
- socket.inet_ntoa(packed IP) -> IP address string
|
|
- socket.getdefaulttimeout() -> None | float
|
|
- socket.setdefaulttimeout(None | float)
|
|
- an Internet socket address is a pair (hostname, port)
|
|
where hostname can be anything recognized by gethostbyname()
|
|
(including the dd.dd.dd.dd notation) and port is in host byte order
|
|
- where a hostname is returned, the dd.dd.dd.dd notation is used
|
|
- a UNIX domain socket address is a string specifying the pathname
|
|
- an AF_PACKET socket address is a tuple containing a string
|
|
specifying the ethernet interface and an integer specifying
|
|
the Ethernet protocol number to be received. For example:
|
|
("eth0",0x1234). Optional 3rd,4th,5th elements in the tuple
|
|
specify packet-type and ha-type/addr.
|
|
|
|
Local naming conventions:
|
|
|
|
- names starting with sock_ are socket object methods
|
|
- names starting with socket_ are module-level functions
|
|
- names starting with PySocket are exported through socketmodule.h
|
|
|
|
*/
|
|
|
|
#ifdef __APPLE__
|
|
/*
|
|
* inet_aton is not available on OSX 10.3, yet we want to use a binary
|
|
* that was build on 10.4 or later to work on that release, weak linking
|
|
* comes to the rescue.
|
|
*/
|
|
# pragma weak inet_aton
|
|
#endif
|
|
|
|
#include "Python.h"
|
|
#include "structmember.h"
|
|
|
|
#undef MAX
|
|
#define MAX(x, y) ((x) < (y) ? (y) : (x))
|
|
|
|
/* Socket object documentation */
|
|
PyDoc_STRVAR(sock_doc,
|
|
"socket([family[, type[, proto]]]) -> socket object\n\
|
|
\n\
|
|
Open a socket of the given type. The family argument specifies the\n\
|
|
address family; it defaults to AF_INET. The type argument specifies\n\
|
|
whether this is a stream (SOCK_STREAM, this is the default)\n\
|
|
or datagram (SOCK_DGRAM) socket. The protocol argument defaults to 0,\n\
|
|
specifying the default protocol. Keyword arguments are accepted.\n\
|
|
\n\
|
|
A socket object represents one endpoint of a network connection.\n\
|
|
\n\
|
|
Methods of socket objects (keyword arguments not allowed):\n\
|
|
\n\
|
|
accept() -- accept a connection, returning new socket and client address\n\
|
|
bind(addr) -- bind the socket to a local address\n\
|
|
close() -- close the socket\n\
|
|
connect(addr) -- connect the socket to a remote address\n\
|
|
connect_ex(addr) -- connect, return an error code instead of an exception\n\
|
|
dup() -- return a new socket object identical to the current one [*]\n\
|
|
fileno() -- return underlying file descriptor\n\
|
|
getpeername() -- return remote address [*]\n\
|
|
getsockname() -- return local address\n\
|
|
getsockopt(level, optname[, buflen]) -- get socket options\n\
|
|
gettimeout() -- return timeout or None\n\
|
|
listen(n) -- start listening for incoming connections\n\
|
|
makefile([mode, [bufsize]]) -- return a file object for the socket [*]\n\
|
|
recv(buflen[, flags]) -- receive data\n\
|
|
recv_into(buffer[, nbytes[, flags]]) -- receive data (into a buffer)\n\
|
|
recvfrom(buflen[, flags]) -- receive data and sender\'s address\n\
|
|
recvfrom_into(buffer[, nbytes, [, flags])\n\
|
|
-- receive data and sender\'s address (into a buffer)\n\
|
|
sendall(data[, flags]) -- send all data\n\
|
|
send(data[, flags]) -- send data, may not send all of it\n\
|
|
sendto(data[, flags], addr) -- send data to a given address\n\
|
|
setblocking(0 | 1) -- set or clear the blocking I/O flag\n\
|
|
setsockopt(level, optname, value) -- set socket options\n\
|
|
settimeout(None | float) -- set or clear the timeout\n\
|
|
shutdown(how) -- shut down traffic in one or both directions\n\
|
|
\n\
|
|
[*] not available on all platforms!");
|
|
|
|
/* XXX This is a terrible mess of platform-dependent preprocessor hacks.
|
|
I hope some day someone can clean this up please... */
|
|
|
|
/* Hacks for gethostbyname_r(). On some non-Linux platforms, the configure
|
|
script doesn't get this right, so we hardcode some platform checks below.
|
|
On the other hand, not all Linux versions agree, so there the settings
|
|
computed by the configure script are needed! */
|
|
|
|
#ifndef linux
|
|
# undef HAVE_GETHOSTBYNAME_R_3_ARG
|
|
# undef HAVE_GETHOSTBYNAME_R_5_ARG
|
|
# undef HAVE_GETHOSTBYNAME_R_6_ARG
|
|
#endif
|
|
|
|
#ifndef WITH_THREAD
|
|
# undef HAVE_GETHOSTBYNAME_R
|
|
#endif
|
|
|
|
#ifdef HAVE_GETHOSTBYNAME_R
|
|
# if defined(_AIX) || defined(__osf__)
|
|
# define HAVE_GETHOSTBYNAME_R_3_ARG
|
|
# elif defined(__sun) || defined(__sgi)
|
|
# define HAVE_GETHOSTBYNAME_R_5_ARG
|
|
# elif defined(linux)
|
|
/* Rely on the configure script */
|
|
# else
|
|
# undef HAVE_GETHOSTBYNAME_R
|
|
# endif
|
|
#endif
|
|
|
|
#if !defined(HAVE_GETHOSTBYNAME_R) && defined(WITH_THREAD) && \
|
|
!defined(MS_WINDOWS)
|
|
# define USE_GETHOSTBYNAME_LOCK
|
|
#endif
|
|
|
|
/* To use __FreeBSD_version */
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
#include <sys/param.h>
|
|
#endif
|
|
/* On systems on which getaddrinfo() is believed to not be thread-safe,
|
|
(this includes the getaddrinfo emulation) protect access with a lock. */
|
|
#if defined(WITH_THREAD) && (defined(__APPLE__) || \
|
|
(defined(__FreeBSD__) && __FreeBSD_version+0 < 503000) || \
|
|
defined(__OpenBSD__) || defined(__NetBSD__) || \
|
|
defined(__VMS) || !defined(HAVE_GETADDRINFO))
|
|
#define USE_GETADDRINFO_LOCK
|
|
#endif
|
|
|
|
#ifdef USE_GETADDRINFO_LOCK
|
|
#define ACQUIRE_GETADDRINFO_LOCK PyThread_acquire_lock(netdb_lock, 1);
|
|
#define RELEASE_GETADDRINFO_LOCK PyThread_release_lock(netdb_lock);
|
|
#else
|
|
#define ACQUIRE_GETADDRINFO_LOCK
|
|
#define RELEASE_GETADDRINFO_LOCK
|
|
#endif
|
|
|
|
#if defined(USE_GETHOSTBYNAME_LOCK) || defined(USE_GETADDRINFO_LOCK)
|
|
# include "pythread.h"
|
|
#endif
|
|
|
|
#if defined(PYCC_VACPP)
|
|
# include <types.h>
|
|
# include <io.h>
|
|
# include <sys/ioctl.h>
|
|
# include <utils.h>
|
|
# include <ctype.h>
|
|
#endif
|
|
|
|
#if defined(__VMS)
|
|
# include <ioctl.h>
|
|
#endif
|
|
|
|
#if defined(PYOS_OS2)
|
|
# define INCL_DOS
|
|
# define INCL_DOSERRORS
|
|
# define INCL_NOPMAPI
|
|
# include <os2.h>
|
|
#endif
|
|
|
|
#if defined(__sgi) && _COMPILER_VERSION>700 && !_SGIAPI
|
|
/* make sure that the reentrant (gethostbyaddr_r etc)
|
|
functions are declared correctly if compiling with
|
|
MIPSPro 7.x in ANSI C mode (default) */
|
|
|
|
/* XXX Using _SGIAPI is the wrong thing,
|
|
but I don't know what the right thing is. */
|
|
#undef _SGIAPI /* to avoid warning */
|
|
#define _SGIAPI 1
|
|
|
|
#undef _XOPEN_SOURCE
|
|
#include <sys/socket.h>
|
|
#include <sys/types.h>
|
|
#include <netinet/in.h>
|
|
#ifdef _SS_ALIGNSIZE
|
|
#define HAVE_GETADDRINFO 1
|
|
#define HAVE_GETNAMEINFO 1
|
|
#endif
|
|
|
|
#define HAVE_INET_PTON
|
|
#include <netdb.h>
|
|
#endif
|
|
|
|
/* Irix 6.5 fails to define this variable at all. This is needed
|
|
for both GCC and SGI's compiler. I'd say that the SGI headers
|
|
are just busted. Same thing for Solaris. */
|
|
#if (defined(__sgi) || defined(sun)) && !defined(INET_ADDRSTRLEN)
|
|
#define INET_ADDRSTRLEN 16
|
|
#endif
|
|
|
|
/* Generic includes */
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
#include <sys/types.h>
|
|
#endif
|
|
|
|
/* Generic socket object definitions and includes */
|
|
#define PySocket_BUILDING_SOCKET
|
|
#include "socketmodule.h"
|
|
|
|
/* Addressing includes */
|
|
|
|
#ifndef MS_WINDOWS
|
|
|
|
/* Non-MS WINDOWS includes */
|
|
# include <netdb.h>
|
|
|
|
/* Headers needed for inet_ntoa() and inet_addr() */
|
|
# ifdef __BEOS__
|
|
# include <net/netdb.h>
|
|
# elif defined(PYOS_OS2) && defined(PYCC_VACPP)
|
|
# include <netdb.h>
|
|
typedef size_t socklen_t;
|
|
# else
|
|
# include <arpa/inet.h>
|
|
# endif
|
|
|
|
# ifndef RISCOS
|
|
# include <fcntl.h>
|
|
# else
|
|
# include <sys/ioctl.h>
|
|
# include <socklib.h>
|
|
# define NO_DUP
|
|
int h_errno; /* not used */
|
|
# define INET_ADDRSTRLEN 16
|
|
# endif
|
|
|
|
#else
|
|
|
|
/* MS_WINDOWS includes */
|
|
# ifdef HAVE_FCNTL_H
|
|
# include <fcntl.h>
|
|
# endif
|
|
|
|
#endif
|
|
|
|
#include <stddef.h>
|
|
|
|
#ifndef offsetof
|
|
# define offsetof(type, member) ((size_t)(&((type *)0)->member))
|
|
#endif
|
|
|
|
#ifndef O_NONBLOCK
|
|
# define O_NONBLOCK O_NDELAY
|
|
#endif
|
|
|
|
/* include Python's addrinfo.h unless it causes trouble */
|
|
#if defined(__sgi) && _COMPILER_VERSION>700 && defined(_SS_ALIGNSIZE)
|
|
/* Do not include addinfo.h on some newer IRIX versions.
|
|
* _SS_ALIGNSIZE is defined in sys/socket.h by 6.5.21,
|
|
* for example, but not by 6.5.10.
|
|
*/
|
|
#elif defined(_MSC_VER) && _MSC_VER>1201
|
|
/* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and
|
|
* EAI_* constants are defined in (the already included) ws2tcpip.h.
|
|
*/
|
|
#else
|
|
# include "addrinfo.h"
|
|
#endif
|
|
|
|
#ifndef HAVE_INET_PTON
|
|
int inet_pton(int af, const char *src, void *dst);
|
|
const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
|
|
#endif
|
|
|
|
#ifdef __APPLE__
|
|
/* On OS X, getaddrinfo returns no error indication of lookup
|
|
failure, so we must use the emulation instead of the libinfo
|
|
implementation. Unfortunately, performing an autoconf test
|
|
for this bug would require DNS access for the machine performing
|
|
the configuration, which is not acceptable. Therefore, we
|
|
determine the bug just by checking for __APPLE__. If this bug
|
|
gets ever fixed, perhaps checking for sys/version.h would be
|
|
appropriate, which is 10/0 on the system with the bug. */
|
|
#ifndef HAVE_GETNAMEINFO
|
|
/* This bug seems to be fixed in Jaguar. Ths easiest way I could
|
|
Find to check for Jaguar is that it has getnameinfo(), which
|
|
older releases don't have */
|
|
#undef HAVE_GETADDRINFO
|
|
#endif
|
|
|
|
#ifdef HAVE_INET_ATON
|
|
#define USE_INET_ATON_WEAKLINK
|
|
#endif
|
|
|
|
#endif
|
|
|
|
/* I know this is a bad practice, but it is the easiest... */
|
|
#if !defined(HAVE_GETADDRINFO)
|
|
/* avoid clashes with the C library definition of the symbol. */
|
|
#define getaddrinfo fake_getaddrinfo
|
|
#define gai_strerror fake_gai_strerror
|
|
#define freeaddrinfo fake_freeaddrinfo
|
|
#include "getaddrinfo.c"
|
|
#endif
|
|
#if !defined(HAVE_GETNAMEINFO)
|
|
#define getnameinfo fake_getnameinfo
|
|
#include "getnameinfo.c"
|
|
#endif
|
|
|
|
#if defined(MS_WINDOWS) || defined(__BEOS__)
|
|
/* BeOS suffers from the same socket dichotomy as Win32... - [cjh] */
|
|
/* seem to be a few differences in the API */
|
|
#define SOCKETCLOSE closesocket
|
|
#define NO_DUP /* Actually it exists on NT 3.5, but what the heck... */
|
|
#endif
|
|
|
|
#ifdef MS_WIN32
|
|
#define EAFNOSUPPORT WSAEAFNOSUPPORT
|
|
#define snprintf _snprintf
|
|
#endif
|
|
|
|
#if defined(PYOS_OS2) && !defined(PYCC_GCC)
|
|
#define SOCKETCLOSE soclose
|
|
#define NO_DUP /* Sockets are Not Actual File Handles under OS/2 */
|
|
#endif
|
|
|
|
#ifndef SOCKETCLOSE
|
|
#define SOCKETCLOSE close
|
|
#endif
|
|
|
|
#if defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H)
|
|
#define USE_BLUETOOTH 1
|
|
#if defined(__FreeBSD__)
|
|
#define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
|
|
#define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
|
|
#define sockaddr_l2 sockaddr_l2cap
|
|
#define sockaddr_rc sockaddr_rfcomm
|
|
#define _BT_L2_MEMB(sa, memb) ((sa)->l2cap_##memb)
|
|
#define _BT_RC_MEMB(sa, memb) ((sa)->rfcomm_##memb)
|
|
#elif defined(__NetBSD__)
|
|
#define sockaddr_l2 sockaddr_bt
|
|
#define sockaddr_rc sockaddr_bt
|
|
#define sockaddr_sco sockaddr_bt
|
|
#define _BT_L2_MEMB(sa, memb) ((sa)->bt_##memb)
|
|
#define _BT_RC_MEMB(sa, memb) ((sa)->bt_##memb)
|
|
#define _BT_SCO_MEMB(sa, memb) ((sa)->bt_##memb)
|
|
#else
|
|
#define _BT_L2_MEMB(sa, memb) ((sa)->l2_##memb)
|
|
#define _BT_RC_MEMB(sa, memb) ((sa)->rc_##memb)
|
|
#define _BT_SCO_MEMB(sa, memb) ((sa)->sco_##memb)
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef __VMS
|
|
/* TCP/IP Services for VMS uses a maximum send/recv buffer length */
|
|
#define SEGMENT_SIZE (32 * 1024 -1)
|
|
#endif
|
|
|
|
#define SAS2SA(x) ((struct sockaddr *)(x))
|
|
|
|
/*
|
|
* Constants for getnameinfo()
|
|
*/
|
|
#if !defined(NI_MAXHOST)
|
|
#define NI_MAXHOST 1025
|
|
#endif
|
|
#if !defined(NI_MAXSERV)
|
|
#define NI_MAXSERV 32
|
|
#endif
|
|
|
|
/* XXX There's a problem here: *static* functions are not supposed to have
|
|
a Py prefix (or use CapitalizedWords). Later... */
|
|
|
|
/* Global variable holding the exception type for errors detected
|
|
by this module (but not argument type or memory errors, etc.). */
|
|
static PyObject *socket_error;
|
|
static PyObject *socket_herror;
|
|
static PyObject *socket_gaierror;
|
|
static PyObject *socket_timeout;
|
|
|
|
#ifdef RISCOS
|
|
/* Global variable which is !=0 if Python is running in a RISC OS taskwindow */
|
|
static int taskwindow;
|
|
#endif
|
|
|
|
/* A forward reference to the socket type object.
|
|
The sock_type variable contains pointers to various functions,
|
|
some of which call new_sockobject(), which uses sock_type, so
|
|
there has to be a circular reference. */
|
|
static PyTypeObject sock_type;
|
|
|
|
#if defined(HAVE_POLL_H)
|
|
#include <poll.h>
|
|
#elif defined(HAVE_SYS_POLL_H)
|
|
#include <sys/poll.h>
|
|
#endif
|
|
|
|
#ifdef Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE
|
|
/* Platform can select file descriptors beyond FD_SETSIZE */
|
|
#define IS_SELECTABLE(s) 1
|
|
#elif defined(HAVE_POLL)
|
|
/* Instead of select(), we'll use poll() since poll() works on any fd. */
|
|
#define IS_SELECTABLE(s) 1
|
|
/* Can we call select() with this socket without a buffer overrun? */
|
|
#else
|
|
/* POSIX says selecting file descriptors beyond FD_SETSIZE
|
|
has undefined behaviour. If there's no timeout left, we don't have to
|
|
call select, so it's a safe, little white lie. */
|
|
#define IS_SELECTABLE(s) ((s)->sock_fd < FD_SETSIZE || s->sock_timeout <= 0.0)
|
|
#endif
|
|
|
|
static PyObject*
|
|
select_error(void)
|
|
{
|
|
PyErr_SetString(socket_error, "unable to select on socket");
|
|
return NULL;
|
|
}
|
|
|
|
/* Convenience function to raise an error according to errno
|
|
and return a NULL pointer from a function. */
|
|
|
|
static PyObject *
|
|
set_error(void)
|
|
{
|
|
#ifdef MS_WINDOWS
|
|
int err_no = WSAGetLastError();
|
|
static struct {
|
|
int no;
|
|
const char *msg;
|
|
} *msgp, msgs[] = {
|
|
{WSAEINTR, "Interrupted system call"},
|
|
{WSAEBADF, "Bad file descriptor"},
|
|
{WSAEACCES, "Permission denied"},
|
|
{WSAEFAULT, "Bad address"},
|
|
{WSAEINVAL, "Invalid argument"},
|
|
{WSAEMFILE, "Too many open files"},
|
|
{WSAEWOULDBLOCK,
|
|
"The socket operation could not complete "
|
|
"without blocking"},
|
|
{WSAEINPROGRESS, "Operation now in progress"},
|
|
{WSAEALREADY, "Operation already in progress"},
|
|
{WSAENOTSOCK, "Socket operation on non-socket"},
|
|
{WSAEDESTADDRREQ, "Destination address required"},
|
|
{WSAEMSGSIZE, "Message too long"},
|
|
{WSAEPROTOTYPE, "Protocol wrong type for socket"},
|
|
{WSAENOPROTOOPT, "Protocol not available"},
|
|
{WSAEPROTONOSUPPORT, "Protocol not supported"},
|
|
{WSAESOCKTNOSUPPORT, "Socket type not supported"},
|
|
{WSAEOPNOTSUPP, "Operation not supported"},
|
|
{WSAEPFNOSUPPORT, "Protocol family not supported"},
|
|
{WSAEAFNOSUPPORT, "Address family not supported"},
|
|
{WSAEADDRINUSE, "Address already in use"},
|
|
{WSAEADDRNOTAVAIL, "Can't assign requested address"},
|
|
{WSAENETDOWN, "Network is down"},
|
|
{WSAENETUNREACH, "Network is unreachable"},
|
|
{WSAENETRESET, "Network dropped connection on reset"},
|
|
{WSAECONNABORTED, "Software caused connection abort"},
|
|
{WSAECONNRESET, "Connection reset by peer"},
|
|
{WSAENOBUFS, "No buffer space available"},
|
|
{WSAEISCONN, "Socket is already connected"},
|
|
{WSAENOTCONN, "Socket is not connected"},
|
|
{WSAESHUTDOWN, "Can't send after socket shutdown"},
|
|
{WSAETOOMANYREFS, "Too many references: can't splice"},
|
|
{WSAETIMEDOUT, "Operation timed out"},
|
|
{WSAECONNREFUSED, "Connection refused"},
|
|
{WSAELOOP, "Too many levels of symbolic links"},
|
|
{WSAENAMETOOLONG, "File name too long"},
|
|
{WSAEHOSTDOWN, "Host is down"},
|
|
{WSAEHOSTUNREACH, "No route to host"},
|
|
{WSAENOTEMPTY, "Directory not empty"},
|
|
{WSAEPROCLIM, "Too many processes"},
|
|
{WSAEUSERS, "Too many users"},
|
|
{WSAEDQUOT, "Disc quota exceeded"},
|
|
{WSAESTALE, "Stale NFS file handle"},
|
|
{WSAEREMOTE, "Too many levels of remote in path"},
|
|
{WSASYSNOTREADY, "Network subsystem is unvailable"},
|
|
{WSAVERNOTSUPPORTED, "WinSock version is not supported"},
|
|
{WSANOTINITIALISED,
|
|
"Successful WSAStartup() not yet performed"},
|
|
{WSAEDISCON, "Graceful shutdown in progress"},
|
|
/* Resolver errors */
|
|
{WSAHOST_NOT_FOUND, "No such host is known"},
|
|
{WSATRY_AGAIN, "Host not found, or server failed"},
|
|
{WSANO_RECOVERY, "Unexpected server error encountered"},
|
|
{WSANO_DATA, "Valid name without requested data"},
|
|
{WSANO_ADDRESS, "No address, look for MX record"},
|
|
{0, NULL}
|
|
};
|
|
if (err_no) {
|
|
PyObject *v;
|
|
const char *msg = "winsock error";
|
|
|
|
for (msgp = msgs; msgp->msg; msgp++) {
|
|
if (err_no == msgp->no) {
|
|
msg = msgp->msg;
|
|
break;
|
|
}
|
|
}
|
|
|
|
v = Py_BuildValue("(is)", err_no, msg);
|
|
if (v != NULL) {
|
|
PyErr_SetObject(socket_error, v);
|
|
Py_DECREF(v);
|
|
}
|
|
return NULL;
|
|
}
|
|
else
|
|
#endif
|
|
|
|
#if defined(PYOS_OS2) && !defined(PYCC_GCC)
|
|
if (sock_errno() != NO_ERROR) {
|
|
APIRET rc;
|
|
ULONG msglen;
|
|
char outbuf[100];
|
|
int myerrorcode = sock_errno();
|
|
|
|
/* Retrieve socket-related error message from MPTN.MSG file */
|
|
rc = DosGetMessage(NULL, 0, outbuf, sizeof(outbuf),
|
|
myerrorcode - SOCBASEERR + 26,
|
|
"mptn.msg",
|
|
&msglen);
|
|
if (rc == NO_ERROR) {
|
|
PyObject *v;
|
|
|
|
/* OS/2 doesn't guarantee a terminator */
|
|
outbuf[msglen] = '\0';
|
|
if (strlen(outbuf) > 0) {
|
|
/* If non-empty msg, trim CRLF */
|
|
char *lastc = &outbuf[ strlen(outbuf)-1 ];
|
|
while (lastc > outbuf &&
|
|
isspace(Py_CHARMASK(*lastc))) {
|
|
/* Trim trailing whitespace (CRLF) */
|
|
*lastc-- = '\0';
|
|
}
|
|
}
|
|
v = Py_BuildValue("(is)", myerrorcode, outbuf);
|
|
if (v != NULL) {
|
|
PyErr_SetObject(socket_error, v);
|
|
Py_DECREF(v);
|
|
}
|
|
return NULL;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
#if defined(RISCOS)
|
|
if (_inet_error.errnum != NULL) {
|
|
PyObject *v;
|
|
v = Py_BuildValue("(is)", errno, _inet_err());
|
|
if (v != NULL) {
|
|
PyErr_SetObject(socket_error, v);
|
|
Py_DECREF(v);
|
|
}
|
|
return NULL;
|
|
}
|
|
#endif
|
|
|
|
return PyErr_SetFromErrno(socket_error);
|
|
}
|
|
|
|
|
|
static PyObject *
|
|
set_herror(int h_error)
|
|
{
|
|
PyObject *v;
|
|
|
|
#ifdef HAVE_HSTRERROR
|
|
v = Py_BuildValue("(is)", h_error, (char *)hstrerror(h_error));
|
|
#else
|
|
v = Py_BuildValue("(is)", h_error, "host not found");
|
|
#endif
|
|
if (v != NULL) {
|
|
PyErr_SetObject(socket_herror, v);
|
|
Py_DECREF(v);
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
static PyObject *
|
|
set_gaierror(int error)
|
|
{
|
|
PyObject *v;
|
|
|
|
#ifdef EAI_SYSTEM
|
|
/* EAI_SYSTEM is not available on Windows XP. */
|
|
if (error == EAI_SYSTEM)
|
|
return set_error();
|
|
#endif
|
|
|
|
#ifdef HAVE_GAI_STRERROR
|
|
v = Py_BuildValue("(is)", error, gai_strerror(error));
|
|
#else
|
|
v = Py_BuildValue("(is)", error, "getaddrinfo failed");
|
|
#endif
|
|
if (v != NULL) {
|
|
PyErr_SetObject(socket_gaierror, v);
|
|
Py_DECREF(v);
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
#ifdef __VMS
|
|
/* Function to send in segments */
|
|
static int
|
|
sendsegmented(int sock_fd, char *buf, int len, int flags)
|
|
{
|
|
int n = 0;
|
|
int remaining = len;
|
|
|
|
while (remaining > 0) {
|
|
unsigned int segment;
|
|
|
|
segment = (remaining >= SEGMENT_SIZE ? SEGMENT_SIZE : remaining);
|
|
n = send(sock_fd, buf, segment, flags);
|
|
if (n < 0) {
|
|
return n;
|
|
}
|
|
remaining -= segment;
|
|
buf += segment;
|
|
} /* end while */
|
|
|
|
return len;
|
|
}
|
|
#endif
|
|
|
|
/* Function to perform the setting of socket blocking mode
|
|
internally. block = (1 | 0). */
|
|
static int
|
|
internal_setblocking(PySocketSockObject *s, int block)
|
|
{
|
|
#ifndef RISCOS
|
|
#ifndef MS_WINDOWS
|
|
int delay_flag;
|
|
#endif
|
|
#endif
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#ifdef __BEOS__
|
|
block = !block;
|
|
setsockopt(s->sock_fd, SOL_SOCKET, SO_NONBLOCK,
|
|
(void *)(&block), sizeof(int));
|
|
#else
|
|
#ifndef RISCOS
|
|
#ifndef MS_WINDOWS
|
|
#if defined(PYOS_OS2) && !defined(PYCC_GCC)
|
|
block = !block;
|
|
ioctl(s->sock_fd, FIONBIO, (caddr_t)&block, sizeof(block));
|
|
#elif defined(__VMS)
|
|
block = !block;
|
|
ioctl(s->sock_fd, FIONBIO, (unsigned int *)&block);
|
|
#else /* !PYOS_OS2 && !__VMS */
|
|
delay_flag = fcntl(s->sock_fd, F_GETFL, 0);
|
|
if (block)
|
|
delay_flag &= (~O_NONBLOCK);
|
|
else
|
|
delay_flag |= O_NONBLOCK;
|
|
fcntl(s->sock_fd, F_SETFL, delay_flag);
|
|
#endif /* !PYOS_OS2 */
|
|
#else /* MS_WINDOWS */
|
|
block = !block;
|
|
ioctlsocket(s->sock_fd, FIONBIO, (u_long*)&block);
|
|
#endif /* MS_WINDOWS */
|
|
#else /* RISCOS */
|
|
block = !block;
|
|
socketioctl(s->sock_fd, FIONBIO, (u_long*)&block);
|
|
#endif /* RISCOS */
|
|
#endif /* __BEOS__ */
|
|
Py_END_ALLOW_THREADS
|
|
|
|
/* Since these don't return anything */
|
|
return 1;
|
|
}
|
|
|
|
/* Do a select()/poll() on the socket, if necessary (sock_timeout > 0).
|
|
The argument writing indicates the direction.
|
|
This does not raise an exception; we'll let our caller do that
|
|
after they've reacquired the interpreter lock.
|
|
Returns 1 on timeout, -1 on error, 0 otherwise. */
|
|
static int
|
|
internal_select(PySocketSockObject *s, int writing)
|
|
{
|
|
int n;
|
|
|
|
/* Nothing to do unless we're in timeout mode (not non-blocking) */
|
|
if (s->sock_timeout <= 0.0)
|
|
return 0;
|
|
|
|
/* Guard against closed socket */
|
|
if (s->sock_fd < 0)
|
|
return 0;
|
|
|
|
/* Prefer poll, if available, since you can poll() any fd
|
|
* which can't be done with select(). */
|
|
#ifdef HAVE_POLL
|
|
{
|
|
struct pollfd pollfd;
|
|
int timeout;
|
|
|
|
pollfd.fd = s->sock_fd;
|
|
pollfd.events = writing ? POLLOUT : POLLIN;
|
|
|
|
/* s->sock_timeout is in seconds, timeout in ms */
|
|
timeout = (int)(s->sock_timeout * 1000 + 0.5);
|
|
n = poll(&pollfd, 1, timeout);
|
|
}
|
|
#else
|
|
{
|
|
/* Construct the arguments to select */
|
|
fd_set fds;
|
|
struct timeval tv;
|
|
tv.tv_sec = (int)s->sock_timeout;
|
|
tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
|
|
FD_ZERO(&fds);
|
|
FD_SET(s->sock_fd, &fds);
|
|
|
|
/* See if the socket is ready */
|
|
if (writing)
|
|
n = select(s->sock_fd+1, NULL, &fds, NULL, &tv);
|
|
else
|
|
n = select(s->sock_fd+1, &fds, NULL, NULL, &tv);
|
|
}
|
|
#endif
|
|
|
|
if (n < 0)
|
|
return -1;
|
|
if (n == 0)
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
/* Initialize a new socket object. */
|
|
|
|
static double defaulttimeout = -1.0; /* Default timeout for new sockets */
|
|
|
|
PyMODINIT_FUNC
|
|
init_sockobject(PySocketSockObject *s,
|
|
SOCKET_T fd, int family, int type, int proto)
|
|
{
|
|
#ifdef RISCOS
|
|
int block = 1;
|
|
#endif
|
|
s->sock_fd = fd;
|
|
s->sock_family = family;
|
|
s->sock_type = type;
|
|
s->sock_proto = proto;
|
|
s->sock_timeout = defaulttimeout;
|
|
|
|
s->errorhandler = &set_error;
|
|
|
|
if (defaulttimeout >= 0.0)
|
|
internal_setblocking(s, 0);
|
|
|
|
#ifdef RISCOS
|
|
if (taskwindow)
|
|
socketioctl(s->sock_fd, 0x80046679, (u_long*)&block);
|
|
#endif
|
|
}
|
|
|
|
|
|
/* Create a new socket object.
|
|
This just creates the object and initializes it.
|
|
If the creation fails, return NULL and set an exception (implicit
|
|
in NEWOBJ()). */
|
|
|
|
static PySocketSockObject *
|
|
new_sockobject(SOCKET_T fd, int family, int type, int proto)
|
|
{
|
|
PySocketSockObject *s;
|
|
s = (PySocketSockObject *)
|
|
PyType_GenericNew(&sock_type, NULL, NULL);
|
|
if (s != NULL)
|
|
init_sockobject(s, fd, family, type, proto);
|
|
return s;
|
|
}
|
|
|
|
|
|
/* Lock to allow python interpreter to continue, but only allow one
|
|
thread to be in gethostbyname or getaddrinfo */
|
|
#if defined(USE_GETHOSTBYNAME_LOCK) || defined(USE_GETADDRINFO_LOCK)
|
|
PyThread_type_lock netdb_lock;
|
|
#endif
|
|
|
|
|
|
/* Convert a string specifying a host name or one of a few symbolic
|
|
names to a numeric IP address. This usually calls gethostbyname()
|
|
to do the work; the names "" and "<broadcast>" are special.
|
|
Return the length (IPv4 should be 4 bytes), or negative if
|
|
an error occurred; then an exception is raised. */
|
|
|
|
static int
|
|
setipaddr(char *name, struct sockaddr *addr_ret, size_t addr_ret_size, int af)
|
|
{
|
|
struct addrinfo hints, *res;
|
|
int error;
|
|
int d1, d2, d3, d4;
|
|
char ch;
|
|
|
|
memset((void *) addr_ret, '\0', sizeof(*addr_ret));
|
|
if (name[0] == '\0') {
|
|
int siz;
|
|
memset(&hints, 0, sizeof(hints));
|
|
hints.ai_family = af;
|
|
hints.ai_socktype = SOCK_DGRAM; /*dummy*/
|
|
hints.ai_flags = AI_PASSIVE;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
ACQUIRE_GETADDRINFO_LOCK
|
|
error = getaddrinfo(NULL, "0", &hints, &res);
|
|
Py_END_ALLOW_THREADS
|
|
/* We assume that those thread-unsafe getaddrinfo() versions
|
|
*are* safe regarding their return value, ie. that a
|
|
subsequent call to getaddrinfo() does not destroy the
|
|
outcome of the first call. */
|
|
RELEASE_GETADDRINFO_LOCK
|
|
if (error) {
|
|
set_gaierror(error);
|
|
return -1;
|
|
}
|
|
switch (res->ai_family) {
|
|
case AF_INET:
|
|
siz = 4;
|
|
break;
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
siz = 16;
|
|
break;
|
|
#endif
|
|
default:
|
|
freeaddrinfo(res);
|
|
PyErr_SetString(socket_error,
|
|
"unsupported address family");
|
|
return -1;
|
|
}
|
|
if (res->ai_next) {
|
|
freeaddrinfo(res);
|
|
PyErr_SetString(socket_error,
|
|
"wildcard resolved to multiple address");
|
|
return -1;
|
|
}
|
|
if (res->ai_addrlen < addr_ret_size)
|
|
addr_ret_size = res->ai_addrlen;
|
|
memcpy(addr_ret, res->ai_addr, addr_ret_size);
|
|
freeaddrinfo(res);
|
|
return siz;
|
|
}
|
|
if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
|
|
struct sockaddr_in *sin;
|
|
if (af != AF_INET && af != AF_UNSPEC) {
|
|
PyErr_SetString(socket_error,
|
|
"address family mismatched");
|
|
return -1;
|
|
}
|
|
sin = (struct sockaddr_in *)addr_ret;
|
|
memset((void *) sin, '\0', sizeof(*sin));
|
|
sin->sin_family = AF_INET;
|
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
|
sin->sin_len = sizeof(*sin);
|
|
#endif
|
|
sin->sin_addr.s_addr = INADDR_BROADCAST;
|
|
return sizeof(sin->sin_addr);
|
|
}
|
|
if (sscanf(name, "%d.%d.%d.%d%c", &d1, &d2, &d3, &d4, &ch) == 4 &&
|
|
0 <= d1 && d1 <= 255 && 0 <= d2 && d2 <= 255 &&
|
|
0 <= d3 && d3 <= 255 && 0 <= d4 && d4 <= 255) {
|
|
struct sockaddr_in *sin;
|
|
sin = (struct sockaddr_in *)addr_ret;
|
|
sin->sin_addr.s_addr = htonl(
|
|
((long) d1 << 24) | ((long) d2 << 16) |
|
|
((long) d3 << 8) | ((long) d4 << 0));
|
|
sin->sin_family = AF_INET;
|
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
|
sin->sin_len = sizeof(*sin);
|
|
#endif
|
|
return 4;
|
|
}
|
|
memset(&hints, 0, sizeof(hints));
|
|
hints.ai_family = af;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
ACQUIRE_GETADDRINFO_LOCK
|
|
error = getaddrinfo(name, NULL, &hints, &res);
|
|
#if defined(__digital__) && defined(__unix__)
|
|
if (error == EAI_NONAME && af == AF_UNSPEC) {
|
|
/* On Tru64 V5.1, numeric-to-addr conversion fails
|
|
if no address family is given. Assume IPv4 for now.*/
|
|
hints.ai_family = AF_INET;
|
|
error = getaddrinfo(name, NULL, &hints, &res);
|
|
}
|
|
#endif
|
|
Py_END_ALLOW_THREADS
|
|
RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
|
|
if (error) {
|
|
set_gaierror(error);
|
|
return -1;
|
|
}
|
|
if (res->ai_addrlen < addr_ret_size)
|
|
addr_ret_size = res->ai_addrlen;
|
|
memcpy((char *) addr_ret, res->ai_addr, addr_ret_size);
|
|
freeaddrinfo(res);
|
|
switch (addr_ret->sa_family) {
|
|
case AF_INET:
|
|
return 4;
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
return 16;
|
|
#endif
|
|
default:
|
|
PyErr_SetString(socket_error, "unknown address family");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
|
|
/* Create a string object representing an IP address.
|
|
This is always a string of the form 'dd.dd.dd.dd' (with variable
|
|
size numbers). */
|
|
|
|
static PyObject *
|
|
makeipaddr(struct sockaddr *addr, int addrlen)
|
|
{
|
|
char buf[NI_MAXHOST];
|
|
int error;
|
|
|
|
error = getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0,
|
|
NI_NUMERICHOST);
|
|
if (error) {
|
|
set_gaierror(error);
|
|
return NULL;
|
|
}
|
|
return PyString_FromString(buf);
|
|
}
|
|
|
|
|
|
#ifdef USE_BLUETOOTH
|
|
/* Convert a string representation of a Bluetooth address into a numeric
|
|
address. Returns the length (6), or raises an exception and returns -1 if
|
|
an error occurred. */
|
|
|
|
static int
|
|
setbdaddr(char *name, bdaddr_t *bdaddr)
|
|
{
|
|
unsigned int b0, b1, b2, b3, b4, b5;
|
|
char ch;
|
|
int n;
|
|
|
|
n = sscanf(name, "%X:%X:%X:%X:%X:%X%c",
|
|
&b5, &b4, &b3, &b2, &b1, &b0, &ch);
|
|
if (n == 6 && (b0 | b1 | b2 | b3 | b4 | b5) < 256) {
|
|
bdaddr->b[0] = b0;
|
|
bdaddr->b[1] = b1;
|
|
bdaddr->b[2] = b2;
|
|
bdaddr->b[3] = b3;
|
|
bdaddr->b[4] = b4;
|
|
bdaddr->b[5] = b5;
|
|
return 6;
|
|
} else {
|
|
PyErr_SetString(socket_error, "bad bluetooth address");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
/* Create a string representation of the Bluetooth address. This is always a
|
|
string of the form 'XX:XX:XX:XX:XX:XX' where XX is a two digit hexadecimal
|
|
value (zero padded if necessary). */
|
|
|
|
static PyObject *
|
|
makebdaddr(bdaddr_t *bdaddr)
|
|
{
|
|
char buf[(6 * 2) + 5 + 1];
|
|
|
|
sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X",
|
|
bdaddr->b[5], bdaddr->b[4], bdaddr->b[3],
|
|
bdaddr->b[2], bdaddr->b[1], bdaddr->b[0]);
|
|
return PyString_FromString(buf);
|
|
}
|
|
#endif
|
|
|
|
|
|
/* Create an object representing the given socket address,
|
|
suitable for passing it back to bind(), connect() etc.
|
|
The family field of the sockaddr structure is inspected
|
|
to determine what kind of address it really is. */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto)
|
|
{
|
|
if (addrlen == 0) {
|
|
/* No address -- may be recvfrom() from known socket */
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
#ifdef __BEOS__
|
|
/* XXX: BeOS version of accept() doesn't set family correctly */
|
|
addr->sa_family = AF_INET;
|
|
#endif
|
|
|
|
switch (addr->sa_family) {
|
|
|
|
case AF_INET:
|
|
{
|
|
struct sockaddr_in *a;
|
|
PyObject *addrobj = makeipaddr(addr, sizeof(*a));
|
|
PyObject *ret = NULL;
|
|
if (addrobj) {
|
|
a = (struct sockaddr_in *)addr;
|
|
ret = Py_BuildValue("Oi", addrobj, ntohs(a->sin_port));
|
|
Py_DECREF(addrobj);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
#if defined(AF_UNIX)
|
|
case AF_UNIX:
|
|
{
|
|
struct sockaddr_un *a = (struct sockaddr_un *) addr;
|
|
#ifdef linux
|
|
if (a->sun_path[0] == 0) { /* Linux abstract namespace */
|
|
addrlen -= (sizeof(*a) - sizeof(a->sun_path));
|
|
return PyString_FromStringAndSize(a->sun_path,
|
|
addrlen);
|
|
}
|
|
else
|
|
#endif /* linux */
|
|
{
|
|
/* regular NULL-terminated string */
|
|
return PyString_FromString(a->sun_path);
|
|
}
|
|
}
|
|
#endif /* AF_UNIX */
|
|
|
|
#if defined(AF_NETLINK)
|
|
case AF_NETLINK:
|
|
{
|
|
struct sockaddr_nl *a = (struct sockaddr_nl *) addr;
|
|
return Py_BuildValue("II", a->nl_pid, a->nl_groups);
|
|
}
|
|
#endif /* AF_NETLINK */
|
|
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
{
|
|
struct sockaddr_in6 *a;
|
|
PyObject *addrobj = makeipaddr(addr, sizeof(*a));
|
|
PyObject *ret = NULL;
|
|
if (addrobj) {
|
|
a = (struct sockaddr_in6 *)addr;
|
|
ret = Py_BuildValue("Oiii",
|
|
addrobj,
|
|
ntohs(a->sin6_port),
|
|
a->sin6_flowinfo,
|
|
a->sin6_scope_id);
|
|
Py_DECREF(addrobj);
|
|
}
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
#ifdef USE_BLUETOOTH
|
|
case AF_BLUETOOTH:
|
|
switch (proto) {
|
|
|
|
case BTPROTO_L2CAP:
|
|
{
|
|
struct sockaddr_l2 *a = (struct sockaddr_l2 *) addr;
|
|
PyObject *addrobj = makebdaddr(&_BT_L2_MEMB(a, bdaddr));
|
|
PyObject *ret = NULL;
|
|
if (addrobj) {
|
|
ret = Py_BuildValue("Oi",
|
|
addrobj,
|
|
_BT_L2_MEMB(a, psm));
|
|
Py_DECREF(addrobj);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
case BTPROTO_RFCOMM:
|
|
{
|
|
struct sockaddr_rc *a = (struct sockaddr_rc *) addr;
|
|
PyObject *addrobj = makebdaddr(&_BT_RC_MEMB(a, bdaddr));
|
|
PyObject *ret = NULL;
|
|
if (addrobj) {
|
|
ret = Py_BuildValue("Oi",
|
|
addrobj,
|
|
_BT_RC_MEMB(a, channel));
|
|
Py_DECREF(addrobj);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
#if !defined(__FreeBSD__)
|
|
case BTPROTO_SCO:
|
|
{
|
|
struct sockaddr_sco *a = (struct sockaddr_sco *) addr;
|
|
return makebdaddr(&_BT_SCO_MEMB(a, bdaddr));
|
|
}
|
|
#endif
|
|
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_NETPACKET_PACKET_H
|
|
case AF_PACKET:
|
|
{
|
|
struct sockaddr_ll *a = (struct sockaddr_ll *)addr;
|
|
char *ifname = "";
|
|
struct ifreq ifr;
|
|
/* need to look up interface name give index */
|
|
if (a->sll_ifindex) {
|
|
ifr.ifr_ifindex = a->sll_ifindex;
|
|
if (ioctl(sockfd, SIOCGIFNAME, &ifr) == 0)
|
|
ifname = ifr.ifr_name;
|
|
}
|
|
return Py_BuildValue("shbhs#",
|
|
ifname,
|
|
ntohs(a->sll_protocol),
|
|
a->sll_pkttype,
|
|
a->sll_hatype,
|
|
a->sll_addr,
|
|
a->sll_halen);
|
|
}
|
|
#endif
|
|
|
|
/* More cases here... */
|
|
|
|
default:
|
|
/* If we don't know the address family, don't raise an
|
|
exception -- return it as a tuple. */
|
|
return Py_BuildValue("is#",
|
|
addr->sa_family,
|
|
addr->sa_data,
|
|
sizeof(addr->sa_data));
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/* Parse a socket address argument according to the socket object's
|
|
address family. Return 1 if the address was in the proper format,
|
|
0 of not. The address is returned through addr_ret, its length
|
|
through len_ret. */
|
|
|
|
static int
|
|
getsockaddrarg(PySocketSockObject *s, PyObject *args,
|
|
struct sockaddr *addr_ret, int *len_ret)
|
|
{
|
|
switch (s->sock_family) {
|
|
|
|
#if defined(AF_UNIX)
|
|
case AF_UNIX:
|
|
{
|
|
struct sockaddr_un* addr;
|
|
char *path;
|
|
int len;
|
|
if (!PyArg_Parse(args, "t#", &path, &len))
|
|
return 0;
|
|
|
|
addr = (struct sockaddr_un*)addr_ret;
|
|
#ifdef linux
|
|
if (len > 0 && path[0] == 0) {
|
|
/* Linux abstract namespace extension */
|
|
if (len > sizeof addr->sun_path) {
|
|
PyErr_SetString(socket_error,
|
|
"AF_UNIX path too long");
|
|
return 0;
|
|
}
|
|
}
|
|
else
|
|
#endif /* linux */
|
|
{
|
|
/* regular NULL-terminated string */
|
|
if (len >= sizeof addr->sun_path) {
|
|
PyErr_SetString(socket_error,
|
|
"AF_UNIX path too long");
|
|
return 0;
|
|
}
|
|
addr->sun_path[len] = 0;
|
|
}
|
|
addr->sun_family = s->sock_family;
|
|
memcpy(addr->sun_path, path, len);
|
|
#if defined(PYOS_OS2)
|
|
*len_ret = sizeof(*addr);
|
|
#else
|
|
*len_ret = len + sizeof(*addr) - sizeof(addr->sun_path);
|
|
#endif
|
|
return 1;
|
|
}
|
|
#endif /* AF_UNIX */
|
|
|
|
#if defined(AF_NETLINK)
|
|
case AF_NETLINK:
|
|
{
|
|
struct sockaddr_nl* addr;
|
|
int pid, groups;
|
|
addr = (struct sockaddr_nl *)addr_ret;
|
|
if (!PyTuple_Check(args)) {
|
|
PyErr_Format(
|
|
PyExc_TypeError,
|
|
"getsockaddrarg: "
|
|
"AF_NETLINK address must be tuple, not %.500s",
|
|
args->ob_type->tp_name);
|
|
return 0;
|
|
}
|
|
if (!PyArg_ParseTuple(args, "II:getsockaddrarg", &pid, &groups))
|
|
return 0;
|
|
addr->nl_family = AF_NETLINK;
|
|
addr->nl_pid = pid;
|
|
addr->nl_groups = groups;
|
|
*len_ret = sizeof(*addr);
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
case AF_INET:
|
|
{
|
|
struct sockaddr_in* addr;
|
|
char *host;
|
|
int port, result;
|
|
if (!PyTuple_Check(args)) {
|
|
PyErr_Format(
|
|
PyExc_TypeError,
|
|
"getsockaddrarg: "
|
|
"AF_INET address must be tuple, not %.500s",
|
|
args->ob_type->tp_name);
|
|
return 0;
|
|
}
|
|
if (!PyArg_ParseTuple(args, "eti:getsockaddrarg",
|
|
"idna", &host, &port))
|
|
return 0;
|
|
addr=(struct sockaddr_in*)addr_ret;
|
|
result = setipaddr(host, (struct sockaddr *)addr,
|
|
sizeof(*addr), AF_INET);
|
|
PyMem_Free(host);
|
|
if (result < 0)
|
|
return 0;
|
|
addr->sin_family = AF_INET;
|
|
addr->sin_port = htons((short)port);
|
|
*len_ret = sizeof *addr;
|
|
return 1;
|
|
}
|
|
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
{
|
|
struct sockaddr_in6* addr;
|
|
char *host;
|
|
int port, flowinfo, scope_id, result;
|
|
flowinfo = scope_id = 0;
|
|
if (!PyTuple_Check(args)) {
|
|
PyErr_Format(
|
|
PyExc_TypeError,
|
|
"getsockaddrarg: "
|
|
"AF_INET6 address must be tuple, not %.500s",
|
|
args->ob_type->tp_name);
|
|
return 0;
|
|
}
|
|
if (!PyArg_ParseTuple(args, "eti|ii",
|
|
"idna", &host, &port, &flowinfo,
|
|
&scope_id)) {
|
|
return 0;
|
|
}
|
|
addr = (struct sockaddr_in6*)addr_ret;
|
|
result = setipaddr(host, (struct sockaddr *)addr,
|
|
sizeof(*addr), AF_INET6);
|
|
PyMem_Free(host);
|
|
if (result < 0)
|
|
return 0;
|
|
addr->sin6_family = s->sock_family;
|
|
addr->sin6_port = htons((short)port);
|
|
addr->sin6_flowinfo = flowinfo;
|
|
addr->sin6_scope_id = scope_id;
|
|
*len_ret = sizeof *addr;
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
#ifdef USE_BLUETOOTH
|
|
case AF_BLUETOOTH:
|
|
{
|
|
switch (s->sock_proto) {
|
|
case BTPROTO_L2CAP:
|
|
{
|
|
struct sockaddr_l2 *addr;
|
|
char *straddr;
|
|
|
|
addr = (struct sockaddr_l2 *)addr_ret;
|
|
_BT_L2_MEMB(addr, family) = AF_BLUETOOTH;
|
|
if (!PyArg_ParseTuple(args, "si", &straddr,
|
|
&_BT_L2_MEMB(addr, psm))) {
|
|
PyErr_SetString(socket_error, "getsockaddrarg: "
|
|
"wrong format");
|
|
return 0;
|
|
}
|
|
if (setbdaddr(straddr, &_BT_L2_MEMB(addr, bdaddr)) < 0)
|
|
return 0;
|
|
|
|
*len_ret = sizeof *addr;
|
|
return 1;
|
|
}
|
|
case BTPROTO_RFCOMM:
|
|
{
|
|
struct sockaddr_rc *addr;
|
|
char *straddr;
|
|
|
|
addr = (struct sockaddr_rc *)addr_ret;
|
|
_BT_RC_MEMB(addr, family) = AF_BLUETOOTH;
|
|
if (!PyArg_ParseTuple(args, "si", &straddr,
|
|
&_BT_RC_MEMB(addr, channel))) {
|
|
PyErr_SetString(socket_error, "getsockaddrarg: "
|
|
"wrong format");
|
|
return 0;
|
|
}
|
|
if (setbdaddr(straddr, &_BT_RC_MEMB(addr, bdaddr)) < 0)
|
|
return 0;
|
|
|
|
*len_ret = sizeof *addr;
|
|
return 1;
|
|
}
|
|
#if !defined(__FreeBSD__)
|
|
case BTPROTO_SCO:
|
|
{
|
|
struct sockaddr_sco *addr;
|
|
char *straddr;
|
|
|
|
addr = (struct sockaddr_sco *)addr_ret;
|
|
_BT_SCO_MEMB(addr, family) = AF_BLUETOOTH;
|
|
straddr = PyString_AsString(args);
|
|
if (straddr == NULL) {
|
|
PyErr_SetString(socket_error, "getsockaddrarg: "
|
|
"wrong format");
|
|
return 0;
|
|
}
|
|
if (setbdaddr(straddr, &_BT_SCO_MEMB(addr, bdaddr)) < 0)
|
|
return 0;
|
|
|
|
*len_ret = sizeof *addr;
|
|
return 1;
|
|
}
|
|
#endif
|
|
default:
|
|
PyErr_SetString(socket_error, "getsockaddrarg: unknown Bluetooth protocol");
|
|
return 0;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_NETPACKET_PACKET_H
|
|
case AF_PACKET:
|
|
{
|
|
struct sockaddr_ll* addr;
|
|
struct ifreq ifr;
|
|
char *interfaceName;
|
|
int protoNumber;
|
|
int hatype = 0;
|
|
int pkttype = 0;
|
|
char *haddr = NULL;
|
|
unsigned int halen = 0;
|
|
|
|
if (!PyTuple_Check(args)) {
|
|
PyErr_Format(
|
|
PyExc_TypeError,
|
|
"getsockaddrarg: "
|
|
"AF_PACKET address must be tuple, not %.500s",
|
|
args->ob_type->tp_name);
|
|
return 0;
|
|
}
|
|
if (!PyArg_ParseTuple(args, "si|iis#", &interfaceName,
|
|
&protoNumber, &pkttype, &hatype,
|
|
&haddr, &halen))
|
|
return 0;
|
|
strncpy(ifr.ifr_name, interfaceName, sizeof(ifr.ifr_name));
|
|
ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
|
|
if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
|
|
s->errorhandler();
|
|
return 0;
|
|
}
|
|
if (halen > 8) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"Hardware address must be 8 bytes or less");
|
|
return 0;
|
|
}
|
|
addr = (struct sockaddr_ll*)addr_ret;
|
|
addr->sll_family = AF_PACKET;
|
|
addr->sll_protocol = htons((short)protoNumber);
|
|
addr->sll_ifindex = ifr.ifr_ifindex;
|
|
addr->sll_pkttype = pkttype;
|
|
addr->sll_hatype = hatype;
|
|
if (halen != 0) {
|
|
memcpy(&addr->sll_addr, haddr, halen);
|
|
}
|
|
addr->sll_halen = halen;
|
|
*len_ret = sizeof *addr;
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
/* More cases here... */
|
|
|
|
default:
|
|
PyErr_SetString(socket_error, "getsockaddrarg: bad family");
|
|
return 0;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/* Get the address length according to the socket object's address family.
|
|
Return 1 if the family is known, 0 otherwise. The length is returned
|
|
through len_ret. */
|
|
|
|
static int
|
|
getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
|
|
{
|
|
switch (s->sock_family) {
|
|
|
|
#if defined(AF_UNIX)
|
|
case AF_UNIX:
|
|
{
|
|
*len_ret = sizeof (struct sockaddr_un);
|
|
return 1;
|
|
}
|
|
#endif /* AF_UNIX */
|
|
#if defined(AF_NETLINK)
|
|
case AF_NETLINK:
|
|
{
|
|
*len_ret = sizeof (struct sockaddr_nl);
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
case AF_INET:
|
|
{
|
|
*len_ret = sizeof (struct sockaddr_in);
|
|
return 1;
|
|
}
|
|
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
{
|
|
*len_ret = sizeof (struct sockaddr_in6);
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
#ifdef USE_BLUETOOTH
|
|
case AF_BLUETOOTH:
|
|
{
|
|
switch(s->sock_proto)
|
|
{
|
|
|
|
case BTPROTO_L2CAP:
|
|
*len_ret = sizeof (struct sockaddr_l2);
|
|
return 1;
|
|
case BTPROTO_RFCOMM:
|
|
*len_ret = sizeof (struct sockaddr_rc);
|
|
return 1;
|
|
#if !defined(__FreeBSD__)
|
|
case BTPROTO_SCO:
|
|
*len_ret = sizeof (struct sockaddr_sco);
|
|
return 1;
|
|
#endif
|
|
default:
|
|
PyErr_SetString(socket_error, "getsockaddrlen: "
|
|
"unknown BT protocol");
|
|
return 0;
|
|
|
|
}
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_NETPACKET_PACKET_H
|
|
case AF_PACKET:
|
|
{
|
|
*len_ret = sizeof (struct sockaddr_ll);
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
/* More cases here... */
|
|
|
|
default:
|
|
PyErr_SetString(socket_error, "getsockaddrlen: bad family");
|
|
return 0;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/* s.accept() method */
|
|
|
|
static PyObject *
|
|
sock_accept(PySocketSockObject *s)
|
|
{
|
|
sock_addr_t addrbuf;
|
|
SOCKET_T newfd;
|
|
socklen_t addrlen;
|
|
PyObject *sock = NULL;
|
|
PyObject *addr = NULL;
|
|
PyObject *res = NULL;
|
|
int timeout;
|
|
|
|
if (!getsockaddrlen(s, &addrlen))
|
|
return NULL;
|
|
memset(&addrbuf, 0, addrlen);
|
|
|
|
#ifdef MS_WINDOWS
|
|
newfd = INVALID_SOCKET;
|
|
#else
|
|
newfd = -1;
|
|
#endif
|
|
|
|
if (!IS_SELECTABLE(s))
|
|
return select_error();
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
timeout = internal_select(s, 0);
|
|
if (!timeout)
|
|
newfd = accept(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return NULL;
|
|
}
|
|
|
|
#ifdef MS_WINDOWS
|
|
if (newfd == INVALID_SOCKET)
|
|
#else
|
|
if (newfd < 0)
|
|
#endif
|
|
return s->errorhandler();
|
|
|
|
/* Create the new object with unspecified family,
|
|
to avoid calls to bind() etc. on it. */
|
|
sock = (PyObject *) new_sockobject(newfd,
|
|
s->sock_family,
|
|
s->sock_type,
|
|
s->sock_proto);
|
|
|
|
if (sock == NULL) {
|
|
SOCKETCLOSE(newfd);
|
|
goto finally;
|
|
}
|
|
addr = makesockaddr(s->sock_fd, SAS2SA(&addrbuf),
|
|
addrlen, s->sock_proto);
|
|
if (addr == NULL)
|
|
goto finally;
|
|
|
|
res = PyTuple_Pack(2, sock, addr);
|
|
|
|
finally:
|
|
Py_XDECREF(sock);
|
|
Py_XDECREF(addr);
|
|
return res;
|
|
}
|
|
|
|
PyDoc_STRVAR(accept_doc,
|
|
"accept() -> (socket object, address info)\n\
|
|
\n\
|
|
Wait for an incoming connection. Return a new socket representing the\n\
|
|
connection, and the address of the client. For IP sockets, the address\n\
|
|
info is a pair (hostaddr, port).");
|
|
|
|
/* s.setblocking(flag) method. Argument:
|
|
False -- non-blocking mode; same as settimeout(0)
|
|
True -- blocking mode; same as settimeout(None)
|
|
*/
|
|
|
|
static PyObject *
|
|
sock_setblocking(PySocketSockObject *s, PyObject *arg)
|
|
{
|
|
int block;
|
|
|
|
block = PyInt_AsLong(arg);
|
|
if (block == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
|
|
s->sock_timeout = block ? -1.0 : 0.0;
|
|
internal_setblocking(s, block);
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(setblocking_doc,
|
|
"setblocking(flag)\n\
|
|
\n\
|
|
Set the socket to blocking (flag is true) or non-blocking (false).\n\
|
|
setblocking(True) is equivalent to settimeout(None);\n\
|
|
setblocking(False) is equivalent to settimeout(0.0).");
|
|
|
|
/* s.settimeout(timeout) method. Argument:
|
|
None -- no timeout, blocking mode; same as setblocking(True)
|
|
0.0 -- non-blocking mode; same as setblocking(False)
|
|
> 0 -- timeout mode; operations time out after timeout seconds
|
|
< 0 -- illegal; raises an exception
|
|
*/
|
|
static PyObject *
|
|
sock_settimeout(PySocketSockObject *s, PyObject *arg)
|
|
{
|
|
double timeout;
|
|
|
|
if (arg == Py_None)
|
|
timeout = -1.0;
|
|
else {
|
|
timeout = PyFloat_AsDouble(arg);
|
|
if (timeout < 0.0) {
|
|
if (!PyErr_Occurred())
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"Timeout value out of range");
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
s->sock_timeout = timeout;
|
|
internal_setblocking(s, timeout < 0.0);
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(settimeout_doc,
|
|
"settimeout(timeout)\n\
|
|
\n\
|
|
Set a timeout on socket operations. 'timeout' can be a float,\n\
|
|
giving in seconds, or None. Setting a timeout of None disables\n\
|
|
the timeout feature and is equivalent to setblocking(1).\n\
|
|
Setting a timeout of zero is the same as setblocking(0).");
|
|
|
|
/* s.gettimeout() method.
|
|
Returns the timeout associated with a socket. */
|
|
static PyObject *
|
|
sock_gettimeout(PySocketSockObject *s)
|
|
{
|
|
if (s->sock_timeout < 0.0) {
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
else
|
|
return PyFloat_FromDouble(s->sock_timeout);
|
|
}
|
|
|
|
PyDoc_STRVAR(gettimeout_doc,
|
|
"gettimeout() -> timeout\n\
|
|
\n\
|
|
Returns the timeout in floating seconds associated with socket \n\
|
|
operations. A timeout of None indicates that timeouts on socket \n\
|
|
operations are disabled.");
|
|
|
|
#ifdef RISCOS
|
|
/* s.sleeptaskw(1 | 0) method */
|
|
|
|
static PyObject *
|
|
sock_sleeptaskw(PySocketSockObject *s,PyObject *arg)
|
|
{
|
|
int block;
|
|
block = PyInt_AsLong(arg);
|
|
if (block == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
socketioctl(s->sock_fd, 0x80046679, (u_long*)&block);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
PyDoc_STRVAR(sleeptaskw_doc,
|
|
"sleeptaskw(flag)\n\
|
|
\n\
|
|
Allow sleeps in taskwindows.");
|
|
#endif
|
|
|
|
|
|
/* s.setsockopt() method.
|
|
With an integer third argument, sets an integer option.
|
|
With a string third argument, sets an option from a buffer;
|
|
use optional built-in module 'struct' to encode the string. */
|
|
|
|
static PyObject *
|
|
sock_setsockopt(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
int level;
|
|
int optname;
|
|
int res;
|
|
char *buf;
|
|
int buflen;
|
|
int flag;
|
|
|
|
if (PyArg_ParseTuple(args, "iii:setsockopt",
|
|
&level, &optname, &flag)) {
|
|
buf = (char *) &flag;
|
|
buflen = sizeof flag;
|
|
}
|
|
else {
|
|
PyErr_Clear();
|
|
if (!PyArg_ParseTuple(args, "iis#:setsockopt",
|
|
&level, &optname, &buf, &buflen))
|
|
return NULL;
|
|
}
|
|
res = setsockopt(s->sock_fd, level, optname, (void *)buf, buflen);
|
|
if (res < 0)
|
|
return s->errorhandler();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(setsockopt_doc,
|
|
"setsockopt(level, option, value)\n\
|
|
\n\
|
|
Set a socket option. See the Unix manual for level and option.\n\
|
|
The value argument can either be an integer or a string.");
|
|
|
|
|
|
/* s.getsockopt() method.
|
|
With two arguments, retrieves an integer option.
|
|
With a third integer argument, retrieves a string buffer of that size;
|
|
use optional built-in module 'struct' to decode the string. */
|
|
|
|
static PyObject *
|
|
sock_getsockopt(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
int level;
|
|
int optname;
|
|
int res;
|
|
PyObject *buf;
|
|
socklen_t buflen = 0;
|
|
|
|
#ifdef __BEOS__
|
|
/* We have incomplete socket support. */
|
|
PyErr_SetString(socket_error, "getsockopt not supported");
|
|
return NULL;
|
|
#else
|
|
|
|
if (!PyArg_ParseTuple(args, "ii|i:getsockopt",
|
|
&level, &optname, &buflen))
|
|
return NULL;
|
|
|
|
if (buflen == 0) {
|
|
int flag = 0;
|
|
socklen_t flagsize = sizeof flag;
|
|
res = getsockopt(s->sock_fd, level, optname,
|
|
(void *)&flag, &flagsize);
|
|
if (res < 0)
|
|
return s->errorhandler();
|
|
return PyInt_FromLong(flag);
|
|
}
|
|
#ifdef __VMS
|
|
/* socklen_t is unsigned so no negative test is needed,
|
|
test buflen == 0 is previously done */
|
|
if (buflen > 1024) {
|
|
#else
|
|
if (buflen <= 0 || buflen > 1024) {
|
|
#endif
|
|
PyErr_SetString(socket_error,
|
|
"getsockopt buflen out of range");
|
|
return NULL;
|
|
}
|
|
buf = PyString_FromStringAndSize((char *)NULL, buflen);
|
|
if (buf == NULL)
|
|
return NULL;
|
|
res = getsockopt(s->sock_fd, level, optname,
|
|
(void *)PyString_AS_STRING(buf), &buflen);
|
|
if (res < 0) {
|
|
Py_DECREF(buf);
|
|
return s->errorhandler();
|
|
}
|
|
_PyString_Resize(&buf, buflen);
|
|
return buf;
|
|
#endif /* __BEOS__ */
|
|
}
|
|
|
|
PyDoc_STRVAR(getsockopt_doc,
|
|
"getsockopt(level, option[, buffersize]) -> value\n\
|
|
\n\
|
|
Get a socket option. See the Unix manual for level and option.\n\
|
|
If a nonzero buffersize argument is given, the return value is a\n\
|
|
string of that length; otherwise it is an integer.");
|
|
|
|
|
|
/* s.bind(sockaddr) method */
|
|
|
|
static PyObject *
|
|
sock_bind(PySocketSockObject *s, PyObject *addro)
|
|
{
|
|
sock_addr_t addrbuf;
|
|
int addrlen;
|
|
int res;
|
|
|
|
if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = bind(s->sock_fd, SAS2SA(&addrbuf), addrlen);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return s->errorhandler();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(bind_doc,
|
|
"bind(address)\n\
|
|
\n\
|
|
Bind the socket to a local address. For IP sockets, the address is a\n\
|
|
pair (host, port); the host must refer to the local host. For raw packet\n\
|
|
sockets the address is a tuple (ifname, proto [,pkttype [,hatype]])");
|
|
|
|
|
|
/* s.close() method.
|
|
Set the file descriptor to -1 so operations tried subsequently
|
|
will surely fail. */
|
|
|
|
static PyObject *
|
|
sock_close(PySocketSockObject *s)
|
|
{
|
|
SOCKET_T fd;
|
|
|
|
if ((fd = s->sock_fd) != -1) {
|
|
s->sock_fd = -1;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
(void) SOCKETCLOSE(fd);
|
|
Py_END_ALLOW_THREADS
|
|
}
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(close_doc,
|
|
"close()\n\
|
|
\n\
|
|
Close the socket. It cannot be used after this call.");
|
|
|
|
static int
|
|
internal_connect(PySocketSockObject *s, struct sockaddr *addr, int addrlen,
|
|
int *timeoutp)
|
|
{
|
|
int res, timeout;
|
|
|
|
timeout = 0;
|
|
res = connect(s->sock_fd, addr, addrlen);
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
if (s->sock_timeout > 0.0) {
|
|
if (res < 0 && WSAGetLastError() == WSAEWOULDBLOCK &&
|
|
IS_SELECTABLE(s)) {
|
|
/* This is a mess. Best solution: trust select */
|
|
fd_set fds;
|
|
fd_set fds_exc;
|
|
struct timeval tv;
|
|
tv.tv_sec = (int)s->sock_timeout;
|
|
tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
|
|
FD_ZERO(&fds);
|
|
FD_SET(s->sock_fd, &fds);
|
|
FD_ZERO(&fds_exc);
|
|
FD_SET(s->sock_fd, &fds_exc);
|
|
res = select(s->sock_fd+1, NULL, &fds, &fds_exc, &tv);
|
|
if (res == 0) {
|
|
res = WSAEWOULDBLOCK;
|
|
timeout = 1;
|
|
} else if (res > 0) {
|
|
if (FD_ISSET(s->sock_fd, &fds))
|
|
/* The socket is in the writeable set - this
|
|
means connected */
|
|
res = 0;
|
|
else {
|
|
/* As per MS docs, we need to call getsockopt()
|
|
to get the underlying error */
|
|
int res_size = sizeof res;
|
|
/* It must be in the exception set */
|
|
assert(FD_ISSET(s->sock_fd, &fds_exc));
|
|
if (0 == getsockopt(s->sock_fd, SOL_SOCKET, SO_ERROR,
|
|
(char *)&res, &res_size))
|
|
/* getsockopt also clears WSAGetLastError,
|
|
so reset it back. */
|
|
WSASetLastError(res);
|
|
else
|
|
res = WSAGetLastError();
|
|
}
|
|
}
|
|
/* else if (res < 0) an error occurred */
|
|
}
|
|
}
|
|
|
|
if (res < 0)
|
|
res = WSAGetLastError();
|
|
|
|
#else
|
|
|
|
if (s->sock_timeout > 0.0) {
|
|
if (res < 0 && errno == EINPROGRESS && IS_SELECTABLE(s)) {
|
|
timeout = internal_select(s, 1);
|
|
if (timeout == 0) {
|
|
res = connect(s->sock_fd, addr, addrlen);
|
|
if (res < 0 && errno == EISCONN)
|
|
res = 0;
|
|
}
|
|
else if (timeout == -1)
|
|
res = errno; /* had error */
|
|
else
|
|
res = EWOULDBLOCK; /* timed out */
|
|
}
|
|
}
|
|
|
|
if (res < 0)
|
|
res = errno;
|
|
|
|
#endif
|
|
*timeoutp = timeout;
|
|
|
|
return res;
|
|
}
|
|
|
|
/* s.connect(sockaddr) method */
|
|
|
|
static PyObject *
|
|
sock_connect(PySocketSockObject *s, PyObject *addro)
|
|
{
|
|
sock_addr_t addrbuf;
|
|
int addrlen;
|
|
int res;
|
|
int timeout;
|
|
|
|
if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
|
|
return NULL;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = internal_connect(s, SAS2SA(&addrbuf), addrlen, &timeout);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return NULL;
|
|
}
|
|
if (res != 0)
|
|
return s->errorhandler();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(connect_doc,
|
|
"connect(address)\n\
|
|
\n\
|
|
Connect the socket to a remote address. For IP sockets, the address\n\
|
|
is a pair (host, port).");
|
|
|
|
|
|
/* s.connect_ex(sockaddr) method */
|
|
|
|
static PyObject *
|
|
sock_connect_ex(PySocketSockObject *s, PyObject *addro)
|
|
{
|
|
sock_addr_t addrbuf;
|
|
int addrlen;
|
|
int res;
|
|
int timeout;
|
|
|
|
if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
|
|
return NULL;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = internal_connect(s, SAS2SA(&addrbuf), addrlen, &timeout);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
/* Signals are not errors (though they may raise exceptions). Adapted
|
|
from PyErr_SetFromErrnoWithFilenameObject(). */
|
|
#ifdef EINTR
|
|
if (res == EINTR && PyErr_CheckSignals())
|
|
return NULL;
|
|
#endif
|
|
|
|
return PyInt_FromLong((long) res);
|
|
}
|
|
|
|
PyDoc_STRVAR(connect_ex_doc,
|
|
"connect_ex(address) -> errno\n\
|
|
\n\
|
|
This is like connect(address), but returns an error code (the errno value)\n\
|
|
instead of raising an exception when an error occurs.");
|
|
|
|
|
|
/* s.fileno() method */
|
|
|
|
static PyObject *
|
|
sock_fileno(PySocketSockObject *s)
|
|
{
|
|
#if SIZEOF_SOCKET_T <= SIZEOF_LONG
|
|
return PyInt_FromLong((long) s->sock_fd);
|
|
#else
|
|
return PyLong_FromLongLong((PY_LONG_LONG)s->sock_fd);
|
|
#endif
|
|
}
|
|
|
|
PyDoc_STRVAR(fileno_doc,
|
|
"fileno() -> integer\n\
|
|
\n\
|
|
Return the integer file descriptor of the socket.");
|
|
|
|
|
|
#ifndef NO_DUP
|
|
/* s.dup() method */
|
|
|
|
static PyObject *
|
|
sock_dup(PySocketSockObject *s)
|
|
{
|
|
SOCKET_T newfd;
|
|
PyObject *sock;
|
|
|
|
newfd = dup(s->sock_fd);
|
|
if (newfd < 0)
|
|
return s->errorhandler();
|
|
sock = (PyObject *) new_sockobject(newfd,
|
|
s->sock_family,
|
|
s->sock_type,
|
|
s->sock_proto);
|
|
if (sock == NULL)
|
|
SOCKETCLOSE(newfd);
|
|
return sock;
|
|
}
|
|
|
|
PyDoc_STRVAR(dup_doc,
|
|
"dup() -> socket object\n\
|
|
\n\
|
|
Return a new socket object connected to the same system resource.");
|
|
|
|
#endif
|
|
|
|
|
|
/* s.getsockname() method */
|
|
|
|
static PyObject *
|
|
sock_getsockname(PySocketSockObject *s)
|
|
{
|
|
sock_addr_t addrbuf;
|
|
int res;
|
|
socklen_t addrlen;
|
|
|
|
if (!getsockaddrlen(s, &addrlen))
|
|
return NULL;
|
|
memset(&addrbuf, 0, addrlen);
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = getsockname(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return s->errorhandler();
|
|
return makesockaddr(s->sock_fd, SAS2SA(&addrbuf), addrlen,
|
|
s->sock_proto);
|
|
}
|
|
|
|
PyDoc_STRVAR(getsockname_doc,
|
|
"getsockname() -> address info\n\
|
|
\n\
|
|
Return the address of the local endpoint. For IP sockets, the address\n\
|
|
info is a pair (hostaddr, port).");
|
|
|
|
|
|
#ifdef HAVE_GETPEERNAME /* Cray APP doesn't have this :-( */
|
|
/* s.getpeername() method */
|
|
|
|
static PyObject *
|
|
sock_getpeername(PySocketSockObject *s)
|
|
{
|
|
sock_addr_t addrbuf;
|
|
int res;
|
|
socklen_t addrlen;
|
|
|
|
if (!getsockaddrlen(s, &addrlen))
|
|
return NULL;
|
|
memset(&addrbuf, 0, addrlen);
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = getpeername(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return s->errorhandler();
|
|
return makesockaddr(s->sock_fd, SAS2SA(&addrbuf), addrlen,
|
|
s->sock_proto);
|
|
}
|
|
|
|
PyDoc_STRVAR(getpeername_doc,
|
|
"getpeername() -> address info\n\
|
|
\n\
|
|
Return the address of the remote endpoint. For IP sockets, the address\n\
|
|
info is a pair (hostaddr, port).");
|
|
|
|
#endif /* HAVE_GETPEERNAME */
|
|
|
|
|
|
/* s.listen(n) method */
|
|
|
|
static PyObject *
|
|
sock_listen(PySocketSockObject *s, PyObject *arg)
|
|
{
|
|
int backlog;
|
|
int res;
|
|
|
|
backlog = PyInt_AsLong(arg);
|
|
if (backlog == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
if (backlog < 1)
|
|
backlog = 1;
|
|
res = listen(s->sock_fd, backlog);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return s->errorhandler();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(listen_doc,
|
|
"listen(backlog)\n\
|
|
\n\
|
|
Enable a server to accept connections. The backlog argument must be at\n\
|
|
least 1; it specifies the number of unaccepted connection that the system\n\
|
|
will allow before refusing new connections.");
|
|
|
|
|
|
#ifndef NO_DUP
|
|
/* s.makefile(mode) method.
|
|
Create a new open file object referring to a dupped version of
|
|
the socket's file descriptor. (The dup() call is necessary so
|
|
that the open file and socket objects may be closed independent
|
|
of each other.)
|
|
The mode argument specifies 'r' or 'w' passed to fdopen(). */
|
|
|
|
static PyObject *
|
|
sock_makefile(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
extern int fclose(FILE *);
|
|
char *mode = "r";
|
|
int bufsize = -1;
|
|
#ifdef MS_WIN32
|
|
Py_intptr_t fd;
|
|
#else
|
|
int fd;
|
|
#endif
|
|
FILE *fp;
|
|
PyObject *f;
|
|
#ifdef __VMS
|
|
char *mode_r = "r";
|
|
char *mode_w = "w";
|
|
#endif
|
|
|
|
if (!PyArg_ParseTuple(args, "|si:makefile", &mode, &bufsize))
|
|
return NULL;
|
|
#ifdef __VMS
|
|
if (strcmp(mode,"rb") == 0) {
|
|
mode = mode_r;
|
|
}
|
|
else {
|
|
if (strcmp(mode,"wb") == 0) {
|
|
mode = mode_w;
|
|
}
|
|
}
|
|
#endif
|
|
#ifdef MS_WIN32
|
|
if (((fd = _open_osfhandle(s->sock_fd, _O_BINARY)) < 0) ||
|
|
((fd = dup(fd)) < 0) || ((fp = fdopen(fd, mode)) == NULL))
|
|
#else
|
|
if ((fd = dup(s->sock_fd)) < 0 || (fp = fdopen(fd, mode)) == NULL)
|
|
#endif
|
|
{
|
|
if (fd >= 0)
|
|
SOCKETCLOSE(fd);
|
|
return s->errorhandler();
|
|
}
|
|
f = PyFile_FromFile(fp, "<socket>", mode, fclose);
|
|
if (f != NULL)
|
|
PyFile_SetBufSize(f, bufsize);
|
|
return f;
|
|
}
|
|
|
|
PyDoc_STRVAR(makefile_doc,
|
|
"makefile([mode[, buffersize]]) -> file object\n\
|
|
\n\
|
|
Return a regular file object corresponding to the socket.\n\
|
|
The mode and buffersize arguments are as for the built-in open() function.");
|
|
|
|
#endif /* NO_DUP */
|
|
|
|
/*
|
|
* This is the guts of the recv() and recv_into() methods, which reads into a
|
|
* char buffer. If you have any inc/def ref to do to the objects that contain
|
|
* the buffer, do it in the caller. This function returns the number of bytes
|
|
* succesfully read. If there was an error, it returns -1. Note that it is
|
|
* also possible that we return a number of bytes smaller than the request
|
|
* bytes.
|
|
*/
|
|
static ssize_t
|
|
sock_recv_guts(PySocketSockObject *s, char* cbuf, int len, int flags)
|
|
{
|
|
ssize_t outlen = -1;
|
|
int timeout;
|
|
#ifdef __VMS
|
|
int remaining;
|
|
char *read_buf;
|
|
#endif
|
|
|
|
if (!IS_SELECTABLE(s)) {
|
|
select_error();
|
|
return -1;
|
|
}
|
|
|
|
#ifndef __VMS
|
|
Py_BEGIN_ALLOW_THREADS
|
|
timeout = internal_select(s, 0);
|
|
if (!timeout)
|
|
outlen = recv(s->sock_fd, cbuf, len, flags);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return -1;
|
|
}
|
|
if (outlen < 0) {
|
|
/* Note: the call to errorhandler() ALWAYS indirectly returned
|
|
NULL, so ignore its return value */
|
|
s->errorhandler();
|
|
return -1;
|
|
}
|
|
#else
|
|
read_buf = cbuf;
|
|
remaining = len;
|
|
while (remaining != 0) {
|
|
unsigned int segment;
|
|
int nread = -1;
|
|
|
|
segment = remaining /SEGMENT_SIZE;
|
|
if (segment != 0) {
|
|
segment = SEGMENT_SIZE;
|
|
}
|
|
else {
|
|
segment = remaining;
|
|
}
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
timeout = internal_select(s, 0);
|
|
if (!timeout)
|
|
nread = recv(s->sock_fd, read_buf, segment, flags);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return -1;
|
|
}
|
|
if (nread < 0) {
|
|
s->errorhandler();
|
|
return -1;
|
|
}
|
|
if (nread != remaining) {
|
|
read_buf += nread;
|
|
break;
|
|
}
|
|
|
|
remaining -= segment;
|
|
read_buf += segment;
|
|
}
|
|
outlen = read_buf - cbuf;
|
|
#endif /* !__VMS */
|
|
|
|
return outlen;
|
|
}
|
|
|
|
|
|
/* s.recv(nbytes [,flags]) method */
|
|
|
|
static PyObject *
|
|
sock_recv(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
int recvlen, flags = 0;
|
|
ssize_t outlen;
|
|
PyObject *buf;
|
|
|
|
if (!PyArg_ParseTuple(args, "i|i:recv", &recvlen, &flags))
|
|
return NULL;
|
|
|
|
if (recvlen < 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"negative buffersize in recv");
|
|
return NULL;
|
|
}
|
|
|
|
/* Allocate a new string. */
|
|
buf = PyString_FromStringAndSize((char *) 0, recvlen);
|
|
if (buf == NULL)
|
|
return NULL;
|
|
|
|
/* Call the guts */
|
|
outlen = sock_recv_guts(s, PyString_AS_STRING(buf), recvlen, flags);
|
|
if (outlen < 0) {
|
|
/* An error occurred, release the string and return an
|
|
error. */
|
|
Py_DECREF(buf);
|
|
return NULL;
|
|
}
|
|
if (outlen != recvlen) {
|
|
/* We did not read as many bytes as we anticipated, resize the
|
|
string if possible and be succesful. */
|
|
if (_PyString_Resize(&buf, outlen) < 0)
|
|
/* Oopsy, not so succesful after all. */
|
|
return NULL;
|
|
}
|
|
|
|
return buf;
|
|
}
|
|
|
|
PyDoc_STRVAR(recv_doc,
|
|
"recv(buffersize[, flags]) -> data\n\
|
|
\n\
|
|
Receive up to buffersize bytes from the socket. For the optional flags\n\
|
|
argument, see the Unix manual. When no data is available, block until\n\
|
|
at least one byte is available or until the remote end is closed. When\n\
|
|
the remote end is closed and all data is read, return the empty string.");
|
|
|
|
|
|
/* s.recv_into(buffer, [nbytes [,flags]]) method */
|
|
|
|
static PyObject*
|
|
sock_recv_into(PySocketSockObject *s, PyObject *args, PyObject *kwds)
|
|
{
|
|
static char *kwlist[] = {"buffer", "nbytes", "flags", 0};
|
|
|
|
int recvlen = 0, flags = 0;
|
|
ssize_t readlen;
|
|
char *buf;
|
|
int buflen;
|
|
|
|
/* Get the buffer's memory */
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "w#|ii:recv", kwlist,
|
|
&buf, &buflen, &recvlen, &flags))
|
|
return NULL;
|
|
assert(buf != 0 && buflen > 0);
|
|
|
|
if (recvlen < 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"negative buffersize in recv");
|
|
return NULL;
|
|
}
|
|
if (recvlen == 0) {
|
|
/* If nbytes was not specified, use the buffer's length */
|
|
recvlen = buflen;
|
|
}
|
|
|
|
/* Check if the buffer is large enough */
|
|
if (buflen < recvlen) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"buffer too small for requested bytes");
|
|
return NULL;
|
|
}
|
|
|
|
/* Call the guts */
|
|
readlen = sock_recv_guts(s, buf, recvlen, flags);
|
|
if (readlen < 0) {
|
|
/* Return an error. */
|
|
return NULL;
|
|
}
|
|
|
|
/* Return the number of bytes read. Note that we do not do anything
|
|
special here in the case that readlen < recvlen. */
|
|
return PyInt_FromSsize_t(readlen);
|
|
}
|
|
|
|
PyDoc_STRVAR(recv_into_doc,
|
|
"recv_into(buffer, [nbytes[, flags]]) -> nbytes_read\n\
|
|
\n\
|
|
A version of recv() that stores its data into a buffer rather than creating \n\
|
|
a new string. Receive up to buffersize bytes from the socket. If buffersize \n\
|
|
is not specified (or 0), receive up to the size available in the given buffer.\n\
|
|
\n\
|
|
See recv() for documentation about the flags.");
|
|
|
|
|
|
/*
|
|
* This is the guts of the recv() and recv_into() methods, which reads into a
|
|
* char buffer. If you have any inc/def ref to do to the objects that contain
|
|
* the buffer, do it in the caller. This function returns the number of bytes
|
|
* succesfully read. If there was an error, it returns -1. Note that it is
|
|
* also possible that we return a number of bytes smaller than the request
|
|
* bytes.
|
|
*
|
|
* 'addr' is a return value for the address object. Note that you must decref
|
|
* it yourself.
|
|
*/
|
|
static ssize_t
|
|
sock_recvfrom_guts(PySocketSockObject *s, char* cbuf, int len, int flags,
|
|
PyObject** addr)
|
|
{
|
|
sock_addr_t addrbuf;
|
|
int timeout;
|
|
ssize_t n = -1;
|
|
socklen_t addrlen;
|
|
|
|
*addr = NULL;
|
|
|
|
if (!getsockaddrlen(s, &addrlen))
|
|
return -1;
|
|
|
|
if (!IS_SELECTABLE(s)) {
|
|
select_error();
|
|
return -1;
|
|
}
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
memset(&addrbuf, 0, addrlen);
|
|
timeout = internal_select(s, 0);
|
|
if (!timeout) {
|
|
#ifndef MS_WINDOWS
|
|
#if defined(PYOS_OS2) && !defined(PYCC_GCC)
|
|
n = recvfrom(s->sock_fd, cbuf, len, flags,
|
|
SAS2SA(&addrbuf), &addrlen);
|
|
#else
|
|
n = recvfrom(s->sock_fd, cbuf, len, flags,
|
|
(void *) &addrbuf, &addrlen);
|
|
#endif
|
|
#else
|
|
n = recvfrom(s->sock_fd, cbuf, len, flags,
|
|
SAS2SA(&addrbuf), &addrlen);
|
|
#endif
|
|
}
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return -1;
|
|
}
|
|
if (n < 0) {
|
|
s->errorhandler();
|
|
return -1;
|
|
}
|
|
|
|
if (!(*addr = makesockaddr(s->sock_fd, SAS2SA(&addrbuf),
|
|
addrlen, s->sock_proto)))
|
|
return -1;
|
|
|
|
return n;
|
|
}
|
|
|
|
/* s.recvfrom(nbytes [,flags]) method */
|
|
|
|
static PyObject *
|
|
sock_recvfrom(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
PyObject *buf = NULL;
|
|
PyObject *addr = NULL;
|
|
PyObject *ret = NULL;
|
|
int recvlen, flags = 0;
|
|
ssize_t outlen;
|
|
|
|
if (!PyArg_ParseTuple(args, "i|i:recvfrom", &recvlen, &flags))
|
|
return NULL;
|
|
|
|
buf = PyString_FromStringAndSize((char *) 0, recvlen);
|
|
if (buf == NULL)
|
|
return NULL;
|
|
|
|
outlen = sock_recvfrom_guts(s, PyString_AS_STRING(buf),
|
|
recvlen, flags, &addr);
|
|
if (outlen < 0) {
|
|
goto finally;
|
|
}
|
|
|
|
if (outlen != recvlen) {
|
|
/* We did not read as many bytes as we anticipated, resize the
|
|
string if possible and be succesful. */
|
|
if (_PyString_Resize(&buf, outlen) < 0)
|
|
/* Oopsy, not so succesful after all. */
|
|
goto finally;
|
|
}
|
|
|
|
ret = PyTuple_Pack(2, buf, addr);
|
|
|
|
finally:
|
|
Py_XDECREF(buf);
|
|
Py_XDECREF(addr);
|
|
return ret;
|
|
}
|
|
|
|
PyDoc_STRVAR(recvfrom_doc,
|
|
"recvfrom(buffersize[, flags]) -> (data, address info)\n\
|
|
\n\
|
|
Like recv(buffersize, flags) but also return the sender's address info.");
|
|
|
|
|
|
/* s.recvfrom_into(buffer[, nbytes [,flags]]) method */
|
|
|
|
static PyObject *
|
|
sock_recvfrom_into(PySocketSockObject *s, PyObject *args, PyObject* kwds)
|
|
{
|
|
static char *kwlist[] = {"buffer", "nbytes", "flags", 0};
|
|
|
|
int recvlen = 0, flags = 0;
|
|
ssize_t readlen;
|
|
char *buf;
|
|
int buflen;
|
|
|
|
PyObject *addr = NULL;
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "w#|ii:recvfrom", kwlist,
|
|
&buf, &buflen, &recvlen, &flags))
|
|
return NULL;
|
|
assert(buf != 0 && buflen > 0);
|
|
|
|
if (recvlen < 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"negative buffersize in recv");
|
|
return NULL;
|
|
}
|
|
if (recvlen == 0) {
|
|
/* If nbytes was not specified, use the buffer's length */
|
|
recvlen = buflen;
|
|
}
|
|
|
|
readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);
|
|
if (readlen < 0) {
|
|
/* Return an error */
|
|
Py_XDECREF(addr);
|
|
return NULL;
|
|
}
|
|
|
|
/* Return the number of bytes read and the address. Note that we do
|
|
not do anything special here in the case that readlen < recvlen. */
|
|
return Py_BuildValue("lN", readlen, addr);
|
|
}
|
|
|
|
PyDoc_STRVAR(recvfrom_into_doc,
|
|
"recvfrom_into(buffer[, nbytes[, flags]]) -> (nbytes, address info)\n\
|
|
\n\
|
|
Like recv_into(buffer[, nbytes[, flags]]) but also return the sender's address info.");
|
|
|
|
|
|
/* s.send(data [,flags]) method */
|
|
|
|
static PyObject *
|
|
sock_send(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
char *buf;
|
|
int len, n = -1, flags = 0, timeout;
|
|
|
|
if (!PyArg_ParseTuple(args, "s#|i:send", &buf, &len, &flags))
|
|
return NULL;
|
|
|
|
if (!IS_SELECTABLE(s))
|
|
return select_error();
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
timeout = internal_select(s, 1);
|
|
if (!timeout)
|
|
#ifdef __VMS
|
|
n = sendsegmented(s->sock_fd, buf, len, flags);
|
|
#else
|
|
n = send(s->sock_fd, buf, len, flags);
|
|
#endif
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return NULL;
|
|
}
|
|
if (n < 0)
|
|
return s->errorhandler();
|
|
return PyInt_FromLong((long)n);
|
|
}
|
|
|
|
PyDoc_STRVAR(send_doc,
|
|
"send(data[, flags]) -> count\n\
|
|
\n\
|
|
Send a data string to the socket. For the optional flags\n\
|
|
argument, see the Unix manual. Return the number of bytes\n\
|
|
sent; this may be less than len(data) if the network is busy.");
|
|
|
|
|
|
/* s.sendall(data [,flags]) method */
|
|
|
|
static PyObject *
|
|
sock_sendall(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
char *buf;
|
|
int len, n = -1, flags = 0, timeout;
|
|
|
|
if (!PyArg_ParseTuple(args, "s#|i:sendall", &buf, &len, &flags))
|
|
return NULL;
|
|
|
|
if (!IS_SELECTABLE(s))
|
|
return select_error();
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
do {
|
|
timeout = internal_select(s, 1);
|
|
n = -1;
|
|
if (timeout)
|
|
break;
|
|
#ifdef __VMS
|
|
n = sendsegmented(s->sock_fd, buf, len, flags);
|
|
#else
|
|
n = send(s->sock_fd, buf, len, flags);
|
|
#endif
|
|
if (n < 0)
|
|
break;
|
|
buf += n;
|
|
len -= n;
|
|
} while (len > 0);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return NULL;
|
|
}
|
|
if (n < 0)
|
|
return s->errorhandler();
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(sendall_doc,
|
|
"sendall(data[, flags])\n\
|
|
\n\
|
|
Send a data string to the socket. For the optional flags\n\
|
|
argument, see the Unix manual. This calls send() repeatedly\n\
|
|
until all data is sent. If an error occurs, it's impossible\n\
|
|
to tell how much data has been sent.");
|
|
|
|
|
|
/* s.sendto(data, [flags,] sockaddr) method */
|
|
|
|
static PyObject *
|
|
sock_sendto(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
PyObject *addro;
|
|
char *buf;
|
|
sock_addr_t addrbuf;
|
|
int addrlen, len, n = -1, flags, timeout;
|
|
|
|
flags = 0;
|
|
if (!PyArg_ParseTuple(args, "s#O:sendto", &buf, &len, &addro)) {
|
|
PyErr_Clear();
|
|
if (!PyArg_ParseTuple(args, "s#iO:sendto",
|
|
&buf, &len, &flags, &addro))
|
|
return NULL;
|
|
}
|
|
|
|
if (!IS_SELECTABLE(s))
|
|
return select_error();
|
|
|
|
if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
|
|
return NULL;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
timeout = internal_select(s, 1);
|
|
if (!timeout)
|
|
n = sendto(s->sock_fd, buf, len, flags, SAS2SA(&addrbuf), addrlen);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return NULL;
|
|
}
|
|
if (n < 0)
|
|
return s->errorhandler();
|
|
return PyInt_FromLong((long)n);
|
|
}
|
|
|
|
PyDoc_STRVAR(sendto_doc,
|
|
"sendto(data[, flags], address) -> count\n\
|
|
\n\
|
|
Like send(data, flags) but allows specifying the destination address.\n\
|
|
For IP sockets, the address is a pair (hostaddr, port).");
|
|
|
|
|
|
/* s.shutdown(how) method */
|
|
|
|
static PyObject *
|
|
sock_shutdown(PySocketSockObject *s, PyObject *arg)
|
|
{
|
|
int how;
|
|
int res;
|
|
|
|
how = PyInt_AsLong(arg);
|
|
if (how == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = shutdown(s->sock_fd, how);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return s->errorhandler();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(shutdown_doc,
|
|
"shutdown(flag)\n\
|
|
\n\
|
|
Shut down the reading side of the socket (flag == SHUT_RD), the writing side\n\
|
|
of the socket (flag == SHUT_WR), or both ends (flag == SHUT_RDWR).");
|
|
|
|
|
|
/* List of methods for socket objects */
|
|
|
|
static PyMethodDef sock_methods[] = {
|
|
{"accept", (PyCFunction)sock_accept, METH_NOARGS,
|
|
accept_doc},
|
|
{"bind", (PyCFunction)sock_bind, METH_O,
|
|
bind_doc},
|
|
{"close", (PyCFunction)sock_close, METH_NOARGS,
|
|
close_doc},
|
|
{"connect", (PyCFunction)sock_connect, METH_O,
|
|
connect_doc},
|
|
{"connect_ex", (PyCFunction)sock_connect_ex, METH_O,
|
|
connect_ex_doc},
|
|
#ifndef NO_DUP
|
|
{"dup", (PyCFunction)sock_dup, METH_NOARGS,
|
|
dup_doc},
|
|
#endif
|
|
{"fileno", (PyCFunction)sock_fileno, METH_NOARGS,
|
|
fileno_doc},
|
|
#ifdef HAVE_GETPEERNAME
|
|
{"getpeername", (PyCFunction)sock_getpeername,
|
|
METH_NOARGS, getpeername_doc},
|
|
#endif
|
|
{"getsockname", (PyCFunction)sock_getsockname,
|
|
METH_NOARGS, getsockname_doc},
|
|
{"getsockopt", (PyCFunction)sock_getsockopt, METH_VARARGS,
|
|
getsockopt_doc},
|
|
{"listen", (PyCFunction)sock_listen, METH_O,
|
|
listen_doc},
|
|
#ifndef NO_DUP
|
|
{"makefile", (PyCFunction)sock_makefile, METH_VARARGS,
|
|
makefile_doc},
|
|
#endif
|
|
{"recv", (PyCFunction)sock_recv, METH_VARARGS,
|
|
recv_doc},
|
|
{"recv_into", (PyCFunction)sock_recv_into, METH_VARARGS | METH_KEYWORDS,
|
|
recv_into_doc},
|
|
{"recvfrom", (PyCFunction)sock_recvfrom, METH_VARARGS,
|
|
recvfrom_doc},
|
|
{"recvfrom_into", (PyCFunction)sock_recvfrom_into, METH_VARARGS | METH_KEYWORDS,
|
|
recvfrom_into_doc},
|
|
{"send", (PyCFunction)sock_send, METH_VARARGS,
|
|
send_doc},
|
|
{"sendall", (PyCFunction)sock_sendall, METH_VARARGS,
|
|
sendall_doc},
|
|
{"sendto", (PyCFunction)sock_sendto, METH_VARARGS,
|
|
sendto_doc},
|
|
{"setblocking", (PyCFunction)sock_setblocking, METH_O,
|
|
setblocking_doc},
|
|
{"settimeout", (PyCFunction)sock_settimeout, METH_O,
|
|
settimeout_doc},
|
|
{"gettimeout", (PyCFunction)sock_gettimeout, METH_NOARGS,
|
|
gettimeout_doc},
|
|
{"setsockopt", (PyCFunction)sock_setsockopt, METH_VARARGS,
|
|
setsockopt_doc},
|
|
{"shutdown", (PyCFunction)sock_shutdown, METH_O,
|
|
shutdown_doc},
|
|
#ifdef RISCOS
|
|
{"sleeptaskw", (PyCFunction)sock_sleeptaskw, METH_O,
|
|
sleeptaskw_doc},
|
|
#endif
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
/* SockObject members */
|
|
static PyMemberDef sock_memberlist[] = {
|
|
{"family", T_INT, offsetof(PySocketSockObject, sock_family), READONLY, "the socket family"},
|
|
{"type", T_INT, offsetof(PySocketSockObject, sock_type), READONLY, "the socket type"},
|
|
{"proto", T_INT, offsetof(PySocketSockObject, sock_proto), READONLY, "the socket protocol"},
|
|
{"timeout", T_DOUBLE, offsetof(PySocketSockObject, sock_timeout), READONLY, "the socket timeout"},
|
|
{0},
|
|
};
|
|
|
|
/* Deallocate a socket object in response to the last Py_DECREF().
|
|
First close the file description. */
|
|
|
|
static void
|
|
sock_dealloc(PySocketSockObject *s)
|
|
{
|
|
if (s->sock_fd != -1)
|
|
(void) SOCKETCLOSE(s->sock_fd);
|
|
s->ob_type->tp_free((PyObject *)s);
|
|
}
|
|
|
|
|
|
static PyObject *
|
|
sock_repr(PySocketSockObject *s)
|
|
{
|
|
char buf[512];
|
|
#if SIZEOF_SOCKET_T > SIZEOF_LONG
|
|
if (s->sock_fd > LONG_MAX) {
|
|
/* this can occur on Win64, and actually there is a special
|
|
ugly printf formatter for decimal pointer length integer
|
|
printing, only bother if necessary*/
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"no printf formatter to display "
|
|
"the socket descriptor in decimal");
|
|
return NULL;
|
|
}
|
|
#endif
|
|
PyOS_snprintf(
|
|
buf, sizeof(buf),
|
|
"<socket object, fd=%ld, family=%d, type=%d, protocol=%d>",
|
|
(long)s->sock_fd, s->sock_family,
|
|
s->sock_type,
|
|
s->sock_proto);
|
|
return PyString_FromString(buf);
|
|
}
|
|
|
|
|
|
/* Create a new, uninitialized socket object. */
|
|
|
|
static PyObject *
|
|
sock_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyObject *new;
|
|
|
|
new = type->tp_alloc(type, 0);
|
|
if (new != NULL) {
|
|
((PySocketSockObject *)new)->sock_fd = -1;
|
|
((PySocketSockObject *)new)->sock_timeout = -1.0;
|
|
((PySocketSockObject *)new)->errorhandler = &set_error;
|
|
}
|
|
return new;
|
|
}
|
|
|
|
|
|
/* Initialize a new socket object. */
|
|
|
|
/*ARGSUSED*/
|
|
static int
|
|
sock_initobj(PyObject *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
PySocketSockObject *s = (PySocketSockObject *)self;
|
|
SOCKET_T fd;
|
|
int family = AF_INET, type = SOCK_STREAM, proto = 0;
|
|
static char *keywords[] = {"family", "type", "proto", 0};
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds,
|
|
"|iii:socket", keywords,
|
|
&family, &type, &proto))
|
|
return -1;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
fd = socket(family, type, proto);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
#ifdef MS_WINDOWS
|
|
if (fd == INVALID_SOCKET)
|
|
#else
|
|
if (fd < 0)
|
|
#endif
|
|
{
|
|
set_error();
|
|
return -1;
|
|
}
|
|
init_sockobject(s, fd, family, type, proto);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
/* Type object for socket objects. */
|
|
|
|
static PyTypeObject sock_type = {
|
|
PyObject_HEAD_INIT(0) /* Must fill in type value later */
|
|
0, /* ob_size */
|
|
"_socket.socket", /* tp_name */
|
|
sizeof(PySocketSockObject), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
(destructor)sock_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
(reprfunc)sock_repr, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
sock_doc, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
sock_methods, /* tp_methods */
|
|
sock_memberlist, /* tp_members */
|
|
0, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
sock_initobj, /* tp_init */
|
|
PyType_GenericAlloc, /* tp_alloc */
|
|
sock_new, /* tp_new */
|
|
PyObject_Del, /* tp_free */
|
|
};
|
|
|
|
|
|
/* Python interface to gethostname(). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_gethostname(PyObject *self, PyObject *unused)
|
|
{
|
|
char buf[1024];
|
|
int res;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = gethostname(buf, (int) sizeof buf - 1);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return set_error();
|
|
buf[sizeof buf - 1] = '\0';
|
|
return PyString_FromString(buf);
|
|
}
|
|
|
|
PyDoc_STRVAR(gethostname_doc,
|
|
"gethostname() -> string\n\
|
|
\n\
|
|
Return the current host name.");
|
|
|
|
|
|
/* Python interface to gethostbyname(name). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_gethostbyname(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
sock_addr_t addrbuf;
|
|
|
|
if (!PyArg_ParseTuple(args, "s:gethostbyname", &name))
|
|
return NULL;
|
|
if (setipaddr(name, SAS2SA(&addrbuf), sizeof(addrbuf), AF_INET) < 0)
|
|
return NULL;
|
|
return makeipaddr(SAS2SA(&addrbuf), sizeof(struct sockaddr_in));
|
|
}
|
|
|
|
PyDoc_STRVAR(gethostbyname_doc,
|
|
"gethostbyname(host) -> address\n\
|
|
\n\
|
|
Return the IP address (a string of the form '255.255.255.255') for a host.");
|
|
|
|
|
|
/* Convenience function common to gethostbyname_ex and gethostbyaddr */
|
|
|
|
static PyObject *
|
|
gethost_common(struct hostent *h, struct sockaddr *addr, int alen, int af)
|
|
{
|
|
char **pch;
|
|
PyObject *rtn_tuple = (PyObject *)NULL;
|
|
PyObject *name_list = (PyObject *)NULL;
|
|
PyObject *addr_list = (PyObject *)NULL;
|
|
PyObject *tmp;
|
|
|
|
if (h == NULL) {
|
|
/* Let's get real error message to return */
|
|
#ifndef RISCOS
|
|
set_herror(h_errno);
|
|
#else
|
|
PyErr_SetString(socket_error, "host not found");
|
|
#endif
|
|
return NULL;
|
|
}
|
|
|
|
if (h->h_addrtype != af) {
|
|
#ifdef HAVE_STRERROR
|
|
/* Let's get real error message to return */
|
|
PyErr_SetString(socket_error,
|
|
(char *)strerror(EAFNOSUPPORT));
|
|
#else
|
|
PyErr_SetString(
|
|
socket_error,
|
|
"Address family not supported by protocol family");
|
|
#endif
|
|
return NULL;
|
|
}
|
|
|
|
switch (af) {
|
|
|
|
case AF_INET:
|
|
if (alen < sizeof(struct sockaddr_in))
|
|
return NULL;
|
|
break;
|
|
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
if (alen < sizeof(struct sockaddr_in6))
|
|
return NULL;
|
|
break;
|
|
#endif
|
|
|
|
}
|
|
|
|
if ((name_list = PyList_New(0)) == NULL)
|
|
goto err;
|
|
|
|
if ((addr_list = PyList_New(0)) == NULL)
|
|
goto err;
|
|
|
|
/* SF #1511317: h_aliases can be NULL */
|
|
if (h->h_aliases) {
|
|
for (pch = h->h_aliases; *pch != NULL; pch++) {
|
|
int status;
|
|
tmp = PyString_FromString(*pch);
|
|
if (tmp == NULL)
|
|
goto err;
|
|
|
|
status = PyList_Append(name_list, tmp);
|
|
Py_DECREF(tmp);
|
|
|
|
if (status)
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
for (pch = h->h_addr_list; *pch != NULL; pch++) {
|
|
int status;
|
|
|
|
switch (af) {
|
|
|
|
case AF_INET:
|
|
{
|
|
struct sockaddr_in sin;
|
|
memset(&sin, 0, sizeof(sin));
|
|
sin.sin_family = af;
|
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
|
sin.sin_len = sizeof(sin);
|
|
#endif
|
|
memcpy(&sin.sin_addr, *pch, sizeof(sin.sin_addr));
|
|
tmp = makeipaddr((struct sockaddr *)&sin, sizeof(sin));
|
|
|
|
if (pch == h->h_addr_list && alen >= sizeof(sin))
|
|
memcpy((char *) addr, &sin, sizeof(sin));
|
|
break;
|
|
}
|
|
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
{
|
|
struct sockaddr_in6 sin6;
|
|
memset(&sin6, 0, sizeof(sin6));
|
|
sin6.sin6_family = af;
|
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
|
sin6.sin6_len = sizeof(sin6);
|
|
#endif
|
|
memcpy(&sin6.sin6_addr, *pch, sizeof(sin6.sin6_addr));
|
|
tmp = makeipaddr((struct sockaddr *)&sin6,
|
|
sizeof(sin6));
|
|
|
|
if (pch == h->h_addr_list && alen >= sizeof(sin6))
|
|
memcpy((char *) addr, &sin6, sizeof(sin6));
|
|
break;
|
|
}
|
|
#endif
|
|
|
|
default: /* can't happen */
|
|
PyErr_SetString(socket_error,
|
|
"unsupported address family");
|
|
return NULL;
|
|
}
|
|
|
|
if (tmp == NULL)
|
|
goto err;
|
|
|
|
status = PyList_Append(addr_list, tmp);
|
|
Py_DECREF(tmp);
|
|
|
|
if (status)
|
|
goto err;
|
|
}
|
|
|
|
rtn_tuple = Py_BuildValue("sOO", h->h_name, name_list, addr_list);
|
|
|
|
err:
|
|
Py_XDECREF(name_list);
|
|
Py_XDECREF(addr_list);
|
|
return rtn_tuple;
|
|
}
|
|
|
|
|
|
/* Python interface to gethostbyname_ex(name). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_gethostbyname_ex(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
struct hostent *h;
|
|
#ifdef ENABLE_IPV6
|
|
struct sockaddr_storage addr;
|
|
#else
|
|
struct sockaddr_in addr;
|
|
#endif
|
|
struct sockaddr *sa;
|
|
PyObject *ret;
|
|
#ifdef HAVE_GETHOSTBYNAME_R
|
|
struct hostent hp_allocated;
|
|
#ifdef HAVE_GETHOSTBYNAME_R_3_ARG
|
|
struct hostent_data data;
|
|
#else
|
|
char buf[16384];
|
|
int buf_len = (sizeof buf) - 1;
|
|
int errnop;
|
|
#endif
|
|
#if defined(HAVE_GETHOSTBYNAME_R_3_ARG) || defined(HAVE_GETHOSTBYNAME_R_6_ARG)
|
|
int result;
|
|
#endif
|
|
#endif /* HAVE_GETHOSTBYNAME_R */
|
|
|
|
if (!PyArg_ParseTuple(args, "s:gethostbyname_ex", &name))
|
|
return NULL;
|
|
if (setipaddr(name, (struct sockaddr *)&addr, sizeof(addr), AF_INET) < 0)
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#ifdef HAVE_GETHOSTBYNAME_R
|
|
#if defined(HAVE_GETHOSTBYNAME_R_6_ARG)
|
|
result = gethostbyname_r(name, &hp_allocated, buf, buf_len,
|
|
&h, &errnop);
|
|
#elif defined(HAVE_GETHOSTBYNAME_R_5_ARG)
|
|
h = gethostbyname_r(name, &hp_allocated, buf, buf_len, &errnop);
|
|
#else /* HAVE_GETHOSTBYNAME_R_3_ARG */
|
|
memset((void *) &data, '\0', sizeof(data));
|
|
result = gethostbyname_r(name, &hp_allocated, &data);
|
|
h = (result != 0) ? NULL : &hp_allocated;
|
|
#endif
|
|
#else /* not HAVE_GETHOSTBYNAME_R */
|
|
#ifdef USE_GETHOSTBYNAME_LOCK
|
|
PyThread_acquire_lock(netdb_lock, 1);
|
|
#endif
|
|
h = gethostbyname(name);
|
|
#endif /* HAVE_GETHOSTBYNAME_R */
|
|
Py_END_ALLOW_THREADS
|
|
/* Some C libraries would require addr.__ss_family instead of
|
|
addr.ss_family.
|
|
Therefore, we cast the sockaddr_storage into sockaddr to
|
|
access sa_family. */
|
|
sa = (struct sockaddr*)&addr;
|
|
ret = gethost_common(h, (struct sockaddr *)&addr, sizeof(addr),
|
|
sa->sa_family);
|
|
#ifdef USE_GETHOSTBYNAME_LOCK
|
|
PyThread_release_lock(netdb_lock);
|
|
#endif
|
|
return ret;
|
|
}
|
|
|
|
PyDoc_STRVAR(ghbn_ex_doc,
|
|
"gethostbyname_ex(host) -> (name, aliaslist, addresslist)\n\
|
|
\n\
|
|
Return the true host name, a list of aliases, and a list of IP addresses,\n\
|
|
for a host. The host argument is a string giving a host name or IP number.");
|
|
|
|
|
|
/* Python interface to gethostbyaddr(IP). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_gethostbyaddr(PyObject *self, PyObject *args)
|
|
{
|
|
#ifdef ENABLE_IPV6
|
|
struct sockaddr_storage addr;
|
|
#else
|
|
struct sockaddr_in addr;
|
|
#endif
|
|
struct sockaddr *sa = (struct sockaddr *)&addr;
|
|
char *ip_num;
|
|
struct hostent *h;
|
|
PyObject *ret;
|
|
#ifdef HAVE_GETHOSTBYNAME_R
|
|
struct hostent hp_allocated;
|
|
#ifdef HAVE_GETHOSTBYNAME_R_3_ARG
|
|
struct hostent_data data;
|
|
#else
|
|
char buf[16384];
|
|
int buf_len = (sizeof buf) - 1;
|
|
int errnop;
|
|
#endif
|
|
#if defined(HAVE_GETHOSTBYNAME_R_3_ARG) || defined(HAVE_GETHOSTBYNAME_R_6_ARG)
|
|
int result;
|
|
#endif
|
|
#endif /* HAVE_GETHOSTBYNAME_R */
|
|
char *ap;
|
|
int al;
|
|
int af;
|
|
|
|
if (!PyArg_ParseTuple(args, "s:gethostbyaddr", &ip_num))
|
|
return NULL;
|
|
af = AF_UNSPEC;
|
|
if (setipaddr(ip_num, sa, sizeof(addr), af) < 0)
|
|
return NULL;
|
|
af = sa->sa_family;
|
|
ap = NULL;
|
|
al = 0;
|
|
switch (af) {
|
|
case AF_INET:
|
|
ap = (char *)&((struct sockaddr_in *)sa)->sin_addr;
|
|
al = sizeof(((struct sockaddr_in *)sa)->sin_addr);
|
|
break;
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
ap = (char *)&((struct sockaddr_in6 *)sa)->sin6_addr;
|
|
al = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr);
|
|
break;
|
|
#endif
|
|
default:
|
|
PyErr_SetString(socket_error, "unsupported address family");
|
|
return NULL;
|
|
}
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#ifdef HAVE_GETHOSTBYNAME_R
|
|
#if defined(HAVE_GETHOSTBYNAME_R_6_ARG)
|
|
result = gethostbyaddr_r(ap, al, af,
|
|
&hp_allocated, buf, buf_len,
|
|
&h, &errnop);
|
|
#elif defined(HAVE_GETHOSTBYNAME_R_5_ARG)
|
|
h = gethostbyaddr_r(ap, al, af,
|
|
&hp_allocated, buf, buf_len, &errnop);
|
|
#else /* HAVE_GETHOSTBYNAME_R_3_ARG */
|
|
memset((void *) &data, '\0', sizeof(data));
|
|
result = gethostbyaddr_r(ap, al, af, &hp_allocated, &data);
|
|
h = (result != 0) ? NULL : &hp_allocated;
|
|
#endif
|
|
#else /* not HAVE_GETHOSTBYNAME_R */
|
|
#ifdef USE_GETHOSTBYNAME_LOCK
|
|
PyThread_acquire_lock(netdb_lock, 1);
|
|
#endif
|
|
h = gethostbyaddr(ap, al, af);
|
|
#endif /* HAVE_GETHOSTBYNAME_R */
|
|
Py_END_ALLOW_THREADS
|
|
ret = gethost_common(h, (struct sockaddr *)&addr, sizeof(addr), af);
|
|
#ifdef USE_GETHOSTBYNAME_LOCK
|
|
PyThread_release_lock(netdb_lock);
|
|
#endif
|
|
return ret;
|
|
}
|
|
|
|
PyDoc_STRVAR(gethostbyaddr_doc,
|
|
"gethostbyaddr(host) -> (name, aliaslist, addresslist)\n\
|
|
\n\
|
|
Return the true host name, a list of aliases, and a list of IP addresses,\n\
|
|
for a host. The host argument is a string giving a host name or IP number.");
|
|
|
|
|
|
/* Python interface to getservbyname(name).
|
|
This only returns the port number, since the other info is already
|
|
known or not useful (like the list of aliases). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_getservbyname(PyObject *self, PyObject *args)
|
|
{
|
|
char *name, *proto=NULL;
|
|
struct servent *sp;
|
|
if (!PyArg_ParseTuple(args, "s|s:getservbyname", &name, &proto))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
sp = getservbyname(name, proto);
|
|
Py_END_ALLOW_THREADS
|
|
if (sp == NULL) {
|
|
PyErr_SetString(socket_error, "service/proto not found");
|
|
return NULL;
|
|
}
|
|
return PyInt_FromLong((long) ntohs(sp->s_port));
|
|
}
|
|
|
|
PyDoc_STRVAR(getservbyname_doc,
|
|
"getservbyname(servicename[, protocolname]) -> integer\n\
|
|
\n\
|
|
Return a port number from a service name and protocol name.\n\
|
|
The optional protocol name, if given, should be 'tcp' or 'udp',\n\
|
|
otherwise any protocol will match.");
|
|
|
|
|
|
/* Python interface to getservbyport(port).
|
|
This only returns the service name, since the other info is already
|
|
known or not useful (like the list of aliases). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_getservbyport(PyObject *self, PyObject *args)
|
|
{
|
|
unsigned short port;
|
|
char *proto=NULL;
|
|
struct servent *sp;
|
|
if (!PyArg_ParseTuple(args, "H|s:getservbyport", &port, &proto))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
sp = getservbyport(htons(port), proto);
|
|
Py_END_ALLOW_THREADS
|
|
if (sp == NULL) {
|
|
PyErr_SetString(socket_error, "port/proto not found");
|
|
return NULL;
|
|
}
|
|
return PyString_FromString(sp->s_name);
|
|
}
|
|
|
|
PyDoc_STRVAR(getservbyport_doc,
|
|
"getservbyport(port[, protocolname]) -> string\n\
|
|
\n\
|
|
Return the service name from a port number and protocol name.\n\
|
|
The optional protocol name, if given, should be 'tcp' or 'udp',\n\
|
|
otherwise any protocol will match.");
|
|
|
|
/* Python interface to getprotobyname(name).
|
|
This only returns the protocol number, since the other info is
|
|
already known or not useful (like the list of aliases). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_getprotobyname(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
struct protoent *sp;
|
|
#ifdef __BEOS__
|
|
/* Not available in BeOS yet. - [cjh] */
|
|
PyErr_SetString(socket_error, "getprotobyname not supported");
|
|
return NULL;
|
|
#else
|
|
if (!PyArg_ParseTuple(args, "s:getprotobyname", &name))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
sp = getprotobyname(name);
|
|
Py_END_ALLOW_THREADS
|
|
if (sp == NULL) {
|
|
PyErr_SetString(socket_error, "protocol not found");
|
|
return NULL;
|
|
}
|
|
return PyInt_FromLong((long) sp->p_proto);
|
|
#endif
|
|
}
|
|
|
|
PyDoc_STRVAR(getprotobyname_doc,
|
|
"getprotobyname(name) -> integer\n\
|
|
\n\
|
|
Return the protocol number for the named protocol. (Rarely used.)");
|
|
|
|
|
|
#ifdef HAVE_SOCKETPAIR
|
|
/* Create a pair of sockets using the socketpair() function.
|
|
Arguments as for socket() except the default family is AF_UNIX if
|
|
defined on the platform; otherwise, the default is AF_INET. */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_socketpair(PyObject *self, PyObject *args)
|
|
{
|
|
PySocketSockObject *s0 = NULL, *s1 = NULL;
|
|
SOCKET_T sv[2];
|
|
int family, type = SOCK_STREAM, proto = 0;
|
|
PyObject *res = NULL;
|
|
|
|
#if defined(AF_UNIX)
|
|
family = AF_UNIX;
|
|
#else
|
|
family = AF_INET;
|
|
#endif
|
|
if (!PyArg_ParseTuple(args, "|iii:socketpair",
|
|
&family, &type, &proto))
|
|
return NULL;
|
|
/* Create a pair of socket fds */
|
|
if (socketpair(family, type, proto, sv) < 0)
|
|
return set_error();
|
|
s0 = new_sockobject(sv[0], family, type, proto);
|
|
if (s0 == NULL)
|
|
goto finally;
|
|
s1 = new_sockobject(sv[1], family, type, proto);
|
|
if (s1 == NULL)
|
|
goto finally;
|
|
res = PyTuple_Pack(2, s0, s1);
|
|
|
|
finally:
|
|
if (res == NULL) {
|
|
if (s0 == NULL)
|
|
SOCKETCLOSE(sv[0]);
|
|
if (s1 == NULL)
|
|
SOCKETCLOSE(sv[1]);
|
|
}
|
|
Py_XDECREF(s0);
|
|
Py_XDECREF(s1);
|
|
return res;
|
|
}
|
|
|
|
PyDoc_STRVAR(socketpair_doc,
|
|
"socketpair([family[, type[, proto]]]) -> (socket object, socket object)\n\
|
|
\n\
|
|
Create a pair of socket objects from the sockets returned by the platform\n\
|
|
socketpair() function.\n\
|
|
The arguments are the same as for socket() except the default family is\n\
|
|
AF_UNIX if defined on the platform; otherwise, the default is AF_INET.");
|
|
|
|
#endif /* HAVE_SOCKETPAIR */
|
|
|
|
|
|
#ifndef NO_DUP
|
|
/* Create a socket object from a numeric file description.
|
|
Useful e.g. if stdin is a socket.
|
|
Additional arguments as for socket(). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_fromfd(PyObject *self, PyObject *args)
|
|
{
|
|
PySocketSockObject *s;
|
|
SOCKET_T fd;
|
|
int family, type, proto = 0;
|
|
if (!PyArg_ParseTuple(args, "iii|i:fromfd",
|
|
&fd, &family, &type, &proto))
|
|
return NULL;
|
|
/* Dup the fd so it and the socket can be closed independently */
|
|
fd = dup(fd);
|
|
if (fd < 0)
|
|
return set_error();
|
|
s = new_sockobject(fd, family, type, proto);
|
|
return (PyObject *) s;
|
|
}
|
|
|
|
PyDoc_STRVAR(fromfd_doc,
|
|
"fromfd(fd, family, type[, proto]) -> socket object\n\
|
|
\n\
|
|
Create a socket object from a duplicate of the given\n\
|
|
file descriptor.\n\
|
|
The remaining arguments are the same as for socket().");
|
|
|
|
#endif /* NO_DUP */
|
|
|
|
|
|
static PyObject *
|
|
socket_ntohs(PyObject *self, PyObject *args)
|
|
{
|
|
int x1, x2;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:ntohs", &x1)) {
|
|
return NULL;
|
|
}
|
|
x2 = (int)ntohs((short)x1);
|
|
return PyInt_FromLong(x2);
|
|
}
|
|
|
|
PyDoc_STRVAR(ntohs_doc,
|
|
"ntohs(integer) -> integer\n\
|
|
\n\
|
|
Convert a 16-bit integer from network to host byte order.");
|
|
|
|
|
|
static PyObject *
|
|
socket_ntohl(PyObject *self, PyObject *arg)
|
|
{
|
|
unsigned long x;
|
|
|
|
if (PyInt_Check(arg)) {
|
|
x = PyInt_AS_LONG(arg);
|
|
if (x == (unsigned long) -1 && PyErr_Occurred())
|
|
return NULL;
|
|
}
|
|
else if (PyLong_Check(arg)) {
|
|
x = PyLong_AsUnsignedLong(arg);
|
|
if (x == (unsigned long) -1 && PyErr_Occurred())
|
|
return NULL;
|
|
#if SIZEOF_LONG > 4
|
|
{
|
|
unsigned long y;
|
|
/* only want the trailing 32 bits */
|
|
y = x & 0xFFFFFFFFUL;
|
|
if (y ^ x)
|
|
return PyErr_Format(PyExc_OverflowError,
|
|
"long int larger than 32 bits");
|
|
x = y;
|
|
}
|
|
#endif
|
|
}
|
|
else
|
|
return PyErr_Format(PyExc_TypeError,
|
|
"expected int/long, %s found",
|
|
arg->ob_type->tp_name);
|
|
if (x == (unsigned long) -1 && PyErr_Occurred())
|
|
return NULL;
|
|
return PyInt_FromLong(ntohl(x));
|
|
}
|
|
|
|
PyDoc_STRVAR(ntohl_doc,
|
|
"ntohl(integer) -> integer\n\
|
|
\n\
|
|
Convert a 32-bit integer from network to host byte order.");
|
|
|
|
|
|
static PyObject *
|
|
socket_htons(PyObject *self, PyObject *args)
|
|
{
|
|
int x1, x2;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:htons", &x1)) {
|
|
return NULL;
|
|
}
|
|
x2 = (int)htons((short)x1);
|
|
return PyInt_FromLong(x2);
|
|
}
|
|
|
|
PyDoc_STRVAR(htons_doc,
|
|
"htons(integer) -> integer\n\
|
|
\n\
|
|
Convert a 16-bit integer from host to network byte order.");
|
|
|
|
|
|
static PyObject *
|
|
socket_htonl(PyObject *self, PyObject *arg)
|
|
{
|
|
unsigned long x;
|
|
|
|
if (PyInt_Check(arg)) {
|
|
x = PyInt_AS_LONG(arg);
|
|
if (x == (unsigned long) -1 && PyErr_Occurred())
|
|
return NULL;
|
|
}
|
|
else if (PyLong_Check(arg)) {
|
|
x = PyLong_AsUnsignedLong(arg);
|
|
if (x == (unsigned long) -1 && PyErr_Occurred())
|
|
return NULL;
|
|
#if SIZEOF_LONG > 4
|
|
{
|
|
unsigned long y;
|
|
/* only want the trailing 32 bits */
|
|
y = x & 0xFFFFFFFFUL;
|
|
if (y ^ x)
|
|
return PyErr_Format(PyExc_OverflowError,
|
|
"long int larger than 32 bits");
|
|
x = y;
|
|
}
|
|
#endif
|
|
}
|
|
else
|
|
return PyErr_Format(PyExc_TypeError,
|
|
"expected int/long, %s found",
|
|
arg->ob_type->tp_name);
|
|
return PyInt_FromLong(htonl(x));
|
|
}
|
|
|
|
PyDoc_STRVAR(htonl_doc,
|
|
"htonl(integer) -> integer\n\
|
|
\n\
|
|
Convert a 32-bit integer from host to network byte order.");
|
|
|
|
/* socket.inet_aton() and socket.inet_ntoa() functions. */
|
|
|
|
PyDoc_STRVAR(inet_aton_doc,
|
|
"inet_aton(string) -> packed 32-bit IP representation\n\
|
|
\n\
|
|
Convert an IP address in string format (123.45.67.89) to the 32-bit packed\n\
|
|
binary format used in low-level network functions.");
|
|
|
|
static PyObject*
|
|
socket_inet_aton(PyObject *self, PyObject *args)
|
|
{
|
|
#ifndef INADDR_NONE
|
|
#define INADDR_NONE (-1)
|
|
#endif
|
|
#ifdef HAVE_INET_ATON
|
|
struct in_addr buf;
|
|
#endif
|
|
|
|
#if !defined(HAVE_INET_ATON) || defined(USE_INET_ATON_WEAKLINK)
|
|
/* Have to use inet_addr() instead */
|
|
unsigned long packed_addr;
|
|
#endif
|
|
char *ip_addr;
|
|
|
|
if (!PyArg_ParseTuple(args, "s:inet_aton", &ip_addr))
|
|
return NULL;
|
|
|
|
|
|
#ifdef HAVE_INET_ATON
|
|
|
|
#ifdef USE_INET_ATON_WEAKLINK
|
|
if (inet_aton != NULL) {
|
|
#endif
|
|
if (inet_aton(ip_addr, &buf))
|
|
return PyString_FromStringAndSize((char *)(&buf),
|
|
sizeof(buf));
|
|
|
|
PyErr_SetString(socket_error,
|
|
"illegal IP address string passed to inet_aton");
|
|
return NULL;
|
|
|
|
#ifdef USE_INET_ATON_WEAKLINK
|
|
} else {
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#if !defined(HAVE_INET_ATON) || defined(USE_INET_ATON_WEAKLINK)
|
|
|
|
/* special-case this address as inet_addr might return INADDR_NONE
|
|
* for this */
|
|
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 */
|
|
PyErr_SetString(socket_error,
|
|
"illegal IP address string passed to inet_aton");
|
|
return NULL;
|
|
}
|
|
}
|
|
return PyString_FromStringAndSize((char *) &packed_addr,
|
|
sizeof(packed_addr));
|
|
|
|
#ifdef USE_INET_ATON_WEAKLINK
|
|
}
|
|
#endif
|
|
|
|
#endif
|
|
}
|
|
|
|
PyDoc_STRVAR(inet_ntoa_doc,
|
|
"inet_ntoa(packed_ip) -> ip_address_string\n\
|
|
\n\
|
|
Convert an IP address from 32-bit packed binary format to string format");
|
|
|
|
static PyObject*
|
|
socket_inet_ntoa(PyObject *self, PyObject *args)
|
|
{
|
|
char *packed_str;
|
|
int addr_len;
|
|
struct in_addr packed_addr;
|
|
|
|
if (!PyArg_ParseTuple(args, "s#:inet_ntoa", &packed_str, &addr_len)) {
|
|
return NULL;
|
|
}
|
|
|
|
if (addr_len != sizeof(packed_addr)) {
|
|
PyErr_SetString(socket_error,
|
|
"packed IP wrong length for inet_ntoa");
|
|
return NULL;
|
|
}
|
|
|
|
memcpy(&packed_addr, packed_str, addr_len);
|
|
|
|
return PyString_FromString(inet_ntoa(packed_addr));
|
|
}
|
|
|
|
#ifdef HAVE_INET_PTON
|
|
|
|
PyDoc_STRVAR(inet_pton_doc,
|
|
"inet_pton(af, ip) -> packed IP address string\n\
|
|
\n\
|
|
Convert an IP address from string format to a packed string suitable\n\
|
|
for use with low-level network functions.");
|
|
|
|
static PyObject *
|
|
socket_inet_pton(PyObject *self, PyObject *args)
|
|
{
|
|
int af;
|
|
char* ip;
|
|
int retval;
|
|
#ifdef ENABLE_IPV6
|
|
char packed[MAX(sizeof(struct in_addr), sizeof(struct in6_addr))];
|
|
#else
|
|
char packed[sizeof(struct in_addr)];
|
|
#endif
|
|
if (!PyArg_ParseTuple(args, "is:inet_pton", &af, &ip)) {
|
|
return NULL;
|
|
}
|
|
|
|
#if !defined(ENABLE_IPV6) && defined(AF_INET6)
|
|
if(af == AF_INET6) {
|
|
PyErr_SetString(socket_error,
|
|
"can't use AF_INET6, IPv6 is disabled");
|
|
return NULL;
|
|
}
|
|
#endif
|
|
|
|
retval = inet_pton(af, ip, packed);
|
|
if (retval < 0) {
|
|
PyErr_SetFromErrno(socket_error);
|
|
return NULL;
|
|
} else if (retval == 0) {
|
|
PyErr_SetString(socket_error,
|
|
"illegal IP address string passed to inet_pton");
|
|
return NULL;
|
|
} else if (af == AF_INET) {
|
|
return PyString_FromStringAndSize(packed,
|
|
sizeof(struct in_addr));
|
|
#ifdef ENABLE_IPV6
|
|
} else if (af == AF_INET6) {
|
|
return PyString_FromStringAndSize(packed,
|
|
sizeof(struct in6_addr));
|
|
#endif
|
|
} else {
|
|
PyErr_SetString(socket_error, "unknown address family");
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
PyDoc_STRVAR(inet_ntop_doc,
|
|
"inet_ntop(af, packed_ip) -> string formatted IP address\n\
|
|
\n\
|
|
Convert a packed IP address of the given family to string format.");
|
|
|
|
static PyObject *
|
|
socket_inet_ntop(PyObject *self, PyObject *args)
|
|
{
|
|
int af;
|
|
char* packed;
|
|
int len;
|
|
const char* retval;
|
|
#ifdef ENABLE_IPV6
|
|
char ip[MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN) + 1];
|
|
#else
|
|
char ip[INET_ADDRSTRLEN + 1];
|
|
#endif
|
|
|
|
/* Guarantee NUL-termination for PyString_FromString() below */
|
|
memset((void *) &ip[0], '\0', sizeof(ip));
|
|
|
|
if (!PyArg_ParseTuple(args, "is#:inet_ntop", &af, &packed, &len)) {
|
|
return NULL;
|
|
}
|
|
|
|
if (af == AF_INET) {
|
|
if (len != sizeof(struct in_addr)) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"invalid length of packed IP address string");
|
|
return NULL;
|
|
}
|
|
#ifdef ENABLE_IPV6
|
|
} else if (af == AF_INET6) {
|
|
if (len != sizeof(struct in6_addr)) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"invalid length of packed IP address string");
|
|
return NULL;
|
|
}
|
|
#endif
|
|
} else {
|
|
PyErr_Format(PyExc_ValueError,
|
|
"unknown address family %d", af);
|
|
return NULL;
|
|
}
|
|
|
|
retval = inet_ntop(af, packed, ip, sizeof(ip));
|
|
if (!retval) {
|
|
PyErr_SetFromErrno(socket_error);
|
|
return NULL;
|
|
} else {
|
|
return PyString_FromString(retval);
|
|
}
|
|
|
|
/* NOTREACHED */
|
|
PyErr_SetString(PyExc_RuntimeError, "invalid handling of inet_ntop");
|
|
return NULL;
|
|
}
|
|
|
|
#endif /* HAVE_INET_PTON */
|
|
|
|
/* Python interface to getaddrinfo(host, port). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_getaddrinfo(PyObject *self, PyObject *args)
|
|
{
|
|
struct addrinfo hints, *res;
|
|
struct addrinfo *res0 = NULL;
|
|
PyObject *hobj = NULL;
|
|
PyObject *pobj = (PyObject *)NULL;
|
|
char pbuf[30];
|
|
char *hptr, *pptr;
|
|
int family, socktype, protocol, flags;
|
|
int error;
|
|
PyObject *all = (PyObject *)NULL;
|
|
PyObject *single = (PyObject *)NULL;
|
|
PyObject *idna = NULL;
|
|
|
|
family = socktype = protocol = flags = 0;
|
|
family = AF_UNSPEC;
|
|
if (!PyArg_ParseTuple(args, "OO|iiii:getaddrinfo",
|
|
&hobj, &pobj, &family, &socktype,
|
|
&protocol, &flags)) {
|
|
return NULL;
|
|
}
|
|
if (hobj == Py_None) {
|
|
hptr = NULL;
|
|
} else if (PyUnicode_Check(hobj)) {
|
|
idna = PyObject_CallMethod(hobj, "encode", "s", "idna");
|
|
if (!idna)
|
|
return NULL;
|
|
hptr = PyString_AsString(idna);
|
|
} else if (PyString_Check(hobj)) {
|
|
hptr = PyString_AsString(hobj);
|
|
} else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"getaddrinfo() argument 1 must be string or None");
|
|
return NULL;
|
|
}
|
|
if (PyInt_Check(pobj)) {
|
|
PyOS_snprintf(pbuf, sizeof(pbuf), "%ld", PyInt_AsLong(pobj));
|
|
pptr = pbuf;
|
|
} else if (PyString_Check(pobj)) {
|
|
pptr = PyString_AsString(pobj);
|
|
} else if (pobj == Py_None) {
|
|
pptr = (char *)NULL;
|
|
} else {
|
|
PyErr_SetString(socket_error, "Int or String expected");
|
|
goto err;
|
|
}
|
|
memset(&hints, 0, sizeof(hints));
|
|
hints.ai_family = family;
|
|
hints.ai_socktype = socktype;
|
|
hints.ai_protocol = protocol;
|
|
hints.ai_flags = flags;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
ACQUIRE_GETADDRINFO_LOCK
|
|
error = getaddrinfo(hptr, pptr, &hints, &res0);
|
|
Py_END_ALLOW_THREADS
|
|
RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
|
|
if (error) {
|
|
set_gaierror(error);
|
|
goto err;
|
|
}
|
|
|
|
if ((all = PyList_New(0)) == NULL)
|
|
goto err;
|
|
for (res = res0; res; res = res->ai_next) {
|
|
PyObject *addr =
|
|
makesockaddr(-1, res->ai_addr, res->ai_addrlen, protocol);
|
|
if (addr == NULL)
|
|
goto err;
|
|
single = Py_BuildValue("iiisO", res->ai_family,
|
|
res->ai_socktype, res->ai_protocol,
|
|
res->ai_canonname ? res->ai_canonname : "",
|
|
addr);
|
|
Py_DECREF(addr);
|
|
if (single == NULL)
|
|
goto err;
|
|
|
|
if (PyList_Append(all, single))
|
|
goto err;
|
|
Py_XDECREF(single);
|
|
}
|
|
Py_XDECREF(idna);
|
|
if (res0)
|
|
freeaddrinfo(res0);
|
|
return all;
|
|
err:
|
|
Py_XDECREF(single);
|
|
Py_XDECREF(all);
|
|
Py_XDECREF(idna);
|
|
if (res0)
|
|
freeaddrinfo(res0);
|
|
return (PyObject *)NULL;
|
|
}
|
|
|
|
PyDoc_STRVAR(getaddrinfo_doc,
|
|
"getaddrinfo(host, port [, family, socktype, proto, flags])\n\
|
|
-> list of (family, socktype, proto, canonname, sockaddr)\n\
|
|
\n\
|
|
Resolve host and port into addrinfo struct.");
|
|
|
|
/* Python interface to getnameinfo(sa, flags). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_getnameinfo(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *sa = (PyObject *)NULL;
|
|
int flags;
|
|
char *hostp;
|
|
int port, flowinfo, scope_id;
|
|
char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
|
|
struct addrinfo hints, *res = NULL;
|
|
int error;
|
|
PyObject *ret = (PyObject *)NULL;
|
|
|
|
flags = flowinfo = scope_id = 0;
|
|
if (!PyArg_ParseTuple(args, "Oi:getnameinfo", &sa, &flags))
|
|
return NULL;
|
|
if (!PyArg_ParseTuple(sa, "si|ii",
|
|
&hostp, &port, &flowinfo, &scope_id))
|
|
return NULL;
|
|
PyOS_snprintf(pbuf, sizeof(pbuf), "%d", port);
|
|
memset(&hints, 0, sizeof(hints));
|
|
hints.ai_family = AF_UNSPEC;
|
|
hints.ai_socktype = SOCK_DGRAM; /* make numeric port happy */
|
|
Py_BEGIN_ALLOW_THREADS
|
|
ACQUIRE_GETADDRINFO_LOCK
|
|
error = getaddrinfo(hostp, pbuf, &hints, &res);
|
|
Py_END_ALLOW_THREADS
|
|
RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
|
|
if (error) {
|
|
set_gaierror(error);
|
|
goto fail;
|
|
}
|
|
if (res->ai_next) {
|
|
PyErr_SetString(socket_error,
|
|
"sockaddr resolved to multiple addresses");
|
|
goto fail;
|
|
}
|
|
switch (res->ai_family) {
|
|
case AF_INET:
|
|
{
|
|
char *t1;
|
|
int t2;
|
|
if (PyArg_ParseTuple(sa, "si", &t1, &t2) == 0) {
|
|
PyErr_SetString(socket_error,
|
|
"IPv4 sockaddr must be 2 tuple");
|
|
goto fail;
|
|
}
|
|
break;
|
|
}
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
{
|
|
struct sockaddr_in6 *sin6;
|
|
sin6 = (struct sockaddr_in6 *)res->ai_addr;
|
|
sin6->sin6_flowinfo = flowinfo;
|
|
sin6->sin6_scope_id = scope_id;
|
|
break;
|
|
}
|
|
#endif
|
|
}
|
|
error = getnameinfo(res->ai_addr, res->ai_addrlen,
|
|
hbuf, sizeof(hbuf), pbuf, sizeof(pbuf), flags);
|
|
if (error) {
|
|
set_gaierror(error);
|
|
goto fail;
|
|
}
|
|
ret = Py_BuildValue("ss", hbuf, pbuf);
|
|
|
|
fail:
|
|
if (res)
|
|
freeaddrinfo(res);
|
|
return ret;
|
|
}
|
|
|
|
PyDoc_STRVAR(getnameinfo_doc,
|
|
"getnameinfo(sockaddr, flags) --> (host, port)\n\
|
|
\n\
|
|
Get host and port for a sockaddr.");
|
|
|
|
|
|
/* Python API to getting and setting the default timeout value. */
|
|
|
|
static PyObject *
|
|
socket_getdefaulttimeout(PyObject *self)
|
|
{
|
|
if (defaulttimeout < 0.0) {
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
else
|
|
return PyFloat_FromDouble(defaulttimeout);
|
|
}
|
|
|
|
PyDoc_STRVAR(getdefaulttimeout_doc,
|
|
"getdefaulttimeout() -> timeout\n\
|
|
\n\
|
|
Returns the default timeout in floating seconds for new socket objects.\n\
|
|
A value of None indicates that new socket objects have no timeout.\n\
|
|
When the socket module is first imported, the default is None.");
|
|
|
|
static PyObject *
|
|
socket_setdefaulttimeout(PyObject *self, PyObject *arg)
|
|
{
|
|
double timeout;
|
|
|
|
if (arg == Py_None)
|
|
timeout = -1.0;
|
|
else {
|
|
timeout = PyFloat_AsDouble(arg);
|
|
if (timeout < 0.0) {
|
|
if (!PyErr_Occurred())
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"Timeout value out of range");
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
defaulttimeout = timeout;
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(setdefaulttimeout_doc,
|
|
"setdefaulttimeout(timeout)\n\
|
|
\n\
|
|
Set the default timeout in floating seconds for new socket objects.\n\
|
|
A value of None indicates that new socket objects have no timeout.\n\
|
|
When the socket module is first imported, the default is None.");
|
|
|
|
|
|
/* List of functions exported by this module. */
|
|
|
|
static PyMethodDef socket_methods[] = {
|
|
{"gethostbyname", socket_gethostbyname,
|
|
METH_VARARGS, gethostbyname_doc},
|
|
{"gethostbyname_ex", socket_gethostbyname_ex,
|
|
METH_VARARGS, ghbn_ex_doc},
|
|
{"gethostbyaddr", socket_gethostbyaddr,
|
|
METH_VARARGS, gethostbyaddr_doc},
|
|
{"gethostname", socket_gethostname,
|
|
METH_NOARGS, gethostname_doc},
|
|
{"getservbyname", socket_getservbyname,
|
|
METH_VARARGS, getservbyname_doc},
|
|
{"getservbyport", socket_getservbyport,
|
|
METH_VARARGS, getservbyport_doc},
|
|
{"getprotobyname", socket_getprotobyname,
|
|
METH_VARARGS, getprotobyname_doc},
|
|
#ifndef NO_DUP
|
|
{"fromfd", socket_fromfd,
|
|
METH_VARARGS, fromfd_doc},
|
|
#endif
|
|
#ifdef HAVE_SOCKETPAIR
|
|
{"socketpair", socket_socketpair,
|
|
METH_VARARGS, socketpair_doc},
|
|
#endif
|
|
{"ntohs", socket_ntohs,
|
|
METH_VARARGS, ntohs_doc},
|
|
{"ntohl", socket_ntohl,
|
|
METH_O, ntohl_doc},
|
|
{"htons", socket_htons,
|
|
METH_VARARGS, htons_doc},
|
|
{"htonl", socket_htonl,
|
|
METH_O, htonl_doc},
|
|
{"inet_aton", socket_inet_aton,
|
|
METH_VARARGS, inet_aton_doc},
|
|
{"inet_ntoa", socket_inet_ntoa,
|
|
METH_VARARGS, inet_ntoa_doc},
|
|
#ifdef HAVE_INET_PTON
|
|
{"inet_pton", socket_inet_pton,
|
|
METH_VARARGS, inet_pton_doc},
|
|
{"inet_ntop", socket_inet_ntop,
|
|
METH_VARARGS, inet_ntop_doc},
|
|
#endif
|
|
{"getaddrinfo", socket_getaddrinfo,
|
|
METH_VARARGS, getaddrinfo_doc},
|
|
{"getnameinfo", socket_getnameinfo,
|
|
METH_VARARGS, getnameinfo_doc},
|
|
{"getdefaulttimeout", (PyCFunction)socket_getdefaulttimeout,
|
|
METH_NOARGS, getdefaulttimeout_doc},
|
|
{"setdefaulttimeout", socket_setdefaulttimeout,
|
|
METH_O, setdefaulttimeout_doc},
|
|
{NULL, NULL} /* Sentinel */
|
|
};
|
|
|
|
|
|
#ifdef RISCOS
|
|
#define OS_INIT_DEFINED
|
|
|
|
static int
|
|
os_init(void)
|
|
{
|
|
_kernel_swi_regs r;
|
|
|
|
r.r[0] = 0;
|
|
_kernel_swi(0x43380, &r, &r);
|
|
taskwindow = r.r[0];
|
|
|
|
return 1;
|
|
}
|
|
|
|
#endif /* RISCOS */
|
|
|
|
|
|
#ifdef MS_WINDOWS
|
|
#define OS_INIT_DEFINED
|
|
|
|
/* Additional initialization and cleanup for Windows */
|
|
|
|
static void
|
|
os_cleanup(void)
|
|
{
|
|
WSACleanup();
|
|
}
|
|
|
|
static int
|
|
os_init(void)
|
|
{
|
|
WSADATA WSAData;
|
|
int ret;
|
|
char buf[100];
|
|
ret = WSAStartup(0x0101, &WSAData);
|
|
switch (ret) {
|
|
case 0: /* No error */
|
|
Py_AtExit(os_cleanup);
|
|
return 1; /* Success */
|
|
case WSASYSNOTREADY:
|
|
PyErr_SetString(PyExc_ImportError,
|
|
"WSAStartup failed: network not ready");
|
|
break;
|
|
case WSAVERNOTSUPPORTED:
|
|
case WSAEINVAL:
|
|
PyErr_SetString(
|
|
PyExc_ImportError,
|
|
"WSAStartup failed: requested version not supported");
|
|
break;
|
|
default:
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
"WSAStartup failed: error code %d", ret);
|
|
PyErr_SetString(PyExc_ImportError, buf);
|
|
break;
|
|
}
|
|
return 0; /* Failure */
|
|
}
|
|
|
|
#endif /* MS_WINDOWS */
|
|
|
|
|
|
#ifdef PYOS_OS2
|
|
#define OS_INIT_DEFINED
|
|
|
|
/* Additional initialization for OS/2 */
|
|
|
|
static int
|
|
os_init(void)
|
|
{
|
|
#ifndef PYCC_GCC
|
|
char reason[64];
|
|
int rc = sock_init();
|
|
|
|
if (rc == 0) {
|
|
return 1; /* Success */
|
|
}
|
|
|
|
PyOS_snprintf(reason, sizeof(reason),
|
|
"OS/2 TCP/IP Error# %d", sock_errno());
|
|
PyErr_SetString(PyExc_ImportError, reason);
|
|
|
|
return 0; /* Failure */
|
|
#else
|
|
/* No need to initialise sockets with GCC/EMX */
|
|
return 1; /* Success */
|
|
#endif
|
|
}
|
|
|
|
#endif /* PYOS_OS2 */
|
|
|
|
|
|
#ifndef OS_INIT_DEFINED
|
|
static int
|
|
os_init(void)
|
|
{
|
|
return 1; /* Success */
|
|
}
|
|
#endif
|
|
|
|
|
|
/* C API table - always add new things to the end for binary
|
|
compatibility. */
|
|
static
|
|
PySocketModule_APIObject PySocketModuleAPI =
|
|
{
|
|
&sock_type,
|
|
NULL
|
|
};
|
|
|
|
|
|
/* Initialize the _socket module.
|
|
|
|
This module is actually called "_socket", and there's a wrapper
|
|
"socket.py" which implements some additional functionality. On some
|
|
platforms (e.g. Windows and OS/2), socket.py also implements a
|
|
wrapper for the socket type that provides missing functionality such
|
|
as makefile(), dup() and fromfd(). The import of "_socket" may fail
|
|
with an ImportError exception if os-specific initialization fails.
|
|
On Windows, this does WINSOCK initialization. When WINSOCK is
|
|
initialized succesfully, a call to WSACleanup() is scheduled to be
|
|
made at exit time.
|
|
*/
|
|
|
|
PyDoc_STRVAR(socket_doc,
|
|
"Implementation module for socket operations.\n\
|
|
\n\
|
|
See the socket module for documentation.");
|
|
|
|
PyMODINIT_FUNC
|
|
init_socket(void)
|
|
{
|
|
PyObject *m, *has_ipv6;
|
|
|
|
if (!os_init())
|
|
return;
|
|
|
|
sock_type.ob_type = &PyType_Type;
|
|
m = Py_InitModule3(PySocket_MODULE_NAME,
|
|
socket_methods,
|
|
socket_doc);
|
|
if (m == NULL)
|
|
return;
|
|
|
|
socket_error = PyErr_NewException("socket.error", NULL, NULL);
|
|
if (socket_error == NULL)
|
|
return;
|
|
PySocketModuleAPI.error = socket_error;
|
|
Py_INCREF(socket_error);
|
|
PyModule_AddObject(m, "error", socket_error);
|
|
socket_herror = PyErr_NewException("socket.herror",
|
|
socket_error, NULL);
|
|
if (socket_herror == NULL)
|
|
return;
|
|
Py_INCREF(socket_herror);
|
|
PyModule_AddObject(m, "herror", socket_herror);
|
|
socket_gaierror = PyErr_NewException("socket.gaierror", socket_error,
|
|
NULL);
|
|
if (socket_gaierror == NULL)
|
|
return;
|
|
Py_INCREF(socket_gaierror);
|
|
PyModule_AddObject(m, "gaierror", socket_gaierror);
|
|
socket_timeout = PyErr_NewException("socket.timeout",
|
|
socket_error, NULL);
|
|
if (socket_timeout == NULL)
|
|
return;
|
|
Py_INCREF(socket_timeout);
|
|
PyModule_AddObject(m, "timeout", socket_timeout);
|
|
Py_INCREF((PyObject *)&sock_type);
|
|
if (PyModule_AddObject(m, "SocketType",
|
|
(PyObject *)&sock_type) != 0)
|
|
return;
|
|
Py_INCREF((PyObject *)&sock_type);
|
|
if (PyModule_AddObject(m, "socket",
|
|
(PyObject *)&sock_type) != 0)
|
|
return;
|
|
|
|
#ifdef ENABLE_IPV6
|
|
has_ipv6 = Py_True;
|
|
#else
|
|
has_ipv6 = Py_False;
|
|
#endif
|
|
Py_INCREF(has_ipv6);
|
|
PyModule_AddObject(m, "has_ipv6", has_ipv6);
|
|
|
|
/* Export C API */
|
|
if (PyModule_AddObject(m, PySocket_CAPI_NAME,
|
|
PyCObject_FromVoidPtr((void *)&PySocketModuleAPI, NULL)
|
|
) != 0)
|
|
return;
|
|
|
|
/* Address families (we only support AF_INET and AF_UNIX) */
|
|
#ifdef AF_UNSPEC
|
|
PyModule_AddIntConstant(m, "AF_UNSPEC", AF_UNSPEC);
|
|
#endif
|
|
PyModule_AddIntConstant(m, "AF_INET", AF_INET);
|
|
#ifdef AF_INET6
|
|
PyModule_AddIntConstant(m, "AF_INET6", AF_INET6);
|
|
#endif /* AF_INET6 */
|
|
#if defined(AF_UNIX)
|
|
PyModule_AddIntConstant(m, "AF_UNIX", AF_UNIX);
|
|
#endif /* AF_UNIX */
|
|
#ifdef AF_AX25
|
|
/* Amateur Radio AX.25 */
|
|
PyModule_AddIntConstant(m, "AF_AX25", AF_AX25);
|
|
#endif
|
|
#ifdef AF_IPX
|
|
PyModule_AddIntConstant(m, "AF_IPX", AF_IPX); /* Novell IPX */
|
|
#endif
|
|
#ifdef AF_APPLETALK
|
|
/* Appletalk DDP */
|
|
PyModule_AddIntConstant(m, "AF_APPLETALK", AF_APPLETALK);
|
|
#endif
|
|
#ifdef AF_NETROM
|
|
/* Amateur radio NetROM */
|
|
PyModule_AddIntConstant(m, "AF_NETROM", AF_NETROM);
|
|
#endif
|
|
#ifdef AF_BRIDGE
|
|
/* Multiprotocol bridge */
|
|
PyModule_AddIntConstant(m, "AF_BRIDGE", AF_BRIDGE);
|
|
#endif
|
|
#ifdef AF_ATMPVC
|
|
/* ATM PVCs */
|
|
PyModule_AddIntConstant(m, "AF_ATMPVC", AF_ATMPVC);
|
|
#endif
|
|
#ifdef AF_AAL5
|
|
/* Reserved for Werner's ATM */
|
|
PyModule_AddIntConstant(m, "AF_AAL5", AF_AAL5);
|
|
#endif
|
|
#ifdef AF_X25
|
|
/* Reserved for X.25 project */
|
|
PyModule_AddIntConstant(m, "AF_X25", AF_X25);
|
|
#endif
|
|
#ifdef AF_INET6
|
|
PyModule_AddIntConstant(m, "AF_INET6", AF_INET6); /* IP version 6 */
|
|
#endif
|
|
#ifdef AF_ROSE
|
|
/* Amateur Radio X.25 PLP */
|
|
PyModule_AddIntConstant(m, "AF_ROSE", AF_ROSE);
|
|
#endif
|
|
#ifdef AF_DECnet
|
|
/* Reserved for DECnet project */
|
|
PyModule_AddIntConstant(m, "AF_DECnet", AF_DECnet);
|
|
#endif
|
|
#ifdef AF_NETBEUI
|
|
/* Reserved for 802.2LLC project */
|
|
PyModule_AddIntConstant(m, "AF_NETBEUI", AF_NETBEUI);
|
|
#endif
|
|
#ifdef AF_SECURITY
|
|
/* Security callback pseudo AF */
|
|
PyModule_AddIntConstant(m, "AF_SECURITY", AF_SECURITY);
|
|
#endif
|
|
#ifdef AF_KEY
|
|
/* PF_KEY key management API */
|
|
PyModule_AddIntConstant(m, "AF_KEY", AF_KEY);
|
|
#endif
|
|
#ifdef AF_NETLINK
|
|
/* */
|
|
PyModule_AddIntConstant(m, "AF_NETLINK", AF_NETLINK);
|
|
PyModule_AddIntConstant(m, "NETLINK_ROUTE", NETLINK_ROUTE);
|
|
#ifdef NETLINK_SKIP
|
|
PyModule_AddIntConstant(m, "NETLINK_SKIP", NETLINK_SKIP);
|
|
#endif
|
|
#ifdef NETLINK_W1
|
|
PyModule_AddIntConstant(m, "NETLINK_W1", NETLINK_W1);
|
|
#endif
|
|
PyModule_AddIntConstant(m, "NETLINK_USERSOCK", NETLINK_USERSOCK);
|
|
PyModule_AddIntConstant(m, "NETLINK_FIREWALL", NETLINK_FIREWALL);
|
|
#ifdef NETLINK_TCPDIAG
|
|
PyModule_AddIntConstant(m, "NETLINK_TCPDIAG", NETLINK_TCPDIAG);
|
|
#endif
|
|
#ifdef NETLINK_NFLOG
|
|
PyModule_AddIntConstant(m, "NETLINK_NFLOG", NETLINK_NFLOG);
|
|
#endif
|
|
#ifdef NETLINK_XFRM
|
|
PyModule_AddIntConstant(m, "NETLINK_XFRM", NETLINK_XFRM);
|
|
#endif
|
|
#ifdef NETLINK_ARPD
|
|
PyModule_AddIntConstant(m, "NETLINK_ARPD", NETLINK_ARPD);
|
|
#endif
|
|
#ifdef NETLINK_ROUTE6
|
|
PyModule_AddIntConstant(m, "NETLINK_ROUTE6", NETLINK_ROUTE6);
|
|
#endif
|
|
PyModule_AddIntConstant(m, "NETLINK_IP6_FW", NETLINK_IP6_FW);
|
|
PyModule_AddIntConstant(m, "NETLINK_DNRTMSG", NETLINK_DNRTMSG);
|
|
#ifdef NETLINK_TAPBASE
|
|
PyModule_AddIntConstant(m, "NETLINK_TAPBASE", NETLINK_TAPBASE);
|
|
#endif
|
|
#endif /* AF_NETLINK */
|
|
#ifdef AF_ROUTE
|
|
/* Alias to emulate 4.4BSD */
|
|
PyModule_AddIntConstant(m, "AF_ROUTE", AF_ROUTE);
|
|
#endif
|
|
#ifdef AF_ASH
|
|
/* Ash */
|
|
PyModule_AddIntConstant(m, "AF_ASH", AF_ASH);
|
|
#endif
|
|
#ifdef AF_ECONET
|
|
/* Acorn Econet */
|
|
PyModule_AddIntConstant(m, "AF_ECONET", AF_ECONET);
|
|
#endif
|
|
#ifdef AF_ATMSVC
|
|
/* ATM SVCs */
|
|
PyModule_AddIntConstant(m, "AF_ATMSVC", AF_ATMSVC);
|
|
#endif
|
|
#ifdef AF_SNA
|
|
/* Linux SNA Project (nutters!) */
|
|
PyModule_AddIntConstant(m, "AF_SNA", AF_SNA);
|
|
#endif
|
|
#ifdef AF_IRDA
|
|
/* IRDA sockets */
|
|
PyModule_AddIntConstant(m, "AF_IRDA", AF_IRDA);
|
|
#endif
|
|
#ifdef AF_PPPOX
|
|
/* PPPoX sockets */
|
|
PyModule_AddIntConstant(m, "AF_PPPOX", AF_PPPOX);
|
|
#endif
|
|
#ifdef AF_WANPIPE
|
|
/* Wanpipe API Sockets */
|
|
PyModule_AddIntConstant(m, "AF_WANPIPE", AF_WANPIPE);
|
|
#endif
|
|
#ifdef AF_LLC
|
|
/* Linux LLC */
|
|
PyModule_AddIntConstant(m, "AF_LLC", AF_LLC);
|
|
#endif
|
|
|
|
#ifdef USE_BLUETOOTH
|
|
PyModule_AddIntConstant(m, "AF_BLUETOOTH", AF_BLUETOOTH);
|
|
PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
|
|
#if !defined(__FreeBSD__)
|
|
PyModule_AddIntConstant(m, "BTPROTO_SCO", BTPROTO_SCO);
|
|
#endif
|
|
PyModule_AddIntConstant(m, "BTPROTO_RFCOMM", BTPROTO_RFCOMM);
|
|
PyModule_AddStringConstant(m, "BDADDR_ANY", "00:00:00:00:00:00");
|
|
PyModule_AddStringConstant(m, "BDADDR_LOCAL", "00:00:00:FF:FF:FF");
|
|
#endif
|
|
|
|
#ifdef HAVE_NETPACKET_PACKET_H
|
|
PyModule_AddIntConstant(m, "AF_PACKET", AF_PACKET);
|
|
PyModule_AddIntConstant(m, "PF_PACKET", PF_PACKET);
|
|
PyModule_AddIntConstant(m, "PACKET_HOST", PACKET_HOST);
|
|
PyModule_AddIntConstant(m, "PACKET_BROADCAST", PACKET_BROADCAST);
|
|
PyModule_AddIntConstant(m, "PACKET_MULTICAST", PACKET_MULTICAST);
|
|
PyModule_AddIntConstant(m, "PACKET_OTHERHOST", PACKET_OTHERHOST);
|
|
PyModule_AddIntConstant(m, "PACKET_OUTGOING", PACKET_OUTGOING);
|
|
PyModule_AddIntConstant(m, "PACKET_LOOPBACK", PACKET_LOOPBACK);
|
|
PyModule_AddIntConstant(m, "PACKET_FASTROUTE", PACKET_FASTROUTE);
|
|
#endif
|
|
|
|
/* Socket types */
|
|
PyModule_AddIntConstant(m, "SOCK_STREAM", SOCK_STREAM);
|
|
PyModule_AddIntConstant(m, "SOCK_DGRAM", SOCK_DGRAM);
|
|
#ifndef __BEOS__
|
|
/* We have incomplete socket support. */
|
|
PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW);
|
|
PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET);
|
|
#if defined(SOCK_RDM)
|
|
PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM);
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef SO_DEBUG
|
|
PyModule_AddIntConstant(m, "SO_DEBUG", SO_DEBUG);
|
|
#endif
|
|
#ifdef SO_ACCEPTCONN
|
|
PyModule_AddIntConstant(m, "SO_ACCEPTCONN", SO_ACCEPTCONN);
|
|
#endif
|
|
#ifdef SO_REUSEADDR
|
|
PyModule_AddIntConstant(m, "SO_REUSEADDR", SO_REUSEADDR);
|
|
#endif
|
|
#ifdef SO_EXCLUSIVEADDRUSE
|
|
PyModule_AddIntConstant(m, "SO_EXCLUSIVEADDRUSE", SO_EXCLUSIVEADDRUSE);
|
|
#endif
|
|
|
|
#ifdef SO_KEEPALIVE
|
|
PyModule_AddIntConstant(m, "SO_KEEPALIVE", SO_KEEPALIVE);
|
|
#endif
|
|
#ifdef SO_DONTROUTE
|
|
PyModule_AddIntConstant(m, "SO_DONTROUTE", SO_DONTROUTE);
|
|
#endif
|
|
#ifdef SO_BROADCAST
|
|
PyModule_AddIntConstant(m, "SO_BROADCAST", SO_BROADCAST);
|
|
#endif
|
|
#ifdef SO_USELOOPBACK
|
|
PyModule_AddIntConstant(m, "SO_USELOOPBACK", SO_USELOOPBACK);
|
|
#endif
|
|
#ifdef SO_LINGER
|
|
PyModule_AddIntConstant(m, "SO_LINGER", SO_LINGER);
|
|
#endif
|
|
#ifdef SO_OOBINLINE
|
|
PyModule_AddIntConstant(m, "SO_OOBINLINE", SO_OOBINLINE);
|
|
#endif
|
|
#ifdef SO_REUSEPORT
|
|
PyModule_AddIntConstant(m, "SO_REUSEPORT", SO_REUSEPORT);
|
|
#endif
|
|
#ifdef SO_SNDBUF
|
|
PyModule_AddIntConstant(m, "SO_SNDBUF", SO_SNDBUF);
|
|
#endif
|
|
#ifdef SO_RCVBUF
|
|
PyModule_AddIntConstant(m, "SO_RCVBUF", SO_RCVBUF);
|
|
#endif
|
|
#ifdef SO_SNDLOWAT
|
|
PyModule_AddIntConstant(m, "SO_SNDLOWAT", SO_SNDLOWAT);
|
|
#endif
|
|
#ifdef SO_RCVLOWAT
|
|
PyModule_AddIntConstant(m, "SO_RCVLOWAT", SO_RCVLOWAT);
|
|
#endif
|
|
#ifdef SO_SNDTIMEO
|
|
PyModule_AddIntConstant(m, "SO_SNDTIMEO", SO_SNDTIMEO);
|
|
#endif
|
|
#ifdef SO_RCVTIMEO
|
|
PyModule_AddIntConstant(m, "SO_RCVTIMEO", SO_RCVTIMEO);
|
|
#endif
|
|
#ifdef SO_ERROR
|
|
PyModule_AddIntConstant(m, "SO_ERROR", SO_ERROR);
|
|
#endif
|
|
#ifdef SO_TYPE
|
|
PyModule_AddIntConstant(m, "SO_TYPE", SO_TYPE);
|
|
#endif
|
|
|
|
/* Maximum number of connections for "listen" */
|
|
#ifdef SOMAXCONN
|
|
PyModule_AddIntConstant(m, "SOMAXCONN", SOMAXCONN);
|
|
#else
|
|
PyModule_AddIntConstant(m, "SOMAXCONN", 5); /* Common value */
|
|
#endif
|
|
|
|
/* Flags for send, recv */
|
|
#ifdef MSG_OOB
|
|
PyModule_AddIntConstant(m, "MSG_OOB", MSG_OOB);
|
|
#endif
|
|
#ifdef MSG_PEEK
|
|
PyModule_AddIntConstant(m, "MSG_PEEK", MSG_PEEK);
|
|
#endif
|
|
#ifdef MSG_DONTROUTE
|
|
PyModule_AddIntConstant(m, "MSG_DONTROUTE", MSG_DONTROUTE);
|
|
#endif
|
|
#ifdef MSG_DONTWAIT
|
|
PyModule_AddIntConstant(m, "MSG_DONTWAIT", MSG_DONTWAIT);
|
|
#endif
|
|
#ifdef MSG_EOR
|
|
PyModule_AddIntConstant(m, "MSG_EOR", MSG_EOR);
|
|
#endif
|
|
#ifdef MSG_TRUNC
|
|
PyModule_AddIntConstant(m, "MSG_TRUNC", MSG_TRUNC);
|
|
#endif
|
|
#ifdef MSG_CTRUNC
|
|
PyModule_AddIntConstant(m, "MSG_CTRUNC", MSG_CTRUNC);
|
|
#endif
|
|
#ifdef MSG_WAITALL
|
|
PyModule_AddIntConstant(m, "MSG_WAITALL", MSG_WAITALL);
|
|
#endif
|
|
#ifdef MSG_BTAG
|
|
PyModule_AddIntConstant(m, "MSG_BTAG", MSG_BTAG);
|
|
#endif
|
|
#ifdef MSG_ETAG
|
|
PyModule_AddIntConstant(m, "MSG_ETAG", MSG_ETAG);
|
|
#endif
|
|
|
|
/* Protocol level and numbers, usable for [gs]etsockopt */
|
|
#ifdef SOL_SOCKET
|
|
PyModule_AddIntConstant(m, "SOL_SOCKET", SOL_SOCKET);
|
|
#endif
|
|
#ifdef SOL_IP
|
|
PyModule_AddIntConstant(m, "SOL_IP", SOL_IP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "SOL_IP", 0);
|
|
#endif
|
|
#ifdef SOL_IPX
|
|
PyModule_AddIntConstant(m, "SOL_IPX", SOL_IPX);
|
|
#endif
|
|
#ifdef SOL_AX25
|
|
PyModule_AddIntConstant(m, "SOL_AX25", SOL_AX25);
|
|
#endif
|
|
#ifdef SOL_ATALK
|
|
PyModule_AddIntConstant(m, "SOL_ATALK", SOL_ATALK);
|
|
#endif
|
|
#ifdef SOL_NETROM
|
|
PyModule_AddIntConstant(m, "SOL_NETROM", SOL_NETROM);
|
|
#endif
|
|
#ifdef SOL_ROSE
|
|
PyModule_AddIntConstant(m, "SOL_ROSE", SOL_ROSE);
|
|
#endif
|
|
#ifdef SOL_TCP
|
|
PyModule_AddIntConstant(m, "SOL_TCP", SOL_TCP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "SOL_TCP", 6);
|
|
#endif
|
|
#ifdef SOL_UDP
|
|
PyModule_AddIntConstant(m, "SOL_UDP", SOL_UDP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "SOL_UDP", 17);
|
|
#endif
|
|
#ifdef IPPROTO_IP
|
|
PyModule_AddIntConstant(m, "IPPROTO_IP", IPPROTO_IP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "IPPROTO_IP", 0);
|
|
#endif
|
|
#ifdef IPPROTO_HOPOPTS
|
|
PyModule_AddIntConstant(m, "IPPROTO_HOPOPTS", IPPROTO_HOPOPTS);
|
|
#endif
|
|
#ifdef IPPROTO_ICMP
|
|
PyModule_AddIntConstant(m, "IPPROTO_ICMP", IPPROTO_ICMP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "IPPROTO_ICMP", 1);
|
|
#endif
|
|
#ifdef IPPROTO_IGMP
|
|
PyModule_AddIntConstant(m, "IPPROTO_IGMP", IPPROTO_IGMP);
|
|
#endif
|
|
#ifdef IPPROTO_GGP
|
|
PyModule_AddIntConstant(m, "IPPROTO_GGP", IPPROTO_GGP);
|
|
#endif
|
|
#ifdef IPPROTO_IPV4
|
|
PyModule_AddIntConstant(m, "IPPROTO_IPV4", IPPROTO_IPV4);
|
|
#endif
|
|
#ifdef IPPROTO_IPV6
|
|
PyModule_AddIntConstant(m, "IPPROTO_IPV6", IPPROTO_IPV6);
|
|
#endif
|
|
#ifdef IPPROTO_IPIP
|
|
PyModule_AddIntConstant(m, "IPPROTO_IPIP", IPPROTO_IPIP);
|
|
#endif
|
|
#ifdef IPPROTO_TCP
|
|
PyModule_AddIntConstant(m, "IPPROTO_TCP", IPPROTO_TCP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "IPPROTO_TCP", 6);
|
|
#endif
|
|
#ifdef IPPROTO_EGP
|
|
PyModule_AddIntConstant(m, "IPPROTO_EGP", IPPROTO_EGP);
|
|
#endif
|
|
#ifdef IPPROTO_PUP
|
|
PyModule_AddIntConstant(m, "IPPROTO_PUP", IPPROTO_PUP);
|
|
#endif
|
|
#ifdef IPPROTO_UDP
|
|
PyModule_AddIntConstant(m, "IPPROTO_UDP", IPPROTO_UDP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "IPPROTO_UDP", 17);
|
|
#endif
|
|
#ifdef IPPROTO_IDP
|
|
PyModule_AddIntConstant(m, "IPPROTO_IDP", IPPROTO_IDP);
|
|
#endif
|
|
#ifdef IPPROTO_HELLO
|
|
PyModule_AddIntConstant(m, "IPPROTO_HELLO", IPPROTO_HELLO);
|
|
#endif
|
|
#ifdef IPPROTO_ND
|
|
PyModule_AddIntConstant(m, "IPPROTO_ND", IPPROTO_ND);
|
|
#endif
|
|
#ifdef IPPROTO_TP
|
|
PyModule_AddIntConstant(m, "IPPROTO_TP", IPPROTO_TP);
|
|
#endif
|
|
#ifdef IPPROTO_IPV6
|
|
PyModule_AddIntConstant(m, "IPPROTO_IPV6", IPPROTO_IPV6);
|
|
#endif
|
|
#ifdef IPPROTO_ROUTING
|
|
PyModule_AddIntConstant(m, "IPPROTO_ROUTING", IPPROTO_ROUTING);
|
|
#endif
|
|
#ifdef IPPROTO_FRAGMENT
|
|
PyModule_AddIntConstant(m, "IPPROTO_FRAGMENT", IPPROTO_FRAGMENT);
|
|
#endif
|
|
#ifdef IPPROTO_RSVP
|
|
PyModule_AddIntConstant(m, "IPPROTO_RSVP", IPPROTO_RSVP);
|
|
#endif
|
|
#ifdef IPPROTO_GRE
|
|
PyModule_AddIntConstant(m, "IPPROTO_GRE", IPPROTO_GRE);
|
|
#endif
|
|
#ifdef IPPROTO_ESP
|
|
PyModule_AddIntConstant(m, "IPPROTO_ESP", IPPROTO_ESP);
|
|
#endif
|
|
#ifdef IPPROTO_AH
|
|
PyModule_AddIntConstant(m, "IPPROTO_AH", IPPROTO_AH);
|
|
#endif
|
|
#ifdef IPPROTO_MOBILE
|
|
PyModule_AddIntConstant(m, "IPPROTO_MOBILE", IPPROTO_MOBILE);
|
|
#endif
|
|
#ifdef IPPROTO_ICMPV6
|
|
PyModule_AddIntConstant(m, "IPPROTO_ICMPV6", IPPROTO_ICMPV6);
|
|
#endif
|
|
#ifdef IPPROTO_NONE
|
|
PyModule_AddIntConstant(m, "IPPROTO_NONE", IPPROTO_NONE);
|
|
#endif
|
|
#ifdef IPPROTO_DSTOPTS
|
|
PyModule_AddIntConstant(m, "IPPROTO_DSTOPTS", IPPROTO_DSTOPTS);
|
|
#endif
|
|
#ifdef IPPROTO_XTP
|
|
PyModule_AddIntConstant(m, "IPPROTO_XTP", IPPROTO_XTP);
|
|
#endif
|
|
#ifdef IPPROTO_EON
|
|
PyModule_AddIntConstant(m, "IPPROTO_EON", IPPROTO_EON);
|
|
#endif
|
|
#ifdef IPPROTO_PIM
|
|
PyModule_AddIntConstant(m, "IPPROTO_PIM", IPPROTO_PIM);
|
|
#endif
|
|
#ifdef IPPROTO_IPCOMP
|
|
PyModule_AddIntConstant(m, "IPPROTO_IPCOMP", IPPROTO_IPCOMP);
|
|
#endif
|
|
#ifdef IPPROTO_VRRP
|
|
PyModule_AddIntConstant(m, "IPPROTO_VRRP", IPPROTO_VRRP);
|
|
#endif
|
|
#ifdef IPPROTO_BIP
|
|
PyModule_AddIntConstant(m, "IPPROTO_BIP", IPPROTO_BIP);
|
|
#endif
|
|
/**/
|
|
#ifdef IPPROTO_RAW
|
|
PyModule_AddIntConstant(m, "IPPROTO_RAW", IPPROTO_RAW);
|
|
#else
|
|
PyModule_AddIntConstant(m, "IPPROTO_RAW", 255);
|
|
#endif
|
|
#ifdef IPPROTO_MAX
|
|
PyModule_AddIntConstant(m, "IPPROTO_MAX", IPPROTO_MAX);
|
|
#endif
|
|
|
|
/* Some port configuration */
|
|
#ifdef IPPORT_RESERVED
|
|
PyModule_AddIntConstant(m, "IPPORT_RESERVED", IPPORT_RESERVED);
|
|
#else
|
|
PyModule_AddIntConstant(m, "IPPORT_RESERVED", 1024);
|
|
#endif
|
|
#ifdef IPPORT_USERRESERVED
|
|
PyModule_AddIntConstant(m, "IPPORT_USERRESERVED", IPPORT_USERRESERVED);
|
|
#else
|
|
PyModule_AddIntConstant(m, "IPPORT_USERRESERVED", 5000);
|
|
#endif
|
|
|
|
/* Some reserved IP v.4 addresses */
|
|
#ifdef INADDR_ANY
|
|
PyModule_AddIntConstant(m, "INADDR_ANY", INADDR_ANY);
|
|
#else
|
|
PyModule_AddIntConstant(m, "INADDR_ANY", 0x00000000);
|
|
#endif
|
|
#ifdef INADDR_BROADCAST
|
|
PyModule_AddIntConstant(m, "INADDR_BROADCAST", INADDR_BROADCAST);
|
|
#else
|
|
PyModule_AddIntConstant(m, "INADDR_BROADCAST", 0xffffffff);
|
|
#endif
|
|
#ifdef INADDR_LOOPBACK
|
|
PyModule_AddIntConstant(m, "INADDR_LOOPBACK", INADDR_LOOPBACK);
|
|
#else
|
|
PyModule_AddIntConstant(m, "INADDR_LOOPBACK", 0x7F000001);
|
|
#endif
|
|
#ifdef INADDR_UNSPEC_GROUP
|
|
PyModule_AddIntConstant(m, "INADDR_UNSPEC_GROUP", INADDR_UNSPEC_GROUP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "INADDR_UNSPEC_GROUP", 0xe0000000);
|
|
#endif
|
|
#ifdef INADDR_ALLHOSTS_GROUP
|
|
PyModule_AddIntConstant(m, "INADDR_ALLHOSTS_GROUP",
|
|
INADDR_ALLHOSTS_GROUP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "INADDR_ALLHOSTS_GROUP", 0xe0000001);
|
|
#endif
|
|
#ifdef INADDR_MAX_LOCAL_GROUP
|
|
PyModule_AddIntConstant(m, "INADDR_MAX_LOCAL_GROUP",
|
|
INADDR_MAX_LOCAL_GROUP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "INADDR_MAX_LOCAL_GROUP", 0xe00000ff);
|
|
#endif
|
|
#ifdef INADDR_NONE
|
|
PyModule_AddIntConstant(m, "INADDR_NONE", INADDR_NONE);
|
|
#else
|
|
PyModule_AddIntConstant(m, "INADDR_NONE", 0xffffffff);
|
|
#endif
|
|
|
|
/* IPv4 [gs]etsockopt options */
|
|
#ifdef IP_OPTIONS
|
|
PyModule_AddIntConstant(m, "IP_OPTIONS", IP_OPTIONS);
|
|
#endif
|
|
#ifdef IP_HDRINCL
|
|
PyModule_AddIntConstant(m, "IP_HDRINCL", IP_HDRINCL);
|
|
#endif
|
|
#ifdef IP_TOS
|
|
PyModule_AddIntConstant(m, "IP_TOS", IP_TOS);
|
|
#endif
|
|
#ifdef IP_TTL
|
|
PyModule_AddIntConstant(m, "IP_TTL", IP_TTL);
|
|
#endif
|
|
#ifdef IP_RECVOPTS
|
|
PyModule_AddIntConstant(m, "IP_RECVOPTS", IP_RECVOPTS);
|
|
#endif
|
|
#ifdef IP_RECVRETOPTS
|
|
PyModule_AddIntConstant(m, "IP_RECVRETOPTS", IP_RECVRETOPTS);
|
|
#endif
|
|
#ifdef IP_RECVDSTADDR
|
|
PyModule_AddIntConstant(m, "IP_RECVDSTADDR", IP_RECVDSTADDR);
|
|
#endif
|
|
#ifdef IP_RETOPTS
|
|
PyModule_AddIntConstant(m, "IP_RETOPTS", IP_RETOPTS);
|
|
#endif
|
|
#ifdef IP_MULTICAST_IF
|
|
PyModule_AddIntConstant(m, "IP_MULTICAST_IF", IP_MULTICAST_IF);
|
|
#endif
|
|
#ifdef IP_MULTICAST_TTL
|
|
PyModule_AddIntConstant(m, "IP_MULTICAST_TTL", IP_MULTICAST_TTL);
|
|
#endif
|
|
#ifdef IP_MULTICAST_LOOP
|
|
PyModule_AddIntConstant(m, "IP_MULTICAST_LOOP", IP_MULTICAST_LOOP);
|
|
#endif
|
|
#ifdef IP_ADD_MEMBERSHIP
|
|
PyModule_AddIntConstant(m, "IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP);
|
|
#endif
|
|
#ifdef IP_DROP_MEMBERSHIP
|
|
PyModule_AddIntConstant(m, "IP_DROP_MEMBERSHIP", IP_DROP_MEMBERSHIP);
|
|
#endif
|
|
#ifdef IP_DEFAULT_MULTICAST_TTL
|
|
PyModule_AddIntConstant(m, "IP_DEFAULT_MULTICAST_TTL",
|
|
IP_DEFAULT_MULTICAST_TTL);
|
|
#endif
|
|
#ifdef IP_DEFAULT_MULTICAST_LOOP
|
|
PyModule_AddIntConstant(m, "IP_DEFAULT_MULTICAST_LOOP",
|
|
IP_DEFAULT_MULTICAST_LOOP);
|
|
#endif
|
|
#ifdef IP_MAX_MEMBERSHIPS
|
|
PyModule_AddIntConstant(m, "IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS);
|
|
#endif
|
|
|
|
/* IPv6 [gs]etsockopt options, defined in RFC2553 */
|
|
#ifdef IPV6_JOIN_GROUP
|
|
PyModule_AddIntConstant(m, "IPV6_JOIN_GROUP", IPV6_JOIN_GROUP);
|
|
#endif
|
|
#ifdef IPV6_LEAVE_GROUP
|
|
PyModule_AddIntConstant(m, "IPV6_LEAVE_GROUP", IPV6_LEAVE_GROUP);
|
|
#endif
|
|
#ifdef IPV6_MULTICAST_HOPS
|
|
PyModule_AddIntConstant(m, "IPV6_MULTICAST_HOPS", IPV6_MULTICAST_HOPS);
|
|
#endif
|
|
#ifdef IPV6_MULTICAST_IF
|
|
PyModule_AddIntConstant(m, "IPV6_MULTICAST_IF", IPV6_MULTICAST_IF);
|
|
#endif
|
|
#ifdef IPV6_MULTICAST_LOOP
|
|
PyModule_AddIntConstant(m, "IPV6_MULTICAST_LOOP", IPV6_MULTICAST_LOOP);
|
|
#endif
|
|
#ifdef IPV6_UNICAST_HOPS
|
|
PyModule_AddIntConstant(m, "IPV6_UNICAST_HOPS", IPV6_UNICAST_HOPS);
|
|
#endif
|
|
/* Additional IPV6 socket options, defined in RFC 3493 */
|
|
#ifdef IPV6_V6ONLY
|
|
PyModule_AddIntConstant(m, "IPV6_V6ONLY", IPV6_V6ONLY);
|
|
#endif
|
|
/* Advanced IPV6 socket options, from RFC 3542 */
|
|
#ifdef IPV6_CHECKSUM
|
|
PyModule_AddIntConstant(m, "IPV6_CHECKSUM", IPV6_CHECKSUM);
|
|
#endif
|
|
#ifdef IPV6_DONTFRAG
|
|
PyModule_AddIntConstant(m, "IPV6_DONTFRAG", IPV6_DONTFRAG);
|
|
#endif
|
|
#ifdef IPV6_DSTOPTS
|
|
PyModule_AddIntConstant(m, "IPV6_DSTOPTS", IPV6_DSTOPTS);
|
|
#endif
|
|
#ifdef IPV6_HOPLIMIT
|
|
PyModule_AddIntConstant(m, "IPV6_HOPLIMIT", IPV6_HOPLIMIT);
|
|
#endif
|
|
#ifdef IPV6_HOPOPTS
|
|
PyModule_AddIntConstant(m, "IPV6_HOPOPTS", IPV6_HOPOPTS);
|
|
#endif
|
|
#ifdef IPV6_NEXTHOP
|
|
PyModule_AddIntConstant(m, "IPV6_NEXTHOP", IPV6_NEXTHOP);
|
|
#endif
|
|
#ifdef IPV6_PATHMTU
|
|
PyModule_AddIntConstant(m, "IPV6_PATHMTU", IPV6_PATHMTU);
|
|
#endif
|
|
#ifdef IPV6_PKTINFO
|
|
PyModule_AddIntConstant(m, "IPV6_PKTINFO", IPV6_PKTINFO);
|
|
#endif
|
|
#ifdef IPV6_RECVDSTOPTS
|
|
PyModule_AddIntConstant(m, "IPV6_RECVDSTOPTS", IPV6_RECVDSTOPTS);
|
|
#endif
|
|
#ifdef IPV6_RECVHOPLIMIT
|
|
PyModule_AddIntConstant(m, "IPV6_RECVHOPLIMIT", IPV6_RECVHOPLIMIT);
|
|
#endif
|
|
#ifdef IPV6_RECVHOPOPTS
|
|
PyModule_AddIntConstant(m, "IPV6_RECVHOPOPTS", IPV6_RECVHOPOPTS);
|
|
#endif
|
|
#ifdef IPV6_RECVPKTINFO
|
|
PyModule_AddIntConstant(m, "IPV6_RECVPKTINFO", IPV6_RECVPKTINFO);
|
|
#endif
|
|
#ifdef IPV6_RECVRTHDR
|
|
PyModule_AddIntConstant(m, "IPV6_RECVRTHDR", IPV6_RECVRTHDR);
|
|
#endif
|
|
#ifdef IPV6_RECVTCLASS
|
|
PyModule_AddIntConstant(m, "IPV6_RECVTCLASS", IPV6_RECVTCLASS);
|
|
#endif
|
|
#ifdef IPV6_RTHDR
|
|
PyModule_AddIntConstant(m, "IPV6_RTHDR", IPV6_RTHDR);
|
|
#endif
|
|
#ifdef IPV6_RTHDRDSTOPTS
|
|
PyModule_AddIntConstant(m, "IPV6_RTHDRDSTOPTS", IPV6_RTHDRDSTOPTS);
|
|
#endif
|
|
#ifdef IPV6_RTHDR_TYPE_0
|
|
PyModule_AddIntConstant(m, "IPV6_RTHDR_TYPE_0", IPV6_RTHDR_TYPE_0);
|
|
#endif
|
|
#ifdef IPV6_RECVPATHMTU
|
|
PyModule_AddIntConstant(m, "IPV6_RECVPATHMTU", IPV6_RECVPATHMTU);
|
|
#endif
|
|
#ifdef IPV6_TCLASS
|
|
PyModule_AddIntConstant(m, "IPV6_TCLASS", IPV6_TCLASS);
|
|
#endif
|
|
#ifdef IPV6_USE_MIN_MTU
|
|
PyModule_AddIntConstant(m, "IPV6_USE_MIN_MTU", IPV6_USE_MIN_MTU);
|
|
#endif
|
|
|
|
/* TCP options */
|
|
#ifdef TCP_NODELAY
|
|
PyModule_AddIntConstant(m, "TCP_NODELAY", TCP_NODELAY);
|
|
#endif
|
|
#ifdef TCP_MAXSEG
|
|
PyModule_AddIntConstant(m, "TCP_MAXSEG", TCP_MAXSEG);
|
|
#endif
|
|
#ifdef TCP_CORK
|
|
PyModule_AddIntConstant(m, "TCP_CORK", TCP_CORK);
|
|
#endif
|
|
#ifdef TCP_KEEPIDLE
|
|
PyModule_AddIntConstant(m, "TCP_KEEPIDLE", TCP_KEEPIDLE);
|
|
#endif
|
|
#ifdef TCP_KEEPINTVL
|
|
PyModule_AddIntConstant(m, "TCP_KEEPINTVL", TCP_KEEPINTVL);
|
|
#endif
|
|
#ifdef TCP_KEEPCNT
|
|
PyModule_AddIntConstant(m, "TCP_KEEPCNT", TCP_KEEPCNT);
|
|
#endif
|
|
#ifdef TCP_SYNCNT
|
|
PyModule_AddIntConstant(m, "TCP_SYNCNT", TCP_SYNCNT);
|
|
#endif
|
|
#ifdef TCP_LINGER2
|
|
PyModule_AddIntConstant(m, "TCP_LINGER2", TCP_LINGER2);
|
|
#endif
|
|
#ifdef TCP_DEFER_ACCEPT
|
|
PyModule_AddIntConstant(m, "TCP_DEFER_ACCEPT", TCP_DEFER_ACCEPT);
|
|
#endif
|
|
#ifdef TCP_WINDOW_CLAMP
|
|
PyModule_AddIntConstant(m, "TCP_WINDOW_CLAMP", TCP_WINDOW_CLAMP);
|
|
#endif
|
|
#ifdef TCP_INFO
|
|
PyModule_AddIntConstant(m, "TCP_INFO", TCP_INFO);
|
|
#endif
|
|
#ifdef TCP_QUICKACK
|
|
PyModule_AddIntConstant(m, "TCP_QUICKACK", TCP_QUICKACK);
|
|
#endif
|
|
|
|
|
|
/* IPX options */
|
|
#ifdef IPX_TYPE
|
|
PyModule_AddIntConstant(m, "IPX_TYPE", IPX_TYPE);
|
|
#endif
|
|
|
|
/* get{addr,name}info parameters */
|
|
#ifdef EAI_ADDRFAMILY
|
|
PyModule_AddIntConstant(m, "EAI_ADDRFAMILY", EAI_ADDRFAMILY);
|
|
#endif
|
|
#ifdef EAI_AGAIN
|
|
PyModule_AddIntConstant(m, "EAI_AGAIN", EAI_AGAIN);
|
|
#endif
|
|
#ifdef EAI_BADFLAGS
|
|
PyModule_AddIntConstant(m, "EAI_BADFLAGS", EAI_BADFLAGS);
|
|
#endif
|
|
#ifdef EAI_FAIL
|
|
PyModule_AddIntConstant(m, "EAI_FAIL", EAI_FAIL);
|
|
#endif
|
|
#ifdef EAI_FAMILY
|
|
PyModule_AddIntConstant(m, "EAI_FAMILY", EAI_FAMILY);
|
|
#endif
|
|
#ifdef EAI_MEMORY
|
|
PyModule_AddIntConstant(m, "EAI_MEMORY", EAI_MEMORY);
|
|
#endif
|
|
#ifdef EAI_NODATA
|
|
PyModule_AddIntConstant(m, "EAI_NODATA", EAI_NODATA);
|
|
#endif
|
|
#ifdef EAI_NONAME
|
|
PyModule_AddIntConstant(m, "EAI_NONAME", EAI_NONAME);
|
|
#endif
|
|
#ifdef EAI_OVERFLOW
|
|
PyModule_AddIntConstant(m, "EAI_OVERFLOW", EAI_OVERFLOW);
|
|
#endif
|
|
#ifdef EAI_SERVICE
|
|
PyModule_AddIntConstant(m, "EAI_SERVICE", EAI_SERVICE);
|
|
#endif
|
|
#ifdef EAI_SOCKTYPE
|
|
PyModule_AddIntConstant(m, "EAI_SOCKTYPE", EAI_SOCKTYPE);
|
|
#endif
|
|
#ifdef EAI_SYSTEM
|
|
PyModule_AddIntConstant(m, "EAI_SYSTEM", EAI_SYSTEM);
|
|
#endif
|
|
#ifdef EAI_BADHINTS
|
|
PyModule_AddIntConstant(m, "EAI_BADHINTS", EAI_BADHINTS);
|
|
#endif
|
|
#ifdef EAI_PROTOCOL
|
|
PyModule_AddIntConstant(m, "EAI_PROTOCOL", EAI_PROTOCOL);
|
|
#endif
|
|
#ifdef EAI_MAX
|
|
PyModule_AddIntConstant(m, "EAI_MAX", EAI_MAX);
|
|
#endif
|
|
#ifdef AI_PASSIVE
|
|
PyModule_AddIntConstant(m, "AI_PASSIVE", AI_PASSIVE);
|
|
#endif
|
|
#ifdef AI_CANONNAME
|
|
PyModule_AddIntConstant(m, "AI_CANONNAME", AI_CANONNAME);
|
|
#endif
|
|
#ifdef AI_NUMERICHOST
|
|
PyModule_AddIntConstant(m, "AI_NUMERICHOST", AI_NUMERICHOST);
|
|
#endif
|
|
#ifdef AI_NUMERICSERV
|
|
PyModule_AddIntConstant(m, "AI_NUMERICSERV", AI_NUMERICSERV);
|
|
#endif
|
|
#ifdef AI_MASK
|
|
PyModule_AddIntConstant(m, "AI_MASK", AI_MASK);
|
|
#endif
|
|
#ifdef AI_ALL
|
|
PyModule_AddIntConstant(m, "AI_ALL", AI_ALL);
|
|
#endif
|
|
#ifdef AI_V4MAPPED_CFG
|
|
PyModule_AddIntConstant(m, "AI_V4MAPPED_CFG", AI_V4MAPPED_CFG);
|
|
#endif
|
|
#ifdef AI_ADDRCONFIG
|
|
PyModule_AddIntConstant(m, "AI_ADDRCONFIG", AI_ADDRCONFIG);
|
|
#endif
|
|
#ifdef AI_V4MAPPED
|
|
PyModule_AddIntConstant(m, "AI_V4MAPPED", AI_V4MAPPED);
|
|
#endif
|
|
#ifdef AI_DEFAULT
|
|
PyModule_AddIntConstant(m, "AI_DEFAULT", AI_DEFAULT);
|
|
#endif
|
|
#ifdef NI_MAXHOST
|
|
PyModule_AddIntConstant(m, "NI_MAXHOST", NI_MAXHOST);
|
|
#endif
|
|
#ifdef NI_MAXSERV
|
|
PyModule_AddIntConstant(m, "NI_MAXSERV", NI_MAXSERV);
|
|
#endif
|
|
#ifdef NI_NOFQDN
|
|
PyModule_AddIntConstant(m, "NI_NOFQDN", NI_NOFQDN);
|
|
#endif
|
|
#ifdef NI_NUMERICHOST
|
|
PyModule_AddIntConstant(m, "NI_NUMERICHOST", NI_NUMERICHOST);
|
|
#endif
|
|
#ifdef NI_NAMEREQD
|
|
PyModule_AddIntConstant(m, "NI_NAMEREQD", NI_NAMEREQD);
|
|
#endif
|
|
#ifdef NI_NUMERICSERV
|
|
PyModule_AddIntConstant(m, "NI_NUMERICSERV", NI_NUMERICSERV);
|
|
#endif
|
|
#ifdef NI_DGRAM
|
|
PyModule_AddIntConstant(m, "NI_DGRAM", NI_DGRAM);
|
|
#endif
|
|
|
|
/* shutdown() parameters */
|
|
#ifdef SHUT_RD
|
|
PyModule_AddIntConstant(m, "SHUT_RD", SHUT_RD);
|
|
#elif defined(SD_RECEIVE)
|
|
PyModule_AddIntConstant(m, "SHUT_RD", SD_RECEIVE);
|
|
#else
|
|
PyModule_AddIntConstant(m, "SHUT_RD", 0);
|
|
#endif
|
|
#ifdef SHUT_WR
|
|
PyModule_AddIntConstant(m, "SHUT_WR", SHUT_WR);
|
|
#elif defined(SD_SEND)
|
|
PyModule_AddIntConstant(m, "SHUT_WR", SD_SEND);
|
|
#else
|
|
PyModule_AddIntConstant(m, "SHUT_WR", 1);
|
|
#endif
|
|
#ifdef SHUT_RDWR
|
|
PyModule_AddIntConstant(m, "SHUT_RDWR", SHUT_RDWR);
|
|
#elif defined(SD_BOTH)
|
|
PyModule_AddIntConstant(m, "SHUT_RDWR", SD_BOTH);
|
|
#else
|
|
PyModule_AddIntConstant(m, "SHUT_RDWR", 2);
|
|
#endif
|
|
|
|
/* Initialize gethostbyname lock */
|
|
#if defined(USE_GETHOSTBYNAME_LOCK) || defined(USE_GETADDRINFO_LOCK)
|
|
netdb_lock = PyThread_allocate_lock();
|
|
#endif
|
|
}
|
|
|
|
|
|
#ifndef HAVE_INET_PTON
|
|
|
|
/* Simplistic emulation code for inet_pton that only works for IPv4 */
|
|
/* These are not exposed because they do not set errno properly */
|
|
|
|
int
|
|
inet_pton(int af, const char *src, void *dst)
|
|
{
|
|
if (af == AF_INET) {
|
|
long packed_addr;
|
|
packed_addr = inet_addr(src);
|
|
if (packed_addr == INADDR_NONE)
|
|
return 0;
|
|
memcpy(dst, &packed_addr, 4);
|
|
return 1;
|
|
}
|
|
/* Should set errno to EAFNOSUPPORT */
|
|
return -1;
|
|
}
|
|
|
|
const char *
|
|
inet_ntop(int af, const void *src, char *dst, socklen_t size)
|
|
{
|
|
if (af == AF_INET) {
|
|
struct in_addr packed_addr;
|
|
if (size < 16)
|
|
/* Should set errno to ENOSPC. */
|
|
return NULL;
|
|
memcpy(&packed_addr, src, sizeof(packed_addr));
|
|
return strncpy(dst, inet_ntoa(packed_addr), size);
|
|
}
|
|
/* Should set errno to EAFNOSUPPORT */
|
|
return NULL;
|
|
}
|
|
|
|
#endif
|