Windows build fixes.

1 files changed, 11 insertions, 11 deletions

diff --git a/node/Node.cpp b/node/Node.cpp
index 4673312a..c6322c31 100644
--- a/node/Node.cpp
+++ b/node/Node.cpp
@@ -837,7 +837,7 @@ ZT1_Node_PeerList *Node::listPeers()
 
 	unsigned int returnBufSize = sizeof(ZT1_Node_PeerList);
 	for(std::vector< std::pair< SharedPtr<Peer>,std::vector<Path> > >::iterator p(pp.data.begin());p!=pp.data.end();++p)
-		returnBufSize += sizeof(ZT1_Node_Peer) + (sizeof(ZT1_Node_PhysicalPath) * p->second.size());
+		returnBufSize += sizeof(ZT1_Node_Peer) + (sizeof(ZT1_Node_PhysicalPath) * (unsigned int)p->second.size());
 
 	char *buf = (char *)::malloc(returnBufSize);
 	if (!buf)
@@ -859,7 +859,7 @@ ZT1_Node_PeerList *Node::listPeers()
 		p->first->address().toString(prec->address,sizeof(prec->address));
 		prec->rawAddress = p->first->address().toInt();
 		prec->latency = p->first->latency();
-		prec->role = RR->topology->isSupernode(p->first->address()) ? ZT1_Node_Peer::ZT1_Node_Peer_SUPERNODE : ZT1_Node_Peer::ZT1_Node_Peer_NODE;
+		prec->role = RR->topology->isSupernode(p->first->address()) ? ZT1_Node_PeerRole::ZT1_Node_Peer_SUPERNODE : ZT1_Node_PeerRole::ZT1_Node_Peer_NODE;
 
 		prec->paths = (ZT1_Node_PhysicalPath *)buf;
 		buf += sizeof(ZT1_Node_PhysicalPath) * p->second.size();
@@ -867,13 +867,13 @@ ZT1_Node_PeerList *Node::listPeers()
 		prec->numPaths = 0;
 		for(std::vector<Path>::iterator pi(p->second.begin());pi!=p->second.end();++pi) {
 			ZT1_Node_PhysicalPath *path = &(prec->paths[prec->numPaths++]);
-			path->type = static_cast<typeof(path->type)>(pi->type());
+			path->type = (ZT1_Node_PhysicalPathType)pi->type();
 			if (pi->address().isV6()) {
-				path->address.type = ZT1_Node_PhysicalAddress::ZT1_Node_PhysicalAddress_TYPE_IPV6;
+				path->address.type = ZT1_Node_PhysicalAddressType::ZT1_Node_PhysicalAddress_TYPE_IPV6;
 				memcpy(path->address.bits,pi->address().rawIpData(),16);
 				// TODO: zoneIndex not supported yet, but should be once echo-location works w/V6
 			} else {
-				path->address.type = ZT1_Node_PhysicalAddress::ZT1_Node_PhysicalAddress_TYPE_IPV4;
+				path->address.type = ZT1_Node_PhysicalAddressType::ZT1_Node_PhysicalAddress_TYPE_IPV4;
 				memcpy(path->address.bits,pi->address().rawIpData(),4);
 			}
 			path->address.port = pi->address().port();
@@ -906,7 +906,7 @@ static void _fillNetworkQueryResultBuffer(const SharedPtr<Network> &network,cons
 	if (lcu > 0)
 		nbuf->configAge = (long)(Utils::now() - lcu);
 	else nbuf->configAge = -1;
-	nbuf->status = static_cast<typeof(nbuf->status)>(network->status());
+	nbuf->status = (ZT1_Node_NetworkStatus)network->status();
 	nbuf->enabled = network->enabled();
 	nbuf->isPrivate = (nconf) ? nconf->isPrivate() : true;
 }
@@ -938,10 +938,10 @@ ZT1_Node_Network *Node::getNetworkStatus(uint64_t nwid)
 	for(std::set<InetAddress>::iterator ip(ips.begin());ip!=ips.end();++ip) {
 		ZT1_Node_PhysicalAddress *ipb = &(nbuf->ips[nbuf->numIps++]);
 		if (ip->isV6()) {
-			ipb->type = ZT1_Node_PhysicalAddress::ZT1_Node_PhysicalAddress_TYPE_IPV6;
+			ipb->type = ZT1_Node_PhysicalAddressType::ZT1_Node_PhysicalAddress_TYPE_IPV6;
 			memcpy(ipb->bits,ip->rawIpData(),16);
 		} else {
-			ipb->type = ZT1_Node_PhysicalAddress::ZT1_Node_PhysicalAddress_TYPE_IPV4;
+			ipb->type = ZT1_Node_PhysicalAddressType::ZT1_Node_PhysicalAddress_TYPE_IPV4;
 			memcpy(ipb->bits,ip->rawIpData(),4);
 		}
 		ipb->port = ip->port();
@@ -965,7 +965,7 @@ ZT1_Node_NetworkList *Node::listNetworks()
 	for(unsigned long i=0;i<networks.size();++i) {
 		nconfs[i] = networks[i]->config2();
 		ipsv[i] = networks[i]->ips();
-		returnBufSize += sizeof(ZT1_Node_Network) + (sizeof(ZT1_Node_PhysicalAddress) * ipsv[i].size());
+		returnBufSize += sizeof(ZT1_Node_Network) + (sizeof(ZT1_Node_PhysicalAddress) * (unsigned int)ipsv[i].size());
 	}
 
 	char *buf = (char *)::malloc(returnBufSize);
@@ -991,10 +991,10 @@ ZT1_Node_NetworkList *Node::listNetworks()
 		for(std::set<InetAddress>::iterator ip(ipsv[i].begin());ip!=ipsv[i].end();++ip) {
 			ZT1_Node_PhysicalAddress *ipb = &(nbuf->ips[nbuf->numIps++]);
 			if (ip->isV6()) {
-				ipb->type = ZT1_Node_PhysicalAddress::ZT1_Node_PhysicalAddress_TYPE_IPV6;
+				ipb->type = ZT1_Node_PhysicalAddressType::ZT1_Node_PhysicalAddress_TYPE_IPV6;
 				memcpy(ipb->bits,ip->rawIpData(),16);
 			} else {
-				ipb->type = ZT1_Node_PhysicalAddress::ZT1_Node_PhysicalAddress_TYPE_IPV4;
+				ipb->type = ZT1_Node_PhysicalAddressType::ZT1_Node_PhysicalAddress_TYPE_IPV4;
 				memcpy(ipb->bits,ip->rawIpData(),4);
 			}
 			ipb->port = ip->port();