Skip to content

Commit

Permalink
normalizes whitespace and sets up gitattributes to preserve fixes zap…
Browse files Browse the repository at this point in the history 
…hoyd#43 fixes zaphoyd#46
  • Loading branch information
Peter Thorson committed Jan 12, 2012
1 parent 75a3f8b commit a17a4de
Show file tree
Hide file tree
Showing 58 changed files with 6,661 additions and 5,010 deletions.
18 changes: 18 additions & 0 deletions .gitattributes
View file
@@ -0,0 +1,18 @@
# Lineendings
*.sln eol=crlf
*.vcproj eol=crlf
*.vcxproj* eol=crfl

# Whitespace rules
# strict (no trailing, no tabs)
*.cpp whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
*.hpp whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
*.c whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
*.h whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol

# normal (no trailing)
*.sql whitespace=trailing-space,space-before-tab,cr-at-eol
*.txt whitespace=trailing-space,space-before-tab,cr-at-eol

# special files which must ignore whitespace
*.patch whitespace=-trailing-space
196 changes: 98 additions & 98 deletions examples/broadcast_server_tls/broadcast_admin.html
View file
@@ -1,11 +1,11 @@
<!doctype html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebSocket++ Broadcast Admin</title>
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="flot/excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="flot/jquery.js"></script>
<script language="javascript" type="text/javascript" src="flot/jquery.flot.js"></script>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebSocket++ Broadcast Admin</title>
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="flot/excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="flot/jquery.js"></script>
<script language="javascript" type="text/javascript" src="flot/jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="md5.js"></script>
</head>
<body>
Expand All @@ -27,52 +27,52 @@
var msgs = {};

function connect() {
url = document.getElementById("server_url").value;
if ("WebSocket" in window) {
ws_client = new WebSocket(url);
url = document.getElementById("server_url").value;
if ("WebSocket" in window) {
ws_client = new WebSocket(url);
ws_admin = new WebSocket(url+"/admin");
} else if ("MozWebSocket" in window) {
ws_client = new MozWebSocket(url);
} else if ("MozWebSocket" in window) {
ws_client = new MozWebSocket(url);
ws_admin = new MozWebSocket(url+"/admin");
} else {
$("#messages").innerHTML += "This Browser does not support WebSockets<br />";
return;
}
} else {
$("#messages").innerHTML += "This Browser does not support WebSockets<br />";
return;
}

ws_client.onopen = function(e) {
$("#messages").append("Client: A client connection to "+url+" has been opened.<br />");
$("#server_url").disabled = true;
$("#toggle_connect").html("Disconnect");
};
ws_client.onopen = function(e) {
$("#messages").append("Client: A client connection to "+url+" has been opened.<br />");
$("#server_url").disabled = true;
$("#toggle_connect").html("Disconnect");
};

ws_admin.onopen = function(e) {
$("#messages").append("Client: An admin connection to "+url+"/admin has been opened.<br />");
$("#server_url").disabled = true;
$("#toggle_connect").html("Disconnect");
};
ws_client.onerror = function(e) {
$("#messages").append("Client: An error occured on the client channel, see console log for more details.<br />");
console.log(e);
};
$("#messages").append("Client: An admin connection to "+url+"/admin has been opened.<br />");
$("#server_url").disabled = true;
$("#toggle_connect").html("Disconnect");
};
ws_client.onerror = function(e) {
$("#messages").append("Client: An error occured on the client channel, see console log for more details.<br />");
console.log(e);
};
ws_admin.onerror = function(e) {
$("#messages").append("Client: An error occured on the admin channel, see console log for more details.<br />");
console.log(e);
};
ws_client.onclose = function(e) {
$("#messages").append("Client: The client connection to "+url+" was closed.<br />");
clear_hud();
};
$("#messages").append("Client: An error occured on the admin channel, see console log for more details.<br />");
console.log(e);
};
ws_client.onclose = function(e) {
$("#messages").append("Client: The client connection to "+url+" was closed.<br />");
clear_hud();
};

