libraries/WiFi: Added protocol member via Socket.begin().

Signed-off-by: jaenrig-ifx <[email protected]>

Author: jaenrig-ifx

libraries/WiFi/src/SecSocket.cpp

@@ -14,23 +14,32 @@ Socket::Socket():
     _status(SOCKET_STATUS_UNINITED),
     _last_error(CY_RSLT_SUCCESS),
     remote_ip(0, 0, 0, 0),
-    _port(0) {
+    _port(0),
+    _protocol(0) {
 
 }
 
-void Socket::begin(bool is_UDP) {
+void Socket::begin(socket_protocol_t protocol) {
     _last_error = Socket::global_sockets_init();
     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);
+    int socket_type = 0, socket_proto = 0;
+
+    _protocol = protocol;
+    switch (_protocol) {
+        case SOCKET_PROTOCOL_TCP:
+            socket_type = CY_SOCKET_TYPE_STREAM;
+            socket_proto = CY_SOCKET_IPPROTO_TCP;
+            break;
+        case SOCKET_PROTOCOL_UDP:
+            socket_type = CY_SOCKET_TYPE_DGRAM;
+            socket_proto = CY_SOCKET_IPPROTO_UDP;
+            break;
     }
+
+    _last_error = cy_socket_create(CY_SOCKET_DOMAIN_AF_INET, socket_type,
+        socket_proto, &socket);
+    socket_assert(_last_error);
+
     _status = SOCKET_STATUS_CREATED;
 }
 

libraries/WiFi/src/SecSocket.h

@@ -16,13 +16,18 @@ typedef enum {
     SOCKET_STATUS_ERROR = -1
 } socket_status_t;
 
+typedef enum {
+    SOCKET_PROTOCOL_TCP = 0,
+    SOCKET_PROTOCOL_UDP,
+} socket_protocol_t;
+
 class Socket {
 
 public:
 
     Socket();
 
-    void begin(bool is_UDP);
+    void begin(socket_protocol_t protocol);
     void end();
 
     void setTimeout(uint32_t timeout);
@@ -58,6 +63,7 @@ class Socket {
 
     IPAddress remote_ip;
     uint16_t _port;
+    socket_protocol_t _protocol;
 
     void setOptCallback(int optname, cy_socket_callback_t cback, void *arg);
 

libraries/WiFi/src/WiFiClient.cpp

@@ -14,7 +14,7 @@ WiFiClient::WiFiClient() :
 }
 
 int WiFiClient::connect(IPAddress ip, uint16_t port) {
-    socket->begin(false); // false = TCP
+    socket->begin(SOCKET_PROTOCOL_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(false); // false = TCP
+    socket->begin(SOCKET_PROTOCOL_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(false); // false = TCP
+    socket.begin(SOCKET_PROTOCOL_TCP);
 
     socket.setTimeout(SERVER_RECV_TIMEOUT_MS);
     socket.setConnectOptCallback(connectionCallback, this);

libraries/WiFi/src/WiFiUdp.cpp

@@ -22,7 +22,7 @@ uint8_t WiFiUDP::begin(uint16_t port) {
     _port = port;
 
     // Initialize the socket for UDP
-    socket.begin(true); // true = UDP
+    socket.begin(SOCKET_PROTOCOL_UDP);
     if (socket.status() != SOCKET_STATUS_CREATED) {
         return 0; // Return 0 if socket creation fails
     }