Changeset 87 for trunk/sources/thelib/src/protocols/defaultprotocolfactory.cpp

Timestamp:

08/21/10 19:30:35 (21 months ago)

Author:

shiretu

Message:

-- work on android apple streaming
-- work on new SSL support

File:

• trunk/sources/thelib/src/protocols/defaultprotocolfactory.cpp (modified) (4 diffs)

trunk/sources/thelib/src/protocols/defaultprotocolfactory.cpp

@@ -23 +23 @@
 #include "protocols/rtmp/inboundrtmpprotocol.h"
 #include "protocols/rtmp/outboundrtmpprotocol.h"
-#include "protocols/sslprotocol.h"
+#include "protocols/ssl/inboundsslprotocol.h"
+#include "protocols/ssl/outboundsslprotocol.h"
 #include "protocols/dns/inbounddnsresolverprotocol.h"
 #include "protocols/dns/outbounddnsresolverprotocol.h"
@@ -51 +52 @@
         ADD_VECTOR_END(result, PT_TCP);
         ADD_VECTOR_END(result, PT_UDP);
-        ADD_VECTOR_END(result, PT_SSL);
+        ADD_VECTOR_END(result, PT_INBOUND_SSL);
+        ADD_VECTOR_END(result, PT_OUTBOUND_SSL);
         ADD_VECTOR_END(result, PT_INBOUND_DNS);
         ADD_VECTOR_END(result, PT_OUTBOUND_DNS);
@@ -156 +158 @@
         else if (name == CONF_PROTOCOL_INBOUND_RTMPS) {
                 ADD_VECTOR_END(result, PT_TCP);
-                ADD_VECTOR_END(result, PT_SSL);
+                ADD_VECTOR_END(result, PT_INBOUND_SSL);
                 ADD_VECTOR_END(result, PT_INBOUND_HTTP);
                 ADD_VECTOR_END(result, PT_INBOUND_HTTP_FOR_RTMP);
@@ -256 +258 @@
                         pResult = new UDPProtocol();
                         break;
-                case PT_SSL:
-                        pResult = new SSLProtocol();
+                case PT_INBOUND_SSL:
+                        pResult = new InboundSSLProtocol();
+                        break;
+                case PT_OUTBOUND_SSL:
+                        pResult = new OutboundSSLProtocol();
                         break;
                 case PT_INBOUND_DNS: