Log connection type to syslogs and to the server.

remoting/host/server_log_entry.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/server_log_entry.h"
 
 #include "base/sys_info.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/session.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
@@ skipping 24 matching lines @@
 
 const char kKeyOsName[] = "os-name";
 const char kValueOsNameWindows[] = "Windows";
 const char kValueOsNameLinux[] = "Linux";
 const char kValueOsNameMac[] = "Mac";
 const char kValueOsNameChromeOS[] = "ChromeOS";
 
 const char kKeyOsVersion[] = "os-version";
 
 const char kKeyCpu[] = "cpu";
+
+const char kKeyConnectionType[] = "connection-type";
+
 }  // namespace
 
 ServerLogEntry::ServerLogEntry() {
 }
 
 ServerLogEntry::~ServerLogEntry() {
 }
 
 ServerLogEntry* ServerLogEntry::MakeSessionStateChange(bool connected) {
   ServerLogEntry* entry = new ServerLogEntry();
@@ skipping 18 matching lines @@
   // OSes: see base/sys_info_unittest.cc.
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
   std::stringstream os_version;
   int32 os_major_version = 0;
   int32 os_minor_version = 0;
   int32 os_bugfix_version = 0;
   SysInfo::OperatingSystemVersionNumbers(&os_major_version, &os_minor_version,
                                          &os_bugfix_version);
   os_version << os_major_version << "." << os_minor_version << "."
              << os_bugfix_version;
-  Set(kKeyOsVersion, os_version.str().c_str());
+  Set(kKeyOsVersion, os_version.str());
 #endif
 
-  Set(kKeyCpu, SysInfo::CPUArchitecture().c_str());
+  Set(kKeyCpu, SysInfo::CPUArchitecture());
 };
 
 void ServerLogEntry::AddModeField(ServerLogEntry::Mode mode) {
   Set(kKeyMode, GetValueMode(mode));
 }
 
+void ServerLogEntry::AddConnectionTypeField(
+    protocol::TransportRoute::RouteType type) {
+  Set(kKeyConnectionType, protocol::TransportRoute::GetTypeString(type));
+}
+
 const char* ServerLogEntry::GetValueMode(ServerLogEntry::Mode mode) {
   switch(mode) {
     case IT2ME:
       return kValueModeIt2Me;
     case ME2ME:
       return kValueModeMe2Me;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 XmlElement* ServerLogEntry::ToStanza() const {
   XmlElement* stanza = new XmlElement(QName(
       kChromotingXmlNamespace, kLogEntry));
   ValuesMap::const_iterator iter;
   for (iter = values_map_.begin(); iter != values_map_.end(); ++iter) {
     stanza->AddAttr(QName("", iter->first), iter->second);
   }
   return stanza;
 }
 
 const char* ServerLogEntry::GetValueSessionState(bool connected) {
   return connected ? kValueSessionStateConnected : kValueSessionStateClosed;
 }
 
-void ServerLogEntry::Set(const char* key, const char* value) {
+void ServerLogEntry::Set(const std::string& key, const std::string& value) {
   values_map_[key] = value;
 }
 
 }  // namespace remoting