diff options
| author | chenzhengzhang <jerry.zzpku@gmail.com> | 2011-04-19 07:56:30 +0200 |
|---|---|---|
| committer | chenzhengzhang <jerry.zzpku@gmail.com> | 2011-04-19 07:56:30 +0200 |
| commit | fe0c557fa06274df7610c0d07a6c6bb827a5cd3f (patch) | |
| tree | 0a8e607b974caea736e392396112d8bea6c60237 /src/lib/dns/python/edns_python.cc | |
| parent | [trac749] rename namespace (diff) | |
| parent | [master] Fix Makefile (diff) | |
| download | kea-fe0c557fa06274df7610c0d07a6c6bb827a5cd3f.tar.xz kea-fe0c557fa06274df7610c0d07a6c6bb827a5cd3f.zip | |
[trac749] Merge 'master' into trac749
Conflicts:
src/bin/auth/auth_srv.h
src/bin/resolver/resolver.h
src/lib/Makefile.am
src/lib/asiodns/dns_lookup.h
src/lib/asiodns/io_fetch.cc
src/lib/asiodns/io_fetch.h
src/lib/asiodns/qid_gen.cc
src/lib/asiodns/qid_gen.h
src/lib/asiodns/tcp_server.cc
src/lib/asiodns/tests/qid_gen_unittest.cc
src/lib/asiodns/udp_server.cc
src/lib/asiolink/Makefile.am
src/lib/asiolink/qid_gen.cc
src/lib/asiolink/qid_gen.h
src/lib/asiolink/tests/Makefile.am
src/lib/asiolink/tests/qid_gen_unittest.cc
src/lib/asiolink/tests/tcp_socket_unittest.cc
src/lib/asiolink/tests/udp_socket_unittest.cc
src/lib/dns/rdata.h
src/lib/resolve/recursive_query.cc
src/lib/resolve/recursive_query.h
src/lib/resolve/tests/recursive_query_unittest_2.cc
src/lib/testutils/srv_test.cc
src/lib/util/Makefile.am
src/lib/util/io_utilities.h
src/lib/util/random/qid_gen.cc
src/lib/util/random/qid_gen.h
src/lib/util/tests/io_utilities_unittest.cc
src/lib/util/tests/qid_gen_unittest.cc
Diffstat (limited to 'src/lib/dns/python/edns_python.cc')
| -rw-r--r-- | src/lib/dns/python/edns_python.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/dns/python/edns_python.cc b/src/lib/dns/python/edns_python.cc index 07dcc14c6b..d781e894de 100644 --- a/src/lib/dns/python/edns_python.cc +++ b/src/lib/dns/python/edns_python.cc @@ -298,12 +298,15 @@ EDNS_getUDPSize(const s_EDNS* const self) { PyObject* EDNS_setUDPSize(s_EDNS* self, PyObject* args) { - unsigned int size; - if (!PyArg_ParseTuple(args, "I", &size)) { + long size; + if (!PyArg_ParseTuple(args, "l", &size)) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, + "No valid type in set_udp_size argument"); return (NULL); } - if (size > 65535) { - PyErr_SetString(PyExc_OverflowError, + if (size < 0 || size > 0xffff) { + PyErr_SetString(PyExc_ValueError, "UDP size is not an unsigned 16-bit integer"); return (NULL); } |