Merge branch 'v0.18'

examples/streamer/dispatchqueue.hpp

@@ -15,6 +15,7 @@
 #include <condition_variable>
 #include <queue>
 #include <functional>
+#include <string>
 
 class DispatchQueue {
     typedef std::function<void(void)> fp_t;

src/capi.cpp

@@ -1035,7 +1035,7 @@ int rtcAddTrackEx(int pc, const rtcTrackInit *init) {
 				desc.addVP8Codec(init->payloadType);
 				break;
 			case RTC_CODEC_VP9:
-				desc.addVP8Codec(init->payloadType);
+				desc.addVP9Codec(init->payloadType);
 				break;
 			default:
 				break;

src/impl/pollservice.cpp

@@ -124,13 +124,14 @@ void PollService::process(std::vector<struct pollfd> &pfds) {
 					mSocks->erase(sock);
 					callback(Event::Error);
 
-				} else if (it->revents & POLLIN || it->revents & POLLOUT) {
+				} else if (it->revents & POLLIN || it->revents & POLLOUT || it->revents & POLLHUP) {
 					entry.until = params.timeout
 					                  ? std::make_optional(clock::now() + *params.timeout)
 					                  : nullopt;
 
 					auto callback = params.callback;
-					if (it->revents & POLLIN) {
+					if (it->revents & POLLIN ||
+					    it->revents & POLLHUP) { // Windows does not set POLLIN on close
 						PLOG_VERBOSE << "Poll in event";
 						callback(Event::In);
 					}

src/impl/tls.cpp

@@ -176,15 +176,12 @@ bool check(int success, const string &message) {
 }
 
 bool check(SSL *ssl, int ret, const string &message) {
-	if (ret == BIO_EOF)
-		return true;
-
 	unsigned long err = SSL_get_error(ssl, ret);
 	if (err == SSL_ERROR_NONE || err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) {
 		return true;
 	}
 	if (err == SSL_ERROR_ZERO_RETURN) {
-		PLOG_DEBUG << "DTLS connection cleanly closed";
+		PLOG_DEBUG << "OpenSSL connection cleanly closed";
 		return false;
 	}
 	string str = error_string(err);

src/impl/wshandshake.hpp

@@ -13,6 +13,9 @@
 
 #if RTC_ENABLE_WEBSOCKET
 
+#include <list>
+#include <map>
+#include <stdexcept>
 #include <vector>
 
 namespace rtc::impl {