Modify IPv6 code (#291)

* Modify IPv6 code

- Modify IPv6 UDP

* update server_drv.cpp

Author: pammyleong

Arduino_package/hardware/cores/ambd/ard_socket.c

@@ -516,29 +516,29 @@ int get_receive_v6(int sock, void *recv_data, int len, int flags, uint32_t *peer
     return ret;
 }
 
-void ipv6_udp_server(void) {
+void ipv6_udp_server(char *data_recv, const char *data_send)
+{
     int server_fd;
     struct sockaddr_in6 client_addr;
 
     unsigned int addrlen = sizeof(struct sockaddr_in6);
 
-    char send_data[MAX_SEND_SIZE] = "Hi client!";
-    char recv_data[MAX_RECV_SIZE];
-
-    //create socket
+    // char send_data[MAX_SEND_SIZE] = "Hi client!";
+    // char recv_data[MAX_RECV_SIZE];
 
+    // create socket
     server_fd = start_server_v6(UDP_SERVER_PORT, 1);
 
     while (1) {
-        memset(recv_data, 0, MAX_RECV_SIZE);
+        memset(data_recv, 0, MAX_RECV_SIZE);
         // if (get_receive_v6(server_fd, recv_data, MAX_SEND_SIZE, 0, UDP_SERVER_IP, UDP_SERVER_PORT) <= 0) {
-        if (lwip_recvfrom(server_fd, recv_data, MAX_RECV_SIZE, 0, (struct sockaddr *)&client_addr, &addrlen) > 0) {
-            printf("\r\n [INFO] Receive data : %s\n", recv_data);
-            //Send Response
-            if (lwip_sendto(server_fd, send_data, MAX_SEND_SIZE, 0, (struct sockaddr *)&client_addr, addrlen) == -1) {
-                printf("\r\n [ERROR] Send data failed\n");
+        if (lwip_recvfrom(server_fd, data_recv, MAX_RECV_SIZE, 0, (struct sockaddr *)&client_addr, &addrlen) > 0) {
+            printf("\r\n[INFO] Receive data : %s\n", data_recv);
+            // Send Response
+            if (lwip_sendto(server_fd, data_send, MAX_SEND_SIZE, 0, (struct sockaddr *)&client_addr, addrlen) == -1) {
+                printf("\r\n[ERROR] %s Send data failed\n", __FUNCTION__);
             } else {
-                printf("\r\n [INFO] Send data successfully\n");
+                printf("\r\n[INFO] Send data successfully\n");
             }
         }
     }

Arduino_package/hardware/cores/ambd/ard_socket.h

@@ -27,7 +27,7 @@ int get_receive(int sock, uint8_t *data, int length, int flag, uint32_t *peer_ad
 int get_receive_v6(int server_fd, void *recv_data, int len, int flags, uint32_t *peer_addr, uint16_t *peer_port);
 int sendto_data(int sock, const uint8_t *data, uint16_t len, uint32_t peer_ip, uint16_t peer_port);
 int sendto_data_v6(int sock, const void *send_data, size_t len, uint32_t peer_ip, uint16_t peer_port);
-void ipv6_udp_server(void);
+void ipv6_udp_server(char *data_recv, const char *data_send);
 
 // OTA
 int ota_bind_socket(int server_socket, int OTAport);

Arduino_package/hardware/cores/ambd/server_drv.cpp

@@ -231,7 +231,7 @@ int ServerDrv::getIPv6Status()
     return get_ipv6_status();
 }
 
-void ServerDrv::setIPv6UDPServer(void)
+void ServerDrv::setIPv6UDPServer(char *data_recv, char *data_send)
 {
-    ipv6_udp_server();
+    ipv6_udp_server(data_recv, data_send);
 }

Arduino_package/hardware/cores/ambd/server_drv.h

@@ -43,7 +43,7 @@ class ServerDrv {
     int setSockRecvTimeout(int sock, int timeout);
     static int enableIPv6();
     static int getIPv6Status();
-    void setIPv6UDPServer(void);
+    void setIPv6UDPServer(char *data_recv, char *data_send);
 
 private:
     bool _available;

Arduino_package/hardware/libraries/WiFi/examples/IPv6UDPServer/IPv6UDPServer.ino

@@ -48,7 +48,7 @@ void setup() {
     printWifiStatus();
 
     // if you get a connection, report back via serial:
-    UDPserver.UDPServerv6();
+    UDPserver.UDPServerv6(data_recv, data_send);
 }
 
 void loop() {}

Arduino_package/hardware/libraries/WiFi/src/WiFiUdp.cpp

@@ -244,6 +244,7 @@ int WiFiUDP::getIPv6Status() {
     return serverDrv.getIPv6Status();
 }
 
-void WiFiUDP::UDPServerv6(void) {
-    serverDrv.setIPv6UDPServer();
+void WiFiUDP::UDPServerv6(char *data_recv, char *data_send)
+{
+    serverDrv.setIPv6UDPServer(data_recv, data_send);
 }

Arduino_package/hardware/libraries/WiFi/src/WiFiUdp.h

@@ -102,7 +102,7 @@ class WiFiUDP : public UDP {
         // IPv6 related
         virtual int enableIPv6();
         virtual int getIPv6Status();
-        virtual void UDPServerv6(void);
+        virtual void UDPServerv6(char* data_recv, char* data_send);
 
         friend class WiFiDrv;
         using Print::write;