Changeset 9656 in orxonox.OLD for trunk/src/lib/network/peer_info.cc

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:

• trunk/src/lib/network/peer_info.cc (modified) (3 diffs)

trunk/src/lib/network/peer_info.cc

@@ -42 +42 @@
 void PeerInfo::clear()
 {
-  this->userId = 0;
-  this->nodeType = NET_CLIENT;
+  this->userId = NET_ID_UNASSIGNED;
+  this->nodeType = NET_UNASSIGNED;
   this->socket = NULL;
   this->handshake = NULL;
@@ -49 +49 @@
   this->lastRecvedState = 0;
   this->connectionMonitor = NULL;
+  this->bLocal = false;
 
   this->ip = IP(0,0);
@@ -68 +69 @@
 const std::string PeerInfo::nodeNames[] =
 {
-
-  "maser server",
+  "master server",
   "proxy server active",
   "proxy server passive",