Swiftdiff options
| author | Joanna Hulboj <joanna.hulboj@isode.com> | 2017-03-18 18:52:56 (GMT) |
|---|---|---|
| committer | Joanna Hulboj <joanna.hulboj@isode.com> | 2017-03-28 14:19:18 (GMT) |
| commit | 0e503ccd97ca5287a14d3147b0deaa99892ccd6f (patch) | |
| tree | 5500f9f6376f8fa6544fc281ed40ea8b18d7129b /Swiften/Client/ClientXMLTracer.cpp | |
| parent | cc873b3f00db4cd0a778bc2ec04f8748d70a92f9 (diff) | |
| download | swift-0e503ccd97ca5287a14d3147b0deaa99892ccd6f.zip swift-0e503ccd97ca5287a14d3147b0deaa99892ccd6f.tar.bz2 | |
Modified XMLBeautifier to handle split payloads
When receiving network data we were processing it in chunks. Sometimes
one XML message got split across multiple chunks. XMLBeautifier was
stateless and would create a new parser for every single chunk. This was
causing multi-chunk messages to be truncated in the beautified output.
The change I made in XMLBeautifier allows it to maintain the state.
Test-Information:
Tested unger Windows 10 and CentOS.
Unit tests pass OK.
Change-Id: Idad2a8e0248ed3cbe2b47a12718b909e56ac1279
Diffstat (limited to 'Swiften/Client/ClientXMLTracer.cpp')
| -rw-r--r-- | Swiften/Client/ClientXMLTracer.cpp | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/Swiften/Client/ClientXMLTracer.cpp b/Swiften/Client/ClientXMLTracer.cpp index 4852aa1..e205f41 100644 --- a/Swiften/Client/ClientXMLTracer.cpp +++ b/Swiften/Client/ClientXMLTracer.cpp @@ -1,56 +1,61 @@ /* * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Client/ClientXMLTracer.h> #include <iostream> #include <boost/bind.hpp> #include <Swiften/Base/Platform.h> namespace Swift { -ClientXMLTracer::ClientXMLTracer(CoreClient* client, bool bosh) : bosh(bosh) { +ClientXMLTracer::ClientXMLTracer(CoreClient* client, bool bosh) : bosh_(bosh) { #ifdef SWIFTEN_PLATFORM_WIN32 - beautifier = new XMLBeautifier(true, false); + beautifier_ = std::unique_ptr<XMLBeautifier>(new XMLBeautifier(true, false)); #else - beautifier = new XMLBeautifier(true, true); + beautifier_ = std::unique_ptr<XMLBeautifier>(new XMLBeautifier(true, true)); #endif - onDataReadConnection = client->onDataRead.connect(boost::bind(&ClientXMLTracer::printData, this, '<', _1)); - onDataWrittenConnection = client->onDataWritten.connect(boost::bind(&ClientXMLTracer::printData, this, '>', _1)); -} - -ClientXMLTracer::~ClientXMLTracer() { - delete beautifier; + onDataReadConnection_ = client->onDataRead.connect(boost::bind(&ClientXMLTracer::printData, this, '<', _1)); + onDataWrittenConnection_ = client->onDataWritten.connect(boost::bind(&ClientXMLTracer::printData, this, '>', _1)); } void ClientXMLTracer::printData(char direction, const SafeByteArray& data) { - printLine(direction); - if (bosh) { + if (bosh_) { + printLine(direction); std::string line = byteArrayToString(ByteArray(data.begin(), data.end())); // Disabled because it swallows bits of XML (namespaces, if I recall) // size_t endOfHTTP = line.find("\r\n\r\n"); // if (false && endOfHTTP != std::string::npos) { // std::cerr << line.substr(0, endOfHTTP) << std::endl << beautifier->beautify(line.substr(endOfHTTP)) << std::endl; // } // else { std::cerr << line << std::endl; // } } else { - std::cerr << beautifier->beautify(byteArrayToString(ByteArray(data.begin(), data.end()))) << std::endl; + const auto& str = beautifier_->beautify(byteArrayToString(ByteArray(data.begin(), data.end()))); + + if (beautifier_->wasReset()) { + printLine(direction); + } + std::cerr << str; + if (beautifier_->getLevel() <= 1) { + std::cerr << std::endl; + } + } } void ClientXMLTracer::printLine(char c) { for (unsigned int i = 0; i < 80; ++i) { std::cerr << c; } std::cerr << std::endl; } } |