leo/CoAP
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/Tanganelli/master' into development

Browse source
This commit is contained in:
Björn Freise 2021-01-18 09:26:17 +01:00
commit 209d4683c9
11 changed files with 64 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
coapthon/client/coap.py
View file

@ -65,6 +65,13 @@ class CoAP(object):
self._receiver_thread = None
def purge_transactions(self, timeout_time=defines.EXCHANGE_LIFETIME):
"""
Clean old transactions
"""
self._messageLayer.purge(timeout_time)
def close(self):
"""
Stop the client.
@ -96,16 +103,21 @@ class CoAP(object):
assert isinstance(c, int)
self._currentMID = c
def send_message(self, message):
def send_message(self, message, no_response=False):
"""
Prepare a message to send on the UDP socket. Eventually set retransmissions.
:param message: the message to send
:param no_response: whether to await a response from the request
"""
if isinstance(message, Request):
request = self._requestLayer.send_request(message)
request = self._observeLayer.send_request(request)
request = self._blockLayer.send_request(request)
if no_response:
# don't add the send message to the message layer transactions
self.send_datagram(request)
return
transaction = self._messageLayer.send_request(request)
self.send_datagram(transaction.request)
if transaction.request.type == defines.Types["CON"]:
@ -238,7 +250,7 @@ class CoAP(object):
while not self.stopped.isSet():
self._socket.settimeout(0.1)
try:
datagram, addr = self._socket.recvfrom(1152)
datagram, addr = self._socket.recvfrom(1500)
except socket.timeout: # pragma: no cover
continue
except Exception as e: # pragma: no cover

13
coapthon/client/helperclient.py
View file

@ -223,17 +223,26 @@ class HelperClient(object):
:param request: the request to send
:param callback: the callback function to invoke upon response
:param timeout: the timeout of the request
:param no_response: whether to await a response from the request
:return: the response
"""
if callback is not None:
thread = threading.Thread(target=self._thread_body, args=(request, callback))
thread.start()
else:
self.protocol.send_message(request)
self.protocol.send_message(request, no_response=no_response)
if no_response:
return
try:
response = self.queue.get(block=True, timeout=timeout)
while True:
response = self.queue.get(block=True, timeout=timeout)
if response is not None:
if response.mid == request.mid:
return response
if response.type == defines.Types["NON"]:
return response
else:
return response
except Empty:
#if timeout is set
response = None

2
coapthon/defines.py
View file

@ -125,7 +125,7 @@ class OptionRegistry(object):
LOCATION_QUERY = OptionItem(20,"Location-Query",STRING, True, None)
BLOCK2 = OptionItem(23, "Block2", INTEGER, False, None)
BLOCK1 = OptionItem(27, "Block1", INTEGER, False, None)
SIZE2 = OptionItem(28, "Size2", INTEGER, False, None)
SIZE2 = OptionItem(28, "Size2", INTEGER, False, 0)
PROXY_URI = OptionItem(35, "Proxy-Uri", STRING, False, None)
PROXY_SCHEME = OptionItem(39, "Proxy-Schema", STRING, False, None)
SIZE1 = OptionItem(60, "Size1", INTEGER, False, None)

4
coapthon/layers/blocklayer.py
View file

@ -60,7 +60,7 @@ class BlockLayer(object):
del transaction.request.block2
else:
# early negotiation
byte = 0
byte = num * size
self._block2_receive[key_token] = BlockItem(byte, num, m, size)
del transaction.request.block2
@ -233,6 +233,7 @@ class BlockLayer(object):
self._block2_receive[key_token] = BlockItem(byte, num, m, size)
# correct m
m = 0 if ((num * size) + size) > len(transaction.response.payload) else 1
# add size2 if requested or if payload is bigger than one datagram
@ -240,6 +241,7 @@ class BlockLayer(object):
if (transaction.request.size2 is not None and transaction.request.size2 == 0) or \
(transaction.response.payload is not None and len(transaction.response.payload) > defines.MAX_PAYLOAD):
transaction.response.size2 = len(transaction.response.payload)
transaction.response.payload = transaction.response.payload[byte:byte + size]
del transaction.response.block2
transaction.response.block2 = (num, m, size)

3
coapthon/layers/forwardLayer.py
View file

