Changeset 4631 for pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/types.hpp

Timestamp:

Oct 23, 2013 5:34:48 AM (11 years ago)

Author:

bennylp

Message:

More re #1519:

• account API implementation (incomplete, callback is still not called)
• using callback class design pattern (observer?)
• after this, it might be changed to use inheritance pattern instead

File:

• pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/types.hpp (modified) (5 diffs)

pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/types.hpp

@@ -70 +70 @@
 typedef void *TransportHandle;
 
+/*
+ * Forward declaration of Account, AccountCallback, AccountConfig, to be used
+ * by Endpoint.
+ */
+class Account;
+class AccountCallback;
+class AccountConfig;
+
 
 /**
@@ -105 +113 @@
     /** The line number of PJSUA source file that throws the error */
     int         srcLine;
+
+    /** Build error string. */
+    string      info(bool multi_line=false) const;
 
     /** Default constructor */
@@ -156 +167 @@
         PJSUA2_CHECK_RAISE_ERROR2(status, "")
 
+#define PJSUA2_CHECK_EXPR(expr)                 \
+        do { \
+            pj_status_t the_status = expr;      \
+            PJSUA2_CHECK_RAISE_ERROR2(the_status, #expr); \
+        } while (0)
 
 //////////////////////////////////////////////////////////////////////////////
@@ -166 +182 @@
 {
     /**
+     * The authentication scheme (e.g. "digest").
+     */
+    string      scheme;
+
+    /**
      * Realm on which this credential is to be used. Use "*" to make
      * a credential that can be used to authenticate against any challenges.
      */
     string      realm;
-
-    /**
-     * The authentication scheme (e.g. "digest").
-     */
-    string      scheme;
 
     /**
@@ -208 +224 @@
     string      akaAmf;
 
+    /** Default constructor */
+    AuthCredInfo();
+
+    /** Construct a credential with the specified parameters */
+    AuthCredInfo(const string &scheme,
+                 const string &realm,
+                 const string &user_name,
+                 const int data_type,
+                 const string data);
 };