Changeset 552

Timestamp:

08/01/11 01:32:15 (10 months ago)

Author:

shiretu

Message:

-- removed the SSL flash hack
-- added bandwidth hint on stream stats

Location:

trunk/sources/thelib/src

Files:

• protocols/ssl/inboundsslprotocol.cpp (modified) (1 diff)
• streaming/baseinstream.cpp (modified) (1 diff)
• streaming/baseoutstream.cpp (modified) (1 diff)

trunk/sources/thelib/src/protocols/ssl/inboundsslprotocol.cpp

@@ -84 +84 @@
                 SSL_CTX_set_verify(_pGlobalSSLContext, SSL_VERIFY_NONE, NULL);
 
-                //7. Lock on the RC4-SHA. Apparently, the latest and the greatest flash plugin
-                //only works with this little fucker
-                WARN("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-                WARN("!!! This is an ugly hack which deactivates !!!");
-                WARN("!!! all the ciphers inside OpenSSL and     !!!");
-                WARN("!!! only keeps RC4-SHA. If you don't use   !!!");
-                WARN("!!! InboundSSLProtocol inside other stuff, !!!");
-                WARN("!!! you can safely ignore this             !!!");
-                WARN("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-                if (SSL_CTX_set_cipher_list(_pGlobalSSLContext, "!DEFAULT:RC4-SHA") == 0) {
-                        FATAL("Unable to select the RC4-SHA cipher. Error was: %s",
-                                        STR(GetSSLErrors()));
-                        SSL_CTX_free(_pGlobalSSLContext);
-                        _pGlobalSSLContext = NULL;
-                        return false;
-                }
-
                 //7. Store the global context for later usage
                 _pGlobalContexts[hash] = _pGlobalSSLContext;

trunk/sources/thelib/src/streaming/baseinstream.cpp

@@ -59 +59 @@
                 pTemp = pTemp->pPrev;
         }
+        StreamCapabilities *pCapabilities = GetCapabilities();
+        if (pCapabilities != NULL)
+                info["bandwidth"] = (uint32_t) pCapabilities->bandwidthHint;
+        else
+                info["bandwidth"] = (uint32_t) 0;
 }
 

trunk/sources/thelib/src/streaming/baseoutstream.cpp

@@ -113 +113 @@
                 info["inStreamUniqueId"] = Variant();
         }
+        StreamCapabilities *pCapabilities = GetCapabilities();
+        if (pCapabilities != NULL)
+                info["bandwidth"] = (uint32_t) pCapabilities->bandwidthHint;
+        else
+                info["bandwidth"] = (uint32_t) 0;
 }