Added type and role string to Description

include/rtc/description.hpp

@@ -34,10 +34,13 @@ public:
 	enum class Type { Unspec = 0, Offer = 1, Answer = 2 };
 	enum class Role { ActPass = 0, Passive = 1, Active = 2 };
 
-	Description(const string &sdp, Type type = Type::Unspec, Role role = Role::ActPass);
+	Description(const string &sdp, const string &typeString = "");
+	Description(const string &sdp, Type type, Role role);
 
 	Type type() const;
+	string typeString() const;
 	Role role() const;
+	string roleString() const;
 	std::optional<string> fingerprint() const;
 	std::optional<uint16_t> sctpPort() const;
 
@@ -57,6 +60,10 @@ private:
 	std::optional<uint16_t> mSctpPort;
 	std::vector<Candidate> mCandidates;
 	bool mTrickle;
+
+	static Type stringToType(const string &typeString);
+	static string typeToString(Type type);
+	static string roleToString(Role role);
 };
 
 } // namespace rtc

src/description.cpp

@@ -44,6 +44,9 @@ inline void trim_end(string &str) {
 
 namespace rtc {
 
+Description::Description(const string &sdp, const string &typeString)
+    : Description(sdp, stringToType(typeString), Description::Role::ActPass) {}
+
 Description::Description(const string &sdp, Type type, Role role)
     : mType(type), mRole(role), mMid("0"), mIceUfrag("0"), mIcePwd("0"), mTrickle(true) {
 	if (mType == Type::Answer && mRole == Role::ActPass)
@@ -88,8 +91,12 @@ Description::Description(const string &sdp, Type type, Role role)
 
 Description::Type Description::type() const { return mType; }
 
+string Description::typeString() const { return typeToString(mType); }
+
 Description::Role Description::role() const { return mRole; }
 
+string Description::roleString() const { return roleToString(mRole); }
+
 std::optional<string> Description::fingerprint() const { return mFingerprint; }
 
 std::optional<uint16_t> Description::sctpPort() const { return mSctpPort; }
@@ -111,19 +118,6 @@ Description::operator string() const {
 	if (!mFingerprint)
 		throw std::logic_error("Fingerprint must be set to generate a SDP");
 
-	string roleStr;
-	switch (mRole) {
-	case Role::Active:
-		roleStr = "active";
-		break;
-	case Role::Passive:
-		roleStr = "passive";
-		break;
-	default:
-		roleStr = "actpass";
-		break;
-	}
-
 	std::ostringstream sdp;
 	sdp << "v=0\n";
 	sdp << "o=- " << mSessionId << " 0 IN IP4 0.0.0.0\n";
@@ -136,7 +130,7 @@ Description::operator string() const {
 	if (mTrickle)
 		sdp << "a=ice-options:trickle\n";
 	sdp << "a=mid:" << mMid << "\n";
-	sdp << "a=setup:" << roleStr << "\n";
+	sdp << "a=setup:" << roleToString(mRole) << "\n";
 	sdp << "a=dtls-id:1\n";
 	if (mFingerprint)
 		sdp << "a=fingerprint:sha-256 " << *mFingerprint << "\n";
@@ -153,6 +147,37 @@ Description::operator string() const {
 	return sdp.str();
 }
 
+Description::Type Description::stringToType(const string &typeString) {
+	if (typeString == "offer")
+		return Type::Offer;
+	else if (typeString == "answer")
+		return Type::Answer;
+	else
+		return Type::Unspec;
+}
+
+string Description::typeToString(Type type) {
+	switch (type) {
+	case Type::Offer:
+		return "offer";
+	case Type::Answer:
+		return "answer";
+	default:
+		return "";
+	}
+}
+
+string Description::roleToString(Role role) {
+	switch (role) {
+	case Role::Active:
+		return "active";
+	case Role::Passive:
+		return "passive";
+	default:
+		return "actpass";
+	}
+}
+
 } // namespace rtc
 
 std::ostream &operator<<(std::ostream &out, const rtc::Description &description) {

src/rtc.cpp

@@ -85,8 +85,8 @@ void rtcSetLocalDescriptionCallback(int pc, void (*descriptionCallback)(const ch
 		void *userPointer = nullptr;
 		if (auto jt = userPointerMap.find(pc); jt != userPointerMap.end())
 			userPointer = jt->second;
-		string type = description.type() == Description::Type::Answer ? "answer" : "offer";
-		descriptionCallback(string(description).c_str(), type.c_str(), userPointer);
+		descriptionCallback(string(description).c_str(), description.typeString().c_str(),
+		                    userPointer);
 	});
 }
 
@@ -115,9 +115,7 @@ void rtcSetRemoteDescription(int pc, const char *sdp, const char *type) {
 	if (it == peerConnectionMap.end())
 		return;
 
-	auto t =
-	    type && string(type) == "answer" ? Description::Type::Answer : Description::Type::Offer;
-	it->second->setRemoteDescription(Description(string(sdp), t));
+	it->second->setRemoteDescription(Description(string(sdp), string(type)));
 }
 
 void rtcAddRemoteCandidate(int pc, const char *candidate, const char *mid) {