Implemented example client with websocket

deps/libjuice

@@ -1 +1 @@
-Subproject commit 511b19f5168825f1d72e79bee4aef8f3b5a36fca
+Subproject commit 6f6faa578396960a5f426582ed12db2747e4f68d

examples/client/main.cpp

@@ -23,8 +23,12 @@
 
 #include <nlohmann/json.hpp>
 
+#include <algorithm>
 #include <iostream>
 #include <memory>
+#include <random>
+#include <thread>
+#include <unordered_map>
 
 using namespace rtc;
 using namespace std;
@@ -34,77 +38,180 @@ using json = nlohmann::json;
 
 template <class T> weak_ptr<T> make_weak_ptr(shared_ptr<T> ptr) { return ptr; }
 
+unordered_map<string, shared_ptr<PeerConnection>> peerConnectionMap;
+unordered_map<string, shared_ptr<DataChannel>> dataChannelMap;
+
+string localId;
+
+shared_ptr<PeerConnection> createPeerConnection(const Configuration &config,
+                                                weak_ptr<WebSocket> wws, string id);
+string randomId(size_t length);
+
 int main(int argc, char **argv) {
 	rtc::InitLogger(LogLevel::Warning);
 
 	Configuration config;
 	config.iceServers.emplace_back("stun.l.google.com:19302"); // change to your STUN server
 
-	auto pc = std::make_shared<PeerConnection>(config);
+	localId = randomId(8);
+	cout << "The local ID is: " << localId << endl;
 
-	const std::string url = "ws://localhost:8000/";
+	auto ws = make_shared<WebSocket>();
 
-	auto ws = std::make_shared<WebSocket>(url);
-	ws->onOpen([]() {
+	ws->onOpen([]() { cout << "WebSocket connected, signaling ready" << endl; });
 
-	});
-	ws->onMessage([wpc = make_weak_ptr(pc)](const std::variant<binary, string> &data) {
-		auto pc = wpc.lock();
-		if (pc && holds_alternative<string>(data)) {
-			json message = json::parse(get<string>(data));
-			if (auto it = message.find("type"); it != message.end()) {
-				auto type = it->get<string>();
-				if (type == "offer" || type == "answer") {
-					auto str = message["description"].get<string>();
-					pc->setRemoteDescription(Description(str, type));
-				} else if (type == "candidate") {
-					auto str = message["candidate"].get<string>();
-					auto mid = message["mid"].get<string>();
-					pc->addRemoteCandidate(Candidate(str, mid));
-				}
-			}
+	ws->onClosed([]() { cout << "WebSocket closed" << endl; });
+
+	ws->onError([](const string &error) { cout << "WebSocket failed: " << error << endl; });
+
+	ws->onMessage([&](const variant<binary, string> &data) {
+		if (!holds_alternative<string>(data))
+			return;
+
+		json message = json::parse(get<string>(data));
+
+		auto it = message.find("id");
+		if (it == message.end())
+			return;
+		string id = it->get<string>();
+
+		it = message.find("type");
+		if (it == message.end())
+			return;
+		string type = it->get<string>();
+
+		shared_ptr<PeerConnection> pc;
+		if (auto jt = peerConnectionMap.find(id); jt != peerConnectionMap.end()) {
+			pc = jt->second;
+		} else if (type == "offer") {
+			cout << "Answering to " + id << endl;
+			pc = createPeerConnection(config, ws, id);
+		} else {
+			return;
 		}
-	});
-	ws->onClosed([]() {
 
+		if (type == "offer" || type == "answer") {
+			auto str = message["description"].get<string>();
+			pc->setRemoteDescription(Description(str, type));
+		} else if (type == "candidate") {
+			auto str = message["candidate"].get<string>();
+			auto mid = message["mid"].get<string>();
+			pc->addRemoteCandidate(Candidate(str, mid));
+		}
 	});
 
-	pc->onLocalDescription([wws = make_weak_ptr(ws)](const Description &description) {
-		json message = {{"type", description.typeString()},
-		                {"description", std::string(description)}};
+	const string url = "ws://localhost:8000/" + localId;
+	ws->open(url);
+
+	cout << "Waiting for signaling to be connected..." << endl;
+	while (!ws->isOpen()) {
+		if (ws->isClosed())
+			return 1;
+		this_thread::sleep_for(100ms);
+	}
+
+	while (true) {
+		string id;
+		cout << "Enter a remote ID to send an offer:" << endl;
+		cin >> id;
+		cin.ignore();
+		if (id.empty())
+			break;
+		if (id == localId)
+			continue;
+
+		cout << "Offering to " + id << endl;
+		auto pc = createPeerConnection(config, ws, id);
+
+		// We are the offerer, so create a data channel to initiate the process
+		const string label = "test";
+		cout << "Creating DataChannel with label \"" << label << "\"" << endl;
+		auto dc = pc->createDataChannel(label);
+
+		dc->onOpen([id, wdc = make_weak_ptr(dc)]() {
+			cout << "DataChannel from " << id << " open" << endl;
+			if (auto dc = wdc.lock())
+				dc->send("Hello from " + localId);
+		});
+
+		dc->onClosed([id]() { cout << "DataChannel from " << id << " closed" << endl; });
+
+		dc->onMessage([id](const variant<binary, string> &message) {
+			if (!holds_alternative<string>(message))
+				return;
+
+			cout << "Message from " << id << " received: " << get<string>(message) << endl;
+		});
+
+		dataChannelMap.emplace(id, dc);
+
+		this_thread::sleep_for(1s);
+	}
+
+	cout << "Cleaning up..." << endl;
+
+	dataChannelMap.clear();
+	peerConnectionMap.clear();
+	return 0;
+}
+
+// Create and setup a PeerConnection
+shared_ptr<PeerConnection> createPeerConnection(const Configuration &config,
+                                                weak_ptr<WebSocket> wws, string id) {
+	auto pc = make_shared<PeerConnection>(config);
+
+	pc->onStateChange([](PeerConnection::State state) { cout << "State: " << state << endl; });
+
+	pc->onGatheringStateChange(
+	    [](PeerConnection::GatheringState state) { cout << "Gathering State: " << state << endl; });
+
+	pc->onLocalDescription([wws, id](const Description &description) {
+		json message = {
+		    {"id", id}, {"type", description.typeString()}, {"description", string(description)}};
 
 		if (auto ws = wws.lock())
 			ws->send(message.dump());
 	});
-	pc->onLocalCandidate([wws = make_weak_ptr(ws)](const Candidate &candidate) {
-		json message = {
-		    {"type", "candidate"}, {"candidate", std::string(candidate)}, {"mid", candidate.mid()}};
+
+	pc->onLocalCandidate([wws, id](const Candidate &candidate) {
+		json message = {{"id", id},
+		                {"type", "candidate"},
+		                {"candidate", string(candidate)},
+		                {"mid", candidate.mid()}};
 
 		if (auto ws = wws.lock())
 			ws->send(message.dump());
 	});
-	pc->onStateChange([wpc = make_weak_ptr(pc)](PeerConnection::State state) {
-		cout << "State: " << state << endl;
-	});
-	pc->onGatheringStateChange(
-	    [](PeerConnection::GatheringState state) { cout << "Gathering State: " << state << endl; });
 
-	auto dc = pc->createDataChannel("test"); // this is the offerer, so create a data channel
+	pc->onDataChannel([id](shared_ptr<DataChannel> dc) {
+		cout << "DataChannel from " << id << " received with label \"" << dc->label() << "\""
+		     << endl;
 
-	dc->onOpen([&]() { cout << "DataChannel open: " << dc->label() << endl; });
+		dc->send("Hello from " + localId);
 
-	dc->onClosed([&]() { cout << "DataChannel closed: " << dc->label() << endl; });
+		dc->onClosed([id]() { cout << "DataChannel from " << id << " closed" << endl; });
 
-	dc->onMessage([](const variant<binary, string> &message) {
-		if (holds_alternative<string>(message)) {
-			cout << "Received: " << get<string>(message) << endl;
-		}
-	});
+		dc->onMessage([id](const variant<binary, string> &message) {
+			if (!holds_alternative<string>(message))
+				return;
 
-	// TODO
+			cout << "Message from " << id << " received: " << get<string>(message) << endl;
+		});
+
+		dataChannelMap.emplace(id, dc);
+	});
 
-	if (dc)
-		dc->close();
-	if (pc)
-		pc->close();
+	peerConnectionMap.emplace(id, pc);
+	return pc;
+};
+
+// Helper function to generate a random ID
+string randomId(size_t length) {
+	static const string characters(
+	    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
+	string id(length, '0');
+	default_random_engine rng(random_device{}());
+	uniform_int_distribution<int> dist(0, characters.size() - 1);
+	generate(id.begin(), id.end(), [&]() { return characters.at(dist(rng)); });
+	return id;
 }

examples/signaling-server-python/LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.

examples/signaling-server-python/signaling-server.py

@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+#
+# libdatachannel signaling server example
+# Copyright (c) 2020 Paul-Louis Ageneau
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import sys
+import ssl
+import json
+import asyncio
+import logging
+import websockets
+
+
+logger = logging.getLogger('websockets')
+logger.setLevel(logging.INFO)
+logger.addHandler(logging.StreamHandler(sys.stdout))
+
+clients = {}
+
+
+async def handle_websocket(websocket, path):
+    client_id = None
+    try:
+        splitted = path.split('/')
+        splitted.pop(0)
+        client_id = splitted.pop(0)
+        print('Client {} connected'.format(client_id))
+
+        clients[client_id] = websocket
+        while True:
+            data = await websocket.recv()
+            print('Client {} << {}'.format(client_id, data))
+            message = json.loads(data)
+            destination_id = message['id']
+            destination_websocket = clients.get(destination_id)
+            if destination_websocket:
+                message['id'] = client_id
+                data = json.dumps(message)
+                print('Client {} >> {}'.format(destination_id, data))
+                await destination_websocket.send(data)
+            else:
+                print('Client {} not found'.format(destination_id))
+
+    except Exception as e:
+        print(e)
+
+    finally:
+        if client_id:
+            del clients[client_id]
+            print('Client {} disconnected'.format(client_id))
+
+if __name__ == '__main__':
+    port = int(sys.argv[1]) if len(sys.argv) > 1 else 8000
+    ssl_cert = sys.argv[2] if len(sys.argv) > 2 else None
+
+    if ssl_cert:
+        ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+        ssl_context.load_cert_chain(ssl_cert)
+    else:
+        ssl_context = None
+
+    print('Listening on port {}'.format(port))
+    start_server = websockets.serve(handle_websocket, '127.0.0.1', port, ssl=ssl_context)
+    asyncio.get_event_loop().run_until_complete(start_server)
+    asyncio.get_event_loop().run_forever()

include/rtc/websocket.hpp

@@ -48,7 +48,6 @@ public:
 	};
 
 	WebSocket();
-	WebSocket(const string &url);
 	~WebSocket();
 
 	State readyState() const;

src/dtlstransport.cpp

@@ -491,6 +491,7 @@ void DtlsTransport::runRecvLoop() {
 					int ret = SSL_read(mSsl, buffer, bufferSize);
 					if (!check_openssl_ret(mSsl, ret))
 						break;
+
 					if (ret > 0)
 						recv(make_message(buffer, buffer + ret));
 				}

src/icetransport.cpp

@@ -100,7 +100,10 @@ IceTransport::IceTransport(const Configuration &config, Description::Role role,
 		throw std::runtime_error("Failed to create the ICE agent");
 }
 
-IceTransport::~IceTransport() { stop(); }
+IceTransport::~IceTransport() {
+	stop();
+	mAgent.reset();
+}
 
 bool IceTransport::stop() {
 	return Transport::stop();

src/peerconnection.cpp

@@ -36,11 +36,17 @@ PeerConnection::PeerConnection() : PeerConnection(Configuration()) {}
 
 PeerConnection::PeerConnection(const Configuration &config)
     : mConfig(config), mCertificate(make_certificate("libdatachannel")), mState(State::New),
-      mGatheringState(GatheringState::New) {}
+      mGatheringState(GatheringState::New) {
+	PLOG_VERBOSE << "Creating PeerConnection";
+}
 
-PeerConnection::~PeerConnection() { close(); }
+PeerConnection::~PeerConnection() {
+	close();
+	PLOG_VERBOSE << "Destroying PeerConnection";
+}
 
 void PeerConnection::close() {
+	PLOG_VERBOSE << "Closing PeerConnection";
 	closeDataChannels();
 	closeTransports();
 }
@@ -339,6 +345,8 @@ shared_ptr<SctpTransport> PeerConnection::initSctpTransport() {
 }
 
 void PeerConnection::closeTransports() {
+	PLOG_VERBOSE << "Closing transports";
+
 	// Change state to sink state Closed to block init methods
 	changeState(State::Closed);
 

src/rtc.cpp

@@ -208,7 +208,9 @@ int rtcDeleteDataChannel(int dc) {
 
 #if RTC_ENABLE_WEBSOCKET
 int rtcCreateWebSocket(const char *url) {
-	return emplaceWebSocket(std::make_shared<WebSocket>(url));
+	auto ws = std::make_shared<WebSocket>();
+	ws->open(url);
+	return emplaceWebSocket(ws);
 }
 
 int rtcDeleteWebsocket(int ws) {

src/tcptransport.cpp

@@ -99,22 +99,30 @@ bool TcpTransport::stop() {
 	if (!Transport::stop())
 		return false;
 
-	PLOG_DEBUG << "Waiting TCP recv thread";
+	PLOG_DEBUG << "Waiting for TCP recv thread";
 	close();
 	mThread.join();
 	return true;
 }
 
 bool TcpTransport::send(message_ptr message) {
+	if (state() != State::Connected)
+		return false;
+
 	if (!message)
 		return mSendQueue.empty();
 
 	PLOG_VERBOSE << "Send size=" << (message ? message->size() : 0);
-
 	return outgoing(message);
 }
 
-void TcpTransport::incoming(message_ptr message) { recv(message); }
+void TcpTransport::incoming(message_ptr message) {
+	if (!message)
+		return;
+
+	PLOG_VERBOSE << "Incoming size=" << message->size();
+	recv(message);
+}
 
 bool TcpTransport::outgoing(message_ptr message) {
 	// If nothing is pending, try to send directly
@@ -140,22 +148,40 @@ void TcpTransport::connect(const string &hostname, const string &service) {
 	if (getaddrinfo(hostname.c_str(), service.c_str(), &hints, &result))
 		throw std::runtime_error("Resolution failed for \"" + hostname + ":" + service + "\"");
 
-	for (auto p = result; p; p = p->ai_next)
+	for (auto p = result; p; p = p->ai_next) {
 		try {
 			connect(p->ai_addr, p->ai_addrlen);
+
+			PLOG_INFO << "Connected to " << hostname << ":" << service;
 			freeaddrinfo(result);
 			return;
+
 		} catch (const std::runtime_error &e) {
-			PLOG_WARNING << e.what();
+			if (p->ai_next) {
+				PLOG_DEBUG << e.what();
+			} else {
+				PLOG_WARNING << e.what();
+			}
 		}
+	}
 
 	freeaddrinfo(result);
-	throw std::runtime_error("Connection failed to \"" + hostname + ":" + service + "\"");
+
+	std::ostringstream msg;
+	msg << "Connection to " << hostname << ":" << service << " failed";
+	throw std::runtime_error(msg.str());
 }
 
 void TcpTransport::connect(const sockaddr *addr, socklen_t addrlen) {
 	try {
-		PLOG_DEBUG << "Creating TCP socket";
+		char node[MAX_NUMERICNODE_LEN];
+		char serv[MAX_NUMERICSERV_LEN];
+		if (getnameinfo(addr, addrlen, node, MAX_NUMERICNODE_LEN, serv, MAX_NUMERICSERV_LEN,
+		                NI_NUMERICHOST | NI_NUMERICSERV) == 0) {
+			PLOG_DEBUG << "Trying address " << node << ":" << serv;
+		}
+
+		PLOG_VERBOSE << "Creating TCP socket";
 
 		// Create socket
 		mSock = ::socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
@@ -166,17 +192,13 @@ void TcpTransport::connect(const sockaddr *addr, socklen_t addrlen) {
 		if (::ioctlsocket(mSock, FIONBIO, &b) < 0)
 			throw std::runtime_error("Failed to set socket non-blocking mode");
 
-		IF_PLOG(plog::debug) {
-			char node[MAX_NUMERICNODE_LEN];
-			char serv[MAX_NUMERICSERV_LEN];
-			if (getnameinfo(addr, addrlen, node, MAX_NUMERICNODE_LEN, serv, MAX_NUMERICSERV_LEN,
-			                NI_NUMERICHOST | NI_NUMERICSERV) == 0) {
-				PLOG_DEBUG << "Trying address " << node << ":" << serv;
-			}
-		}
-
 		// Initiate connection
-		::connect(mSock, addr, addrlen);
+		int ret = ::connect(mSock, addr, addrlen);
+		if (ret < 0 && errno != EINPROGRESS) {
+			std::ostringstream msg;
+			msg << "TCP connection to " << node << ":" << serv << " failed, errno=" << sockerrno;
+			throw std::runtime_error(msg.str());
+		}
 
 		fd_set writefds;
 		FD_ZERO(&writefds);
@@ -184,13 +206,29 @@ void TcpTransport::connect(const sockaddr *addr, socklen_t addrlen) {
 		struct timeval tv;
 		tv.tv_sec = 10; // TODO
 		tv.tv_usec = 0;
-		int ret = ::select(SOCKET_TO_INT(mSock) + 1, NULL, &writefds, NULL, &tv);
+		ret = ::select(SOCKET_TO_INT(mSock) + 1, NULL, &writefds, NULL, &tv);
 
 		if (ret < 0)
 			throw std::runtime_error("Failed to wait for socket connection");
 
-		if (ret == 0 || ::send(mSock, NULL, 0, MSG_NOSIGNAL) != 0)
-			throw std::runtime_error("Connection failed");
+		if (ret == 0) {
+			std::ostringstream msg;
+			msg << "TCP connection to " << node << ":" << serv << " timed out";
+			throw std::runtime_error(msg.str());
+		}
+
+		int error = 0;
+		socklen_t errorlen = sizeof(error);
+		if (::getsockopt(mSock, SOL_SOCKET, SO_ERROR, &error, &errorlen) != 0)
+			throw std::runtime_error("Failed to get socket error code");
+
+		if (error != 0) {
+			std::ostringstream msg;
+			msg << "TCP connection to " << node << ":" << serv << " failed, errno=" << error;
+			throw std::runtime_error(msg.str());
+		}
+
+		PLOG_DEBUG << "TCP connection to " << node << ":" << serv << " succeeded";
 
 	} catch (...) {
 		if (mSock != INVALID_SOCKET) {
@@ -257,7 +295,6 @@ void TcpTransport::runLoop() {
 		return;
 	}
 
-
 	// Receive loop
 	try {
 		PLOG_INFO << "TCP connected";
@@ -266,9 +303,18 @@ void TcpTransport::runLoop() {
 		while (true) {
 			fd_set readfds, writefds;
 			int n = prepareSelect(readfds, writefds);
-			int ret = ::select(n, &readfds, &writefds, NULL, NULL);
-			if (ret < 0)
+
+			struct timeval tv;
+			tv.tv_sec = 10;
+			tv.tv_usec = 0;
+			int ret = ::select(n, &readfds, &writefds, NULL, &tv);
+			if (ret < 0) {
 				throw std::runtime_error("Failed to wait on socket");
+			} else if (ret == 0) {
+				PLOG_VERBOSE << "TCP is idle";
+				incoming(make_message(0));
+				continue;
+			}
 
 			if (FD_ISSET(mSock, &writefds))
 				trySendQueue();
@@ -280,7 +326,7 @@ void TcpTransport::runLoop() {
 					if (errno == EAGAIN || errno == EWOULDBLOCK) {
 						continue;
 					} else {
-						throw std::runtime_error("Connection lost, errno=" + to_string(sockerrno));
+						throw std::runtime_error("Connection lost");
 					}
 				}
 

src/tlstransport.cpp

@@ -86,7 +86,6 @@ TlsTransport::TlsTransport(shared_ptr<TcpTransport> lower, string host, state_ca
 		registerIncoming();
 
 	} catch (...) {
-
 		gnutls_deinit(mSession);
 		throw;
 	}
@@ -112,7 +111,6 @@ bool TlsTransport::send(message_ptr message) {
 		return false;
 
 	PLOG_VERBOSE << "Send size=" << message->size();
-
 	ssize_t ret;
 	do {
 		ret = gnutls_record_send(mSession, message->data(), message->size());
@@ -198,12 +196,16 @@ ssize_t TlsTransport::WriteCallback(gnutls_transport_ptr_t ptr, const void *data
 
 ssize_t TlsTransport::ReadCallback(gnutls_transport_ptr_t ptr, void *data, size_t maxlen) {
 	TlsTransport *t = static_cast<TlsTransport *>(ptr);
-	if (auto next = t->mIncomingQueue.pop()) {
+	while (auto next = t->mIncomingQueue.pop()) {
 		auto message = *next;
-		ssize_t len = std::min(maxlen, message->size());
-		std::memcpy(data, message->data(), len);
-		gnutls_transport_set_errno(t->mSession, 0);
-		return len;
+		if (message->size() > 0) {
+			ssize_t len = std::min(maxlen, message->size());
+			std::memcpy(data, message->data(), len);
+			gnutls_transport_set_errno(t->mSession, 0);
+			return len;
+		}
+
+		recv(message); // Pass zero-sized messages through
 	}
 	// Closed
 	gnutls_transport_set_errno(t->mSession, 0);
@@ -373,33 +375,47 @@ void TlsTransport::runRecvLoop() {
 	try {
 		changeState(State::Connecting);
 
-		SSL_do_handshake(mSsl);
-		while (int len = BIO_read(mOutBio, buffer, bufferSize))
-			outgoing(make_message(buffer, buffer + len));
+		// Initiate the handshake
+		int ret = SSL_do_handshake(mSsl);
+		check_openssl_ret(mSsl, ret, "Handshake failed");
+
+		while (true) {
+			// Output
+			while (int len = BIO_read(mOutBio, buffer, bufferSize))
+				outgoing(make_message(buffer, buffer + len));
 
-		while (auto next = mIncomingQueue.pop()) {
+			auto next = mIncomingQueue.pop();
+			if (!next)
+				break;
 			message_ptr message = *next;
-			message_ptr decrypted;
 
-			BIO_write(mInBio, message->data(), message->size());
+			if (message->size() == 0) {
+				// Pass zero-sized messages through
+				recv(message);
+				continue;
+			}
 
-			int ret = SSL_read(mSsl, buffer, bufferSize);
-			if (!check_openssl_ret(mSsl, ret))
-				break;
+			// Input
+			BIO_write(mInBio, message->data(), message->size());
 
-			if (ret > 0)
-				decrypted = make_message(buffer, buffer + ret);
+			if (state() == State::Connecting) {
+				// Continue the handshake
+				int ret = SSL_do_handshake(mSsl);
+				if (!check_openssl_ret(mSsl, ret, "Handshake failed"))
+					break;
 
-			while (int len = BIO_read(mOutBio, buffer, bufferSize))
-				outgoing(make_message(buffer, buffer + len));
+				if (SSL_is_init_finished(mSsl)) {
+					PLOG_INFO << "TLS handshake finished";
+					changeState(State::Connected);
+				}
+			} else {
+				int ret = SSL_read(mSsl, buffer, bufferSize);
+				if (!check_openssl_ret(mSsl, ret))
+					break;
 
-			if (state() == State::Connecting && SSL_is_init_finished(mSsl)) {
-				PLOG_INFO << "TLS handshake finished";
-				changeState(State::Connected);
+				if (ret > 0)
+					recv(make_message(buffer, buffer + ret));
 			}
-
-			if (decrypted)
-				recv(decrypted);
 		}
 	} catch (const std::exception &e) {
 		PLOG_ERROR << "TLS recv: " << e.what();

src/websocket.cpp

@@ -33,11 +33,12 @@
 
 namespace rtc {
 
-WebSocket::WebSocket() {}
+WebSocket::WebSocket() { PLOG_VERBOSE << "Creating WebSocket"; }
 
-WebSocket::WebSocket(const string &url) : WebSocket() { open(url); }
-
-WebSocket::~WebSocket() { remoteClose(); }
+WebSocket::~WebSocket() {
+	PLOG_VERBOSE << "Destroying WebSocket";
+	remoteClose();
+}
 
 WebSocket::State WebSocket::readyState() const { return mState; }
 
@@ -74,6 +75,7 @@ void WebSocket::open(const string &url) {
 }
 
 void WebSocket::close() {
+	PLOG_VERBOSE << "Closing WebSocket";
 	auto state = mState.load();
 	if (state == State::Connecting || state == State::Open) {
 		changeState(State::Closing);
@@ -283,6 +285,8 @@ std::shared_ptr<WsTransport> WebSocket::initWsTransport() {
 }
 
 void WebSocket::closeTransports() {
+	PLOG_VERBOSE << "Closing transports";
+
 	changeState(State::Closed);
 
 	// Pass the references to a thread, allowing to terminate a transport from its own thread

src/wstransport.cpp

@@ -87,32 +87,50 @@ bool WsTransport::send(mutable_message_ptr message) {
 		return false;
 
 	PLOG_VERBOSE << "Send size=" << message->size();
-
 	return sendFrame({message->type == Message::String ? TEXT_FRAME : BINARY_FRAME, message->data(),
 	                  message->size(), true, true});
 }
 
 void WsTransport::incoming(message_ptr message) {
-	try {
+	auto s = state();
+	if (s != State::Connecting && s != State::Connected)
+		return; // Drop
+
+	if (message) {
+		PLOG_VERBOSE << "Incoming size=" << message->size();
+
+		if (message->size() == 0) {
+			// TCP is idle, send a ping
+			PLOG_DEBUG << "WebSocket sending ping";
+			uint32_t dummy = 0;
+			sendFrame({PING, reinterpret_cast<byte *>(&dummy), 4, true, true});
+			return;
+		}
+
 		mBuffer.insert(mBuffer.end(), message->begin(), message->end());
 
-		if (state() == State::Connecting) {
-			if (size_t len = readHttpResponse(mBuffer.data(), mBuffer.size())) {
-				mBuffer.erase(mBuffer.begin(), mBuffer.begin() + len);
-				PLOG_INFO << "WebSocket open";
-				changeState(State::Connected);
+		try {
+			if (state() == State::Connecting) {
+				if (size_t len = readHttpResponse(mBuffer.data(), mBuffer.size())) {
+					PLOG_INFO << "WebSocket open";
+					changeState(State::Connected);
+					mBuffer.erase(mBuffer.begin(), mBuffer.begin() + len);
+				}
 			}
-		}
 
-		if (state() == State::Connected) {
-			Frame frame = {};
-			while (size_t len = readFrame(mBuffer.data(), mBuffer.size(), frame)) {
-				mBuffer.erase(mBuffer.begin(), mBuffer.begin() + len);
-				recvFrame(frame);
+			if (state() == State::Connected) {
+				Frame frame;
+				while (size_t len = readFrame(mBuffer.data(), mBuffer.size(), frame)) {
+					recvFrame(frame);
+					mBuffer.erase(mBuffer.begin(), mBuffer.begin() + len);
+				}
 			}
+
+			return;
+
+		} catch (const std::exception &e) {
+			PLOG_ERROR << e.what();
 		}
-	} catch (const std::exception &e) {
-		PLOG_ERROR << e.what();
 	}
 
 	if (state() == State::Connected) {
@@ -140,8 +158,8 @@ bool WsTransport::sendHttpRequest() {
 	random_bytes_engine generator(seed);
 
 	binary key(16);
-	std::generate(reinterpret_cast<uint8_t *>(key.data()),
-	              reinterpret_cast<uint8_t *>(key.data() + key.size()), generator);
+	auto k = reinterpret_cast<uint8_t *>(key.data());
+	std::generate(k, k + key.size(), generator);
 
 	const string request = "GET " + mPath +
 	                       " HTTP/1.1\r\n"
@@ -166,6 +184,7 @@ size_t WsTransport::readHttpResponse(const byte *buffer, size_t size) {
 	auto begin = reinterpret_cast<const char *>(buffer);
 	auto end = begin + size;
 	auto cur = begin;
+
 	while (true) {
 		auto last = cur;
 		cur = std::find(cur, end, '\n');
@@ -260,7 +279,7 @@ size_t WsTransport::readFrame(byte *buffer, size_t size, Frame &frame) {
 		cur += 2;
 	} else if (frame.length == 0x7F) {
 		if (end - cur < 8)
-			return false;
+			return 0;
 		frame.length = ntohll(*reinterpret_cast<const uint64_t *>(cur));
 		cur += 8;
 	}
@@ -274,49 +293,63 @@ size_t WsTransport::readFrame(byte *buffer, size_t size, Frame &frame) {
 	}
 
 	if (end - cur < frame.length)
-		return false;
+		return 0;
 
 	frame.payload = cur;
 	if (maskingKey)
 		for (size_t i = 0; i < frame.length; ++i)
 			frame.payload[i] ^= maskingKey[i % 4];
+	cur += frame.length;
 
-	return end - buffer;
+	return cur - buffer;
 }
 
 void WsTransport::recvFrame(const Frame &frame) {
+	PLOG_DEBUG << "WebSocket received frame: opcode=" << int(frame.opcode)
+	           << ", length=" << frame.length;
+
 	switch (frame.opcode) {
 	case TEXT_FRAME:
 	case BINARY_FRAME: {
 		if (!mPartial.empty()) {
+			PLOG_WARNING << "WebSocket unfinished message: type="
+			             << (mPartialOpcode == TEXT_FRAME ? "text" : "binary")
+			             << ", length=" << mPartial.size();
 			auto type = mPartialOpcode == TEXT_FRAME ? Message::String : Message::Binary;
 			recv(make_message(mPartial.begin(), mPartial.end(), type));
 			mPartial.clear();
 		}
+		mPartialOpcode = frame.opcode;
 		if (frame.fin) {
+			PLOG_DEBUG << "WebSocket finished message: type="
+			           << (frame.opcode == TEXT_FRAME ? "text" : "binary")
+			           << ", length=" << frame.length;
 			auto type = frame.opcode == TEXT_FRAME ? Message::String : Message::Binary;
-			recv(make_message(frame.payload, frame.payload + frame.length));
+			recv(make_message(frame.payload, frame.payload + frame.length, type));
 		} else {
 			mPartial.insert(mPartial.end(), frame.payload, frame.payload + frame.length);
-			mPartialOpcode = frame.opcode;
 		}
 		break;
 	}
 	case CONTINUATION: {
 		mPartial.insert(mPartial.end(), frame.payload, frame.payload + frame.length);
 		if (frame.fin) {
+			PLOG_DEBUG << "WebSocket finished message: type="
+			           << (frame.opcode == TEXT_FRAME ? "text" : "binary")
+			           << ", length=" << mPartial.size();
 			auto type = mPartialOpcode == TEXT_FRAME ? Message::String : Message::Binary;
-			recv(make_message(mPartial.begin(), mPartial.end()));
+			recv(make_message(mPartial.begin(), mPartial.end(), type));
 			mPartial.clear();
 		}
 		break;
 	}
 	case PING: {
+		PLOG_DEBUG << "WebSocket received ping, sending pong";
 		sendFrame({PONG, frame.payload, frame.length, true, true});
 		break;
 	}
 	case PONG: {
-		// TODO
+		PLOG_DEBUG << "WebSocket received pong";
 		break;
 	}
 	case CLOSE: {
@@ -333,6 +366,9 @@ void WsTransport::recvFrame(const Frame &frame) {
 }
 
 bool WsTransport::sendFrame(const Frame &frame) {
+	PLOG_DEBUG << "WebSocket sending frame: opcode=" << int(frame.opcode)
+	           << ", length=" << frame.length;
+
 	byte buffer[14];
 	byte *cur = buffer;
 
@@ -340,13 +376,13 @@ bool WsTransport::sendFrame(const Frame &frame) {
 
 	if (frame.length < 0x7E) {
 		*cur++ = byte((frame.length & 0x7F) | (frame.mask ? 0x80 : 0));
-	} else if (frame.length <= 0xFF) {
+	} else if (frame.length <= 0xFFFF) {
 		*cur++ = byte(0x7E | (frame.mask ? 0x80 : 0));
-		*reinterpret_cast<uint16_t *>(cur) = uint16_t(frame.length);
+		*reinterpret_cast<uint16_t *>(cur) = htons(uint16_t(frame.length));
 		cur += 2;
 	} else {
 		*cur++ = byte(0x7F | (frame.mask ? 0x80 : 0));
-		*reinterpret_cast<uint64_t *>(cur) = uint64_t(frame.length);
+		*reinterpret_cast<uint64_t *>(cur) = htonll(uint64_t(frame.length));
 		cur += 8;
 	}
 
@@ -354,9 +390,10 @@ bool WsTransport::sendFrame(const Frame &frame) {
 		auto seed = system_clock::now().time_since_epoch().count();
 		random_bytes_engine generator(seed);
 
-		auto *maskingKey = cur;
-		std::generate(reinterpret_cast<uint8_t *>(maskingKey),
-		              reinterpret_cast<uint8_t *>(maskingKey + 4), generator);
+		byte *maskingKey = reinterpret_cast<byte *>(cur);
+
+		auto u = reinterpret_cast<uint8_t *>(maskingKey);
+		std::generate(u, u + 4, generator);
 		cur += 4;
 
 		for (size_t i = 0; i < frame.length; ++i)