mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Connection sockets now have the proper family/type/proto values.

Browse source 
Fix argument handling bug in socket(f,t,p) call.
Fix some comments.
This commit is contained in:
Guido van Rossum 1991-07-01 18:51:33 +00:00
parent 9db401333f
commit 4dd2a7e45b
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Modules/socketmodule.c
View file

@ -32,14 +32,14 @@ Limitations:
- only AF_INET and AF_UNIX address families are supported - only AF_INET and AF_UNIX address families are supported
- no asynchronous I/O - no asynchronous I/O
- no read/write operations (use send/recv instead) - no read/write operations (use send/recv instead)
- no flags on send/recv operations - no flags on sendto/recvfrom operations
- no setsockopt() call - no setsockopt() call
Interface: Interface:
- socket.gethostbyname(hostname) --> host IP address (string: 'dd.dd.dd.dd') - socket.gethostbyname(hostname) --> host IP address (string: 'dd.dd.dd.dd')
- socket.getservbyname(server, type) --> port number - socket.getservbyname(servername, protocolname) --> port number
- socket.socket(family, type) --> new socket object - socket.socket(family, type [, proto]) --> new socket object
- family and type constants from <socket.h> are accessed as socket.AF_INET etc. - family and type constants from <socket.h> are accessed as socket.AF_INET etc.
- errors are reported as the exception socket.error - errors are reported as the exception socket.error
- an Internet socket address is a pair (hostname, port) - an Internet socket address is a pair (hostname, port)
@ -325,7 +325,10 @@ sock_accept(s, args)
return socket_error(); return socket_error();
/* Create the new object with unspecified family, /* Create the new object with unspecified family,
to avoid calls to bind() etc. on it. */ to avoid calls to bind() etc. on it. */
res = makepair((object *) newsockobject(newfd, AF_UNSPEC, 0, 0), res = makepair((object *) newsockobject(newfd,
s->sock_family,
s->sock_type,
s->sock_proto),
makesockaddr((struct sockaddr *) addrbuf, addrlen)); makesockaddr((struct sockaddr *) addrbuf, addrlen));
if (res == NULL) if (res == NULL)
close(newfd); close(newfd);
@ -666,7 +669,7 @@ socket_socket(self, args)
sockobject *s; sockobject *s;
int family, type, proto, fd; int family, type, proto, fd;
if (args != NULL && is_tupleobject(args) && gettuplesize(args) == 3) { if (args != NULL && is_tupleobject(args) && gettuplesize(args) == 3) {
if (!getintintarg(args, &family, &type, &proto)) if (!getintintintarg(args, &family, &type, &proto))
return NULL; return NULL;
} }
else { else {