Diff: coapServer.cpp

Revision:

2:c3ca8b8526e0

Parent:

1:1d936c763440

Child:

4:9f635ab44d8e

diff -r 1d936c763440 -r c3ca8b8526e0 coapServer.cpp
--- a/coapServer.cpp	Sun Jan 20 13:48:02 2019 +0000
+++ b/coapServer.cpp	Sun Jan 20 23:27:10 2019 +0000
@@ -3,18 +3,20 @@
 //
 
 #include "coapServer.h"
+#include "dbg.h"
 
 int CoapServer::listen(uint8_t* buffer, int len, METHOD* requestMethod, int* uriNumber) {
     uint8_t requestBuffer[radioWrapper.packetSize()];
     int ret = radioWrapper.read(requestBuffer, radioWrapper.packetSize(), this->listeningTimeout);
+    DBG("REC: %d \r\n", ret);
     if (ret < 0) {
         return RADIO_NOT_WORKING;
-    } else {
-        CoapPDU request(requestBuffer, radioWrapper.packetSize(), ret);
+    } else if (ret > 0) {
+        CoapPDU request(requestBuffer, ret, radioWrapper.packetSize());
         if (request.validate()) {
-
+            request.printHuman();
             this->lastMessageId = request.getMessageID();
-            std::memcpy(this->lastMessageToken, request.getTokenPointer(), 4);
+            std::memcpy(this->lastMessageToken, request.getTokenPointer(), 1);
             if (request.getPayloadLength() <= len) {
                 std::memcpy(buffer, request.getPayloadPointer(), static_cast<size_t>(request.getPayloadLength()));
                 if (request.getCode() == CoapPDU::COAP_GET) {
@@ -26,13 +28,14 @@
                 int requestUriLen = 0;
                 request.getURI(requestUri, 32, &requestUriLen);
                 bool foundMatchingUri = false;
+                DBG("URI: %s", requestUri);
                 for (int i = 0; i < urisNumber; ++i) {
-                    if(std::strcmp(requestUri, this->uris[i].data()) == 0) {
+                    if (std::strcmp(requestUri, this->uris[i].data()) == 0) {
                         *uriNumber = i;
                         foundMatchingUri = true;
                     }
                 }
-                if(!foundMatchingUri) {
+                if (!foundMatchingUri) {
                     return UNKNOWN_URI;
                 }
                 return request.getPayloadLength();
@@ -48,21 +51,28 @@
     CoapPDU response = CoapPDU();
     prepareAckPDU(response);
     response.setCode(responseCode);
+
+    DBG("uri: %d, %s", (int) uris[uri].size(), uris[uri].data());
+    if (response.addOption(CoapPDU::COAP_OPTION_URI_PATH, (int) uris[uri].size(), (uint8_t*) uris[uri].data()) != 0) {
+        return COAP_ERROR;
+    }
+    DBG("SEND RESPONSE");
     response.setPayload(buffer, len);
-    response.setURI((char*) uris[uri].data(), (int)uris[uri].size());
+    response.printHuman();
     int ret = radioWrapper.write(response.getPDUPointer(), response.getPDULength());
-    if(ret < 0) {
+    if (ret < 0) {
         return RADIO_NOT_WORKING;
     }
-    return 0;
+    return ret;
 }
 
 void CoapServer::prepareAckPDU(CoapPDU& coapPDU) {
     coapPDU.setVersion(1);
     coapPDU.setType(CoapPDU::COAP_ACKNOWLEDGEMENT);
     coapPDU.setMessageID(this->lastMessageId);
-    coapPDU.setToken(this->lastMessageToken, 4);
+    coapPDU.setToken(this->lastMessageToken, 1);
 }
 
-CoapServer::CoapServer(int timeout, std::string* uris, int urisNumber, int channel, unsigned long long rx_address,  unsigned long long tx_address): 
-listeningTimeout(timeout), radioWrapper(channel, rx_address, tx_address), urisNumber(urisNumber), uris(uris) {}
\ No newline at end of file
+CoapServer::CoapServer(int timeout, std::string* uris, int urisNumber, int channel, unsigned long long rx_address,
+                       unsigned long long tx_address) :
+        listeningTimeout(timeout), radioWrapper(channel, rx_address, tx_address), urisNumber(urisNumber), uris(uris) {}
\ No newline at end of file