Merge remote-tracking branch 'refs/remotes/upstream/master'

coapthon/client/helperclient.py

@@ -99,6 +99,24 @@ class HelperClient(object):
 
         return self.send_request(request, callback, timeout)
 
+    def get_non(self, path, callback=None, timeout=None, **kwargs):  # pragma: no cover
+        """
+        Perform a GET on a certain path.
+
+        :param path: the path
+        :param callback: the callback function to invoke upon response
+        :param timeout: the timeout of the request
+        :return: the response
+        """
+        request = self.mk_request_non(defines.Codes.GET, path)
+        request.token = generate_random_token(2)
+
+        for k, v in kwargs.items():
+            if hasattr(request, k):
+                setattr(request, k, v)
+
+        return self.send_request(request, callback, timeout)
+
     def observe(self, path, callback, timeout=None, **kwargs):  # pragma: no cover
         """
         Perform a GET with observe on a certain path.
@@ -243,4 +261,19 @@ class HelperClient(object):
         request.uri_path = path
         return request
 
+    def mk_request_non(self, method, path):
+        """
+        Create a request.
+
+        :param method: the CoAP method
+        :param path: the path of the request
+        :return:  the request
+        """
+        request = Request()
+        request.destination = self.server
+        request.code = method.number
+        request.uri_path = path
+        request.type = defines.Types["NON"]
+        return request
+
 

coapthon/layers/blocklayer.py

@@ -141,10 +141,10 @@ class BlockLayer(object):
             item.num += 1
             item.byte += item.size
             if len(item.payload) <= item.byte:
-                m = 0
+                item.m = 0
             else:
-                m = 1
-            request.block1 = (item.num, m, item.size)
+                item.m = 1
+            request.block1 = (item.num, item.m, item.size)
         elif transaction.response.block2 is not None:
 
             num, m, size = transaction.response.block2

coapthon/server/coap.py

@@ -16,14 +16,18 @@ from coapthon.messages.request import Request
 from coapthon.messages.response import Response
 from coapthon.resources.resource import Resource
 from coapthon.serializer import Serializer
-from coapthon.utils import Tree
+from coapthon.utils import Tree, create_logging
 import collections
 
 
 __author__ = 'Giacomo Tanganelli'
 
 
+if not os.path.isfile("logging.conf"):
+    create_logging()
+
 logger = logging.getLogger(__name__)
+logging.config.fileConfig("logging.conf", disable_existing_loggers=False)
 
 
 class CoAP(object):
@@ -79,16 +83,10 @@ class CoAP(object):
             # Join group
             if addrinfo[0] == socket.AF_INET:  # IPv4
                 self._socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
-
-                # Allow multiple copies of this program on one machine
-                # (not strictly needed)
                 self._socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-                self._socket.bind((defines.ALL_COAP_NODES, self.server_address[1]))
+                self._socket.bind(('', self.server_address[1]))
                 mreq = struct.pack("4sl", socket.inet_aton(defines.ALL_COAP_NODES), socket.INADDR_ANY)
                 self._socket.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, mreq)
-                self._unicast_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-                self._unicast_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-                self._unicast_socket.bind(self.server_address)
             else:
                 self._socket = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
 
@@ -104,7 +102,6 @@ class CoAP(object):
                 self._unicast_socket = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
                 self._unicast_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
                 self._unicast_socket.bind(self.server_address)
-
         else:
             if addrinfo[0] == socket.AF_INET:  # IPv4
                 self._socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
@@ -252,9 +249,6 @@ class CoAP(object):
             logger.debug("send_datagram - " + str(message))
             serializer = Serializer()
             message = serializer.serialize(message)
-            if self.multicast:
-                self._unicast_socket.sendto(message, (host, port))
-            else:
             self._socket.sendto(message, (host, port))
 
     def add_resource(self, path, resource):
@@ -279,8 +273,6 @@ class CoAP(object):
             except KeyError:
                 res = None
             if res is None:
-                if len(paths) != i:
-                    return False
                 resource.path = actual_path
                 self.root[actual_path] = resource
         return True