Browse Source

Warning removal, and dev is now 1.2.1

Adam Ierymenko 8 years ago
parent
commit
e3feaf3f5d
2 changed files with 3 additions and 3 deletions
  1. 2 2
      service/SoftwareUpdater.cpp
  2. 1 1
      version.h

+ 2 - 2
service/SoftwareUpdater.cpp

@@ -258,14 +258,14 @@ void SoftwareUpdater::handleSoftwareUpdateUserMessage(uint64_t origin,const void
 
 
 			default:
 			default:
 				if (_distLog) {
 				if (_distLog) {
-					fprintf(_distLog,"%.10llx WARNING: bad update message verb==%u length==%u (unrecognized verb)" ZT_EOL_S,origin,(unsigned int)v,len);
+					fprintf(_distLog,"%.10llx WARNING: bad update message verb==%u length==%u (unrecognized verb)" ZT_EOL_S,(unsigned long long)origin,(unsigned int)v,len);
 					fflush(_distLog);
 					fflush(_distLog);
 				}
 				}
 				break;
 				break;
 		}
 		}
 	} catch ( ... ) {
 	} catch ( ... ) {
 		if (_distLog) {
 		if (_distLog) {
-			fprintf(_distLog,"%.10llx WARNING: bad update message verb==%u length==%u (unexpected exception, likely invalid JSON)" ZT_EOL_S,origin,(unsigned int)v,len);
+			fprintf(_distLog,"%.10llx WARNING: bad update message verb==%u length==%u (unexpected exception, likely invalid JSON)" ZT_EOL_S,(unsigned long long)origin,(unsigned int)v,len);
 			fflush(_distLog);
 			fflush(_distLog);
 		}
 		}
 	}
 	}

+ 1 - 1
version.h

@@ -32,7 +32,7 @@
 /**
 /**
  * Revision
  * Revision
  */
  */
-#define ZEROTIER_ONE_VERSION_REVISION 0
+#define ZEROTIER_ONE_VERSION_REVISION 1
 
 
 /**
 /**
  * Build version
  * Build version