~ubuntu-branches/ubuntu/quantal/psi/quantal

« back to all changes in this revision

Viewing changes to third-party/qca/qca/src/qca_securelayer.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2009-09-25 17:49:51 UTC
  • mfrom: (6.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090925174951-lvm7kdap82o8xhn3
Tags: 0.13-1
* Updated to upstream version 0.13
* Set Standards-Version to 3.8.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
 *
15
15
 * You should have received a copy of the GNU Lesser General Public
16
16
 * License along with this library; if not, write to the Free Software
17
 
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
17
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
18
 * 02110-1301  USA
18
19
 *
19
20
 */
20
21
 
21
22
#include "qca_securelayer.h"
22
23
 
23
24
#include "qcaprovider.h"
 
25
#include "qca_safeobj.h"
24
26
 
25
 
#include <QTimer>
26
27
#include <QPointer>
27
28
 
28
29
namespace QCA {
222
223
        bool server;
223
224
        QString host;
224
225
        TLSContext::SessionInfo sessionInfo;
225
 
        QTimer actionTrigger;
 
226
        SafeTimer actionTrigger;
226
227
        int op;
227
228
        QList<Action> actionQueue;
228
229
        bool need_update;
510
511
                if(op != -1)
511
512
                {
512
513
                        QCA_logTextMessage(QString("tls[%1]: ignoring update while operation active").arg(q->objectName()), Logger::Information);
 
514
                        need_update = true;
513
515
                        return;
514
516
                }
515
517
 
1333
1335
        QString server_realm;
1334
1336
        bool allowClientSendFirst;
1335
1337
        bool disableServerSendLast;
1336
 
        QTimer actionTrigger;
 
1338
        SafeTimer actionTrigger;
1337
1339
        int op;
1338
1340
        QList<Action> actionQueue;
1339
1341
        bool need_update;
1573
1575
                if(op != -1)
1574
1576
                {
1575
1577
                        QCA_logTextMessage(QString("sasl[%1]: ignoring update while operation active").arg(q->objectName()), Logger::Information);
 
1578
                        need_update = true;
1576
1579
                        return;
1577
1580
                }
1578
1581
 
1598
1601
 
1599
1602
                if(last_op == OpStart)
1600
1603
                {
1601
 
                        mech = c->mech();
1602
 
 
1603
1604
                        if(server)
1604
1605
                        {
1605
1606
                                if(r != SASLContext::Success)
1614
1615
                        }
1615
1616
                        else // client
1616
1617
                        {
 
1618
                                mech = c->mech();
 
1619
 
1617
1620
                                // fall into this logic
1618
1621
                                last_op = OpTryAgain;
1619
1622
                        }