Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
rt-thread
提交
8f95b78d
R
rt-thread
项目概览
BaiXuePrincess
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
8f95b78d
编写于
9月 14, 2018
作者:
Lawlieta
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[net][at] fix at select receive event change issue.
上级
0aa4b72b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
11 deletion
+20
-11
components/net/at/at_socket/at_socket.c
components/net/at/at_socket/at_socket.c
+18
-9
components/net/at/include/at.h
components/net/at/include/at.h
+2
-2
未找到文件。
components/net/at/at_socket/at_socket.c
浏览文件 @
8f95b78d
...
...
@@ -513,6 +513,7 @@ static void at_closed_notice_cb(int socket, at_socket_evt_t event, const char *b
sock
->
state
=
AT_SOCKET_CLOSED
;
rt_sem_release
(
sock
->
recv_notice
);
}
int
at_connect
(
int
socket
,
const
struct
sockaddr
*
name
,
socklen_t
namelen
)
{
struct
at_socket
*
sock
;
...
...
@@ -611,7 +612,13 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f
sock
->
state
=
AT_SOCKET_CONNECT
;
}
if
(
sock
->
state
!=
AT_SOCKET_CONNECT
)
/* socket passively closed, receive function return 0 */
if
(
sock
->
state
==
AT_SOCKET_CLOSED
)
{
result
=
0
;
goto
__exit
;
}
else
if
(
sock
->
state
!=
AT_SOCKET_CONNECT
)
{
LOG_E
(
"received data error, current socket (%d) state (%d) is error."
,
socket
,
sock
->
state
);
result
=
-
1
;
...
...
@@ -664,7 +671,7 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f
else
{
LOG_D
(
"received data exit, current socket (%d) is closed by remote."
,
socket
);
result
=
-
1
;
result
=
0
;
goto
__exit
;
}
}
...
...
@@ -672,18 +679,20 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f
__exit:
if
(
result
<
0
)
{
at_do_event_changes
(
sock
,
AT_EVENT_ERROR
,
RT_TRUE
);
}
else
if
(
recv_len
>
0
)
{
result
=
recv_len
;
if
(
recv_len
)
at_do_event_changes
(
sock
,
AT_EVENT_RECV
,
RT_FALSE
);
if
(
!
rt_slist_isempty
(
&
sock
->
recvpkt_list
))
{
at_do_event_changes
(
sock
,
AT_EVENT_RECV
,
RT_
FALS
E
);
at_do_event_changes
(
sock
,
AT_EVENT_RECV
,
RT_
TRU
E
);
}
}
else
{
at_do_event_changes
(
sock
,
AT_EVENT_ERROR
,
RT_TRUE
);
}
return
result
;
}
...
...
components/net/at/include/at.h
浏览文件 @
8f95b78d
...
...
@@ -32,8 +32,8 @@
extern
"C"
{
#endif
#define AT_SW_VERSION "1.0.
1
"
#define AT_SW_VERSION_NUM 0x1000
0
#define AT_SW_VERSION "1.0.
2
"
#define AT_SW_VERSION_NUM 0x1000
2
#define DBG_ENABLE
#define DBG_SECTION_NAME "AT"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录