ws_admin.onclose = function(e) {
$("#messages").append("Client: The admin connection to "+url+"/admin was closed.<br />");
clear_hud();
};
$("#messages").append("Client: The admin connection to "+url+"/admin was closed.<br />");
clear_hud();
};
ws_client.onmessage = function(e) {
if (options.console_enabled) {
if (e.data.length <= 126) {
Expand All @@ -84,20 +84,20 @@
ws_client.send("ack:"+hex_md5(e.data)+"=1;");
}

ws_admin.onmessage = function(e) {
ws_admin.onmessage = function(e) {
foo = JSON.parse(e.data);
if (foo.type == "message") {
if (options.console_enabled) {
if (foo.type == "message") {
if (options.console_enabled) {
document.getElementById("messages").innerHTML += "Broadcasted Message: "+foo.value+"<br />";
}
} else if (foo.type == "error") {
if (options.console_enabled) {
} else if (foo.type == "error") {
if (options.console_enabled) {
document.getElementById("messages").innerHTML += "Command Error: "+foo.value+"<br />";
}
} else if (foo.type == "con") {
document.getElementById("connected_clients").innerHTML = foo.value;
} else if (foo.type == "stats") {
} else if (foo.type == "con") {
document.getElementById("connected_clients").innerHTML = foo.value;
} else if (foo.type == "stats") {
var msg_delta = 0;
var data_delta = 0;

Expand Down Expand Up @@ -131,10 +131,10 @@
$("#sent_messages").html(o);

/*document.getElementById("messages_per_sec").innerHTML = foo.messages+"/s";
document.getElementById("bytes_per_sec").innerHTML = format_data(foo.bytes)+"/s";
document.getElementById("messages_sent").innerHTML = foo.messages_sent;
document.getElementById("bytes_per_sec").innerHTML = format_data(foo.bytes)+"/s";
document.getElementById("messages_sent").innerHTML = foo.messages_sent;
document.getElementById("messages_acked").innerHTML = foo.messages_acked;
document.getElementById("bytes_sent").innerHTML = format_data(foo.bytes_sent);*/
document.getElementById("bytes_sent").innerHTML = format_data(foo.bytes_sent);*/


document.getElementById("admin_connections").innerHTML = foo.admin_connections;
Expand All @@ -155,45 +155,45 @@
if (message_history.length > total_points) {
message_history = message_history.slice(message_history.length-total_points);
}
} else {
document.getElementById("messages").innerHTML += "Unrecognized Server Command.<br />";
}
}
} else {
document.getElementById("messages").innerHTML += "Unrecognized Server Command.<br />";
}
}
}

function clear_hud() {
document.getElementById("server_url").disabled = false;
document.getElementById("toggle_connect").innerHTML = "Connect";
document.getElementById("connected_clients").innerHTML = "N/A";
document.getElementById("server_url").disabled = false;
document.getElementById("toggle_connect").innerHTML = "Connect";
document.getElementById("connected_clients").innerHTML = "N/A";
document.getElementById("admin_connections").innerHTML = "N/A";
document.getElementById("messages_per_sec").innerHTML = "N/A";
document.getElementById("bytes_per_sec").innerHTML = "N/A";
document.getElementById("messages_sent").innerHTML = "N/A";
document.getElementById("bytes_sent").innerHTML = "N/A";
document.getElementById("messages_per_sec").innerHTML = "N/A";
document.getElementById("bytes_per_sec").innerHTML = "N/A";
document.getElementById("messages_sent").innerHTML = "N/A";
document.getElementById("bytes_sent").innerHTML = "N/A";
document.getElementById("messages_acked").innerHTML = "N/A";
}
function disconnect() {
ws_client.close();
ws_client.close();
ws_admin.close();
}

function toggle_connect() {
if (document.getElementById("server_url").disabled === false) {
connect();
} else {
disconnect();
}
if (document.getElementById("server_url").disabled === false) {
connect();
} else {
disconnect();
}
}

function broadcast() {
if (ws_client === undefined || ws_client.readyState != 1) {
$("#messages").append("Client: Client websocket is not avaliable for writing<br />");
return;
}
ws_client.send(document.getElementById("msg").value);
document.getElementById("msg").value = "";
if (ws_client === undefined || ws_client.readyState != 1) {
$("#messages").append("Client: Client websocket is not avaliable for writing<br />");
return;
}
ws_client.send(document.getElementById("msg").value);
document.getElementById("msg").value = "";
}

function send_command(command,args) {
Expand Down Expand Up @@ -278,21 +278,21 @@

<style>
body,html {
margin: 0px;
padding: 0px;
margin: 0px;
padding: 0px;
height:100%;
font-family: sans-serif;
font-size: 12px;
}
#controls {
float:right;
background-color: #333;
color: #fff;
padding: 5px;
float:right;
background-color: #333;
color: #fff;
padding: 5px;
}
#controls h2 {
font-family: sans-serif;
font-size: 16px;
font-family: sans-serif;
font-size: 16px;
margin-bottom: 4px;
}
#controls h3 {
Expand All @@ -308,24 +308,24 @@
</style>

<div id="controls">
<div id="server">
<input type="text" name="server_url" id="server_url" value="ws://localhost:9002" />
<button id="toggle_connect" onclick="toggle_connect();">Connect</button>
</div>
<div id="server">
<input type="text" name="server_url" id="server_url" value="ws://localhost:9002" />
<button id="toggle_connect" onclick="toggle_connect();">Connect</button>
</div>

<div id="message_input"><input type="text" name="msg" id="msg" value="Hello World!" />
<button onclick="broadcast();">Broadcast</button></div>
<h2>Stats</h2>
<h3>Server</h3>
<div id="message_input"><input type="text" name="msg" id="msg" value="Hello World!" />
<button onclick="broadcast();">Broadcast</button></div>
<h2>Stats</h2>
<h3>Server</h3>
<div>Connected Clients: <span id="connected_clients">N/A</span><br /></div>
<div>Admin Clients: <span id="admin_connections">N/A</span><br /></div>
<div id="client_history" style="width:320px;height:200px;"></div>
<h3>Messages</h3>
<div>Messages Sent: <span id="messages_sent">N/A</span><br /></div>
<div>Messages Acked: <span id="messages_acked">N/A</span><br /></div>
<div>Messages Rate: <span id="messages_per_sec">N/A</span><br /></div>
<div id="message_history" style="width:320px;height:200px;"></div>
<div id="message_history" style="width:320px;height:200px;"></div>

<div>
<table>
Expand Down
12 changes: 6 additions & 6 deletions examples/broadcast_server_tls/broadcast_admin_handler.hpp
View file
Expand Up @@ -58,10 +58,10 @@ class admin_handler : public endpoint_type::handler {

void on_open(connection_ptr connection) {
if (!m_timer) {
m_timer.reset(new boost::asio::deadline_timer(connection->get_io_service(),boost::posix_time::seconds(0)));
m_timer->expires_from_now(boost::posix_time::milliseconds(250));
m_timer->async_wait(boost::bind(&type::on_timer,this,boost::asio::placeholders::error));
}
m_timer.reset(new boost::asio::deadline_timer(connection->get_io_service(),boost::posix_time::seconds(0)));
m_timer->expires_from_now(boost::posix_time::milliseconds(250));
m_timer->async_wait(boost::bind(&type::on_timer,this,boost::asio::placeholders::error));
}

m_connections.insert(connection);
}
Expand Down Expand Up @@ -177,7 +177,7 @@ class admin_handler : public endpoint_type::handler {
}

m_timer->expires_from_now(boost::posix_time::milliseconds(250));
m_timer->async_wait(
m_timer->async_wait(
boost::bind(
&type::on_timer,
this,
Expand All @@ -190,7 +190,7 @@ class admin_handler : public endpoint_type::handler {
broadcast_handler_ptr m_broadcast_handler;

std::set<connection_ptr> m_connections;
boost::posix_time::ptime m_epoch;
boost::posix_time::ptime m_epoch;

boost::shared_ptr<boost::asio::deadline_timer> m_timer;
};
Expand Down

0 comments on commit a17a4de

Please sign in to comment.