Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
e1e94f2e
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
e1e94f2e
编写于
1月 08, 2013
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename HAVE_LIBSSH2 to WITH_SSH2
上级
40541c2a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
13 deletion
+13
-13
configure.ac
configure.ac
+2
-2
src/Makefile.am
src/Makefile.am
+2
-2
src/rpc/virnetsocket.c
src/rpc/virnetsocket.c
+9
-9
未找到文件。
configure.ac
浏览文件 @
e1e94f2e
...
...
@@ -1426,11 +1426,11 @@ if test "$with_phyp" = "yes"; then
AC_DEFINE_UNQUOTED([WITH_PHYP], 1, [whether IBM HMC / IVM driver is enabled])
fi
if test "$with_libssh2_transport" = "yes"; then
AC_DEFINE_UNQUOTED([
HAVE_LIB
SSH2], 1, [whether libssh2 transport is enabled])
AC_DEFINE_UNQUOTED([
WITH_
SSH2], 1, [whether libssh2 transport is enabled])
fi
AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"])
AM_CONDITIONAL([
HAVE_LIB
SSH2], [test "$with_libssh2_transport" = "yes"])
AM_CONDITIONAL([
WITH_
SSH2], [test "$with_libssh2_transport" = "yes"])
AC_SUBST([LIBSSH2_CFLAGS])
AC_SUBST([LIBSSH2_LIBS])
...
...
src/Makefile.am
浏览文件 @
e1e94f2e
...
...
@@ -1426,7 +1426,7 @@ if WITH_SASL
USED_SYM_FILES
+=
$(srcdir)
/libvirt_sasl.syms
endif
if
HAVE_LIB
SSH2
if
WITH_
SSH2
USED_SYM_FILES
+=
$(srcdir)
/libvirt_libssh2.syms
endif
...
...
@@ -1772,7 +1772,7 @@ libvirt_net_rpc_la_SOURCES = \
rpc/virnetsocket.h rpc/virnetsocket.c
\
rpc/virkeepaliveprotocol.h rpc/virkeepaliveprotocol.c
\
rpc/virkeepalive.h rpc/virkeepalive.c
if
HAVE_LIB
SSH2
if
WITH_
SSH2
libvirt_net_rpc_la_SOURCES
+=
\
rpc/virnetsshsession.h rpc/virnetsshsession.c
else
...
...
src/rpc/virnetsocket.c
浏览文件 @
e1e94f2e
...
...
@@ -51,7 +51,7 @@
#include "passfd.h"
#if
HAVE_LIB
SSH2
#if
WITH_
SSH2
# include "virnetsshsession.h"
#endif
...
...
@@ -93,7 +93,7 @@ struct _virNetSocket {
size_t
saslEncodedLength
;
size_t
saslEncodedOffset
;
#endif
#if
HAVE_LIB
SSH2
#if
WITH_
SSH2
virNetSSHSessionPtr
sshSession
;
#endif
};
...
...
@@ -738,7 +738,7 @@ int virNetSocketNewConnectSSH(const char *nodename,
return
virNetSocketNewConnectCommand
(
cmd
,
retsock
);
}
#if
HAVE_LIB
SSH2
#if
WITH_
SSH2
int
virNetSocketNewConnectLibSSH2
(
const
char
*
host
,
const
char
*
port
,
...
...
@@ -870,7 +870,7 @@ virNetSocketNewConnectLibSSH2(const char *host ATTRIBUTE_UNUSED,
_
(
"libssh2 transport support was not enabled"
));
return
-
1
;
}
#endif
/*
HAVE_LIB
SSH2 */
#endif
/*
WITH_
SSH2 */
int
virNetSocketNewConnectExternal
(
const
char
**
cmdargv
,
virNetSocketPtr
*
retsock
)
...
...
@@ -1025,7 +1025,7 @@ void virNetSocketDispose(void *obj)
virObjectUnref
(
sock
->
saslSession
);
#endif
#if
HAVE_LIB
SSH2
#if
WITH_
SSH2
virObjectUnref
(
sock
->
sshSession
);
#endif
...
...
@@ -1234,7 +1234,7 @@ bool virNetSocketHasCachedData(virNetSocketPtr sock ATTRIBUTE_UNUSED)
bool
hasCached
=
false
;
virMutexLock
(
&
sock
->
lock
);
#if
HAVE_LIB
SSH2
#if
WITH_
SSH2
if
(
virNetSSHSessionHasCachedData
(
sock
->
sshSession
))
hasCached
=
true
;
#endif
...
...
@@ -1247,7 +1247,7 @@ bool virNetSocketHasCachedData(virNetSocketPtr sock ATTRIBUTE_UNUSED)
return
hasCached
;
}
#if
HAVE_LIB
SSH2
#if
WITH_
SSH2
static
ssize_t
virNetSocketLibSSH2Read
(
virNetSocketPtr
sock
,
char
*
buf
,
size_t
len
)
...
...
@@ -1281,7 +1281,7 @@ static ssize_t virNetSocketReadWire(virNetSocketPtr sock, char *buf, size_t len)
char
*
errout
=
NULL
;
ssize_t
ret
;
#if
HAVE_LIB
SSH2
#if
WITH_
SSH2
if
(
sock
->
sshSession
)
return
virNetSocketLibSSH2Read
(
sock
,
buf
,
len
);
#endif
...
...
@@ -1340,7 +1340,7 @@ static ssize_t virNetSocketWriteWire(virNetSocketPtr sock, const char *buf, size
{
ssize_t
ret
;
#if
HAVE_LIB
SSH2
#if
WITH_
SSH2
if
(
sock
->
sshSession
)
return
virNetSocketLibSSH2Write
(
sock
,
buf
,
len
);
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录