Added integer manipulation to Version

GamePad64 · Mar 10, 2013 · cf990c7 · cf990c7
1 parent fa42770
commit cf990c7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/common/Version.cpp b/src/common/Version.cpp
@@ -42,7 +42,6 @@ void Version::fromString(std::string version_s) {
 	std::stringstream version_ss(version_s);
 	version_ss >> major_version >> temp_ch >> minor_version >> temp_ch >> bugfix_version >> temp_ch >> variant_version;
 }
-
 std::string Version::toString() {
 	std::stringstream version_ss;
 	version_ss << major_version << "." << minor_version << "." << bugfix_version;
@@ -51,11 +50,22 @@ std::string Version::toString() {
 	}
 	return version_ss.str();
 }
-
 Version::Version(std::string version_s){
 	fromString(version_s);
 }
 
+void Version::fromInteger(uint32_t version_int){
+	bugfix_version = version_int % 100;
+	minor_version = (version_int / 100) % 100;
+	major_version = (version_int / 10000) % 100;
+}
+uint32_t Version::toInteger(){
+	return bugfix_version + minor_version*100 + major_version*100;
+}
+Version::Version(uint32_t version_int){
+	fromInteger(version_int);
+}
+
 bool Version::operator==(Version& lhs) {
 	return (this->major_version == lhs.major_version && this->minor_version == lhs.minor_version && this->bugfix_version == lhs.bugfix_version);
 }

diff --git a/src/common/Version.h b/src/common/Version.h
@@ -37,6 +37,10 @@ class Version {
 	std::string toString();
 	Version(std::string version_s);
 
+	void fromInteger(uint32_t version_int);
+	uint32_t toInteger();
+	Version(uint32_t version_int);
+
 	// relational operators
 	bool operator==(Version& lhs);
 	bool operator<(Version& lhs);

diff --git a/src/daemon/protobuf/LPDMessage.proto b/src/daemon/protobuf/LPDMessage.proto
@@ -17,7 +17,5 @@ package p2pnet.net.lpd;
 
 message UDPLPDMessage {
 	required uint32 port = 1;
-	optional uint32 version_major = 2;
-	optional uint32 version_minor = 3;
-	optional uint32 version_bugfix = 4;
+	optional uint32 version = 2;
 }