Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-08-01 10:07:16 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-08-01 10:22:55 (GMT) |
| commit | 5a15e4df671aac30bba332801528a6283c2e4874 (patch) | |
| tree | 8668089b7b9db89451b8b06ba7be29056a805f53 /Slimber/Server.h | |
| parent | 336aa7d1c0a5aa223a6543d50ee17d82560c2b84 (diff) | |
| download | swift-5a15e4df671aac30bba332801528a6283c2e4874.zip swift-5a15e4df671aac30bba332801528a6283c2e4874.tar.bz2 | |
Made Slimber fully functional again.
Diffstat (limited to 'Slimber/Server.h')
| -rw-r--r-- | Slimber/Server.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Slimber/Server.h b/Slimber/Server.h index 3ed0a58..38c45de 100644 --- a/Slimber/Server.h +++ b/Slimber/Server.h @@ -16,6 +16,7 @@ namespace Swift { class DNSSDServiceID; class String; class VCardCollection; + class LinkLocalConnector; class LinkLocalServiceBrowser; class LinkLocalPresenceManager; class BoostConnectionServer; @@ -42,16 +43,13 @@ namespace Swift { void handleRosterChanged(boost::shared_ptr<RosterPayload> roster); void handlePresenceChanged(boost::shared_ptr<Presence> presence); void handleServiceRegistered(const DNSSDServiceID& service); -/* void handleNewLinkLocalConnection(boost::shared_ptr<Connection> connection); void handleLinkLocalSessionFinished(boost::shared_ptr<Session> session); void handleLinkLocalElementReceived(boost::shared_ptr<Element> element, boost::shared_ptr<Session> session); void handleConnectFinished(boost::shared_ptr<LinkLocalConnector> connector, bool error); - void registerLinkLocalSession(boost::shared_ptr<Session> session); boost::shared_ptr<Session> getLinkLocalSessionForJID(const JID& jid); boost::shared_ptr<LinkLocalConnector> getLinkLocalConnectorForJID(const JID& jid); - */ - + void registerLinkLocalSession(boost::shared_ptr<Session> session); void unregisterService(); LinkLocalServiceInfo getLinkLocalServiceInfo(boost::shared_ptr<Presence> presence); @@ -82,11 +80,9 @@ namespace Swift { boost::shared_ptr<ServerFromClientSession> serverFromClientSession; boost::shared_ptr<Presence> lastPresence; JID selfJID; - /* - boost::shared_ptr<BoostConnectionServer> serverFromNetworkConnectionServer_; - std::vector< boost::shared_ptr<Session> > linkLocalSessions_; - std::vector< boost::shared_ptr<LinkLocalConnector> > connectors_; -*/ + boost::shared_ptr<BoostConnectionServer> serverFromNetworkConnectionServer; + std::vector< boost::shared_ptr<Session> > linkLocalSessions; + std::vector< boost::shared_ptr<LinkLocalConnector> > connectors; std::vector< boost::shared_ptr<SessionTracer> > tracers; }; } |