Diff: main.cpp

Revision:

15:d0f20339c1ad

Parent:

14:ec9e195830ff

Child:

16:31c387e94b6d

--- a/main.cpp	Sat May 06 11:21:27 2017 +0000
+++ b/main.cpp	Sun May 07 03:00:16 2017 +0000
@@ -63,10 +63,10 @@
 #define LESHAN_SERVER "5.39.83.206"     
 #define LESHAN_PORT 5683
 #define UDP_TIMEOUT 60000
-#define UDP_PORT 56830
+#define UDP_PORT 5683
 #define DEVICE_OBJ_NUM 4
 
-#define LOCAL_PORT 56830
+#define LOCAL_PORT 5683
 
 
 // LCD 128X32
@@ -265,7 +265,7 @@
     //test_udp(eth);
     
     udp.open(&eth);
-    udp.set_timeout(UDP_TIMEOUT);
+    //udp.set_timeout(UDP_TIMEOUT);
     udp.bind(UDP_PORT);
     
     return ret;    
@@ -296,7 +296,7 @@
     //debug_dump(buffer,length);
     
     ret = udp.sendto(addr->get_ip_address(), addr->get_port(), (void *)buffer, (int)length);
-    if(ret!=0)
+    if(ret!=length)
     {
         return COAP_500_INTERNAL_SERVER_ERROR;
     }
@@ -416,18 +416,18 @@
             return -1;
         }
 
-        numBytes = udp.recvfrom(&client, buffer, sizeof(buffer));
+        numBytes = udp.recvfrom(&server, buffer, sizeof(buffer));
         if(numBytes <=0){
             printf("Error in recvfrom() - numBytes = 0\r\n");
-            return -1;
+            //return -1;
         }
         else
         {
-            printf("Received packet from: %s of size %d\n", client.get_ip_address(), numBytes);
+            printf("Received packet from: %s of size %d; session = 0x%x\n", server.get_ip_address(), numBytes, (int)(&server));
             //debug_dump((uint8_t *)buffer,numBytes);
             
             //Let liblwm2m respond to the query depending on the context
-            lwm2m_handle_packet(lwm2mH, buffer, numBytes, (void*) &client);
+            lwm2m_handle_packet(lwm2mH, buffer, numBytes, (void*) &server);
         }
     }//while()