From 5ad4178137ac869f1e057e07c3a171e11763d9df Mon Sep 17 00:00:00 2001 From: "pthatcher@webrtc.org" Date: Tue, 23 Dec 2014 22:14:15 +0000 Subject: [PATCH] Move the Jingle-specific network code into webrtc/libjingle. R=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/29319004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7977 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/session/media/mediasession.cc | 3 +- webrtc/libjingle/libjingle.gyp | 6 + webrtc/libjingle/session/constants.cc | 217 +++++++++++++++++ webrtc/libjingle/session/constants.h | 219 ++++++++++++++++++ webrtc/libjingle/session/media/call.cc | 2 +- .../libjingle/session/media/mediamessages.h | 4 +- .../session/media/mediasessionclient.cc | 1 - .../session/media/mediasessionclient.h | 2 +- .../libjingle/session/p2ptransportparser.cc | 5 +- webrtc/libjingle/session/p2ptransportparser.h | 6 +- .../base => libjingle/session}/parsing.cc | 2 +- .../{p2p/base => libjingle/session}/parsing.h | 6 +- .../libjingle/session/rawtransportparser.cc | 2 +- webrtc/libjingle/session/rawtransportparser.h | 7 +- webrtc/libjingle/session/session_unittest.cc | 4 +- .../session}/sessionclient.h | 1 + webrtc/libjingle/session/sessionmanager.cc | 2 +- webrtc/libjingle/session/sessionmanager.h | 12 +- .../session}/sessionmanagertask.h | 6 +- .../session}/sessionmessages.cc | 18 +- .../session}/sessionmessages.h | 13 +- .../session}/sessionsendtask.h | 4 +- webrtc/libjingle/session/transportparser.cc | 2 +- webrtc/libjingle/session/transportparser.h | 6 +- .../session/transportparser_unittest.cc | 4 +- .../session/tunnel/tunnelsessionclient.h | 2 +- webrtc/p2p/base/constants.cc | 209 +---------------- webrtc/p2p/base/constants.h | 209 +---------------- webrtc/p2p/base/p2ptransport.cc | 5 +- webrtc/p2p/base/sessiondescription.cc | 2 - webrtc/p2p/base/sessionmanager.cc | 1 - webrtc/p2p/base/sessionmanager.h | 1 - webrtc/p2p/client/autoportallocator.h | 2 - webrtc/p2p/p2p.gyp | 12 - 34 files changed, 517 insertions(+), 480 deletions(-) create mode 100644 webrtc/libjingle/session/constants.cc create mode 100644 webrtc/libjingle/session/constants.h rename webrtc/{p2p/base => libjingle/session}/parsing.cc (98%) rename webrtc/{p2p/base => libjingle/session}/parsing.h (96%) rename webrtc/{p2p/base => libjingle/session}/sessionclient.h (98%) rename webrtc/{p2p/client => libjingle/session}/sessionmanagertask.h (93%) rename webrtc/{p2p/base => libjingle/session}/sessionmessages.cc (99%) rename webrtc/{p2p/base => libjingle/session}/sessionmessages.h (97%) rename webrtc/{p2p/client => libjingle/session}/sessionsendtask.h (97%) delete mode 100644 webrtc/p2p/base/sessionmanager.cc delete mode 100644 webrtc/p2p/base/sessionmanager.h diff --git a/talk/session/media/mediasession.cc b/talk/session/media/mediasession.cc index 96e45a6fc..4f7d4b2ab 100644 --- a/talk/session/media/mediasession.cc +++ b/talk/session/media/mediasession.cc @@ -34,14 +34,13 @@ #include "talk/media/base/constants.h" #include "talk/media/base/cryptoparams.h" -#include "webrtc/p2p/base/constants.h" #include "talk/session/media/channelmanager.h" #include "talk/session/media/srtpfilter.h" -#include "webrtc/libjingle/xmpp/constants.h" #include "webrtc/base/helpers.h" #include "webrtc/base/logging.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/stringutils.h" +#include "webrtc/p2p/base/constants.h" #ifdef HAVE_SCTP #include "talk/media/sctp/sctpdataengine.h" diff --git a/webrtc/libjingle/libjingle.gyp b/webrtc/libjingle/libjingle.gyp index bc7658016..f1ed3baf9 100644 --- a/webrtc/libjingle/libjingle.gyp +++ b/webrtc/libjingle/libjingle.gyp @@ -41,14 +41,20 @@ '<(DEPTH)/third_party/expat/expat.gyp:expat', ], 'sources': [ + 'session/constants.cc', + 'session/constants.h', 'session/p2ptransportparser.cc', 'session/p2ptransportparser.h', + 'session/parsing.cc', + 'session/parsing.h', 'session/rawtransportparser.cc', 'session/rawtransportparser.h', 'session/sessionclient.h', 'session/sessionmanager.h', 'session/sessionmanager.cc', 'session/sessionmanagertask.h', + 'session/sessionmessages.cc', + 'session/sessionmessages.h', 'session/sessionsendtask.h', 'session/transportparser.cc', 'session/transportparser.h', diff --git a/webrtc/libjingle/session/constants.cc b/webrtc/libjingle/session/constants.cc new file mode 100644 index 000000000..5f5bcd368 --- /dev/null +++ b/webrtc/libjingle/session/constants.cc @@ -0,0 +1,217 @@ +/* + * Copyright 2004 The WebRTC Project Authors. All rights reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "webrtc/libjingle/session/constants.h" + +#include + +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/p2p/base/constants.h" + +namespace cricket { + +const char NS_EMPTY[] = ""; +const char NS_JINGLE[] = "urn:xmpp:jingle:1"; +const char NS_JINGLE_DRAFT[] = "google:jingle"; +const char NS_GINGLE[] = "http://www.google.com/session"; + +// actions (aka or ) +const buzz::StaticQName QN_ACTION = { NS_EMPTY, "action" }; +const char LN_INITIATOR[] = "initiator"; +const buzz::StaticQName QN_INITIATOR = { NS_EMPTY, LN_INITIATOR }; +const buzz::StaticQName QN_CREATOR = { NS_EMPTY, "creator" }; + +const buzz::StaticQName QN_JINGLE = { NS_JINGLE, "jingle" }; +const buzz::StaticQName QN_JINGLE_CONTENT = { NS_JINGLE, "content" }; +const buzz::StaticQName QN_JINGLE_CONTENT_NAME = { NS_EMPTY, "name" }; +const buzz::StaticQName QN_JINGLE_CONTENT_MEDIA = { NS_EMPTY, "media" }; +const buzz::StaticQName QN_JINGLE_REASON = { NS_JINGLE, "reason" }; +const buzz::StaticQName QN_JINGLE_DRAFT_GROUP = { NS_JINGLE_DRAFT, "group" }; +const buzz::StaticQName QN_JINGLE_DRAFT_GROUP_TYPE = { NS_EMPTY, "type" }; +const char JINGLE_CONTENT_MEDIA_AUDIO[] = "audio"; +const char JINGLE_CONTENT_MEDIA_VIDEO[] = "video"; +const char JINGLE_CONTENT_MEDIA_DATA[] = "data"; +const char JINGLE_ACTION_SESSION_INITIATE[] = "session-initiate"; +const char JINGLE_ACTION_SESSION_INFO[] = "session-info"; +const char JINGLE_ACTION_SESSION_ACCEPT[] = "session-accept"; +const char JINGLE_ACTION_SESSION_TERMINATE[] = "session-terminate"; +const char JINGLE_ACTION_TRANSPORT_INFO[] = "transport-info"; +const char JINGLE_ACTION_TRANSPORT_ACCEPT[] = "transport-accept"; +const char JINGLE_ACTION_DESCRIPTION_INFO[] = "description-info"; + +const buzz::StaticQName QN_GINGLE_SESSION = { NS_GINGLE, "session" }; +const char GINGLE_ACTION_INITIATE[] = "initiate"; +const char GINGLE_ACTION_INFO[] = "info"; +const char GINGLE_ACTION_ACCEPT[] = "accept"; +const char GINGLE_ACTION_REJECT[] = "reject"; +const char GINGLE_ACTION_TERMINATE[] = "terminate"; +const char GINGLE_ACTION_CANDIDATES[] = "candidates"; +const char GINGLE_ACTION_UPDATE[] = "update"; + +const char LN_ERROR[] = "error"; +const buzz::StaticQName QN_GINGLE_REDIRECT = { NS_GINGLE, "redirect" }; +const char STR_REDIRECT_PREFIX[] = "xmpp:"; + +// Session Contents (aka Gingle +// or Jingle ) +const char LN_DESCRIPTION[] = "description"; +const char LN_PAYLOADTYPE[] = "payload-type"; +const buzz::StaticQName QN_ID = { NS_EMPTY, "id" }; +const buzz::StaticQName QN_SID = { NS_EMPTY, "sid" }; +const buzz::StaticQName QN_NAME = { NS_EMPTY, "name" }; +const buzz::StaticQName QN_CLOCKRATE = { NS_EMPTY, "clockrate" }; +const buzz::StaticQName QN_BITRATE = { NS_EMPTY, "bitrate" }; +const buzz::StaticQName QN_CHANNELS = { NS_EMPTY, "channels" }; +const buzz::StaticQName QN_WIDTH = { NS_EMPTY, "width" }; +const buzz::StaticQName QN_HEIGHT = { NS_EMPTY, "height" }; +const buzz::StaticQName QN_FRAMERATE = { NS_EMPTY, "framerate" }; +const char LN_NAME[] = "name"; +const char LN_VALUE[] = "value"; +const buzz::StaticQName QN_PAYLOADTYPE_PARAMETER_NAME = { NS_EMPTY, LN_NAME }; +const buzz::StaticQName QN_PAYLOADTYPE_PARAMETER_VALUE = { NS_EMPTY, LN_VALUE }; +const char PAYLOADTYPE_PARAMETER_BITRATE[] = "bitrate"; +const char PAYLOADTYPE_PARAMETER_HEIGHT[] = "height"; +const char PAYLOADTYPE_PARAMETER_WIDTH[] = "width"; +const char PAYLOADTYPE_PARAMETER_FRAMERATE[] = "framerate"; +const char LN_BANDWIDTH[] = "bandwidth"; + +const buzz::StaticQName QN_JINGLE_RTP_CONTENT = + { NS_JINGLE_RTP, LN_DESCRIPTION }; +const buzz::StaticQName QN_SSRC = { NS_EMPTY, "ssrc" }; +const buzz::StaticQName QN_JINGLE_RTP_PAYLOADTYPE = + { NS_JINGLE_RTP, LN_PAYLOADTYPE }; +const buzz::StaticQName QN_JINGLE_RTP_BANDWIDTH = + { NS_JINGLE_RTP, LN_BANDWIDTH }; +const buzz::StaticQName QN_JINGLE_RTCP_MUX = { NS_JINGLE_RTP, "rtcp-mux" }; +const buzz::StaticQName QN_JINGLE_RTCP_FB = { NS_JINGLE_RTP, "rtcp-fb" }; +const buzz::StaticQName QN_SUBTYPE = { NS_EMPTY, "subtype" }; +const buzz::StaticQName QN_PARAMETER = { NS_JINGLE_RTP, "parameter" }; +const buzz::StaticQName QN_JINGLE_RTP_HDREXT = + { NS_JINGLE_RTP, "rtp-hdrext" }; +const buzz::StaticQName QN_URI = { NS_EMPTY, "uri" }; + +const buzz::StaticQName QN_JINGLE_DRAFT_SCTP_CONTENT = + { NS_JINGLE_DRAFT_SCTP, LN_DESCRIPTION }; +const buzz::StaticQName QN_JINGLE_DRAFT_SCTP_STREAM = + { NS_JINGLE_DRAFT_SCTP, "stream" }; + +const char NS_GINGLE_AUDIO[] = "http://www.google.com/session/phone"; +const buzz::StaticQName QN_GINGLE_AUDIO_CONTENT = + { NS_GINGLE_AUDIO, LN_DESCRIPTION }; +const buzz::StaticQName QN_GINGLE_AUDIO_PAYLOADTYPE = + { NS_GINGLE_AUDIO, LN_PAYLOADTYPE }; +const buzz::StaticQName QN_GINGLE_AUDIO_SRCID = { NS_GINGLE_AUDIO, "src-id" }; +const char NS_GINGLE_VIDEO[] = "http://www.google.com/session/video"; +const buzz::StaticQName QN_GINGLE_VIDEO_CONTENT = + { NS_GINGLE_VIDEO, LN_DESCRIPTION }; +const buzz::StaticQName QN_GINGLE_VIDEO_PAYLOADTYPE = + { NS_GINGLE_VIDEO, LN_PAYLOADTYPE }; +const buzz::StaticQName QN_GINGLE_VIDEO_SRCID = { NS_GINGLE_VIDEO, "src-id" }; +const buzz::StaticQName QN_GINGLE_VIDEO_BANDWIDTH = + { NS_GINGLE_VIDEO, LN_BANDWIDTH }; + +// Crypto support. +const buzz::StaticQName QN_ENCRYPTION = { NS_JINGLE_RTP, "encryption" }; +const buzz::StaticQName QN_ENCRYPTION_REQUIRED = { NS_EMPTY, "required" }; +const buzz::StaticQName QN_CRYPTO = { NS_JINGLE_RTP, "crypto" }; +const buzz::StaticQName QN_GINGLE_AUDIO_CRYPTO_USAGE = + { NS_GINGLE_AUDIO, "usage" }; +const buzz::StaticQName QN_GINGLE_VIDEO_CRYPTO_USAGE = + { NS_GINGLE_VIDEO, "usage" }; +const buzz::StaticQName QN_CRYPTO_SUITE = { NS_EMPTY, "crypto-suite" }; +const buzz::StaticQName QN_CRYPTO_KEY_PARAMS = { NS_EMPTY, "key-params" }; +const buzz::StaticQName QN_CRYPTO_TAG = { NS_EMPTY, "tag" }; +const buzz::StaticQName QN_CRYPTO_SESSION_PARAMS = + { NS_EMPTY, "session-params" }; + +// Transports and candidates. +const char LN_TRANSPORT[] = "transport"; +const char LN_CANDIDATE[] = "candidate"; +const buzz::StaticQName QN_UFRAG = { cricket::NS_EMPTY, "ufrag" }; +const buzz::StaticQName QN_PWD = { cricket::NS_EMPTY, "pwd" }; +const buzz::StaticQName QN_COMPONENT = { cricket::NS_EMPTY, "component" }; +const buzz::StaticQName QN_IP = { cricket::NS_EMPTY, "ip" }; +const buzz::StaticQName QN_PORT = { cricket::NS_EMPTY, "port" }; +const buzz::StaticQName QN_NETWORK = { cricket::NS_EMPTY, "network" }; +const buzz::StaticQName QN_GENERATION = { cricket::NS_EMPTY, "generation" }; +const buzz::StaticQName QN_PRIORITY = { cricket::NS_EMPTY, "priority" }; +const buzz::StaticQName QN_PROTOCOL = { cricket::NS_EMPTY, "protocol" }; +const char ICE_CANDIDATE_TYPE_PEER_STUN[] = "prflx"; +const char ICE_CANDIDATE_TYPE_SERVER_STUN[] = "srflx"; + +const buzz::StaticQName QN_FINGERPRINT = { cricket::NS_EMPTY, "fingerprint" }; +const buzz::StaticQName QN_FINGERPRINT_ALGORITHM = + { cricket::NS_EMPTY, "algorithm" }; +const buzz::StaticQName QN_FINGERPRINT_DIGEST = { cricket::NS_EMPTY, "digest" }; + +const buzz::StaticQName QN_GINGLE_P2P_TRANSPORT = + { NS_GINGLE_P2P, LN_TRANSPORT }; +const buzz::StaticQName QN_GINGLE_P2P_CANDIDATE = + { NS_GINGLE_P2P, LN_CANDIDATE }; +const buzz::StaticQName QN_GINGLE_P2P_UNKNOWN_CHANNEL_NAME = + { NS_GINGLE_P2P, "unknown-channel-name" }; +const buzz::StaticQName QN_GINGLE_CANDIDATE = { NS_GINGLE, LN_CANDIDATE }; +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" }; + +// terminate reasons and errors +const char JINGLE_ERROR_BAD_REQUEST[] = "bad-request"; +const char JINGLE_ERROR_OUT_OF_ORDER[] = "out-of-order"; +const char JINGLE_ERROR_UNKNOWN_SESSION[] = "unknown-session"; + +// Call terminate reasons from XEP-166 +const char STR_TERMINATE_DECLINE[] = "decline"; +const char STR_TERMINATE_SUCCESS[] = "success"; +const char STR_TERMINATE_ERROR[] = "general-error"; +const char STR_TERMINATE_INCOMPATIBLE_PARAMETERS[] = "incompatible-parameters"; + +// Old terminate reasons used by cricket +const char STR_TERMINATE_CALL_ENDED[] = "call-ended"; +const char STR_TERMINATE_RECIPIENT_UNAVAILABLE[] = "recipient-unavailable"; +const char STR_TERMINATE_RECIPIENT_BUSY[] = "recipient-busy"; +const char STR_TERMINATE_INSUFFICIENT_FUNDS[] = "insufficient-funds"; +const char STR_TERMINATE_NUMBER_MALFORMED[] = "number-malformed"; +const char STR_TERMINATE_NUMBER_DISALLOWED[] = "number-disallowed"; +const char STR_TERMINATE_PROTOCOL_ERROR[] = "protocol-error"; +const char STR_TERMINATE_INTERNAL_SERVER_ERROR[] = "internal-server-error"; +const char STR_TERMINATE_UNKNOWN_ERROR[] = "unknown-error"; + +// Draft view and notify messages. +const char STR_JINGLE_DRAFT_CONTENT_NAME_VIDEO[] = "video"; +const char STR_JINGLE_DRAFT_CONTENT_NAME_AUDIO[] = "audio"; +const buzz::StaticQName QN_NICK = { cricket::NS_EMPTY, "nick" }; +const buzz::StaticQName QN_TYPE = { cricket::NS_EMPTY, "type" }; +const buzz::StaticQName QN_JINGLE_DRAFT_VIEW = { NS_JINGLE_DRAFT, "view" }; +const char STR_JINGLE_DRAFT_VIEW_TYPE_NONE[] = "none"; +const char STR_JINGLE_DRAFT_VIEW_TYPE_STATIC[] = "static"; +const buzz::StaticQName QN_JINGLE_DRAFT_PARAMS = { NS_JINGLE_DRAFT, "params" }; +const buzz::StaticQName QN_JINGLE_DRAFT_STREAMS = { NS_JINGLE_DRAFT, "streams" }; +const buzz::StaticQName QN_JINGLE_DRAFT_STREAM = { NS_JINGLE_DRAFT, "stream" }; +const buzz::StaticQName QN_DISPLAY = { cricket::NS_EMPTY, "display" }; +const buzz::StaticQName QN_CNAME = { cricket::NS_EMPTY, "cname" }; +const buzz::StaticQName QN_JINGLE_DRAFT_SSRC = { NS_JINGLE_DRAFT, "ssrc" }; +const buzz::StaticQName QN_JINGLE_DRAFT_SSRC_GROUP = + { NS_JINGLE_DRAFT, "ssrc-group" }; +const buzz::StaticQName QN_SEMANTICS = { cricket::NS_EMPTY, "semantics" }; +const buzz::StaticQName QN_JINGLE_LEGACY_NOTIFY = { NS_JINGLE_DRAFT, "notify" }; +const buzz::StaticQName QN_JINGLE_LEGACY_SOURCE = { NS_JINGLE_DRAFT, "source" }; + +const buzz::StaticQName QN_GINGLE_RAW_TRANSPORT = { NS_GINGLE_RAW, "transport" }; +const buzz::StaticQName QN_GINGLE_RAW_CHANNEL = { NS_GINGLE_RAW, "channel" }; + +// old stuff +#ifdef FEATURE_ENABLE_VOICEMAIL +const char NS_VOICEMAIL[] = "http://www.google.com/session/voicemail"; +const buzz::StaticQName QN_VOICEMAIL_REGARDING = { NS_VOICEMAIL, "regarding" }; +#endif + +} // namespace cricket diff --git a/webrtc/libjingle/session/constants.h b/webrtc/libjingle/session/constants.h new file mode 100644 index 000000000..b9d526899 --- /dev/null +++ b/webrtc/libjingle/session/constants.h @@ -0,0 +1,219 @@ +/* + * Copyright 2004 The WebRTC Project Authors. All rights reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#ifndef WEBRTC_LIBJINGLE_SESSION_CONSTANTS_H_ +#define WEBRTC_LIBJINGLE_SESSION_CONSTANTS_H_ + +#include + +#include "webrtc/libjingle/xmllite/qname.h" + +// This file contains constants related to signaling that are used in various +// classes in this directory. + +namespace cricket { + +// NS_ == namespace +// QN_ == buzz::QName (namespace + name) +// LN_ == "local name" == QName::LocalPart() +// these are useful when you need to find a tag +// that has different namespaces (like or ) + +extern const char NS_EMPTY[]; +extern const char NS_JINGLE[]; +extern const char NS_JINGLE_DRAFT[]; +extern const char NS_GINGLE[]; + +enum SignalingProtocol { + PROTOCOL_JINGLE, + PROTOCOL_GINGLE, + PROTOCOL_HYBRID, +}; + +// actions (aka Gingle or Jingle ) +extern const buzz::StaticQName QN_ACTION; +extern const char LN_INITIATOR[]; +extern const buzz::StaticQName QN_INITIATOR; +extern const buzz::StaticQName QN_CREATOR; + +extern const buzz::StaticQName QN_JINGLE; +extern const buzz::StaticQName QN_JINGLE_CONTENT; +extern const buzz::StaticQName QN_JINGLE_CONTENT_NAME; +extern const buzz::StaticQName QN_JINGLE_CONTENT_MEDIA; +extern const buzz::StaticQName QN_JINGLE_REASON; +extern const buzz::StaticQName QN_JINGLE_DRAFT_GROUP; +extern const buzz::StaticQName QN_JINGLE_DRAFT_GROUP_TYPE; +extern const char JINGLE_CONTENT_MEDIA_AUDIO[]; +extern const char JINGLE_CONTENT_MEDIA_VIDEO[]; +extern const char JINGLE_CONTENT_MEDIA_DATA[]; +extern const char JINGLE_ACTION_SESSION_INITIATE[]; +extern const char JINGLE_ACTION_SESSION_INFO[]; +extern const char JINGLE_ACTION_SESSION_ACCEPT[]; +extern const char JINGLE_ACTION_SESSION_TERMINATE[]; +extern const char JINGLE_ACTION_TRANSPORT_INFO[]; +extern const char JINGLE_ACTION_TRANSPORT_ACCEPT[]; +extern const char JINGLE_ACTION_DESCRIPTION_INFO[]; + +extern const buzz::StaticQName QN_GINGLE_SESSION; +extern const char GINGLE_ACTION_INITIATE[]; +extern const char GINGLE_ACTION_INFO[]; +extern const char GINGLE_ACTION_ACCEPT[]; +extern const char GINGLE_ACTION_REJECT[]; +extern const char GINGLE_ACTION_TERMINATE[]; +extern const char GINGLE_ACTION_CANDIDATES[]; +extern const char GINGLE_ACTION_UPDATE[]; + +extern const char LN_ERROR[]; +extern const buzz::StaticQName QN_GINGLE_REDIRECT; +extern const char STR_REDIRECT_PREFIX[]; + +// Session Contents (aka Gingle +// or Jingle ) +extern const char LN_DESCRIPTION[]; +extern const char LN_PAYLOADTYPE[]; +extern const buzz::StaticQName QN_ID; +extern const buzz::StaticQName QN_SID; +extern const buzz::StaticQName QN_NAME; +extern const buzz::StaticQName QN_CLOCKRATE; +extern const buzz::StaticQName QN_BITRATE; +extern const buzz::StaticQName QN_CHANNELS; +extern const buzz::StaticQName QN_PARAMETER; +extern const char LN_NAME[]; +extern const char LN_VALUE[]; +extern const buzz::StaticQName QN_PAYLOADTYPE_PARAMETER_NAME; +extern const buzz::StaticQName QN_PAYLOADTYPE_PARAMETER_VALUE; +extern const char PAYLOADTYPE_PARAMETER_BITRATE[]; +extern const char PAYLOADTYPE_PARAMETER_HEIGHT[]; +extern const char PAYLOADTYPE_PARAMETER_WIDTH[]; +extern const char PAYLOADTYPE_PARAMETER_FRAMERATE[]; +extern const char LN_BANDWIDTH[]; + +extern const buzz::StaticQName QN_JINGLE_RTP_CONTENT; +extern const buzz::StaticQName QN_SSRC; +extern const buzz::StaticQName QN_JINGLE_RTP_PAYLOADTYPE; +extern const buzz::StaticQName QN_JINGLE_RTP_BANDWIDTH; +extern const buzz::StaticQName QN_JINGLE_RTCP_MUX; +extern const buzz::StaticQName QN_JINGLE_RTCP_FB; +extern const buzz::StaticQName QN_SUBTYPE; +extern const buzz::StaticQName QN_JINGLE_RTP_HDREXT; +extern const buzz::StaticQName QN_URI; + +extern const buzz::StaticQName QN_JINGLE_DRAFT_SCTP_CONTENT; +extern const buzz::StaticQName QN_JINGLE_DRAFT_SCTP_STREAM; + +extern const char NS_GINGLE_AUDIO[]; +extern const buzz::StaticQName QN_GINGLE_AUDIO_CONTENT; +extern const buzz::StaticQName QN_GINGLE_AUDIO_PAYLOADTYPE; +extern const buzz::StaticQName QN_GINGLE_AUDIO_SRCID; +extern const char NS_GINGLE_VIDEO[]; +extern const buzz::StaticQName QN_GINGLE_VIDEO_CONTENT; +extern const buzz::StaticQName QN_GINGLE_VIDEO_PAYLOADTYPE; +extern const buzz::StaticQName QN_GINGLE_VIDEO_SRCID; +extern const buzz::StaticQName QN_GINGLE_VIDEO_BANDWIDTH; + +// Crypto support. +extern const buzz::StaticQName QN_ENCRYPTION; +extern const buzz::StaticQName QN_ENCRYPTION_REQUIRED; +extern const buzz::StaticQName QN_CRYPTO; +extern const buzz::StaticQName QN_GINGLE_AUDIO_CRYPTO_USAGE; +extern const buzz::StaticQName QN_GINGLE_VIDEO_CRYPTO_USAGE; +extern const buzz::StaticQName QN_CRYPTO_SUITE; +extern const buzz::StaticQName QN_CRYPTO_KEY_PARAMS; +extern const buzz::StaticQName QN_CRYPTO_TAG; +extern const buzz::StaticQName QN_CRYPTO_SESSION_PARAMS; + +// Transports and candidates. +extern const char LN_TRANSPORT[]; +extern const char LN_CANDIDATE[]; +extern const buzz::StaticQName QN_JINGLE_P2P_TRANSPORT; +extern const buzz::StaticQName QN_JINGLE_P2P_CANDIDATE; +extern const buzz::StaticQName QN_UFRAG; +extern const buzz::StaticQName QN_COMPONENT; +extern const buzz::StaticQName QN_PWD; +extern const buzz::StaticQName QN_IP; +extern const buzz::StaticQName QN_PORT; +extern const buzz::StaticQName QN_NETWORK; +extern const buzz::StaticQName QN_GENERATION; +extern const buzz::StaticQName QN_PRIORITY; +extern const buzz::StaticQName QN_PROTOCOL; +extern const char ICE_CANDIDATE_TYPE_PEER_STUN[]; +extern const char ICE_CANDIDATE_TYPE_SERVER_STUN[]; + +extern const buzz::StaticQName QN_FINGERPRINT; +extern const buzz::StaticQName QN_FINGERPRINT_ALGORITHM; +extern const buzz::StaticQName QN_FINGERPRINT_DIGEST; + +extern const buzz::StaticQName QN_GINGLE_P2P_TRANSPORT; +extern const buzz::StaticQName QN_GINGLE_P2P_CANDIDATE; +extern const buzz::StaticQName QN_GINGLE_P2P_UNKNOWN_CHANNEL_NAME; +extern const buzz::StaticQName QN_GINGLE_CANDIDATE; +extern const buzz::StaticQName QN_ADDRESS; +extern const buzz::StaticQName QN_USERNAME; +extern const buzz::StaticQName QN_PASSWORD; +extern const buzz::StaticQName QN_PREFERENCE; +extern const char GINGLE_CANDIDATE_TYPE_STUN[]; + +extern const buzz::StaticQName QN_GINGLE_RAW_TRANSPORT; +extern const buzz::StaticQName QN_GINGLE_RAW_CHANNEL; + +// terminate reasons and errors: see http://xmpp.org/extensions/xep-0166.html +extern const char JINGLE_ERROR_BAD_REQUEST[]; // like parse error +// got transport-info before session-initiate, for example +extern const char JINGLE_ERROR_OUT_OF_ORDER[]; +extern const char JINGLE_ERROR_UNKNOWN_SESSION[]; + +// Call terminate reasons from XEP-166 +extern const char STR_TERMINATE_DECLINE[]; // polite reject +extern const char STR_TERMINATE_SUCCESS[]; // polite hangup +extern const char STR_TERMINATE_ERROR[]; // something bad happened +extern const char STR_TERMINATE_INCOMPATIBLE_PARAMETERS[]; // no codecs? + +// Old terminate reasons used by cricket +extern const char STR_TERMINATE_CALL_ENDED[]; +extern const char STR_TERMINATE_RECIPIENT_UNAVAILABLE[]; +extern const char STR_TERMINATE_RECIPIENT_BUSY[]; +extern const char STR_TERMINATE_INSUFFICIENT_FUNDS[]; +extern const char STR_TERMINATE_NUMBER_MALFORMED[]; +extern const char STR_TERMINATE_NUMBER_DISALLOWED[]; +extern const char STR_TERMINATE_PROTOCOL_ERROR[]; +extern const char STR_TERMINATE_INTERNAL_SERVER_ERROR[]; +extern const char STR_TERMINATE_UNKNOWN_ERROR[]; + +// Draft view and notify messages. +extern const char STR_JINGLE_DRAFT_CONTENT_NAME_VIDEO[]; +extern const char STR_JINGLE_DRAFT_CONTENT_NAME_AUDIO[]; +extern const buzz::StaticQName QN_NICK; +extern const buzz::StaticQName QN_TYPE; +extern const buzz::StaticQName QN_JINGLE_DRAFT_VIEW; +extern const char STR_JINGLE_DRAFT_VIEW_TYPE_NONE[]; +extern const char STR_JINGLE_DRAFT_VIEW_TYPE_STATIC[]; +extern const buzz::StaticQName QN_JINGLE_DRAFT_PARAMS; +extern const buzz::StaticQName QN_WIDTH; +extern const buzz::StaticQName QN_HEIGHT; +extern const buzz::StaticQName QN_FRAMERATE; +extern const buzz::StaticQName QN_JINGLE_DRAFT_STREAM; +extern const buzz::StaticQName QN_JINGLE_DRAFT_STREAMS; +extern const buzz::StaticQName QN_DISPLAY; +extern const buzz::StaticQName QN_CNAME; +extern const buzz::StaticQName QN_JINGLE_DRAFT_SSRC; +extern const buzz::StaticQName QN_JINGLE_DRAFT_SSRC_GROUP; +extern const buzz::StaticQName QN_SEMANTICS; +extern const buzz::StaticQName QN_JINGLE_LEGACY_NOTIFY; +extern const buzz::StaticQName QN_JINGLE_LEGACY_SOURCE; + +// old stuff +#ifdef FEATURE_ENABLE_VOICEMAIL +extern const char NS_VOICEMAIL[]; +extern const buzz::StaticQName QN_VOICEMAIL_REGARDING; +#endif + +} // namespace cricket + +#endif // WEBRTC_LIBJINGLE_SESSION_CONSTANTS_H_ diff --git a/webrtc/libjingle/session/media/call.cc b/webrtc/libjingle/session/media/call.cc index 0c9b4b381..2857531dc 100644 --- a/webrtc/libjingle/session/media/call.cc +++ b/webrtc/libjingle/session/media/call.cc @@ -37,7 +37,7 @@ #include "webrtc/base/thread.h" #include "webrtc/base/window.h" #include "webrtc/libjingle/session/media/mediasessionclient.h" -#include "webrtc/p2p/base/parsing.h" +#include "webrtc/libjingle/session/parsing.h" namespace cricket { diff --git a/webrtc/libjingle/session/media/mediamessages.h b/webrtc/libjingle/session/media/mediamessages.h index a476f922e..b7943f675 100644 --- a/webrtc/libjingle/session/media/mediamessages.h +++ b/webrtc/libjingle/session/media/mediamessages.h @@ -41,9 +41,9 @@ #include "talk/media/base/mediachannel.h" // For RtpHeaderExtension #include "talk/media/base/streamparams.h" -#include "webrtc/p2p/base/parsing.h" -#include "webrtc/p2p/base/sessiondescription.h" #include "webrtc/base/basictypes.h" +#include "webrtc/libjingle/session/parsing.h" +#include "webrtc/p2p/base/sessiondescription.h" namespace cricket { diff --git a/webrtc/libjingle/session/media/mediasessionclient.cc b/webrtc/libjingle/session/media/mediasessionclient.cc index 337413d67..7cfcf155c 100644 --- a/webrtc/libjingle/session/media/mediasessionclient.cc +++ b/webrtc/libjingle/session/media/mediasessionclient.cc @@ -42,7 +42,6 @@ #include "webrtc/libjingle/xmllite/xmlconstants.h" #include "webrtc/libjingle/xmpp/constants.h" #include "webrtc/p2p/base/constants.h" -#include "webrtc/p2p/base/parsing.h" namespace cricket { diff --git a/webrtc/libjingle/session/media/mediasessionclient.h b/webrtc/libjingle/session/media/mediasessionclient.h index d8c88ffd8..c80b0a4b4 100644 --- a/webrtc/libjingle/session/media/mediasessionclient.h +++ b/webrtc/libjingle/session/media/mediasessionclient.h @@ -41,8 +41,8 @@ #include "webrtc/base/sigslotrepeater.h" #include "webrtc/base/thread.h" #include "webrtc/libjingle/session/media/call.h" +#include "webrtc/libjingle/session/sessionclient.h" #include "webrtc/libjingle/session/sessionmanager.h" -#include "webrtc/p2p/base/sessionclient.h" #include "webrtc/p2p/base/sessiondescription.h" namespace cricket { diff --git a/webrtc/libjingle/session/p2ptransportparser.cc b/webrtc/libjingle/session/p2ptransportparser.cc index 75d81c7bc..cb3467148 100644 --- a/webrtc/libjingle/session/p2ptransportparser.cc +++ b/webrtc/libjingle/session/p2ptransportparser.cc @@ -13,9 +13,10 @@ #include #include "webrtc/p2p/base/constants.h" -#include "webrtc/p2p/base/parsing.h" +#include "webrtc/libjingle/session/constants.h" +#include "webrtc/libjingle/session/parsing.h" #include "webrtc/libjingle/session/sessionmanager.h" -#include "webrtc/p2p/base/sessionmessages.h" +#include "webrtc/libjingle/session/sessionmessages.h" #include "webrtc/libjingle/xmllite/qname.h" #include "webrtc/libjingle/xmllite/xmlelement.h" #include "webrtc/libjingle/xmpp/constants.h" diff --git a/webrtc/libjingle/session/p2ptransportparser.h b/webrtc/libjingle/session/p2ptransportparser.h index 8fadbb8f7..754673ba7 100644 --- a/webrtc/libjingle/session/p2ptransportparser.h +++ b/webrtc/libjingle/session/p2ptransportparser.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_P2PTRANSPORTPARSER_H_ -#define WEBRTC_P2P_BASE_P2PTRANSPORTPARSER_H_ +#ifndef WEBRTC_LIBJINGLE_SESSION_P2PTRANSPORTPARSER_H_ +#define WEBRTC_LIBJINGLE_SESSION_P2PTRANSPORTPARSER_H_ #include #include "webrtc/libjingle/session/transportparser.h" @@ -64,4 +64,4 @@ class P2PTransportParser : public TransportParser { } // namespace cricket -#endif // WEBRTC_P2P_BASE_P2PTRANSPORTPARSER_H_ +#endif // WEBRTC_LIBJINGLE_SESSION_P2PTRANSPORTPARSER_H_ diff --git a/webrtc/p2p/base/parsing.cc b/webrtc/libjingle/session/parsing.cc similarity index 98% rename from webrtc/p2p/base/parsing.cc rename to webrtc/libjingle/session/parsing.cc index 04d7e79ee..9a6100aad 100644 --- a/webrtc/p2p/base/parsing.cc +++ b/webrtc/libjingle/session/parsing.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/parsing.h" +#include "webrtc/libjingle/session/parsing.h" #include #include diff --git a/webrtc/p2p/base/parsing.h b/webrtc/libjingle/session/parsing.h similarity index 96% rename from webrtc/p2p/base/parsing.h rename to webrtc/libjingle/session/parsing.h index 6b32b5dbd..1d1b69d08 100644 --- a/webrtc/p2p/base/parsing.h +++ b/webrtc/libjingle/session/parsing.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_PARSING_H_ -#define WEBRTC_P2P_BASE_PARSING_H_ +#ifndef WEBRTC_LIBJINGLE_SESSION_PARSING_H_ +#define WEBRTC_LIBJINGLE_SESSION_PARSING_H_ #include #include @@ -137,4 +137,4 @@ std::vector CopyOfXmlChildren(const buzz::XmlElement* elem); } // namespace cricket -#endif // WEBRTC_P2P_BASE_PARSING_H_ +#endif // WEBRTC_LIBJINGLE_SESSION_PARSING_H_ diff --git a/webrtc/libjingle/session/rawtransportparser.cc b/webrtc/libjingle/session/rawtransportparser.cc index 1fa762a9f..e8df956a0 100644 --- a/webrtc/libjingle/session/rawtransportparser.cc +++ b/webrtc/libjingle/session/rawtransportparser.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/p2p/base/parsing.h" +#include "webrtc/libjingle/session/parsing.h" #include "webrtc/libjingle/xmllite/qname.h" #include "webrtc/libjingle/xmllite/xmlelement.h" #include "webrtc/libjingle/xmpp/constants.h" diff --git a/webrtc/libjingle/session/rawtransportparser.h b/webrtc/libjingle/session/rawtransportparser.h index f3783607c..092fa3fee 100644 --- a/webrtc/libjingle/session/rawtransportparser.h +++ b/webrtc/libjingle/session/rawtransportparser.h @@ -8,12 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_RAWTRANSPORTPARSER_H_ -#define WEBRTC_P2P_BASE_RAWTRANSPORTPARSER_H_ +#ifndef WEBRTC_LIBJINGLE_SESSION_RAWTRANSPORTPARSER_H_ +#define WEBRTC_LIBJINGLE_SESSION_RAWTRANSPORTPARSER_H_ #include #include "webrtc/p2p/base/constants.h" +#include "webrtc/libjingle/session/constants.h" #include "webrtc/libjingle/session/transportparser.h" namespace cricket { @@ -45,4 +46,4 @@ class RawTransportParser : public TransportParser { } // namespace cricket -#endif // WEBRTC_P2P_BASE_RAWTRANSPORTPARSER_H_ +#endif // WEBRTC_LIBJINGLE_SESSION_RAWTRANSPORTPARSER_H_ diff --git a/webrtc/libjingle/session/session_unittest.cc b/webrtc/libjingle/session/session_unittest.cc index 8b28d2d89..c2ff1a791 100644 --- a/webrtc/libjingle/session/session_unittest.cc +++ b/webrtc/libjingle/session/session_unittest.cc @@ -22,16 +22,16 @@ #include "webrtc/base/natserver.h" #include "webrtc/base/natsocketfactory.h" #include "webrtc/base/stringencode.h" +#include "webrtc/libjingle/session/parsing.h" +#include "webrtc/libjingle/session/sessionclient.h" #include "webrtc/libjingle/session/sessionmanager.h" #include "webrtc/libjingle/xmpp/constants.h" #include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/base/constants.h" #include "webrtc/p2p/base/p2ptransport.h" -#include "webrtc/p2p/base/parsing.h" #include "webrtc/p2p/base/portallocator.h" #include "webrtc/p2p/base/relayport.h" #include "webrtc/p2p/base/relayserver.h" -#include "webrtc/p2p/base/sessionclient.h" #include "webrtc/p2p/base/stunport.h" #include "webrtc/p2p/base/stunserver.h" #include "webrtc/p2p/base/transportchannel.h" diff --git a/webrtc/p2p/base/sessionclient.h b/webrtc/libjingle/session/sessionclient.h similarity index 98% rename from webrtc/p2p/base/sessionclient.h rename to webrtc/libjingle/session/sessionclient.h index 8cbd3be31..1db4b6ee6 100644 --- a/webrtc/p2p/base/sessionclient.h +++ b/webrtc/libjingle/session/sessionclient.h @@ -11,6 +11,7 @@ #ifndef WEBRTC_P2P_BASE_SESSIONCLIENT_H_ #define WEBRTC_P2P_BASE_SESSIONCLIENT_H_ +#include "webrtc/libjingle/session/constants.h" #include "webrtc/p2p/base/constants.h" namespace buzz { diff --git a/webrtc/libjingle/session/sessionmanager.cc b/webrtc/libjingle/session/sessionmanager.cc index abe42999a..25948b25a 100644 --- a/webrtc/libjingle/session/sessionmanager.cc +++ b/webrtc/libjingle/session/sessionmanager.cc @@ -16,10 +16,10 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/stringencode.h" #include "webrtc/libjingle/session/p2ptransportparser.h" +#include "webrtc/libjingle/session/sessionmessages.h" #include "webrtc/libjingle/xmpp/constants.h" #include "webrtc/libjingle/xmpp/jid.h" #include "webrtc/p2p/base/constants.h" -#include "webrtc/p2p/base/sessionmessages.h" namespace cricket { diff --git a/webrtc/libjingle/session/sessionmanager.h b/webrtc/libjingle/session/sessionmanager.h index 2ad0d4a88..ec5cd98aa 100644 --- a/webrtc/libjingle/session/sessionmanager.h +++ b/webrtc/libjingle/session/sessionmanager.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_SESSIONMANAGER_H_ -#define WEBRTC_P2P_BASE_SESSIONMANAGER_H_ +#ifndef WEBRTC_LIBJINGLE_SESSION_SESSIONMANAGER_H_ +#define WEBRTC_LIBJINGLE_SESSION_SESSIONMANAGER_H_ #include #include @@ -18,13 +18,13 @@ #include "webrtc/base/sigslot.h" #include "webrtc/base/thread.h" +#include "webrtc/libjingle/session/parsing.h" +#include "webrtc/libjingle/session/sessionclient.h" +#include "webrtc/libjingle/session/sessionmessages.h" #include "webrtc/libjingle/xmllite/xmlelement.h" #include "webrtc/libjingle/xmpp/constants.h" -#include "webrtc/p2p/base/parsing.h" #include "webrtc/p2p/base/portallocator.h" #include "webrtc/p2p/base/session.h" -#include "webrtc/p2p/base/sessionclient.h" -#include "webrtc/p2p/base/sessionmessages.h" #include "webrtc/p2p/base/transportdescriptionfactory.h" namespace buzz { @@ -433,4 +433,4 @@ class SessionManager : public sigslot::has_slots<> { } // namespace cricket -#endif // WEBRTC_P2P_BASE_SESSIONMANAGER_H_ +#endif // WEBRTC_LIBJINGLE_SESSION_SESSIONMANAGER_H_ diff --git a/webrtc/p2p/client/sessionmanagertask.h b/webrtc/libjingle/session/sessionmanagertask.h similarity index 93% rename from webrtc/p2p/client/sessionmanagertask.h rename to webrtc/libjingle/session/sessionmanagertask.h index e5b32b3b9..3d865c0ea 100644 --- a/webrtc/p2p/client/sessionmanagertask.h +++ b/webrtc/libjingle/session/sessionmanagertask.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_CLIENT_SESSIONMANAGERTASK_H_ -#define WEBRTC_P2P_CLIENT_SESSIONMANAGERTASK_H_ +#ifndef WEBRTC_LIBJINGLE_SESSION_SESSIONMANAGERTASK_H_ +#define WEBRTC_LIBJINGLE_SESSION_SESSIONMANAGERTASK_H_ #include "webrtc/libjingle/session/sessionmanager.h" +#include "webrtc/libjingle/session/sessionsendtask.h" #include "webrtc/libjingle/xmpp/xmppengine.h" #include "webrtc/libjingle/xmpp/xmpptask.h" -#include "webrtc/p2p/client/sessionsendtask.h" namespace cricket { diff --git a/webrtc/p2p/base/sessionmessages.cc b/webrtc/libjingle/session/sessionmessages.cc similarity index 99% rename from webrtc/p2p/base/sessionmessages.cc rename to webrtc/libjingle/session/sessionmessages.cc index cc63673f4..acc8afabc 100644 --- a/webrtc/p2p/base/sessionmessages.cc +++ b/webrtc/libjingle/session/sessionmessages.cc @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/p2p/base/sessionmessages.h" +#include "webrtc/libjingle/session/sessionmessages.h" #include #include -#include "webrtc/p2p/base/constants.h" -#include "webrtc/p2p/base/p2ptransport.h" -#include "webrtc/p2p/base/parsing.h" -#include "webrtc/p2p/base/sessionclient.h" -#include "webrtc/p2p/base/sessiondescription.h" -#include "webrtc/p2p/base/transport.h" -#include "webrtc/libjingle/xmllite/xmlconstants.h" -#include "webrtc/libjingle/xmpp/constants.h" #include "webrtc/base/logging.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/stringutils.h" +#include "webrtc/libjingle/session/parsing.h" +#include "webrtc/libjingle/session/sessionclient.h" +#include "webrtc/libjingle/xmllite/xmlconstants.h" +#include "webrtc/libjingle/xmpp/constants.h" +#include "webrtc/p2p/base/constants.h" +#include "webrtc/p2p/base/p2ptransport.h" +#include "webrtc/p2p/base/sessiondescription.h" +#include "webrtc/p2p/base/transport.h" namespace cricket { diff --git a/webrtc/p2p/base/sessionmessages.h b/webrtc/libjingle/session/sessionmessages.h similarity index 97% rename from webrtc/p2p/base/sessionmessages.h rename to webrtc/libjingle/session/sessionmessages.h index 95a5727f9..49c5f5346 100644 --- a/webrtc/p2p/base/sessionmessages.h +++ b/webrtc/libjingle/session/sessionmessages.h @@ -8,22 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_SESSIONMESSAGES_H_ -#define WEBRTC_P2P_BASE_SESSIONMESSAGES_H_ +#ifndef WEBRTC_LIBJINGLE_SESSION_SESSIONMESSAGES_H_ +#define WEBRTC_LIBJINGLE_SESSION_SESSIONMESSAGES_H_ #include #include #include #include "webrtc/base/basictypes.h" +#include "webrtc/libjingle/session/constants.h" +#include "webrtc/libjingle/session/parsing.h" +#include "webrtc/libjingle/session/transportparser.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "webrtc/p2p/base/candidate.h" #include "webrtc/p2p/base/constants.h" -#include "webrtc/p2p/base/parsing.h" #include "webrtc/p2p/base/sessiondescription.h" // Needed to delete contents. #include "webrtc/p2p/base/transport.h" #include "webrtc/p2p/base/transportinfo.h" -#include "webrtc/libjingle/session/transportparser.h" -#include "webrtc/libjingle/xmllite/xmlelement.h" namespace cricket { @@ -215,4 +216,4 @@ bool FindSessionRedirect(const buzz::XmlElement* stanza, SessionRedirect* redirect); } // namespace cricket -#endif // WEBRTC_P2P_BASE_SESSIONMESSAGES_H_ +#endif // WEBRTC_LIBJINGLE_SESSION_SESSIONMESSAGES_H_ diff --git a/webrtc/p2p/client/sessionsendtask.h b/webrtc/libjingle/session/sessionsendtask.h similarity index 97% rename from webrtc/p2p/client/sessionsendtask.h rename to webrtc/libjingle/session/sessionsendtask.h index 77cea08d9..195207c00 100644 --- a/webrtc/p2p/client/sessionsendtask.h +++ b/webrtc/libjingle/session/sessionsendtask.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_CLIENT_SESSIONSENDTASK_H_ -#define WEBRTC_P2P_CLIENT_SESSIONSENDTASK_H_ +#ifndef WEBRTC_LIBJINGLE_SESSION_SESSIONSENDTASK_H_ +#define WEBRTC_LIBJINGLE_SESSION_SESSIONSENDTASK_H_ #include "webrtc/libjingle/session/sessionmanager.h" #include "webrtc/libjingle/xmpp/constants.h" diff --git a/webrtc/libjingle/session/transportparser.cc b/webrtc/libjingle/session/transportparser.cc index 3dda481ea..d438f8e6e 100644 --- a/webrtc/libjingle/session/transportparser.cc +++ b/webrtc/libjingle/session/transportparser.cc @@ -10,7 +10,7 @@ #include "webrtc/libjingle/session/transportparser.h" -#include "webrtc/p2p/base/parsing.h" +#include "webrtc/libjingle/session/parsing.h" #include "webrtc/libjingle/xmllite/xmlelement.h" #include "webrtc/libjingle/xmpp/constants.h" diff --git a/webrtc/libjingle/session/transportparser.h b/webrtc/libjingle/session/transportparser.h index 92c121cf2..7512e7bc6 100644 --- a/webrtc/libjingle/session/transportparser.h +++ b/webrtc/libjingle/session/transportparser.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_P2P_BASE_TRANSPORTPARSER_H_ -#define WEBRTC_P2P_BASE_TRANSPORTPARSER_H_ +#ifndef WEBRTC_LIBJINGLE_SESSION_TRANSPORTPARSER_H_ +#define WEBRTC_LIBJINGLE_SESSION_TRANSPORTPARSER_H_ #include #include @@ -75,4 +75,4 @@ class TransportParser { } // namespace cricket -#endif // WEBRTC_P2P_BASE_TRANSPORTPARSER_H_ +#endif // WEBRTC_LIBJINGLE_SESSION_TRANSPORTPARSER_H_ diff --git a/webrtc/libjingle/session/transportparser_unittest.cc b/webrtc/libjingle/session/transportparser_unittest.cc index 81db39804..1a61102cc 100644 --- a/webrtc/libjingle/session/transportparser_unittest.cc +++ b/webrtc/libjingle/session/transportparser_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/base/gunit.h" #include "webrtc/libjingle/session/p2ptransportparser.h" -#include "webrtc/p2p/base/parsing.h" -#include "webrtc/p2p/base/sessionmessages.h" +#include "webrtc/libjingle/session/parsing.h" +#include "webrtc/libjingle/session/sessionmessages.h" #include "webrtc/libjingle/xmllite/xmlelement.h" #include "webrtc/libjingle/xmpp/constants.h" #include "webrtc/p2p/base/constants.h" diff --git a/webrtc/libjingle/session/tunnel/tunnelsessionclient.h b/webrtc/libjingle/session/tunnel/tunnelsessionclient.h index 63d1c382a..5fa121c15 100644 --- a/webrtc/libjingle/session/tunnel/tunnelsessionclient.h +++ b/webrtc/libjingle/session/tunnel/tunnelsessionclient.h @@ -32,13 +32,13 @@ #include "webrtc/base/criticalsection.h" #include "webrtc/base/stream.h" +#include "webrtc/libjingle/session/sessionclient.h" #include "webrtc/libjingle/session/sessionmanager.h" #include "webrtc/libjingle/xmllite/qname.h" #include "webrtc/libjingle/xmpp/constants.h" #include "webrtc/p2p/base/constants.h" #include "webrtc/p2p/base/pseudotcp.h" #include "webrtc/p2p/base/session.h" -#include "webrtc/p2p/base/sessionclient.h" #include "webrtc/p2p/base/sessiondescription.h" namespace cricket { diff --git a/webrtc/p2p/base/constants.cc b/webrtc/p2p/base/constants.cc index ef7487bb7..614cbc845 100644 --- a/webrtc/p2p/base/constants.cc +++ b/webrtc/p2p/base/constants.cc @@ -12,147 +12,21 @@ #include -#include "webrtc/libjingle/xmllite/qname.h" - namespace cricket { -const char NS_EMPTY[] = ""; -const char NS_JINGLE[] = "urn:xmpp:jingle:1"; -const char NS_JINGLE_DRAFT[] = "google:jingle"; -const char NS_GINGLE[] = "http://www.google.com/session"; - -// actions (aka or ) -const buzz::StaticQName QN_ACTION = { NS_EMPTY, "action" }; -const char LN_INITIATOR[] = "initiator"; -const buzz::StaticQName QN_INITIATOR = { NS_EMPTY, LN_INITIATOR }; -const buzz::StaticQName QN_CREATOR = { NS_EMPTY, "creator" }; - -const buzz::StaticQName QN_JINGLE = { NS_JINGLE, "jingle" }; -const buzz::StaticQName QN_JINGLE_CONTENT = { NS_JINGLE, "content" }; -const buzz::StaticQName QN_JINGLE_CONTENT_NAME = { NS_EMPTY, "name" }; -const buzz::StaticQName QN_JINGLE_CONTENT_MEDIA = { NS_EMPTY, "media" }; -const buzz::StaticQName QN_JINGLE_REASON = { NS_JINGLE, "reason" }; -const buzz::StaticQName QN_JINGLE_DRAFT_GROUP = { NS_JINGLE_DRAFT, "group" }; -const buzz::StaticQName QN_JINGLE_DRAFT_GROUP_TYPE = { NS_EMPTY, "type" }; -const char JINGLE_CONTENT_MEDIA_AUDIO[] = "audio"; -const char JINGLE_CONTENT_MEDIA_VIDEO[] = "video"; -const char JINGLE_CONTENT_MEDIA_DATA[] = "data"; -const char JINGLE_ACTION_SESSION_INITIATE[] = "session-initiate"; -const char JINGLE_ACTION_SESSION_INFO[] = "session-info"; -const char JINGLE_ACTION_SESSION_ACCEPT[] = "session-accept"; -const char JINGLE_ACTION_SESSION_TERMINATE[] = "session-terminate"; -const char JINGLE_ACTION_TRANSPORT_INFO[] = "transport-info"; -const char JINGLE_ACTION_TRANSPORT_ACCEPT[] = "transport-accept"; -const char JINGLE_ACTION_DESCRIPTION_INFO[] = "description-info"; - -const buzz::StaticQName QN_GINGLE_SESSION = { NS_GINGLE, "session" }; -const char GINGLE_ACTION_INITIATE[] = "initiate"; -const char GINGLE_ACTION_INFO[] = "info"; -const char GINGLE_ACTION_ACCEPT[] = "accept"; -const char GINGLE_ACTION_REJECT[] = "reject"; -const char GINGLE_ACTION_TERMINATE[] = "terminate"; -const char GINGLE_ACTION_CANDIDATES[] = "candidates"; -const char GINGLE_ACTION_UPDATE[] = "update"; - -const char LN_ERROR[] = "error"; -const buzz::StaticQName QN_GINGLE_REDIRECT = { NS_GINGLE, "redirect" }; -const char STR_REDIRECT_PREFIX[] = "xmpp:"; - -// Session Contents (aka Gingle -// or Jingle ) -const char LN_DESCRIPTION[] = "description"; -const char LN_PAYLOADTYPE[] = "payload-type"; -const buzz::StaticQName QN_ID = { NS_EMPTY, "id" }; -const buzz::StaticQName QN_SID = { NS_EMPTY, "sid" }; -const buzz::StaticQName QN_NAME = { NS_EMPTY, "name" }; -const buzz::StaticQName QN_CLOCKRATE = { NS_EMPTY, "clockrate" }; -const buzz::StaticQName QN_BITRATE = { NS_EMPTY, "bitrate" }; -const buzz::StaticQName QN_CHANNELS = { NS_EMPTY, "channels" }; -const buzz::StaticQName QN_WIDTH = { NS_EMPTY, "width" }; -const buzz::StaticQName QN_HEIGHT = { NS_EMPTY, "height" }; -const buzz::StaticQName QN_FRAMERATE = { NS_EMPTY, "framerate" }; -const char LN_NAME[] = "name"; -const char LN_VALUE[] = "value"; -const buzz::StaticQName QN_PAYLOADTYPE_PARAMETER_NAME = { NS_EMPTY, LN_NAME }; -const buzz::StaticQName QN_PAYLOADTYPE_PARAMETER_VALUE = { NS_EMPTY, LN_VALUE }; -const char PAYLOADTYPE_PARAMETER_BITRATE[] = "bitrate"; -const char PAYLOADTYPE_PARAMETER_HEIGHT[] = "height"; -const char PAYLOADTYPE_PARAMETER_WIDTH[] = "width"; -const char PAYLOADTYPE_PARAMETER_FRAMERATE[] = "framerate"; -const char LN_BANDWIDTH[] = "bandwidth"; - const char CN_AUDIO[] = "audio"; const char CN_VIDEO[] = "video"; const char CN_DATA[] = "data"; const char CN_OTHER[] = "main"; -// other SDP related strings + const char GROUP_TYPE_BUNDLE[] = "BUNDLE"; -const char NS_JINGLE_RTP[] = "urn:xmpp:jingle:apps:rtp:1"; -const buzz::StaticQName QN_JINGLE_RTP_CONTENT = - { NS_JINGLE_RTP, LN_DESCRIPTION }; -const buzz::StaticQName QN_SSRC = { NS_EMPTY, "ssrc" }; -const buzz::StaticQName QN_JINGLE_RTP_PAYLOADTYPE = - { NS_JINGLE_RTP, LN_PAYLOADTYPE }; -const buzz::StaticQName QN_JINGLE_RTP_BANDWIDTH = - { NS_JINGLE_RTP, LN_BANDWIDTH }; -const buzz::StaticQName QN_JINGLE_RTCP_MUX = { NS_JINGLE_RTP, "rtcp-mux" }; -const buzz::StaticQName QN_JINGLE_RTCP_FB = { NS_JINGLE_RTP, "rtcp-fb" }; -const buzz::StaticQName QN_SUBTYPE = { NS_EMPTY, "subtype" }; -const buzz::StaticQName QN_PARAMETER = { NS_JINGLE_RTP, "parameter" }; -const buzz::StaticQName QN_JINGLE_RTP_HDREXT = - { NS_JINGLE_RTP, "rtp-hdrext" }; -const buzz::StaticQName QN_URI = { NS_EMPTY, "uri" }; +const char NS_JINGLE_ICE_UDP[] = "urn:xmpp:jingle:transports:ice-udp:1"; +const char NS_GINGLE_P2P[] = "http://www.google.com/transport/p2p"; +const char NS_GINGLE_RAW[] = "http://www.google.com/transport/raw-udp"; -const char NS_JINGLE_DRAFT_SCTP[] = "google:jingle:sctp"; -const buzz::StaticQName QN_JINGLE_DRAFT_SCTP_CONTENT = - { NS_JINGLE_DRAFT_SCTP, LN_DESCRIPTION }; -const buzz::StaticQName QN_JINGLE_DRAFT_SCTP_STREAM = - { NS_JINGLE_DRAFT_SCTP, "stream" }; +const char ICE_OPTION_GICE[] = "google-ice"; -const char NS_GINGLE_AUDIO[] = "http://www.google.com/session/phone"; -const buzz::StaticQName QN_GINGLE_AUDIO_CONTENT = - { NS_GINGLE_AUDIO, LN_DESCRIPTION }; -const buzz::StaticQName QN_GINGLE_AUDIO_PAYLOADTYPE = - { NS_GINGLE_AUDIO, LN_PAYLOADTYPE }; -const buzz::StaticQName QN_GINGLE_AUDIO_SRCID = { NS_GINGLE_AUDIO, "src-id" }; -const char NS_GINGLE_VIDEO[] = "http://www.google.com/session/video"; -const buzz::StaticQName QN_GINGLE_VIDEO_CONTENT = - { NS_GINGLE_VIDEO, LN_DESCRIPTION }; -const buzz::StaticQName QN_GINGLE_VIDEO_PAYLOADTYPE = - { NS_GINGLE_VIDEO, LN_PAYLOADTYPE }; -const buzz::StaticQName QN_GINGLE_VIDEO_SRCID = { NS_GINGLE_VIDEO, "src-id" }; -const buzz::StaticQName QN_GINGLE_VIDEO_BANDWIDTH = - { NS_GINGLE_VIDEO, LN_BANDWIDTH }; - -// Crypto support. -const buzz::StaticQName QN_ENCRYPTION = { NS_JINGLE_RTP, "encryption" }; -const buzz::StaticQName QN_ENCRYPTION_REQUIRED = { NS_EMPTY, "required" }; -const buzz::StaticQName QN_CRYPTO = { NS_JINGLE_RTP, "crypto" }; -const buzz::StaticQName QN_GINGLE_AUDIO_CRYPTO_USAGE = - { NS_GINGLE_AUDIO, "usage" }; -const buzz::StaticQName QN_GINGLE_VIDEO_CRYPTO_USAGE = - { NS_GINGLE_VIDEO, "usage" }; -const buzz::StaticQName QN_CRYPTO_SUITE = { NS_EMPTY, "crypto-suite" }; -const buzz::StaticQName QN_CRYPTO_KEY_PARAMS = { NS_EMPTY, "key-params" }; -const buzz::StaticQName QN_CRYPTO_TAG = { NS_EMPTY, "tag" }; -const buzz::StaticQName QN_CRYPTO_SESSION_PARAMS = - { NS_EMPTY, "session-params" }; - -// Transports and candidates. -const char LN_TRANSPORT[] = "transport"; -const char LN_CANDIDATE[] = "candidate"; -const buzz::StaticQName QN_UFRAG = { cricket::NS_EMPTY, "ufrag" }; -const buzz::StaticQName QN_PWD = { cricket::NS_EMPTY, "pwd" }; -const buzz::StaticQName QN_COMPONENT = { cricket::NS_EMPTY, "component" }; -const buzz::StaticQName QN_IP = { cricket::NS_EMPTY, "ip" }; -const buzz::StaticQName QN_PORT = { cricket::NS_EMPTY, "port" }; -const buzz::StaticQName QN_NETWORK = { cricket::NS_EMPTY, "network" }; -const buzz::StaticQName QN_GENERATION = { cricket::NS_EMPTY, "generation" }; -const buzz::StaticQName QN_PRIORITY = { cricket::NS_EMPTY, "priority" }; -const buzz::StaticQName QN_PROTOCOL = { cricket::NS_EMPTY, "protocol" }; -const char ICE_CANDIDATE_TYPE_PEER_STUN[] = "prflx"; -const char ICE_CANDIDATE_TYPE_SERVER_STUN[] = "srflx"; // Minimum ufrag length is 4 characters as per RFC5245. We chose 16 because // some internal systems expect username to be 16 bytes. const int ICE_UFRAG_LENGTH = 16; @@ -164,32 +38,16 @@ const size_t ICE_PWD_MIN_LENGTH = 22; const size_t ICE_UFRAG_MAX_LENGTH = 255; const size_t ICE_PWD_MAX_LENGTH = 256; const size_t GICE_UFRAG_MAX_LENGTH = 16; + // TODO: This is media-specific, so might belong // somewhere like media/base/constants.h const int ICE_CANDIDATE_COMPONENT_RTP = 1; const int ICE_CANDIDATE_COMPONENT_RTCP = 2; const int ICE_CANDIDATE_COMPONENT_DEFAULT = 1; -const buzz::StaticQName QN_FINGERPRINT = { cricket::NS_EMPTY, "fingerprint" }; -const buzz::StaticQName QN_FINGERPRINT_ALGORITHM = - { cricket::NS_EMPTY, "algorithm" }; -const buzz::StaticQName QN_FINGERPRINT_DIGEST = { cricket::NS_EMPTY, "digest" }; +const char NS_JINGLE_RTP[] = "urn:xmpp:jingle:apps:rtp:1"; +const char NS_JINGLE_DRAFT_SCTP[] = "google:jingle:sctp"; -const char NS_JINGLE_ICE_UDP[] = "urn:xmpp:jingle:transports:ice-udp:1"; - -const char ICE_OPTION_GICE[] = "google-ice"; -const char NS_GINGLE_P2P[] = "http://www.google.com/transport/p2p"; -const buzz::StaticQName QN_GINGLE_P2P_TRANSPORT = - { NS_GINGLE_P2P, LN_TRANSPORT }; -const buzz::StaticQName QN_GINGLE_P2P_CANDIDATE = - { NS_GINGLE_P2P, LN_CANDIDATE }; -const buzz::StaticQName QN_GINGLE_P2P_UNKNOWN_CHANNEL_NAME = - { NS_GINGLE_P2P, "unknown-channel-name" }; -const buzz::StaticQName QN_GINGLE_CANDIDATE = { NS_GINGLE, LN_CANDIDATE }; -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_CHANNEL_NAME_RTP[] = "rtp"; const char GICE_CHANNEL_NAME_RTCP[] = "rtcp"; const char GICE_CHANNEL_NAME_VIDEO_RTP[] = "video_rtp"; @@ -197,57 +55,6 @@ const char GICE_CHANNEL_NAME_VIDEO_RTCP[] = "video_rtcp"; const char GICE_CHANNEL_NAME_DATA_RTP[] = "data_rtp"; const char GICE_CHANNEL_NAME_DATA_RTCP[] = "data_rtcp"; -// terminate reasons and errors -const char JINGLE_ERROR_BAD_REQUEST[] = "bad-request"; -const char JINGLE_ERROR_OUT_OF_ORDER[] = "out-of-order"; -const char JINGLE_ERROR_UNKNOWN_SESSION[] = "unknown-session"; - -// Call terminate reasons from XEP-166 -const char STR_TERMINATE_DECLINE[] = "decline"; -const char STR_TERMINATE_SUCCESS[] = "success"; -const char STR_TERMINATE_ERROR[] = "general-error"; -const char STR_TERMINATE_INCOMPATIBLE_PARAMETERS[] = "incompatible-parameters"; - -// Old terminate reasons used by cricket -const char STR_TERMINATE_CALL_ENDED[] = "call-ended"; -const char STR_TERMINATE_RECIPIENT_UNAVAILABLE[] = "recipient-unavailable"; -const char STR_TERMINATE_RECIPIENT_BUSY[] = "recipient-busy"; -const char STR_TERMINATE_INSUFFICIENT_FUNDS[] = "insufficient-funds"; -const char STR_TERMINATE_NUMBER_MALFORMED[] = "number-malformed"; -const char STR_TERMINATE_NUMBER_DISALLOWED[] = "number-disallowed"; -const char STR_TERMINATE_PROTOCOL_ERROR[] = "protocol-error"; -const char STR_TERMINATE_INTERNAL_SERVER_ERROR[] = "internal-server-error"; -const char STR_TERMINATE_UNKNOWN_ERROR[] = "unknown-error"; - -// Draft view and notify messages. -const char STR_JINGLE_DRAFT_CONTENT_NAME_VIDEO[] = "video"; -const char STR_JINGLE_DRAFT_CONTENT_NAME_AUDIO[] = "audio"; -const buzz::StaticQName QN_NICK = { cricket::NS_EMPTY, "nick" }; -const buzz::StaticQName QN_TYPE = { cricket::NS_EMPTY, "type" }; -const buzz::StaticQName QN_JINGLE_DRAFT_VIEW = { NS_JINGLE_DRAFT, "view" }; -const char STR_JINGLE_DRAFT_VIEW_TYPE_NONE[] = "none"; -const char STR_JINGLE_DRAFT_VIEW_TYPE_STATIC[] = "static"; -const buzz::StaticQName QN_JINGLE_DRAFT_PARAMS = { NS_JINGLE_DRAFT, "params" }; -const buzz::StaticQName QN_JINGLE_DRAFT_STREAMS = { NS_JINGLE_DRAFT, "streams" }; -const buzz::StaticQName QN_JINGLE_DRAFT_STREAM = { NS_JINGLE_DRAFT, "stream" }; -const buzz::StaticQName QN_DISPLAY = { cricket::NS_EMPTY, "display" }; -const buzz::StaticQName QN_CNAME = { cricket::NS_EMPTY, "cname" }; -const buzz::StaticQName QN_JINGLE_DRAFT_SSRC = { NS_JINGLE_DRAFT, "ssrc" }; -const buzz::StaticQName QN_JINGLE_DRAFT_SSRC_GROUP = - { NS_JINGLE_DRAFT, "ssrc-group" }; -const buzz::StaticQName QN_SEMANTICS = { cricket::NS_EMPTY, "semantics" }; -const buzz::StaticQName QN_JINGLE_LEGACY_NOTIFY = { NS_JINGLE_DRAFT, "notify" }; -const buzz::StaticQName QN_JINGLE_LEGACY_SOURCE = { NS_JINGLE_DRAFT, "source" }; - -const char NS_GINGLE_RAW[] = "http://www.google.com/transport/raw-udp"; -const buzz::StaticQName QN_GINGLE_RAW_TRANSPORT = { NS_GINGLE_RAW, "transport" }; -const buzz::StaticQName QN_GINGLE_RAW_CHANNEL = { NS_GINGLE_RAW, "channel" }; - -// old stuff -#ifdef FEATURE_ENABLE_VOICEMAIL -const char NS_VOICEMAIL[] = "http://www.google.com/session/voicemail"; -const buzz::StaticQName QN_VOICEMAIL_REGARDING = { NS_VOICEMAIL, "regarding" }; -#endif // From RFC 4145, SDP setup attribute values. const char CONNECTIONROLE_ACTIVE_STR[] = "active"; diff --git a/webrtc/p2p/base/constants.h b/webrtc/p2p/base/constants.h index edfe07c30..90a781623 100644 --- a/webrtc/p2p/base/constants.h +++ b/webrtc/p2p/base/constants.h @@ -12,88 +12,9 @@ #define WEBRTC_P2P_BASE_CONSTANTS_H_ #include -#include "webrtc/libjingle/xmllite/qname.h" - -// This file contains constants related to signaling that are used in various -// classes in this directory. namespace cricket { -// NS_ == namespace -// QN_ == buzz::QName (namespace + name) -// LN_ == "local name" == QName::LocalPart() -// these are useful when you need to find a tag -// that has different namespaces (like or ) - -extern const char NS_EMPTY[]; -extern const char NS_JINGLE[]; -extern const char NS_JINGLE_DRAFT[]; -extern const char NS_GINGLE[]; - -enum SignalingProtocol { - PROTOCOL_JINGLE, - PROTOCOL_GINGLE, - PROTOCOL_HYBRID, -}; - -// actions (aka Gingle or Jingle ) -extern const buzz::StaticQName QN_ACTION; -extern const char LN_INITIATOR[]; -extern const buzz::StaticQName QN_INITIATOR; -extern const buzz::StaticQName QN_CREATOR; - -extern const buzz::StaticQName QN_JINGLE; -extern const buzz::StaticQName QN_JINGLE_CONTENT; -extern const buzz::StaticQName QN_JINGLE_CONTENT_NAME; -extern const buzz::StaticQName QN_JINGLE_CONTENT_MEDIA; -extern const buzz::StaticQName QN_JINGLE_REASON; -extern const buzz::StaticQName QN_JINGLE_DRAFT_GROUP; -extern const buzz::StaticQName QN_JINGLE_DRAFT_GROUP_TYPE; -extern const char JINGLE_CONTENT_MEDIA_AUDIO[]; -extern const char JINGLE_CONTENT_MEDIA_VIDEO[]; -extern const char JINGLE_CONTENT_MEDIA_DATA[]; -extern const char JINGLE_ACTION_SESSION_INITIATE[]; -extern const char JINGLE_ACTION_SESSION_INFO[]; -extern const char JINGLE_ACTION_SESSION_ACCEPT[]; -extern const char JINGLE_ACTION_SESSION_TERMINATE[]; -extern const char JINGLE_ACTION_TRANSPORT_INFO[]; -extern const char JINGLE_ACTION_TRANSPORT_ACCEPT[]; -extern const char JINGLE_ACTION_DESCRIPTION_INFO[]; - -extern const buzz::StaticQName QN_GINGLE_SESSION; -extern const char GINGLE_ACTION_INITIATE[]; -extern const char GINGLE_ACTION_INFO[]; -extern const char GINGLE_ACTION_ACCEPT[]; -extern const char GINGLE_ACTION_REJECT[]; -extern const char GINGLE_ACTION_TERMINATE[]; -extern const char GINGLE_ACTION_CANDIDATES[]; -extern const char GINGLE_ACTION_UPDATE[]; - -extern const char LN_ERROR[]; -extern const buzz::StaticQName QN_GINGLE_REDIRECT; -extern const char STR_REDIRECT_PREFIX[]; - -// Session Contents (aka Gingle -// or Jingle ) -extern const char LN_DESCRIPTION[]; -extern const char LN_PAYLOADTYPE[]; -extern const buzz::StaticQName QN_ID; -extern const buzz::StaticQName QN_SID; -extern const buzz::StaticQName QN_NAME; -extern const buzz::StaticQName QN_CLOCKRATE; -extern const buzz::StaticQName QN_BITRATE; -extern const buzz::StaticQName QN_CHANNELS; -extern const buzz::StaticQName QN_PARAMETER; -extern const char LN_NAME[]; -extern const char LN_VALUE[]; -extern const buzz::StaticQName QN_PAYLOADTYPE_PARAMETER_NAME; -extern const buzz::StaticQName QN_PAYLOADTYPE_PARAMETER_VALUE; -extern const char PAYLOADTYPE_PARAMETER_BITRATE[]; -extern const char PAYLOADTYPE_PARAMETER_HEIGHT[]; -extern const char PAYLOADTYPE_PARAMETER_WIDTH[]; -extern const char PAYLOADTYPE_PARAMETER_FRAMERATE[]; -extern const char LN_BANDWIDTH[]; - // CN_ == "content name". When we initiate a session, we choose the // name, and when we receive a Gingle session, we provide default // names (since Gingle has no content names). But when we receive a @@ -103,62 +24,16 @@ extern const char CN_AUDIO[]; extern const char CN_VIDEO[]; extern const char CN_DATA[]; extern const char CN_OTHER[]; -// other SDP related strings + // GN stands for group name extern const char GROUP_TYPE_BUNDLE[]; -extern const char NS_JINGLE_RTP[]; -extern const buzz::StaticQName QN_JINGLE_RTP_CONTENT; -extern const buzz::StaticQName QN_SSRC; -extern const buzz::StaticQName QN_JINGLE_RTP_PAYLOADTYPE; -extern const buzz::StaticQName QN_JINGLE_RTP_BANDWIDTH; -extern const buzz::StaticQName QN_JINGLE_RTCP_MUX; -extern const buzz::StaticQName QN_JINGLE_RTCP_FB; -extern const buzz::StaticQName QN_SUBTYPE; -extern const buzz::StaticQName QN_JINGLE_RTP_HDREXT; -extern const buzz::StaticQName QN_URI; +extern const char NS_JINGLE_ICE_UDP[]; +extern const char NS_GINGLE_P2P[]; +extern const char NS_GINGLE_RAW[]; -extern const char NS_JINGLE_DRAFT_SCTP[]; -extern const buzz::StaticQName QN_JINGLE_DRAFT_SCTP_CONTENT; -extern const buzz::StaticQName QN_JINGLE_DRAFT_SCTP_STREAM; +extern const char ICE_OPTION_GICE[]; -extern const char NS_GINGLE_AUDIO[]; -extern const buzz::StaticQName QN_GINGLE_AUDIO_CONTENT; -extern const buzz::StaticQName QN_GINGLE_AUDIO_PAYLOADTYPE; -extern const buzz::StaticQName QN_GINGLE_AUDIO_SRCID; -extern const char NS_GINGLE_VIDEO[]; -extern const buzz::StaticQName QN_GINGLE_VIDEO_CONTENT; -extern const buzz::StaticQName QN_GINGLE_VIDEO_PAYLOADTYPE; -extern const buzz::StaticQName QN_GINGLE_VIDEO_SRCID; -extern const buzz::StaticQName QN_GINGLE_VIDEO_BANDWIDTH; - -// Crypto support. -extern const buzz::StaticQName QN_ENCRYPTION; -extern const buzz::StaticQName QN_ENCRYPTION_REQUIRED; -extern const buzz::StaticQName QN_CRYPTO; -extern const buzz::StaticQName QN_GINGLE_AUDIO_CRYPTO_USAGE; -extern const buzz::StaticQName QN_GINGLE_VIDEO_CRYPTO_USAGE; -extern const buzz::StaticQName QN_CRYPTO_SUITE; -extern const buzz::StaticQName QN_CRYPTO_KEY_PARAMS; -extern const buzz::StaticQName QN_CRYPTO_TAG; -extern const buzz::StaticQName QN_CRYPTO_SESSION_PARAMS; - -// Transports and candidates. -extern const char LN_TRANSPORT[]; -extern const char LN_CANDIDATE[]; -extern const buzz::StaticQName QN_JINGLE_P2P_TRANSPORT; -extern const buzz::StaticQName QN_JINGLE_P2P_CANDIDATE; -extern const buzz::StaticQName QN_UFRAG; -extern const buzz::StaticQName QN_COMPONENT; -extern const buzz::StaticQName QN_PWD; -extern const buzz::StaticQName QN_IP; -extern const buzz::StaticQName QN_PORT; -extern const buzz::StaticQName QN_NETWORK; -extern const buzz::StaticQName QN_GENERATION; -extern const buzz::StaticQName QN_PRIORITY; -extern const buzz::StaticQName QN_PROTOCOL; -extern const char ICE_CANDIDATE_TYPE_PEER_STUN[]; -extern const char ICE_CANDIDATE_TYPE_SERVER_STUN[]; extern const int ICE_UFRAG_LENGTH; extern const int ICE_PWD_LENGTH; extern const size_t ICE_UFRAG_MIN_LENGTH; @@ -166,27 +41,14 @@ extern const size_t ICE_PWD_MIN_LENGTH; extern const size_t ICE_UFRAG_MAX_LENGTH; extern const size_t ICE_PWD_MAX_LENGTH; extern const size_t GICE_UFRAG_MAX_LENGTH; + extern const int ICE_CANDIDATE_COMPONENT_RTP; extern const int ICE_CANDIDATE_COMPONENT_RTCP; extern const int ICE_CANDIDATE_COMPONENT_DEFAULT; -extern const buzz::StaticQName QN_FINGERPRINT; -extern const buzz::StaticQName QN_FINGERPRINT_ALGORITHM; -extern const buzz::StaticQName QN_FINGERPRINT_DIGEST; +extern const char NS_JINGLE_RTP[]; +extern const char NS_JINGLE_DRAFT_SCTP[]; -extern const char NS_JINGLE_ICE_UDP[]; - -extern const char ICE_OPTION_GICE[]; -extern const char NS_GINGLE_P2P[]; -extern const buzz::StaticQName QN_GINGLE_P2P_TRANSPORT; -extern const buzz::StaticQName QN_GINGLE_P2P_CANDIDATE; -extern const buzz::StaticQName QN_GINGLE_P2P_UNKNOWN_CHANNEL_NAME; -extern const buzz::StaticQName QN_GINGLE_CANDIDATE; -extern const buzz::StaticQName QN_ADDRESS; -extern const buzz::StaticQName QN_USERNAME; -extern const buzz::StaticQName QN_PASSWORD; -extern const buzz::StaticQName QN_PREFERENCE; -extern const char GINGLE_CANDIDATE_TYPE_STUN[]; extern const char GICE_CHANNEL_NAME_RTP[]; extern const char GICE_CHANNEL_NAME_RTCP[]; extern const char GICE_CHANNEL_NAME_VIDEO_RTP[]; @@ -194,61 +56,6 @@ extern const char GICE_CHANNEL_NAME_VIDEO_RTCP[]; extern const char GICE_CHANNEL_NAME_DATA_RTP[]; extern const char GICE_CHANNEL_NAME_DATA_RTCP[]; -extern const char NS_GINGLE_RAW[]; -extern const buzz::StaticQName QN_GINGLE_RAW_TRANSPORT; -extern const buzz::StaticQName QN_GINGLE_RAW_CHANNEL; - -// terminate reasons and errors: see http://xmpp.org/extensions/xep-0166.html -extern const char JINGLE_ERROR_BAD_REQUEST[]; // like parse error -// got transport-info before session-initiate, for example -extern const char JINGLE_ERROR_OUT_OF_ORDER[]; -extern const char JINGLE_ERROR_UNKNOWN_SESSION[]; - -// Call terminate reasons from XEP-166 -extern const char STR_TERMINATE_DECLINE[]; // polite reject -extern const char STR_TERMINATE_SUCCESS[]; // polite hangup -extern const char STR_TERMINATE_ERROR[]; // something bad happened -extern const char STR_TERMINATE_INCOMPATIBLE_PARAMETERS[]; // no codecs? - -// Old terminate reasons used by cricket -extern const char STR_TERMINATE_CALL_ENDED[]; -extern const char STR_TERMINATE_RECIPIENT_UNAVAILABLE[]; -extern const char STR_TERMINATE_RECIPIENT_BUSY[]; -extern const char STR_TERMINATE_INSUFFICIENT_FUNDS[]; -extern const char STR_TERMINATE_NUMBER_MALFORMED[]; -extern const char STR_TERMINATE_NUMBER_DISALLOWED[]; -extern const char STR_TERMINATE_PROTOCOL_ERROR[]; -extern const char STR_TERMINATE_INTERNAL_SERVER_ERROR[]; -extern const char STR_TERMINATE_UNKNOWN_ERROR[]; - -// Draft view and notify messages. -extern const char STR_JINGLE_DRAFT_CONTENT_NAME_VIDEO[]; -extern const char STR_JINGLE_DRAFT_CONTENT_NAME_AUDIO[]; -extern const buzz::StaticQName QN_NICK; -extern const buzz::StaticQName QN_TYPE; -extern const buzz::StaticQName QN_JINGLE_DRAFT_VIEW; -extern const char STR_JINGLE_DRAFT_VIEW_TYPE_NONE[]; -extern const char STR_JINGLE_DRAFT_VIEW_TYPE_STATIC[]; -extern const buzz::StaticQName QN_JINGLE_DRAFT_PARAMS; -extern const buzz::StaticQName QN_WIDTH; -extern const buzz::StaticQName QN_HEIGHT; -extern const buzz::StaticQName QN_FRAMERATE; -extern const buzz::StaticQName QN_JINGLE_DRAFT_STREAM; -extern const buzz::StaticQName QN_JINGLE_DRAFT_STREAMS; -extern const buzz::StaticQName QN_DISPLAY; -extern const buzz::StaticQName QN_CNAME; -extern const buzz::StaticQName QN_JINGLE_DRAFT_SSRC; -extern const buzz::StaticQName QN_JINGLE_DRAFT_SSRC_GROUP; -extern const buzz::StaticQName QN_SEMANTICS; -extern const buzz::StaticQName QN_JINGLE_LEGACY_NOTIFY; -extern const buzz::StaticQName QN_JINGLE_LEGACY_SOURCE; - -// old stuff -#ifdef FEATURE_ENABLE_VOICEMAIL -extern const char NS_VOICEMAIL[]; -extern const buzz::StaticQName QN_VOICEMAIL_REGARDING; -#endif - // RFC 4145, SDP setup attribute values. extern const char CONNECTIONROLE_ACTIVE_STR[]; extern const char CONNECTIONROLE_PASSIVE_STR[]; diff --git a/webrtc/p2p/base/p2ptransport.cc b/webrtc/p2p/base/p2ptransport.cc index c4cea5fb1..89586f9f3 100644 --- a/webrtc/p2p/base/p2ptransport.cc +++ b/webrtc/p2p/base/p2ptransport.cc @@ -12,14 +12,11 @@ #include -#include "webrtc/p2p/base/p2ptransportchannel.h" -#include "webrtc/libjingle/xmllite/qname.h" -#include "webrtc/libjingle/xmllite/xmlelement.h" -#include "webrtc/libjingle/xmpp/constants.h" #include "webrtc/base/base64.h" #include "webrtc/base/common.h" #include "webrtc/base/stringencode.h" #include "webrtc/base/stringutils.h" +#include "webrtc/p2p/base/p2ptransportchannel.h" namespace cricket { diff --git a/webrtc/p2p/base/sessiondescription.cc b/webrtc/p2p/base/sessiondescription.cc index b05dc5108..5320b0596 100644 --- a/webrtc/p2p/base/sessiondescription.cc +++ b/webrtc/p2p/base/sessiondescription.cc @@ -10,8 +10,6 @@ #include "webrtc/p2p/base/sessiondescription.h" -#include "webrtc/libjingle/xmllite/xmlelement.h" - namespace cricket { ContentInfo* FindContentInfoByName( diff --git a/webrtc/p2p/base/sessionmanager.cc b/webrtc/p2p/base/sessionmanager.cc deleted file mode 100644 index a7cf322eb..000000000 --- a/webrtc/p2p/base/sessionmanager.cc +++ /dev/null @@ -1 +0,0 @@ -// TODO(pthatcher): Delete this file once Chromium no longer trys to build it. diff --git a/webrtc/p2p/base/sessionmanager.h b/webrtc/p2p/base/sessionmanager.h deleted file mode 100644 index a7cf322eb..000000000 --- a/webrtc/p2p/base/sessionmanager.h +++ /dev/null @@ -1 +0,0 @@ -// TODO(pthatcher): Delete this file once Chromium no longer trys to build it. diff --git a/webrtc/p2p/client/autoportallocator.h b/webrtc/p2p/client/autoportallocator.h index 5df1f0d6c..7856510e1 100644 --- a/webrtc/p2p/client/autoportallocator.h +++ b/webrtc/p2p/client/autoportallocator.h @@ -15,8 +15,6 @@ #include #include "webrtc/p2p/client/httpportallocator.h" -#include "webrtc/libjingle/xmpp/jingleinfotask.h" -#include "webrtc/libjingle/xmpp/xmppclient.h" #include "webrtc/base/sigslot.h" // This class sets the relay and stun servers using XmppClient. diff --git a/webrtc/p2p/p2p.gyp b/webrtc/p2p/p2p.gyp index eaae62529..4de6b216c 100644 --- a/webrtc/p2p/p2p.gyp +++ b/webrtc/p2p/p2p.gyp @@ -14,15 +14,10 @@ 'type': 'static_library', 'dependencies': [ '<(webrtc_root)/base/base.gyp:webrtc_base', - '<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp', - '<(DEPTH)/third_party/expat/expat.gyp:expat', ], 'cflags_cc!': [ '-Wnon-virtual-dtor', ], - 'export_dependent_settings': [ - '<(DEPTH)/third_party/expat/expat.gyp:expat', - ], 'sources': [ 'base/asyncstuntcpsocket.cc', 'base/asyncstuntcpsocket.h', @@ -39,8 +34,6 @@ 'base/p2ptransportchannel.cc', 'base/p2ptransportchannel.h', 'base/packetsocketfactory.h', - 'base/parsing.cc', - 'base/parsing.h', 'base/port.cc', 'base/port.h', 'base/portallocator.cc', @@ -62,12 +55,9 @@ 'base/relayserver.h', 'base/session.cc', 'base/session.h', - 'base/sessionclient.h', 'base/sessiondescription.cc', 'base/sessiondescription.h', 'base/sessionid.h', - 'base/sessionmessages.cc', - 'base/sessionmessages.h', 'base/stun.cc', 'base/stun.h', 'base/stunport.cc', @@ -102,8 +92,6 @@ 'client/connectivitychecker.h', 'client/httpportallocator.cc', 'client/httpportallocator.h', - 'client/sessionmanagertask.h', - 'client/sessionsendtask.h', 'client/socketmonitor.cc', 'client/socketmonitor.h', ],