generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch use of wsprintfW out for the libjingle equivalent.

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/55001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@135 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tommi@google.com 2011-06-30 07:30:13 +00:00
parent 20cb6b684b
commit b2e56b9816
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
peerconnection/samples/client/peer_connection_client.cc
View File

@ -12,6 +12,9 @@
#include "peerconnection/samples/client/defaults.h" #include "peerconnection/samples/client/defaults.h"
#include "talk/base/logging.h" #include "talk/base/logging.h"
#include "talk/base/stringutils.h"
using talk_base::sprintfn;
PeerConnectionClient::PeerConnectionClient() PeerConnectionClient::PeerConnectionClient()
: callback_(NULL), my_id_(-1), state_(NOT_CONNECTED) { : callback_(NULL), my_id_(-1), state_(NOT_CONNECTED) {
@ -78,7 +81,8 @@ bool PeerConnectionClient::Connect(const std::string& server, int port,
} }
char buffer[1024]; char buffer[1024];
wsprintfA(buffer, "GET /sign_in?%s HTTP/1.0\r\n\r\n", client_name.c_str()); sprintfn(buffer, sizeof(buffer),
"GET /sign_in?%s HTTP/1.0\r\n\r\n", client_name.c_str());
onconnect_data_ = buffer; onconnect_data_ = buffer;
bool ret = ConnectControlSocket(); bool ret = ConnectControlSocket();
@ -98,10 +102,11 @@ bool PeerConnectionClient::SendToPeer(int peer_id, const std::string& message) {
return false; return false;
char headers[1024]; char headers[1024];
wsprintfA(headers, "POST /message?peer_id=%i&to=%i HTTP/1.0\r\n" sprintfn(headers, sizeof(headers),
"Content-Length: %i\r\n" "POST /message?peer_id=%i&to=%i HTTP/1.0\r\n"
"Content-Type: text/plain\r\n" "Content-Length: %i\r\n"
"\r\n", "Content-Type: text/plain\r\n"
"\r\n",
my_id_, peer_id, message.length()); my_id_, peer_id, message.length());
onconnect_data_ = headers; onconnect_data_ = headers;
onconnect_data_ += message; onconnect_data_ += message;
@ -120,7 +125,8 @@ bool PeerConnectionClient::SignOut() {
state_ = SIGNING_OUT; state_ = SIGNING_OUT;
char buffer[1024]; char buffer[1024];
wsprintfA(buffer, "GET /sign_out?peer_id=%i HTTP/1.0\r\n\r\n", my_id_); sprintfn(buffer, sizeof(buffer),
"GET /sign_out?peer_id=%i HTTP/1.0\r\n\r\n", my_id_);
onconnect_data_ = buffer; onconnect_data_ = buffer;
return ConnectControlSocket(); return ConnectControlSocket();
} else { } else {
@ -158,7 +164,8 @@ void PeerConnectionClient::OnConnect(talk_base::AsyncSocket* socket) {
void PeerConnectionClient::OnHangingGetConnect(talk_base::AsyncSocket* socket) { void PeerConnectionClient::OnHangingGetConnect(talk_base::AsyncSocket* socket) {
char buffer[1024]; char buffer[1024];
wsprintfA(buffer, "GET /wait?peer_id=%i HTTP/1.0\r\n\r\n", my_id_); sprintfn(buffer, sizeof(buffer),
"GET /wait?peer_id=%i HTTP/1.0\r\n\r\n", my_id_);
int len = lstrlenA(buffer); int len = lstrlenA(buffer);
int sent = socket->Send(buffer, len); int sent = socket->Send(buffer, len);
ASSERT(sent == len); ASSERT(sent == len);