Diff: MQTTNetwork.h

Revision:

23:1523bdaba8c8

Parent:

22:d9576c025cd7

Child:

24:8a0b0c410820

--- a/MQTTNetwork.h	Fri Dec 27 14:06:13 2019 -0400
+++ b/MQTTNetwork.h	Tue Mar 10 21:26:49 2020 -0400
@@ -42,33 +42,43 @@
      //Class to represent Network layer
      class MQTTNetwork {
          private:
-             
-             //Pointer member to represent socket
-             TCPSocket socket;
-
              //Variable to stored server port
              int serverPort;
 
              //Poniter mebers for mbedTLS structures
              mbedtls_entropy_context* _entropy;
              mbedtls_ctr_drbg_context* _ctr_drbg;
+
              mbedtls_x509_crt* _cacert;
              mbedtls_ssl_context* _ssl;
              mbedtls_ssl_config* _ssl_conf;
          public:
              //Pointer member for ethernet interface
-             NetworkInterface *network;
-
+             //NetworkInterface *network;
+             EthernetInterface *net;
+            //Pointer member to represent socket
+             TCPSocket socket;
+             
             //Default constructor to initialize network, mbedTLS structures
              MQTTNetwork(): serverPort(1883){
+                 pc.printf("serverPort\r\n");
+                 net = new EthernetInterface;
+                 //network->set_blocking(false);
+                 net->set_blocking(false);
+                 pc.printf("set_blocking(false)\r\n");
                  //Instantiate new ethernet interface
-                 network = new EthernetInterface();
+                 //network = new EthernetInterface();
+                 pc.printf("Network\r\n");
                  //Connect to ethernet interface
-                 network->connect();
+                 //nsapi_error_t err = network->connect();
+                 nsapi_error_t err = net->connect();
+                 pc.printf("Connected %d\r\n",err);
                  //Create socket with created ethernet interface
+                 //TCPSocket*  socket;
                  //socket = new TCPSocket(network);
-                 //TCPSocket*  socket;
-
+                 //socket.open(network);
+                 socket.open(net);
+                 pc.printf("Socket\r\n");
                  //Instantiate mbedTLS structures
                  _entropy = new mbedtls_entropy_context();
                  _ctr_drbg = new mbedtls_ctr_drbg_context();
@@ -101,7 +111,8 @@
 
                  //Free the allocated memory for socket and network pointers
                  //delete socket;
-                 delete network;
+                 //delete network;
+                 delete net;
 
                  //Free the allocated memory for mbedTLS structures
                  delete _entropy;
@@ -117,11 +128,12 @@
              int connect(const char*host, int port){
                 int rc = -1;
 
-                socket.open(network);
+                //socket.open(network);
+                socket.open(net);
                 serverPort = port;
                 if(port == 1883)
                      //Establish unsecured socket connection
-                     
+                                          
                      rc = socket.connect(host, port);
                 else{
                         //Establish secure socket connection using SSL/TLS