Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
人间散章
rt-thread
提交
2d894b41
R
rt-thread
项目概览
人间散章
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
1
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2d894b41
编写于
8月 27, 2018
作者:
Lawlieta
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[net][at] Modify AT Socket object callback name
上级
9fdd46fa
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
22 deletion
+22
-22
components/net/at/at_socket/at_socket.c
components/net/at/at_socket/at_socket.c
+17
-17
components/net/at/at_socket/at_socket.h
components/net/at/at_socket/at_socket.h
+5
-5
未找到文件。
components/net/at/at_socket/at_socket.c
浏览文件 @
2d894b41
...
...
@@ -46,7 +46,7 @@
((unsigned char *)&addr)[2], \
((unsigned char *)&addr)[3]
#if
def AT_DEVICE_NOT_SELECTED
#if
!defined(AT_DEVICE_SOCKETS_NUM) || defined(AT_DEVICE_NOT_SELECTED)
#error The AT socket device is not selected, please select it through the env menuconfig.
#endif
...
...
@@ -398,7 +398,7 @@ int at_closesocket(int socket)
if
(
last_state
==
AT_SOCKET_CONNECT
)
{
if
(
at_dev_ops
->
close
(
socket
)
!=
0
)
if
(
at_dev_ops
->
at_closesocket
(
socket
)
!=
0
)
{
LOG_E
(
"AT socket (%d) closesocket failed!"
,
socket
);
}
...
...
@@ -424,7 +424,7 @@ int at_shutdown(int socket, int how)
if
(
sock
->
state
==
AT_SOCKET_CONNECT
)
{
if
(
at_dev_ops
->
close
(
socket
)
!=
0
)
if
(
at_dev_ops
->
at_closesocket
(
socket
)
!=
0
)
{
LOG_E
(
"AT socket (%d) shutdown failed!"
,
socket
);
}
...
...
@@ -535,7 +535,7 @@ int at_connect(int socket, const struct sockaddr *name, socklen_t namelen)
socketaddr_to_ipaddr_port
(
name
,
&
remote_addr
,
&
remote_port
);
ipaddr_to_ipstr
(
name
,
ipstr
);
if
(
at_dev_ops
->
connect
(
socket
,
ipstr
,
remote_port
,
sock
->
type
,
RT_TRUE
)
<
0
)
if
(
at_dev_ops
->
at_
connect
(
socket
,
ipstr
,
remote_port
,
sock
->
type
,
RT_TRUE
)
<
0
)
{
LOG_E
(
"AT socket(%d) connect failed!"
,
socket
);
result
=
-
1
;
...
...
@@ -545,8 +545,8 @@ int at_connect(int socket, const struct sockaddr *name, socklen_t namelen)
sock
->
state
=
AT_SOCKET_CONNECT
;
/* set AT socket receive data callback function */
at_dev_ops
->
set_event_cb
(
AT_SOCKET_EVT_RECV
,
at_recv_notice_cb
);
at_dev_ops
->
set_event_cb
(
AT_SOCKET_EVT_CLOSED
,
at_closed_notice_cb
);
at_dev_ops
->
at_
set_event_cb
(
AT_SOCKET_EVT_RECV
,
at_recv_notice_cb
);
at_dev_ops
->
at_
set_event_cb
(
AT_SOCKET_EVT_CLOSED
,
at_closed_notice_cb
);
__exit:
...
...
@@ -593,7 +593,7 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f
socketaddr_to_ipaddr_port
(
from
,
&
remote_addr
,
&
remote_port
);
ipaddr_to_ipstr
(
from
,
ipstr
);
if
(
at_dev_ops
->
connect
(
socket
,
ipstr
,
remote_port
,
sock
->
type
,
RT_TRUE
)
<
0
)
if
(
at_dev_ops
->
at_
connect
(
socket
,
ipstr
,
remote_port
,
sock
->
type
,
RT_TRUE
)
<
0
)
{
LOG_E
(
"AT socket UDP connect failed!"
);
result
=
-
1
;
...
...
@@ -719,7 +719,7 @@ int at_sendto(int socket, const void *data, size_t size, int flags, const struct
goto
__exit
;
}
if
((
len
=
at_dev_ops
->
send
(
sock
->
socket
,
(
const
char
*
)
data
,
size
,
sock
->
type
))
<
0
)
if
((
len
=
at_dev_ops
->
at_
send
(
sock
->
socket
,
(
const
char
*
)
data
,
size
,
sock
->
type
))
<
0
)
{
result
=
-
1
;
goto
__exit
;
...
...
@@ -736,7 +736,7 @@ int at_sendto(int socket, const void *data, size_t size, int flags, const struct
socketaddr_to_ipaddr_port
(
to
,
&
remote_addr
,
&
remote_port
);
ipaddr_to_ipstr
(
to
,
ipstr
);
if
(
at_dev_ops
->
connect
(
socket
,
ipstr
,
remote_port
,
sock
->
type
,
RT_TRUE
)
<
0
)
if
(
at_dev_ops
->
at_
connect
(
socket
,
ipstr
,
remote_port
,
sock
->
type
,
RT_TRUE
)
<
0
)
{
LOG_E
(
"AT socket (%d) UDP connect failed!"
,
socket
);
result
=
-
1
;
...
...
@@ -745,7 +745,7 @@ int at_sendto(int socket, const void *data, size_t size, int flags, const struct
sock
->
state
=
AT_SOCKET_CONNECT
;
}
if
((
len
=
at_dev_ops
->
send
(
sock
->
socket
,
(
char
*
)
data
,
size
,
sock
->
type
))
<
0
)
if
((
len
=
at_dev_ops
->
at_
send
(
sock
->
socket
,
(
char
*
)
data
,
size
,
sock
->
type
))
<
0
)
{
result
=
-
1
;
goto
__exit
;
...
...
@@ -940,7 +940,7 @@ struct hostent *at_gethostbyname(const char *name)
if
(
idx
<
strlen
(
name
))
{
if
(
at_dev_ops
->
domain_resolve
(
name
,
ipstr
)
<
0
)
if
(
at_dev_ops
->
at_
domain_resolve
(
name
,
ipstr
)
<
0
)
{
LOG_E
(
"AT domain (%s) resolve error!"
,
name
);
return
RT_NULL
;
...
...
@@ -1040,7 +1040,7 @@ int at_getaddrinfo(const char *nodename, const char *servname,
if
(
idx
<
strlen
(
nodename
))
{
if
(
at_dev_ops
->
domain_resolve
((
char
*
)
nodename
,
ip_str
)
!=
0
)
if
(
at_dev_ops
->
at_
domain_resolve
((
char
*
)
nodename
,
ip_str
)
!=
0
)
{
return
EAI_FAIL
;
}
...
...
@@ -1129,10 +1129,10 @@ void at_freeaddrinfo(struct addrinfo *ai)
void
at_scoket_device_register
(
const
struct
at_device_ops
*
ops
)
{
RT_ASSERT
(
ops
);
RT_ASSERT
(
ops
->
connect
);
RT_ASSERT
(
ops
->
close
);
RT_ASSERT
(
ops
->
send
);
RT_ASSERT
(
ops
->
domain_resolve
);
RT_ASSERT
(
ops
->
set_event_cb
);
RT_ASSERT
(
ops
->
at_
connect
);
RT_ASSERT
(
ops
->
at_closesocket
);
RT_ASSERT
(
ops
->
at_
send
);
RT_ASSERT
(
ops
->
at_
domain_resolve
);
RT_ASSERT
(
ops
->
at_
set_event_cb
);
at_dev_ops
=
(
struct
at_device_ops
*
)
ops
;
}
components/net/at/at_socket/at_socket.h
浏览文件 @
2d894b41
...
...
@@ -77,11 +77,11 @@ typedef void (* at_socket_callback)(struct at_socket *conn, int event, uint16_t
/* AT device socket options function */
struct
at_device_ops
{
int
(
*
connect
)(
int
socket
,
char
*
ip
,
int32_t
port
,
enum
at_socket_type
type
,
rt_bool_t
is_client
);
int
(
*
close
)(
int
socket
);
int
(
*
send
)(
int
socket
,
const
char
*
buff
,
size_t
bfsz
,
enum
at_socket_type
type
);
int
(
*
domain_resolve
)(
const
char
*
name
,
char
ip
[
16
]);
void
(
*
set_event_cb
)(
at_socket_evt_t
event
,
at_evt_cb_t
cb
);
int
(
*
at_
connect
)(
int
socket
,
char
*
ip
,
int32_t
port
,
enum
at_socket_type
type
,
rt_bool_t
is_client
);
int
(
*
at_closesocket
)(
int
socket
);
int
(
*
at_
send
)(
int
socket
,
const
char
*
buff
,
size_t
bfsz
,
enum
at_socket_type
type
);
int
(
*
at_
domain_resolve
)(
const
char
*
name
,
char
ip
[
16
]);
void
(
*
at_
set_event_cb
)(
at_socket_evt_t
event
,
at_evt_cb_t
cb
);
};
/* AT receive package list structure */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录