1 files changed, 14 insertions, 6 deletions
diff --git a/Swiften/Session/BasicSessionStream.cpp b/Swiften/Session/BasicSessionStream.cpp
index 115dc7c..8b14367 100644
--- a/Swiften/Session/BasicSessionStream.cpp
+++ b/Swiften/Session/BasicSessionStream.cpp
@@ -1,8 +1,6 @@
-// TODO: Send out better errors
-
 #include "Swiften/Session/BasicSessionStream.h"
 
 #include <boost/bind.hpp>
 
 #include "Swiften/StreamStack/XMPPLayer.h"
 #include "Swiften/StreamStack/StreamStack.h"
@@ -20,12 +18,14 @@ void BasicSessionStream::initialize() {
 	xmppLayer = boost::shared_ptr<XMPPLayer>(
 			new XMPPLayer(payloadParserFactories, payloadSerializers));
 	xmppLayer->onStreamStart.connect(boost::bind(&BasicSessionStream::handleStreamStartReceived, shared_from_this(), _1));
 	xmppLayer->onElement.connect(boost::bind(&BasicSessionStream::handleElementReceived, shared_from_this(), _1));
 	xmppLayer->onError.connect(boost::bind(
       &BasicSessionStream::handleXMPPError, shared_from_this()));
+  xmppLayer->onDataRead.connect(boost::bind(&BasicSessionStream::handleDataRead, shared_from_this(), _1));
+  xmppLayer->onWriteData.connect(boost::bind(&BasicSessionStream::handleDataWritten, shared_from_this(), _1));
 
 	connection->onDisconnected.connect(boost::bind(&BasicSessionStream::handleConnectionError, shared_from_this(), _1));
 	connectionLayer = boost::shared_ptr<ConnectionLayer>(
       new ConnectionLayer(connection));
 
 	streamStack = new StreamStack(xmppLayer, connectionLayer);
@@ -61,13 +61,13 @@ bool BasicSessionStream::supportsTLSEncryption() {
 }
 
 void BasicSessionStream::addTLSEncryption() {
 	assert(available);
 	tlsLayer = tlsLayerFactory->createTLSLayer();
 	if (hasTLSCertificate() && !tlsLayer->setClientCertificate(getTLSCertificate())) {
-		onError(boost::shared_ptr<Error>(new Error()));
+		onError(boost::shared_ptr<Error>(new Error(Error::InvalidTLSCertificateError)));
 	}
 	else {
 		streamStack->addLayer(tlsLayer);
 		tlsLayer->onError.connect(boost::bind(&BasicSessionStream::handleTLSError, shared_from_this()));
 		tlsLayer->onConnected.connect(boost::bind(&BasicSessionStream::handleTLSConnected, shared_from_this()));
 		tlsLayer->connect();
@@ -98,24 +98,32 @@ void BasicSessionStream::handleStreamStartReceived(const ProtocolHeader& header)
 void BasicSessionStream::handleElementReceived(boost::shared_ptr<Element> element) {
 	onElementReceived(element);
 }
 
 void BasicSessionStream::handleXMPPError() {
 	available = false;
-	onError(boost::shared_ptr<Error>(new Error()));
+	onError(boost::shared_ptr<Error>(new Error(Error::ParseError)));
 }
 
 void BasicSessionStream::handleTLSConnected() {
 	onTLSEncrypted();
 }
 
 void BasicSessionStream::handleTLSError() {
 	available = false;
-	onError(boost::shared_ptr<Error>(new Error()));
+	onError(boost::shared_ptr<Error>(new Error(Error::TLSError)));
 }
 
 void BasicSessionStream::handleConnectionError(const boost::optional<Connection::Error>&) {
 	available = false;
-	onError(boost::shared_ptr<Error>(new Error()));
+	onError(boost::shared_ptr<Error>(new Error(Error::ConnectionError)));
+}
+
+void BasicSessionStream::handleDataRead(const ByteArray& data) {
+	onDataRead(String(data.getData(), data.getSize()));
+}
+
+void BasicSessionStream::handleDataWritten(const ByteArray& data) {
+	onDataWritten(String(data.getData(), data.getSize()));
 }
 
 };