summaryrefslogtreecommitdiffstats
path: root/Modules/socketmodule.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1992-09-08 09:05:33 (GMT)
committerGuido van Rossum <guido@python.org>1992-09-08 09:05:33 (GMT)
commitaee087946dbbcda815e8d337fa0b051b814a04fc (patch)
treeb3ffa5be07076015d6c8240da101d720a659c0f5 /Modules/socketmodule.c
parent4526f379bca5695b2144f1142f6a524d77bb7fe4 (diff)
downloadcpython-aee087946dbbcda815e8d337fa0b051b814a04fc.zip
cpython-aee087946dbbcda815e8d337fa0b051b814a04fc.tar.gz
cpython-aee087946dbbcda815e8d337fa0b051b814a04fc.tar.bz2
Made struct a standard built-in module; added string args to {set,get}sockopt;
added gl.gversion().
Diffstat (limited to 'Modules/socketmodule.c')
-rw-r--r--Modules/socketmodule.c64
1 files changed, 48 insertions, 16 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index ab8c6b5..b1ab96d 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -384,8 +384,10 @@ sock_allowbroadcast(s, args)
}
-/* s.setsockopt() method */
-/* XXX this works for integer flags only */
+/* s.setsockopt() method.
+ With an integer third argument, sets an integer option.
+ With a string third argument, sets an option from a buffer;
+ use optional built-in module 'struct' to encode the string. */
static object *
sock_setsockopt(s, args)
@@ -394,12 +396,21 @@ sock_setsockopt(s, args)
{
int level;
int optname;
- int flag;
int res;
+ char *buf;
+ int buflen;
+ int flag;
- if (!getargs(args, "(iii)", &level, &optname, &flag))
- return NULL;
- res = setsockopt(s->sock_fd, level, optname, &flag, sizeof flag);
+ if (getargs(args, "(iii)", &level, &optname, &flag)) {
+ buf = (char *) &flag;
+ buflen = sizeof flag;
+ }
+ else {
+ err_clear();
+ if (!getargs(args, "(iis#)", &level, &optname, &buf, &buflen))
+ return NULL;
+ }
+ res = setsockopt(s->sock_fd, level, optname, buf, buflen);
if (res < 0)
return socket_error();
INCREF(None);
@@ -407,8 +418,10 @@ sock_setsockopt(s, args)
}
-/* s.getsockopt() method */
-/* XXX this works for integer flags only */
+/* s.getsockopt() method.
+ With two arguments, retrieves an integer option.
+ With a third integer argument, retrieves a string buffer of that size;
+ use optional built-in module 'struct' to decode the string. */
static object *
sock_getsockopt(s, args)
@@ -417,18 +430,37 @@ sock_getsockopt(s, args)
{
int level;
int optname;
- int flag;
- int flagsize;
int res;
+ object *buf;
+ int buflen;
+ int flag;
- if (!getargs(args, "(ii)", &level, &optname))
+ if (getargs(args, "(ii)", &level, &optname)) {
+ int flag = 0;
+ int flagsize = sizeof flag;
+ res = getsockopt(s->sock_fd, level, optname, &flag, &flagsize);
+ if (res < 0)
+ return socket_error();
+ return newintobject(flag);
+ }
+ err_clear();
+ if (!getargs(args, "(iii)", &level, &optname, &buflen))
return NULL;
- flagsize = sizeof flag;
- flag = 0;
- res = getsockopt(s->sock_fd, level, optname, &flag, &flagsize);
- if (res < 0)
+ if (buflen <= 0 || buflen > 1024) {
+ err_setstr(SocketError, "getsockopt buflen out of range");
+ return NULL;
+ }
+ buf = newsizedstringobject((char *)NULL, buflen);
+ if (buf == NULL)
+ return NULL;
+ res = getsockopt(s->sock_fd, level, optname, getstringvalue(buf),
+ &buflen);
+ if (res < 0) {
+ DECREF(buf);
return socket_error();
- return newintobject(flag);
+ }
+ resizestring(&buf, buflen);
+ return buf;
}