Changeset 9444 in orxonox.OLD for branches/proxy/src

Timestamp:

Jul 25, 2006, 8:15:01 AM (18 years ago)

Author:

bensch

Message:

some cleanup

Location:

branches/proxy/src/lib/network

Files:

• monitor/network_stats_widget.cc (modified) (1 diff)
• peer_info.cc (modified) (2 diffs)
• peer_info.h (modified) (2 diffs)
• zip.h (modified) (3 diffs)

branches/proxy/src/lib/network/monitor/network_stats_widget.cc

@@ -20 +20 @@
 
 #include "multi_type.h"
+
+#include "shell_command.h"
+
+// SHELL_COMMAND(gui, NetworkMonitor, toggleGUI)
+//  ->setAlias("ProxyGui");
+
 
 HostWidget::HostWidget(const std::string& name, const IP& ip)

branches/proxy/src/lib/network/peer_info.cc

@@ -54 +54 @@
 
 
-std::string PeerInfo::getNodeTypeString()
+const std::string& PeerInfo::getNodeTypeString()
 {
+  return nodeNames[this->nodeType];
+/*
   switch( this->nodeType)
   {
@@ -68 +70 @@
   }
 
-  return std::string("node is uninit");
+  return std::string("node is uninit");*/
 }
+
+const std::string PeerInfo::nodeNames[] =
+{
+
+  "maser server",
+  "proxy server active",
+  "proxy server passive",
+  "client",
+  "node is not initialized"
+};

branches/proxy/src/lib/network/peer_info.h

@@ -27 +27 @@
     inline bool isClient() const { return this->nodeType == NET_CLIENT; }
 
-    std::string getNodeTypeString();
+    const std::string& getNodeTypeString();
+
 
 
@@ -41 +42 @@
     int                 lastAckedState;          //!< last acked state synchronized state
     int                 lastRecvedState;         //!< last received state
+
+    static const std::string nodeNames[];
+
 };
 

branches/proxy/src/lib/network/zip.h

@@ -21 +21 @@
 
 //! A class for compressing/uncompressing packes.
-class Zip 
+class Zip
 {
   public:
@@ -27 +27 @@
     /** @returns a Pointer to the only object of this Class */
     inline static Zip* getInstance(void) { if (!singletonRef) singletonRef = new Zip();  return singletonRef; };
-    
+
     int loadDictionary( std::string name );
     int zip( byte * from, int fromLength, byte * to, int maxLength, int dict = 0 );
     int unZip( byte * from, int fromLength, byte * to, int maxLength );
-    
+
     int getDictCount(){ return dicts.size(); }
 
@@ -37 +37 @@
     Zip();
     static Zip* singletonRef;
-    
+
     std::vector<DictionaryEntry> dicts;
 };
 
-#endif /* _PROTO_SINGLETON_H */
+#endif /* _ZIP_H */