Client can now connect

lumi created 9 years ago

Change summary

src/client.rs    | 11 +++++++++--
src/transport.rs |  9 +++++++--
2 files changed, 16 insertions(+), 4 deletions(-)

Detailed changes

src/client.rs

@@ -1,6 +1,9 @@
 use jid::Jid;
-use transport::SslTransport;
+use transport::{Transport, SslTransport};
 use error::Error;
+use ns;
+
+use xml::writer::XmlEvent;
 
 pub struct ClientBuilder {
     jid: Jid,
@@ -29,7 +32,11 @@ impl ClientBuilder {
 
     pub fn connect(self) -> Result<Client, Error> {
         let host = &self.host.unwrap_or(self.jid.domain.clone());
-        let transport = SslTransport::connect(host, self.port)?;
+        let mut transport = SslTransport::connect(host, self.port)?;
+        transport.write_event(XmlEvent::start_element("stream:stream")
+                                       .attr("to", &self.jid.domain)
+                                       .default_ns(ns::CLIENT)
+                                       .ns("stream", ns::STREAM))?;
         Ok(Client {
             jid: self.jid,
             transport: transport

src/transport.rs

@@ -3,7 +3,7 @@ use std::io::prelude::*;
 use std::net::TcpStream;
 
 use xml::reader::{EventReader, XmlEvent as XmlReaderEvent};
-use xml::writer::{EventWriter, XmlEvent as XmlWriterEvent};
+use xml::writer::{EventWriter, XmlEvent as XmlWriterEvent, EmitterConfig};
 
 use std::sync::{Arc, Mutex};
 
@@ -67,7 +67,12 @@ impl SslTransport {
         let ssl_stream = Arc::new(Mutex::new(ssl_connector.connect(host, stream)?));
         let locked_io = LockedIO::from(ssl_stream.clone());
         let reader = EventReader::new(locked_io.clone());
-        let writer = EventWriter::new(locked_io);
+        let writer = EventWriter::new_with_config(locked_io, EmitterConfig {
+            line_separator: "".into(),
+            perform_indent: false,
+            normalize_empty_elements: false,
+            .. Default::default()
+        });
         Ok(SslTransport {
             inner: ssl_stream,
             reader: reader,