102b2270c7
I made several updates to the Windows version as well so that both implementations share a big portion of the code. The underlying PeerConnection notifications have changed a bit since the last update so that there's still a known issue that I plan to fix in my next change: // TODO(tommi): There's a problem now with terminating connections: // When ending a conversation, both peers now send a signaling message // that indicates that their ports are closed (port=0). The trouble this // causes us here is that we can interpret such a message as an invite // to a new conversation. So, currently there is a bug that ending // a conversation can immediately start a new one. // To fix this I plan to change how conversations start and have a special // notification message via the server that prepares a client for a // conversation instead of automatically recognizing the first signaling // message as an invite. Review URL: http://webrtc-codereview.appspot.com/112008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@446 4adac7df-926f-26a2-2b94-8c16560cd09d
110 lines
3.4 KiB
C++
110 lines
3.4 KiB
C++
/*
|
|
* Copyright (c) 2011 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 PEERCONNECTION_SAMPLES_CLIENT_PEER_CONNECTION_CLIENT_H_
|
|
#define PEERCONNECTION_SAMPLES_CLIENT_PEER_CONNECTION_CLIENT_H_
|
|
#pragma once
|
|
|
|
#include <map>
|
|
#include <string>
|
|
|
|
#include "talk/base/sigslot.h"
|
|
#include "talk/base/physicalsocketserver.h"
|
|
#include "talk/base/scoped_ptr.h"
|
|
|
|
typedef std::map<int, std::string> Peers;
|
|
|
|
struct PeerConnectionClientObserver {
|
|
virtual void OnSignedIn() = 0; // Called when we're logged on.
|
|
virtual void OnDisconnected() = 0;
|
|
virtual void OnPeerConnected(int id, const std::string& name) = 0;
|
|
virtual void OnPeerDisconnected(int peer_id) = 0;
|
|
virtual void OnMessageFromPeer(int peer_id, const std::string& message) = 0;
|
|
virtual void OnMessageSent(int err) = 0;
|
|
|
|
protected:
|
|
virtual ~PeerConnectionClientObserver() {}
|
|
};
|
|
|
|
class PeerConnectionClient : public sigslot::has_slots<> {
|
|
public:
|
|
enum State {
|
|
NOT_CONNECTED,
|
|
SIGNING_IN,
|
|
CONNECTED,
|
|
SIGNING_OUT_WAITING,
|
|
SIGNING_OUT,
|
|
};
|
|
|
|
PeerConnectionClient();
|
|
~PeerConnectionClient();
|
|
|
|
int id() const;
|
|
bool is_connected() const;
|
|
const Peers& peers() const;
|
|
|
|
void RegisterObserver(PeerConnectionClientObserver* callback);
|
|
|
|
bool Connect(const std::string& server, int port,
|
|
const std::string& client_name);
|
|
|
|
bool SendToPeer(int peer_id, const std::string& message);
|
|
bool SendHangUp(int peer_id);
|
|
bool IsSendingMessage();
|
|
|
|
bool SignOut();
|
|
|
|
protected:
|
|
void Close();
|
|
bool ConnectControlSocket();
|
|
void OnConnect(talk_base::AsyncSocket* socket);
|
|
void OnHangingGetConnect(talk_base::AsyncSocket* socket);
|
|
void OnMessageFromPeer(int peer_id, const std::string& message);
|
|
|
|
// Quick and dirty support for parsing HTTP header values.
|
|
bool GetHeaderValue(const std::string& data, size_t eoh,
|
|
const char* header_pattern, size_t* value);
|
|
|
|
bool GetHeaderValue(const std::string& data, size_t eoh,
|
|
const char* header_pattern, std::string* value);
|
|
|
|
// Returns true if the whole response has been read.
|
|
bool ReadIntoBuffer(talk_base::AsyncSocket* socket, std::string* data,
|
|
size_t* content_length);
|
|
|
|
void OnRead(talk_base::AsyncSocket* socket);
|
|
|
|
void OnHangingGetRead(talk_base::AsyncSocket* socket);
|
|
|
|
// Parses a single line entry in the form "<name>,<id>,<connected>"
|
|
bool ParseEntry(const std::string& entry, std::string* name, int* id,
|
|
bool* connected);
|
|
|
|
int GetResponseStatus(const std::string& response);
|
|
|
|
bool ParseServerResponse(const std::string& response, size_t content_length,
|
|
size_t* peer_id, size_t* eoh);
|
|
|
|
void OnClose(talk_base::AsyncSocket* socket, int err);
|
|
|
|
PeerConnectionClientObserver* callback_;
|
|
talk_base::SocketAddress server_address_;
|
|
talk_base::scoped_ptr<talk_base::AsyncSocket> control_socket_;
|
|
talk_base::scoped_ptr<talk_base::AsyncSocket> hanging_get_;
|
|
std::string onconnect_data_;
|
|
std::string control_data_;
|
|
std::string notification_data_;
|
|
Peers peers_;
|
|
State state_;
|
|
int my_id_;
|
|
};
|
|
|
|
#endif // PEERCONNECTION_SAMPLES_CLIENT_PEER_CONNECTION_CLIENT_H_
|