Changeset 2998 for pjproject/trunk/pjlib/src/pj/ssl_sock_symbian.cpp

Timestamp:

Nov 9, 2009 8:51:34 AM (14 years ago)

Author:

bennylp

Message:

Ticket #950 and #957:

• added QoS options on PJLIB/PJLIB SSL/TLS socket/transport
• added demo in Symbian ua.cpp

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_symbian.cpp (modified) (8 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_symbian.cpp

@@ -98 +98 @@
     };
     
-    static CPjSSLSocket *NewL(const TDesC8 &ssl_proto) {
-        CPjSSLSocket *self = new (ELeave) CPjSSLSocket();
+    static CPjSSLSocket *NewL(const TDesC8 &ssl_proto,
+                              pj_qos_type qos_type,
+                              const pj_qos_params &qos_params) 
+    {
+        CPjSSLSocket *self = new (ELeave) CPjSSLSocket(qos_type, qos_params);
         CleanupStack::PushL(self);
         self->ConstructL(ssl_proto);
@@ -131 +134 @@
     CSecureSocket       *securesock_;
     bool                 is_connected_;
+    
+    pj_qos_type          qos_type_;
+    pj_qos_params        qos_params_;
+                              
     CPjSSLSocketReader  *reader_;
     TBuf<32>             ssl_proto_;
@@ -144 +151 @@
     void RunL();
 
-    CPjSSLSocket() :
+    CPjSSLSocket(pj_qos_type qos_type, const pj_qos_params &qos_params) :
         CActive(0), state_(SSL_STATE_NULL), sock_(PJ_INVALID_SOCKET), 
-        securesock_(NULL), 
-        is_connected_(false), reader_(NULL),
-        cb_(NULL), key_(NULL)
+        securesock_(NULL), is_connected_(false),
+        qos_type_(qos_type), qos_params_(qos_params),
+        reader_(NULL),  cb_(NULL), key_(NULL)
     {}
     
@@ -165 +172 @@
         }
         if (sock_ != PJ_INVALID_SOCKET) {
-            delete (CPjSocket*)sock_;
+            pj_sock_close(sock_);
             sock_ = PJ_INVALID_SOCKET;
         }           
@@ -184 +191 @@
         return status;
 
+    // Apply QoS
+    status = pj_sock_apply_qos2(sock_, qos_type_, &qos_params_, 
+                                2,  THIS_FILE, NULL);
+    
     RSocket &rSock = ((CPjSocket*)sock_)->Socket();
 
@@ -412 +423 @@
     pj_sockaddr          local_addr;
     pj_sockaddr          rem_addr;
+
+    /* QoS settings */
+    pj_qos_type          qos_type;
+    pj_qos_params        qos_params;
+    pj_bool_t            qos_ignore_error;
+
 
     pj_ssl_sock_proto    proto;
@@ -502 +519 @@
     }
     pj_strdup_with_null(pool, &ssock->servername, &param->server_name);
+
+    ssock->qos_type = param->qos_type;
+    ssock->qos_ignore_error = param->qos_ignore_error;
+    pj_memcpy(&ssock->qos_params, &param->qos_params,
+              sizeof(param->qos_params));
 
     /* Finally */
@@ -1062 +1084 @@
 
     /* Init SSL engine */
-    TRAPD(err, sock = CPjSSLSocket::NewL(proto));
+    TRAPD(err, sock = CPjSSLSocket::NewL(proto, ssock->qos_type, 
+                                         ssock->qos_params));
     if (err != KErrNone)
         return PJ_ENOMEM;