On 03/18/2011 12:54 PM, Daniel P. Berrange wrote: > This extends the basic virNetSocket APIs to allow them to have > a handle to the TLS/SASL session objects, once established. > This ensures that any data reads/writes are automagically > passed through the TLS/SASL encryption layers if required. > > * src/rpc/virnetsocket.c, src/rpc/virnetsocket.h: Wire up > SASL/TLS encryption > --- > src/rpc/virnetsocket.c | 274 +++++++++++++++++++++++++++++++++++++++++++++++- > src/rpc/virnetsocket.h | 11 ++ > 2 files changed, 282 insertions(+), 3 deletions(-) > @@ -416,7 +432,7 @@ error: > } > > > -#if HAVE_SYS_UN_H > +#ifdef HAVE_SYS_UN_H Why the spurious change? > + > + > +static ssize_t virNetSocketWriteSASL(virNetSocketPtr sock, const char *buf, size_t len) > +{ > + int ret; > + size_t tosend = virNetSASLSessionGetMaxBufSize(sock->saslSession); > + > + /* SASL doesn't neccessarily let us send the whole s/neccessarily/necessarily/ > + /* Send some of the encoded stuff out on the wire */ > + ret = virNetSocketWriteWire(sock, > + sock->saslEncoded + sock->saslEncodedOffset, > + sock->saslEncodedLength - sock->saslEncodedOffset); > + > + if (ret <= 0) > + return ret; /* -1 error, 0 == egain */ s/egain/eagain/ ACK with those nits fixed. -- Eric Blake eblake@xxxxxxxxxx +1-801-349-2682 Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list