fix socket function and add network-led

class/m5311/at_device_m5311.c

@@ -228,7 +228,7 @@ static void check_link_status_entry(void *parameter)
 #define M5311_LINK_STATUS_OK   1
 #define M5311_LINK_RESP_SIZE   64
 #define M5311_LINK_RESP_TIMO   (3 * RT_TICK_PER_SECOND)
-#define M5311_LINK_DELAY_TIME  (30 * RT_TICK_PER_SECOND)
+#define M5311_LINK_DELAY_TIME  (60 * RT_TICK_PER_SECOND)
 
     struct netdev *netdev = (struct netdev *)parameter;
     struct at_device *device = RT_NULL;
@@ -578,12 +578,17 @@ static void m5311_init_thread_entry(void *parameter)
         AT_SEND_CMD(client, resp, 0, 300, "ATE0");
         /* get module version */
         AT_SEND_CMD(client, resp, 0, 300, "ATI");
-        /* LED Status reg:slow, not reg:fast
-         * AT+CMSYSCTRL=<op>,<mode>[,<nonreg_h>,<reg_h>,<nonreg_l>,<reg_l>]
-         * */
-        /* AT_SEND_CMD(client, resp, 0, 300, "AT+CMSYSCTRL=0,2,50,80,50,700"); */
+        /* LED Status reg:slow, not reg:fast */
+        /* AT+CMSYSCTRL=<op>,<mode>[,<nonreg_h>,<reg_h>,<nonreg_l>,<reg_l>] */
+#ifdef M5311_SAMPLE_CLIENT_USE_STATUSLED
+        AT_SEND_CMD(client, resp, 0, 300, "AT+CMSYSCTRL=0,2,50,80,50,700");
+#endif /* M5311_SAMPLE_CLIENT_USE_STATUSLED */
         /* Turn off sleep */
         AT_SEND_CMD(client,resp,0,300,"AT+SM=LOCK");
