From ce35dfbc40f9001ed1df81926e268ceaaa436844 Mon Sep 17 00:00:00 2001 From: luhuadong Date: Wed, 20 May 2020 01:11:46 +0800 Subject: [PATCH] [AT] Adjust where the AT socket callback function --- components/net/at/at_socket/at_socket.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/components/net/at/at_socket/at_socket.c b/components/net/at/at_socket/at_socket.c index 220bf9d620..ca57677daf 100644 --- a/components/net/at/at_socket/at_socket.c +++ b/components/net/at/at_socket/at_socket.c @@ -404,6 +404,9 @@ static struct at_socket *alloc_socket(void) return alloc_socket_by_device(device); } +static void at_recv_notice_cb(struct at_socket *sock, at_socket_evt_t event, const char *buff, size_t bfsz); +static void at_closed_notice_cb(struct at_socket *sock, at_socket_evt_t event, const char *buff, size_t bfsz); + int at_socket(int domain, int type, int protocol) { struct at_socket *sock = RT_NULL; @@ -438,6 +441,10 @@ int at_socket(int domain, int type, int protocol) sock->type = socket_type; sock->state = AT_SOCKET_OPEN; + /* set AT socket receive data callback function */ + sock->ops->at_set_event_cb(AT_SOCKET_EVT_RECV, at_recv_notice_cb); + sock->ops->at_set_event_cb(AT_SOCKET_EVT_CLOSED, at_closed_notice_cb); + return sock->socket; } @@ -703,10 +710,6 @@ int at_connect(int socket, const struct sockaddr *name, socklen_t namelen) sock->state = AT_SOCKET_CONNECT; - /* set AT socket receive data callback function */ - sock->ops->at_set_event_cb(AT_SOCKET_EVT_RECV, at_recv_notice_cb); - sock->ops->at_set_event_cb(AT_SOCKET_EVT_CLOSED, at_closed_notice_cb); - __exit: if (result < 0) @@ -760,9 +763,6 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f goto __exit; } sock->state = AT_SOCKET_CONNECT; - /* set AT socket receive data callback function */ - sock->ops->at_set_event_cb(AT_SOCKET_EVT_RECV, at_recv_notice_cb); - sock->ops->at_set_event_cb(AT_SOCKET_EVT_CLOSED, at_closed_notice_cb); } /* receive packet list last transmission of remaining data */ @@ -924,9 +924,6 @@ int at_sendto(int socket, const void *data, size_t size, int flags, const struct goto __exit; } sock->state = AT_SOCKET_CONNECT; - /* set AT socket receive data callback function */ - sock->ops->at_set_event_cb(AT_SOCKET_EVT_RECV, at_recv_notice_cb); - sock->ops->at_set_event_cb(AT_SOCKET_EVT_CLOSED, at_closed_notice_cb); } if ((len = sock->ops->at_send(sock, (char *) data, size, sock->type)) < 0) -- GitLab