patches/ekiga-13-opal-bz356696.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 8477 97eab3f1978f
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8477
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
     1
--- opal/src/sip/sippdu.cxx.old	2006-10-31 18:01:23.337125000 +0800
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
     2
+++ opal/src/sip/sippdu.cxx	2006-10-31 18:01:51.738194000 +0800
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
     3
@@ -1231,7 +1231,7 @@
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
     4
 
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
     5
   qopAuth = qopAuthInt = FALSE;
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
     6
   cnonce.MakeEmpty();
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
     7
-  nonceCount = 1;
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
     8
+  nonceCount.SetValue(1) ;
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
     9
 
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    10
   if (auth.Find("digest") != 0) {
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    11
     PTRACE(1, "SIP\tUnknown authentication type");
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    12
--- opal/include/sip/sippdu.h.old	2006-10-31 18:03:24.062915000 +0800
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    13
+++ opal/include/sip/sippdu.h	2006-10-31 17:54:42.786540000 +0800
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    14
@@ -453,6 +453,24 @@
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    15
       const PString & password = PString::Empty()
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    16
     );
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    17
 
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    18
+    SIPAuthentication & operator =(const SIPAuthentication & auth)
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    19
+    {
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    20
+      isProxy   = auth.isProxy;
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    21
+      authRealm = auth.authRealm;
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    22
+      username  = auth.username;
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    23
+      password  = auth.password;
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    24
+      nonce     = auth.nonce;
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    25
+      algorithm = auth.algorithm;
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    26
+                  opaque    = auth.opaque;
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    27
+
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    28
+                  qopAuth    = auth.qopAuth;
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    29
+                  qopAuthInt = auth.qopAuthInt;
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    30
+                  cnonce     = auth.cnonce;
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    31
+                  nonceCount.SetValue(auth.nonceCount);
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    32
+
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    33
+      return *this;
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    34
+    }
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    35
+
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    36
     BOOL Parse(
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    37
       const PCaselessString & auth,
97eab3f1978f 2006-11-02 Dave Lin <[email protected]>
davelam
parents:
diff changeset
    38
       BOOL proxy