+#ifdef AT_USING_SOCKET
+        /* Set URC mode */
+        AT_SEND_CMD(client, resp, 0,300, "AT+IPRCFG=1,2,1");
+#endif /* AT_USING_SOCKET */
         /* show module version */
         for (i = 0; i < (int) resp->line_counts - 1; i++)
         {

class/m5311/at_socket_m5311.c

@@ -25,14 +25,16 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <at_device_m5311.h>
 
 #define LOG_TAG                        "at.skt.m5311"
 #include <at_log.h>
-
+/* socket require increase AT_CMD_MAX_LEN and RT_SERIAL_RB_BUFSZ */
 
 #if defined(AT_DEVICE_USING_M5311) && defined(AT_USING_SOCKET)
 
 #define M5311_MODULE_SEND_MAX_SIZE       1024
+#define M5311_MODULE_RECV_MAX_SIZE       4096
 
 /* set real event by current socket and current state */
 #define SET_EVENT(socket, event)       (((socket + 1) << 16) | (event))
@@ -45,12 +47,90 @@
 #define M5311_EVENT_CONN_FAIL            (1L << 4)
 #define M5311_EVENT_SEND_FAIL            (1L << 5)
 
+/**
+ * convert data from string to ASCII string.
+ * @param source
+ * @param dest
+ * @param max_dest_len
+ * @return
+ */
+static int str_to_hex(const char *source, char *dest, int max_dest_len)
+{
+    int i = 0, j = 0;
+    char ch1, ch2;
+
+    while (j + 1 < max_dest_len)
+    {
+        ch1 = (source[i] & 0xF0) >> 4;
+        ch2 = source[i] & 0x0F;
+
+        if(ch1 <= 9)
+            *(dest + j) = ch1 + '0';
+		else
+            *(dest + j) = ch1 + 'A' - 10;
+
+        if(ch2 <= 9)
+            *(dest + j + 1) = ch2 + '0';
+		else
+            *(dest + j + 1) = ch2 + 'A' - 10;
+
+        i++;
+        j += 2;
+    }
+
+    *(dest + j) = '\0';
+
+	return j;
+}
+
+/**
+ * convert data from Hex string to ASCII string.
+ *
+ * @param hex  input Hex string
+ * @param str  output ASCII string
+ * @param len  length of str, or the size you want to convert
+ *
+ * @return =0: convert failed, or no data need to convert
+ *         >0: the size of convert success
+ */
+static int hex_to_string(const char *hex, char *str, const rt_size_t len)
+{
+    RT_ASSERT(hex && str);
+
+    int hex_len = rt_strlen(hex);
+    int pos = 0, left, right, i;
+
+    if (len < 1 || hex_len/2 < len)
+    {
+        return 0;
+    }
+
+    for (i = 0; i < len*2; i++, pos++)
+    {
+        left = hex[i++];
+        right = hex[i];
+
+        left  = (left  < 58) ? (left  - 48) : (left  - 55);
+        right = (right < 58) ? (right - 48) : (right - 55);
+
+        str[pos] = (left << 4) | right;
+    }
+
+    return pos;
+}
+
 static at_evt_cb_t at_evt_cb_set[] =
 {
     [AT_SOCKET_EVT_RECV]    = NULL,
     [AT_SOCKET_EVT_CLOSED]  = NULL,
 };
 
+static struct at_socket_ip_info
+{
+    char ip_addr[16];
+    int  port;
+} m5311_sock_info[AT_DEVICE_M5311_SOCKETS_NUM];
+
 static int m5311_socket_event_send(struct at_device *device, uint32_t event)
 {
     return (int) rt_event_send(device->socket_event, event);
@@ -62,7 +142,8 @@ static int m5311_socket_event_recv(struct at_device *device, uint32_t event, uin
     rt_uint32_t recved = 0;
 
     result = rt_event_recv(device->socket_event, event, option | RT_EVENT_FLAG_CLEAR, timeout, &recved);
-    if (result != RT_EOK){
+    if (result != RT_EOK)
+    {
         return -RT_ETIMEOUT;
     }
 
@@ -85,8 +166,9 @@ static int m5311_socket_close(struct at_socket *socket)
     int device_socket = (int) socket->user_data;
     struct at_device *device  = (struct at_device *) socket->device;
 
-    resp = at_create_resp(64, 0, rt_tick_from_millisecond(300));
-    if (resp == RT_NULL){
+    resp = at_create_resp(64, 0, rt_tick_from_millisecond(500));
+    if (resp == RT_NULL)
+    {
         LOG_E("no memory for resp create.", device->name);
         return -RT_ENOMEM;
     }
@@ -94,23 +176,18 @@ static int m5311_socket_close(struct at_socket *socket)
     /* clear socket close event */
     m5311_socket_event_recv(device, SET_EVENT(device_socket, M5311_EVNET_CLOSE_OK), 0, RT_EVENT_FLAG_OR);
 
-    if (at_obj_exec_cmd(device->client, resp, "AT+IPCLOSE=%d", device_socket) < 0){
-        result = -RT_ERROR;
-        goto __exit;
-    }
-
-    if (m5311_socket_event_recv(device, SET_EVENT(device_socket, M5311_EVNET_CLOSE_OK),
-            rt_tick_from_millisecond(300 * 3), RT_EVENT_FLAG_AND) < 0)
+    result = at_obj_exec_cmd(device->client, resp, "AT+IPCLOSE=%d", device_socket);
+    if (result == 0)
     {
-        LOG_E("%s device socket(%d) close failed, wait close OK timeout.", device->name, device_socket);
-        result = -RT_ETIMEOUT;
-        goto __exit;
+    	LOG_I("%s device close socket(%d).", device->name, device_socket);
     }
+    else
+    {
+    	LOG_E("%s device socket(%d) close failed, wait close OK timeout.", device->name, device_socket);
+	}
+
+    at_delete_resp(resp);
 
-__exit:
-    if (resp){
-        at_delete_resp(resp);
-    }
     return result;
 }
 
@@ -136,7 +213,7 @@ static int m5311_socket_connect(struct at_socket *socket, char *ip, int32_t port
     int device_socket = (int) socket->user_data;
     struct at_device *device = (struct at_device *) socket->device;
 
-    resp = at_create_resp(128, 0, rt_tick_from_millisecond(300));
+    resp = at_create_resp(128, 0, 1 * RT_TICK_PER_SECOND);
     if (resp == RT_NULL)
     {
         LOG_E("no memory for resp create.");
@@ -146,141 +223,82 @@ static int m5311_socket_connect(struct at_socket *socket, char *ip, int32_t port
     RT_ASSERT(ip);
     RT_ASSERT(port >= 0);
 
-__retry:
+    if (!is_client)
+    {
+        return -RT_ERROR;
+    }
+
+	if (type == AT_SOCKET_UDP)
+	{
+		rt_strncpy(m5311_sock_info[device_socket].ip_addr, ip, 16);
+		m5311_sock_info[device_socket].port = port;
+	}
 
+__retry:
     /* clear socket connect event */
     event_result = SET_EVENT(device_socket, M5311_EVENT_CONN_OK | M5311_EVENT_CONN_FAIL);
     m5311_socket_event_recv(device, event_result, 0, RT_EVENT_FLAG_OR);
 
-    if (is_client){
-        switch (type){
-            case AT_SOCKET_TCP:
-                /* send AT commands(eg: AT+IPSTART=0,"TCP","x.x.x.x", 1234) to connect TCP server */
-                /* AT+IPSTART=<sockid>,<type>,<addr>,<port>[,<cid>[,<domian>[,<protocol>]]] */
-                if (at_obj_exec_cmd(device->client, resp,
-                                "AT+IPSTART=%d,\"TCP\",\"%s\",%d", device_socket, ip, port) < 0)
-                {
-                    result = -RT_ERROR;
-                    goto __exit;
-                }
-                break;
-
-            case AT_SOCKET_UDP:
-                if (at_obj_exec_cmd(device->client, resp,
-                                "AT+IPSTART=%d,\"UDP\",\"%s\",%d", device_socket, ip, port) < 0)
-                {
-                    result = -RT_ERROR;
-                    goto __exit;
-                }
-                break;
-
-            default:
-                LOG_E("%s device not supported connect type : %d.", device->name, type);
-                return -RT_ERROR;
-        }
-    }
-
-    /* waiting result event from AT URC, the device default connection timeout is 75 seconds, but it set to 10 seconds is convenient to use.*/
-    if (m5311_socket_event_recv(device, SET_EVENT(device_socket, 0), 10 * RT_TICK_PER_SECOND, RT_EVENT_FLAG_OR) < 0)
-    {
-        LOG_E("%s device socket(%d) wait connect result timeout.", device->name, device_socket);
-        result = -RT_ETIMEOUT;
-        goto __exit;
-    }
-    /* waiting OK or failed result */
-    if ((event_result = m5311_socket_event_recv(device, M5311_EVENT_CONN_OK | M5311_EVENT_CONN_FAIL,
-            1 * RT_TICK_PER_SECOND, RT_EVENT_FLAG_OR)) < 0)
+	switch (type)
+	{
+	case AT_SOCKET_TCP:
+	/* send AT commands(eg: AT+IPSTART=0,"TCP","x.x.x.x", 1234) to connect TCP server */
+	/* AT+IPSTART=<sockid>,<type>,<addr>,<port>[,<cid>[,<domian>[,<protocol>]]] */
+		if (at_obj_exec_cmd(device->client, resp,
+				"AT+IPSTART=%d,\"TCP\",\"%s\",%d", device_socket, ip, port) < 0)
+		{
+			result = -RT_ERROR;
+			goto __exit;
+		}
+		resp = at_resp_set_info(resp, 128, 3, 10 * RT_TICK_PER_SECOND);
+		//rt_thread_mdelay(500);
+	    if (at_resp_parse_line_args(resp, 3, "CONNECT OK") < 0)
+	    {
+	        result = -RT_ERROR;
+	    }
+
+		break;
+
+	case AT_SOCKET_UDP:
+		if (at_obj_exec_cmd(device->client, resp,
+				"AT+IPSTART=%d,\"UDP\",\"%s\",%d", device_socket, ip, port) < 0)
+		{
+			result = -RT_ERROR;
+			goto __exit;
+		}
+		break;
+
+	default:
+		LOG_E("%s device not supported connect type : %d.", device->name, type);
+		return -RT_ERROR;
+	}
+
+    if(!at_resp_get_line_by_kw(resp, "OK"))
     {
-        LOG_E("%s device socket(%d) wait connect OK|FAIL timeout.", device->name, device_socket);
-        result = -RT_ETIMEOUT;
-        goto __exit;
-    }
-    /* check result */
-    if (event_result & M5311_EVENT_CONN_FAIL){
-        if (retryed == RT_FALSE){
-            LOG_D("%s device socket(%d) connect failed, the socket was not be closed and now will retry.",
-                    device->name, device_socket);
-            if (m5311_socket_close(socket) < 0){
-                goto __exit;
-            }
-            retryed = RT_TRUE;
-            goto __retry;
-        }
-        LOG_E("%s device socket(%d) connect failed.", device->name, device_socket);
-        result = -RT_ERROR;
-        goto __exit;
-    }
-
-__exit:
-    if (resp){
-        at_delete_resp(resp);
-    }
-
-    return result;
-}
-/*
- * 检查数据包收发情况
- * */
-static int at_get_send_size(struct at_socket *socket,
-                            size_t *sent,
-                            size_t *received,
-                            size_t *tx_buf_left,
-                            size_t *unsent,
-                            size_t *unacked)
-{
-    int result = 0;
-    at_response_t resp = RT_NULL;
-    int device_socket = (int) socket->user_data;
-    struct at_device *device = (struct at_device *) socket->device;
-
-    resp = at_create_resp(64, 0, 5 * RT_TICK_PER_SECOND);
-    if (resp == RT_NULL){
-        LOG_E("no memory for resp create.");
-        result = -RT_ENOMEM;
-        goto __exit;
-    }
-
-    if (at_obj_exec_cmd(device->client, resp, "AT+IPSACK=%d", device_socket) < 0){
         result = -RT_ERROR;
-        goto __exit;
     }
 
-    /* Response:<sent>,<received>[,<tx_buf_left>,<unsent>,<unacked>] */
-    if (at_resp_parse_line_args_by_kw(resp, "+IPSACK:", "+IPSACK: %d, %d, %d, %d, %d", \
-                                      sent, received, tx_buf_left,unsent,unacked) <= 0)
+    if (result != RT_EOK && retryed == RT_FALSE)
     {
-        LOG_E("%s device prase \"AT+IPSACK\" cmd error.", device->name);
-        result = -RT_ERROR;
-        goto __exit;
+    	LOG_D("%s device socket(%d) connect failed, now retry(m5311).",
+    		  device->name, device_socket);
+    	if (m5311_socket_close(socket) < 0)
+    	{
+    		goto __exit;
+    	}
+    	retryed = RT_TRUE;
+        result = RT_EOK;
+        goto __retry;
     }
 
 __exit:
-    if (resp){
+    if (resp)
+    {
         at_delete_resp(resp);
     }
 
     return result;
 }
-/*
- * 等待发送完成
- * */
-static int at_wait_send_finish(struct at_socket *socket, size_t settings_size)
-{
-    /* get the timeout by the input data size */
-    rt_tick_t timeout = rt_tick_from_millisecond(settings_size);
-    rt_tick_t last_time = rt_tick_get();
-    size_t sent = 0, received = 0, tx_buf_left = 0, unsent = 0, unacked = 0;
-
-    while (rt_tick_get() - last_time <= timeout){
-        at_get_send_size(socket, &sent, &received, &tx_buf_left, &unsent, &unacked);
-        if (tx_buf_left == 0){
-            return RT_EOK;
-        }
-        rt_thread_mdelay(50);
-    }
-
-    return -RT_ETIMEOUT;
-}
 
 /**
  * send data to server or client by AT commands.
@@ -295,91 +313,123 @@ static int at_wait_send_finish(struct at_socket *socket, size_t settings_size)
  *          -2: waited socket event timeout
  *          -5: no memory
  */
-static int m5311_socket_send(struct at_socket *socket, const char *buff, size_t bfsz, enum at_socket_type type)
+static int m5311_socket_send(struct at_socket *socket, const char *buff,
+                            size_t bfsz, enum at_socket_type type)
 {
+    uint32_t event = 0;
     int result = 0, event_result = 0;
-    size_t pkt_size = 0, sent_size = 0;
+    size_t cur_pkt_size = 0, sent_size = 0;
     at_response_t resp = RT_NULL;
     int device_socket = (int) socket->user_data;
     struct at_device *device = (struct at_device *) socket->device;
-    struct at_device_m5311 *m5311 = (struct at_device_m5311 *) device->user_data;
     rt_mutex_t lock = device->client->lock;
 
     RT_ASSERT(buff);
 
-    resp = at_create_resp(128, 2, 5 * RT_TICK_PER_SECOND);
-    if (resp == RT_NULL){
-        LOG_E("no memory for resp create(m5311).");
+    resp = at_create_resp(128, 0, rt_tick_from_millisecond(300));
+    if (resp == RT_NULL)
+    {
+        LOG_E("no memory for resp create.");
         return -RT_ENOMEM;
     }
 
     rt_mutex_take(lock, RT_WAITING_FOREVER);
 
-    /* Clear socket send event */
-    event_result = SET_EVENT(device_socket, M5311_EVENT_SEND_OK | M5311_EVENT_SEND_FAIL);
-    m5311_socket_event_recv(device, event_result, 0, RT_EVENT_FLAG_OR);
+    /* clear socket send event */
+    event = SET_EVENT(device_socket, M5311_EVENT_SEND_OK | M5311_EVENT_SEND_FAIL);
+    m5311_socket_event_recv(device, event, 0, RT_EVENT_FLAG_OR);
 
-    /* set current socket for send URC event */
-    m5311->user_data = (void *) device_socket;
-    /* set AT client end sign to deal with '>' sign.*/
-    at_obj_set_end_sign(device->client, '>');
+    /* only use for UDP socket */
+    const char *ip = m5311_sock_info[device_socket].ip_addr;
+    const int port = m5311_sock_info[device_socket].port;
 
-    while (sent_size < bfsz){
-        if (bfsz - sent_size < M5311_MODULE_SEND_MAX_SIZE){
-            pkt_size = bfsz - sent_size;
-        }else{
-            pkt_size = M5311_MODULE_SEND_MAX_SIZE;
+    while (sent_size < bfsz)
+    {
+        if (bfsz - sent_size < M5311_MODULE_SEND_MAX_SIZE)
+        {
+            cur_pkt_size = bfsz - sent_size;
         }
+        else
+        {
+            cur_pkt_size = M5311_MODULE_SEND_MAX_SIZE;
+        }
+
+        //size_t i = 0, ind = 0;
+		char hex_data[bfsz * 2];
+		rt_memset(hex_data, 0, sizeof(hex_data));
+		str_to_hex(buff, hex_data, bfsz * 2);
+
+        switch (type)
+        {
+        case AT_SOCKET_TCP:
+            /* TCP : AT+IPSEND=<socket_id>,[<data_len>],<data>[,<pri_flag>] */
+            if (at_obj_exec_cmd(device->client, resp, "AT+IPSEND=%d,%d,%s",
+            		            device_socket, (int)cur_pkt_size, hex_data) < 0)
+            {
+            	LOG_D("%s", buff);
+                result = -RT_ERROR;
+                goto __exit;
+            }
+            LOG_D("%s device TCP socket(%d) send %d bytes.\n>> %s", device->name, device_socket, (int)cur_pkt_size, buff);
+            break;
+
+        case AT_SOCKET_UDP:
+            /* UDP : AT+IPSEND=<socket_id>,[<data_len>],<data>[,<addr>,<port>[,<pri_flag>]] */
+            if (at_obj_exec_cmd(device->client, resp, "AT+IPSEND=%d,%d,\"%s\",%s,%d,1",
+                                device_socket, (int)cur_pkt_size, hex_data, ip, port) < 0)
+            {
+
+                result = -RT_ERROR;
+                goto __exit;
+            }
+            LOG_D("%s device UDP socket(%d) send %d bytes to %s:%d.", device->name, device_socket, (int)cur_pkt_size, ip, port);
+            break;
 
-        /* send the "AT+IPSEND" commands to AT server include string payload. */
-        if (at_obj_exec_cmd(device->client, resp, "AT+IPSEND=%d,%d,\"%s\"", device_socket, pkt_size, buff) < 0){
+        default:
+            LOG_E("not supported send type %d.", type);
             result = -RT_ERROR;
             goto __exit;
         }
 
-        /* send the real data to server or client
-        result = (int) at_client_obj_send(device->client, buff + sent_size, pkt_size);
-        if (result == 0){
+        /* check if sent ok */
+        if (!at_resp_get_line_by_kw(resp, "OK"))
+        {
+            LOG_E("%s device socket(%d) send data failed.", device->name, device_socket);
             result = -RT_ERROR;
             goto __exit;
         }
-        */
 
-        /* waiting result event from AT URC */
-        if (m5311_socket_event_recv(device, SET_EVENT(device_socket, 0), 15 * RT_TICK_PER_SECOND, RT_EVENT_FLAG_OR) < 0){
+        /* waiting result event from AT URC, the device default timeout is 60 seconds*/
+        if (m5311_socket_event_recv(device, SET_EVENT(device_socket, 0),
+                                   60 * RT_TICK_PER_SECOND, RT_EVENT_FLAG_OR) < 0)
+        {
             LOG_E("%s device socket(%d) wait send result timeout.", device->name, device_socket);
             result = -RT_ETIMEOUT;
             goto __exit;
         }
         /* waiting OK or failed result */
-        if ((event_result = m5311_socket_event_recv(device, M5311_EVENT_SEND_OK | M5311_EVENT_SEND_FAIL,
-                1 * RT_TICK_PER_SECOND, RT_EVENT_FLAG_OR)) < 0)
+        event_result = m5311_socket_event_recv(device, M5311_EVENT_SEND_OK | M5311_EVENT_SEND_FAIL,
+                                              1 * RT_TICK_PER_SECOND, RT_EVENT_FLAG_OR);
+        if (event_result & M5311_EVENT_SEND_FAIL)
         {
-            LOG_E("%s device socket(%d) wait send OK|FAIL timeout.", device->name, device_socket);
-            result = -RT_ETIMEOUT;
-            goto __exit;
-        }
-        /* check result */
-        if (event_result & M5311_EVENT_SEND_FAIL){
             LOG_E("%s device socket(%d) send failed.", device->name, device_socket);
             result = -RT_ERROR;
             goto __exit;
         }
-
-        if (type == AT_SOCKET_TCP){
-            at_wait_send_finish(socket, pkt_size);
+        else
+        {
+            LOG_D("%s device socket(%d) send success.", device->name, device_socket);
+            sent_size += cur_pkt_size;
+            result = sent_size;
         }
-
-        sent_size += pkt_size;
+        rt_memset(hex_data, 0, bfsz * 2);
     }
 
 __exit:
-    /* reset the end sign for data conflict */
-    at_obj_set_end_sign(device->client, 0);
-
     rt_mutex_release(lock);
 
-    if (resp){
+    if (resp)
+    {
         at_delete_resp(resp);
     }
 
@@ -397,12 +447,12 @@ __exit:
  *         -2: wait socket event timeout
  *         -5: no memory
  */
-static int m5311_domain_resolve(const char *name, char ip[32])
+static int m5311_domain_resolve(const char *name, char ip[16])
 {
 #define RESOLVE_RETRY                  5
 
     int i, result = RT_EOK;
-    char recv_ip[32] = { 0 };
+    char recv_ip[16] = { 0 };
     at_response_t resp = RT_NULL;
     struct at_device *device = RT_NULL;
 
@@ -410,45 +460,55 @@ static int m5311_domain_resolve(const char *name, char ip[32])
     RT_ASSERT(ip);
 
     device = at_device_get_first_initialized();
-    if (device == RT_NULL){
+    if (device == RT_NULL)
+    {
         LOG_E("get first init device failed.");
         return -RT_ERROR;
     }
 
-    /* The maximum response time is 14 seconds, affected by network status */
-    resp = at_create_resp(128, 4, 14 * RT_TICK_PER_SECOND);
-    if (resp == RT_NULL){
+    /* The maximum response time is 3 seconds, affected by network status */
+    resp = at_create_resp(256, 4, 2 * RT_TICK_PER_SECOND);
+    if (resp == RT_NULL)
+    {
         LOG_E("no memory for resp create.");
         return -RT_ENOMEM;
     }
 
-    for(i = 0; i < RESOLVE_RETRY; i++){
-        if (at_obj_exec_cmd(device->client, resp, "AT+CMDNS=\"%s\"", name) < 0){
+    for(i = 0; i < RESOLVE_RETRY; i++)
+    {
+        if (at_obj_exec_cmd(device->client, resp, "AT+CMDNS=\"%s\"", name) < 0)
+        {
             result = -RT_ERROR;
             goto __exit;
         }
 
-        /* parse the third line of response data, get the IP address */
-        if(at_resp_parse_line_args_by_kw(resp, "+CMDNS: %s", recv_ip) < 0){
+        /* get the IP address */
+        if(at_resp_parse_line_args_by_kw(resp, "+CMDNS: ", "+CMDNS: %[^\r]", recv_ip) < 0)
+        {
             rt_thread_mdelay(100);
             /* resolve failed, maybe receive an URC CRLF */
             continue;
         }
 
-        if (rt_strlen(recv_ip) < 8){
+        if (rt_strlen(recv_ip) < 8)
+        {
             rt_thread_mdelay(100);
             /* resolve failed, maybe receive an URC CRLF */
             continue;
-        }else{
+        }
+        else
+        {
             rt_thread_mdelay(10);
-            rt_strncpy(ip, recv_ip, 32);
-            ip[32] = '\0';
+            rt_strncpy(ip, recv_ip, 16);
+            ip[15] = '\0';
+            LOG_D("domain:%s,IP address:%s", name, ip);
             break;
         }
     }
 
 __exit:
-    if (resp){
+    if (resp)
+    {
         at_delete_resp(resp);
     }
 
@@ -463,88 +523,63 @@ __exit:
  */
 static void m5311_socket_set_event_cb(at_socket_evt_t event, at_evt_cb_t cb)
 {
-    if (event < sizeof(at_evt_cb_set) / sizeof(at_evt_cb_set[1])){
+    if (event < sizeof(at_evt_cb_set) / sizeof(at_evt_cb_set[1]))
+    {
         at_evt_cb_set[event] = cb;
     }
 }
 
-static void urc_connect_func(struct at_client *client, const char *data, rt_size_t size)
-{
-    int device_socket = 0;
-    struct at_device *device = RT_NULL;
-    char *client_name = client->device->parent.name;
-
-    RT_ASSERT(data && size);
-
-    device = at_device_get_by_name(AT_DEVICE_NAMETYPE_CLIENT, client_name);
-    if (device == RT_NULL){
-        LOG_E("get device(%s) failed.", client_name);
-        return;
-    }
-
-    sscanf(data, "%d%*[^0-9]", &device_socket);
-
-    if (rt_strstr(data, "CONNECT OK")){
-        m5311_socket_event_send(device, SET_EVENT(device_socket, M5311_EVENT_CONN_OK));
-    }else{
-        m5311_socket_event_send(device, SET_EVENT(device_socket, M5311_EVENT_CONN_FAIL));
-    }
-}
 
 static void urc_send_func(struct at_client *client, const char *data, rt_size_t size)
 {
-    int device_socket = 0;
+    int device_socket = 0, data_size = 0;
     struct at_device *device = RT_NULL;
-    struct at_device_m5311 *m5311 = RT_NULL;
     char *client_name = client->device->parent.name;
 
     RT_ASSERT(data && size);
 
     device = at_device_get_by_name(AT_DEVICE_NAMETYPE_CLIENT, client_name);
-    if (device == RT_NULL){
+    if (device == RT_NULL)
+    {
         LOG_E("get device(%s) failed.", client_name);
         return;
     }
-    m5311 = (struct at_device_m5311 *) device->user_data;
-    device_socket = (int) m5311->user_data;
 
-    if (rt_strstr(data, "SEND OK")){
+    sscanf(data, "+IPSEND: %d,%d", &device_socket, &data_size);
+
+    if (data_size > 0)
+    {
         m5311_socket_event_send(device, SET_EVENT(device_socket, M5311_EVENT_SEND_OK));
     }
-    else if (rt_strstr(data, "SEND FAIL")){
-        m5311_socket_event_send(device, SET_EVENT(device_socket, M5311_EVENT_SEND_FAIL));
+    else
+    {
+    	m5311_socket_event_send(device, SET_EVENT(device_socket, M5311_EVENT_SEND_FAIL));
     }
 }
 
 static void urc_close_func(struct at_client *client, const char *data, rt_size_t size)
 {
     int device_socket = 0;
+    struct at_socket *socket = RT_NULL;
     struct at_device *device = RT_NULL;
     char *client_name = client->device->parent.name;
 
     RT_ASSERT(data && size);
 
     device = at_device_get_by_name(AT_DEVICE_NAMETYPE_CLIENT, client_name);
-    if (device == RT_NULL){
+    if (device == RT_NULL)
+    {
         LOG_E("get device(%s) failed.", client_name);
         return;
     }
 
-    sscanf(data, "%d%*s", &device_socket);
-
-    if (rt_strstr(data, "CLOSE OK")){
-        m5311_socket_event_send(device, SET_EVENT(device_socket, M5311_EVNET_CLOSE_OK));
-    }else if (rt_strstr(data, "CLOSED")){
-        struct at_socket *socket = RT_NULL;
-
-        /* get at socket object by device socket descriptor */
-        socket = &(device->sockets[device_socket]);
+    sscanf(data, "+IPCLOSE: %d", &device_socket);
+    socket = &(device->sockets[device_socket]);
 
-        /* notice the socket is disconnect by remote */
-        if (at_evt_cb_set[AT_SOCKET_EVT_CLOSED]){
-            at_evt_cb_set[AT_SOCKET_EVT_CLOSED](socket, AT_SOCKET_EVT_CLOSED, NULL, 0);
-        }
-    }
+    if (at_evt_cb_set[AT_SOCKET_EVT_CLOSED])
+	{
+		at_evt_cb_set[AT_SOCKET_EVT_CLOSED](socket, AT_SOCKET_EVT_CLOSED, RT_NULL, 0);
+	}
 }
 
 static void urc_recv_func(struct at_client *client, const char *data, rt_size_t size)
@@ -552,7 +587,10 @@ static void urc_recv_func(struct at_client *client, const char *data, rt_size_t
     int device_socket = 0;
     rt_int32_t timeout;
     rt_size_t bfsz = 0, temp_size = 0;
-    char *recv_buf = RT_NULL, temp[8] = {0};
+    char *recv_buf = RT_NULL, *hex_buf = RT_NULL, temp[8] = {0};
+    char remote_addr[16] = {0};
+    int remote_port = -1;
+
     struct at_socket *socket = RT_NULL;
     struct at_device *device = RT_NULL;
     char *client_name = client->device->parent.name;
@@ -560,61 +598,68 @@ static void urc_recv_func(struct at_client *client, const char *data, rt_size_t
     RT_ASSERT(data && size);
 
     device = at_device_get_by_name(AT_DEVICE_NAMETYPE_CLIENT, client_name);
-    if (device == RT_NULL){
+    if (device == RT_NULL)
+    {
         LOG_E("get device(%s) failed.", client_name);
         return;
     }
 
+    hex_buf = (char *) rt_calloc(1, M5311_MODULE_RECV_MAX_SIZE * 2 + 1);
+
     /* get the current socket and receive buffer size by receive data */
-    sscanf(data, "+RECEIVE: %d, %d", &device_socket, (int *) &bfsz);
+    /* mode 2 => +IPRD: <socket>,<remote_addr>, <remote_port>,<length>,<data> */
+    sscanf(data, "+IPRD: %d,\"%[0-9.]\",%d,%d,%s", &device_socket, remote_addr, &remote_port, (int *) &bfsz, hex_buf);
+    //LOG_D("%s device socket(%d) recv %d bytes from %s:%d\n>>%s", device->name, device_socket, bfsz, remote_addr, remote_port, hex_buf);
 
     /* set receive timeout by receive buffer length, not less than 10 ms */
     timeout = bfsz > 10 ? bfsz : 10;
 
-    if (device_socket < 0 || bfsz == 0){
+    if (device_socket < 0 || bfsz == 0)
         return;
-    }
 
-    recv_buf = (char *) rt_calloc(1, bfsz);
-    if (recv_buf == RT_NULL){
-        LOG_E("no memory for receive buffer (%d).", device->name, bfsz);
+    recv_buf = (char *) rt_calloc(1, bfsz + 1);
+
+    if (recv_buf == RT_NULL || hex_buf == RT_NULL)
+    {
+        LOG_E("no memory for URC receive buffer(%d).", bfsz);
         /* read and clean the coming data */
-        while (temp_size < bfsz){
-            if (bfsz - temp_size > sizeof(temp)){
+        while (temp_size < bfsz)
+        {
+            if (bfsz - temp_size > sizeof(temp))
+            {
                 at_client_obj_recv(client, temp, sizeof(temp), timeout);
-            }else{
+            }
+            else
+            {
                 at_client_obj_recv(client, temp, bfsz - temp_size, timeout);
             }
             temp_size += sizeof(temp);
         }
-        return;
-    }
 
-    /* sync receive data */
-    if (at_client_obj_recv(client, recv_buf, bfsz, timeout) != bfsz){
-        LOG_E("%s device receive size(%d) data failed.",  device->name, bfsz);
-        rt_free(recv_buf);
+        if (recv_buf) rt_free(recv_buf);
+        if (hex_buf)  rt_free(hex_buf);
         return;
     }
 
+    /* convert receive data */
+    hex_to_string(hex_buf, recv_buf, bfsz);
+    rt_free(hex_buf);
+
     /* get at socket object by device socket descriptor */
     socket = &(device->sockets[device_socket]);
 
     /* notice the receive buffer and buffer size */
-    if (at_evt_cb_set[AT_SOCKET_EVT_RECV]){
+    if (at_evt_cb_set[AT_SOCKET_EVT_RECV])
+    {
         at_evt_cb_set[AT_SOCKET_EVT_RECV](socket, AT_SOCKET_EVT_RECV, recv_buf, bfsz);
     }
 }
 
 static const struct at_urc urc_table[] =
 {
-    {"",            ", CONNECT OK\r\n",     urc_connect_func},
-    {"",            ", CONNECT FAIL\r\n",   urc_connect_func},
-    {"SEND OK",     "\r\n",                 urc_send_func},
-    {"SEND FAIL",   "\r\n",                 urc_send_func},
-    {"",            ", CLOSE OK\r\n",       urc_close_func},
-    {"",            ", CLOSED\r\n",         urc_close_func},
-    {"+RECEIVE:",   "\r\n",                 urc_recv_func},
+    {"+IPSEND: ",    "\r\n",                 urc_send_func},
+    {"+IPCLOSE: ",   "\r\n",                 urc_close_func},
+    {"+IPRD: ",      "\r\n",                 urc_recv_func},
 };
 
 static const struct at_socket_ops m5311_socket_ops =