NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename virNetClient*AddrString

Browse Source 
Add SASL at the end to make the format obvious.
This commit is contained in:
Ján Tomko 2016-06-23 22:31:20 +02:00
parent eaf7ff3873
commit 541bd183f7
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libvirt_remote.syms
View File

@ -17,7 +17,7 @@ virNetClientIsOpen;
virNetClientKeepAliveIsSupported; virNetClientKeepAliveIsSupported;
virNetClientKeepAliveStart; virNetClientKeepAliveStart;
virNetClientKeepAliveStop; virNetClientKeepAliveStop;
virNetClientLocalAddrString; virNetClientLocalAddrStringSASL;
virNetClientNewExternal; virNetClientNewExternal;
virNetClientNewLibSSH2; virNetClientNewLibSSH2;
virNetClientNewSSH; virNetClientNewSSH;
@ -25,7 +25,7 @@ virNetClientNewTCP;
virNetClientNewUNIX; virNetClientNewUNIX;
virNetClientRegisterAsyncIO; virNetClientRegisterAsyncIO;
virNetClientRegisterKeepAlive; virNetClientRegisterKeepAlive;
virNetClientRemoteAddrString; virNetClientRemoteAddrStringSASL;
virNetClientRemoveStream; virNetClientRemoveStream;
virNetClientSendNonBlock; virNetClientSendNonBlock;
virNetClientSendNoReply; virNetClientSendNoReply;

4
src/remote/remote_driver.c
View File

@ -3831,8 +3831,8 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv,
if (!(sasl = virNetSASLSessionNewClient(saslCtxt, if (!(sasl = virNetSASLSessionNewClient(saslCtxt,
"libvirt", "libvirt",
priv->hostname, priv->hostname,
virNetClientLocalAddrString(priv->client), virNetClientLocalAddrStringSASL(priv->client),
virNetClientRemoteAddrString(priv->client), virNetClientRemoteAddrStringSASL(priv->client),
saslcb))) saslcb)))
goto cleanup; goto cleanup;
/* saslcb is now owned by sasl */ /* saslcb is now owned by sasl */

4
src/rpc/virnetclient.c
View File

@ -944,12 +944,12 @@ void virNetClientRemoveStream(virNetClientPtr client,
} }
const char *virNetClientLocalAddrString(virNetClientPtr client) const char *virNetClientLocalAddrStringSASL(virNetClientPtr client)
{ {
return virNetSocketLocalAddrStringSASL(client->sock); return virNetSocketLocalAddrStringSASL(client->sock);
} }
const char *virNetClientRemoteAddrString(virNetClientPtr client) const char *virNetClientRemoteAddrStringSASL(virNetClientPtr client)
{ {
return virNetSocketRemoteAddrStringSASL(client->sock); return virNetSocketRemoteAddrStringSASL(client->sock);
} }

4
src/rpc/virnetclient.h
View File

@ -121,8 +121,8 @@ int virNetClientSetTLSSession(virNetClientPtr client,
bool virNetClientIsEncrypted(virNetClientPtr client); bool virNetClientIsEncrypted(virNetClientPtr client);
bool virNetClientIsOpen(virNetClientPtr client); bool virNetClientIsOpen(virNetClientPtr client);
const char *virNetClientLocalAddrString(virNetClientPtr client); const char *virNetClientLocalAddrStringSASL(virNetClientPtr client);
const char *virNetClientRemoteAddrString(virNetClientPtr client); const char *virNetClientRemoteAddrStringSASL(virNetClientPtr client);
# ifdef WITH_GNUTLS # ifdef WITH_GNUTLS
int virNetClientGetTLSKeySize(virNetClientPtr client); int virNetClientGetTLSKeySize(virNetClientPtr client);