Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-07-19 15:25:29 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-07-19 15:25:29 (GMT) |
| commit | 74e666956ab3b0150ae63885cdf56efae6ca05b3 (patch) | |
| tree | 305639f148ec831c462068c0fc0b936622a38f1a /Swiften/LinkLocal/IncomingLinkLocalSession.cpp | |
| parent | d66658252e70abfc2d4eb7cf5f694ba5dc824291 (diff) | |
| download | swift-74e666956ab3b0150ae63885cdf56efae6ca05b3.zip swift-74e666956ab3b0150ae63885cdf56efae6ca05b3.tar.bz2 | |
Factored out common link local session code.
Diffstat (limited to 'Swiften/LinkLocal/IncomingLinkLocalSession.cpp')
| -rw-r--r-- | Swiften/LinkLocal/IncomingLinkLocalSession.cpp | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/Swiften/LinkLocal/IncomingLinkLocalSession.cpp b/Swiften/LinkLocal/IncomingLinkLocalSession.cpp index b73e979..a1fb901 100644 --- a/Swiften/LinkLocal/IncomingLinkLocalSession.cpp +++ b/Swiften/LinkLocal/IncomingLinkLocalSession.cpp @@ -18,23 +18,17 @@ IncomingLinkLocalSession::IncomingLinkLocalSession( boost::shared_ptr<Connection> connection, PayloadParserFactoryCollection* payloadParserFactories, PayloadSerializerCollection* payloadSerializers) : - LinkLocalSession( - localJID, - connection, - payloadParserFactories, - payloadSerializers) { -} - -void IncomingLinkLocalSession::start() { - initializeStreamStack(); + Session(connection, payloadParserFactories, payloadSerializers) { + setLocalJID(localJID); } void IncomingLinkLocalSession::handleStreamStart(const ProtocolHeader& incomingHeader) { - remoteJID_ = JID(incomingHeader.getFrom()); - if (!remoteJID_.isValid()) { + setRemoteJID(JID(incomingHeader.getFrom())); + if (!getRemoteJID().isValid()) { finishSession(); return; } + ProtocolHeader header; header.setFrom(getLocalJID()); getXMPPLayer()->writeHeader(header); @@ -55,14 +49,7 @@ void IncomingLinkLocalSession::handleElement(boost::shared_ptr<Element> element) setInitialized(); } - if (isInitialized()) { - if (stanza) { - onElementReceived(stanza); - } - else { - std::cerr << "Received unexpected element" << std::endl; - } - } + onElementReceived(element); } |