libraries/WiFi: Code cleanup.

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

Author: IFX-Anusha

libraries/WiFi/src/SecSocket.cpp

@@ -1,5 +1,4 @@
 #include <SecSocket.h>
-#include <Arduino.h>
 
 #define socket_assert(cy_ret)   if (cy_ret != CY_RSLT_SUCCESS) { \
             _status = SOCKET_STATUS_ERROR; \
@@ -16,7 +15,7 @@ Socket::Socket():
     _last_error(CY_RSLT_SUCCESS),
     remote_ip(0, 0, 0, 0),
     _port(0),
-    _protocol(0) {
+    _protocol(SOCKET_PROTOCOL_TCP) {
 
 }
 
@@ -238,10 +237,6 @@ cy_rslt_t Socket::getLastError() {
     return _last_error;
 }
 
-void Socket::setPeerAddress(cy_socket_sockaddr_t *peer_addr) {
-    _peer_ip = IPAddress(peer_addr->ip_address.ip.v4);
-    _peer_port = peer_addr->port;
-}
 
 bool Socket::connect(cy_socket_sockaddr_t *addr) {
     _last_error = cy_socket_connect(socket, addr, sizeof(cy_socket_sockaddr_t));
@@ -271,11 +266,9 @@ void Socket::receiveCallback(cy_socket_sockaddr_t *peer_addr) {
             case SOCKET_PROTOCOL_UDP:
                 _last_error = cy_socket_recvfrom(socket, temp_rx_buff, bytes_rcvd_request,
                     CY_SOCKET_FLAGS_RECVFROM_NONE, peer_addr, nullptr, &bytes_received);
-                setPeerAddress(peer_addr);
                 break;
         }
         socket_assert(_last_error);
-
         for (uint32_t i = 0; i < bytes_received; i++) {
             rx_buf.store_char(temp_rx_buff[i]);
         }

libraries/WiFi/src/SecSocket.h

@@ -65,8 +65,6 @@ class Socket {
     IPAddress remote_ip;
     uint16_t _port;
     socket_protocol_t _protocol;
-    IPAddress _peer_ip;
-    uint16_t _peer_port;
 
     void setOptCallback(int optname, cy_socket_callback_t cback, void *arg);
 
@@ -75,7 +73,6 @@ class Socket {
 
     bool connect(cy_socket_sockaddr_t *addr);
     void receiveCallback(cy_socket_sockaddr_t *peer_addr = nullptr);
-    void setPeerAddress(cy_socket_sockaddr_t *peer_addr);
 
     static bool global_socket_initialized;
     static uint32_t global_socket_count;

libraries/WiFi/src/WiFiUdp.cpp

@@ -1,5 +1,5 @@
 #include "WiFiUdp.h"
-#include "Arduino.h"
+
 
 #define udp_assert(cy_ret)   if (cy_ret != CY_RSLT_SUCCESS) { \
             _status = SOCKET_STATUS_ERROR; \
@@ -11,7 +11,6 @@
 }
 
 WiFiUDP::WiFiUDP() :
-    client_handle(nullptr),
     _status(SOCKET_STATUS_UNINITED),
     _last_error(CY_RSLT_SUCCESS),
     remote_ip(0, 0, 0, 0),
@@ -20,37 +19,35 @@ WiFiUDP::WiFiUDP() :
 }
 
 uint8_t WiFiUDP::begin(uint16_t port) {
-    _port = port;
     _parsedPacketSize = 0;
 
     // Initialize the socket for UDP
     socket.begin(SOCKET_PROTOCOL_UDP);
     if (socket.status() != SOCKET_STATUS_CREATED) {
-        return 0; // Return 0 if socket creation fails
+        return 0;
     }
 
     socket.setReceiveOptCallback(receiveCallback, this);
 
     // Bind the socket to the specified port
     socket.bind(port);
     if (socket.status() != SOCKET_STATUS_BOUND) {
-        return 0; // Return 0 if binding fail
+        return 0;
 
     }
     return socket.status(); // Return the socket status
 }
 
 
 void WiFiUDP::stop() {
-    // Stop the UDP socket
     socket.end();
 }
 
 int WiFiUDP::beginPacket(IPAddress ip, uint16_t port) {
     remote_ip = ip;
     _port = port;
     txBuffer.clear();
-    return 1; // Return 1 if successful
+    return 1;
 }
 
 int WiFiUDP::beginPacket(const char *host, uint16_t port) {
@@ -72,9 +69,9 @@ int WiFiUDP::endPacket() {
     }
     size_t bytes_sent = socket.send(temp_buffer, size, remote_ip, _port);
     if (bytes_sent != size) {
-        return 0; // Return 0 if not all bytes were sent
+        return 0;
     }
-    return 1; // Return 1 if all bytes were sent successfully
+    return 1;
 }
 
 size_t WiFiUDP::write(uint8_t byte) {
@@ -146,19 +143,27 @@ int WiFiUDP::peek() {
 }
 
 void WiFiUDP::flush() {
-    return;
+    socket.flush();
+    _parsedPacketSize = 0;
 }
 
 IPAddress WiFiUDP::remoteIP() {
-    return IPAddress();
+    return _senderIP;
 }
 
 uint16_t WiFiUDP::remotePort() {
-    return 0;
+    return _senderPort;
 }
 
 cy_rslt_t WiFiUDP::receiveCallback(cy_socket_t socket_handle, void *arg) {
     WiFiUDP *udp = (WiFiUDP *)arg;
-    udp->socket.receiveCallback();
+
+    cy_socket_sockaddr_t peer_addr;
+    udp->socket.receiveCallback(&peer_addr);
+
+    // store the sender's IP address and port
+    udp->_senderIP = IPAddress(peer_addr.ip_address.ip.v4);
+    udp->_senderPort = peer_addr.port;
+
     return CY_RSLT_SUCCESS;
 }

libraries/WiFi/src/WiFiUdp.h

@@ -16,8 +16,6 @@ class WiFiUDP: public arduino::UDP {
 
     WiFiUDP();
     uint8_t begin(uint16_t);
-
-    // yet to implement these functions
     void stop();
     int beginPacket(IPAddress ip, uint16_t port);
     int beginPacket(const char *host, uint16_t port);
@@ -42,11 +40,12 @@ class WiFiUDP: public arduino::UDP {
 
     static cy_rslt_t receiveCallback(cy_socket_t socket_handle, void *arg);
 
-    cy_socket_t client_handle;
     socket_status_t _status;
     cy_rslt_t _last_error;
     IPAddress remote_ip;
     uint16_t _port;
+    IPAddress _senderIP;   // Stores the sender's IP address
+    uint16_t _senderPort;  // Stores the sender's port
     int _parsedPacketSize;
 
     arduino::RingBufferN < WIFI_UDP_BUFFER_SIZE > txBuffer;