Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity
cpython/Modules/socketmodule.c

3763 lines
92 KiB
C
Raw Normal View History

Initial revision
1991-06-25 21:36:08 +00:00
/* Socket module */
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
/* SSL support based on patches by Brian E Gallew and Laszlo Kovacs */
Initial revision
1991-06-25 21:36:08 +00:00
/*
This module provides an interface to Berkeley socket IPC.
Limitations:
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
- only AF_INET, AF_INET6 and AF_UNIX address families are supported in a
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
portable manner, though AF_PACKET is supported under Linux.
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
- no read/write operations (use sendall/recv or makefile instead)
- additional restrictions apply on Windows (compensated for by socket.py)
Initial revision
1991-06-25 21:36:08 +00:00
fixed up comments describing interface
1995-03-16 15:43:47 +00:00
Module interface:
Initial revision
1991-06-25 21:36:08 +00:00
fixed up comments describing interface
1995-03-16 15:43:47 +00:00
- socket.error: exception raised for socket specific errors
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
- 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
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
- socket.gethostbyname(hostname) --> host IP address (string: 'dd.dd.dd.dd')
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
- socket.gethostbyaddr(IP address) --> (hostname, [alias, ...], [IP addr, ...])
fixed up comments describing interface
1995-03-16 15:43:47 +00:00
- socket.gethostname() --> host name (string: 'spam' or 'spam.domain.com')
Added the new getprotobyname() call to the module overview at the top.
1996-12-19 16:42:52 +00:00
- socket.getprotobyname(protocolname) --> protocol number
fixed up comments describing interface
1995-03-16 15:43:47 +00:00
- socket.getservbyname(servicename, protocolname) --> port number
Connection sockets now have the proper family/type/proto values. Fix argument handling bug in socket(f,t,p) call. Fix some comments.
1991-07-01 18:51:33 +00:00
- socket.socket(family, type [, proto]) --> new socket object
ntohs, ntohl, htons, htonl -- thanks to Lance
1996-06-12 04:04:55 +00:00
- 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
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
- socket.getaddrinfo(host, port [, family, socktype, proto, flags])
--> List of (family, socktype, proto, canonname, sockaddr)
- socket.getnameinfo(sockaddr, flags) --> (host, port)
fixed up comments describing interface
1995-03-16 15:43:47 +00:00
- socket.AF_INET, socket.SOCK_STREAM, etc.: constants from <socket.h>
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
- socket.inet_aton(IP address) -> 32-bit packed IP representation
- socket.inet_ntoa(packed IP) -> IP address string
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
- socket.ssl(socket, keyfile, certfile) -> new ssl object
Initial revision
1991-06-25 21:36:08 +00:00
- 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
fixed up comments describing interface
1995-03-16 15:43:47 +00:00
- a UNIX domain socket address is a string specifying the pathname
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
- 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:
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
("eth0",0x1234). Optional 3rd,4th,5th elements in the tuple
specify packet-type and ha-type/addr -- these are ignored by
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
networking code, but accepted since they are returned by the
getsockname() method.
Initial revision
1991-06-25 21:36:08 +00:00
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
Socket methods:
Add gethostname() and s.avail().
1991-07-27 21:42:02 +00:00
- s.accept() --> new socket object, sockaddr
Restore strict checking of socket address values; addresses passed to the bind(), connect(), and connect_ex() methods must be a single parameter. Originally part of 1.98, reverted in 1.100.
2000-07-01 03:40:12 +00:00
- s.bind(sockaddr) --> None
fixed up comments describing interface
1995-03-16 15:43:47 +00:00
- s.close() --> None
Restore strict checking of socket address values; addresses passed to the bind(), connect(), and connect_ex() methods must be a single parameter. Originally part of 1.98, reverted in 1.100.
2000-07-01 03:40:12 +00:00
- s.connect(sockaddr) --> None
- s.connect_ex(sockaddr) --> 0 or errno (handy for e.g. async connect)
fixed up comments describing interface
1995-03-16 15:43:47 +00:00
- s.fileno() --> file descriptor
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
- s.dup() --> same as socket.fromfd(os.dup(s.fileno(), ...)
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
- s.getpeername() --> sockaddr
fixed up comments describing interface
1995-03-16 15:43:47 +00:00
- s.getsockname() --> sockaddr
- s.getsockopt(level, optname[, buflen]) --> int or string
- s.listen(backlog) --> None
mode and optional bufsize for makefile()
1995-03-14 15:05:13 +00:00
- s.makefile([mode[, bufsize]]) --> file object
fixed up comments describing interface
1995-03-16 15:43:47 +00:00
- s.recv(buflen [,flags]) --> string
- s.recvfrom(buflen [,flags]) --> string, sockaddr
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
- s.send(string [,flags]) --> nbytes
Add sendall() method, which loops until all data is written or an error occurs, and doesn't return a count. (This is my second patch from SF patch #474307, with small change to the docstring for send().) 2.1.2 "bugfix" candidate.
2001-10-26 03:25:00 +00:00
- s.sendall(string [,flags]) # tries to send everything in a loop
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
- s.sendto(string, [flags,] sockaddr) --> nbytes
fixed up comments describing interface
1995-03-16 15:43:47 +00:00
- s.setblocking(0 | 1) --> None
- s.setsockopt(level, optname, value) --> None
- s.shutdown(how) --> None
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
- repr(s) --> "<socket object, fd=%d, family=%d, type=%d, protocol=%d>"
Initial revision
1991-06-25 21:36:08 +00:00
*/
new style
1994-10-10 17:59:00 +00:00
#include "Python.h"
Clean up pass for the previous patches. - Use HAVE_GETHOSTBYNAME_R_6_ARG instead of testing for Linux and glibc2. - If gethostbyname takes 3 args, undefine HAVE_GETHOSTBYNAME_R -- don't know what code should be used. - New symbol USE_GETHOSTBYNAME_LOCK defined iff the lock should be used. - Modify the gethostbyaddr() code to also hold on to the lock until after it is safe to release, overlapping with the Python lock. (Note: I think that it could in theory be possible that Python code executed while gethostbyname_lock is held could attempt to reacquire the lock -- e.g. in a signal handler or destructor. I will simply say "don't do that then.")
1999-03-22 21:44:51 +00:00
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
/* XXX This is a terrible mess of of platform-dependent preprocessor hacks.
I hope some day someone can clean this up please... */
(1) On Linux, we really need to trust the configure script to select the right variant of gethostbyname_r for us, since not all Linuxes are equal in this respect. Reported by Laurent Pointal. (2) On BeOS, Chris Herborth reports that instead of arpa/inet.h you must include net/netdb.h to get the inet_ntoa() and inet_addr() prototypes.
1999-09-15 22:01:40 +00:00
/* 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
Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the data struct before calling gethostby{name,addr}_r(); (2) ignore the 3/5/6 args determinations made by the configure script and switch on platform identifiers instead: AIX, OSF have 3 args Sun, SGI have 5 args Linux has 6 args On all other platforms, undef HAVE_GETHOSTBYNAME_R altogether.
1999-03-24 17:24:33 +00:00
#undef HAVE_GETHOSTBYNAME_R_3_ARG
#undef HAVE_GETHOSTBYNAME_R_5_ARG
#undef HAVE_GETHOSTBYNAME_R_6_ARG
(1) On Linux, we really need to trust the configure script to select the right variant of gethostbyname_r for us, since not all Linuxes are equal in this respect. Reported by Laurent Pointal. (2) On BeOS, Chris Herborth reports that instead of arpa/inet.h you must include net/netdb.h to get the inet_ntoa() and inet_addr() prototypes.
1999-09-15 22:01:40 +00:00
#endif
Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the data struct before calling gethostby{name,addr}_r(); (2) ignore the 3/5/6 args determinations made by the configure script and switch on platform identifiers instead: AIX, OSF have 3 args Sun, SGI have 5 args Linux has 6 args On all other platforms, undef HAVE_GETHOSTBYNAME_R altogether.
1999-03-24 17:24:33 +00:00
Put back __osf__ support for gethostbyname_r(); the real bug was that it was being used even without threads. This of course might be an all-platform problem so now we only use the _r variant when we are using threads.
1999-04-13 04:07:32 +00:00
#ifndef WITH_THREAD
#undef HAVE_GETHOSTBYNAME_R
#endif
Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the data struct before calling gethostby{name,addr}_r(); (2) ignore the 3/5/6 args determinations made by the configure script and switch on platform identifiers instead: AIX, OSF have 3 args Sun, SGI have 5 args Linux has 6 args On all other platforms, undef HAVE_GETHOSTBYNAME_R altogether.
1999-03-24 17:24:33 +00:00
#ifdef HAVE_GETHOSTBYNAME_R
Put back __osf__ support for gethostbyname_r(); the real bug was that it was being used even without threads. This of course might be an all-platform problem so now we only use the _r variant when we are using threads.
1999-04-13 04:07:32 +00:00
#if defined(_AIX) || defined(__osf__)
Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the data struct before calling gethostby{name,addr}_r(); (2) ignore the 3/5/6 args determinations made by the configure script and switch on platform identifiers instead: AIX, OSF have 3 args Sun, SGI have 5 args Linux has 6 args On all other platforms, undef HAVE_GETHOSTBYNAME_R altogether.
1999-03-24 17:24:33 +00:00
#define HAVE_GETHOSTBYNAME_R_3_ARG
Test for __sun instead of __sun__, since SUNWspro only defines the latter; gcc defines both.
2001-10-13 09:00:42 +00:00
#elif defined(__sun) || defined(__sgi)
Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the data struct before calling gethostby{name,addr}_r(); (2) ignore the 3/5/6 args determinations made by the configure script and switch on platform identifiers instead: AIX, OSF have 3 args Sun, SGI have 5 args Linux has 6 args On all other platforms, undef HAVE_GETHOSTBYNAME_R altogether.
1999-03-24 17:24:33 +00:00
#define HAVE_GETHOSTBYNAME_R_5_ARG
#elif defined(linux)
(1) On Linux, we really need to trust the configure script to select the right variant of gethostbyname_r for us, since not all Linuxes are equal in this respect. Reported by Laurent Pointal. (2) On BeOS, Chris Herborth reports that instead of arpa/inet.h you must include net/netdb.h to get the inet_ntoa() and inet_addr() prototypes.
1999-09-15 22:01:40 +00:00
/* Rely on the configure script */
Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the data struct before calling gethostby{name,addr}_r(); (2) ignore the 3/5/6 args determinations made by the configure script and switch on platform identifiers instead: AIX, OSF have 3 args Sun, SGI have 5 args Linux has 6 args On all other platforms, undef HAVE_GETHOSTBYNAME_R altogether.
1999-03-24 17:24:33 +00:00
#else
#undef HAVE_GETHOSTBYNAME_R
#endif
#endif
Clean up pass for the previous patches. - Use HAVE_GETHOSTBYNAME_R_6_ARG instead of testing for Linux and glibc2. - If gethostbyname takes 3 args, undefine HAVE_GETHOSTBYNAME_R -- don't know what code should be used. - New symbol USE_GETHOSTBYNAME_LOCK defined iff the lock should be used. - Modify the gethostbyaddr() code to also hold on to the lock until after it is safe to release, overlapping with the Python lock. (Note: I think that it could in theory be possible that Python code executed while gethostbyname_lock is held could attempt to reacquire the lock -- e.g. in a signal handler or destructor. I will simply say "don't do that then.")
1999-03-22 21:44:51 +00:00
#if !defined(HAVE_GETHOSTBYNAME_R) && defined(WITH_THREAD) && !defined(MS_WINDOWS)
#define USE_GETHOSTBYNAME_LOCK
#endif
#ifdef USE_GETHOSTBYNAME_LOCK
Renamed thread.h to pythread.h.
1998-10-01 20:42:43 +00:00
#include "pythread.h"
Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>.
1998-04-09 20:56:35 +00:00
#endif
Initial revision
1991-06-25 21:36:08 +00:00
Keep gcc -Wall happy.
1996-12-05 23:43:35 +00:00
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
#if defined(PYCC_VACPP)
#include <types.h>
#include <io.h>
#include <sys/ioctl.h>
#include <utils.h>
#include <ctype.h>
#endif
#if defined(PYOS_OS2)
#define INCL_DOS
#define INCL_DOSERRORS
#define INCL_NOPMAPI
#include <os2.h>
#endif
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
#include <sys/types.h>
Changes for new UNIX-specific built-in module 'select' and new header for interfaces to variants of select() system call, "myselect.h". This includes adding fileno() methods to files, sockets and stdwin.
1992-06-23 09:07:03 +00:00
Add gethostname() and s.avail().
1991-07-27 21:42:02 +00:00
#include <signal.h>
Slightly different Windows ifdefs
1996-06-28 20:15:15 +00:00
#ifndef MS_WINDOWS
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
#include <netdb.h>
Initial revision
1991-06-25 21:36:08 +00:00
#include <sys/socket.h>
#include <netinet/in.h>
SF patch 473749 compile under OS/2 VA C++, from Michael Muller. Changes enabling Python to compile under OS/2 Visual Age C++.
2001-11-05 02:45:59 +00:00
#if !(defined(__BEOS__) || defined(__CYGWIN__) || (defined(PYOS_OS2) && defined(PYCC_VACPP)))
Add '#include <netinet/tcp.h>' "man tcp" on Solaris says that TCP_NODELAY is defined in netinet/tcp.h, and the Open Groups Unix98 spec agrees (http://www.opengroup.org/onlinepubs/009619199/ninettcp.htm).
2000-03-31 17:24:30 +00:00
#include <netinet/tcp.h>
Donn Cave <donn@oz.net>: BeOS (up to 5.0) lacks <netinet/tcp.h>.
2000-05-16 13:30:12 +00:00
#endif
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
(1) On Linux, we really need to trust the configure script to select the right variant of gethostbyname_r for us, since not all Linuxes are equal in this respect. Reported by Laurent Pointal. (2) On BeOS, Chris Herborth reports that instead of arpa/inet.h you must include net/netdb.h to get the inet_ntoa() and inet_addr() prototypes.
1999-09-15 22:01:40 +00:00
/* Headers needed for inet_ntoa() and inet_addr() */
#ifdef __BEOS__
#include <net/netdb.h>
SF patch 473749 compile under OS/2 VA C++, from Michael Muller. Changes enabling Python to compile under OS/2 Visual Age C++.
2001-11-05 02:45:59 +00:00
#elif defined(PYOS_OS2) && defined(PYCC_VACPP)
#include <netdb.h>
typedef size_t socklen_t;
(1) On Linux, we really need to trust the configure script to select the right variant of gethostbyname_r for us, since not all Linuxes are equal in this respect. Reported by Laurent Pointal. (2) On BeOS, Chris Herborth reports that instead of arpa/inet.h you must include net/netdb.h to get the inet_ntoa() and inet_addr() prototypes.
1999-09-15 22:01:40 +00:00
#else
Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the socklen_t (unsigned int) for most size parameters. Apparently this is part of the UNIX 98 standard. [GvR: the changes to configure.in etc. that I just checked in make sure that socklen_t is defined everywhere, so I deleted the little part of Jack's mod to define socklen_t if not in GUSI2. I suppose I will have to add it to the Windows config.h in a minute.]
2000-04-24 15:16:03 +00:00
#ifndef USE_GUSI1
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
#include <arpa/inet.h>
(1) On Linux, we really need to trust the configure script to select the right variant of gethostbyname_r for us, since not all Linuxes are equal in this respect. Reported by Laurent Pointal. (2) On BeOS, Chris Herborth reports that instead of arpa/inet.h you must include net/netdb.h to get the inet_ntoa() and inet_addr() prototypes.
1999-09-15 22:01:40 +00:00
#endif
Bugfix by Jack Jansen for Macintosh (for the inet_ntoa/aton changes): <arpa/inet.h> doesn't exist and isn't needed; and inet_addr() returns a structure containing a long rather than a long.
1999-11-04 18:22:29 +00:00
#endif
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
SF patch #474590 -- RISC OS support
2001-10-24 20:42:55 +00:00
#ifndef RISCOS
Setup.in: added tkinter; rearranged the definition of PYTHONPATH so that the module-specific components are in the section for that module. cursesmodule.c: patched it so it actually works. tkintermodule.c: call Py_AtExit instead of atexit(). signalmodule.c: converted to new naming style; added BGN/END SAVE around pause() call. socketmodule.c: added setblocking() after Tommy Burnette.
1994-09-07 14:32:49 +00:00
#include <fcntl.h>
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
#else
SF patch #474590 -- RISC OS support
2001-10-24 20:42:55 +00:00
#include <sys/fcntl.h>
#define NO_DUP
int h_errno; /* not used */
#endif
#else
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
#include <winsock.h>
add setblocking(); NT changes; null-terminate Unix path
1995-06-14 22:28:08 +00:00
#include <fcntl.h>
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
#endif
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
#ifdef HAVE_SYS_UN_H
Initial revision
1991-06-25 21:36:08 +00:00
#include <sys/un.h>
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
#else
#undef AF_UNIX
* Microscopic corrections to make things compile on the Cray APP. * Removed one use of $> in Makefile and warned about others. Added configurable lines in Makefile to change CC and AR.
1993-04-07 14:06:14 +00:00
#endif
Autotest for netpacket/packet.h, as it is not available on all Linux versions. Depend AF_PACKET on HAVE_NETPACKET_PACKET_H. Fixes #449157
2001-08-10 20:29:40 +00:00
#ifdef HAVE_NETPACKET_PACKET_H
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
#include <sys/ioctl.h>
#include <net/if.h>
#include <netpacket/packet.h>
#endif
Provide a definition for offsetof.
2001-06-24 21:28:42 +00:00
#ifdef HAVE_STDDEF_H
#include <stddef.h>
#endif
#ifndef offsetof
#define offsetof(type, member) ((size_t)(&((type *)0)->member))
#endif
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
#ifndef O_NDELAY
#define O_NDELAY O_NONBLOCK /* For QNX only? */
#endif
Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the socklen_t (unsigned int) for most size parameters. Apparently this is part of the UNIX 98 standard. [GvR: the changes to configure.in etc. that I just checked in make sure that socklen_t is defined everywhere, so I deleted the little part of Jack's mod to define socklen_t if not in GUSI2. I suppose I will have to add it to the Windows config.h in a minute.]
2000-04-24 15:16:03 +00:00
#ifdef USE_GUSI1
Include GUSI.h if using gusi-sockets
1996-02-14 15:57:45 +00:00
/* fdopen() isn't declared in stdio.h (sigh) */
#include <GUSI.h>
#endif
Patch #401196: Configuration machinery for IPv6. Contributed by Jun-ichiro "itojun" Hagino. get{addr,name}info emulation code taken from WIDE.
2001-06-23 16:30:13 +00:00
#include "addrinfo.h"
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
#ifdef USE_SSL
Use openssl/*.h to include the OpenSSL header files
2001-01-18 17:41:41 +00:00
#include "openssl/rsa.h"
#include "openssl/crypto.h"
#include "openssl/x509.h"
#include "openssl/pem.h"
#include "openssl/ssl.h"
#include "openssl/err.h"
Expose three OpenSSL API calls for dealing with the PRNG. Quoth the OpenSSL RAND_add man page: OpenSSL makes sure that the PRNG state is unique for each thread. On systems that provide /dev/urandom, the randomness device is used to seed the PRNG transparently. However, on all other systems, the application is responsible for seeding the PRNG by calling RAND_add(), RAND_egd(3) or RAND_load_file(3). I decided to expose RAND_add() because it's general and RAND_egd() because it's a useful special case. RAND_load_file() didn't seem to offer much over RAND_add(), so I skipped it. Also supplied RAND_status() which returns true if the PRNG is seeded and false if not.
2001-10-18 00:28:50 +00:00
#include "openssl/rand.h"
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
#endif /* USE_SSL */
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
Emulate inet_{pton,ntop} on systems that don't provide it.
2001-06-24 21:18:26 +00:00
#ifndef HAVE_INET_PTON
Silence warnings in MSVC++: hide unused variables, add constness back to inet_pton/ntop, convert htons argument to u_short.
2001-07-21 09:42:15 +00:00
int inet_pton (int af, const char *src, void *dst);
const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
Emulate inet_{pton,ntop} on systems that don't provide it.
2001-06-24 21:18:26 +00:00
#endif
Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Since getnameinfo is not implemented, remove __APPLE__ check here.
2001-08-03 10:02:29 +00:00
#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. */
#undef HAVE_GETADDRINFO
/* avoid clashes with the C library definition of the symbol. */
#define getaddrinfo fake_getaddrinfo
#endif
Patch #401196: Configuration machinery for IPv6. Contributed by Jun-ichiro "itojun" Hagino. get{addr,name}info emulation code taken from WIDE.
2001-06-23 16:30:13 +00:00
/* I know this is a bad practice, but it is the easiest... */
Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Since getnameinfo is not implemented, remove __APPLE__ check here.
2001-08-03 10:02:29 +00:00
#if !defined(HAVE_GETADDRINFO)
Patch #401196: Configuration machinery for IPv6. Contributed by Jun-ichiro "itojun" Hagino. get{addr,name}info emulation code taken from WIDE.
2001-06-23 16:30:13 +00:00
#include "getaddrinfo.c"
#endif
Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Since getnameinfo is not implemented, remove __APPLE__ check here.
2001-08-03 10:02:29 +00:00
#if !defined(HAVE_GETNAMEINFO)
Patch #401196: Configuration machinery for IPv6. Contributed by Jun-ichiro "itojun" Hagino. get{addr,name}info emulation code taken from WIDE.
2001-06-23 16:30:13 +00:00
#include "getnameinfo.c"
#endif
Changes for BeOS, QNX and long long, by Chris Herborth.
1998-08-04 22:53:56 +00:00
#if defined(MS_WINDOWS) || defined(__BEOS__)
/* BeOS suffers from the same socket dichotomy as Win32... - [cjh] */
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
/* seem to be a few differences in the API */
Use an explicit macro SOCKETCLOSE which expands to closesocket (on Windows), soclose (on OS2), or to close (everywhere else). Hopefully this fixes a new compilation error that I suddenly get on Windows because the macro definition for close -> closesocket apparently was done before including io.h, which contains a prototype for close. (No idea why this wasn't an error before.)
2000-04-21 20:33:00 +00:00
#define SOCKETCLOSE closesocket
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
#define NO_DUP /* Actually it exists on NT 3.5, but what the heck... */
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
#endif
Trent Mick <trentm@activestate.com>: This patch fixes possible overflows in the socket module for 64-bit platforms (mainly Win64). The changes are: - abstract the socket type to SOCKET_T (this is SOCKET on Windows, int on Un*x), this is necessary because sizeof(SOCKET) > sizeof(int) on Win64 - use INVALID_SOCKET on Win32/64 for an error return value for accept() - ensure no overflow of the socket variable for: (1) a PyObject return value (use PyLong_FromLongLong if necessary); and (2) printf formatting in repr(). Closes SourceForge patch #100516.
2000-06-30 02:46:07 +00:00
/* abstract the socket file descriptor type */
#ifdef MS_WINDOWS
typedef SOCKET SOCKET_T;
# ifdef MS_WIN64
# define SIZEOF_SOCKET_T 8
# else
# define SIZEOF_SOCKET_T 4
# endif
#else
typedef int SOCKET_T;
# define SIZEOF_SOCKET_T SIZEOF_INT
#endif
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
#ifdef MS_WIN32
# define EAFNOSUPPORT WSAEAFNOSUPPORT
# define snprintf _snprintf
#endif
Trent Mick <trentm@activestate.com>: This patch fixes possible overflows in the socket module for 64-bit platforms (mainly Win64). The changes are: - abstract the socket type to SOCKET_T (this is SOCKET on Windows, int on Un*x), this is necessary because sizeof(SOCKET) > sizeof(int) on Win64 - use INVALID_SOCKET on Win32/64 for an error return value for accept() - ensure no overflow of the socket variable for: (1) a PyObject return value (use PyLong_FromLongLong if necessary); and (2) printf formatting in repr(). Closes SourceForge patch #100516.
2000-06-30 02:46:07 +00:00
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
#if defined(PYOS_OS2)
Use an explicit macro SOCKETCLOSE which expands to closesocket (on Windows), soclose (on OS2), or to close (everywhere else). Hopefully this fixes a new compilation error that I suddenly get on Windows because the macro definition for close -> closesocket apparently was done before including io.h, which contains a prototype for close. (No idea why this wasn't an error before.)
2000-04-21 20:33:00 +00:00
#define SOCKETCLOSE soclose
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
#define NO_DUP /* Sockets are Not Actual File Handles under OS/2 */
#endif
Use an explicit macro SOCKETCLOSE which expands to closesocket (on Windows), soclose (on OS2), or to close (everywhere else). Hopefully this fixes a new compilation error that I suddenly get on Windows because the macro definition for close -> closesocket apparently was done before including io.h, which contains a prototype for close. (No idea why this wasn't an error before.)
2000-04-21 20:33:00 +00:00
#ifndef SOCKETCLOSE
#define SOCKETCLOSE close
#endif
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
/* XXX There's a problem here: *static* functions are not supposed to have
a Py prefix (or use CapitalizedWords). Later... */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* Global variable holding the exception type for errors detected
by this module (but not argument type or memory errors, etc.). */
new style
1994-10-10 17:59:00 +00:00
static PyObject *PySocket_Error;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
static PyObject *PyH_Error;
static PyObject *PyGAI_Error;
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
#ifdef USE_SSL
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
static PyObject *PySSLErrorObject;
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
#endif /* USE_SSL */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#ifdef RISCOS
/* Global variable which is !=0 if Python is running in a RISC OS taskwindow */
static int taskwindow;
#endif
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* Convenience function to raise an error according to errno
and return a NULL pointer from a function. */
Initial revision
1991-06-25 21:36:08 +00:00
new style
1994-10-10 17:59:00 +00:00
static PyObject *
Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', and a couple of functions that were missed in the previous batches. Not terribly tested, but very carefully scrutinized, three times. All these were found by the little findkrc.py that I posted to python-dev, which means there might be more lurking. Cases such as this: long func(a, b) long a; long b; /* flagword */ { and other cases where the last ; in the argument list isn't followed by a newline and an opening curly bracket. Regexps to catch all are welcome, of course ;)
2000-07-21 06:00:07 +00:00
PySocket_Err(void)
Initial revision
1991-06-25 21:36:08 +00:00
{
changed windows test symbols; removed debug printf from sockets
1996-06-26 18:22:49 +00:00
#ifdef MS_WINDOWS
Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch]
2000-07-24 01:45:11 +00:00
int err_no = WSAGetLastError();
if (err_no) {
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" },
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{ WSAEWOULDBLOCK,
Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch]
2000-07-24 01:45:11 +00:00
"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" },
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{ WSAENETRESET,
Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch]
2000-07-24 01:45:11 +00:00
"Network dropped connection on reset" },
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{ WSAECONNABORTED,
Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch]
2000-07-24 01:45:11 +00:00
"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" },
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{ WSANOTINITIALISED,
Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch]
2000-07-24 01:45:11 +00:00
"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 }
};
new style
1994-10-10 17:59:00 +00:00
PyObject *v;
Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch]
2000-07-24 01:45:11 +00:00
const char *msg = "winsock error";
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
Patch #100926 - Better error messages for socket exceptions on Windows. [Slight style differences from posted patch]
2000-07-24 01:45:11 +00:00
for (msgp = msgs; msgp->msg; msgp++) {
if (err_no == msgp->no) {
msg = msgp->msg;
break;
}
}
v = Py_BuildValue("(is)", err_no, msg);
* Modules/xxmodule.c: integrated with xxobject.c by Jack * Modules/(posix,socket}module.c: more NT changes
1994-09-29 09:50:09 +00:00
if (v != NULL) {
new style
1994-10-10 17:59:00 +00:00
PyErr_SetObject(PySocket_Error, v);
Py_DECREF(v);
* Modules/xxmodule.c: integrated with xxobject.c by Jack * Modules/(posix,socket}module.c: more NT changes
1994-09-29 09:50:09 +00:00
}
return NULL;
}
else
#endif
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
#if defined(PYOS_OS2)
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;
outbuf[msglen] = '\0'; /* OS/2 Doesn't Guarantee a Terminator */
if (strlen(outbuf) > 0) { /* If Non-Empty Msg, Trim CRLF */
char *lastc = &outbuf[ strlen(outbuf)-1 ];
while (lastc > outbuf && isspace(*lastc))
*lastc-- = '\0'; /* Trim Trailing Whitespace (CRLF) */
}
v = Py_BuildValue("(is)", myerrorcode, outbuf);
if (v != NULL) {
PyErr_SetObject(PySocket_Error, v);
Py_DECREF(v);
}
return NULL;
}
}
#endif
new style
1994-10-10 17:59:00 +00:00
return PyErr_SetFromErrno(PySocket_Error);
Initial revision
1991-06-25 21:36:08 +00:00
}
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
static PyObject *
PyH_Err(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) {
Auto-detect hstrerror. Raise socket.herror in PyH_Error. Register the three exception classes in the module dictionary.
2001-08-04 22:32:03 +00:00
PyErr_SetObject(PyH_Error, v);
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
Py_DECREF(v);
}
return NULL;
}
static PyObject *
PyGAI_Err(int error)
{
PyObject *v;
if (error == EAI_SYSTEM)
return PySocket_Err();
Fix portability problems with glibc 2.0, as reported in #449157.
2001-08-15 17:14:33 +00:00
#ifdef HAVE_GAI_STRERROR
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
v = Py_BuildValue("(is)", error, gai_strerror(error));
Fix portability problems with glibc 2.0, as reported in #449157.
2001-08-15 17:14:33 +00:00
#else
v = Py_BuildValue("(is)", error, "getaddrinfo failed");
#endif
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
if (v != NULL) {
PyErr_SetObject(PyGAI_Error, v);
Py_DECREF(v);
}
return NULL;
}
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* The object holding a socket. It holds some extra information,
like the address family, which is used to decode socket address
arguments properly. */
Initial revision
1991-06-25 21:36:08 +00:00
typedef struct {
new style
1994-10-10 17:59:00 +00:00
PyObject_HEAD
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
SOCKET_T sock_fd; /* Socket file descriptor */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
int sock_family; /* Address family, e.g., AF_INET */
int sock_type; /* Socket type, e.g., SOCK_STREAM */
int sock_proto; /* Protocol type, usually 0 */
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
union sock_addr {
struct sockaddr_in in;
#ifdef AF_UNIX
struct sockaddr_un un;
#endif
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
#ifdef INET6
struct sockaddr_in6 in6;
struct sockaddr_storage storage;
#endif
Autotest for netpacket/packet.h, as it is not available on all Linux versions. Depend AF_PACKET on HAVE_NETPACKET_PACKET_H. Fixes #449157
2001-08-10 20:29:40 +00:00
#ifdef HAVE_NETPACKET_PACKET_H
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
struct sockaddr_ll ll;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#endif
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
} sock_addr;
new style
1994-10-10 17:59:00 +00:00
} PySocketSockObject;
Initial revision
1991-06-25 21:36:08 +00:00
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
#ifdef USE_SSL
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
#define X509_NAME_MAXLEN 256
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
typedef struct {
PyObject_HEAD
PySocketSockObject *Socket; /* Socket on which we're layered */
SSL_CTX* ctx;
SSL* ssl;
X509* server_cert;
BIO* sbio;
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
char server[X509_NAME_MAXLEN];
char issuer[X509_NAME_MAXLEN];
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
} PySSLObject;
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
staticforward PyTypeObject PySSL_Type;
staticforward PyObject *PySSL_SSLwrite(PySSLObject *self, PyObject *args);
staticforward PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args);
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
#define PySSLObject_Check(v) ((v)->ob_type == &PySSL_Type)
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
#endif /* USE_SSL */
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* A forward reference to the Socktype type object.
The Socktype variable contains pointers to various functions,
new style
1994-10-10 17:59:00 +00:00
some of which call newsockobject(), which uses Socktype, so
Make Socktype global so old and new compilers will like it.
1991-09-10 14:57:12 +00:00
there has to be a circular reference. */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
new style
1994-10-10 17:59:00 +00:00
staticforward PyTypeObject PySocketSock_Type;
Initial revision
1991-06-25 21:36:08 +00:00
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
/* Initialize a new socket object. */
static void
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;
#ifdef RISCOS
if(taskwindow) {
socketioctl(s->sock_fd, 0x80046679, (u_long*)&block);
}
#endif
}
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* 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()). */
new style
1994-10-10 17:59:00 +00:00
static PySocketSockObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocketSock_New(SOCKET_T fd, int family, int type, int proto)
Initial revision
1991-06-25 21:36:08 +00:00
{
new style
1994-10-10 17:59:00 +00:00
PySocketSockObject *s;
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
s = (PySocketSockObject *)
PyType_GenericNew(&PySocketSock_Type, NULL, NULL);
if (s != NULL)
init_sockobject(s, fd, family, type, proto);
Initial revision
1991-06-25 21:36:08 +00:00
return s;
}
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
/* Lock to allow python interpreter to continue, but only allow one
Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>.
1998-04-09 20:56:35 +00:00
thread to be in gethostbyname */
Clean up pass for the previous patches. - Use HAVE_GETHOSTBYNAME_R_6_ARG instead of testing for Linux and glibc2. - If gethostbyname takes 3 args, undefine HAVE_GETHOSTBYNAME_R -- don't know what code should be used. - New symbol USE_GETHOSTBYNAME_LOCK defined iff the lock should be used. - Modify the gethostbyaddr() code to also hold on to the lock until after it is safe to release, overlapping with the Python lock. (Note: I think that it could in theory be possible that Python code executed while gethostbyname_lock is held could attempt to reacquire the lock -- e.g. in a signal handler or destructor. I will simply say "don't do that then.")
1999-03-22 21:44:51 +00:00
#ifdef USE_GETHOSTBYNAME_LOCK
Thanks to Chris Herborth, the thread primitives now have proper Py* names in the source code (they already had those for the linker, through some smart macros; but the source still had the old, un-Py names).
1998-12-21 19:32:43 +00:00
PyThread_type_lock gethostbyname_lock;
Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>.
1998-04-09 20:56:35 +00:00
#endif
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* 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.
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
Return the length (IPv4 should be 4 bytes), or negative if
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
an error occurred; then an exception is raised. */
Initial revision
1991-06-25 21:36:08 +00:00
static int
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
setipaddr(char* name, struct sockaddr * addr_ret, int af)
Initial revision
1991-06-25 21:36:08 +00:00
{
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
struct addrinfo hints, *res;
int error;
Initial revision
1991-06-25 21:36:08 +00:00
Keep gcc -Wall happy.
1996-12-05 23:43:35 +00:00
memset((void *) addr_ret, '\0', sizeof(*addr_ret));
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
if (name[0] == '\0') {
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
int siz;
memset(&hints, 0, sizeof(hints));
hints.ai_family = af;
hints.ai_socktype = SOCK_DGRAM; /*dummy*/
hints.ai_flags = AI_PASSIVE;
error = getaddrinfo(NULL, "0", &hints, &res);
if (error) {
PyGAI_Err(error);
return -1;
}
switch (res->ai_family) {
case AF_INET:
siz = 4;
break;
#ifdef INET6
case AF_INET6:
siz = 16;
break;
#endif
default:
freeaddrinfo(res);
PyErr_SetString(PySocket_Error,
"unsupported address family");
return -1;
}
if (res->ai_next) {
Fix memory leaks detecting in bug report #478003.
2001-11-07 08:31:03 +00:00
freeaddrinfo(res);
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
PyErr_SetString(PySocket_Error,
"wildcard resolved to multiple address");
return -1;
}
memcpy(addr_ret, res->ai_addr, res->ai_addrlen);
freeaddrinfo(res);
return siz;
Initial revision
1991-06-25 21:36:08 +00:00
}
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
struct sockaddr_in *sin;
if (af != PF_INET && af != PF_UNSPEC) {
PyErr_SetString(PySocket_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);
Initial revision
1991-06-25 21:36:08 +00:00
}
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
memset(&hints, 0, sizeof(hints));
hints.ai_family = af;
error = getaddrinfo(name, NULL, &hints, &res);
After discussion with itojun, it was clarified that Tru64 is in error, and that the work-around should be restricted to that system.
2001-10-25 09:04:03 +00:00
#if defined(__digital__) && defined(__unix__)
Fix typo. Thanks to Jack Jansen for spotting it.
2001-10-24 17:35:46 +00:00
if (error == EAI_NONAME && af == AF_UNSPEC) {
After discussion with itojun, it was clarified that Tru64 is in error, and that the work-around should be restricted to that system.
2001-10-25 09:04:03 +00:00
/* On Tru64 V5.1, numeric-to-addr conversion
Include netdb.h to detect getaddrinfo. Work around problem with getaddrinfo not properly processing numeric IPv4 addresses. Fixes V5.1 part of #472675.
2001-10-24 14:36:00 +00:00
fails if no address family is given. Assume IPv4 for now.*/
hints.ai_family = AF_INET;
error = getaddrinfo(name, NULL, &hints, &res);
}
After discussion with itojun, it was clarified that Tru64 is in error, and that the work-around should be restricted to that system.
2001-10-25 09:04:03 +00:00
#endif
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
if (error) {
PyGAI_Err(error);
return -1;
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
}
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
memcpy((char *) addr_ret, res->ai_addr, res->ai_addrlen);
freeaddrinfo(res);
switch (addr_ret->sa_family) {
case AF_INET:
return 4;
#ifdef INET6
case AF_INET6:
return 16;
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
#endif
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
default:
PyErr_SetString(PySocket_Error, "unknown address family");
Initial revision
1991-06-25 21:36:08 +00:00
return -1;
}
}
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* Create a string object representing an IP address.
This is always a string of the form 'dd.dd.dd.dd' (with variable
size numbers). */
new style
1994-10-10 17:59:00 +00:00
static PyObject *
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
makeipaddr(struct sockaddr *addr, int addrlen)
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
{
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
char buf[NI_MAXHOST];
int error;
error = getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0,
NI_NUMERICHOST);
if (error) {
PyGAI_Err(error);
return NULL;
}
new style
1994-10-10 17:59:00 +00:00
return PyString_FromString(buf);
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
}
/* 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. */
Initial revision
1991-06-25 21:36:08 +00:00
/*ARGSUSED*/
new style
1994-10-10 17:59:00 +00:00
static PyObject *
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
makesockaddr(int sockfd, struct sockaddr *addr, int addrlen)
Initial revision
1991-06-25 21:36:08 +00:00
{
Sometimes, recvfrom() returns an empty address; this is not an error. Also, get rid of makepair() in favor of mkvalue().
1992-08-05 19:00:45 +00:00
if (addrlen == 0) {
/* No address -- may be recvfrom() from known socket */
new style
1994-10-10 17:59:00 +00:00
Py_INCREF(Py_None);
return Py_None;
Sometimes, recvfrom() returns an empty address; this is not an error. Also, get rid of makepair() in favor of mkvalue().
1992-08-05 19:00:45 +00:00
}
Changes for BeOS, QNX and long long, by Chris Herborth.
1998-08-04 22:53:56 +00:00
#ifdef __BEOS__
Patch by Charles G Waldman: 1) Adds MSG_DONTWAIT if defined (I needed this) 2) Spells "coreectly" correctly ;-)
2000-04-25 21:34:53 +00:00
/* XXX: BeOS version of accept() doesn't set family correctly */
Changes for BeOS, QNX and long long, by Chris Herborth.
1998-08-04 22:53:56 +00:00
addr->sa_family = AF_INET;
#endif
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
switch (addr->sa_family) {
case AF_INET:
{
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
struct sockaddr_in *a;
PyObject *addrobj = makeipaddr(addr, sizeof(*a));
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
PyObject *ret = NULL;
if (addrobj) {
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
a = (struct sockaddr_in *)addr;
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
ret = Py_BuildValue("Oi", addrobj, ntohs(a->sin_port));
Py_DECREF(addrobj);
}
* ceval.c: ifdef out the last argument passing compat hack. * Fixed memory leaks in socket, select and sv modules: mkvalue("O", v) does INCREF(v) so if v is brand new it should be XDECREF'd
1993-02-05 09:46:15 +00:00
return ret;
Initial revision
1991-06-25 21:36:08 +00:00
}
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
#ifdef AF_UNIX
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
case AF_UNIX:
{
Initial revision
1991-06-25 21:36:08 +00:00
struct sockaddr_un *a = (struct sockaddr_un *) addr;
new style
1994-10-10 17:59:00 +00:00
return PyString_FromString(a->sun_path);
Initial revision
1991-06-25 21:36:08 +00:00
}
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
#endif /* AF_UNIX */
#ifdef INET6
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;
}
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
#endif
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
Autotest for netpacket/packet.h, as it is not available on all Linux versions. Depend AF_PACKET on HAVE_NETPACKET_PACKET_H. Fixes #449157
2001-08-10 20:29:40 +00:00
#ifdef HAVE_NETPACKET_PACKET_H
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
case AF_PACKET:
{
struct sockaddr_ll *a = (struct sockaddr_ll *)addr;
char *ifname = "";
struct ifreq ifr;
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
/* need to look up interface name give index */
if (a->sll_ifindex) {
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
ifr.ifr_ifindex = a->sll_ifindex;
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
if (ioctl(sockfd, SIOCGIFNAME, &ifr) == 0)
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
ifname = ifr.ifr_name;
}
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
return Py_BuildValue("shbhs#", ifname, ntohs(a->sll_protocol),
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
a->sll_pkttype, a->sll_hatype,
a->sll_addr, a->sll_halen);
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
}
#endif
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* More cases here... */
default:
In makesockaddr(), if we don't know the address family, don't raise an exception -- return it as a tuple. Seems useful in promiscuous mode.
1997-05-07 17:41:48 +00:00
/* 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));
Sometimes, recvfrom() returns an empty address; this is not an error. Also, get rid of makepair() in favor of mkvalue().
1992-08-05 19:00:45 +00:00
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
}
Initial revision
1991-06-25 21:36:08 +00:00
}
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* 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. */
Initial revision
1991-06-25 21:36:08 +00:00
static int
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
getsockaddrarg(PySocketSockObject *s, PyObject *args,
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
struct sockaddr **addr_ret, int *len_ret)
Initial revision
1991-06-25 21:36:08 +00:00
{
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
switch (s->sock_family) {
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
#ifdef AF_UNIX
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
case AF_UNIX:
{
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
struct sockaddr_un* addr;
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
char *path;
Initial revision
1991-06-25 21:36:08 +00:00
int len;
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
addr = (struct sockaddr_un* )&(s->sock_addr).un;
Use the t# format where appropriate. Greg Stein.
1998-10-08 02:25:24 +00:00
if (!PyArg_Parse(args, "t#", &path, &len))
Initial revision
1991-06-25 21:36:08 +00:00
return 0;
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
if (len > sizeof addr->sun_path) {
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
PyErr_SetString(PySocket_Error,
"AF_UNIX path too long");
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
return 0;
}
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
addr->sun_family = s->sock_family;
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
memcpy(addr->sun_path, path, len);
add setblocking(); NT changes; null-terminate Unix path
1995-06-14 22:28:08 +00:00
addr->sun_path[len] = 0;
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
*addr_ret = (struct sockaddr *) addr;
Calculate length of AF_UNIX addr struct portably in getsockaddrarg().
1996-06-11 18:36:33 +00:00
*len_ret = len + sizeof(*addr) - sizeof(addr->sun_path);
Initial revision
1991-06-25 21:36:08 +00:00
return 1;
}
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
#endif /* AF_UNIX */
Initial revision
1991-06-25 21:36:08 +00:00
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
case AF_INET:
{
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
struct sockaddr_in* addr;
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
char *host;
Initial revision
1991-06-25 21:36:08 +00:00
int port;
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
addr=(struct sockaddr_in*)&(s->sock_addr).in;
Patch by Michael Hudson to clarify the error message from getsockaddrarg when the address is not a tuple.
2000-12-01 13:13:11 +00:00
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, "si:getsockaddrarg", &host, &port))
Initial revision
1991-06-25 21:36:08 +00:00
return 0;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
if (setipaddr(host, (struct sockaddr *)addr, AF_INET) < 0)
Initial revision
1991-06-25 21:36:08 +00:00
return 0;
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
addr->sin_family = AF_INET;
Tweaks to keep the Microsoft compiler quier.
1997-04-09 19:24:53 +00:00
addr->sin_port = htons((short)port);
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
*addr_ret = (struct sockaddr *) addr;
*len_ret = sizeof *addr;
Initial revision
1991-06-25 21:36:08 +00:00
return 1;
}
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
#ifdef INET6
case AF_INET6:
{
struct sockaddr_in6* addr;
char *host;
int port, flowinfo, scope_id;
addr = (struct sockaddr_in6*)&(s->sock_addr).in6;
flowinfo = scope_id = 0;
if (!PyArg_ParseTuple(args, "si|ii", &host, &port, &flowinfo,
&scope_id)) {
return 0;
}
if (setipaddr(host, (struct sockaddr *)addr, AF_INET6) < 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;
*addr_ret = (struct sockaddr *) addr;
*len_ret = sizeof *addr;
return 1;
}
#endif
Autotest for netpacket/packet.h, as it is not available on all Linux versions. Depend AF_PACKET on HAVE_NETPACKET_PACKET_H. Fixes #449157
2001-08-10 20:29:40 +00:00
#ifdef HAVE_NETPACKET_PACKET_H
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
case AF_PACKET:
{
struct sockaddr_ll* addr;
struct ifreq ifr;
char *interfaceName;
int protoNumber;
int hatype = 0;
int pkttype = 0;
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
char *haddr;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
if (!PyArg_ParseTuple(args, "si|iis", &interfaceName,
&protoNumber, &pkttype, &hatype, &haddr))
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
return 0;
strncpy(ifr.ifr_name, interfaceName, sizeof(ifr.ifr_name));
ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
Use PySocket_Err() instead of PyErr_SetFromErrno(). The former does the right thing on Windows, the latter does not.
2001-10-11 17:27:58 +00:00
PySocket_Err();
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
return 0;
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
}
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
addr = &(s->sock_addr.ll);
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;
*addr_ret = (struct sockaddr *) addr;
*len_ret = sizeof *addr;
return 1;
}
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#endif
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* More cases here... */
default:
new style
1994-10-10 17:59:00 +00:00
PyErr_SetString(PySocket_Error, "getsockaddrarg: bad family");
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
return 0;
}
Initial revision
1991-06-25 21:36:08 +00:00
}
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
/* Get the address length according to the socket object's address family.
Some UNIX types want the exact size of the address structure
1992-06-12 10:39:36 +00:00
Return 1 if the family is known, 0 otherwise. The length is returned
through len_ret. */
static int
Errare humanum est. Changed parameter in getsockaddrlen from unsigned to socklen_t.
2000-07-11 23:00:12 +00:00
getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
Some UNIX types want the exact size of the address structure
1992-06-12 10:39:36 +00:00
{
switch (s->sock_family) {
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
#ifdef AF_UNIX
Some UNIX types want the exact size of the address structure
1992-06-12 10:39:36 +00:00
case AF_UNIX:
{
*len_ret = sizeof (struct sockaddr_un);
return 1;
}
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
#endif /* AF_UNIX */
Some UNIX types want the exact size of the address structure
1992-06-12 10:39:36 +00:00
case AF_INET:
{
*len_ret = sizeof (struct sockaddr_in);
return 1;
}
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
#ifdef INET6
case AF_INET6:
{
*len_ret = sizeof (struct sockaddr_in6);
return 1;
}
#endif
Autotest for netpacket/packet.h, as it is not available on all Linux versions. Depend AF_PACKET on HAVE_NETPACKET_PACKET_H. Fixes #449157
2001-08-10 20:29:40 +00:00
#ifdef HAVE_NETPACKET_PACKET_H
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
case AF_PACKET:
{
*len_ret = sizeof (struct sockaddr_ll);
return 1;
}
#endif
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
Some UNIX types want the exact size of the address structure
1992-06-12 10:39:36 +00:00
/* More cases here... */
default:
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
PyErr_SetString(PySocket_Error, "getsockaddrlen: bad family");
Some UNIX types want the exact size of the address structure
1992-06-12 10:39:36 +00:00
return 0;
}
}
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* s.accept() method */
new style
1994-10-10 17:59:00 +00:00
static PyObject *
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
PySocketSock_accept(PySocketSockObject *s)
Initial revision
1991-06-25 21:36:08 +00:00
{
char addrbuf[256];
Trent Mick <trentm@activestate.com>: This patch fixes possible overflows in the socket module for 64-bit platforms (mainly Win64). The changes are: - abstract the socket type to SOCKET_T (this is SOCKET on Windows, int on Un*x), this is necessary because sizeof(SOCKET) > sizeof(int) on Win64 - use INVALID_SOCKET on Win32/64 for an error return value for accept() - ensure no overflow of the socket variable for: (1) a PyObject return value (use PyLong_FromLongLong if necessary); and (2) printf formatting in repr(). Closes SourceForge patch #100516.
2000-06-30 02:46:07 +00:00
SOCKET_T newfd;
Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the socklen_t (unsigned int) for most size parameters. Apparently this is part of the UNIX 98 standard. [GvR: the changes to configure.in etc. that I just checked in make sure that socklen_t is defined everywhere, so I deleted the little part of Jack's mod to define socklen_t if not in GUSI2. I suppose I will have to add it to the Windows config.h in a minute.]
2000-04-24 15:16:03 +00:00
socklen_t addrlen;
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
PyObject *sock = NULL;
PyObject *addr = NULL;
PyObject *res = NULL;
Some UNIX types want the exact size of the address structure
1992-06-12 10:39:36 +00:00
if (!getsockaddrlen(s, &addrlen))
return NULL;
Three uses of makesockaddr() used sockaddr buffers that had not be cleared; this could cause invalid paths to be returned for AF_UNIX sockets on some platforms (including FreeBSD 4.2-RELEASE), appearantly because there is no assurance that the address will be nul-terminated when filled in by the kernel. PySocketSock_recvfrom(): Use PyString_AS_STRING() to get the data pointer of a string we create ourselves; there is no need for the extra type check from PyString_AsString(). This closes SF bug #416573.
2001-05-09 19:11:33 +00:00
memset(addrbuf, 0, addrlen);
new style
1994-10-10 17:59:00 +00:00
Py_BEGIN_ALLOW_THREADS
Initial revision
1991-06-25 21:36:08 +00:00
newfd = accept(s->sock_fd, (struct sockaddr *) addrbuf, &addrlen);
new style
1994-10-10 17:59:00 +00:00
Py_END_ALLOW_THREADS
Trent Mick <trentm@activestate.com>: This patch fixes possible overflows in the socket module for 64-bit platforms (mainly Win64). The changes are: - abstract the socket type to SOCKET_T (this is SOCKET on Windows, int on Un*x), this is necessary because sizeof(SOCKET) > sizeof(int) on Win64 - use INVALID_SOCKET on Win32/64 for an error return value for accept() - ensure no overflow of the socket variable for: (1) a PyObject return value (use PyLong_FromLongLong if necessary); and (2) printf formatting in repr(). Closes SourceForge patch #100516.
2000-06-30 02:46:07 +00:00
#ifdef MS_WINDOWS
if (newfd == INVALID_SOCKET)
#else
Initial revision
1991-06-25 21:36:08 +00:00
if (newfd < 0)
Trent Mick <trentm@activestate.com>: This patch fixes possible overflows in the socket module for 64-bit platforms (mainly Win64). The changes are: - abstract the socket type to SOCKET_T (this is SOCKET on Windows, int on Un*x), this is necessary because sizeof(SOCKET) > sizeof(int) on Win64 - use INVALID_SOCKET on Win32/64 for an error return value for accept() - ensure no overflow of the socket variable for: (1) a PyObject return value (use PyLong_FromLongLong if necessary); and (2) printf formatting in repr(). Closes SourceForge patch #100516.
2000-06-30 02:46:07 +00:00
#endif
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* Create the new object with unspecified family,
to avoid calls to bind() etc. on it. */
new style
1994-10-10 17:59:00 +00:00
sock = (PyObject *) PySocketSock_New(newfd,
* ceval.c: ifdef out the last argument passing compat hack. * Fixed memory leaks in socket, select and sv modules: mkvalue("O", v) does INCREF(v) so if v is brand new it should be XDECREF'd
1993-02-05 09:46:15 +00:00
s->sock_family,
s->sock_type,
s->sock_proto);
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
if (sock == NULL) {
Use an explicit macro SOCKETCLOSE which expands to closesocket (on Windows), soclose (on OS2), or to close (everywhere else). Hopefully this fixes a new compilation error that I suddenly get on Windows because the macro definition for close -> closesocket apparently was done before including io.h, which contains a prototype for close. (No idea why this wasn't an error before.)
2000-04-21 20:33:00 +00:00
SOCKETCLOSE(newfd);
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
goto finally;
}
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
addr = makesockaddr(s->sock_fd, (struct sockaddr *)addrbuf,
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
addrlen);
if (addr == NULL)
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
goto finally;
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
res = Py_BuildValue("OO", sock, addr);
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
finally:
new style
1994-10-10 17:59:00 +00:00
Py_XDECREF(sock);
Py_XDECREF(addr);
Initial revision
1991-06-25 21:36:08 +00:00
return res;
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char 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).";
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
Setup.in: added tkinter; rearranged the definition of PYTHONPATH so that the module-specific components are in the section for that module. cursesmodule.c: patched it so it actually works. tkintermodule.c: call Py_AtExit instead of atexit(). signalmodule.c: converted to new naming style; added BGN/END SAVE around pause() call. socketmodule.c: added setblocking() after Tommy Burnette.
1994-09-07 14:32:49 +00:00
/* s.setblocking(1 | 0) method */
new style
1994-10-10 17:59:00 +00:00
static PyObject *
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
PySocketSock_setblocking(PySocketSockObject *s, PyObject *arg)
Setup.in: added tkinter; rearranged the definition of PYTHONPATH so that the module-specific components are in the section for that module. cursesmodule.c: patched it so it actually works. tkintermodule.c: call Py_AtExit instead of atexit(). signalmodule.c: converted to new naming style; added BGN/END SAVE around pause() call. socketmodule.c: added setblocking() after Tommy Burnette.
1994-09-07 14:32:49 +00:00
{
int block;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#ifndef RISCOS
Tweaks to keep the Microsoft compiler quier.
1997-04-09 19:24:53 +00:00
#ifndef MS_WINDOWS
Setup.in: added tkinter; rearranged the definition of PYTHONPATH so that the module-specific components are in the section for that module. cursesmodule.c: patched it so it actually works. tkintermodule.c: call Py_AtExit instead of atexit(). signalmodule.c: converted to new naming style; added BGN/END SAVE around pause() call. socketmodule.c: added setblocking() after Tommy Burnette.
1994-09-07 14:32:49 +00:00
int delay_flag;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#endif
Tweaks to keep the Microsoft compiler quier.
1997-04-09 19:24:53 +00:00
#endif
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
block = PyInt_AsLong(arg);
if (block == -1 && PyErr_Occurred())
Setup.in: added tkinter; rearranged the definition of PYTHONPATH so that the module-specific components are in the section for that module. cursesmodule.c: patched it so it actually works. tkintermodule.c: call Py_AtExit instead of atexit(). signalmodule.c: converted to new naming style; added BGN/END SAVE around pause() call. socketmodule.c: added setblocking() after Tommy Burnette.
1994-09-07 14:32:49 +00:00
return NULL;
new style
1994-10-10 17:59:00 +00:00
Py_BEGIN_ALLOW_THREADS
Changes for BeOS, QNX and long long, by Chris Herborth.
1998-08-04 22:53:56 +00:00
#ifdef __BEOS__
block = !block;
setsockopt( s->sock_fd, SOL_SOCKET, SO_NONBLOCK,
(void *)(&block), sizeof( int ) );
#else
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#ifndef RISCOS
Slightly different Windows ifdefs
1996-06-28 20:15:15 +00:00
#ifndef MS_WINDOWS
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
#ifdef PYOS_OS2
block = !block;
ioctl(s->sock_fd, FIONBIO, (caddr_t)&block, sizeof(block));
#else /* !PYOS_OS2 */
Setup.in: added tkinter; rearranged the definition of PYTHONPATH so that the module-specific components are in the section for that module. cursesmodule.c: patched it so it actually works. tkintermodule.c: call Py_AtExit instead of atexit(). signalmodule.c: converted to new naming style; added BGN/END SAVE around pause() call. socketmodule.c: added setblocking() after Tommy Burnette.
1994-09-07 14:32:49 +00:00
delay_flag = fcntl (s->sock_fd, F_GETFL, 0);
if (block)
delay_flag &= (~O_NDELAY);
else
delay_flag |= O_NDELAY;
fcntl (s->sock_fd, F_SETFL, delay_flag);
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
#endif /* !PYOS_OS2 */
#else /* MS_WINDOWS */
add setblocking(); NT changes; null-terminate Unix path
1995-06-14 22:28:08 +00:00
block = !block;
ioctlsocket(s->sock_fd, FIONBIO, (u_long*)&block);
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
#endif /* MS_WINDOWS */
Changes for BeOS, QNX and long long, by Chris Herborth.
1998-08-04 22:53:56 +00:00
#endif /* __BEOS__ */
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#endif /* RISCOS */
new style
1994-10-10 17:59:00 +00:00
Py_END_ALLOW_THREADS
Setup.in: added tkinter; rearranged the definition of PYTHONPATH so that the module-specific components are in the section for that module. cursesmodule.c: patched it so it actually works. tkintermodule.c: call Py_AtExit instead of atexit(). signalmodule.c: converted to new naming style; added BGN/END SAVE around pause() call. socketmodule.c: added setblocking() after Tommy Burnette.
1994-09-07 14:32:49 +00:00
new style
1994-10-10 17:59:00 +00:00
Py_INCREF(Py_None);
return Py_None;
Setup.in: added tkinter; rearranged the definition of PYTHONPATH so that the module-specific components are in the section for that module. cursesmodule.c: patched it so it actually works. tkintermodule.c: call Py_AtExit instead of atexit(). signalmodule.c: converted to new naming style; added BGN/END SAVE around pause() call. socketmodule.c: added setblocking() after Tommy Burnette.
1994-09-07 14:32:49 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char setblocking_doc[] =
"setblocking(flag)\n\
\n\
Set the socket to blocking (flag is true) or non-blocking (false).\n\
This uses the FIONBIO ioctl with the O_NDELAY flag.";
Setup.in: added tkinter; rearranged the definition of PYTHONPATH so that the module-specific components are in the section for that module. cursesmodule.c: patched it so it actually works. tkintermodule.c: call Py_AtExit instead of atexit(). signalmodule.c: converted to new naming style; added BGN/END SAVE around pause() call. socketmodule.c: added setblocking() after Tommy Burnette.
1994-09-07 14:32:49 +00:00
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#ifdef RISCOS
/* s.sleeptaskw(1 | 0) method */
static PyObject *
PySocketSock_sleeptaskw(PySocketSockObject *s,PyObject *args)
{
int block;
int delay_flag;
if (!PyArg_GetInt(args, &block))
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;
}
static char sleeptaskw_doc[] =
"sleeptaskw(flag)\n\
\n\
Allow sleeps in taskwindows.";
#endif
Made struct a standard built-in module; added string args to {set,get}sockopt; added gl.gversion().
1992-09-08 09:05:33 +00:00
/* 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. */
Added {get,set}sockopt(). allowbroadcast is now obsolete.
1992-06-05 15:11:30 +00:00
new style
1994-10-10 17:59:00 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocketSock_setsockopt(PySocketSockObject *s, PyObject *args)
Added {get,set}sockopt(). allowbroadcast is now obsolete.
1992-06-05 15:11:30 +00:00
{
int level;
int optname;
int res;
Made struct a standard built-in module; added string args to {set,get}sockopt; added gl.gversion().
1992-09-08 09:05:33 +00:00
char *buf;
int buflen;
int flag;
Added {get,set}sockopt(). allowbroadcast is now obsolete.
1992-06-05 15:11:30 +00:00
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (PyArg_ParseTuple(args, "iii:setsockopt",
&level, &optname, &flag)) {
Made struct a standard built-in module; added string args to {set,get}sockopt; added gl.gversion().
1992-09-08 09:05:33 +00:00
buf = (char *) &flag;
buflen = sizeof flag;
}
else {
new style
1994-10-10 17:59:00 +00:00
PyErr_Clear();
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "iis#:setsockopt",
&level, &optname, &buf, &buflen))
Made struct a standard built-in module; added string args to {set,get}sockopt; added gl.gversion().
1992-09-08 09:05:33 +00:00
return NULL;
}
Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Leave the actual #define in for API compatibility.
2000-07-25 12:56:38 +00:00
res = setsockopt(s->sock_fd, level, optname, (void *)buf, buflen);
Added {get,set}sockopt(). allowbroadcast is now obsolete.
1992-06-05 15:11:30 +00:00
if (res < 0)
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
Py_INCREF(Py_None);
return Py_None;
Added {get,set}sockopt(). allowbroadcast is now obsolete.
1992-06-05 15:11:30 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char 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.";
Added {get,set}sockopt(). allowbroadcast is now obsolete.
1992-06-05 15:11:30 +00:00
Made struct a standard built-in module; added string args to {set,get}sockopt; added gl.gversion().
1992-09-08 09:05:33 +00:00
/* 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. */
Added {get,set}sockopt(). allowbroadcast is now obsolete.
1992-06-05 15:11:30 +00:00
new style
1994-10-10 17:59:00 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocketSock_getsockopt(PySocketSockObject *s, PyObject *args)
Added {get,set}sockopt(). allowbroadcast is now obsolete.
1992-06-05 15:11:30 +00:00
{
int level;
int optname;
int res;
new style
1994-10-10 17:59:00 +00:00
PyObject *buf;
Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the socklen_t (unsigned int) for most size parameters. Apparently this is part of the UNIX 98 standard. [GvR: the changes to configure.in etc. that I just checked in make sure that socklen_t is defined everywhere, so I deleted the little part of Jack's mod to define socklen_t if not in GUSI2. I suppose I will have to add it to the Windows config.h in a minute.]
2000-04-24 15:16:03 +00:00
socklen_t buflen = 0;
Added {get,set}sockopt(). allowbroadcast is now obsolete.
1992-06-05 15:11:30 +00:00
Changes for BeOS, QNX and long long, by Chris Herborth.
1998-08-04 22:53:56 +00:00
#ifdef __BEOS__
Fix a minor style consistency issue. When getting a string buffer for a string we just created, use PyString_AS_STRING() instead of PyString_AsString() to avoid the call overhead and extra type check.
2001-05-11 20:12:26 +00:00
/* We have incomplete socket support. */
PyErr_SetString(PySocket_Error, "getsockopt not supported");
Changes for BeOS, QNX and long long, by Chris Herborth.
1998-08-04 22:53:56 +00:00
return NULL;
#else
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "ii|i:getsockopt",
&level, &optname, &buflen))
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
return NULL;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
if (buflen == 0) {
Made struct a standard built-in module; added string args to {set,get}sockopt; added gl.gversion().
1992-09-08 09:05:33 +00:00
int flag = 0;
Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the socklen_t (unsigned int) for most size parameters. Apparently this is part of the UNIX 98 standard. [GvR: the changes to configure.in etc. that I just checked in make sure that socklen_t is defined everywhere, so I deleted the little part of Jack's mod to define socklen_t if not in GUSI2. I suppose I will have to add it to the Windows config.h in a minute.]
2000-04-24 15:16:03 +00:00
socklen_t flagsize = sizeof flag;
* timemodule.c: Add hack for Solaris 2. * posixmodule.c: don't prototype getcwd() -- it's not portable... * mappingobject.c: double-check validity of last_name_char in dict{lookup,insert,remove}. * arraymodule.c: need memmove only for non-STDC Suns. * Makefile: comment out HTML_LIBS and XT_USE by default * pythonmain.c: don't prototype getopt() -- it's not standardized * socketmodule.c: cast flags arg to {get,set}sockopt() and addrbuf arg to recvfrom() to (ANY*). * pythonrun.c (initsigs): fix prototype, make it static * intobject.c (LONG_BIT): only #define it if not already defined * classobject.[ch]: remove all references to unused instance_convert() * mappingobject.c (getmappingsize): Don't return NULL in int function.
1993-11-23 17:53:17 +00:00
res = getsockopt(s->sock_fd, level, optname,
Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Leave the actual #define in for API compatibility.
2000-07-25 12:56:38 +00:00
(void *)&flag, &flagsize);
Made struct a standard built-in module; added string args to {set,get}sockopt; added gl.gversion().
1992-09-08 09:05:33 +00:00
if (res < 0)
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
return PyInt_FromLong(flag);
Made struct a standard built-in module; added string args to {set,get}sockopt; added gl.gversion().
1992-09-08 09:05:33 +00:00
}
if (buflen <= 0 || buflen > 1024) {
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
PyErr_SetString(PySocket_Error,
"getsockopt buflen out of range");
Made struct a standard built-in module; added string args to {set,get}sockopt; added gl.gversion().
1992-09-08 09:05:33 +00:00
return NULL;
}
new style
1994-10-10 17:59:00 +00:00
buf = PyString_FromStringAndSize((char *)NULL, buflen);
Made struct a standard built-in module; added string args to {set,get}sockopt; added gl.gversion().
1992-09-08 09:05:33 +00:00
if (buf == NULL)
return NULL;
* timemodule.c: Add hack for Solaris 2. * posixmodule.c: don't prototype getcwd() -- it's not portable... * mappingobject.c: double-check validity of last_name_char in dict{lookup,insert,remove}. * arraymodule.c: need memmove only for non-STDC Suns. * Makefile: comment out HTML_LIBS and XT_USE by default * pythonmain.c: don't prototype getopt() -- it's not standardized * socketmodule.c: cast flags arg to {get,set}sockopt() and addrbuf arg to recvfrom() to (ANY*). * pythonrun.c (initsigs): fix prototype, make it static * intobject.c (LONG_BIT): only #define it if not already defined * classobject.[ch]: remove all references to unused instance_convert() * mappingobject.c (getmappingsize): Don't return NULL in int function.
1993-11-23 17:53:17 +00:00
res = getsockopt(s->sock_fd, level, optname,
Fix a minor style consistency issue. When getting a string buffer for a string we just created, use PyString_AS_STRING() instead of PyString_AsString() to avoid the call overhead and extra type check.
2001-05-11 20:12:26 +00:00
(void *)PyString_AS_STRING(buf), &buflen);
Made struct a standard built-in module; added string args to {set,get}sockopt; added gl.gversion().
1992-09-08 09:05:33 +00:00
if (res < 0) {
new style
1994-10-10 17:59:00 +00:00
Py_DECREF(buf);
return PySocket_Err();
Made struct a standard built-in module; added string args to {set,get}sockopt; added gl.gversion().
1992-09-08 09:05:33 +00:00
}
new style
1994-10-10 17:59:00 +00:00
_PyString_Resize(&buf, buflen);
Made struct a standard built-in module; added string args to {set,get}sockopt; added gl.gversion().
1992-09-08 09:05:33 +00:00
return buf;
Changes for BeOS, QNX and long long, by Chris Herborth.
1998-08-04 22:53:56 +00:00
#endif /* __BEOS__ */
Added {get,set}sockopt(). allowbroadcast is now obsolete.
1992-06-05 15:11:30 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char 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.";
Added {get,set}sockopt(). allowbroadcast is now obsolete.
1992-06-05 15:11:30 +00:00
Restore strict checking of socket address values; addresses passed to the bind(), connect(), and connect_ex() methods must be a single parameter. Originally part of 1.98, reverted in 1.100.
2000-07-01 03:40:12 +00:00
/* s.bind(sockaddr) method */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
new style
1994-10-10 17:59:00 +00:00
static PyObject *
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
PySocketSock_bind(PySocketSockObject *s, PyObject *addro)
Initial revision
1991-06-25 21:36:08 +00:00
{
struct sockaddr *addr;
int addrlen;
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
int res;
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
Restore strict checking of socket address values; addresses passed to the bind(), connect(), and connect_ex() methods must be a single parameter. Originally part of 1.98, reverted in 1.100.
2000-07-01 03:40:12 +00:00
if (!getsockaddrarg(s, addro, &addr, &addrlen))
Initial revision
1991-06-25 21:36:08 +00:00
return NULL;
new style
1994-10-10 17:59:00 +00:00
Py_BEGIN_ALLOW_THREADS
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
res = bind(s->sock_fd, addr, addrlen);
new style
1994-10-10 17:59:00 +00:00
Py_END_ALLOW_THREADS
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
if (res < 0)
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
Py_INCREF(Py_None);
return Py_None;
Initial revision
1991-06-25 21:36:08 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char bind_doc[] =
"bind(address)\n\
\n\
Bind the socket to a local address. For IP sockets, the address is a\n\
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
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]])";
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* s.close() method.
Set the file descriptor to -1 so operations tried subsequently
will surely fail. */
new style
1994-10-10 17:59:00 +00:00
static PyObject *
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
PySocketSock_close(PySocketSockObject *s)
Initial revision
1991-06-25 21:36:08 +00:00
{
Adapted from a patch by Barry Scott, SF patch #102875 and SF bug #125981: closing sockets was not thread-safe.
2000-12-18 22:23:44 +00:00
SOCKET_T fd;
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
Adapted from a patch by Barry Scott, SF patch #102875 and SF bug #125981: closing sockets was not thread-safe.
2000-12-18 22:23:44 +00:00
if ((fd = s->sock_fd) != -1) {
s->sock_fd = -1;
Don't close an already closed socket.
1996-10-12 14:07:22 +00:00
Py_BEGIN_ALLOW_THREADS
Adapted from a patch by Barry Scott, SF patch #102875 and SF bug #125981: closing sockets was not thread-safe.
2000-12-18 22:23:44 +00:00
(void) SOCKETCLOSE(fd);
Don't close an already closed socket.
1996-10-12 14:07:22 +00:00
Py_END_ALLOW_THREADS
}
new style
1994-10-10 17:59:00 +00:00
Py_INCREF(Py_None);
return Py_None;
Initial revision
1991-06-25 21:36:08 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char close_doc[] =
"close()\n\
\n\
Close the socket. It cannot be used after this call.";
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
Restore strict checking of socket address values; addresses passed to the bind(), connect(), and connect_ex() methods must be a single parameter. Originally part of 1.98, reverted in 1.100.
2000-07-01 03:40:12 +00:00
/* s.connect(sockaddr) method */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
new style
1994-10-10 17:59:00 +00:00
static PyObject *
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
PySocketSock_connect(PySocketSockObject *s, PyObject *addro)
Initial revision
1991-06-25 21:36:08 +00:00
{
struct sockaddr *addr;
int addrlen;
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
int res;
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
Restore strict checking of socket address values; addresses passed to the bind(), connect(), and connect_ex() methods must be a single parameter. Originally part of 1.98, reverted in 1.100.
2000-07-01 03:40:12 +00:00
if (!getsockaddrarg(s, addro, &addr, &addrlen))
Initial revision
1991-06-25 21:36:08 +00:00
return NULL;
new style
1994-10-10 17:59:00 +00:00
Py_BEGIN_ALLOW_THREADS
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
res = connect(s->sock_fd, addr, addrlen);
new style
1994-10-10 17:59:00 +00:00
Py_END_ALLOW_THREADS
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
if (res < 0)
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
Py_INCREF(Py_None);
return Py_None;
Initial revision
1991-06-25 21:36:08 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char connect_doc[] =
"connect(address)\n\
\n\
Connect the socket to a remote address. For IP sockets, the address\n\
is a pair (host, port).";
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
Restore strict checking of socket address values; addresses passed to the bind(), connect(), and connect_ex() methods must be a single parameter. Originally part of 1.98, reverted in 1.100.
2000-07-01 03:40:12 +00:00
/* s.connect_ex(sockaddr) method */
Add s.connect_ex() which returns errno instead of raising an exception.
1997-11-19 18:57:13 +00:00
static PyObject *
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
PySocketSock_connect_ex(PySocketSockObject *s, PyObject *addro)
Add s.connect_ex() which returns errno instead of raising an exception.
1997-11-19 18:57:13 +00:00
{
struct sockaddr *addr;
int addrlen;
int res;
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
Restore strict checking of socket address values; addresses passed to the bind(), connect(), and connect_ex() methods must be a single parameter. Originally part of 1.98, reverted in 1.100.
2000-07-01 03:40:12 +00:00
if (!getsockaddrarg(s, addro, &addr, &addrlen))
Add s.connect_ex() which returns errno instead of raising an exception.
1997-11-19 18:57:13 +00:00
return NULL;
Py_BEGIN_ALLOW_THREADS
res = connect(s->sock_fd, addr, addrlen);
Py_END_ALLOW_THREADS
PySocketSock_connect_ex(): On Windows, return the correct Windows exit code. The patch is from Jeremy, and allows test_asynchat to run again. Bugfix candidate.
2001-10-30 01:26:49 +00:00
if (res != 0) {
#ifdef MS_WINDOWS
res = WSAGetLastError();
#else
Add s.connect_ex() which returns errno instead of raising an exception.
1997-11-19 18:57:13 +00:00
res = errno;
PySocketSock_connect_ex(): On Windows, return the correct Windows exit code. The patch is from Jeremy, and allows test_asynchat to run again. Bugfix candidate.
2001-10-30 01:26:49 +00:00
#endif
}
Add s.connect_ex() which returns errno instead of raising an exception.
1997-11-19 18:57:13 +00:00
return PyInt_FromLong((long) res);
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char connect_ex_doc[] =
"connect_ex(address)\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.";
Add s.connect_ex() which returns errno instead of raising an exception.
1997-11-19 18:57:13 +00:00
Changes for new UNIX-specific built-in module 'select' and new header for interfaces to variants of select() system call, "myselect.h". This includes adding fileno() methods to files, sockets and stdwin.
1992-06-23 09:07:03 +00:00
/* s.fileno() method */
new style
1994-10-10 17:59:00 +00:00
static PyObject *
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
PySocketSock_fileno(PySocketSockObject *s)
Changes for new UNIX-specific built-in module 'select' and new header for interfaces to variants of select() system call, "myselect.h". This includes adding fileno() methods to files, sockets and stdwin.
1992-06-23 09:07:03 +00:00
{
Trent Mick <trentm@activestate.com>: This patch fixes possible overflows in the socket module for 64-bit platforms (mainly Win64). The changes are: - abstract the socket type to SOCKET_T (this is SOCKET on Windows, int on Un*x), this is necessary because sizeof(SOCKET) > sizeof(int) on Win64 - use INVALID_SOCKET on Win32/64 for an error return value for accept() - ensure no overflow of the socket variable for: (1) a PyObject return value (use PyLong_FromLongLong if necessary); and (2) printf formatting in repr(). Closes SourceForge patch #100516.
2000-06-30 02:46:07 +00:00
#if SIZEOF_SOCKET_T <= SIZEOF_LONG
new style
1994-10-10 17:59:00 +00:00
return PyInt_FromLong((long) s->sock_fd);
Trent Mick <trentm@activestate.com>: This patch fixes possible overflows in the socket module for 64-bit platforms (mainly Win64). The changes are: - abstract the socket type to SOCKET_T (this is SOCKET on Windows, int on Un*x), this is necessary because sizeof(SOCKET) > sizeof(int) on Win64 - use INVALID_SOCKET on Win32/64 for an error return value for accept() - ensure no overflow of the socket variable for: (1) a PyObject return value (use PyLong_FromLongLong if necessary); and (2) printf formatting in repr(). Closes SourceForge patch #100516.
2000-06-30 02:46:07 +00:00
#else
return PyLong_FromLongLong((LONG_LONG)s->sock_fd);
#endif
Changes for new UNIX-specific built-in module 'select' and new header for interfaces to variants of select() system call, "myselect.h". This includes adding fileno() methods to files, sockets and stdwin.
1992-06-23 09:07:03 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char fileno_doc[] =
"fileno() -> integer\n\
\n\
Return the integer file descriptor of the socket.";
Changes for new UNIX-specific built-in module 'select' and new header for interfaces to variants of select() system call, "myselect.h". This includes adding fileno() methods to files, sockets and stdwin.
1992-06-23 09:07:03 +00:00
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
#ifndef NO_DUP
/* s.dup() method */
static PyObject *
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
PySocketSock_dup(PySocketSockObject *s)
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
{
Trent Mick <trentm@activestate.com>: This patch fixes possible overflows in the socket module for 64-bit platforms (mainly Win64). The changes are: - abstract the socket type to SOCKET_T (this is SOCKET on Windows, int on Un*x), this is necessary because sizeof(SOCKET) > sizeof(int) on Win64 - use INVALID_SOCKET on Win32/64 for an error return value for accept() - ensure no overflow of the socket variable for: (1) a PyObject return value (use PyLong_FromLongLong if necessary); and (2) printf formatting in repr(). Closes SourceForge patch #100516.
2000-06-30 02:46:07 +00:00
SOCKET_T newfd;
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
PyObject *sock;
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
newfd = dup(s->sock_fd);
if (newfd < 0)
return PySocket_Err();
sock = (PyObject *) PySocketSock_New(newfd,
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
s->sock_family,
s->sock_type,
s->sock_proto);
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
if (sock == NULL)
Use an explicit macro SOCKETCLOSE which expands to closesocket (on Windows), soclose (on OS2), or to close (everywhere else). Hopefully this fixes a new compilation error that I suddenly get on Windows because the macro definition for close -> closesocket apparently was done before including io.h, which contains a prototype for close. (No idea why this wasn't an error before.)
2000-04-21 20:33:00 +00:00
SOCKETCLOSE(newfd);
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
return sock;
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char dup_doc[] =
"dup() -> socket object\n\
\n\
Return a new socket object connected to the same system resource.";
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
#endif
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
/* s.getsockname() method */
new style
1994-10-10 17:59:00 +00:00
static PyObject *
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
PySocketSock_getsockname(PySocketSockObject *s)
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
{
char addrbuf[256];
Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the socklen_t (unsigned int) for most size parameters. Apparently this is part of the UNIX 98 standard. [GvR: the changes to configure.in etc. that I just checked in make sure that socklen_t is defined everywhere, so I deleted the little part of Jack's mod to define socklen_t if not in GUSI2. I suppose I will have to add it to the Windows config.h in a minute.]
2000-04-24 15:16:03 +00:00
int res;
socklen_t addrlen;
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
if (!getsockaddrlen(s, &addrlen))
return NULL;
clear addr buffer before calling getsockname
1996-01-12 01:36:05 +00:00
memset(addrbuf, 0, addrlen);
new style
1994-10-10 17:59:00 +00:00
Py_BEGIN_ALLOW_THREADS
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
res = getsockname(s->sock_fd, (struct sockaddr *) addrbuf, &addrlen);
new style
1994-10-10 17:59:00 +00:00
Py_END_ALLOW_THREADS
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
if (res < 0)
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
return makesockaddr(s->sock_fd, (struct sockaddr *) addrbuf, addrlen);
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char 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).";
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
#ifdef HAVE_GETPEERNAME /* Cray APP doesn't have this :-( */
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
/* s.getpeername() method */
new style
1994-10-10 17:59:00 +00:00
static PyObject *
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
PySocketSock_getpeername(PySocketSockObject *s)
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
{
char addrbuf[256];
Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the socklen_t (unsigned int) for most size parameters. Apparently this is part of the UNIX 98 standard. [GvR: the changes to configure.in etc. that I just checked in make sure that socklen_t is defined everywhere, so I deleted the little part of Jack's mod to define socklen_t if not in GUSI2. I suppose I will have to add it to the Windows config.h in a minute.]
2000-04-24 15:16:03 +00:00
int res;
socklen_t addrlen;
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
if (!getsockaddrlen(s, &addrlen))
return NULL;
Three uses of makesockaddr() used sockaddr buffers that had not be cleared; this could cause invalid paths to be returned for AF_UNIX sockets on some platforms (including FreeBSD 4.2-RELEASE), appearantly because there is no assurance that the address will be nul-terminated when filled in by the kernel. PySocketSock_recvfrom(): Use PyString_AS_STRING() to get the data pointer of a string we create ourselves; there is no need for the extra type check from PyString_AsString(). This closes SF bug #416573.
2001-05-09 19:11:33 +00:00
memset(addrbuf, 0, addrlen);
new style
1994-10-10 17:59:00 +00:00
Py_BEGIN_ALLOW_THREADS
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
res = getpeername(s->sock_fd, (struct sockaddr *) addrbuf, &addrlen);
new style
1994-10-10 17:59:00 +00:00
Py_END_ALLOW_THREADS
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
if (res < 0)
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
return makesockaddr(s->sock_fd, (struct sockaddr *) addrbuf, addrlen);
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char 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).";
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
#endif /* HAVE_GETPEERNAME */
* config.c: Added audioop to lists. * Makefile: change default source directory * socketmodule.c: added getsockname and getpeername * bltinmodule.c: corrected typo in type() error message * Added new built-in functions str() and repr(): repr(x) == `x`; str(x) == x if x is a string, otherwise str(x) == repr(x). * Added joinfields to stropmodule.c (string.join calls joinfields now)
1992-11-26 08:54:07 +00:00
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* s.listen(n) method */
new style
1994-10-10 17:59:00 +00:00
static PyObject *
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
PySocketSock_listen(PySocketSockObject *s, PyObject *arg)
Initial revision
1991-06-25 21:36:08 +00:00
{
int backlog;
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
int res;
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
backlog = PyInt_AsLong(arg);
if (backlog == -1 && PyErr_Occurred())
Initial revision
1991-06-25 21:36:08 +00:00
return NULL;
new style
1994-10-10 17:59:00 +00:00
Py_BEGIN_ALLOW_THREADS
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
if (backlog < 1)
backlog = 1;
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
res = listen(s->sock_fd, backlog);
new style
1994-10-10 17:59:00 +00:00
Py_END_ALLOW_THREADS
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
if (res < 0)
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
Py_INCREF(Py_None);
return Py_None;
Initial revision
1991-06-25 21:36:08 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char 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.";
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
#ifndef NO_DUP
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* 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(). */
new style
1994-10-10 17:59:00 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocketSock_makefile(PySocketSockObject *s, PyObject *args)
Initial revision
1991-06-25 21:36:08 +00:00
{
Nuke all remaining occurrences of Py_PROTO and Py_FPROTO.
2000-07-09 03:09:57 +00:00
extern int fclose(FILE *);
mode and optional bufsize for makefile()
1995-03-14 15:05:13 +00:00
char *mode = "r";
int bufsize = -1;
Trent Mick <trentm@activestate.com>: This patch fixes possible overflows in the socket module for 64-bit platforms (mainly Win64). The changes are: - abstract the socket type to SOCKET_T (this is SOCKET on Windows, int on Un*x), this is necessary because sizeof(SOCKET) > sizeof(int) on Win64 - use INVALID_SOCKET on Win32/64 for an error return value for accept() - ensure no overflow of the socket variable for: (1) a PyObject return value (use PyLong_FromLongLong if necessary); and (2) printf formatting in repr(). Closes SourceForge patch #100516.
2000-06-30 02:46:07 +00:00
#ifdef MS_WIN32
SF bug [#456252] Python should never stomp on [u]intptr_t. pyport.h: typedef a new Py_intptr_t type. DELICATE ASSUMPTION: That HAVE_UINTPTR_T implies intptr_t is available as well as uintptr_t. If that turns out not to be true, things must get uglier (C99 wants both, so I think it's an assumption we're *likely* to get away with). thread_nt.h, PyThread_start_new_thread: MS _beginthread is documented as returning unsigned long; no idea why uintptr_t was being used. Others: Always use Py_[u]intptr_t, never [u]intptr_t directly.
2001-08-29 21:37:10 +00:00
Py_intptr_t fd;
Trent Mick <trentm@activestate.com>: This patch fixes possible overflows in the socket module for 64-bit platforms (mainly Win64). The changes are: - abstract the socket type to SOCKET_T (this is SOCKET on Windows, int on Un*x), this is necessary because sizeof(SOCKET) > sizeof(int) on Win64 - use INVALID_SOCKET on Win32/64 for an error return value for accept() - ensure no overflow of the socket variable for: (1) a PyObject return value (use PyLong_FromLongLong if necessary); and (2) printf formatting in repr(). Closes SourceForge patch #100516.
2000-06-30 02:46:07 +00:00
#else
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
int fd;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#endif
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
FILE *fp;
mode and optional bufsize for makefile()
1995-03-14 15:05:13 +00:00
PyObject *f;
Massive patch by Skip Montanaro to add ":name" to as many PyArg_ParseTuple() format string arguments as possible.
2000-02-29 13:59:29 +00:00
if (!PyArg_ParseTuple(args, "|si:makefile", &mode, &bufsize))
Initial revision
1991-06-25 21:36:08 +00:00
return NULL;
changed windows test symbols; removed debug printf from sockets
1996-06-26 18:22:49 +00:00
#ifdef MS_WIN32
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
if (((fd = _open_osfhandle(s->sock_fd, _O_BINARY)) < 0) ||
((fd = dup(fd)) < 0) || ((fp = fdopen(fd, mode)) == NULL))
add setblocking(); NT changes; null-terminate Unix path
1995-06-14 22:28:08 +00:00
#else
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
if ((fd = dup(s->sock_fd)) < 0 || (fp = fdopen(fd, mode)) == NULL)
add setblocking(); NT changes; null-terminate Unix path
1995-06-14 22:28:08 +00:00
#endif
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
{
mode and optional bufsize for makefile()
1995-03-14 15:05:13 +00:00
if (fd >= 0)
Use an explicit macro SOCKETCLOSE which expands to closesocket (on Windows), soclose (on OS2), or to close (everywhere else). Hopefully this fixes a new compilation error that I suddenly get on Windows because the macro definition for close -> closesocket apparently was done before including io.h, which contains a prototype for close. (No idea why this wasn't an error before.)
2000-04-21 20:33:00 +00:00
SOCKETCLOSE(fd);
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
mode and optional bufsize for makefile()
1995-03-14 15:05:13 +00:00
}
f = PyFile_FromFile(fp, "<socket>", mode, fclose);
if (f != NULL)
PyFile_SetBufSize(f, bufsize);
return f;
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char 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.";
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
#endif /* NO_DUP */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
* classobject.c: in instance_getattr, don't make a method out of a function found as instance data. * socketmodule.c: added 'flags' argument sendto/recvfrom, rewrite argument parsing in send/recv. * More changes related to access (terminology change: owner instead of class; allow any object as owner; local/global variables are owned by their dictionary, only class/instance data is owned by the class; "from...import *" now only imports objects with public access; etc.)
1993-05-25 09:38:27 +00:00
/* s.recv(nbytes [,flags]) method */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
new style
1994-10-10 17:59:00 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocketSock_recv(PySocketSockObject *s, PyObject *args)
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
{
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
int len, n, flags = 0;
new style
1994-10-10 17:59:00 +00:00
PyObject *buf;
Massive patch by Skip Montanaro to add ":name" to as many PyArg_ParseTuple() format string arguments as possible.
2000-02-29 13:59:29 +00:00
if (!PyArg_ParseTuple(args, "i|i:recv", &len, &flags))
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
return NULL;
Test for negative buffer sizes. Fixes #482871.
2001-11-19 10:41:26 +00:00
if (len < 0) {
PyErr_SetString(PyExc_ValueError,
"negative buffersize in connect");
return NULL;
}
new style
1994-10-10 17:59:00 +00:00
buf = PyString_FromStringAndSize((char *) 0, len);
Initial revision
1991-06-25 21:36:08 +00:00
if (buf == NULL)
return NULL;
new style
1994-10-10 17:59:00 +00:00
Py_BEGIN_ALLOW_THREADS
It will always be a string, because it is created just before this call.
2001-08-20 19:06:36 +00:00
n = recv(s->sock_fd, PyString_AS_STRING(buf), len, flags);
new style
1994-10-10 17:59:00 +00:00
Py_END_ALLOW_THREADS
plug some leaks
1995-09-13 18:39:47 +00:00
if (n < 0) {
Py_DECREF(buf);
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
plug some leaks
1995-09-13 18:39:47 +00:00
}
Get rid of obsolete allowbroadcast(). Avoid core dumps in resizestring().
1996-06-11 18:35:24 +00:00
if (n != len && _PyString_Resize(&buf, n) < 0)
Initial revision
1991-06-25 21:36:08 +00:00
return NULL;
return buf;
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char 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.";
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
* classobject.c: in instance_getattr, don't make a method out of a function found as instance data. * socketmodule.c: added 'flags' argument sendto/recvfrom, rewrite argument parsing in send/recv. * More changes related to access (terminology change: owner instead of class; allow any object as owner; local/global variables are owned by their dictionary, only class/instance data is owned by the class; "from...import *" now only imports objects with public access; etc.)
1993-05-25 09:38:27 +00:00
/* s.recvfrom(nbytes [,flags]) method */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
new style
1994-10-10 17:59:00 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocketSock_recvfrom(PySocketSockObject *s, PyObject *args)
Initial revision
1991-06-25 21:36:08 +00:00
{
char addrbuf[256];
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
PyObject *buf = NULL;
PyObject *addr = NULL;
PyObject *ret = NULL;
Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the socklen_t (unsigned int) for most size parameters. Apparently this is part of the UNIX 98 standard. [GvR: the changes to configure.in etc. that I just checked in make sure that socklen_t is defined everywhere, so I deleted the little part of Jack's mod to define socklen_t if not in GUSI2. I suppose I will have to add it to the Windows config.h in a minute.]
2000-04-24 15:16:03 +00:00
int len, n, flags = 0;
socklen_t addrlen;
Massive patch by Skip Montanaro to add ":name" to as many PyArg_ParseTuple() format string arguments as possible.
2000-02-29 13:59:29 +00:00
if (!PyArg_ParseTuple(args, "i|i:recvfrom", &len, &flags))
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
return NULL;
* socketmodule.c: fix long-standing bug in recvfrom() -- addrlen wasn't initialized.
1993-05-25 12:16:29 +00:00
if (!getsockaddrlen(s, &addrlen))
return NULL;
new style
1994-10-10 17:59:00 +00:00
buf = PyString_FromStringAndSize((char *) 0, len);
* socketmodule.c: fix long-standing bug in recvfrom() -- addrlen wasn't initialized.
1993-05-25 12:16:29 +00:00
if (buf == NULL)
return NULL;
new style
1994-10-10 17:59:00 +00:00
Py_BEGIN_ALLOW_THREADS
Three uses of makesockaddr() used sockaddr buffers that had not be cleared; this could cause invalid paths to be returned for AF_UNIX sockets on some platforms (including FreeBSD 4.2-RELEASE), appearantly because there is no assurance that the address will be nul-terminated when filled in by the kernel. PySocketSock_recvfrom(): Use PyString_AS_STRING() to get the data pointer of a string we create ourselves; there is no need for the extra type check from PyString_AsString(). This closes SF bug #416573.
2001-05-09 19:11:33 +00:00
memset(addrbuf, 0, addrlen);
n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags,
changed windows test symbols; removed debug printf from sockets
1996-06-26 18:22:49 +00:00
#ifndef MS_WINDOWS
Left-aligned preprocessor directives and changed C++ comments to C comments.
1997-12-02 20:37:32 +00:00
#if defined(PYOS_OS2)
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
(struct sockaddr *)addrbuf, &addrlen
Left-aligned preprocessor directives and changed C++ comments to C comments.
1997-12-02 20:37:32 +00:00
#else
Use 'void' directly instead of the ANY #define, now that all code is ANSI C. Leave the actual #define in for API compatibility.
2000-07-25 12:56:38 +00:00
(void *)addrbuf, &addrlen
Left-aligned preprocessor directives and changed C++ comments to C comments.
1997-12-02 20:37:32 +00:00
#endif
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
#else
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
(struct sockaddr *)addrbuf, &addrlen
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
#endif
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
);
new style
1994-10-10 17:59:00 +00:00
Py_END_ALLOW_THREADS
plug some leaks
1995-09-13 18:39:47 +00:00
if (n < 0) {
Py_DECREF(buf);
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
plug some leaks
1995-09-13 18:39:47 +00:00
}
Get rid of obsolete allowbroadcast(). Avoid core dumps in resizestring().
1996-06-11 18:35:24 +00:00
if (n != len && _PyString_Resize(&buf, n) < 0)
Initial revision
1991-06-25 21:36:08 +00:00
return NULL;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
fix a couple last-minute bugs in the raw socket support
2001-02-02 19:55:17 +00:00
if (!(addr = makesockaddr(s->sock_fd, (struct sockaddr *)addrbuf, addrlen)))
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
goto finally;
new style
1994-10-10 17:59:00 +00:00
ret = Py_BuildValue("OO", buf, addr);
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
finally:
new style
1994-10-10 17:59:00 +00:00
Py_XDECREF(addr);
Py_XDECREF(buf);
* ceval.c: ifdef out the last argument passing compat hack. * Fixed memory leaks in socket, select and sv modules: mkvalue("O", v) does INCREF(v) so if v is brand new it should be XDECREF'd
1993-02-05 09:46:15 +00:00
return ret;
Initial revision
1991-06-25 21:36:08 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char recvfrom_doc[] =
"recvfrom(buffersize[, flags]) -> (data, address info)\n\
\n\
Like recv(buffersize, flags) but also return the sender's address info.";
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
* classobject.c: in instance_getattr, don't make a method out of a function found as instance data. * socketmodule.c: added 'flags' argument sendto/recvfrom, rewrite argument parsing in send/recv. * More changes related to access (terminology change: owner instead of class; allow any object as owner; local/global variables are owned by their dictionary, only class/instance data is owned by the class; "from...import *" now only imports objects with public access; etc.)
1993-05-25 09:38:27 +00:00
/* s.send(data [,flags]) method */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
new style
1994-10-10 17:59:00 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocketSock_send(PySocketSockObject *s, PyObject *args)
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
{
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
char *buf;
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
int len, n, flags = 0;
Massive patch by Skip Montanaro to add ":name" to as many PyArg_ParseTuple() format string arguments as possible.
2000-02-29 13:59:29 +00:00
if (!PyArg_ParseTuple(args, "s#|i:send", &buf, &len, &flags))
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
return NULL;
new style
1994-10-10 17:59:00 +00:00
Py_BEGIN_ALLOW_THREADS
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
n = send(s->sock_fd, buf, len, flags);
new style
1994-10-10 17:59:00 +00:00
Py_END_ALLOW_THREADS
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
if (n < 0)
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
return PyInt_FromLong((long)n);
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char send_doc[] =
Add sendall() method, which loops until all data is written or an error occurs, and doesn't return a count. (This is my second patch from SF patch #474307, with small change to the docstring for send().) 2.1.2 "bugfix" candidate.
2001-10-26 03:25:00 +00:00
"send(data[, flags]) -> count\n\
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
\n\
Send a data string to the socket. For the optional flags\n\
Add sendall() method, which loops until all data is written or an error occurs, and doesn't return a count. (This is my second patch from SF patch #474307, with small change to the docstring for send().) 2.1.2 "bugfix" candidate.
2001-10-26 03:25:00 +00:00
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 *
PySocketSock_sendall(PySocketSockObject *s, PyObject *args)
{
char *buf;
int len, n, flags = 0, total = 0;
if (!PyArg_ParseTuple(args, "s#|i:sendall", &buf, &len, &flags))
return NULL;
Py_BEGIN_ALLOW_THREADS
do {
n = send(s->sock_fd, buf, len, flags);
if (n < 0)
break;
total += n;
buf += n;
len -= n;
} while (len > 0);
Py_END_ALLOW_THREADS
if (n < 0)
return PySocket_Err();
Py_INCREF(Py_None);
return Py_None;
}
static char 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.";
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
* classobject.c: in instance_getattr, don't make a method out of a function found as instance data. * socketmodule.c: added 'flags' argument sendto/recvfrom, rewrite argument parsing in send/recv. * More changes related to access (terminology change: owner instead of class; allow any object as owner; local/global variables are owned by their dictionary, only class/instance data is owned by the class; "from...import *" now only imports objects with public access; etc.)
1993-05-25 09:38:27 +00:00
/* s.sendto(data, [flags,] sockaddr) method */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
new style
1994-10-10 17:59:00 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocketSock_sendto(PySocketSockObject *s, PyObject *args)
Initial revision
1991-06-25 21:36:08 +00:00
{
new style
1994-10-10 17:59:00 +00:00
PyObject *addro;
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
char *buf;
Initial revision
1991-06-25 21:36:08 +00:00
struct sockaddr *addr;
* classobject.c: in instance_getattr, don't make a method out of a function found as instance data. * socketmodule.c: added 'flags' argument sendto/recvfrom, rewrite argument parsing in send/recv. * More changes related to access (terminology change: owner instead of class; allow any object as owner; local/global variables are owned by their dictionary, only class/instance data is owned by the class; "from...import *" now only imports objects with public access; etc.)
1993-05-25 09:38:27 +00:00
int addrlen, len, n, flags;
flags = 0;
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "s#O:sendto", &buf, &len, &addro)) {
new style
1994-10-10 17:59:00 +00:00
PyErr_Clear();
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "s#iO:sendto",
&buf, &len, &flags, &addro))
* classobject.c: in instance_getattr, don't make a method out of a function found as instance data. * socketmodule.c: added 'flags' argument sendto/recvfrom, rewrite argument parsing in send/recv. * More changes related to access (terminology change: owner instead of class; allow any object as owner; local/global variables are owned by their dictionary, only class/instance data is owned by the class; "from...import *" now only imports objects with public access; etc.)
1993-05-25 09:38:27 +00:00
return NULL;
Initial revision
1991-06-25 21:36:08 +00:00
}
* classobject.c: in instance_getattr, don't make a method out of a function found as instance data. * socketmodule.c: added 'flags' argument sendto/recvfrom, rewrite argument parsing in send/recv. * More changes related to access (terminology change: owner instead of class; allow any object as owner; local/global variables are owned by their dictionary, only class/instance data is owned by the class; "from...import *" now only imports objects with public access; etc.)
1993-05-25 09:38:27 +00:00
if (!getsockaddrarg(s, addro, &addr, &addrlen))
Initial revision
1991-06-25 21:36:08 +00:00
return NULL;
new style
1994-10-10 17:59:00 +00:00
Py_BEGIN_ALLOW_THREADS
* classobject.c: in instance_getattr, don't make a method out of a function found as instance data. * socketmodule.c: added 'flags' argument sendto/recvfrom, rewrite argument parsing in send/recv. * More changes related to access (terminology change: owner instead of class; allow any object as owner; local/global variables are owned by their dictionary, only class/instance data is owned by the class; "from...import *" now only imports objects with public access; etc.)
1993-05-25 09:38:27 +00:00
n = sendto(s->sock_fd, buf, len, flags, addr, addrlen);
new style
1994-10-10 17:59:00 +00:00
Py_END_ALLOW_THREADS
Initial revision
1991-06-25 21:36:08 +00:00
if (n < 0)
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
return PyInt_FromLong((long)n);
Initial revision
1991-06-25 21:36:08 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char sendto_doc[] =
"sendto(data[, flags], address)\n\
\n\
Like send(data, flags) but allows specifying the destination address.\n\
For IP sockets, the address is a pair (hostaddr, port).";
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* s.shutdown(how) method */
new style
1994-10-10 17:59:00 +00:00
static PyObject *
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
PySocketSock_shutdown(PySocketSockObject *s, PyObject *arg)
Initial revision
1991-06-25 21:36:08 +00:00
{
int how;
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
int res;
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
how = PyInt_AsLong(arg);
if (how == -1 && PyErr_Occurred())
Initial revision
1991-06-25 21:36:08 +00:00
return NULL;
new style
1994-10-10 17:59:00 +00:00
Py_BEGIN_ALLOW_THREADS
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
res = shutdown(s->sock_fd, how);
new style
1994-10-10 17:59:00 +00:00
Py_END_ALLOW_THREADS
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
if (res < 0)
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
Py_INCREF(Py_None);
return Py_None;
Initial revision
1991-06-25 21:36:08 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char shutdown_doc[] =
"shutdown(flag)\n\
\n\
Shut down the reading side of the socket (flag == 0), the writing side\n\
of the socket (flag == 1), or both ends (flag == 2).";
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* List of methods for socket objects */
Initial revision
1991-06-25 21:36:08 +00:00
new style
1994-10-10 17:59:00 +00:00
static PyMethodDef PySocketSock_methods[] = {
Fix a bunch of warnings reported by Skip. To whoever who changed a bunch of (PyCFunction) casts to (PyNoArgsFunction) in PyMethodDef initializers: don't do that. The cast is to shut the compiler up. The compiler wants the function pointer initializer to be a PyCFunction.
2001-10-15 21:12:54 +00:00
{"accept", (PyCFunction)PySocketSock_accept, METH_NOARGS,
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
accept_doc},
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
{"bind", (PyCFunction)PySocketSock_bind, METH_O,
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
bind_doc},
Fix a bunch of warnings reported by Skip. To whoever who changed a bunch of (PyCFunction) casts to (PyNoArgsFunction) in PyMethodDef initializers: don't do that. The cast is to shut the compiler up. The compiler wants the function pointer initializer to be a PyCFunction.
2001-10-15 21:12:54 +00:00
{"close", (PyCFunction)PySocketSock_close, METH_NOARGS,
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
close_doc},
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
{"connect", (PyCFunction)PySocketSock_connect, METH_O,
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
connect_doc},
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
{"connect_ex", (PyCFunction)PySocketSock_connect_ex, METH_O,
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
connect_ex_doc},
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
#ifndef NO_DUP
Fix a bunch of warnings reported by Skip. To whoever who changed a bunch of (PyCFunction) casts to (PyNoArgsFunction) in PyMethodDef initializers: don't do that. The cast is to shut the compiler up. The compiler wants the function pointer initializer to be a PyCFunction.
2001-10-15 21:12:54 +00:00
{"dup", (PyCFunction)PySocketSock_dup, METH_NOARGS,
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
dup_doc},
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
#endif
Fix a bunch of warnings reported by Skip. To whoever who changed a bunch of (PyCFunction) casts to (PyNoArgsFunction) in PyMethodDef initializers: don't do that. The cast is to shut the compiler up. The compiler wants the function pointer initializer to be a PyCFunction.
2001-10-15 21:12:54 +00:00
{"fileno", (PyCFunction)PySocketSock_fileno, METH_NOARGS,
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
fileno_doc},
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
#ifdef HAVE_GETPEERNAME
Fix a bunch of warnings reported by Skip. To whoever who changed a bunch of (PyCFunction) casts to (PyNoArgsFunction) in PyMethodDef initializers: don't do that. The cast is to shut the compiler up. The compiler wants the function pointer initializer to be a PyCFunction.
2001-10-15 21:12:54 +00:00
{"getpeername", (PyCFunction)PySocketSock_getpeername,
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
METH_NOARGS, getpeername_doc},
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#endif
Fix a bunch of warnings reported by Skip. To whoever who changed a bunch of (PyCFunction) casts to (PyNoArgsFunction) in PyMethodDef initializers: don't do that. The cast is to shut the compiler up. The compiler wants the function pointer initializer to be a PyCFunction.
2001-10-15 21:12:54 +00:00
{"getsockname", (PyCFunction)PySocketSock_getsockname,
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
METH_NOARGS, getsockname_doc},
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"getsockopt", (PyCFunction)PySocketSock_getsockopt, METH_VARARGS,
getsockopt_doc},
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
{"listen", (PyCFunction)PySocketSock_listen, METH_O,
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
listen_doc},
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
#ifndef NO_DUP
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"makefile", (PyCFunction)PySocketSock_makefile, METH_VARARGS,
makefile_doc},
#endif
{"recv", (PyCFunction)PySocketSock_recv, METH_VARARGS,
recv_doc},
{"recvfrom", (PyCFunction)PySocketSock_recvfrom, METH_VARARGS,
recvfrom_doc},
{"send", (PyCFunction)PySocketSock_send, METH_VARARGS,
send_doc},
Add sendall() method, which loops until all data is written or an error occurs, and doesn't return a count. (This is my second patch from SF patch #474307, with small change to the docstring for send().) 2.1.2 "bugfix" candidate.
2001-10-26 03:25:00 +00:00
{"sendall", (PyCFunction)PySocketSock_sendall, METH_VARARGS,
sendall_doc},
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"sendto", (PyCFunction)PySocketSock_sendto, METH_VARARGS,
sendto_doc},
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
{"setblocking", (PyCFunction)PySocketSock_setblocking, METH_O,
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
setblocking_doc},
{"setsockopt", (PyCFunction)PySocketSock_setsockopt, METH_VARARGS,
setsockopt_doc},
Convert socket methods to use METH_O and METH_NOARGS where possible.
2001-10-11 16:36:35 +00:00
{"shutdown", (PyCFunction)PySocketSock_shutdown, METH_O,
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
shutdown_doc},
#ifdef RISCOS
{"sleeptaskw", (PyCFunction)PySocketSock_sleeptaskw, METH_VARARGS,
sleeptaskw_doc},
#endif
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
{NULL, NULL} /* sentinel */
Initial revision
1991-06-25 21:36:08 +00:00
};
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
new style
1994-10-10 17:59:00 +00:00
/* Deallocate a socket object in response to the last Py_DECREF().
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
First close the file description. */
Initial revision
1991-06-25 21:36:08 +00:00
static void
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocketSock_dealloc(PySocketSockObject *s)
Initial revision
1991-06-25 21:36:08 +00:00
{
In dealloc(), only close the socket if fd != -1.
2000-04-10 12:45:45 +00:00
if (s->sock_fd != -1)
Use an explicit macro SOCKETCLOSE which expands to closesocket (on Windows), soclose (on OS2), or to close (everywhere else). Hopefully this fixes a new compilation error that I suddenly get on Windows because the macro definition for close -> closesocket apparently was done before including io.h, which contains a prototype for close. (No idea why this wasn't an error before.)
2000-04-21 20:33:00 +00:00
(void) SOCKETCLOSE(s->sock_fd);
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
s->ob_type->tp_free((PyObject *)s);
Initial revision
1991-06-25 21:36:08 +00:00
}
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocketSock_repr(PySocketSockObject *s)
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
{
char buf[512];
Trent Mick <trentm@activestate.com>: This patch fixes possible overflows in the socket module for 64-bit platforms (mainly Win64). The changes are: - abstract the socket type to SOCKET_T (this is SOCKET on Windows, int on Un*x), this is necessary because sizeof(SOCKET) > sizeof(int) on Win64 - use INVALID_SOCKET on Win32/64 for an error return value for accept() - ensure no overflow of the socket variable for: (1) a PyObject return value (use PyLong_FromLongLong if necessary); and (2) printf formatting in repr(). Closes SourceForge patch #100516.
2000-06-30 02:46:07 +00:00
#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
sprintf -> PyOS_snprintf in some "obviously safe" cases. Also changed <>-style #includes to ""-style in some places where the former didn't make sense.
2001-11-28 20:27:42 +00:00
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);
remove unused variables
1996-02-27 15:21:19 +00:00
return PyString_FromString(buf);
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
}
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
/* Create a new, uninitialized socket object. */
static PyObject *
PySocketSock_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
PyObject *new;
new = type->tp_alloc(type, 0);
if (new != NULL)
((PySocketSockObject *)new)->sock_fd = -1;
return new;
}
/* Initialize a new socket object. */
/*ARGSUSED*/
static int
PySocketSock_init(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
{
PySocket_Err();
return -1;
}
init_sockobject(s, fd, family, type, proto);
/* From now on, ignore SIGPIPE and let the error checking
do the work. */
#ifdef SIGPIPE
(void) signal(SIGPIPE, SIG_IGN);
#endif
return 0;
}
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
/* Type object for socket objects. */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
static char socket_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.\n\
\n\
A socket represents one endpoint of a network connection.\n\
\n\
Methods:\n\
\n\
accept() -- accept a connection, returning new socket and client address\n\
bind() -- bind the socket to a local address\n\
close() -- close the socket\n\
connect() -- connect the socket to a remote address\n\
connect_ex() -- 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() -- get socket options\n\
listen() -- start listening for incoming connections\n\
Fix docstring typo
2001-11-28 04:28:31 +00:00
makefile() -- return a file object corresponding to the socket (*)\n\
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
recv() -- receive data\n\
recvfrom() -- receive data and sender's address\n\
send() -- send data, may not send all of it\n\
sendall() -- send all data\n\
sendto() -- send data to a given address\n\
setblocking() -- set or clear the blocking I/O flag\n\
setsockopt() -- set socket options\n\
shutdown() -- shut down traffic in one or both directions\n\
\n\
(*) not available on all platforms!)";
new style
1994-10-10 17:59:00 +00:00
static PyTypeObject PySocketSock_Type = {
Windows/PC changes
1996-05-23 22:54:50 +00:00
PyObject_HEAD_INIT(0) /* Must fill in type value later */
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
0, /* ob_size */
Oops. In the tp_name field, the name should be "_socket.socket", not "socket.socket" -- on Windows, "socket.socket" is the wrapper class. Also added the module name to the SSL type (which is not a new-style class -- I don't want to mess with it yet).
2001-10-28 12:31:33 +00:00
"_socket.socket", /* tp_name */
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
sizeof(PySocketSockObject), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)PySocketSock_dealloc, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_compare */
(reprfunc)PySocketSock_repr, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
Fixes to compile cPickle.c & socketmodule.c on cygwin and possibly other platforms that have funny ideas about whether addresses of functions in dlls are compile-time constants.
2001-11-09 10:06:23 +00:00
0, /* set below */ /* tp_getattro */
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
socket_doc, /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
PySocketSock_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
PySocketSock_init, /* tp_init */
Fixes to compile cPickle.c & socketmodule.c on cygwin and possibly other platforms that have funny ideas about whether addresses of functions in dlls are compile-time constants.
2001-11-09 10:06:23 +00:00
0, /* set below */ /* tp_alloc */
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
PySocketSock_new, /* tp_new */
Fixes to compile cPickle.c & socketmodule.c on cygwin and possibly other platforms that have funny ideas about whether addresses of functions in dlls are compile-time constants.
2001-11-09 10:06:23 +00:00
0, /* set below */ /* tp_free */
Initial revision
1991-06-25 21:36:08 +00:00
};
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
Add gethostname() and s.avail().
1991-07-27 21:42:02 +00:00
/* Python interface to gethostname(). */
/*ARGSUSED*/
new style
1994-10-10 17:59:00 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocket_gethostname(PyObject *self, PyObject *args)
Add gethostname() and s.avail().
1991-07-27 21:42:02 +00:00
{
char buf[1024];
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
int res;
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, ":gethostname"))
Add gethostname() and s.avail().
1991-07-27 21:42:02 +00:00
return NULL;
new style
1994-10-10 17:59:00 +00:00
Py_BEGIN_ALLOW_THREADS
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
res = gethostname(buf, (int) sizeof buf - 1);
new style
1994-10-10 17:59:00 +00:00
Py_END_ALLOW_THREADS
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
if (res < 0)
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
Add gethostname() and s.avail().
1991-07-27 21:42:02 +00:00
buf[sizeof buf - 1] = '\0';
new style
1994-10-10 17:59:00 +00:00
return PyString_FromString(buf);
Add gethostname() and s.avail().
1991-07-27 21:42:02 +00:00
}
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char gethostname_doc[] =
"gethostname() -> string\n\
\n\
Return the current host name.";
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* Python interface to gethostbyname(name). */
/*ARGSUSED*/
new style
1994-10-10 17:59:00 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocket_gethostbyname(PyObject *self, PyObject *args)
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
{
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
char *name;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
struct sockaddr_storage addrbuf;
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "s:gethostbyname", &name))
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
return NULL;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
if (setipaddr(name, (struct sockaddr *)&addrbuf, AF_INET) < 0)
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
return NULL;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
return makeipaddr((struct sockaddr *)&addrbuf,
sizeof(struct sockaddr_in));
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char gethostbyname_doc[] =
"gethostbyname(host) -> address\n\
\n\
Return the IP address (a string of the form '255.255.255.255') for a host.";
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
/* Convenience function common to gethostbyname_ex and gethostbyaddr */
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
static PyObject *
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
gethost_common(struct hostent *h, struct sockaddr *addr, int alen, int af)
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
{
remove unused variables
1996-02-27 15:21:19 +00:00
char **pch;
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
PyObject *rtn_tuple = (PyObject *)NULL;
PyObject *name_list = (PyObject *)NULL;
PyObject *addr_list = (PyObject *)NULL;
PyObject *tmp;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
if (h == NULL) {
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
/* Let's get real error message to return */
SF patch #474590 -- RISC OS support
2001-10-24 20:42:55 +00:00
#ifndef RISCOS
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
PyH_Err(h_errno);
SF patch #474590 -- RISC OS support
2001-10-24 20:42:55 +00:00
#else
PyErr_SetString(PySocket_Error, "host not found");
#endif
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
return NULL;
}
if (h->h_addrtype != af) {
#ifdef HAVE_STRERROR
/* Let's get real error message to return */
PyErr_SetString(PySocket_Error, (char *)strerror(EAFNOSUPPORT));
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
#else
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
PyErr_SetString(PySocket_Error,
"Address family not supported by protocol family");
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
#endif
return NULL;
}
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
switch (af) {
case AF_INET:
if (alen < sizeof(struct sockaddr_in))
return NULL;
break;
#ifdef INET6
case AF_INET6:
if (alen < sizeof(struct sockaddr_in6))
return NULL;
break;
#endif
}
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
if ((name_list = PyList_New(0)) == NULL)
goto err;
if ((addr_list = PyList_New(0)) == NULL)
goto err;
for (pch = h->h_aliases; *pch != NULL; pch++) {
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
int status;
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
tmp = PyString_FromString(*pch);
if (tmp == NULL)
goto err;
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
status = PyList_Append(name_list, tmp);
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
Py_DECREF(tmp);
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
if (status)
goto err;
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
}
for (pch = h->h_addr_list; *pch != NULL; pch++) {
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
int status;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
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 INET6
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(PySocket_Error,
"unsupported address family");
return NULL;
}
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
if (tmp == NULL)
goto err;
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
status = PyList_Append(addr_list, tmp);
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
Py_DECREF(tmp);
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
if (status)
goto err;
Another bulky set of minor changes. Note addition of gethostbyaddr() and improved repr() for sockets, renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
1995-01-02 19:30:30 +00:00
}
rtn_tuple = Py_BuildValue("sOO", h->h_name, name_list, addr_list);
err:
Py_XDECREF(name_list);
Py_XDECREF(addr_list);
return rtn_tuple;
}
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
/* Python interface to gethostbyname_ex(name). */
/*ARGSUSED*/
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocket_gethostbyname_ex(PyObject *self, PyObject *args)
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
{
char *name;
struct hostent *h;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
struct sockaddr_storage addr;
Instead of accessing ss_family, cast sockaddr_storage to sockaddr and access sa_family.
2001-07-23 01:30:10 +00:00
struct sockaddr *sa;
Jonathan Giddy writes: Here's a patch to fix the race condition, which wasn't fixed by Rob's patch. It holds the gethostbyname lock until the results are copied out, which means that this lock and the Python global lock are held at the same time. This shouldn't be a problem as long as the gethostbyname lock is always acquired when the global lock is not held.
1999-03-22 20:14:53 +00:00
PyObject *ret;
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
#ifdef HAVE_GETHOSTBYNAME_R
struct hostent hp_allocated;
Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code.
1999-03-24 17:20:40 +00:00
#ifdef HAVE_GETHOSTBYNAME_R_3_ARG
struct hostent_data data;
#else
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
char buf[16384];
int buf_len = (sizeof buf) - 1;
int errnop;
Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code.
1999-03-24 17:20:40 +00:00
#endif
#if defined(HAVE_GETHOSTBYNAME_R_3_ARG) || defined(HAVE_GETHOSTBYNAME_R_6_ARG)
Patch by Rob Riggs for Linux -- glibc2 has a different argument converntion for gethostbyname_r() etc. than Solaris!
1999-03-15 21:40:14 +00:00
int result;
#endif
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
#endif /* HAVE_GETHOSTBYNAME_R */
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "s:gethostbyname_ex", &name))
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
return NULL;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
if (setipaddr(name, (struct sockaddr *)&addr, PF_INET) < 0)
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
return NULL;
Py_BEGIN_ALLOW_THREADS
#ifdef HAVE_GETHOSTBYNAME_R
Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code.
1999-03-24 17:20:40 +00:00
#if defined(HAVE_GETHOSTBYNAME_R_6_ARG)
Patch by Rob Riggs for Linux -- glibc2 has a different argument converntion for gethostbyname_r() etc. than Solaris!
1999-03-15 21:40:14 +00:00
result = gethostbyname_r(name, &hp_allocated, buf, buf_len, &h, &errnop);
Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code.
1999-03-24 17:20:40 +00:00
#elif defined(HAVE_GETHOSTBYNAME_R_5_ARG)
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
h = gethostbyname_r(name, &hp_allocated, buf, buf_len, &errnop);
Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code.
1999-03-24 17:20:40 +00:00
#else /* HAVE_GETHOSTBYNAME_R_3_ARG */
Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the data struct before calling gethostby{name,addr}_r(); (2) ignore the 3/5/6 args determinations made by the configure script and switch on platform identifiers instead: AIX, OSF have 3 args Sun, SGI have 5 args Linux has 6 args On all other platforms, undef HAVE_GETHOSTBYNAME_R altogether.
1999-03-24 17:24:33 +00:00
memset((void *) &data, '\0', sizeof(data));
Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code.
1999-03-24 17:20:40 +00:00
result = gethostbyname_r(name, &hp_allocated, &data);
h = (result != 0) ? NULL : &hp_allocated;
Patch by Rob Riggs for Linux -- glibc2 has a different argument converntion for gethostbyname_r() etc. than Solaris!
1999-03-15 21:40:14 +00:00
#endif
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
#else /* not HAVE_GETHOSTBYNAME_R */
Clean up pass for the previous patches. - Use HAVE_GETHOSTBYNAME_R_6_ARG instead of testing for Linux and glibc2. - If gethostbyname takes 3 args, undefine HAVE_GETHOSTBYNAME_R -- don't know what code should be used. - New symbol USE_GETHOSTBYNAME_LOCK defined iff the lock should be used. - Modify the gethostbyaddr() code to also hold on to the lock until after it is safe to release, overlapping with the Python lock. (Note: I think that it could in theory be possible that Python code executed while gethostbyname_lock is held could attempt to reacquire the lock -- e.g. in a signal handler or destructor. I will simply say "don't do that then.")
1999-03-22 21:44:51 +00:00
#ifdef USE_GETHOSTBYNAME_LOCK
PyThread_acquire_lock(gethostbyname_lock, 1);
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
#endif
h = gethostbyname(name);
#endif /* HAVE_GETHOSTBYNAME_R */
Py_END_ALLOW_THREADS
Instead of accessing ss_family, cast sockaddr_storage to sockaddr and access sa_family.
2001-07-23 01:30:10 +00:00
/* 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);
Clean up pass for the previous patches. - Use HAVE_GETHOSTBYNAME_R_6_ARG instead of testing for Linux and glibc2. - If gethostbyname takes 3 args, undefine HAVE_GETHOSTBYNAME_R -- don't know what code should be used. - New symbol USE_GETHOSTBYNAME_LOCK defined iff the lock should be used. - Modify the gethostbyaddr() code to also hold on to the lock until after it is safe to release, overlapping with the Python lock. (Note: I think that it could in theory be possible that Python code executed while gethostbyname_lock is held could attempt to reacquire the lock -- e.g. in a signal handler or destructor. I will simply say "don't do that then.")
1999-03-22 21:44:51 +00:00
#ifdef USE_GETHOSTBYNAME_LOCK
Jonathan Giddy writes: Here's a patch to fix the race condition, which wasn't fixed by Rob's patch. It holds the gethostbyname lock until the results are copied out, which means that this lock and the Python global lock are held at the same time. This shouldn't be a problem as long as the gethostbyname lock is always acquired when the global lock is not held.
1999-03-22 20:14:53 +00:00
PyThread_release_lock(gethostbyname_lock);
#endif
return ret;
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
}
static char 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 *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocket_gethostbyaddr(PyObject *self, PyObject *args)
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
{
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
#ifdef INET6
struct sockaddr_storage addr;
#else
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
struct sockaddr_in addr;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
#endif
struct sockaddr *sa = (struct sockaddr *)&addr;
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
char *ip_num;
struct hostent *h;
Clean up pass for the previous patches. - Use HAVE_GETHOSTBYNAME_R_6_ARG instead of testing for Linux and glibc2. - If gethostbyname takes 3 args, undefine HAVE_GETHOSTBYNAME_R -- don't know what code should be used. - New symbol USE_GETHOSTBYNAME_LOCK defined iff the lock should be used. - Modify the gethostbyaddr() code to also hold on to the lock until after it is safe to release, overlapping with the Python lock. (Note: I think that it could in theory be possible that Python code executed while gethostbyname_lock is held could attempt to reacquire the lock -- e.g. in a signal handler or destructor. I will simply say "don't do that then.")
1999-03-22 21:44:51 +00:00
PyObject *ret;
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
#ifdef HAVE_GETHOSTBYNAME_R
struct hostent hp_allocated;
Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code.
1999-03-24 17:20:40 +00:00
#ifdef HAVE_GETHOSTBYNAME_R_3_ARG
struct hostent_data data;
#else
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
char buf[16384];
int buf_len = (sizeof buf) - 1;
int errnop;
Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code.
1999-03-24 17:20:40 +00:00
#endif
#if defined(HAVE_GETHOSTBYNAME_R_3_ARG) || defined(HAVE_GETHOSTBYNAME_R_6_ARG)
Patch by Rob Riggs for Linux -- glibc2 has a different argument converntion for gethostbyname_r() etc. than Solaris!
1999-03-15 21:40:14 +00:00
int result;
#endif
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
#endif /* HAVE_GETHOSTBYNAME_R */
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
char *ap;
int al;
int af;
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "s:gethostbyaddr", &ip_num))
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
return NULL;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
af = PF_UNSPEC;
if (setipaddr(ip_num, sa, 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 INET6
case AF_INET6:
ap = (char *)&((struct sockaddr_in6 *)sa)->sin6_addr;
al = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr);
break;
#endif
default:
PyErr_SetString(PySocket_Error, "unsupported address family");
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
return NULL;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
}
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
Py_BEGIN_ALLOW_THREADS
#ifdef HAVE_GETHOSTBYNAME_R
Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code.
1999-03-24 17:20:40 +00:00
#if defined(HAVE_GETHOSTBYNAME_R_6_ARG)
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
result = gethostbyaddr_r(ap, al, af,
&hp_allocated, buf, buf_len,
Patch by Rob Riggs for Linux -- glibc2 has a different argument converntion for gethostbyname_r() etc. than Solaris!
1999-03-15 21:40:14 +00:00
&h, &errnop);
Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code.
1999-03-24 17:20:40 +00:00
#elif defined(HAVE_GETHOSTBYNAME_R_5_ARG)
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
h = gethostbyaddr_r(ap, al, af,
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
&hp_allocated, buf, buf_len, &errnop);
Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code.
1999-03-24 17:20:40 +00:00
#else /* HAVE_GETHOSTBYNAME_R_3_ARG */
Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the data struct before calling gethostby{name,addr}_r(); (2) ignore the 3/5/6 args determinations made by the configure script and switch on platform identifiers instead: AIX, OSF have 3 args Sun, SGI have 5 args Linux has 6 args On all other platforms, undef HAVE_GETHOSTBYNAME_R altogether.
1999-03-24 17:24:33 +00:00
memset((void *) &data, '\0', sizeof(data));
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
result = gethostbyaddr_r(ap, al, af, &hp_allocated, &data);
Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code.
1999-03-24 17:20:40 +00:00
h = (result != 0) ? NULL : &hp_allocated;
Patch by Rob Riggs for Linux -- glibc2 has a different argument converntion for gethostbyname_r() etc. than Solaris!
1999-03-15 21:40:14 +00:00
#endif
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
#else /* not HAVE_GETHOSTBYNAME_R */
Clean up pass for the previous patches. - Use HAVE_GETHOSTBYNAME_R_6_ARG instead of testing for Linux and glibc2. - If gethostbyname takes 3 args, undefine HAVE_GETHOSTBYNAME_R -- don't know what code should be used. - New symbol USE_GETHOSTBYNAME_LOCK defined iff the lock should be used. - Modify the gethostbyaddr() code to also hold on to the lock until after it is safe to release, overlapping with the Python lock. (Note: I think that it could in theory be possible that Python code executed while gethostbyname_lock is held could attempt to reacquire the lock -- e.g. in a signal handler or destructor. I will simply say "don't do that then.")
1999-03-22 21:44:51 +00:00
#ifdef USE_GETHOSTBYNAME_LOCK
PyThread_acquire_lock(gethostbyname_lock, 1);
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
#endif
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
h = gethostbyaddr(ap, al, af);
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
#endif /* HAVE_GETHOSTBYNAME_R */
Py_END_ALLOW_THREADS
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
ret = gethost_common(h, (struct sockaddr *)&addr, sizeof(addr), af);
Clean up pass for the previous patches. - Use HAVE_GETHOSTBYNAME_R_6_ARG instead of testing for Linux and glibc2. - If gethostbyname takes 3 args, undefine HAVE_GETHOSTBYNAME_R -- don't know what code should be used. - New symbol USE_GETHOSTBYNAME_LOCK defined iff the lock should be used. - Modify the gethostbyaddr() code to also hold on to the lock until after it is safe to release, overlapping with the Python lock. (Note: I think that it could in theory be possible that Python code executed while gethostbyname_lock is held could attempt to reacquire the lock -- e.g. in a signal handler or destructor. I will simply say "don't do that then.")
1999-03-22 21:44:51 +00:00
#ifdef USE_GETHOSTBYNAME_LOCK
PyThread_release_lock(gethostbyname_lock);
#endif
return ret;
Added gethostbyname_ex(), which returns the same kind of data as gethostbyaddr(). (Plain gethostbyname() returns only the IP address.) This moves the code shared by gethostbyaddr() and gethostbyname_ex() to a subroutine. Original patch by Dan Stromberg; some tweaks by GvR.
1998-08-04 22:16:43 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char 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.";
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* 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*/
new style
1994-10-10 17:59:00 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocket_getservbyname(PyObject *self, PyObject *args)
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
{
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
char *name, *proto;
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
struct servent *sp;
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "ss:getservbyname", &name, &proto))
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
return NULL;
new style
1994-10-10 17:59:00 +00:00
Py_BEGIN_ALLOW_THREADS
* Makefile: cosmetics * socketmodule.c: get rid of makepair(); fix makesocketaddr to fix broken recvfrom() * socketmodule: get rid of getStrarg() * ceval.h: move eval_code() to new file eval.h, so compile.h is no longer needed. * ceval.c: move thread comments to ceval.h; always make save/restore thread functions available (for dynloaded modules) * cdmodule.c, listobject.c: don't include compile.h * flmodule.c: include ceval.h * import.c: include eval.h instead of ceval.h * cgen.py: add forground(); noport(); winopen(""); to initgl(). * bltinmodule.c, socketmodule.c, fileobject.c, posixmodule.c, selectmodule.c: adapt to threads (add BGN/END SAVE macros) * stdwinmodule.c: adapt to threads and use a special stdwin lock. * pythonmain.c: don't include getpythonpath(). * pythonrun.c: use BGN/END SAVE instead of direct calls; also more BGN/END SAVE calls etc. * thread.c: bigger stack size for sun; change exit() to _exit() * threadmodule.c: use BGN/END SAVE macros where possible * timemodule.c: adapt better to threads; use BGN/END SAVE; add longsleep internal function if BSD_TIME; cosmetics
1992-08-05 19:58:53 +00:00
sp = getservbyname(name, proto);
new style
1994-10-10 17:59:00 +00:00
Py_END_ALLOW_THREADS
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
if (sp == NULL) {
new style
1994-10-10 17:59:00 +00:00
PyErr_SetString(PySocket_Error, "service/proto not found");
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
return NULL;
}
new style
1994-10-10 17:59:00 +00:00
return PyInt_FromLong((long) ntohs(sp->s_port));
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char getservbyname_doc[] =
"getservbyname(servicename, protocolname) -> integer\n\
\n\
Return a port number from a service name and protocol name.\n\
The protocol name should be 'tcp' or 'udp'.";
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
Added getprotobyname() interface.
1996-12-19 16:35:04 +00:00
/* 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 *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocket_getprotobyname(PyObject *self, PyObject *args)
Added getprotobyname() interface.
1996-12-19 16:35:04 +00:00
{
char *name;
struct protoent *sp;
Changes for BeOS, QNX and long long, by Chris Herborth.
1998-08-04 22:53:56 +00:00
#ifdef __BEOS__
/* Not available in BeOS yet. - [cjh] */
PyErr_SetString( PySocket_Error, "getprotobyname not supported" );
return NULL;
#else
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "s:getprotobyname", &name))
Added getprotobyname() interface.
1996-12-19 16:35:04 +00:00
return NULL;
Py_BEGIN_ALLOW_THREADS
sp = getprotobyname(name);
Py_END_ALLOW_THREADS
if (sp == NULL) {
PyErr_SetString(PySocket_Error, "protocol not found");
return NULL;
}
return PyInt_FromLong((long) sp->p_proto);
Changes for BeOS, QNX and long long, by Chris Herborth.
1998-08-04 22:53:56 +00:00
#endif
Added getprotobyname() interface.
1996-12-19 16:35:04 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char getprotobyname_doc[] =
"getprotobyname(name) -> integer\n\
\n\
Return the protocol number for the named protocol. (Rarely used.)";
Added getprotobyname() interface.
1996-12-19 16:35:04 +00:00
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
#ifndef NO_DUP
socketmodule.c: added socket.fromfd(fd, family, type, [proto]); converted socket() to use of getargs().
1992-12-08 13:38:24 +00:00
/* Create a socket object from a numeric file description.
Useful e.g. if stdin is a socket.
Additional arguments as for socket(). */
/*ARGSUSED*/
new style
1994-10-10 17:59:00 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocket_fromfd(PyObject *self, PyObject *args)
socketmodule.c: added socket.fromfd(fd, family, type, [proto]); converted socket() to use of getargs().
1992-12-08 13:38:24 +00:00
{
new style
1994-10-10 17:59:00 +00:00
PySocketSockObject *s;
Trent Mick <trentm@activestate.com>: This patch fixes possible overflows in the socket module for 64-bit platforms (mainly Win64). The changes are: - abstract the socket type to SOCKET_T (this is SOCKET on Windows, int on Un*x), this is necessary because sizeof(SOCKET) > sizeof(int) on Win64 - use INVALID_SOCKET on Win32/64 for an error return value for accept() - ensure no overflow of the socket variable for: (1) a PyObject return value (use PyLong_FromLongLong if necessary); and (2) printf formatting in repr(). Closes SourceForge patch #100516.
2000-06-30 02:46:07 +00:00
SOCKET_T fd;
int family, type, proto = 0;
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "iii|i:fromfd",
&fd, &family, &type, &proto))
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
return NULL;
* mymalloc.h: always allocate one extra byte, since some malloc's return NULL for malloc(0) or realloc(p, 0). (This should be done differently than wasting one byte, but alas...) * Moved "add'l libraries" option in Makefile to an earlier place. * Remove argument compatibility hacks (b) and (c). * Add grey2mono, dither2mono and mono2grey to imageop. * Dup the fd in socket.fromfd(). * Added new modules mpz, md5 (by JH, requiring GNU MP 1.2). Affects Makefile and config.c. * socketmodule.c: added socket.fromfd(fd, family, type, [proto]), converted socket() to use of getargs().
1992-12-14 16:59:51 +00:00
/* Dup the fd so it and the socket can be closed independently */
fd = dup(fd);
if (fd < 0)
new style
1994-10-10 17:59:00 +00:00
return PySocket_Err();
s = PySocketSock_New(fd, family, type, proto);
socketmodule.c: added socket.fromfd(fd, family, type, [proto]); converted socket() to use of getargs().
1992-12-08 13:38:24 +00:00
/* From now on, ignore SIGPIPE and let the error checking
do the work. */
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#ifdef SIGPIPE
socketmodule.c: added socket.fromfd(fd, family, type, [proto]); converted socket() to use of getargs().
1992-12-08 13:38:24 +00:00
(void) signal(SIGPIPE, SIG_IGN);
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#endif
new style
1994-10-10 17:59:00 +00:00
return (PyObject *) s;
socketmodule.c: added socket.fromfd(fd, family, type, [proto]); converted socket() to use of getargs().
1992-12-08 13:38:24 +00:00
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char fromfd_doc[] =
"fromfd(fd, family, type[, proto]) -> socket object\n\
\n\
Create a socket object from the given file descriptor.\n\
The remaining arguments are the same as for socket().";
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
#endif /* NO_DUP */
socketmodule.c: added socket.fromfd(fd, family, type, [proto]); converted socket() to use of getargs().
1992-12-08 13:38:24 +00:00
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
ntohs, ntohl, htons, htonl -- thanks to Lance
1996-06-12 04:04:55 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocket_ntohs(PyObject *self, PyObject *args)
ntohs, ntohl, htons, htonl -- thanks to Lance
1996-06-12 04:04:55 +00:00
{
int x1, x2;
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "i:ntohs", &x1)) {
ntohs, ntohl, htons, htonl -- thanks to Lance
1996-06-12 04:04:55 +00:00
return NULL;
}
x2 = (int)ntohs((short)x1);
return PyInt_FromLong(x2);
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char ntohs_doc[] =
"ntohs(integer) -> integer\n\
\n\
Convert a 16-bit integer from network to host byte order.";
ntohs, ntohl, htons, htonl -- thanks to Lance
1996-06-12 04:04:55 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocket_ntohl(PyObject *self, PyObject *args)
ntohs, ntohl, htons, htonl -- thanks to Lance
1996-06-12 04:04:55 +00:00
{
int x1, x2;
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "i:ntohl", &x1)) {
ntohs, ntohl, htons, htonl -- thanks to Lance
1996-06-12 04:04:55 +00:00
return NULL;
}
x2 = ntohl(x1);
return PyInt_FromLong(x2);
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char ntohl_doc[] =
"ntohl(integer) -> integer\n\
\n\
Convert a 32-bit integer from network to host byte order.";
ntohs, ntohl, htons, htonl -- thanks to Lance
1996-06-12 04:04:55 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocket_htons(PyObject *self, PyObject *args)
ntohs, ntohl, htons, htonl -- thanks to Lance
1996-06-12 04:04:55 +00:00
{
int x1, x2;
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "i:htons", &x1)) {
ntohs, ntohl, htons, htonl -- thanks to Lance
1996-06-12 04:04:55 +00:00
return NULL;
}
x2 = (int)htons((short)x1);
return PyInt_FromLong(x2);
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char htons_doc[] =
"htons(integer) -> integer\n\
\n\
Convert a 16-bit integer from host to network byte order.";
ntohs, ntohl, htons, htonl -- thanks to Lance
1996-06-12 04:04:55 +00:00
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocket_htonl(PyObject *self, PyObject *args)
ntohs, ntohl, htons, htonl -- thanks to Lance
1996-06-12 04:04:55 +00:00
{
int x1, x2;
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "i:htonl", &x1)) {
ntohs, ntohl, htons, htonl -- thanks to Lance
1996-06-12 04:04:55 +00:00
return NULL;
}
x2 = htonl(x1);
return PyInt_FromLong(x2);
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char htonl_doc[] =
"htonl(integer) -> integer\n\
\n\
Convert a 32-bit integer from host to network byte order.";
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
/*
* socket.inet_aton() and socket.inet_ntoa() functions
*
* written 20 Aug 1999 by Ben Gertzfield <che@debian.org> <- blame him!
*
*/
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
static char inet_aton_doc[] =
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
"inet_aton(string) -> packed 32-bit IP representation\n\
\n\
Port inet_ntoa and inet_aton to Windows: - fix unescaped newline in string literal - removed unused err variable - Windows doesn't have inet_aton; use inet_addr instead
1999-08-20 19:11:27 +00:00
Convert an IP address in string format (123.45.67.89) to the 32-bit packed\n\
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
binary format used in low-level network functions.";
static PyObject*
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocket_inet_aton(PyObject *self, PyObject *args)
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
{
It appears that inet_aton() doesn't really exist except in libresolv; the proper function to call is inet_addr(). Since we already had code to do that (for MS-Windows), this simplifies things a lot!
1999-09-09 15:42:59 +00:00
#ifndef INADDR_NONE
#define INADDR_NONE (-1)
#endif
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
Port inet_ntoa and inet_aton to Windows: - fix unescaped newline in string literal - removed unused err variable - Windows doesn't have inet_aton; use inet_addr instead
1999-08-20 19:11:27 +00:00
/* Have to use inet_addr() instead */
char *ip_addr;
Clean up some warnings from the SGI compiler. This is part of SF patch #434992.
2001-07-19 21:16:41 +00:00
unsigned long packed_addr;
Port inet_ntoa and inet_aton to Windows: - fix unescaped newline in string literal - removed unused err variable - Windows doesn't have inet_aton; use inet_addr instead
1999-08-20 19:11:27 +00:00
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "s:inet_aton", &ip_addr)) {
Port inet_ntoa and inet_aton to Windows: - fix unescaped newline in string literal - removed unused err variable - Windows doesn't have inet_aton; use inet_addr instead
1999-08-20 19:11:27 +00:00
return NULL;
}
Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the socklen_t (unsigned int) for most size parameters. Apparently this is part of the UNIX 98 standard. [GvR: the changes to configure.in etc. that I just checked in make sure that socklen_t is defined everywhere, so I deleted the little part of Jack's mod to define socklen_t if not in GUSI2. I suppose I will have to add it to the Windows config.h in a minute.]
2000-04-24 15:16:03 +00:00
#ifdef USE_GUSI1
Clean up some warnings from the SGI compiler. This is part of SF patch #434992.
2001-07-19 21:16:41 +00:00
packed_addr = inet_addr(ip_addr).s_addr;
Bugfix by Jack Jansen for Macintosh (for the inet_ntoa/aton changes): <arpa/inet.h> doesn't exist and isn't needed; and inet_addr() returns a structure containing a long rather than a long.
1999-11-04 18:22:29 +00:00
#else
Port inet_ntoa and inet_aton to Windows: - fix unescaped newline in string literal - removed unused err variable - Windows doesn't have inet_aton; use inet_addr instead
1999-08-20 19:11:27 +00:00
packed_addr = inet_addr(ip_addr);
Bugfix by Jack Jansen for Macintosh (for the inet_ntoa/aton changes): <arpa/inet.h> doesn't exist and isn't needed; and inet_addr() returns a structure containing a long rather than a long.
1999-11-04 18:22:29 +00:00
#endif
Port inet_ntoa and inet_aton to Windows: - fix unescaped newline in string literal - removed unused err variable - Windows doesn't have inet_aton; use inet_addr instead
1999-08-20 19:11:27 +00:00
if (packed_addr == INADDR_NONE) { /* invalid address */
PyErr_SetString(PySocket_Error,
"illegal IP address string passed to inet_aton");
return NULL;
}
return PyString_FromStringAndSize((char *) &packed_addr,
sizeof(packed_addr));
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
}
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
static char inet_ntoa_doc[] =
Fixed inet_ntoa() docstring.
2000-03-07 14:05:16 +00:00
"inet_ntoa(packed_ip) -> ip_address_string\n\
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
\n\
Convert an IP address from 32-bit packed binary format to string format";
static PyObject*
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocket_inet_ntoa(PyObject *self, PyObject *args)
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
{
char *packed_str;
Port inet_ntoa and inet_aton to Windows: - fix unescaped newline in string literal - removed unused err variable - Windows doesn't have inet_aton; use inet_addr instead
1999-08-20 19:11:27 +00:00
int addr_len;
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
struct in_addr packed_addr;
Fix all routines to use PyArg_ParseTuple(), and add ":name" to the argument format strings. THIS WILL PROBABLY BREAK LOTS OF CODE!!! Also fixed a bogus string in an error message in getsockaddrlen().
2000-03-24 20:56:56 +00:00
if (!PyArg_ParseTuple(args, "s#:inet_ntoa", &packed_str, &addr_len)) {
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
return NULL;
}
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls.
1999-08-20 18:21:51 +00:00
if (addr_len != sizeof(packed_addr)) {
PyErr_SetString(PySocket_Error,
"packed IP wrong length for inet_ntoa");
return NULL;
}
memcpy(&packed_addr, packed_str, addr_len);
return PyString_FromString(inet_ntoa(packed_addr));
}
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
/* Python interface to getaddrinfo(host, port). */
/*ARGSUSED*/
static PyObject *
PySocket_getaddrinfo(PyObject *self, PyObject *args)
{
Fix memory leaks detecting in bug report #478003.
2001-11-07 08:31:03 +00:00
struct addrinfo hints, *res;
struct addrinfo *res0 = NULL;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
PyObject *pobj = (PyObject *)NULL;
Bump size of sprintf buffer. Suggested by Alex Coventry.
2001-08-12 09:28:40 +00:00
char pbuf[30];
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
char *hptr, *pptr;
int family, socktype, protocol, flags;
int error;
PyObject *all = (PyObject *)NULL;
PyObject *single = (PyObject *)NULL;
family = socktype = protocol = flags = 0;
family = PF_UNSPEC;
if (!PyArg_ParseTuple(args, "zO|iiii:getaddrinfo",
&hptr, &pobj, &family, &socktype,
&protocol, &flags)) {
return NULL;
}
if (PyInt_Check(pobj)) {
Enable PyOS_snprintf() et al. during alpha phase of 2.2.0 and add another use case to the socketmodule.
2001-07-31 18:05:33 +00:00
PyOS_snprintf(pbuf, sizeof(pbuf), "%ld", PyInt_AsLong(pobj));
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
pptr = pbuf;
} else if (PyString_Check(pobj)) {
pptr = PyString_AsString(pobj);
} else if (pobj == Py_None) {
pptr = (char *)NULL;
} else {
PyErr_SetString(PySocket_Error, "Int or String expected");
return NULL;
}
memset(&hints, 0, sizeof(hints));
hints.ai_family = family;
hints.ai_socktype = socktype;
hints.ai_protocol = protocol;
hints.ai_flags = flags;
error = getaddrinfo(hptr, pptr, &hints, &res0);
if (error) {
PyGAI_Err(error);
return NULL;
}
if ((all = PyList_New(0)) == NULL)
goto err;
for (res = res0; res; res = res->ai_next) {
PySocket_getaddrinfo(): fix two refcount bugs, both having to do with a misunderstanding of the refcont behavior of the 'O' format code in PyArg_ParseTuple() and Py_BuildValue(), respectively. - pobj is only a borrowed reference, so should *not* be DECREF'ed at the end. This was the cause of SF bug #470635. - The Py_BuildValue() call would leak the object produced by makesockaddr(). (I found this by eyeballing the code.)
2001-10-12 18:59:27 +00:00
PyObject *addr =
makesockaddr(-1, res->ai_addr, res->ai_addrlen);
if (addr == NULL)
goto err;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
single = Py_BuildValue("iiisO", res->ai_family,
res->ai_socktype, res->ai_protocol,
res->ai_canonname ? res->ai_canonname : "",
PySocket_getaddrinfo(): fix two refcount bugs, both having to do with a misunderstanding of the refcont behavior of the 'O' format code in PyArg_ParseTuple() and Py_BuildValue(), respectively. - pobj is only a borrowed reference, so should *not* be DECREF'ed at the end. This was the cause of SF bug #470635. - The Py_BuildValue() call would leak the object produced by makesockaddr(). (I found this by eyeballing the code.)
2001-10-12 18:59:27 +00:00
addr);
Py_DECREF(addr);
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
if (single == NULL)
goto err;
if (PyList_Append(all, single))
goto err;
Py_XDECREF(single);
}
return all;
err:
Py_XDECREF(single);
Py_XDECREF(all);
Fix memory leaks detecting in bug report #478003.
2001-11-07 08:31:03 +00:00
if (res0)
freeaddrinfo(res0);
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
return (PyObject *)NULL;
}
static char getaddrinfo_doc[] =
"socket.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 *
PySocket_getnameinfo(PyObject *self, PyObject *args)
{
PyObject *sa = (PyObject *)NULL;
int flags;
char *hostp;
Correct getnameinfo refcounting and tuple parsing. Fixes #476648.
2001-11-02 23:34:52 +00:00
int port, flowinfo, scope_id;
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
struct addrinfo hints, *res = NULL;
int error;
PyObject *ret = (PyObject *)NULL;
flags = flowinfo = scope_id = 0;
Correct getnameinfo refcounting and tuple parsing. Fixes #476648.
2001-11-02 23:34:52 +00:00
if (!PyArg_ParseTuple(args, "Oi:getnameinfo", &sa, &flags))
return NULL;
if (!PyArg_ParseTuple(sa, "si|ii", &hostp, &port, &flowinfo, &scope_id))
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
return NULL;
Enable PyOS_snprintf() et al. during alpha phase of 2.2.0 and add another use case to the socketmodule.
2001-07-31 18:05:33 +00:00
PyOS_snprintf(pbuf, sizeof(pbuf), "%d", port);
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
memset(&hints, 0, sizeof(hints));
hints.ai_family = PF_UNSPEC;
Add more constants. Contributed by itojun.
2001-08-04 22:37:23 +00:00
hints.ai_socktype = SOCK_DGRAM; /* make numeric port happy */
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
error = getaddrinfo(hostp, pbuf, &hints, &res);
if (error) {
PyGAI_Err(error);
goto fail;
}
if (res->ai_next) {
PyErr_SetString(PySocket_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(PySocket_Error,
"IPv4 sockaddr must be 2 tuple");
goto fail;
}
break;
}
#ifdef INET6
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) {
PyGAI_Err(error);
goto fail;
}
ret = Py_BuildValue("ss", hbuf, pbuf);
fail:
if (res)
freeaddrinfo(res);
return ret;
}
static char getnameinfo_doc[] =
"socket.getnameinfo(sockaddr, flags) --> (host, port)\n\
\n\
Get host and port for a sockaddr.";
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
/* XXX It might be helpful to augment the error message generated
below with the name of the SSL function that generated the error.
I expect it's obvious most of the time.
*/
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
#ifdef USE_SSL
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
static PyObject *
PySSL_SetError(SSL *ssl, int ret)
{
PyObject *v, *n, *s;
char *errstr;
int err;
assert(ret <= 0);
err = SSL_get_error(ssl, ret);
n = PyInt_FromLong(err);
if (n == NULL)
return NULL;
v = PyTuple_New(2);
if (v == NULL) {
Py_DECREF(n);
return NULL;
}
switch (SSL_get_error(ssl, ret)) {
case SSL_ERROR_ZERO_RETURN:
errstr = "TLS/SSL connection has been closed";
break;
case SSL_ERROR_WANT_READ:
errstr = "The operation did not complete (read)";
break;
case SSL_ERROR_WANT_WRITE:
errstr = "The operation did not complete (write)";
break;
case SSL_ERROR_WANT_X509_LOOKUP:
errstr = "The operation did not complete (X509 lookup)";
break;
case SSL_ERROR_SYSCALL:
case SSL_ERROR_SSL:
{
unsigned long e = ERR_get_error();
if (e == 0) {
/* an EOF was observed that violates the protocol */
errstr = "EOF occurred in violation of protocol";
} else if (e == -1) {
/* the underlying BIO reported an I/O error */
Py_DECREF(v);
Py_DECREF(n);
Use PySocket_Err() instead of PyErr_SetFromErrno(). The former does the right thing on Windows, the latter does not.
2001-10-11 17:27:58 +00:00
return PySocket_Err();
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
} else {
/* XXX Protected by global interpreter lock */
errstr = ERR_error_string(e, NULL);
}
break;
}
default:
errstr = "Invalid error code";
}
s = PyString_FromString(errstr);
if (s == NULL) {
Py_DECREF(v);
Py_DECREF(n);
}
PyTuple_SET_ITEM(v, 0, n);
PyTuple_SET_ITEM(v, 1, s);
PyErr_SetObject(PySSLErrorObject, v);
return NULL;
}
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
/* This is a C function to be called for new object initialization */
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
static PySSLObject *
newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file)
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
{
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
PySSLObject *self;
USe PyObject_SetString() instead of PyObject_SetObject() in newSSLObject().
2001-10-10 22:33:32 +00:00
char *errstr = NULL;
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
int ret;
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
self = PyObject_New(PySSLObject, &PySSL_Type); /* Create new object */
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
if (self == NULL){
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
errstr = "newPySSLObject error";
Fix two memory leaks in socket.ssl(). XXX [1] These changes aren't tested very thoroughly, because regrtest doesn't do any SSL tests. I've done some trivial tests on my own, but don't really know how to use the key and cert files. In one case, an SSL-level error causes Python to dump core. I'll get the fixed in the next round of changes. XXX [2] The checkin removes the x_attr member of the SSLObject struct. I'm not sure if this is kosher for backwards compatibility at the binary level. Perhaps its safer to keep the member but keep it assigned to NULL. And the leaks? newSSLObject() called PyDict_New(), stored the result in x_attr without checking it, and later stored NULL in x_attr without doing anything to the dict. So the dict always leaks. There is no further reference to x_attr, so I just removed it completely. The error cases in newSSLObject() passed the return value of PyString_FromString() directly to PyErr_SetObject(). PyErr_SetObject() expects a borrowed reference, so the string leaked.
2001-10-10 03:19:39 +00:00
goto fail;
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
}
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
memset(self->server, '\0', sizeof(char) * X509_NAME_MAXLEN);
memset(self->issuer, '\0', sizeof(char) * X509_NAME_MAXLEN);
In newSSLObject(), initialize the various members of an SSLObject to NULL. In SSL_dealloc(), free/dealloc them only if they're non-NULL. Fixes some obvious core dumps, but not sure yet if there are more semantics to the SSL calls that would affect the dealloc.
2001-10-10 03:37:05 +00:00
self->server_cert = NULL;
self->ssl = NULL;
self->ctx = NULL;
self->Socket = NULL;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
Do simple error checking before doing any SSL calls.
2001-10-10 22:37:48 +00:00
if ((key_file && !cert_file) || (!key_file && cert_file)) {
errstr = "Both the key & certificate files must be specified";
Fix two memory leaks in socket.ssl(). XXX [1] These changes aren't tested very thoroughly, because regrtest doesn't do any SSL tests. I've done some trivial tests on my own, but don't really know how to use the key and cert files. In one case, an SSL-level error causes Python to dump core. I'll get the fixed in the next round of changes. XXX [2] The checkin removes the x_attr member of the SSLObject struct. I'm not sure if this is kosher for backwards compatibility at the binary level. Perhaps its safer to keep the member but keep it assigned to NULL. And the leaks? newSSLObject() called PyDict_New(), stored the result in x_attr without checking it, and later stored NULL in x_attr without doing anything to the dict. So the dict always leaks. There is no further reference to x_attr, so I just removed it completely. The error cases in newSSLObject() passed the return value of PyString_FromString() directly to PyErr_SetObject(). PyErr_SetObject() expects a borrowed reference, so the string leaked.
2001-10-10 03:19:39 +00:00
goto fail;
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
}
Do simple error checking before doing any SSL calls.
2001-10-10 22:37:48 +00:00
self->ctx = SSL_CTX_new(SSLv23_method()); /* Set up context */
if (self->ctx == NULL) {
errstr = "SSL_CTX_new error";
Fix two memory leaks in socket.ssl(). XXX [1] These changes aren't tested very thoroughly, because regrtest doesn't do any SSL tests. I've done some trivial tests on my own, but don't really know how to use the key and cert files. In one case, an SSL-level error causes Python to dump core. I'll get the fixed in the next round of changes. XXX [2] The checkin removes the x_attr member of the SSLObject struct. I'm not sure if this is kosher for backwards compatibility at the binary level. Perhaps its safer to keep the member but keep it assigned to NULL. And the leaks? newSSLObject() called PyDict_New(), stored the result in x_attr without checking it, and later stored NULL in x_attr without doing anything to the dict. So the dict always leaks. There is no further reference to x_attr, so I just removed it completely. The error cases in newSSLObject() passed the return value of PyString_FromString() directly to PyErr_SetObject(). PyErr_SetObject() expects a borrowed reference, so the string leaked.
2001-10-10 03:19:39 +00:00
goto fail;
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
}
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
if (key_file) {
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
if (SSL_CTX_use_PrivateKey_file(self->ctx, key_file,
Fix two memory leaks in socket.ssl(). XXX [1] These changes aren't tested very thoroughly, because regrtest doesn't do any SSL tests. I've done some trivial tests on my own, but don't really know how to use the key and cert files. In one case, an SSL-level error causes Python to dump core. I'll get the fixed in the next round of changes. XXX [2] The checkin removes the x_attr member of the SSLObject struct. I'm not sure if this is kosher for backwards compatibility at the binary level. Perhaps its safer to keep the member but keep it assigned to NULL. And the leaks? newSSLObject() called PyDict_New(), stored the result in x_attr without checking it, and later stored NULL in x_attr without doing anything to the dict. So the dict always leaks. There is no further reference to x_attr, so I just removed it completely. The error cases in newSSLObject() passed the return value of PyString_FromString() directly to PyErr_SetObject(). PyErr_SetObject() expects a borrowed reference, so the string leaked.
2001-10-10 03:19:39 +00:00
SSL_FILETYPE_PEM) < 1) {
USe PyObject_SetString() instead of PyObject_SetObject() in newSSLObject().
2001-10-10 22:33:32 +00:00
errstr = "SSL_CTX_use_PrivateKey_file error";
Fix two memory leaks in socket.ssl(). XXX [1] These changes aren't tested very thoroughly, because regrtest doesn't do any SSL tests. I've done some trivial tests on my own, but don't really know how to use the key and cert files. In one case, an SSL-level error causes Python to dump core. I'll get the fixed in the next round of changes. XXX [2] The checkin removes the x_attr member of the SSLObject struct. I'm not sure if this is kosher for backwards compatibility at the binary level. Perhaps its safer to keep the member but keep it assigned to NULL. And the leaks? newSSLObject() called PyDict_New(), stored the result in x_attr without checking it, and later stored NULL in x_attr without doing anything to the dict. So the dict always leaks. There is no further reference to x_attr, so I just removed it completely. The error cases in newSSLObject() passed the return value of PyString_FromString() directly to PyErr_SetObject(). PyErr_SetObject() expects a borrowed reference, so the string leaked.
2001-10-10 03:19:39 +00:00
goto fail;
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
}
if (SSL_CTX_use_certificate_chain_file(self->ctx,
Fix two memory leaks in socket.ssl(). XXX [1] These changes aren't tested very thoroughly, because regrtest doesn't do any SSL tests. I've done some trivial tests on my own, but don't really know how to use the key and cert files. In one case, an SSL-level error causes Python to dump core. I'll get the fixed in the next round of changes. XXX [2] The checkin removes the x_attr member of the SSLObject struct. I'm not sure if this is kosher for backwards compatibility at the binary level. Perhaps its safer to keep the member but keep it assigned to NULL. And the leaks? newSSLObject() called PyDict_New(), stored the result in x_attr without checking it, and later stored NULL in x_attr without doing anything to the dict. So the dict always leaks. There is no further reference to x_attr, so I just removed it completely. The error cases in newSSLObject() passed the return value of PyString_FromString() directly to PyErr_SetObject(). PyErr_SetObject() expects a borrowed reference, so the string leaked.
2001-10-10 03:19:39 +00:00
cert_file) < 1) {
USe PyObject_SetString() instead of PyObject_SetObject() in newSSLObject().
2001-10-10 22:33:32 +00:00
errstr = "SSL_CTX_use_certificate_chain_file error";
Fix two memory leaks in socket.ssl(). XXX [1] These changes aren't tested very thoroughly, because regrtest doesn't do any SSL tests. I've done some trivial tests on my own, but don't really know how to use the key and cert files. In one case, an SSL-level error causes Python to dump core. I'll get the fixed in the next round of changes. XXX [2] The checkin removes the x_attr member of the SSLObject struct. I'm not sure if this is kosher for backwards compatibility at the binary level. Perhaps its safer to keep the member but keep it assigned to NULL. And the leaks? newSSLObject() called PyDict_New(), stored the result in x_attr without checking it, and later stored NULL in x_attr without doing anything to the dict. So the dict always leaks. There is no further reference to x_attr, so I just removed it completely. The error cases in newSSLObject() passed the return value of PyString_FromString() directly to PyErr_SetObject(). PyErr_SetObject() expects a borrowed reference, so the string leaked.
2001-10-10 03:19:39 +00:00
goto fail;
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
}
}
SSL_CTX_set_verify(self->ctx,
SSL_VERIFY_NONE, NULL); /* set verify lvl */
self->ssl = SSL_new(self->ctx); /* New ssl struct */
SSL_set_fd(self->ssl, Sock->sock_fd); /* Set the socket for SSL */
SSL_set_connect_state(self->ssl);
Fix two memory leaks in socket.ssl(). XXX [1] These changes aren't tested very thoroughly, because regrtest doesn't do any SSL tests. I've done some trivial tests on my own, but don't really know how to use the key and cert files. In one case, an SSL-level error causes Python to dump core. I'll get the fixed in the next round of changes. XXX [2] The checkin removes the x_attr member of the SSLObject struct. I'm not sure if this is kosher for backwards compatibility at the binary level. Perhaps its safer to keep the member but keep it assigned to NULL. And the leaks? newSSLObject() called PyDict_New(), stored the result in x_attr without checking it, and later stored NULL in x_attr without doing anything to the dict. So the dict always leaks. There is no further reference to x_attr, so I just removed it completely. The error cases in newSSLObject() passed the return value of PyString_FromString() directly to PyErr_SetObject(). PyErr_SetObject() expects a borrowed reference, so the string leaked.
2001-10-10 03:19:39 +00:00
/* Actually negotiate SSL connection */
/* XXX If SSL_connect() returns 0, it's also a failure. */
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
ret = SSL_connect(self->ssl);
if (ret <= 0) {
PySSL_SetError(self->ssl, ret);
Fix two memory leaks in socket.ssl(). XXX [1] These changes aren't tested very thoroughly, because regrtest doesn't do any SSL tests. I've done some trivial tests on my own, but don't really know how to use the key and cert files. In one case, an SSL-level error causes Python to dump core. I'll get the fixed in the next round of changes. XXX [2] The checkin removes the x_attr member of the SSLObject struct. I'm not sure if this is kosher for backwards compatibility at the binary level. Perhaps its safer to keep the member but keep it assigned to NULL. And the leaks? newSSLObject() called PyDict_New(), stored the result in x_attr without checking it, and later stored NULL in x_attr without doing anything to the dict. So the dict always leaks. There is no further reference to x_attr, so I just removed it completely. The error cases in newSSLObject() passed the return value of PyString_FromString() directly to PyErr_SetObject(). PyErr_SetObject() expects a borrowed reference, so the string leaked.
2001-10-10 03:19:39 +00:00
goto fail;
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
}
self->ssl->debug = 1;
if ((self->server_cert = SSL_get_peer_certificate(self->ssl))) {
X509_NAME_oneline(X509_get_subject_name(self->server_cert),
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
self->server, X509_NAME_MAXLEN);
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
X509_NAME_oneline(X509_get_issuer_name(self->server_cert),
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
self->issuer, X509_NAME_MAXLEN);
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
}
self->Socket = Sock;
Py_INCREF(self->Socket);
return self;
Fix two memory leaks in socket.ssl(). XXX [1] These changes aren't tested very thoroughly, because regrtest doesn't do any SSL tests. I've done some trivial tests on my own, but don't really know how to use the key and cert files. In one case, an SSL-level error causes Python to dump core. I'll get the fixed in the next round of changes. XXX [2] The checkin removes the x_attr member of the SSLObject struct. I'm not sure if this is kosher for backwards compatibility at the binary level. Perhaps its safer to keep the member but keep it assigned to NULL. And the leaks? newSSLObject() called PyDict_New(), stored the result in x_attr without checking it, and later stored NULL in x_attr without doing anything to the dict. So the dict always leaks. There is no further reference to x_attr, so I just removed it completely. The error cases in newSSLObject() passed the return value of PyString_FromString() directly to PyErr_SetObject(). PyErr_SetObject() expects a borrowed reference, so the string leaked.
2001-10-10 03:19:39 +00:00
fail:
USe PyObject_SetString() instead of PyObject_SetObject() in newSSLObject().
2001-10-10 22:33:32 +00:00
if (errstr)
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
PyErr_SetString(PySSLErrorObject, errstr);
Fix two memory leaks in socket.ssl(). XXX [1] These changes aren't tested very thoroughly, because regrtest doesn't do any SSL tests. I've done some trivial tests on my own, but don't really know how to use the key and cert files. In one case, an SSL-level error causes Python to dump core. I'll get the fixed in the next round of changes. XXX [2] The checkin removes the x_attr member of the SSLObject struct. I'm not sure if this is kosher for backwards compatibility at the binary level. Perhaps its safer to keep the member but keep it assigned to NULL. And the leaks? newSSLObject() called PyDict_New(), stored the result in x_attr without checking it, and later stored NULL in x_attr without doing anything to the dict. So the dict always leaks. There is no further reference to x_attr, so I just removed it completely. The error cases in newSSLObject() passed the return value of PyString_FromString() directly to PyErr_SetObject(). PyErr_SetObject() expects a borrowed reference, so the string leaked.
2001-10-10 03:19:39 +00:00
Py_DECREF(self);
return NULL;
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
}
/* This is the Python function called for new object initialization */
static PyObject *
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
PySocket_ssl(PyObject *self, PyObject *args)
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
{
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
PySSLObject *rv;
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
PySocketSockObject *Sock;
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
char *key_file = NULL;
char *cert_file = NULL;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
if (!PyArg_ParseTuple(args, "O!|zz:ssl",
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
&PySocketSock_Type, (PyObject*)&Sock,
A bit of reformatting to match the standard style
2001-10-10 03:33:24 +00:00
&key_file, &cert_file))
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
return NULL;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
rv = newPySSLObject(Sock, key_file, cert_file);
A bit of reformatting to match the standard style
2001-10-10 03:33:24 +00:00
if (rv == NULL)
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
return NULL;
return (PyObject *)rv;
}
static char ssl_doc[] =
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
"ssl(socket, [keyfile, certfile]) -> sslobject";
/* SSL object methods */
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
static PyObject *
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
PySSL_server(PySSLObject *self)
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
{
return PyString_FromString(self->server);
}
static PyObject *
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
PySSL_issuer(PySSLObject *self)
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
{
return PyString_FromString(self->issuer);
}
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
static void PySSL_dealloc(PySSLObject *self)
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
{
if (self->server_cert) /* Possible not to have one? */
X509_free (self->server_cert);
In newSSLObject(), initialize the various members of an SSLObject to NULL. In SSL_dealloc(), free/dealloc them only if they're non-NULL. Fixes some obvious core dumps, but not sure yet if there are more semantics to the SSL calls that would affect the dealloc.
2001-10-10 03:37:05 +00:00
if (self->ssl)
SSL_free(self->ssl);
if (self->ctx)
SSL_CTX_free(self->ctx);
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
Py_XDECREF(self->Socket);
Vladimir Marangozov's long-awaited malloc restructuring. For more comments, read the patches@python.org archives. For documentation read the comments in mymalloc.h and objimpl.h. (This is not exactly what Vladimir posted to the patches list; I've made a few changes, and Vladimir sent me a fix in private email for a problem that only occurs in debug mode. I'm also holding back on his change to main.c, which seems unnecessary to me.)
2000-05-03 23:44:39 +00:00
PyObject_Del(self);
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
}
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
static PyObject *PySSL_SSLwrite(PySSLObject *self, PyObject *args)
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
{
char *data;
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
int len;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
Remove the optional integer argument to SSL_write; now it will always send the entire string passed to it
2001-02-07 20:41:17 +00:00
if (!PyArg_ParseTuple(args, "s#:write", &data, &len))
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
return NULL;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
Add sendall() method, which loops until all data is written or an error occurs, and doesn't return a count. (This is my second patch from SF patch #474307, with small change to the docstring for send().) 2.1.2 "bugfix" candidate.
2001-10-26 03:25:00 +00:00
Py_BEGIN_ALLOW_THREADS
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
len = SSL_write(self->ssl, data, len);
Add sendall() method, which loops until all data is written or an error occurs, and doesn't return a count. (This is my second patch from SF patch #474307, with small change to the docstring for send().) 2.1.2 "bugfix" candidate.
2001-10-26 03:25:00 +00:00
Py_END_ALLOW_THREADS
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
if (len > 0)
return PyInt_FromLong(len);
else
return PySSL_SetError(self->ssl, len);
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
}
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
static char PySSL_SSLwrite_doc[] =
"write(s) -> len\n\
\n\
Writes the string s into the SSL object. Returns the number\n\
of bytes written.";
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
static PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args)
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
{
PyObject *buf;
int count = 0;
int len = 1024;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
if (!PyArg_ParseTuple(args, "|i:read", &len))
return NULL;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
if (!(buf = PyString_FromStringAndSize((char *) 0, len)))
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
return NULL;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
Add sendall() method, which loops until all data is written or an error occurs, and doesn't return a count. (This is my second patch from SF patch #474307, with small change to the docstring for send().) 2.1.2 "bugfix" candidate.
2001-10-26 03:25:00 +00:00
Py_BEGIN_ALLOW_THREADS
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
count = SSL_read(self->ssl, PyString_AsString(buf), len);
Add sendall() method, which loops until all data is written or an error occurs, and doesn't return a count. (This is my second patch from SF patch #474307, with small change to the docstring for send().) 2.1.2 "bugfix" candidate.
2001-10-26 03:25:00 +00:00
Py_END_ALLOW_THREADS
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
if (count <= 0) {
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
Py_DECREF(buf);
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
return PySSL_SetError(self->ssl, count);
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
}
if (count != len && _PyString_Resize(&buf, count) < 0)
return NULL;
return buf;
}
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
static char PySSL_SSLread_doc[] =
"read([len]) -> string\n\
\n\
Read up to len bytes from the SSL socket.";
static PyMethodDef PySSLMethods[] = {
{"write", (PyCFunction)PySSL_SSLwrite, 1,
PySSL_SSLwrite_doc},
{"read", (PyCFunction)PySSL_SSLread, 1,
PySSL_SSLread_doc},
Fix a bunch of warnings reported by Skip. To whoever who changed a bunch of (PyCFunction) casts to (PyNoArgsFunction) in PyMethodDef initializers: don't do that. The cast is to shut the compiler up. The compiler wants the function pointer initializer to be a PyCFunction.
2001-10-15 21:12:54 +00:00
{"server", (PyCFunction)PySSL_server, METH_NOARGS},
{"issuer", (PyCFunction)PySSL_issuer, METH_NOARGS},
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
{NULL, NULL}
};
static PyObject *PySSL_getattr(PySSLObject *self, char *name)
{
return Py_FindMethod(PySSLMethods, (PyObject *)self, name);
}
staticforward PyTypeObject PySSL_Type = {
PyObject_HEAD_INIT(NULL)
0, /*ob_size*/
Oops. In the tp_name field, the name should be "_socket.socket", not "socket.socket" -- on Windows, "socket.socket" is the wrapper class. Also added the module name to the SSL type (which is not a new-style class -- I don't want to mess with it yet).
2001-10-28 12:31:33 +00:00
"_socket.SSL", /*tp_name*/
Commit parts of SF patch #462759 Use #define X509_NAME_MAXLEN for server/issuer length on an SSL object. Update doc strings for socket.ssl() and ssl methods read() and write(). PySSL_SSLwrite(): Check return value and raise exception on error. Use int for len instead of size_t. (All the function the size_t obj was passed to our from expected an int!) PySSL_SSLread(): Check return value of PyArg_ParseTuple()! More robust checks of return values from SSL_read().
2001-10-11 17:23:34 +00:00
sizeof(PySSLObject), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
(destructor)PySSL_dealloc, /*tp_dealloc*/
0, /*tp_print*/
(getattrfunc)PySSL_getattr, /*tp_getattr*/
0, /*tp_setattr*/
0, /*tp_compare*/
0, /*tp_repr*/
0, /*tp_as_number*/
0, /*tp_as_sequence*/
0, /*tp_as_mapping*/
0, /*tp_hash*/
};
Expose three OpenSSL API calls for dealing with the PRNG. Quoth the OpenSSL RAND_add man page: OpenSSL makes sure that the PRNG state is unique for each thread. On systems that provide /dev/urandom, the randomness device is used to seed the PRNG transparently. However, on all other systems, the application is responsible for seeding the PRNG by calling RAND_add(), RAND_egd(3) or RAND_load_file(3). I decided to expose RAND_add() because it's general and RAND_egd() because it's a useful special case. RAND_load_file() didn't seem to offer much over RAND_add(), so I skipped it. Also supplied RAND_status() which returns true if the PRNG is seeded and false if not.
2001-10-18 00:28:50 +00:00
/* helper routines for seeding the SSL PRNG */
static PyObject *
PySSL_RAND_add(PyObject *self, PyObject *args)
{
char *buf;
int len;
double entropy;
if (!PyArg_ParseTuple(args, "s#d:RAND_add", &buf, &len, &entropy))
return NULL;
RAND_add(buf, len, entropy);
Py_INCREF(Py_None);
return Py_None;
}
static char PySSL_RAND_add_doc[] =
"RAND_add(string, entropy)\n\
\n\
Mix string into the OpenSSL PRNG state. entropy (a float) is a lower\n\
bound on the entropy contained in string.";
static PyObject *
PySSL_RAND_status(PyObject *self)
{
return PyInt_FromLong(RAND_status());
}
static char PySSL_RAND_status_doc[] =
"RAND_status() -> 0 or 1\n\
\n\
Returns 1 if the OpenSSL PRNG has been seeded with enough data and 0 if not.\n\
It is necessary to seed the PRNG with RAND_add() on some platforms before\n\
using the ssl() function.";
static PyObject *
PySSL_RAND_egd(PyObject *self, PyObject *arg)
{
int bytes;
if (!PyString_Check(arg))
return PyErr_Format(PyExc_TypeError,
"RAND_egd() expected string, found %s",
arg->ob_type->tp_name);
bytes = RAND_egd(PyString_AS_STRING(arg));
if (bytes == -1) {
PyErr_SetString(PySSLErrorObject,
"EGD connection failed or EGD did not return "
"enough data to seed the PRNG");
return NULL;
}
return PyInt_FromLong(bytes);
}
static char PySSL_RAND_egd_doc[] =
(Hopefully) fix SF bug #472675: CVS socketmodule now doesn't compile This appears to be a case of a missing \n\ in a multiline string literal.
2001-10-19 12:40:40 +00:00
"RAND_egd(path) -> bytes\n\
Expose three OpenSSL API calls for dealing with the PRNG. Quoth the OpenSSL RAND_add man page: OpenSSL makes sure that the PRNG state is unique for each thread. On systems that provide /dev/urandom, the randomness device is used to seed the PRNG transparently. However, on all other systems, the application is responsible for seeding the PRNG by calling RAND_add(), RAND_egd(3) or RAND_load_file(3). I decided to expose RAND_add() because it's general and RAND_egd() because it's a useful special case. RAND_load_file() didn't seem to offer much over RAND_add(), so I skipped it. Also supplied RAND_status() which returns true if the PRNG is seeded and false if not.
2001-10-18 00:28:50 +00:00
\n\
Queries the entropy gather daemon (EGD) on socket path. Returns number\n\
of bytes read. Raises socket.sslerror if connection to EGD fails or\n\
if it does provide enough data to seed PRNG.";
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
#endif /* USE_SSL */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* List of functions exported by this module. */
new style
1994-10-10 17:59:00 +00:00
static PyMethodDef PySocket_methods[] = {
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"gethostbyname", PySocket_gethostbyname,
Use METH_VARARGS instead of numeric constant 1 in method def. tables
2000-08-03 02:06:16 +00:00
METH_VARARGS, gethostbyname_doc},
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"gethostbyname_ex", PySocket_gethostbyname_ex,
Use METH_VARARGS instead of numeric constant 1 in method def. tables
2000-08-03 02:06:16 +00:00
METH_VARARGS, ghbn_ex_doc},
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"gethostbyaddr", PySocket_gethostbyaddr,
Use METH_VARARGS instead of numeric constant 1 in method def. tables
2000-08-03 02:06:16 +00:00
METH_VARARGS, gethostbyaddr_doc},
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"gethostname", PySocket_gethostname,
Use METH_VARARGS instead of numeric constant 1 in method def. tables
2000-08-03 02:06:16 +00:00
METH_VARARGS, gethostname_doc},
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"getservbyname", PySocket_getservbyname,
Use METH_VARARGS instead of numeric constant 1 in method def. tables
2000-08-03 02:06:16 +00:00
METH_VARARGS, getservbyname_doc},
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"getprotobyname", PySocket_getprotobyname,
Use METH_VARARGS instead of numeric constant 1 in method def. tables
2000-08-03 02:06:16 +00:00
METH_VARARGS,getprotobyname_doc},
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
#ifndef NO_DUP
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"fromfd", PySocket_fromfd,
Use METH_VARARGS instead of numeric constant 1 in method def. tables
2000-08-03 02:06:16 +00:00
METH_VARARGS, fromfd_doc},
Changes to make it work and compile on NT, by Mark Hammond. (NT changes for posixmodule.c re-invented by Guido.)
1994-08-18 15:42:46 +00:00
#endif
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"ntohs", PySocket_ntohs,
Use METH_VARARGS instead of numeric constant 1 in method def. tables
2000-08-03 02:06:16 +00:00
METH_VARARGS, ntohs_doc},
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"ntohl", PySocket_ntohl,
Use METH_VARARGS instead of numeric constant 1 in method def. tables
2000-08-03 02:06:16 +00:00
METH_VARARGS, ntohl_doc},
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"htons", PySocket_htons,
Use METH_VARARGS instead of numeric constant 1 in method def. tables
2000-08-03 02:06:16 +00:00
METH_VARARGS, htons_doc},
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"htonl", PySocket_htonl,
Use METH_VARARGS instead of numeric constant 1 in method def. tables
2000-08-03 02:06:16 +00:00
METH_VARARGS, htonl_doc},
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"inet_aton", PySocket_inet_aton,
Use METH_VARARGS instead of numeric constant 1 in method def. tables
2000-08-03 02:06:16 +00:00
METH_VARARGS, inet_aton_doc},
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"inet_ntoa", PySocket_inet_ntoa,
Use METH_VARARGS instead of numeric constant 1 in method def. tables
2000-08-03 02:06:16 +00:00
METH_VARARGS, inet_ntoa_doc},
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
{"getaddrinfo", PySocket_getaddrinfo,
METH_VARARGS, getaddrinfo_doc},
{"getnameinfo", PySocket_getnameinfo,
METH_VARARGS, getnameinfo_doc},
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
#ifdef USE_SSL
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
{"ssl", PySocket_ssl,
Use METH_VARARGS instead of numeric constant 1 in method def. tables
2000-08-03 02:06:16 +00:00
METH_VARARGS, ssl_doc},
Expose three OpenSSL API calls for dealing with the PRNG. Quoth the OpenSSL RAND_add man page: OpenSSL makes sure that the PRNG state is unique for each thread. On systems that provide /dev/urandom, the randomness device is used to seed the PRNG transparently. However, on all other systems, the application is responsible for seeding the PRNG by calling RAND_add(), RAND_egd(3) or RAND_load_file(3). I decided to expose RAND_add() because it's general and RAND_egd() because it's a useful special case. RAND_load_file() didn't seem to offer much over RAND_add(), so I skipped it. Also supplied RAND_status() which returns true if the PRNG is seeded and false if not.
2001-10-18 00:28:50 +00:00
{"RAND_add", PySSL_RAND_add, METH_VARARGS,
PySSL_RAND_add_doc},
{"RAND_egd", PySSL_RAND_egd, METH_O,
PySSL_RAND_egd_doc},
{"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS,
PySSL_RAND_status_doc},
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
#endif /* USE_SSL */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
{NULL, NULL} /* Sentinel */
Initial revision
1991-06-25 21:36:08 +00:00
};
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* Convenience routine to export an integer value.
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
*
Apply two changes, systematically: (1) Use PyErr_NewException("module.class", NULL, NULL) to create the exception object. (2) Remove all calls to Py_FatalError(); instead, return or ignore the errors -- the import code now checks PyErr_Occurred() after calling a module's init function, so it's no longer a fatal error for the initialization to fail. Also did some small cleanups, e.g. removed unnecessary test for "already initialized" from initfpectl(), and unified initposix()/initnt(). I haven't checked this very thoroughly, so while the changes are pretty trivial -- beware of untested code!
1997-10-01 04:29:29 +00:00
* Errors are silently ignored, for better or for worse...
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
*/
Initial revision
1991-06-25 21:36:08 +00:00
static void
- ANSI-ification (patch #100770 by Peter Schneider-Kamp)
2000-07-09 15:09:56 +00:00
insint(PyObject *d, char *name, int value)
Initial revision
1991-06-25 21:36:08 +00:00
{
new style
1994-10-10 17:59:00 +00:00
PyObject *v = PyInt_FromLong((long) value);
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
if (!v || PyDict_SetItemString(d, name, v))
Apply two changes, systematically: (1) Use PyErr_NewException("module.class", NULL, NULL) to create the exception object. (2) Remove all calls to Py_FatalError(); instead, return or ignore the errors -- the import code now checks PyErr_Occurred() after calling a module's init function, so it's no longer a fatal error for the initialization to fail. Also did some small cleanups, e.g. removed unnecessary test for "already initialized" from initfpectl(), and unified initposix()/initnt(). I haven't checked this very thoroughly, so while the changes are pretty trivial -- beware of untested code!
1997-10-01 04:29:29 +00:00
PyErr_Clear();
Check of return values and proper error handling.
1997-01-03 17:18:10 +00:00
Apply two changes, systematically: (1) Use PyErr_NewException("module.class", NULL, NULL) to create the exception object. (2) Remove all calls to Py_FatalError(); instead, return or ignore the errors -- the import code now checks PyErr_Occurred() after calling a module's init function, so it's no longer a fatal error for the initialization to fail. Also did some small cleanups, e.g. removed unnecessary test for "already initialized" from initfpectl(), and unified initposix()/initnt(). I haven't checked this very thoroughly, so while the changes are pretty trivial -- beware of untested code!
1997-10-01 04:29:29 +00:00
Py_XDECREF(v);
Initial revision
1991-06-25 21:36:08 +00:00
}
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
changed windows test symbols; removed debug printf from sockets
1996-06-26 18:22:49 +00:00
#ifdef MS_WINDOWS
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
/* Additional initialization and cleanup for NT/Windows */
static void
Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', and a couple of functions that were missed in the previous batches. Not terribly tested, but very carefully scrutinized, three times. All these were found by the little findkrc.py that I posted to python-dev, which means there might be more lurking. Cases such as this: long func(a, b) long a; long b; /* flagword */ { and other cases where the last ; in the argument list isn't followed by a newline and an opening curly bracket. Regexps to catch all are welcome, of course ;)
2000-07-21 06:00:07 +00:00
NTcleanup(void)
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
{
WSACleanup();
}
static int
Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', and a couple of functions that were missed in the previous batches. Not terribly tested, but very carefully scrutinized, three times. All these were found by the little findkrc.py that I posted to python-dev, which means there might be more lurking. Cases such as this: long func(a, b) long a; long b; /* flagword */ { and other cases where the last ; in the argument list isn't followed by a newline and an opening curly bracket. Regexps to catch all are welcome, of course ;)
2000-07-21 06:00:07 +00:00
NTinit(void)
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
{
WSADATA WSAData;
int ret;
char buf[100];
ret = WSAStartup(0x0101, &WSAData);
switch (ret) {
case 0: /* no error */
atexit(NTcleanup);
return 1;
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:
sprintf -> PyOS_snprintf in some "obviously safe" cases. Also changed <>-style #includes to ""-style in some places where the former didn't make sense.
2001-11-28 20:27:42 +00:00
PyOS_snprintf(buf, sizeof(buf),
"WSAStartup failed: error code %d", ret);
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
PyErr_SetString(PyExc_ImportError, buf);
break;
}
return 0;
}
changed windows test symbols; removed debug printf from sockets
1996-06-26 18:22:49 +00:00
#endif /* MS_WINDOWS */
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
#if defined(PYOS_OS2)
/* Additional initialization and cleanup for OS/2 */
static void
Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', and a couple of functions that were missed in the previous batches. Not terribly tested, but very carefully scrutinized, three times. All these were found by the little findkrc.py that I posted to python-dev, which means there might be more lurking. Cases such as this: long func(a, b) long a; long b; /* flagword */ { and other cases where the last ; in the argument list isn't followed by a newline and an opening curly bracket. Regexps to catch all are welcome, of course ;)
2000-07-21 06:00:07 +00:00
OS2cleanup(void)
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
{
/* No cleanup is necessary for OS/2 Sockets */
}
static int
Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', and a couple of functions that were missed in the previous batches. Not terribly tested, but very carefully scrutinized, three times. All these were found by the little findkrc.py that I posted to python-dev, which means there might be more lurking. Cases such as this: long func(a, b) long a; long b; /* flagword */ { and other cases where the last ; in the argument list isn't followed by a newline and an opening curly bracket. Regexps to catch all are welcome, of course ;)
2000-07-21 06:00:07 +00:00
OS2init(void)
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
{
char reason[64];
int rc = sock_init();
if (rc == 0) {
Left-aligned preprocessor directives and changed C++ comments to C comments.
1997-12-02 20:37:32 +00:00
atexit(OS2cleanup);
return 1; /* Indicate Success */
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
}
sprintf(reason, "OS/2 TCP/IP Error# %d", sock_errno());
PyErr_SetString(PyExc_ImportError, reason);
Left-aligned preprocessor directives and changed C++ comments to C comments.
1997-12-02 20:37:32 +00:00
return 0; /* Indicate Failure */
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
}
#endif /* PYOS_OS2 */
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
/* Initialize this module.
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
* This is called when the first 'import socket' is done,
* via a table in config.c, if config.c is compiled with USE_SOCKET
* defined.
*
* For MS_WINDOWS (which means any Windows variant), this module
* is actually called "_socket", and there's a wrapper "socket.py"
* which implements some missing functionality (such as makefile(),
* dup() and fromfd()). The import of "_socket" may fail with an
* ImportError exception if initialization of WINSOCK fails. When
* WINSOCK is initialized succesfully, a call to WSACleanup() is
* scheduled to be made at exit time.
*
* For OS/2, this module is also called "_socket" and uses a wrapper
* "socket.py" which implements that functionality that is missing
* when PC operating systems don't put socket descriptors in the
* operating system's filesystem layer.
*/
Many changes to the interface, and added comments.
1991-06-27 15:51:29 +00:00
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
static char module_doc[] =
Remove a lot of the confusing conditional compilation from the beginning of the init_socket() function. This module is now *always* _socket.
2000-08-16 14:18:30 +00:00
"Implementation module for socket operations. See the socket module\n\
for documentation.";
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
Add DL_EXPORT() to all modules that could possibly be used on BeOS or Windows.
1998-12-04 18:50:17 +00:00
DL_EXPORT(void)
Create a new section of pyport.h to hold all external function declarations for systems that are missing those declarations from system include files. Start by moving a pointy-haired ones from their previous locations to the new section. (The gethostname() one, for instance, breaks on several systems, because some define it as (char *, size_t) and some as (char *, int).) I purposely decided not to include the summary of used #defines like Tim did in the first section of pyport.h. In my opinion, the number of #defines likedly to be used by this section would make such an overview unwieldy. I would suggest documenting the non-obvious ones, though.
2000-07-24 16:06:23 +00:00
init_socket(void)
Initial revision
1991-06-25 21:36:08 +00:00
{
new style
1994-10-10 17:59:00 +00:00
PyObject *m, *d;
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#ifdef RISCOS
_kernel_swi_regs r;
r.r[0]=0;
_kernel_swi(0x43380, &r, &r);
taskwindow = r.r[0];
#else
changed windows test symbols; removed debug printf from sockets
1996-06-26 18:22:49 +00:00
#ifdef MS_WINDOWS
More rational support for Windows (tested on Roj's NT 3.5 machine only). Use PyArg_ParseTuple() where it makes sense.
1996-06-20 16:25:29 +00:00
if (!NTinit())
return;
#else
Left-aligned preprocessor directives and changed C++ comments to C comments.
1997-12-02 20:37:32 +00:00
#if defined(__TOS_OS2__)
os2 patch by Jeff Rush
1997-11-22 21:53:48 +00:00
if (!OS2init())
return;
Remove a lot of the confusing conditional compilation from the beginning of the init_socket() function. This module is now *always* _socket.
2000-08-16 14:18:30 +00:00
#endif /* __TOS_OS2__ */
#endif /* MS_WINDOWS */
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#endif /* RISCOS */
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
PySocketSock_Type.ob_type = &PyType_Type;
Fixes to compile cPickle.c & socketmodule.c on cygwin and possibly other platforms that have funny ideas about whether addresses of functions in dlls are compile-time constants.
2001-11-09 10:06:23 +00:00
PySocketSock_Type.tp_getattro = PyObject_GenericGetAttr;
PySocketSock_Type.tp_alloc = PyType_GenericAlloc;
PySocketSock_Type.tp_free = _PyObject_Del;
SF Patch #103185, by jlt63: Some more standard modules cleanup for Cygwin
2001-01-22 15:29:14 +00:00
#ifdef USE_SSL
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
PySSL_Type.ob_type = &PyType_Type;
SF Patch #103185, by jlt63: Some more standard modules cleanup for Cygwin
2001-01-22 15:29:14 +00:00
#endif
Added copious docstrings, plus two minor layout tweaks.
1998-07-07 20:45:43 +00:00
m = Py_InitModule3("_socket", PySocket_methods, module_doc);
new style
1994-10-10 17:59:00 +00:00
d = PyModule_GetDict(m);
Apply two changes, systematically: (1) Use PyErr_NewException("module.class", NULL, NULL) to create the exception object. (2) Remove all calls to Py_FatalError(); instead, return or ignore the errors -- the import code now checks PyErr_Occurred() after calling a module's init function, so it's no longer a fatal error for the initialization to fail. Also did some small cleanups, e.g. removed unnecessary test for "already initialized" from initfpectl(), and unified initposix()/initnt(). I haven't checked this very thoroughly, so while the changes are pretty trivial -- beware of untested code!
1997-10-01 04:29:29 +00:00
PySocket_Error = PyErr_NewException("socket.error", NULL, NULL);
if (PySocket_Error == NULL)
return;
Auto-detect hstrerror. Raise socket.herror in PyH_Error. Register the three exception classes in the module dictionary.
2001-08-04 22:32:03 +00:00
PyDict_SetItemString(d, "error", PySocket_Error);
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
PyH_Error = PyErr_NewException("socket.herror", PySocket_Error, NULL);
if (PyH_Error == NULL)
return;
Auto-detect hstrerror. Raise socket.herror in PyH_Error. Register the three exception classes in the module dictionary.
2001-08-04 22:32:03 +00:00
PyDict_SetItemString(d, "herror", PyH_Error);
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
PyGAI_Error = PyErr_NewException("socket.gaierror", PySocket_Error,
NULL);
if (PyGAI_Error == NULL)
return;
Auto-detect hstrerror. Raise socket.herror in PyH_Error. Register the three exception classes in the module dictionary.
2001-08-04 22:32:03 +00:00
PyDict_SetItemString(d, "gaierror", PyGAI_Error);
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
#ifdef USE_SSL
SSL_load_error_strings();
SSLeay_add_ssl_algorithms();
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
PySSLErrorObject = PyErr_NewException("socket.sslerror", NULL, NULL);
if (PySSLErrorObject == NULL)
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
return;
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
PyDict_SetItemString(d, "sslerror", PySSLErrorObject);
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
if (PyDict_SetItemString(d, "SSLType",
Lots of code reorganization with a few small API changes. Change all the local names that start with SSL to start with PySSL. The OpenSSL library defines lots of calls that start with "SSL_". The calls for Python's SSL objects also started with "SSL_". This choice made it really confusing to figure out which calls were to the library and which calls were local to the file. Add PySSL_SetError() that sets an exception based on the information from SSL_get_error(). This function will eventually replace all the calls that set it with an error message that is based on the name of the call that failed rather than the reason it failed. (Example: If SSL_connect() failed it used to report "SSL_connect error" now it will offer a specific message about why SSL_connect failed.) XXX It might be helpful to augment the error message generated below with the name of the SSL function that generated the error. I expect it's obvious most of the time. Remove several unnecessary INCREFs in the module's constructor call. PyDict_SetItem() and friends do the INCREF for you.
2001-10-10 23:55:43 +00:00
(PyObject *)&PySSL_Type) != 0)
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
return;
Add a bunch of SSL error constants
2001-10-11 00:00:17 +00:00
PyModule_AddIntConstant(m, "SSL_ERROR_ZERO_RETURN",
SSL_ERROR_ZERO_RETURN);
PyModule_AddIntConstant(m, "SSL_ERROR_WANT_READ",
SSL_ERROR_WANT_READ);
PyModule_AddIntConstant(m, "SSL_ERROR_WANT_WRITE",
SSL_ERROR_WANT_WRITE);
PyModule_AddIntConstant(m, "SSL_ERROR_WANT_X509_LOOKUP",
SSL_ERROR_WANT_X509_LOOKUP);
PyModule_AddIntConstant(m, "SSL_ERROR_SYSCALL",
SSL_ERROR_SYSCALL);
PyModule_AddIntConstant(m, "SSL_ERROR_SSL",
SSL_ERROR_SSL);
OpenSSL support. This is based on patches for a version of SSLeay by Brian E Gallew, which were improved and adapted to OpenSSL 0.9.4 by Laszlo Kovacs of HP. Both have kindly given permission to include the patches in the Python distribution. Final formatting by GvR.
1999-12-07 21:37:17 +00:00
#endif /* USE_SSL */
socket_type -> SocketType
1997-06-02 22:18:09 +00:00
if (PyDict_SetItemString(d, "SocketType",
Add socket.socket_type, as discussed on c.l.p.
1997-05-21 14:37:37 +00:00
(PyObject *)&PySocketSock_Type) != 0)
Apply two changes, systematically: (1) Use PyErr_NewException("module.class", NULL, NULL) to create the exception object. (2) Remove all calls to Py_FatalError(); instead, return or ignore the errors -- the import code now checks PyErr_Occurred() after calling a module's init function, so it's no longer a fatal error for the initialization to fail. Also did some small cleanups, e.g. removed unnecessary test for "already initialized" from initfpectl(), and unified initposix()/initnt(). I haven't checked this very thoroughly, so while the changes are pretty trivial -- beware of untested code!
1997-10-01 04:29:29 +00:00
return;
Made SocketType and socket the same thing: a subclassable type whose constructor acts just like socket() before. All three arguments have a sensible default now; socket() is equivalent to socket(AF_INET, SOCK_STREAM). One minor issue: the socket() function and the SocketType had different doc strings; socket.__doc__ gave the signature, SocketType.__doc__ gave the methods. I've merged these for now, but maybe the list of methods is no longer necessary since it can easily be recovered through socket.__dict__.keys(). The problem with keeping it is that the total doc string is a bit long (34 lines -- it scrolls of a standard tty screen). Another general issue with the socket module is that it's a big mess. There's pages and pages of random platform #ifdefs, and the naming conventions are totally wrong: it uses Py prefixes and CapWords for static functions. That's a cleanup for another day... (Also I think the big starting comment that summarizes the API can go -- it's a repeat of the docstring.)
2001-10-27 22:20:47 +00:00
if (PyDict_SetItemString(d, "socket",
(PyObject *)&PySocketSock_Type) != 0)
return;
Patch by Marc-Andre Lemburg to add a bunch more symbols.
1999-08-09 14:40:40 +00:00
/* Address families (we only support AF_INET and AF_UNIX) */
#ifdef AF_UNSPEC
insint(d, "AF_UNSPEC", AF_UNSPEC);
#endif
Initial revision
1991-06-25 21:36:08 +00:00
insint(d, "AF_INET", AF_INET);
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
#ifdef AF_INET6
insint(d, "AF_INET6", AF_INET6);
#endif /* AF_INET6 */
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
#ifdef AF_UNIX
Initial revision
1991-06-25 21:36:08 +00:00
insint(d, "AF_UNIX", AF_UNIX);
Merge alpha100 branch back to main trunk
1994-08-01 11:34:53 +00:00
#endif /* AF_UNIX */
Patch by Marc-Andre Lemburg to add a bunch more symbols.
1999-08-09 14:40:40 +00:00
#ifdef AF_AX25
insint(d, "AF_AX25", AF_AX25); /* Amateur Radio AX.25 */
#endif
#ifdef AF_IPX
insint(d, "AF_IPX", AF_IPX); /* Novell IPX */
#endif
#ifdef AF_APPLETALK
insint(d, "AF_APPLETALK", AF_APPLETALK); /* Appletalk DDP */
#endif
#ifdef AF_NETROM
insint(d, "AF_NETROM", AF_NETROM); /* Amateur radio NetROM */
#endif
#ifdef AF_BRIDGE
insint(d, "AF_BRIDGE", AF_BRIDGE); /* Multiprotocol bridge */
#endif
#ifdef AF_AAL5
insint(d, "AF_AAL5", AF_AAL5); /* Reserved for Werner's ATM */
#endif
#ifdef AF_X25
insint(d, "AF_X25", AF_X25); /* Reserved for X.25 project */
#endif
#ifdef AF_INET6
insint(d, "AF_INET6", AF_INET6); /* IP version 6 */
#endif
#ifdef AF_ROSE
insint(d, "AF_ROSE", AF_ROSE); /* Amateur Radio X.25 PLP */
#endif
Autotest for netpacket/packet.h, as it is not available on all Linux versions. Depend AF_PACKET on HAVE_NETPACKET_PACKET_H. Fixes #449157
2001-08-10 20:29:40 +00:00
#ifdef HAVE_NETPACKET_PACKET_H
SF patch 101137 from Grant Edwards Adds support for raw packets (AF_PACKET) under Linux. I haven't tested this code thoroughly; it compiles and the basic calls all work without crashing. Not sure what to actually do with raw sockets though. Not sure what other platforms this might be useful for.
2001-02-02 03:23:09 +00:00
insint(d, "AF_PACKET", AF_PACKET);
insint(d, "PF_PACKET", PF_PACKET);
insint(d, "PACKET_HOST", PACKET_HOST);
insint(d, "PACKET_BROADCAST", PACKET_BROADCAST);
insint(d, "PACKET_MULTICAST", PACKET_MULTICAST);
insint(d, "PACKET_OTHERHOST", PACKET_OTHERHOST);
insint(d, "PACKET_OUTGOING", PACKET_OUTGOING);
insint(d, "PACKET_LOOPBACK", PACKET_LOOPBACK);
insint(d, "PACKET_FASTROUTE", PACKET_FASTROUTE);
RISCOS changes by dschwertberger.
2001-03-02 06:34:14 +00:00
#endif
Patch by Marc-Andre Lemburg to add a bunch more symbols.
1999-08-09 14:40:40 +00:00
/* Socket types */
Initial revision
1991-06-25 21:36:08 +00:00
insint(d, "SOCK_STREAM", SOCK_STREAM);
insint(d, "SOCK_DGRAM", SOCK_DGRAM);
Changes for BeOS, QNX and long long, by Chris Herborth.
1998-08-04 22:53:56 +00:00
#ifndef __BEOS__
/* We have incomplete socket support. */
Initial revision
1991-06-25 21:36:08 +00:00
insint(d, "SOCK_RAW", SOCK_RAW);
insint(d, "SOCK_SEQPACKET", SOCK_SEQPACKET);
insint(d, "SOCK_RDM", SOCK_RDM);
Changes for BeOS, QNX and long long, by Chris Herborth.
1998-08-04 22:53:56 +00:00
#endif
add socket related constants
1995-02-07 15:39:52 +00:00
#ifdef SO_DEBUG
insint(d, "SO_DEBUG", SO_DEBUG);
#endif
#ifdef SO_ACCEPTCONN
insint(d, "SO_ACCEPTCONN", SO_ACCEPTCONN);
#endif
#ifdef SO_REUSEADDR
insint(d, "SO_REUSEADDR", SO_REUSEADDR);
#endif
#ifdef SO_KEEPALIVE
insint(d, "SO_KEEPALIVE", SO_KEEPALIVE);
#endif
#ifdef SO_DONTROUTE
insint(d, "SO_DONTROUTE", SO_DONTROUTE);
#endif
#ifdef SO_BROADCAST
insint(d, "SO_BROADCAST", SO_BROADCAST);
#endif
#ifdef SO_USELOOPBACK
insint(d, "SO_USELOOPBACK", SO_USELOOPBACK);
#endif
#ifdef SO_LINGER
insint(d, "SO_LINGER", SO_LINGER);
#endif
#ifdef SO_OOBINLINE
insint(d, "SO_OOBINLINE", SO_OOBINLINE);
#endif
#ifdef SO_REUSEPORT
insint(d, "SO_REUSEPORT", SO_REUSEPORT);
#endif
#ifdef SO_SNDBUF
insint(d, "SO_SNDBUF", SO_SNDBUF);
#endif
#ifdef SO_RCVBUF
insint(d, "SO_RCVBUF", SO_RCVBUF);
#endif
#ifdef SO_SNDLOWAT
insint(d, "SO_SNDLOWAT", SO_SNDLOWAT);
#endif
#ifdef SO_RCVLOWAT
insint(d, "SO_RCVLOWAT", SO_RCVLOWAT);
#endif
#ifdef SO_SNDTIMEO
insint(d, "SO_SNDTIMEO", SO_SNDTIMEO);
#endif
#ifdef SO_RCVTIMEO
insint(d, "SO_RCVTIMEO", SO_RCVTIMEO);
#endif
#ifdef SO_ERROR
insint(d, "SO_ERROR", SO_ERROR);
#endif
#ifdef SO_TYPE
insint(d, "SO_TYPE", SO_TYPE);
#endif
/* Maximum number of connections for "listen" */
#ifdef SOMAXCONN
insint(d, "SOMAXCONN", SOMAXCONN);
#else
insint(d, "SOMAXCONN", 5); /* Common value */
#endif
/* Flags for send, recv */
#ifdef MSG_OOB
insint(d, "MSG_OOB", MSG_OOB);
#endif
#ifdef MSG_PEEK
insint(d, "MSG_PEEK", MSG_PEEK);
#endif
#ifdef MSG_DONTROUTE
insint(d, "MSG_DONTROUTE", MSG_DONTROUTE);
#endif
Patch by Charles G Waldman: 1) Adds MSG_DONTWAIT if defined (I needed this) 2) Spells "coreectly" correctly ;-)
2000-04-25 21:34:53 +00:00
#ifdef MSG_DONTWAIT
Fix typo in last patch -- the symbol's name is MSG_DONWAIT, not MSG_DONTWAIT. Reported by Fredrik Lundh.
2000-04-25 21:53:58 +00:00
insint(d, "MSG_DONTWAIT", MSG_DONTWAIT);
Patch by Charles G Waldman: 1) Adds MSG_DONTWAIT if defined (I needed this) 2) Spells "coreectly" correctly ;-)
2000-04-25 21:34:53 +00:00
#endif
add socket related constants
1995-02-07 15:39:52 +00:00
#ifdef MSG_EOR
insint(d, "MSG_EOR", MSG_EOR);
#endif
#ifdef MSG_TRUNC
insint(d, "MSG_TRUNC", MSG_TRUNC);
#endif
#ifdef MSG_CTRUNC
insint(d, "MSG_CTRUNC", MSG_CTRUNC);
#endif
#ifdef MSG_WAITALL
insint(d, "MSG_WAITALL", MSG_WAITALL);
#endif
#ifdef MSG_BTAG
insint(d, "MSG_BTAG", MSG_BTAG);
#endif
#ifdef MSG_ETAG
insint(d, "MSG_ETAG", MSG_ETAG);
#endif
/* Protocol level and numbers, usable for [gs]etsockopt */
#ifdef SOL_SOCKET
insint(d, "SOL_SOCKET", SOL_SOCKET);
#endif
Patch by Marc-Andre Lemburg to add a bunch more symbols.
1999-08-09 14:40:40 +00:00
#ifdef SOL_IP
insint(d, "SOL_IP", SOL_IP);
#else
insint(d, "SOL_IP", 0);
#endif
#ifdef SOL_IPX
insint(d, "SOL_IPX", SOL_IPX);
#endif
#ifdef SOL_AX25
insint(d, "SOL_AX25", SOL_AX25);
#endif
#ifdef SOL_ATALK
insint(d, "SOL_ATALK", SOL_ATALK);
#endif
#ifdef SOL_NETROM
insint(d, "SOL_NETROM", SOL_NETROM);
#endif
#ifdef SOL_ROSE
insint(d, "SOL_ROSE", SOL_ROSE);
#endif
#ifdef SOL_TCP
insint(d, "SOL_TCP", SOL_TCP);
#else
insint(d, "SOL_TCP", 6);
#endif
#ifdef SOL_UDP
insint(d, "SOL_UDP", SOL_UDP);
#else
insint(d, "SOL_UDP", 17);
#endif
add socket related constants
1995-02-07 15:39:52 +00:00
#ifdef IPPROTO_IP
insint(d, "IPPROTO_IP", IPPROTO_IP);
Some systems (e.g. Linux) use enums for some symbols (like IPPROTO_IP) so that our #ifdef test has the wrong effect. Substitute hardcoded values for some important symbols (but not for the whole range -- some are pretty obscure so it's not worth it).
1998-05-28 20:18:18 +00:00
#else
insint(d, "IPPROTO_IP", 0);
add socket related constants
1995-02-07 15:39:52 +00:00
#endif
Add more constants. Contributed by itojun.
2001-08-04 22:37:23 +00:00
#ifdef IPPROTO_HOPOPTS
insint(d, "IPPROTO_HOPOPTS", IPPROTO_HOPOPTS);
#endif
add socket related constants
1995-02-07 15:39:52 +00:00
#ifdef IPPROTO_ICMP
insint(d, "IPPROTO_ICMP", IPPROTO_ICMP);
Some systems (e.g. Linux) use enums for some symbols (like IPPROTO_IP) so that our #ifdef test has the wrong effect. Substitute hardcoded values for some important symbols (but not for the whole range -- some are pretty obscure so it's not worth it).
1998-05-28 20:18:18 +00:00
#else
insint(d, "IPPROTO_ICMP", 1);
add socket related constants
1995-02-07 15:39:52 +00:00
#endif
#ifdef IPPROTO_IGMP
insint(d, "IPPROTO_IGMP", IPPROTO_IGMP);
#endif
#ifdef IPPROTO_GGP
insint(d, "IPPROTO_GGP", IPPROTO_GGP);
#endif
Add more constants. Contributed by itojun.
2001-08-04 22:37:23 +00:00
#ifdef IPPROTO_IPV4
insint(d, "IPPROTO_IPV4", IPPROTO_IPV4);
#endif
#ifdef IPPROTO_IPIP
insint(d, "IPPROTO_IPIP", IPPROTO_IPIP);
#endif
add socket related constants
1995-02-07 15:39:52 +00:00
#ifdef IPPROTO_TCP
insint(d, "IPPROTO_TCP", IPPROTO_TCP);
Some systems (e.g. Linux) use enums for some symbols (like IPPROTO_IP) so that our #ifdef test has the wrong effect. Substitute hardcoded values for some important symbols (but not for the whole range -- some are pretty obscure so it's not worth it).
1998-05-28 20:18:18 +00:00
#else
insint(d, "IPPROTO_TCP", 6);
add socket related constants
1995-02-07 15:39:52 +00:00
#endif
#ifdef IPPROTO_EGP
insint(d, "IPPROTO_EGP", IPPROTO_EGP);
#endif
#ifdef IPPROTO_PUP
insint(d, "IPPROTO_PUP", IPPROTO_PUP);
#endif
#ifdef IPPROTO_UDP
insint(d, "IPPROTO_UDP", IPPROTO_UDP);
Some systems (e.g. Linux) use enums for some symbols (like IPPROTO_IP) so that our #ifdef test has the wrong effect. Substitute hardcoded values for some important symbols (but not for the whole range -- some are pretty obscure so it's not worth it).
1998-05-28 20:18:18 +00:00
#else
insint(d, "IPPROTO_UDP", 17);
add socket related constants
1995-02-07 15:39:52 +00:00
#endif
#ifdef IPPROTO_IDP
insint(d, "IPPROTO_IDP", IPPROTO_IDP);
#endif
#ifdef IPPROTO_HELLO
insint(d, "IPPROTO_HELLO", IPPROTO_HELLO);
#endif
#ifdef IPPROTO_ND
insint(d, "IPPROTO_ND", IPPROTO_ND);
#endif
#ifdef IPPROTO_TP
insint(d, "IPPROTO_TP", IPPROTO_TP);
#endif
Add more constants. Contributed by itojun.
2001-08-04 22:37:23 +00:00
#ifdef IPPROTO_IPV6
insint(d, "IPPROTO_IPV6", IPPROTO_IPV6);
#endif
#ifdef IPPROTO_ROUTING
insint(d, "IPPROTO_ROUTING", IPPROTO_ROUTING);
#endif
#ifdef IPPROTO_FRAGMENT
insint(d, "IPPROTO_FRAGMENT", IPPROTO_FRAGMENT);
#endif
#ifdef IPPROTO_RSVP
insint(d, "IPPROTO_RSVP", IPPROTO_RSVP);
#endif
#ifdef IPPROTO_GRE
insint(d, "IPPROTO_GRE", IPPROTO_GRE);
#endif
#ifdef IPPROTO_ESP
insint(d, "IPPROTO_ESP", IPPROTO_ESP);
#endif
#ifdef IPPROTO_AH
insint(d, "IPPROTO_AH", IPPROTO_AH);
#endif
#ifdef IPPROTO_MOBILE
insint(d, "IPPROTO_MOBILE", IPPROTO_MOBILE);
#endif
#ifdef IPPROTO_ICMPV6
insint(d, "IPPROTO_ICMPV6", IPPROTO_ICMPV6);
#endif
#ifdef IPPROTO_NONE
insint(d, "IPPROTO_NONE", IPPROTO_NONE);
#endif
#ifdef IPPROTO_DSTOPTS
insint(d, "IPPROTO_DSTOPTS", IPPROTO_DSTOPTS);
#endif
add socket related constants
1995-02-07 15:39:52 +00:00
#ifdef IPPROTO_XTP
insint(d, "IPPROTO_XTP", IPPROTO_XTP);
#endif
#ifdef IPPROTO_EON
insint(d, "IPPROTO_EON", IPPROTO_EON);
#endif
Add more constants. Contributed by itojun.
2001-08-04 22:37:23 +00:00
#ifdef IPPROTO_PIM
insint(d, "IPPROTO_PIM", IPPROTO_PIM);
#endif
#ifdef IPPROTO_IPCOMP
insint(d, "IPPROTO_IPCOMP", IPPROTO_IPCOMP);
#endif
#ifdef IPPROTO_VRRP
insint(d, "IPPROTO_VRRP", IPPROTO_VRRP);
#endif
add socket related constants
1995-02-07 15:39:52 +00:00
#ifdef IPPROTO_BIP
insint(d, "IPPROTO_BIP", IPPROTO_BIP);
#endif
/**/
#ifdef IPPROTO_RAW
insint(d, "IPPROTO_RAW", IPPROTO_RAW);
Some systems (e.g. Linux) use enums for some symbols (like IPPROTO_IP) so that our #ifdef test has the wrong effect. Substitute hardcoded values for some important symbols (but not for the whole range -- some are pretty obscure so it's not worth it).
1998-05-28 20:18:18 +00:00
#else
insint(d, "IPPROTO_RAW", 255);
add socket related constants
1995-02-07 15:39:52 +00:00
#endif
#ifdef IPPROTO_MAX
insint(d, "IPPROTO_MAX", IPPROTO_MAX);
#endif
/* Some port configuration */
#ifdef IPPORT_RESERVED
insint(d, "IPPORT_RESERVED", IPPORT_RESERVED);
#else
insint(d, "IPPORT_RESERVED", 1024);
#endif
#ifdef IPPORT_USERRESERVED
insint(d, "IPPORT_USERRESERVED", IPPORT_USERRESERVED);
#else
insint(d, "IPPORT_USERRESERVED", 5000);
#endif
add INADDR_* symbols
1995-02-17 15:11:07 +00:00
/* Some reserved IP v.4 addresses */
#ifdef INADDR_ANY
insint(d, "INADDR_ANY", INADDR_ANY);
#else
insint(d, "INADDR_ANY", 0x00000000);
#endif
#ifdef INADDR_BROADCAST
insint(d, "INADDR_BROADCAST", INADDR_BROADCAST);
#else
insint(d, "INADDR_BROADCAST", 0xffffffff);
#endif
#ifdef INADDR_LOOPBACK
insint(d, "INADDR_LOOPBACK", INADDR_LOOPBACK);
#else
insint(d, "INADDR_LOOPBACK", 0x7F000001);
#endif
#ifdef INADDR_UNSPEC_GROUP
insint(d, "INADDR_UNSPEC_GROUP", INADDR_UNSPEC_GROUP);
#else
insint(d, "INADDR_UNSPEC_GROUP", 0xe0000000);
#endif
#ifdef INADDR_ALLHOSTS_GROUP
insint(d, "INADDR_ALLHOSTS_GROUP", INADDR_ALLHOSTS_GROUP);
#else
insint(d, "INADDR_ALLHOSTS_GROUP", 0xe0000001);
#endif
#ifdef INADDR_MAX_LOCAL_GROUP
insint(d, "INADDR_MAX_LOCAL_GROUP", INADDR_MAX_LOCAL_GROUP);
#else
insint(d, "INADDR_MAX_LOCAL_GROUP", 0xe00000ff);
#endif
#ifdef INADDR_NONE
insint(d, "INADDR_NONE", INADDR_NONE);
#else
insint(d, "INADDR_NONE", 0xffffffff);
#endif
Add more constants. Contributed by itojun.
2001-08-04 22:37:23 +00:00
/* IPv4 [gs]etsockopt options */
add socket related constants
1995-02-07 15:39:52 +00:00
#ifdef IP_OPTIONS
insint(d, "IP_OPTIONS", IP_OPTIONS);
#endif
#ifdef IP_HDRINCL
insint(d, "IP_HDRINCL", IP_HDRINCL);
#endif
#ifdef IP_TOS
insint(d, "IP_TOS", IP_TOS);
#endif
#ifdef IP_TTL
insint(d, "IP_TTL", IP_TTL);
#endif
#ifdef IP_RECVOPTS
insint(d, "IP_RECVOPTS", IP_RECVOPTS);
#endif
#ifdef IP_RECVRETOPTS
insint(d, "IP_RECVRETOPTS", IP_RECVRETOPTS);
#endif
#ifdef IP_RECVDSTADDR
insint(d, "IP_RECVDSTADDR", IP_RECVDSTADDR);
#endif
#ifdef IP_RETOPTS
insint(d, "IP_RETOPTS", IP_RETOPTS);
#endif
#ifdef IP_MULTICAST_IF
insint(d, "IP_MULTICAST_IF", IP_MULTICAST_IF);
#endif
#ifdef IP_MULTICAST_TTL
insint(d, "IP_MULTICAST_TTL", IP_MULTICAST_TTL);
#endif
#ifdef IP_MULTICAST_LOOP
insint(d, "IP_MULTICAST_LOOP", IP_MULTICAST_LOOP);
#endif
#ifdef IP_ADD_MEMBERSHIP
insint(d, "IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP);
#endif
#ifdef IP_DROP_MEMBERSHIP
insint(d, "IP_DROP_MEMBERSHIP", IP_DROP_MEMBERSHIP);
#endif
Patch by Marc-Andre Lemburg to add a bunch more symbols.
1999-08-09 14:40:40 +00:00
#ifdef IP_DEFAULT_MULTICAST_TTL
insint(d, "IP_DEFAULT_MULTICAST_TTL", IP_DEFAULT_MULTICAST_TTL);
#endif
#ifdef IP_DEFAULT_MULTICAST_LOOP
insint(d, "IP_DEFAULT_MULTICAST_LOOP", IP_DEFAULT_MULTICAST_LOOP);
#endif
#ifdef IP_MAX_MEMBERSHIPS
insint(d, "IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS);
#endif
Add more constants. Contributed by itojun.
2001-08-04 22:37:23 +00:00
/* IPv6 [gs]etsockopt options, defined in RFC2553 */
#ifdef IPV6_JOIN_GROUP
insint(d, "IPV6_JOIN_GROUP", IPV6_JOIN_GROUP);
#endif
#ifdef IPV6_LEAVE_GROUP
insint(d, "IPV6_LEAVE_GROUP", IPV6_LEAVE_GROUP);
#endif
#ifdef IPV6_MULTICAST_HOPS
insint(d, "IPV6_MULTICAST_HOPS", IPV6_MULTICAST_HOPS);
#endif
#ifdef IPV6_MULTICAST_IF
insint(d, "IPV6_MULTICAST_IF", IPV6_MULTICAST_IF);
#endif
#ifdef IPV6_MULTICAST_LOOP
insint(d, "IPV6_MULTICAST_LOOP", IPV6_MULTICAST_LOOP);
#endif
#ifdef IPV6_UNICAST_HOPS
insint(d, "IPV6_UNICAST_HOPS", IPV6_UNICAST_HOPS);
#endif
Patch by Marc-Andre Lemburg to add a bunch more symbols.
1999-08-09 14:40:40 +00:00
/* TCP options */
#ifdef TCP_NODELAY
insint(d, "TCP_NODELAY", TCP_NODELAY);
#endif
#ifdef TCP_MAXSEG
insint(d, "TCP_MAXSEG", TCP_MAXSEG);
#endif
/* IPX options */
#ifdef IPX_TYPE
insint(d, "IPX_TYPE", IPX_TYPE);
#endif
Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>.
1998-04-09 20:56:35 +00:00
Patch #401196: IPv6 extensions to the socket module. New functions getnameinfo, getaddrinfo. New exceptions socket.gaierror, socket.herror. Various new constants, in particular AF_INET6 and error codes and parameters for getaddrinfo. AF_INET6 support in setipaddr, makesockaddr, getsockaddr, getsockaddrlen, gethost_common, PySocket_gethostbyaddr.
2001-07-21 18:05:31 +00:00
/* get{addr,name}info parameters */
#ifdef EAI_ADDRFAMILY
insint(d, "EAI_ADDRFAMILY", EAI_ADDRFAMILY);
#endif
#ifdef EAI_AGAIN
insint(d, "EAI_AGAIN", EAI_AGAIN);
#endif
#ifdef EAI_BADFLAGS
insint(d, "EAI_BADFLAGS", EAI_BADFLAGS);
#endif
#ifdef EAI_FAIL
insint(d, "EAI_FAIL", EAI_FAIL);
#endif
#ifdef EAI_FAMILY
insint(d, "EAI_FAMILY", EAI_FAMILY);
#endif
#ifdef EAI_MEMORY
insint(d, "EAI_MEMORY", EAI_MEMORY);
#endif
#ifdef EAI_NODATA
insint(d, "EAI_NODATA", EAI_NODATA);
#endif
#ifdef EAI_NONAME
insint(d, "EAI_NONAME", EAI_NONAME);
#endif
#ifdef EAI_SERVICE
insint(d, "EAI_SERVICE", EAI_SERVICE);
#endif
#ifdef EAI_SOCKTYPE
insint(d, "EAI_SOCKTYPE", EAI_SOCKTYPE);
#endif
#ifdef EAI_SYSTEM
insint(d, "EAI_SYSTEM", EAI_SYSTEM);
#endif
#ifdef EAI_BADHINTS
insint(d, "EAI_BADHINTS", EAI_BADHINTS);
#endif
#ifdef EAI_PROTOCOL
insint(d, "EAI_PROTOCOL", EAI_PROTOCOL);
#endif
#ifdef EAI_MAX
insint(d, "EAI_MAX", EAI_MAX);
#endif
#ifdef AI_PASSIVE
insint(d, "AI_PASSIVE", AI_PASSIVE);
#endif
#ifdef AI_CANONNAME
insint(d, "AI_CANONNAME", AI_CANONNAME);
#endif
#ifdef AI_NUMERICHOST
insint(d, "AI_NUMERICHOST", AI_NUMERICHOST);
#endif
#ifdef AI_MASK
insint(d, "AI_MASK", AI_MASK);
#endif
#ifdef AI_ALL
insint(d, "AI_ALL", AI_ALL);
#endif
#ifdef AI_V4MAPPED_CFG
insint(d, "AI_V4MAPPED_CFG", AI_V4MAPPED_CFG);
#endif
#ifdef AI_ADDRCONFIG
insint(d, "AI_ADDRCONFIG", AI_ADDRCONFIG);
#endif
#ifdef AI_V4MAPPED
insint(d, "AI_V4MAPPED", AI_V4MAPPED);
#endif
#ifdef AI_DEFAULT
insint(d, "AI_DEFAULT", AI_DEFAULT);
#endif
#ifdef NI_MAXHOST
insint(d, "NI_MAXHOST", NI_MAXHOST);
#endif
#ifdef NI_MAXSERV
insint(d, "NI_MAXSERV", NI_MAXSERV);
#endif
#ifdef NI_NOFQDN
insint(d, "NI_NOFQDN", NI_NOFQDN);
#endif
#ifdef NI_NUMERICHOST
insint(d, "NI_NUMERICHOST", NI_NUMERICHOST);
#endif
#ifdef NI_NAMEREQD
insint(d, "NI_NAMEREQD", NI_NAMEREQD);
#endif
#ifdef NI_NUMERICSERV
insint(d, "NI_NUMERICSERV", NI_NUMERICSERV);
#endif
#ifdef NI_DGRAM
insint(d, "NI_DGRAM", NI_DGRAM);
#endif
Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>.
1998-04-09 20:56:35 +00:00
/* Initialize gethostbyname lock */
Clean up pass for the previous patches. - Use HAVE_GETHOSTBYNAME_R_6_ARG instead of testing for Linux and glibc2. - If gethostbyname takes 3 args, undefine HAVE_GETHOSTBYNAME_R -- don't know what code should be used. - New symbol USE_GETHOSTBYNAME_LOCK defined iff the lock should be used. - Modify the gethostbyaddr() code to also hold on to the lock until after it is safe to release, overlapping with the Python lock. (Note: I think that it could in theory be possible that Python code executed while gethostbyname_lock is held could attempt to reacquire the lock -- e.g. in a signal handler or destructor. I will simply say "don't do that then.")
1999-03-22 21:44:51 +00:00
#ifdef USE_GETHOSTBYNAME_LOCK
Thanks to Chris Herborth, the thread primitives now have proper Py* names in the source code (they already had those for the linker, through some smart macros; but the source still had the old, un-Py names).
1998-12-21 19:32:43 +00:00
gethostbyname_lock = PyThread_allocate_lock();
Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>.
1998-04-09 20:56:35 +00:00
#endif
Initial revision
1991-06-25 21:36:08 +00:00
}
Emulate inet_{pton,ntop} on systems that don't provide it.
2001-06-24 21:18:26 +00:00
/* Simplistic emulation code for inet_pton that only works for IPv4 */
#ifndef HAVE_INET_PTON
Fix typos in inet_pton/inet_ntop.
2001-06-24 21:35:43 +00:00
int
Silence warnings in MSVC++: hide unused variables, add constness back to inet_pton/ntop, convert htons argument to u_short.
2001-07-21 09:42:15 +00:00
inet_pton (int af, const char *src, void *dst)
Emulate inet_{pton,ntop} on systems that don't provide it.
2001-06-24 21:18:26 +00:00
{
if(af == AF_INET){
long packed_addr;
#ifdef USE_GUSI1
packed_addr = (long)inet_addr(src).s_addr;
#else
packed_addr = inet_addr(src);
#endif
if (packed_addr == INADDR_NONE)
return 0;
memcpy(dst, &packed_addr, 4);
return 1;
}
/* Should set errno to EAFNOSUPPORT */
return -1;
}
Silence warnings in MSVC++: hide unused variables, add constness back to inet_pton/ntop, convert htons argument to u_short.
2001-07-21 09:42:15 +00:00
const char *
inet_ntop(int af, const void *src, char *dst, socklen_t size)
Emulate inet_{pton,ntop} on systems that don't provide it.
2001-06-24 21:18:26 +00:00
{
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
Reference in a new issue Copy permalink