External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

virNetSocket: rename AddrStr to AddrStrSASL

Browse Source 
Make it more obvious that these are in the SASL format.
This commit is contained in:
Ján Tomko 2016-06-20 15:55:55 +02:00
parent 42362c9166
commit dbce70b243
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/rpc/virnetsocket.c
View File

@ -85,8 +85,8 @@ struct _virNetSocket {
virSocketAddr localAddr; virSocketAddr localAddr;
virSocketAddr remoteAddr; virSocketAddr remoteAddr;
char *localAddrStr; char *localAddrStrSASL;
char *remoteAddrStr; char *remoteAddrStrSASL;
char *remoteAddrStrURI; char *remoteAddrStrURI;
#if WITH_GNUTLS #if WITH_GNUTLS
@ -263,11 +263,11 @@ static virNetSocketPtr virNetSocketNew(virSocketAddrPtr localAddr,
if (localAddr && if (localAddr &&
!(sock->localAddrStr = virSocketAddrFormatFull(localAddr, true, ";"))) !(sock->localAddrStrSASL = virSocketAddrFormatFull(localAddr, true, ";")))
goto error; goto error;
if (remoteAddr && if (remoteAddr &&
!(sock->remoteAddrStr = virSocketAddrFormatFull(remoteAddr, true, ";"))) !(sock->remoteAddrStrSASL = virSocketAddrFormatFull(remoteAddr, true, ";")))
goto error; goto error;
if (remoteAddr && if (remoteAddr &&
@ -279,7 +279,7 @@ static virNetSocketPtr virNetSocketNew(virSocketAddrPtr localAddr,
PROBE(RPC_SOCKET_NEW, PROBE(RPC_SOCKET_NEW,
"sock=%p fd=%d errfd=%d pid=%lld localAddr=%s, remoteAddr=%s", "sock=%p fd=%d errfd=%d pid=%lld localAddr=%s, remoteAddr=%s",
sock, fd, errfd, (long long) pid, sock, fd, errfd, (long long) pid,
NULLSTR(sock->localAddrStr), NULLSTR(sock->remoteAddrStr)); NULLSTR(sock->localAddrStrSASL), NULLSTR(sock->remoteAddrStrSASL));
return sock; return sock;
@ -1207,8 +1207,8 @@ void virNetSocketDispose(void *obj)
virProcessAbort(sock->pid); virProcessAbort(sock->pid);
VIR_FREE(sock->localAddrStr); VIR_FREE(sock->localAddrStrSASL);
VIR_FREE(sock->remoteAddrStr); VIR_FREE(sock->remoteAddrStrSASL);
VIR_FREE(sock->remoteAddrStrURI); VIR_FREE(sock->remoteAddrStrURI);
} }
@ -1463,12 +1463,12 @@ int virNetSocketSetBlocking(virNetSocketPtr sock,
const char *virNetSocketLocalAddrString(virNetSocketPtr sock) const char *virNetSocketLocalAddrString(virNetSocketPtr sock)
{ {
return sock->localAddrStr; return sock->localAddrStrSASL;
} }
const char *virNetSocketRemoteAddrString(virNetSocketPtr sock) const char *virNetSocketRemoteAddrString(virNetSocketPtr sock)
{ {
return sock->remoteAddrStr; return sock->remoteAddrStrSASL;
} }
const char *virNetSocketRemoteAddrStringURI(virNetSocketPtr sock) const char *virNetSocketRemoteAddrStringURI(virNetSocketPtr sock)