Skip to content
Snippets Groups Projects
Commit 41f16134 authored by Jannis Konrad's avatar Jannis Konrad
Browse files

- reorganize module to avoid naming conflicts

- add logLevel to init
parent 200602f1
No related branches found
No related tags found
No related merge requests found
[submodule "tinydtls"]
path = tinydtls
path = lowlevel/tinydtls
url = https://git.eclipse.org/r/tinydtls/org.eclipse.tinydtls
import socket, dtls, time
import socket, time
import lowlevel.dtls as dtls
DTLS_CLIENT = dtls.DTLS_CLIENT
DTLS_SERVER = dtls.DTLS_SERVER
......@@ -11,11 +12,12 @@ class DTLSSocket():
outancbuff = None
_sock = None
def __init__(self, pskId=b"Client_identity", pskStore={b"Client_identity": b"secretPSK"}):
def __init__(self, pskId=b"Client_identity", pskStore={b"Client_identity": b"secretPSK"}, logLevel = dtls.DTLS_LOG_EMERG):
self._sock = socket.socket(family=socket.AF_INET6, type=socket.SOCK_DGRAM)
self._sock.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_RECVPKTINFO, 1)
self.d = dtls.DTLS(read=self._read, write=self._write, event=self._event, pskId=pskId, pskStore=pskStore)
print("Init done:", self._sock, self.d)
self.d.setLogLevel(logLevel)
#print("Init done:", self._sock, self.d)
def __del__(self):
self.connected.clear()
......@@ -121,7 +123,7 @@ class DTLSSocket():
print("Debug: dst =", dst)
mc = True
if mc:
ret = self.d.handleMessageAddr(dst[0], dst[1], data, mc)
ret = self.d.handleMessageAddr(dst[0], dst[1], data)
if ret != 0:
print("handleMessageAddr returned", ret)
raise BlockingIOError
......@@ -129,7 +131,7 @@ class DTLSSocket():
addr, port = src[:2]
addr = addr.split("%")[0]
#print("recvmsg call handleMessageAddr with:", addr, port)
ret = self.d.handleMessageAddr(addr, port, data, mc)
ret = self.d.handleMessageAddr(addr, port, data)
if ret != 0:
print("handleMessageAddr returned", ret)
raise BlockingIOError
......
File moved
File moved
tinydtls @ cc5863fa
File moved
......@@ -9,7 +9,7 @@ class prepare_tinydtls(build_ext):
def run(self):
def run_command(args):
print("Running:", " ".join(args))
subprocess.check_call(args, cwd="./tinydtls")
subprocess.check_call(args, cwd="./lowlevel/tinydtls")
commands = [
["autoconf"],
["autoheader"],
......@@ -20,12 +20,13 @@ class prepare_tinydtls(build_ext):
build_ext.run(self)
cy_build = cythonize([
Extension("dtls",
["dtls.pyx", "tinydtls/dtls.c", "tinydtls/crypto.c", "tinydtls/ccm.c",
"tinydtls/hmac.c", "tinydtls/netq.c", "tinydtls/peer.c", "tinydtls/dtls_time.c",
"tinydtls/session.c", "tinydtls/dtls_debug.c",
"tinydtls/aes/rijndael.c", "tinydtls/sha2/sha2.c"],
include_dirs=['tinydtls'],
Extension("lowlevel.dtls",
["lowlevel/dtls.pyx", "lowlevel/tinydtls/dtls.c", "lowlevel/tinydtls/crypto.c",
"lowlevel/tinydtls/ccm.c", "lowlevel/tinydtls/hmac.c", "lowlevel/tinydtls/netq.c",
"lowlevel/tinydtls/peer.c", "lowlevel/tinydtls/dtls_time.c",
"lowlevel/tinydtls/session.c", "lowlevel/tinydtls/dtls_debug.c",
"lowlevel/tinydtls/aes/rijndael.c", "lowlevel/tinydtls/sha2/sha2.c"],
include_dirs=['lowlevel/tinydtls'],
define_macros=[('DTLSv12', '1'),
('WITH_SHA256', '1'),
('DTLS_CHECK_CONTENTTYPE', '1'),
......
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment