1 files changed, 90 insertions, 6 deletions
diff --git a/Swiften/Elements/JingleS5BTransportPayload.h b/Swiften/Elements/JingleS5BTransportPayload.h
index 7b3089f..980af27 100644
--- a/Swiften/Elements/JingleS5BTransportPayload.h
+++ b/Swiften/Elements/JingleS5BTransportPayload.h
@@ -6,23 +6,107 @@
 
 #pragma once
 
+#include <vector>
+
+#include <boost/shared_ptr.hpp>
+
 #include <Swiften/Elements/JingleTransportPayload.h>
 #include <Swiften/Elements/Bytestreams.h>
+#include <Swiften/Network/HostAddressPort.h>
 
-// FIXME: Remove Bytestreams, and replace by our own candidate
 
 namespace Swift {
 	class JingleS5BTransportPayload : public JingleTransportPayload {
 		public:
-			const Bytestreams& getInfo() const {
-				return info;
+			enum Mode {
+				TCPMode, // default case
+				UDPMode,
+			};
+
+			struct Candidate {
+				enum Type {
+					DirectType, // default case
+					AssistedType,
+					TunnelType,
+					ProxyType,
+				};
+
+				Candidate() : priority(0), type(DirectType) {}
+
+				std::string cid;
+				JID jid;
+				HostAddressPort hostPort;
+				int priority;
+				Type type;
+			};
+
+			struct CompareCandidate {
+				bool operator() (const JingleS5BTransportPayload::Candidate& c1, const JingleS5BTransportPayload::Candidate& c2) const {
+					if (c1.priority < c2.priority) return true;
+					return false;
+				}
+			};
+
+		public:
+			JingleS5BTransportPayload() : mode(TCPMode), candidateError(false), proxyError(false) {}
+
+			Mode getMode() const {
+				return mode;
+			}
+
+			void setMode(Mode mode) {
+				this->mode = mode;
+			}
+
+			const std::vector<Candidate>& getCandidates() {
+				return candidates;
+			}
+
+			void addCandidate(const Candidate& candidate) {
+				candidates.push_back(candidate);
+			}
+
+			void setCandidateUsed(const std::string& cid) {
+				candidateUsedCID = cid;
+			}
+
+			const std::string& getCandidateUsed() const {
+				return candidateUsedCID;
+			}
+
+			void setActivated(const std::string& cid) {
+				activatedCID = cid;
 			}
 
-			void setInfo(const Bytestreams& info) {
-				this->info = info;
+			const std::string& getActivated() const {
+				return activatedCID;
 			}
 
+			void setCandidateError(bool hasError) {
+				candidateError = hasError;
+			}
+			
+			bool hasCandidateError() const {
+				return candidateError;
+			}
+			
+			void setProxyError(bool hasError) {
+				proxyError = hasError;
+			}
+
+			bool hasProxyError() const {
+				return proxyError;
+			}
+		public:
+			typedef boost::shared_ptr<JingleS5BTransportPayload> ref;
+
 		private:
-			Bytestreams info;
+			Mode mode;
+			std::vector<Candidate> candidates;
+			
+			std::string candidateUsedCID;
+			std::string activatedCID;
+			bool candidateError;
+			bool proxyError;
 	};
 }