libraries/Wire: Changes in socket.begin function.

Signed-off-by: IFX-Anusha <[email protected]>

Author: IFX-Anusha

libraries/WiFi/src/SecSocket.cpp

@@ -18,14 +18,19 @@ Socket::Socket():
 
 }
 
-void Socket::begin() {
+void Socket::begin(bool is_UDP) {
     _last_error = Socket::global_sockets_init();
     socket_assert(_last_error);
 
-    _last_error = cy_socket_create(CY_SOCKET_DOMAIN_AF_INET, CY_SOCKET_TYPE_STREAM,
-        CY_SOCKET_IPPROTO_TCP, &socket);
-    socket_assert(_last_error);
-
+    if (is_UDP) {
+        _last_error = cy_socket_create(CY_SOCKET_DOMAIN_AF_INET, CY_SOCKET_TYPE_DGRAM,
+            CY_SOCKET_IPPROTO_UDP, &socket);
+        socket_assert(_last_error);
+    } else {
+        _last_error = cy_socket_create(CY_SOCKET_DOMAIN_AF_INET, CY_SOCKET_TYPE_STREAM,
+            CY_SOCKET_IPPROTO_TCP, &socket);
+        socket_assert(_last_error);
+    }
     _status = SOCKET_STATUS_CREATED;
 }
 

libraries/WiFi/src/SecSocket.h

@@ -22,7 +22,7 @@ class Socket {
 
     Socket();
 
-    void begin();
+    void begin(bool is_UDP);
     void end();
 
     void setTimeout(uint32_t timeout);

libraries/WiFi/src/WiFiClient.cpp

@@ -14,7 +14,7 @@ WiFiClient::WiFiClient() :
 }
 
 int WiFiClient::connect(IPAddress ip, uint16_t port) {
-    socket->begin();
+    socket->begin(false); // false = TCP
 
     socket->setReceiveOptCallback(receiveCallback, this);
     socket->setDisconnectOptCallback(disconnectionCallback, this);
@@ -23,7 +23,7 @@ int WiFiClient::connect(IPAddress ip, uint16_t port) {
 }
 
 int WiFiClient::connect(const char *host, uint16_t port) {
-    socket->begin();
+    socket->begin(false); // false = TCP
 
     socket->setReceiveOptCallback(receiveCallback, this);
     socket->setDisconnectOptCallback(disconnectionCallback, this);

libraries/WiFi/src/WiFiServer.cpp

@@ -9,7 +9,7 @@ WiFiServer::WiFiServer() {
 }
 
 void WiFiServer::begin(uint16_t port) {
-    socket.begin();
+    socket.begin(false); // false = TCP
 
     socket.setTimeout(SERVER_RECV_TIMEOUT_MS);
     socket.setConnectOptCallback(connectionCallback, this);

libraries/WiFi/src/WiFiUdp.cpp

@@ -1,4 +1,5 @@
 #include "WiFiUdp.h"
+#include <Arduino.h>
 
 #define udp_assert(cy_ret)   if (cy_ret != CY_RSLT_SUCCESS) { \
             _status = SOCKET_STATUS_ERROR; \
@@ -12,19 +13,26 @@
 WiFiUDP::WiFiUDP() :
     client_handle(nullptr),
     _status(SOCKET_STATUS_UNINITED),
-    _last_error(CY_RSLT_SUCCESS) {
+    _last_error(CY_RSLT_SUCCESS),
+    remote_ip(0, 0, 0, 0),
+    _port(0) {
 }
 
 uint8_t WiFiUDP::begin(uint16_t port) {
-    _last_error = WiFiUDP::global_sockets_init();
-    udp_assert_raise(_last_error);
+    _port = port;
 
-    /* Create a UDP socket */
-    _last_error = cy_socket_create(CY_SOCKET_DOMAIN_AF_INET, CY_SOCKET_TYPE_DGRAM, CY_SOCKET_IPPROTO_UDP, &client_handle);
-    udp_assert_raise(_last_error);
+    // Initialize the socket for UDP
+    socket.begin(true); // true = UDP
+    if (socket.status() != SOCKET_STATUS_CREATED) {
+        return 0; // Return 0 if socket creation fails
+    }
+    // Bind the socket to the specified port
+    socket.bind(port);
+    if (socket.status() != SOCKET_STATUS_BOUND) {
+        return 0; // Return 0 if binding fail
 
-    _status = SOCKET_STATUS_CREATED;
-    return 1;
+    }
+    return socket.status(); // Return the socket status
 }
 
 
@@ -87,18 +95,3 @@ IPAddress WiFiUDP::remoteIP() {
 uint16_t WiFiUDP::remotePort() {
     return 0;
 }
-
-bool WiFiUDP::global_socket_initialized = false;
-uint32_t WiFiUDP::global_socket_count = 0;
-
-cy_rslt_t WiFiUDP::global_sockets_init() {
-    if (!WiFiUDP::global_socket_initialized) {
-        cy_rslt_t ret = cy_socket_init();
-        if (ret != CY_RSLT_SUCCESS) {
-            return ret;
-        }
-        WiFiUDP::global_socket_initialized = true;
-    }
-    WiFiUDP::global_socket_count++;
-    return CY_RSLT_SUCCESS;
-}

libraries/WiFi/src/WiFiUdp.h

@@ -36,14 +36,14 @@ class WiFiUDP: public arduino::UDP {
 
 
 private:
+    Socket socket;
+
     cy_socket_t client_handle;
     socket_status_t _status;
     cy_rslt_t _last_error;
+    IPAddress remote_ip;
+    uint16_t _port;
 
-    static bool global_socket_initialized;
-    static uint32_t global_socket_count;
-    cy_rslt_t global_sockets_init();
-    cy_rslt_t global_sockets_deinit();
 };
 
 #endif /* WIFI_UDP_H */