@ -53,11 +53,12 @@ class ForwardLayer(object):
:rtype : Transaction
:return: the edited transaction
"""
wkc_resource_is_defined = defines.DISCOVERY_URL in self._server.root
path = str("/" + transaction.request.uri_path)
transaction.response = Response()
transaction.response.destination = transaction.request.source
transaction.response.token = transaction.request.token
if path == defines.DISCOVERY_URL:
if path == defines.DISCOVERY_URL and not wkc_resource_is_defined:
transaction = self._server.resourceLayer.discover(transaction)
else:
new = False

6
coapthon/layers/messagelayer.py
View file

@ -42,17 +42,17 @@ class MessageLayer(object):
self._current_mid %= 65535
return current_mid
def purge(self):
def purge(self, timeout_time=defines.EXCHANGE_LIFETIME):
for k in list(self._transactions.keys()):
now = time.time()
transaction = self._transactions[k]
if transaction.timestamp + defines.EXCHANGE_LIFETIME < now:
if transaction.timestamp + timeout_time < now:
logger.debug("Delete transaction")
del self._transactions[k]
for k in list(self._transactions_token.keys()):
now = time.time()
transaction = self._transactions_token[k]
if transaction.timestamp + defines.EXCHANGE_LIFETIME < now:
if transaction.timestamp + timeout_time < now:
logger.debug("Delete transaction")
del self._transactions_token[k]

3
coapthon/layers/requestlayer.py
View file

@ -52,11 +52,12 @@ class RequestLayer(object):
:rtype : Transaction
:return: the edited transaction with the response to the request
"""
wkc_resource_is_defined = defines.DISCOVERY_URL in self._server.root
path = str("/" + transaction.request.uri_path)
transaction.response = Response()
transaction.response.destination = transaction.request.source
transaction.response.token = transaction.request.token
if path == defines.DISCOVERY_URL:
if path == defines.DISCOVERY_URL and not wkc_resource_is_defined:
transaction = self._server.resourceLayer.discover(transaction)
else:
try:

23
coapthon/messages/message.py
View file

@ -119,17 +119,16 @@ class Message(object):
"""
Set the Token of the message.
:type value: String
:type value: Bytes
:param value: the Token
:raise AttributeError: if value is longer than 256
"""
if value is None:
self._token = value
return
if isinstance(value, int):
value = bytes([value])
if not isinstance(value, bytes):
value = bytes(value, "utf-8")
value = bytes(value)
if len(value) > 256:
raise AttributeError
self._token = value
@ -647,7 +646,6 @@ class Message(object):
"""
self.del_option_by_number(defines.OptionRegistry.BLOCK2.number)
@property
def size1(self):
value = None
for option in self.options:
@ -668,14 +666,24 @@ class Message(object):
@property
def size2(self):
"""
Get the Size2 option.
:return: the Size2 value
"""
value = None
for option in self.options:
if option.number == defines.OptionRegistry.SIZE2.number:
value = option.value if option.value is not None else 0
value = option.value
return value
@size2.setter
def size2(self, value):
"""
Set the Size2 option.
:param value: the Block2 value
"""
option = Option()
option.number = defines.OptionRegistry.SIZE2.number
option.value = value
@ -683,6 +691,9 @@ class Message(object):
@size2.deleter
def size2(self):
"""
Delete the Size2 option.
"""
self.del_option_by_number(defines.OptionRegistry.SIZE2.number)
@property

9
coapthon/serializer.py
View file

@ -129,6 +129,9 @@ class Serializer(object):
return defines.Codes.BAD_REQUEST.number
except struct.error:
return defines.Codes.BAD_REQUEST.number
except UnicodeDecodeError as e:
logger.debug(e)
return defines.Codes.BAD_REQUEST.number
@staticmethod
def serialize(message):
@ -154,10 +157,8 @@ class Serializer(object):
values = [tmp, message.code, message.mid]
if message.token is not None and tkl > 0:
for b in message.token:
fmt += "B"
values.append(b)
fmt += "%ss" % tkl
values.append(message.token)
options = Serializer.as_sorted_list(message.options) # already sorted
lastoptionnumber = 0

3
coapthon/utils.py
View file

@ -201,3 +201,6 @@ class Tree(object):
def __delitem__(self, key):
del self.tree[key]
def __contains__(self, item):
return item in self.tree

2
exampleresources.py
View file

@ -1,3 +1,5 @@
#!/usr/bin/env python
import time
from coapthon import defines