diff --git a/talk/app/webrtc/portallocatorfactory.cc b/talk/app/webrtc/portallocatorfactory.cc index 32008f6b5..decd33c7b 100644 --- a/talk/app/webrtc/portallocatorfactory.cc +++ b/talk/app/webrtc/portallocatorfactory.cc @@ -33,8 +33,6 @@ #include "talk/p2p/base/basicpacketsocketfactory.h" #include "talk/p2p/client/basicportallocator.h" -static const char kUserAgent[] = "PeerConnection User Agent"; - namespace webrtc { using talk_base::scoped_ptr; diff --git a/talk/app/webrtc/webrtcsdp.cc b/talk/app/webrtc/webrtcsdp.cc index bee822241..ac920aed5 100644 --- a/talk/app/webrtc/webrtcsdp.cc +++ b/talk/app/webrtc/webrtcsdp.cc @@ -127,9 +127,6 @@ static const char kAttributeMsidSemantics[] = "msid-semantic"; static const char kMediaStreamSemantic[] = "WMS"; static const char kSsrcAttributeMsid[] = "msid"; static const char kDefaultMsid[] = "default"; -static const char kMsidAppdataAudio[] = "a"; -static const char kMsidAppdataVideo[] = "v"; -static const char kMsidAppdataData[] = "d"; static const char kSsrcAttributeMslabel[] = "mslabel"; static const char kSSrcAttributeLabel[] = "label"; static const char kAttributeSsrcGroup[] = "ssrc-group"; diff --git a/talk/base/ipaddress.cc b/talk/base/ipaddress.cc index b3585d785..6c2212bf8 100644 --- a/talk/base/ipaddress.cc +++ b/talk/base/ipaddress.cc @@ -51,13 +51,11 @@ namespace talk_base { // Prefixes used for categorizing IPv6 addresses. -static const in6_addr kULAPrefix = {{{0xfc, 0}}}; static const in6_addr kV4MappedPrefix = {{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0}}}; static const in6_addr k6To4Prefix = {{{0x20, 0x02, 0}}}; static const in6_addr kTeredoPrefix = {{{0x20, 0x01, 0x00, 0x00}}}; static const in6_addr kV4CompatibilityPrefix = {{{0}}}; -static const in6_addr kSiteLocalPrefix = {{{0xfe, 0xc0, 0}}}; static const in6_addr k6BonePrefix = {{{0x3f, 0xfe, 0}}}; bool IPAddress::strip_sensitive_ = false; diff --git a/talk/base/network.cc b/talk/base/network.cc index 49901138b..e3458eb78 100644 --- a/talk/base/network.cc +++ b/talk/base/network.cc @@ -612,16 +612,14 @@ Network::Network(const std::string& name, const std::string& desc, const std::string& key) : name_(name), description_(desc), prefix_(prefix), prefix_length_(prefix_length), key_(key), scope_id_(0), ignored_(false), - uniform_numerator_(0), uniform_denominator_(0), exponential_numerator_(0), - exponential_denominator_(0), type_(ADAPTER_TYPE_UNKNOWN), preference_(0) { + type_(ADAPTER_TYPE_UNKNOWN), preference_(0) { } Network::Network(const std::string& name, const std::string& desc, const IPAddress& prefix, int prefix_length) : name_(name), description_(desc), prefix_(prefix), prefix_length_(prefix_length), scope_id_(0), ignored_(false), - uniform_numerator_(0), uniform_denominator_(0), exponential_numerator_(0), - exponential_denominator_(0), type_(ADAPTER_TYPE_UNKNOWN), preference_(0) { + type_(ADAPTER_TYPE_UNKNOWN), preference_(0) { } std::string Network::ToString() const { diff --git a/talk/base/network.h b/talk/base/network.h index 75a443bca..e4ff5f8f6 100644 --- a/talk/base/network.h +++ b/talk/base/network.h @@ -254,10 +254,6 @@ class Network { std::vector ips_; int scope_id_; bool ignored_; - double uniform_numerator_; - double uniform_denominator_; - double exponential_numerator_; - double exponential_denominator_; AdapterType type_; int preference_; diff --git a/talk/base/nssidentity.cc b/talk/base/nssidentity.cc index 8c020a6b4..a0cd8b217 100644 --- a/talk/base/nssidentity.cc +++ b/talk/base/nssidentity.cc @@ -355,7 +355,7 @@ NSSIdentity* NSSIdentity::GenerateInternal(const SSLIdentityParams& params) { NSSIdentity *identity = NULL; CERTSubjectPublicKeyInfo *spki = NULL; CERTCertificateRequest *certreq = NULL; - CERTValidity *validity; + CERTValidity *validity = NULL; CERTCertificate *certificate = NULL; NSSKeyPair *keypair = NSSKeyPair::Generate(); SECItem inner_der; diff --git a/talk/base/physicalsocketserver.cc b/talk/base/physicalsocketserver.cc index 836f65321..12c1bccb2 100644 --- a/talk/base/physicalsocketserver.cc +++ b/talk/base/physicalsocketserver.cc @@ -79,6 +79,7 @@ typedef char* SockOptArg; namespace talk_base { +#if defined(WIN32) // Standard MTUs, from RFC 1191 const uint16 PACKET_MAXIMUMS[] = { 65535, // Theoretical maximum, Hyperchannel @@ -106,6 +107,7 @@ static const int IP_HEADER_SIZE = 20u; static const int IPV6_HEADER_SIZE = 40u; static const int ICMP_HEADER_SIZE = 8u; static const int ICMP_PING_TIMEOUT_MILLIS = 10000u; +#endif class PhysicalSocket : public AsyncSocket, public sigslot::has_slots<> { public: @@ -1202,9 +1204,7 @@ class Signaler : public EventDispatcher { }; PhysicalSocketServer::PhysicalSocketServer() - : fWait_(false), - last_tick_tracked_(0), - last_tick_dispatch_count_(0) { + : fWait_(false) { signal_wakeup_ = new Signaler(this, &fWait_); #ifdef WIN32 socket_ev_ = WSACreateEvent(); @@ -1514,12 +1514,6 @@ bool PhysicalSocketServer::Wait(int cmsWait, bool process_io) { int cmsElapsed = 0; uint32 msStart = Time(); -#if LOGGING - if (last_tick_dispatch_count_ == 0) { - last_tick_tracked_ = msStart; - } -#endif - fWait_ = true; while (fWait_) { std::vector events; @@ -1569,23 +1563,6 @@ bool PhysicalSocketServer::Wait(int cmsWait, bool process_io) { cmsNext, false); -#if 0 // LOGGING - // we track this information purely for logging purposes. - last_tick_dispatch_count_++; - if (last_tick_dispatch_count_ >= 1000) { - int32 elapsed = TimeSince(last_tick_tracked_); - LOG(INFO) << "PhysicalSocketServer took " << elapsed - << "ms for 1000 events"; - - // If we get more than 1000 events in a second, we are spinning badly - // (normally it should take about 8-20 seconds). - ASSERT(elapsed > 1000); - - last_tick_tracked_ = Time(); - last_tick_dispatch_count_ = 0; - } -#endif - if (dw == WSA_WAIT_FAILED) { // Failed? // TODO: need a better strategy than this! diff --git a/talk/base/physicalsocketserver.h b/talk/base/physicalsocketserver.h index 709f85ab1..9173f238d 100644 --- a/talk/base/physicalsocketserver.h +++ b/talk/base/physicalsocketserver.h @@ -127,8 +127,6 @@ class PhysicalSocketServer : public SocketServer { Signaler* signal_wakeup_; CriticalSection crit_; bool fWait_; - uint32 last_tick_tracked_; - int last_tick_dispatch_count_; #ifdef WIN32 WSAEVENT socket_ev_; #endif diff --git a/talk/base/timeutils.cc b/talk/base/timeutils.cc index 54db3418b..fee85aa64 100644 --- a/talk/base/timeutils.cc +++ b/talk/base/timeutils.cc @@ -25,6 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include + #ifdef POSIX #include #if defined(OSX) || defined(IOS) @@ -45,7 +47,6 @@ namespace talk_base { -const uint32 LAST = 0xFFFFFFFF; const uint32 HALF = 0x80000000; uint64 TimeNanos() { @@ -190,13 +191,13 @@ int32 TimeDiff(uint32 later, uint32 earlier) { if (earlier <= later) { return static_cast(later - earlier); } else { - return static_cast(later + (LAST - earlier) + 1); + return static_cast(later + (UINT32_MAX - earlier) + 1); } } else { if (later <= earlier) { return -static_cast(earlier - later); } else { - return -static_cast(earlier + (LAST - later) + 1); + return -static_cast(earlier + (UINT32_MAX - later) + 1); } } #endif diff --git a/talk/p2p/base/constants.cc b/talk/p2p/base/constants.cc index 27d43096b..14cac8802 100644 --- a/talk/p2p/base/constants.cc +++ b/talk/p2p/base/constants.cc @@ -202,7 +202,6 @@ const buzz::StaticQName QN_ADDRESS = { cricket::NS_EMPTY, "address" }; const buzz::StaticQName QN_USERNAME = { cricket::NS_EMPTY, "username" }; const buzz::StaticQName QN_PASSWORD = { cricket::NS_EMPTY, "password" }; const buzz::StaticQName QN_PREFERENCE = { cricket::NS_EMPTY, "preference" }; -const char GICE_CANDIDATE_TYPE_STUN[] = "stun"; const char GICE_CHANNEL_NAME_RTP[] = "rtp"; const char GICE_CHANNEL_NAME_RTCP[] = "rtcp"; const char GICE_CHANNEL_NAME_VIDEO_RTP[] = "video_rtp"; diff --git a/talk/p2p/base/dtlstransportchannel.cc b/talk/p2p/base/dtlstransportchannel.cc index 3635c0407..30cd80e70 100644 --- a/talk/p2p/base/dtlstransportchannel.cc +++ b/talk/p2p/base/dtlstransportchannel.cc @@ -42,7 +42,6 @@ namespace cricket { static const size_t kDtlsRecordHeaderLen = 13; static const size_t kMaxDtlsPacketLen = 2048; static const size_t kMinRtpPacketLen = 12; -static const size_t kDefaultVideoAndDataCryptos = 1; static bool IsDtlsPacket(const char* data, size_t len) { const uint8* u = reinterpret_cast(data); diff --git a/talk/p2p/base/pseudotcp.cc b/talk/p2p/base/pseudotcp.cc index 8b838774d..3925637a3 100644 --- a/talk/p2p/base/pseudotcp.cc +++ b/talk/p2p/base/pseudotcp.cc @@ -82,7 +82,6 @@ const uint32 MAX_PACKET = 65535; const uint32 MIN_PACKET = 296; const uint32 IP_HEADER_SIZE = 20; // (+ up to 40 bytes of options?) -const uint32 ICMP_HEADER_SIZE = 8; const uint32 UDP_HEADER_SIZE = 8; // TODO: Make JINGLE_HEADER_SIZE transparent to this code? const uint32 JINGLE_HEADER_SIZE = 64; // when relay framing is in use @@ -119,7 +118,6 @@ const uint32 DEFAULT_SND_BUF_SIZE = 90 * 1024; #define PSEUDO_KEEPALIVE 0 -const uint32 MAX_SEQ = 0xFFFFFFFF; const uint32 HEADER_SIZE = 24; const uint32 PACKET_OVERHEAD = HEADER_SIZE + UDP_HEADER_SIZE + IP_HEADER_SIZE + JINGLE_HEADER_SIZE; @@ -132,8 +130,6 @@ const uint8 FLAG_CTL = 0x02; const uint8 FLAG_RST = 0x04; const uint8 CTL_CONNECT = 0; -//const uint8 CTL_REDIRECT = 1; -const uint8 CTL_EXTRA = 255; // TCP options. const uint8 TCP_OPT_EOL = 0; // End of list. @@ -141,14 +137,6 @@ const uint8 TCP_OPT_NOOP = 1; // No-op. const uint8 TCP_OPT_MSS = 2; // Maximum segment size. const uint8 TCP_OPT_WND_SCALE = 3; // Window scale factor. -/* -const uint8 FLAG_FIN = 0x01; -const uint8 FLAG_SYN = 0x02; -const uint8 FLAG_ACK = 0x10; -*/ - -const uint32 CTRL_BOUND = 0x80000000; - const long DEFAULT_TIMEOUT = 4000; // If there are no pending clocks, wake up every 4 seconds const long CLOSED_TIMEOUT = 60 * 1000; // If the connection is closed, once per minute diff --git a/talk/p2p/base/turnport.cc b/talk/p2p/base/turnport.cc index 988c29e0a..eeaa3af60 100644 --- a/talk/p2p/base/turnport.cc +++ b/talk/p2p/base/turnport.cc @@ -43,7 +43,6 @@ namespace cricket { // TODO(juberti): Move to stun.h when relay messages have been renamed. static const int TURN_ALLOCATE_REQUEST = STUN_ALLOCATE_REQUEST; -static const int TURN_ALLOCATE_ERROR_RESPONSE = STUN_ALLOCATE_ERROR_RESPONSE; // TODO(juberti): Extract to turnmessage.h static const int TURN_DEFAULT_PORT = 3478; diff --git a/talk/p2p/client/basicportallocator.cc b/talk/p2p/client/basicportallocator.cc index 9e2ce07ca..7c285d1c3 100644 --- a/talk/p2p/client/basicportallocator.cc +++ b/talk/p2p/client/basicportallocator.cc @@ -56,7 +56,6 @@ const uint32 MSG_SEQUENCEOBJECTS_CREATED = 6; const uint32 MSG_CONFIG_STOP = 7; const uint32 ALLOCATE_DELAY = 250; -const uint32 ALLOCATION_STEP_DELAY = 1 * 1000; const int PHASE_UDP = 0; const int PHASE_RELAY = 1; @@ -238,7 +237,6 @@ BasicPortAllocatorSession::BasicPortAllocatorSession( ice_ufrag, ice_pwd, allocator->flags()), allocator_(allocator), network_thread_(NULL), socket_factory_(allocator->socket_factory()), - configuration_done_(false), allocation_started_(false), network_manager_started_(false), running_(false), diff --git a/talk/p2p/client/basicportallocator.h b/talk/p2p/client/basicportallocator.h index 1fc6ebe10..c46c29aaf 100644 --- a/talk/p2p/client/basicportallocator.h +++ b/talk/p2p/client/basicportallocator.h @@ -204,7 +204,6 @@ class BasicPortAllocatorSession : public PortAllocatorSession, talk_base::Thread* network_thread_; talk_base::scoped_ptr owned_socket_factory_; talk_base::PacketSocketFactory* socket_factory_; - bool configuration_done_; bool allocation_started_; bool network_manager_started_; bool running_; // set when StartGetAllPorts is called diff --git a/talk/p2p/client/httpportallocator.cc b/talk/p2p/client/httpportallocator.cc index e54acba5c..b881d439f 100644 --- a/talk/p2p/client/httpportallocator.cc +++ b/talk/p2p/client/httpportallocator.cc @@ -41,9 +41,6 @@ namespace { -const uint32 MSG_TIMEOUT = 100; // must not conflict - // with BasicPortAllocator.cpp - // Helper routine to remove whitespace from the ends of a string. void Trim(std::string& str) { size_t first = str.find_first_not_of(" \t\r\n"); diff --git a/talk/session/media/mediamessages.cc b/talk/session/media/mediamessages.cc index 6b5d03cf9..45c6c7965 100644 --- a/talk/session/media/mediamessages.cc +++ b/talk/session/media/mediamessages.cc @@ -52,13 +52,6 @@ bool ParseSsrc(const std::string& string, uint32* ssrc) { return talk_base::FromString(string, ssrc); } -bool ParseSsrc(const buzz::XmlElement* element, uint32* ssrc) { - if (element == NULL) { - return false; - } - return ParseSsrc(element->BodyText(), ssrc); -} - // Builds a element according to the following spec: // goto/jinglemuc buzz::XmlElement* CreateViewElem(const std::string& name, diff --git a/talk/xmllite/xmlparser.cc b/talk/xmllite/xmlparser.cc index 3e4d73348..880223187 100644 --- a/talk/xmllite/xmlparser.cc +++ b/talk/xmllite/xmlparser.cc @@ -60,7 +60,7 @@ XmlDeclCallback(void * userData, const char * ver, const char * enc, int st) { } XmlParser::XmlParser(XmlParseHandler *pxph) : - context_(this), pxph_(pxph), sentError_(false) { + pxph_(pxph), sentError_(false) { expat_ = XML_ParserCreate(NULL); XML_SetUserData(expat_, this); XML_SetElementHandler(expat_, StartElementCallback, EndElementCallback); @@ -196,8 +196,7 @@ XmlParser::ParseXml(XmlParseHandler *pxph, std::string text) { parser.Parse(text.c_str(), text.length(), true); } -XmlParser::ParseContext::ParseContext(XmlParser *parser) : - parser_(parser), +XmlParser::ParseContext::ParseContext() : xmlnsstack_(), raised_(XML_ERROR_NONE), line_number_(0), diff --git a/talk/xmllite/xmlparser.h b/talk/xmllite/xmlparser.h index 69cde75f7..4a79858e4 100644 --- a/talk/xmllite/xmlparser.h +++ b/talk/xmllite/xmlparser.h @@ -87,7 +87,7 @@ private: class ParseContext : public XmlParseContext { public: - ParseContext(XmlParser * parser); + ParseContext(); virtual ~ParseContext(); virtual QName ResolveQName(const char * qname, bool isAttr); virtual void RaiseError(XML_Error err) { if (!raised_) raised_ = err; } @@ -102,7 +102,6 @@ private: void SetPosition(int line, int column, long byte_index); private: - const XmlParser * parser_; XmlnsStack xmlnsstack_; XML_Error raised_; XML_Size line_number_; diff --git a/talk/xmpp/constants.cc b/talk/xmpp/constants.cc index db2fc9810..8144fe0c2 100644 --- a/talk/xmpp/constants.cc +++ b/talk/xmpp/constants.cc @@ -216,7 +216,6 @@ const char NS_GOOGLE_AUTH_PROTOCOL[] = "http://www.google.com/talk/protocol/auth"; const StaticQName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT = { NS_GOOGLE_AUTH_PROTOCOL, "client-uses-full-bind-result" }; -const char NS_GOOGLE_AUTH_OLD[] = "google:auth"; const StaticQName QN_GOOGLE_ALLOW_NON_GOOGLE_ID_XMPP_LOGIN = { NS_GOOGLE_AUTH_PROTOCOL, "allow-non-google-login" }; const StaticQName QN_GOOGLE_AUTH_SERVICE = @@ -345,8 +344,6 @@ const StaticQName QN_NICK = { STR_EMPTY, "nick" }; const StaticQName QN_SUBSCRIPTION = { STR_EMPTY, "subscription" }; const StaticQName QN_TITLE1 = { STR_EMPTY, "title1" }; const StaticQName QN_TITLE2 = { STR_EMPTY, "title2" }; -const StaticQName QN_SOURCE = { STR_EMPTY, "source" }; -const StaticQName QN_TIME = { STR_EMPTY, "time" }; const StaticQName QN_XMLNS_CLIENT = { NS_XMLNS, STR_CLIENT }; const StaticQName QN_XMLNS_SERVER = { NS_XMLNS, STR_SERVER }; diff --git a/talk/xmpp/constants.h b/talk/xmpp/constants.h index 2322fa7f4..62e4901d0 100644 --- a/talk/xmpp/constants.h +++ b/talk/xmpp/constants.h @@ -122,6 +122,7 @@ extern const StaticQName QN_GOOGLE_MUC_HANGOUT_INVITE_TYPE; extern const StaticQName QN_ATTR_CREATE_ACTIVITY; extern const StaticQName QN_GOOGLE_MUC_HANGOUT_PUBLIC; extern const StaticQName QN_GOOGLE_MUC_HANGOUT_INVITEE; +extern const StaticQName QN_GOOGLE_MUC_HANGOUT_NOTIFICATION_STATUS; extern const StaticQName QN_GOOGLE_MUC_HANGOUT_NOTIFICATION_TYPE; extern const StaticQName QN_GOOGLE_MUC_HANGOUT_HANGOUT_START_CONTEXT; extern const StaticQName QN_GOOGLE_MUC_HANGOUT_CONVERSATION_ID; diff --git a/talk/xmpp/xmppengineimpl.cc b/talk/xmpp/xmppengineimpl.cc index d4c9c7d5f..cf07ab70a 100644 --- a/talk/xmpp/xmppengineimpl.cc +++ b/talk/xmpp/xmppengineimpl.cc @@ -418,8 +418,7 @@ void XmppEngineImpl::StartTls(const std::string& domain) { XmppEngineImpl::EnterExit::EnterExit(XmppEngineImpl* engine) : engine_(engine), - state_(engine->state_), - error_(engine->error_code_) { + state_(engine->state_) { engine->engine_entered_ += 1; } diff --git a/talk/xmpp/xmppengineimpl.h b/talk/xmpp/xmppengineimpl.h index e292e75d1..827868136 100644 --- a/talk/xmpp/xmppengineimpl.h +++ b/talk/xmpp/xmppengineimpl.h @@ -234,8 +234,6 @@ class XmppEngineImpl : public XmppEngine { private: XmppEngineImpl* engine_; State state_; - Error error_; - }; friend class StanzaParseHandler;