Merge pull request #338 from boyvinall/client-port

awa_clientd and static API bind to random port
ConnectivityFoundry · Feb 3, 2017 · b6c0a62 · b6c0a62
2 parents 28088bc + fc6ac7e
commit b6c0a62
Show file tree

Hide file tree

Showing 11 changed files with 344 additions and 333 deletions.
diff --git a/api/examples/tutorials/static-client-tutorial1.c b/api/examples/tutorials/static-client-tutorial1.c
@@ -30,7 +30,7 @@ int main(void)
 
     AwaStaticClient_SetLogLevel(AwaLogLevel_Error);
     AwaStaticClient_SetEndPointName(awaClient, "AwaStaticClient1");
-    AwaStaticClient_SetCoAPListenAddressPort(awaClient, "0.0.0.0", 6000);
+    AwaStaticClient_SetCoAPListenAddressPort(awaClient, "0.0.0.0", 0);
     AwaStaticClient_SetBootstrapServerURI(awaClient, "coap://[127.0.0.1]:15685");
 
     AwaStaticClient_Init(awaClient);

diff --git a/api/examples/tutorials/static-client-tutorial2.c b/api/examples/tutorials/static-client-tutorial2.c
@@ -63,7 +63,7 @@ int main(void)
 
     AwaStaticClient_SetLogLevel(AwaLogLevel_Error);
     AwaStaticClient_SetEndPointName(awaClient, "AwaStaticClient1");
-    AwaStaticClient_SetCoAPListenAddressPort(awaClient, "0.0.0.0", 6000);
+    AwaStaticClient_SetCoAPListenAddressPort(awaClient, "0.0.0.0", 0);
     AwaStaticClient_SetBootstrapServerURI(awaClient, "coap://[127.0.0.1]:15685");
 
     AwaStaticClient_Init(awaClient);

diff --git a/api/examples/tutorials/static-client-tutorial3.c b/api/examples/tutorials/static-client-tutorial3.c
@@ -152,7 +152,7 @@ int main(void)
 
     AwaStaticClient_SetLogLevel(AwaLogLevel_Error);
     AwaStaticClient_SetEndPointName(awaClient, "AwaStaticClient1");
-    AwaStaticClient_SetCoAPListenAddressPort(awaClient, "0.0.0.0", 6000);
+    AwaStaticClient_SetCoAPListenAddressPort(awaClient, "0.0.0.0", 0);
     AwaStaticClient_SetBootstrapServerURI(awaClient, "coap://[127.0.0.1]:15685");
 
     AwaStaticClient_Init(awaClient);

diff --git a/core/src/client/lwm2m_static.c b/core/src/client/lwm2m_static.c
@@ -22,6 +22,8 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <stdlib.h>
+#include <time.h>
 
 #include "awa/static.h"
 #include "lwm2m_security_object.h"
@@ -99,6 +101,11 @@ AwaError AwaStaticClient_Init(AwaStaticClient * client)
     {
         if (client->CoAPConfigured && client->BootstrapConfigured && client->EndpointNameConfigured)
         {
+            if (client->CoAPListenPort == 0)
+            {
+                srand(time(NULL));
+                client->CoAPListenPort = 6000 + (rand() % 32768);
+            }
             client->CoAPInfo = coap_Init(client->CoAPListenAddress, client->CoAPListenPort, false, Lwm2m_GetLogLevel());
 
             if (client->CoAPInfo != NULL)