Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
KASAKI11
TDengine
提交
b1bb894e
T
TDengine
项目概览
KASAKI11
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
b1bb894e
编写于
11月 16, 2019
作者:
P
plum-lihui
提交者:
GitHub
11月 16, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #734 from taosdata/feature/slguan
Feature/slguan
上级
7aeacaf6
5e48daf5
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
9 addition
and
15 deletion
+9
-15
src/inc/sdb.h
src/inc/sdb.h
+3
-3
src/inc/trpc.h
src/inc/trpc.h
+1
-2
src/os/darwin/src/tdarwin.c
src/os/darwin/src/tdarwin.c
+0
-1
src/os/linux/src/tlinux.c
src/os/linux/src/tlinux.c
+0
-1
src/rpc/src/ttcpserver.c
src/rpc/src/ttcpserver.c
+2
-1
src/util/src/tglobalcfg.c
src/util/src/tglobalcfg.c
+3
-3
src/util/src/tsocket.c
src/util/src/tsocket.c
+0
-4
未找到文件。
src/inc/sdb.h
浏览文件 @
b1bb894e
...
...
@@ -23,10 +23,10 @@ extern "C" {
#include "taosmsg.h"
#include "tsdb.h"
extern
short
sdbPeer
Port
;
extern
short
sdb
SyncPort
;
extern
short
tsMgmtMgmt
Port
;
extern
short
tsMgmt
SyncPort
;
extern
int
sdbMaxNodes
;
extern
int
sdbHb
Timer
;
// seconds
extern
int
tsMgmtPeerHB
Timer
;
// seconds
extern
char
sdbZone
[];
extern
char
sdbMasterIp
[];
extern
char
sdbPrivateIp
[];
...
...
src/inc/trpc.h
浏览文件 @
b1bb894e
...
...
@@ -25,7 +25,6 @@ extern "C" {
#define TAOS_CONN_UDPS 0
#define TAOS_CONN_UDPC 1
#define TAOS_CONN_UDP 1
#define TAOS_CONN_TCPS 2
#define TAOS_CONN_TCPC 3
#define TAOS_CONN_HTTPS 4
...
...
@@ -39,7 +38,7 @@ extern "C" {
#define TAOS_ID_REALLOCATE 2
#define TAOS_CONN_SOCKET_TYPE_S() ((strcasecmp(tsSocketType, TAOS_SOCKET_TYPE_NAME_UDP) == 0)? TAOS_CONN_UDPS:TAOS_CONN_TCPS)
#define TAOS_CONN_SOCKET_TYPE_C() ((strcasecmp(tsSocketType, TAOS_SOCKET_TYPE_NAME_UDP) == 0)? TAOS_CONN_UDP:TAOS_CONN_TCPC)
#define TAOS_CONN_SOCKET_TYPE_C() ((strcasecmp(tsSocketType, TAOS_SOCKET_TYPE_NAME_UDP) == 0)? TAOS_CONN_UDP
C
:TAOS_CONN_TCPC)
#define taosSendMsgToPeer(x, y, z) taosSendMsgToPeerH(x, y, z, NULL)
#define taosOpenRpcChann(x, y, z) taosOpenRpcChannWithQ(x,y,z,NULL)
...
...
src/os/darwin/src/tdarwin.c
浏览文件 @
b1bb894e
...
...
@@ -204,7 +204,6 @@ int taosOpenUDServerSocket(char *ip, short port) {
char
name
[
128
];
pTrace
(
"open ud socket:%s"
,
name
);
// if (tsAllowLocalhost) ip = "0.0.0.0";
sprintf
(
name
,
"%s.%d"
,
ip
,
port
);
bzero
((
char
*
)
&
serverAdd
,
sizeof
(
serverAdd
));
...
...
src/os/linux/src/tlinux.c
浏览文件 @
b1bb894e
...
...
@@ -197,7 +197,6 @@ int taosOpenUDServerSocket(char *ip, short port) {
char
name
[
128
];
pTrace
(
"open ud socket:%s"
,
name
);
// if (tsAllowLocalhost) ip = "0.0.0.0";
sprintf
(
name
,
"%s.%d"
,
ip
,
port
);
bzero
((
char
*
)
&
serverAdd
,
sizeof
(
serverAdd
));
...
...
src/rpc/src/ttcpserver.c
浏览文件 @
b1bb894e
...
...
@@ -185,8 +185,9 @@ static void taosProcessTcpData(void *param) {
void
*
buffer
=
malloc
(
1024
);
int
headLen
=
taosReadMsg
(
pFdObj
->
fd
,
buffer
,
sizeof
(
STaosHeader
));
if
(
headLen
!=
sizeof
(
STaosHeader
))
{
tError
(
"%s read error, headLen:%d
"
,
pThreadObj
->
label
,
headLen
);
tError
(
"%s read error, headLen:%d
, errno:%d"
,
pThreadObj
->
label
,
headLen
,
errno
);
taosCleanUpFdObj
(
pFdObj
);
tfree
(
buffer
);
continue
;
...
...
src/util/src/tglobalcfg.c
浏览文件 @
b1bb894e
...
...
@@ -62,8 +62,8 @@ short tsMgmtShellPort = 6030; // udp[6030-6034] tcp[6030]
short
tsVnodeShellPort
=
6035
;
// udp[6035-6039] tcp[6035]
short
tsMgmtVnodePort
=
6040
;
// udp[6040-6044] tcp[6040]
short
tsVnodeVnodePort
=
6045
;
// tcp[6045]
short
tsMgmtMgmtPort
=
6050
;
//
sdbPeerPort only
udp, numOfVnodes fixed to 1, range udp[6050]
short
tsMgmtSyncPort
=
6050
;
//
sdbSyncPort only
tcp, range tcp[6050]
short
tsMgmtMgmtPort
=
6050
;
// udp, numOfVnodes fixed to 1, range udp[6050]
short
tsMgmtSyncPort
=
6050
;
// tcp, range tcp[6050]
int
tsStatusInterval
=
1
;
// second
int
tsShellActivityTimer
=
3
;
// second
...
...
@@ -77,7 +77,7 @@ float tsRatioOfQueryThreads = 0.5;
char
tsPublicIp
[
TSDB_IPv4ADDR_LEN
]
=
{
0
};
char
tsInternalIp
[
TSDB_IPv4ADDR_LEN
]
=
{
0
};
char
tsPrivateIp
[
TSDB_IPv4ADDR_LEN
]
=
{
0
};
char
tsServerIpStr
[
TSDB_IPv4ADDR_LEN
]
=
"
0.0.0.0
"
;
char
tsServerIpStr
[
TSDB_IPv4ADDR_LEN
]
=
"
127.0.0.1
"
;
short
tsNumOfVnodesPerCore
=
8
;
short
tsNumOfTotalVnodes
=
0
;
short
tsCheckHeaderFile
=
0
;
...
...
src/util/src/tsocket.c
浏览文件 @
b1bb894e
...
...
@@ -269,7 +269,6 @@ int taosOpenUdpSocket(char *ip, short port) {
int
bufSize
=
8192000
;
pTrace
(
"open udp socket:%s:%d"
,
ip
,
port
);
// if (tsAllowLocalhost) ip = "0.0.0.0";
memset
((
char
*
)
&
localAddr
,
0
,
sizeof
(
localAddr
));
localAddr
.
sin_family
=
AF_INET
;
...
...
@@ -334,7 +333,6 @@ int taosOpenTcpClientSocket(char *destIp, short destPort, char *clientIp) {
int
ret
;
pTrace
(
"open tcp client socket:%s:%d"
,
destIp
,
destPort
);
// if (tsAllowLocalhost) destIp = "0.0.0.0";
sockFd
=
(
int
)
socket
(
PF_INET
,
SOCK_STREAM
,
IPPROTO_TCP
);
...
...
@@ -430,7 +428,6 @@ int taosOpenTcpServerSocket(char *ip, short port) {
int
reuse
;
pTrace
(
"open tcp server socket:%s:%d"
,
ip
,
port
);
// if (tsAllowLocalhost) ip = "0.0.0.0";
bzero
((
char
*
)
&
serverAdd
,
sizeof
(
serverAdd
));
serverAdd
.
sin_family
=
AF_INET
;
...
...
@@ -472,7 +469,6 @@ int taosOpenRawSocket(char *ip) {
struct
sockaddr_in
rawAdd
;
pTrace
(
"open udp raw socket:%s"
,
ip
);
// if (tsAllowLocalhost) ip = "0.0.0.0";
fd
=
(
int
)
socket
(
AF_INET
,
SOCK_RAW
,
IPPROTO_UDP
);
if
(
fd
<
0
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录