mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Jack Jansen: The GUSI 2.0 I/O library used on the Mac uses the

Browse source 
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.]
This commit is contained in:
Guido van Rossum 2000-04-24 15:16:03 +00:00
parent ddc3b63bf6
commit ff3ab42c04
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Modules/socketmodule.c
View file

@ -172,7 +172,7 @@ int shutdown( int, int );
#ifdef __BEOS__ #ifdef __BEOS__
#include <net/netdb.h> #include <net/netdb.h>
#else #else
#ifndef macintosh #ifndef USE_GUSI1
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #endif
#endif #endif
@ -192,7 +192,7 @@ int shutdown( int, int );
#define O_NDELAY O_NONBLOCK /* For QNX only? */ #define O_NDELAY O_NONBLOCK /* For QNX only? */
#endif #endif
#ifdef USE_GUSI #ifdef USE_GUSI1
/* fdopen() isn't declared in stdio.h (sigh) */ /* fdopen() isn't declared in stdio.h (sigh) */
#include <GUSI.h> #include <GUSI.h>
#endif #endif
@ -664,7 +664,8 @@ static PyObject *
BUILD_FUNC_DEF_2(PySocketSock_accept,PySocketSockObject *,s, PyObject *,args) BUILD_FUNC_DEF_2(PySocketSock_accept,PySocketSockObject *,s, PyObject *,args)
{ {
char addrbuf[256]; char addrbuf[256];
int addrlen, newfd; int newfd;
socklen_t addrlen;
PyObject *sock = NULL; PyObject *sock = NULL;
PyObject *addr = NULL; PyObject *addr = NULL;
PyObject *res = NULL; PyObject *res = NULL;
@ -808,7 +809,7 @@ BUILD_FUNC_DEF_2(PySocketSock_getsockopt,PySocketSockObject *,s, PyObject *,args
int optname; int optname;
int res; int res;
PyObject *buf; PyObject *buf;
int buflen = 0; socklen_t buflen = 0;
#ifdef __BEOS__ #ifdef __BEOS__
/* We have incomplete socket support. */ /* We have incomplete socket support. */
@ -822,7 +823,7 @@ BUILD_FUNC_DEF_2(PySocketSock_getsockopt,PySocketSockObject *,s, PyObject *,args
if (buflen == 0) { if (buflen == 0) {
int flag = 0; int flag = 0;
int flagsize = sizeof flag; socklen_t flagsize = sizeof flag;
res = getsockopt(s->sock_fd, level, optname, res = getsockopt(s->sock_fd, level, optname,
(ANY *)&flag, &flagsize); (ANY *)&flag, &flagsize);
if (res < 0) if (res < 0)
@ -1010,7 +1011,9 @@ static PyObject *
BUILD_FUNC_DEF_2(PySocketSock_getsockname,PySocketSockObject *,s, PyObject *,args) BUILD_FUNC_DEF_2(PySocketSock_getsockname,PySocketSockObject *,s, PyObject *,args)
{ {
char addrbuf[256]; char addrbuf[256];
int addrlen, res; int res;
socklen_t addrlen;
if (!PyArg_ParseTuple(args, ":getsockname")) if (!PyArg_ParseTuple(args, ":getsockname"))
return NULL; return NULL;
if (!getsockaddrlen(s, &addrlen)) if (!getsockaddrlen(s, &addrlen))
@ -1038,7 +1041,9 @@ static PyObject *
BUILD_FUNC_DEF_2(PySocketSock_getpeername,PySocketSockObject *,s, PyObject *,args) BUILD_FUNC_DEF_2(PySocketSock_getpeername,PySocketSockObject *,s, PyObject *,args)
{ {
char addrbuf[256]; char addrbuf[256];
int addrlen, res; int res;
socklen_t addrlen;
if (!PyArg_ParseTuple(args, ":getpeername")) if (!PyArg_ParseTuple(args, ":getpeername"))
return NULL; return NULL;
if (!getsockaddrlen(s, &addrlen)) if (!getsockaddrlen(s, &addrlen))
@ -1177,7 +1182,8 @@ BUILD_FUNC_DEF_2(PySocketSock_recvfrom,PySocketSockObject *,s, PyObject *,args)
PyObject *addr = NULL; PyObject *addr = NULL;
PyObject *ret = NULL; PyObject *ret = NULL;
int addrlen, len, n, flags = 0; int len, n, flags = 0;
socklen_t addrlen;
if (!PyArg_ParseTuple(args, "i|i:recvfrom", &len, &flags)) if (!PyArg_ParseTuple(args, "i|i:recvfrom", &len, &flags))
return NULL; return NULL;
if (!getsockaddrlen(s, &addrlen)) if (!getsockaddrlen(s, &addrlen))
@ -1882,7 +1888,7 @@ BUILD_FUNC_DEF_2(PySocket_inet_aton, PyObject *, self, PyObject *, args)
if (!PyArg_ParseTuple(args, "s:inet_aton", &ip_addr)) { if (!PyArg_ParseTuple(args, "s:inet_aton", &ip_addr)) {
return NULL; return NULL;
} }
#ifdef macintosh #ifdef USE_GUSI1
packed_addr = (long)inet_addr(ip_addr).s_addr; packed_addr = (long)inet_addr(ip_addr).s_addr;
#else #else
packed_addr = inet_addr(ip_addr); packed_addr = inet_addr(ip_addr);