Changeset 503

Timestamp:

Jun 13, 2006 10:57:13 PM (19 years ago)

Author:

bennylp

Message:

-- REWRITE OF PJSUA API --

Location:

pjproject/trunk

Files:

• pjlib/src/pj/config.c (modified) (1 diff)
• pjsip-apps/build (modified) (1 prop)
• pjsip-apps/build/activex-pjsua.dsp (modified) (1 diff)
• pjsip-apps/build/pjsua.dsp (modified) (1 diff)
• pjsip-apps/src/activex-pjsua (modified) (1 prop)
• pjsip-apps/src/pjsua/main.c (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua.c (added)
• pjsip/build/pjsua_lib.dsp (modified) (3 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (19 diffs)
• pjsip/include/pjsua-lib/pjsua_console_app.h (deleted)
• pjsip/include/pjsua-lib/pjsua_internal.h (added)
• pjsip/src/pjsua-lib/pjsua_acc.c (added)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (33 diffs)
• pjsip/src/pjsua-lib/pjsua_console_app.c (deleted)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (9 diffs)
• pjsip/src/pjsua-lib/pjsua_im.c (modified) (13 diffs)
• pjsip/src/pjsua-lib/pjsua_imp.h (deleted)
• pjsip/src/pjsua-lib/pjsua_media.c (added)
• pjsip/src/pjsua-lib/pjsua_pres.c (modified) (27 diffs)
• pjsip/src/pjsua-lib/pjsua_reg.c (deleted)
• pjsip/src/pjsua-lib/pjsua_settings.c (deleted)

pjproject/trunk/pjlib/src/pj/config.c

@@ -22 +22 @@
 
 static const char *id = "config.c";
-const char *PJ_VERSION = "0.5.5.6";
+const char *PJ_VERSION = "0.5.6.0";
 
 PJ_DEF(void) pj_dump_config(void)

pjproject/trunk/pjsip-apps/build

@@ -8 +8 @@
 *.suo
 *.pdb
+activex-pjsua_p.c
+dlldata.c

@@ -8 +8 @@
 *.suo
 *.pdb
+activex-pjsua_p.c
+dlldata.c

pjproject/trunk/pjsip-apps/build/activex-pjsua.dsp

@@ -324 +324 @@
 # Begin Source File
 
-SOURCE="..\src\activex-pjsua\pjsua.h"
+SOURCE="..\src\activex-pjsua\pjsua-structs.h"
 # End Source File
 # Begin Source File

pjproject/trunk/pjsip-apps/build/pjsua.dsp

@@ -93 +93 @@
 SOURCE=..\src\pjsua\main.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\src\pjsua\pjsua.c
+# End Source File
 # End Group
 # Begin Group "Header Files"

pjproject/trunk/pjsip-apps/src/pjsua/main.c

@@ -18 +18 @@
  */
 #include <pjsua-lib/pjsua.h>
-#include <pjsua-lib/pjsua_console_app.h>
-
 
 #define THIS_FILE       "main.c"
 
-/*****************************************************************************
- * main():
+
+/*
+ * These are defined in pjsua.c.
  */
+pj_status_t app_init(int argc, char *argv[]);
+pj_status_t app_main(void);
+pj_status_t app_destroy(void);
+
 int main(int argc, char *argv[])
 {
-    pjsua_config cfg;
-    pj_str_t uri_to_call = { NULL, 0 };
-
-    /* Init default settings. */
-    pjsua_default_config(&cfg);
-
-
-    /* Create PJLIB and memory pool */
-    pjsua_create();
-
-
-    /* Parse command line arguments: */
-    if (pjsua_parse_args(argc, argv, &cfg, &uri_to_call) != PJ_SUCCESS)
+    if (app_init(argc, argv) != PJ_SUCCESS)
         return 1;
 
-
-    /* Init pjsua */
-    if (pjsua_init(&cfg, &console_callback) != PJ_SUCCESS)
-        return 1;
-
-
-    /* Start pjsua! */
-    if (pjsua_start() != PJ_SUCCESS) {
-        pjsua_destroy();
-        return 1;
-    }
-
-
-    /* Sleep for a while, let any messages get printed to console: */
-    pj_thread_sleep(500);
-
-
-    /* Start UI console main loop: */
-    pjsua_console_app_main(&uri_to_call);
-
-
-    /* Destroy pjsua: */
-    pjsua_destroy();
-
-    /* This is for internal testing, to make sure that pjsua_destroy()
-     * can be called multiple times. 
-     */
-    pjsua_destroy();
-
-
-    /* Exit... */
+    app_main();
+    app_destroy();
 
     return 0;

pjproject/trunk/pjsip/build/pjsua_lib.dsp

@@ -88 +88 @@
 # Begin Source File
 
-SOURCE="..\src\pjsua-lib\pjsua_call.c"
+SOURCE="..\src\pjsua-lib\pjsua_acc.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\src\pjsua-lib\pjsua_console_app.c"
+SOURCE="..\src\pjsua-lib\pjsua_call.c"
 # End Source File
 # Begin Source File
@@ -104 +104 @@
 # Begin Source File
 
-SOURCE="..\src\pjsua-lib\pjsua_imp.h"
+SOURCE="..\src\pjsua-lib\pjsua_media.c"
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjsua-lib\pjsua_pres.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\pjsua-lib\pjsua_reg.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\pjsua-lib\pjsua_settings.c"
 # End Source File
 # End Group
@@ -128 +120 @@
 # Begin Source File
 
-SOURCE="..\include\pjsua-lib\pjsua_console_app.h"
+SOURCE="..\include\pjsua-lib\pjsua_internal.h"
 # End Source File
 # End Group

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -57 +57 @@
  */
 #ifndef PJSUA_MAX_CALLS
-#   define PJSUA_MAX_CALLS          256
+#   define PJSUA_MAX_CALLS          32
 #endif
 
 
 /**
+ * Max ports in the conference bridge.
+ */
+#ifndef PJSUA_MAX_CONF_PORTS
+#   define PJSUA_MAX_CONF_PORTS     254
+#endif
+
+
+/**
  * Maximum accounts.
  */
 #ifndef PJSUA_MAX_ACC
-#   define PJSUA_MAX_ACC            32
+#   define PJSUA_MAX_ACC            8
 #endif
 
 
+/**
+ * Maximum proxies in account.
+ */
+#ifndef PJSUA_ACC_MAX_PROXIES
+#   define PJSUA_ACC_MAX_PROXIES    8
+#endif
+
+/**
+ * Default registration interval.
+ */
+#ifndef PJSUA_REG_INTERVAL
+#   define PJSUA_REG_INTERVAL       55
+#endif
+
+
+/** Account identification */
 typedef int pjsua_acc_id;
+
+/** Call identification */
+typedef int pjsua_call_id;
+
+/** SIP transport identification */
+typedef int pjsua_transport_id;
+
+/** Buddy identification */
 typedef int pjsua_buddy_id;
+
+/** File player identification */
 typedef int pjsua_player_id;
+
+/** File recorder identification */
 typedef int pjsua_recorder_id;
+
+/** Conference port identification */
 typedef int pjsua_conf_port_id;
 
 
+/** Constant to identify invalid ID for all sorts of IDs. */
+#define PJSUA_INVALID_ID            (-1)
+
+
+
 /**
  * Account configuration.
  */
-struct pjsua_acc_config
-{
-    /** SIP URL for account ID (mandatory) */
+typedef struct pjsua_acc_config
+{
+    /** 
+     * The full SIP URL for the account. The value can take name address or 
+     * URL format, and will look something like "sip:account@serviceprovider".
+     *
+     * This field is mandatory.
+     */
     pj_str_t        id;
 
-    /** Registrar URI (mandatory) */
+    /** 
+     * This is the URL to be put in the request URI for the registration,
+     * and will look something like "sip:serviceprovider".
+     *
+     * This field should be specified if registration is desired. If the
+     * value is empty, no account registration will be performed.
+     */
     pj_str_t        reg_uri;
 
-    /** Optional contact URI */
+    /** 
+     * Optional URI to be put as Contact for this account. It is recommended
+     * that this field is left empty, so that the value will be calculated
+     * automatically based on the transport address.
+     */
     pj_str_t        contact;
 
-    /** Service proxy (default: none) */
-    pj_str_t        proxy;
-
-    /** Default timeout (mandatory) */
-    pj_int32_t      reg_timeout;
-
-    /** Number of credentials. */
+    /**
+     * Number of proxies in the proxy array below.
+     */
+    unsigned        proxy_cnt;
+
+    /** 
+     * Optional URI of the proxies to be visited for all outgoing requests 
+     * that are using this account (REGISTER, INVITE, etc). Application need 
+     * to specify these proxies if the service provider requires that requests
+     * destined towards its network should go through certain proxies first
+     * (for example, border controllers).
+     *
+     * These proxies will be put in the route set for this account, with 
+     * maintaining the orders (the first proxy in the array will be visited
+     * first).
+     */
+    pj_str_t        proxy[PJSUA_ACC_MAX_PROXIES];
+
+    /** 
+     * Optional interval for registration, in seconds. If the value is zero, 
+     * default interval will be used (PJSUA_REG_INTERVAL, 55 seconds).
+     */
+    unsigned        reg_timeout;
+
+    /** 
+     * Number of credentials in the credential array.
+     */
     unsigned        cred_count;
 
-    /** Array of credentials. */
-    pjsip_cred_info cred_info[4];
-
-};
-
-
-/**
- * @see pjsua_acc_config
- */
-typedef struct pjsua_acc_config pjsua_acc_config;
-
-
-/**
- * PJSUA settings.
- */
-struct pjsua_config
-{
-    /** SIP UDP signaling port. Set to zero to disable UDP signaling,
-     * which in this case application must manually add a transport
-     * to SIP endpoint.
-     * (default: 5060) 
-     */
-    unsigned    udp_port;
-
-    /** Optional hostname or IP address to publish as the host part of
-     *  Contact header. This must be specified if UDP transport is
-     *  disabled.
-     *  (default: NULL)
-     */
-    pj_str_t    sip_host;
-
-    /** Optional port number to publish in the port part of Contact header.
-     *  This must be specified if UDP transport is disabled.
-     *  (default: 0)
-     */
-    unsigned    sip_port;
-
-    /** Start of RTP port. Set to zero to prevent pjsua from creating
-     *  media transports, which in this case application must manually
-     *  create media transport for each calls.
-     *  (default: 4000) 
-     */
-    unsigned    start_rtp_port;
-
-    /**
-     * Enable incoming and outgoing message logging (default: 1).
+    /** 
+     * Array of credentials. If registration is desired, normally there should
+     * be at least one credential specified, to successfully authenticate
+     * against the service provider. More credentials can be specified, for
+     * example when the requests are expected to be challenged by the
+     * proxies in the route set.
+     */
+    pjsip_cred_info cred_info[PJSUA_ACC_MAX_PROXIES];
+
+} pjsua_acc_config;
+
+
+/**
+ * Call this function to initialize account config with default values.
+ *
+ * @param cfg       The account config to be initialized.
+ */
+PJ_INLINE(void) pjsua_acc_config_default(pjsua_acc_config *cfg)
+{
+    pj_memset(cfg, 0, sizeof(*cfg));
+
+    cfg->reg_timeout = PJSUA_REG_INTERVAL;
+}
+
+
+
+/**
+ * Account info. Application can query account info by calling 
+ * #pjsua_acc_get_info().
+ */
+typedef struct pjsua_acc_info
+{
+    /** 
+     * The account ID. 
+     */
+    pjsua_acc_id        id;
+
+    /**
+     * Flag to indicate whether this is the default account.
+     */
+    pj_bool_t           is_default;
+
+    /** 
+     * Account URI 
+     */
+    pj_str_t            acc_uri;
+
+    /** 
+     * Flag to tell whether this account has registration setting
+     * (reg_uri is not empty).
+     */
+    pj_bool_t           has_registration;
+
+    /**
+     * An up to date expiration interval for account registration session.
+     */
+    int                 expires;
+
+    /**
+     * Last registration status code. If status code is zero, the account
+     * is currently not registered. Any other value indicates the SIP
+     * status code of the registration.
+     */
+    pjsip_status_code   status;
+
+    /**
+     * String describing the registration status.
+     */
+    pj_str_t            status_text;
+
+    /**
+     * Presence online status for this account.
+     */
+    pj_bool_t           online_status;
+
+    /**
+     * Buffer that is used internally to store the status text.
+     */
+    char                buf_[PJ_ERR_MSG_SIZE];
+
+} pjsua_acc_info;
+
+
+
+/**
+ * STUN configuration.
+ */
+typedef struct pjsua_stun_config
+{
+    /**
+     * The first STUN server IP address or hostname.
+     */
+    pj_str_t    stun_srv1;
+
+    /**
+     * Port number of the first STUN server.
+     * If zero, default STUN port will be used.
+     */
+    unsigned    stun_port1;
+    
+    /**
+     * Optional second STUN server IP address or hostname, for which the
+     * result of the mapping request will be compared to. If the value
+     * is empty, only one STUN server will be used.
+     */
+    pj_str_t    stun_srv2;
+
+    /**
+     * Port number of the second STUN server.
+     * If zero, default STUN port will be used.
+     */
+    unsigned    stun_port2;
+
+} pjsua_stun_config;
+
+
+
+/**
+ * Call this function to initialize STUN config with default values.
+ *
+ * @param cfg       The STUN config to be initialized.
+ */
+PJ_INLINE(void) pjsua_stun_config_default(pjsua_stun_config *cfg)
+{
+    pj_memset(cfg, 0, sizeof(*cfg));
+}
+
+
+/**
+ * Transport configuration for creating UDP transports for both SIP
+ * and media.
+ */
+typedef struct pjsua_transport_config
+{
+    /**
+     * UDP port number to bind locally. This setting MUST be specified
+     * even when default port is desired. If the value is zero, the
+     * transport will be bound to any available port, and application
+     * can query the port by querying the transport info.
+     */
+    unsigned            port;
+
+    /**
+     * Optional address where the socket should be bound.
+     */
+    pj_in_addr          ip_addr;
+
+    /**
+     * Flag to indicate whether STUN should be used.
+     */
+    pj_bool_t           use_stun;
+
+    /**
+     * STUN configuration, must be specified when STUN is used.
+     */
+    pjsua_stun_config   stun_config;
+
+} pjsua_transport_config;
+
+
+/**
+ * Call this function to initialize UDP config with default values.
+ *
+ * @param cfg       The UDP config to be initialized.
+ */
+PJ_INLINE(void) pjsua_transport_config_default(pjsua_transport_config *cfg)
+{
+    pj_memset(cfg, 0, sizeof(*cfg));
+}
+
+
+/**
+ * Normalize STUN config.
+ */
+PJ_INLINE(void) pjsua_normalize_stun_config( pjsua_stun_config *cfg )
+{
+    if (cfg->stun_srv1.slen) {
+
+        if (cfg->stun_port1 == 0)
+            cfg->stun_port1 = 3478;
+
+        if (cfg->stun_srv2.slen == 0) {
+            cfg->stun_srv2 = cfg->stun_srv1;
+            cfg->stun_port2 = cfg->stun_port1;
+        } else {
+            if (cfg->stun_port2 == 0)
+                cfg->stun_port2 = 3478;
+        }
+
+    } else {
+        cfg->stun_port1 = 0;
+        cfg->stun_srv2.slen = 0;
+        cfg->stun_port2 = 0;
+    }
+}
+
+
+/**
+ * Duplicate transport config.
+ */
+PJ_INLINE(void) pjsua_transport_config_dup(pj_pool_t *pool,
+                                           pjsua_transport_config *dst,
+                                           const pjsua_transport_config *src)
+{
+    pj_memcpy(dst, src, sizeof(*src));
+
+    if (src->stun_config.stun_srv1.slen) {
+        pj_strdup_with_null(pool, &dst->stun_config.stun_srv1,
+                            &src->stun_config.stun_srv1);
+    }
+
+    if (src->stun_config.stun_srv2.slen) {
+        pj_strdup_with_null(pool, &dst->stun_config.stun_srv2,
+                            &src->stun_config.stun_srv2);
+    }
+
+    pjsua_normalize_stun_config(&dst->stun_config);
+}
+
+
+
+/**
+ * Transport info.
+ */
+typedef struct pjsua_transport_info
+{
+    /**
+     * PJSUA transport identification.
+     */
+    pjsua_transport_id      id;
+
+    /**
+     * Transport type.
+     */
+    pjsip_transport_type_e  type;
+
+    /**
+     * Transport type name.
+     */
+    pj_str_t                type_name;
+
+    /**
+     * Transport string info/description.
+     */
+    pj_str_t                info;
+
+    /**
+     * Transport flag (see ##pjsip_transport_flags_e).
+     */
+    unsigned                flag;
+
+    /**
+     * Local address length.
+     */
+    unsigned                addr_len;
+
+    /**
+     * Local/bound address.
+     */
+    pj_sockaddr             local_addr;
+
+    /**
+     * Published address (or transport address name).
+     */
+    pjsip_host_port         local_name;
+
+    /**
+     * Current number of objects currently referencing this transport.
+     */
+    unsigned                usage_count;
+
+
+} pjsua_transport_info;
+
+
+/**
+ * Media configuration.
+ */
+typedef struct pjsua_media_config
+{
+    /**
+     * Clock rate to be applied to the conference bridge.
+     * If value is zero, default clock rate will be used (16KHz).
+     */
+    unsigned            clock_rate;
+
+    /**
+     * Specify maximum number of media ports to be created in the
+     * conference bridge. Since all media terminate in the bridge
+     * (calls, file player, file recorder, etc), the value must be
+     * large enough to support all of them. However, the larger
+     * the value, the more computations are performed.
+     */
+    unsigned            max_media_ports;
+
+    /**
+     * Specify whether the media manager should manage its own
+     * ioqueue for the RTP/RTCP sockets. If yes, ioqueue will be created
+     * and at least one worker thread will be created too. If no,
+     * the RTP/RTCP sockets will share the same ioqueue as SIP sockets,
+     * and no worker thread is needed.
+     *
+     * Normally application would say yes here, unless it wants to
+     * run everything from a single thread.
+     */
+    pj_bool_t           has_ioqueue;
+
+    /**
+     * Specify the number of worker threads to handle incoming RTP
+     * packets. A value of one is recommended for most applications.
+     */
+    unsigned            thread_cnt;
+
+
+} pjsua_media_config;
+
+
+/**
+ * Use this function to initialize media config.
+ *
+ * @param cfg   The media config to be initialized.
+ */
+PJ_INLINE(void) pjsua_media_config_default(pjsua_media_config *cfg)
+{
+    pj_memset(cfg, 0, sizeof(*cfg));
+
+    cfg->clock_rate = 16000;
+    cfg->max_media_ports = 32;
+    cfg->has_ioqueue = PJ_TRUE;
+    cfg->thread_cnt = 1;
+}
+
+
+
+/**
+ * Logging configuration.
+ */
+typedef struct pjsua_logging_config
+{
+    /**
+     * Log incoming and outgoing SIP message? Yes!
      */
     pj_bool_t   msg_logging;
 
-    /** Maximum calls to support (default: 4) */
-    unsigned    max_calls;
-
-    /** Maximum slots in the conference bridge (default: 0/calculated
-     *  as max_calls*2
-     */
-    unsigned    conf_ports;
-
-    /** Number of worker threads (value >=0, default: 1) */
-    unsigned    thread_cnt;
-
-    /** Separate ioqueue for media? (default: yes) */
-    pj_bool_t   media_has_ioqueue;
-
-    /** Number of worker thread for media (value >=0, default: 1) */
-    unsigned    media_thread_cnt;
-
-    /** First STUN server IP address. When STUN is configured, then the
-     *  two STUN server settings must be fully set.
-     *  (default: none) 
-     */
-    pj_str_t    stun_srv1;
-
-    /** First STUN port number */
-    unsigned    stun_port1;
-
-    /** Second STUN server IP address */
-    pj_str_t    stun_srv2;
-
-    /** Second STUN server port number */
-    unsigned    stun_port2;
-
-    /** Sound player device ID (default: 0) */
-    unsigned    snd_player_id;
-
-    /** Sound capture device ID (default: 0) */
-    unsigned    snd_capture_id;
-
-    /** Internal clock rate (to be applied to sound devices and conference
-     *  bridge, default is 0/follows the codec, or 44100 for MacOS).
-     */
-    unsigned    clock_rate;
-
-    /** Do not use sound device (default: 0). */
-    pj_bool_t   null_audio;
-
-    /** WAV file to load for auto_play (default: NULL) */
-    pj_str_t    wav_file;
-
-    /** Auto play WAV file for calls? (default: no) */
-    pj_bool_t   auto_play;
-
-    /** Auto loopback calls? (default: no) */
-    pj_bool_t   auto_loop;
-
-    /** Automatically put calls to conference? (default: no) */
-    pj_bool_t   auto_conf;
-
-    /** Speex codec complexity? (default: 10) */
-    unsigned    complexity;
-
-    /** Speex codec quality? (default: 10) */
-    unsigned    quality;
-
-    /** Codec ptime? (default: 0 (follows the codec)) */
-    unsigned    ptime;
-
-    /** Number of additional codecs/"--add-codec" with pjsua (default: 0) */
-    unsigned    codec_cnt;
-
-    /** Additional codecs/"--add-codec" options */
-    pj_str_t    codec_arg[32];
-
-    /** SIP status code to be automatically sent to incoming calls
-     *  (default: 100).
-     */
-    unsigned    auto_answer;
-
-    /** Periodic time to refresh call with re-INVITE (default: 0)
-     */
-    unsigned    uas_refresh;
-
-    /** Maximum incoming call duration (default: 3600) */
-    unsigned    uas_duration;
-
-    /** Outbound proxy (default: none) */
-    pj_str_t    outbound_proxy;
-
-    /** Number of SIP accounts */
-    unsigned    acc_cnt;
-
-    /** SIP accounts configuration */
-    pjsua_acc_config    acc_config[32];
-
-    /** Logging verbosity (default: 5). */
-    unsigned    log_level;
-
-    /** Logging to be displayed to stdout (default: 4) */
-    unsigned    app_log_level;
-
-    /** Log decoration */
-    unsigned    log_decor;
-
-    /** Optional log filename (default: NULL) */
+    /**
+     * Input verbosity level. Value 5 is reasonable.
+     */
+    unsigned    level;
+
+    /**
+     * Verbosity level for console. Value 4 is reasonable.
+     */
+    unsigned    console_level;
+
+    /**
+     * Log decoration.
+     */
+    unsigned    decor;
+
+    /**
+     * Optional log filename.
+     */
     pj_str_t    log_filename;
 
-    /** Number of buddies in address book (default: 0) */
-    unsigned    buddy_cnt;
-
-    /** Buddies URI */
-    pj_str_t    buddy_uri[256];
-};
-
-
-/**
- * @see pjsua_config
- */
-typedef struct pjsua_config pjsua_config;
-
+    /**
+     * Optional callback function to be called to write log to 
+     * application specific device. This function will be called for
+     * log messages on input verbosity level.
+     */
+    void       (*cb)(int level, const char *data, pj_size_t len);
+
+
+} pjsua_logging_config;
+
+
+/**
+ * Use this function to initialize logging config.
+ *
+ * @param cfg   The logging config to be initialized.
+ */
+PJ_INLINE(void) pjsua_logging_config_default(pjsua_logging_config *cfg)
+{
+    pj_memset(cfg, 0, sizeof(*cfg));
+
+    cfg->msg_logging = PJ_TRUE;
+    cfg->level = 5;
+    cfg->console_level = 4;
+    cfg->decor = PJ_LOG_HAS_SENDER | PJ_LOG_HAS_TIME | 
+                 PJ_LOG_HAS_MICRO_SEC | PJ_LOG_HAS_NEWLINE;
+}
+
+/**
+ * Use this function to duplicate logging config.
+ *
+ * @param pool      Pool to use.
+ * @param dst       Destination config.
+ * @param src       Source config.
+ */
+PJ_INLINE(void) pjsua_logging_config_dup(pj_pool_t *pool,
+                                         pjsua_logging_config *dst,
+                                         const pjsua_logging_config *src)
+{
+    pj_memcpy(dst, src, sizeof(*src));
+    pj_strdup_with_null(pool, &dst->log_filename, &src->log_filename);
+}
+
+
+/**
+ * Buddy configuration.
+ */
+typedef struct pjsua_buddy_config
+{
+    /**
+     * Buddy URL or name address.
+     */
+    pj_str_t    uri;
+
+    /**
+     * Specify whether presence subscription should start immediately.
+     */
+    pj_bool_t   subscribe;
+
+} pjsua_buddy_config;
+
+
+/**
+ * Buddy's online status.
+ */
+typedef enum pjsua_buddy_status
+{
+    /**
+     * Online status is unknown (possibly because no presence subscription
+     * has been established).
+     */
+    PJSUA_BUDDY_STATUS_UNKNOWN,
+
+    /**
+     * Buddy is known to be offline.
+     */
+    PJSUA_BUDDY_STATUS_ONLINE,
+
+    /**
+     * Buddy is offline.
+     */
+    PJSUA_BUDDY_STATUS_OFFLINE,
+
+} pjsua_buddy_status;
+
+
+
+/**
+ * Buddy info.
+ */
+typedef struct pjsua_buddy_info
+{
+    /**
+     * The buddy ID.
+     */
+    pjsua_buddy_id      id;
+
+    /**
+     * The full URI of the buddy, as specified in the configuration.
+     */
+    pj_str_t            uri;
+
+    /**
+     * Buddy's Contact, only available when presence subscription has
+     * been established to the buddy.
+     */
+    pj_str_t            contact;
+
+    /**
+     * Buddy's online status.
+     */
+    pjsua_buddy_status  status;
+
+    /**
+     * Text to describe buddy's online status.
+     */
+    pj_str_t            status_text;
+
+    /**
+     * Flag to indicate that we should monitor the presence information for
+     * this buddy (normally yes, unless explicitly disabled).
+     */
+    pj_bool_t           monitor_pres;
+
+    /**
+     * Internal buffer.
+     */
+    char                buf_[256];
+
+} pjsua_buddy_info;
+
+
+/**
+ * Codec config.
+ */
+typedef struct pjsua_codec_info
+{
+    /**
+     * Codec unique identification.
+     */
+    pj_str_t            codec_id;
+
+    /**
+     * Codec priority (integer 0-255).
+     */
+    pj_uint8_t          priority;
+
+    /**
+     * Internal buffer.
+     */
+    char                buf_[32];
+
+} pjsua_codec_info;
 
 
@@ -272 +698 @@
  * Application callbacks.
  */
-struct pjsua_callback
+typedef struct pjsua_callback
 {
     /**
@@ -279 +705 @@
      * detail call states.
      */
-    void (*on_call_state)(int call_index, pjsip_event *e);
+    void (*on_call_state)(pjsua_call_id call_id, pjsip_event *e);
 
     /**
      * Notify application on incoming call.
      */
-    void (*on_incoming_call)(pjsua_acc_id acc_id, int call_index,
+    void (*on_incoming_call)(pjsua_acc_id acc_id, pjsua_call_id call_id,
                              pjsip_rx_data *rdata);
+
+    /**
+     * Notify application when media state in the call has changed.
+     * Normal application would need to implement this callback, e.g.
+     * to connect the call's media to sound device.
+     */
+    void (*on_call_media_state)(pjsua_call_id call_id);
 
     /**
@@ -294 +727 @@
      * transfer.
      */
-    void (*on_call_transfered)(int call_index,
+    void (*on_call_transfered)(pjsua_call_id call_id,
                                const pj_str_t *dst,
                                pjsip_status_code *code);
@@ -313 +746 @@
     /**
      * Notify application on incoming pager (i.e. MESSAGE request).
-     * Argument call_index will be -1 if MESSAGE request is not related to an 
+     * Argument call_id will be -1 if MESSAGE request is not related to an
      * existing call.
      */
-    void (*on_pager)(int call_index, const pj_str_t *from,
-                     const pj_str_t *to, const pj_str_t *txt);
+    void (*on_pager)(pjsua_call_id call_id, const pj_str_t *from,
+                     const pj_str_t *to, const pj_str_t *contact,
+                     const pj_str_t *mime_type, const pj_str_t *body);
+
+    /**
+     * Notify application about the delivery status of outgoing pager
+     * request.
+     *
+     * @param call_id       Containts the ID of the call where the IM was
+     *                      sent, or PJSUA_INVALID_ID if the IM was sent
+     *                      outside call context.
+     * @param to            Destination URI.
+     * @param body          Message body.
+     * @param user_data     Arbitrary data that was specified when sending
+     *                      IM message.
+     * @param status        Delivery status.
+     * @param reason        Delivery status reason.
+     */
+    void (*on_pager_status)(pjsua_call_id call_id,
+                            const pj_str_t *to,
+                            const pj_str_t *body,
+                            void *user_data,
+                            pjsip_status_code status,
+                            const pj_str_t *reason);
 
     /**
      * Notify application about typing indication.
      */
-    void (*on_typing)(int call_index, const pj_str_t *from,
-                      const pj_str_t *to, pj_bool_t is_typing);
-
-};
-
-/**
- * @see pjsua_callback
- */
-typedef struct pjsua_callback pjsua_callback;
+    void (*on_typing)(pjsua_call_id call_id, const pj_str_t *from,
+                      const pj_str_t *to, const pj_str_t *contact,
+                      pj_bool_t is_typing);
+
+} pjsua_callback;
+
+
+
+
+/**
+ * PJSUA settings.
+ */
+typedef struct pjsua_config
+{
+
+    /** 
+     * Maximum calls to support (default: 4) 
+     */
+    unsigned        max_calls;
+
+    /** 
+     * Number of worker threads. Normally application will want to have at
+     * least one worker thread, unless when it wants to poll the library
+     * periodically, which in this case the worker thread can be set to
+     * zero.
+     */
+    unsigned        thread_cnt;
+
+    /**
+     * Number of outbound proxies in the array.
+     */
+    unsigned        outbound_proxy_cnt;
+
+    /** 
+     * Specify the URL of outbound proxies to visit for all outgoing requests.
+     * The outbound proxies will be used for all accounts, and it will
+     * be used to build the route set for outgoing requests. The final
+     * route set for outgoing requests will consists of the outbound proxies
+     * and the proxy configured in the account.
+     */
+    pj_str_t        outbound_proxy[4];
+
+    /** 
+     * Number of credentials in the credential array.
+     */
+    unsigned        cred_count;
+
+    /** 
+     * Array of credentials. These credentials will be used by all accounts,
+     * and can be used to authenticate against outbound proxies.
+     */
+    pjsip_cred_info cred_info[PJSUA_ACC_MAX_PROXIES];
+
+    /**
+     * Application callback.
+     */
+    pjsua_callback  cb;
+
+} pjsua_config;
+
+
+/**
+ * Use this function to initialize pjsua config.
+ *
+ * @param cfg   pjsua config to be initialized.
+ */
+PJ_INLINE(void) pjsua_config_default(pjsua_config *cfg)
+{
+    pj_memset(cfg, 0, sizeof(*cfg));
+
+    cfg->max_calls = 4;
+    cfg->thread_cnt = 1;
+}
+
+
+/**
+ * Duplicate credential.
+ */
+PJ_INLINE(void) pjsip_cred_dup( pj_pool_t *pool,
+                                pjsip_cred_info *dst,
+                                const pjsip_cred_info *src)
+{
+    pj_strdup_with_null(pool, &dst->realm, &src->realm);
+    pj_strdup_with_null(pool, &dst->scheme, &src->scheme);
+    pj_strdup_with_null(pool, &dst->username, &src->username);
+    pj_strdup_with_null(pool, &dst->data, &src->data);
+
+}
+
+
+/**
+ * Duplicate pjsua_config.
+ */
+PJ_INLINE(void) pjsua_config_dup(pj_pool_t *pool,
+                                 pjsua_config *dst,
+                                 const pjsua_config *src)
+{
+    unsigned i;
+
+    pj_memcpy(dst, src, sizeof(*src));
+
+    for (i=0; i<src->outbound_proxy_cnt; ++i) {
+        pj_strdup_with_null(pool, &dst->outbound_proxy[i],
+                            &src->outbound_proxy[i]);
+    }
+
+    for (i=0; i<src->cred_count; ++i) {
+        pjsip_cred_dup(pool, &dst->cred_info[i], &src->cred_info[i]);
+    }
+}
+
+
+/**
+ * Call media status.
+ */
+typedef enum pjsua_call_media_status
+{
+    PJSUA_CALL_MEDIA_NONE,
+    PJSUA_CALL_MEDIA_ACTIVE,
+    PJSUA_CALL_MEDIA_LOCAL_HOLD,
+    PJSUA_CALL_MEDIA_REMOTE_HOLD,
+} pjsua_call_media_status;
 
 
@@ -336 +904 @@
  * Call info.
  */
-struct pjsua_call_info
-{
-    unsigned            index;
-    pj_bool_t           active;
+typedef struct pjsua_call_info
+{
+    /** Call identification. */
+    pjsua_call_id       id;
+
+    /** Initial call role (UAC == caller) */
     pjsip_role_e        role;
+
+    /** Local URI */
     pj_str_t            local_info;
+
+    /** Local Contact */
+    pj_str_t            local_contact;
+
+    /** Remote URI */
     pj_str_t            remote_info;
+
+    /** Remote contact */
+    pj_str_t            remote_contact;
+
+    /** Dialog Call-ID string. */
+    pj_str_t            call_id;
+
+    /** Call state */
     pjsip_inv_state     state;
+
+    /** Text describing the state */
     pj_str_t            state_text;
+
+    /** Last status code heard, which can be used as cause code */
     pjsip_status_code   last_status;
+
+    /** The reason phrase describing the status. */
     pj_str_t            last_status_text;
+
+    /** Call media status. */
+    pjsua_call_media_status media_status;
+
+    /** Media direction */
+    pjmedia_dir         media_dir;
+
+    /** The conference port number for the call */
+    pjsua_conf_port_id  conf_slot;
+
+    /** Up-to-date call connected duration (zero when call is not 
+     *  established)
+     */
     pj_time_val         connect_duration;
+
+    /** Total call duration, including set-up time */
     pj_time_val         total_duration;
-    pj_bool_t           has_media;
-    pjsua_conf_port_id  conf_slot;
-};
-
-typedef struct pjsua_call_info pjsua_call_info;
-
-
-enum pjsua_buddy_status
-{
-    PJSUA_BUDDY_STATUS_UNKNOWN,
-    PJSUA_BUDDY_STATUS_ONLINE,
-    PJSUA_BUDDY_STATUS_OFFLINE,
-};
-
-typedef enum pjsua_buddy_status pjsua_buddy_status;
-
-
-/**
- * Buddy info.
- */
-struct pjsua_buddy_info
-{
-    pjsua_buddy_id      index;
-    pj_bool_t           is_valid;
+
+    /** Internal */
+    struct {
+        char    local_info[128];
+        char    local_contact[128];
+        char    remote_info[128];
+        char    remote_contact[128];
+        char    call_id[128];
+        char    last_status_text[128];
+    } buf_;
+
+} pjsua_call_info;
+
+
+
+
+/**
+ * Conference port info.
+ */
+typedef struct pjsua_conf_port_info
+{
+    /** Conference port number. */
+    pjsua_conf_port_id  slot_id;
+
+    /** Port name. */
     pj_str_t            name;
-    pj_str_t            display_name;
-    pj_str_t            host;
-    unsigned            port;
-    pj_str_t            uri;
-    pjsua_buddy_status  status;
-    pj_str_t            status_text;
-    pj_bool_t           monitor;
-};
-
-typedef struct pjsua_buddy_info pjsua_buddy_info;
-
-
-/**
- * Account info.
- */
-struct pjsua_acc_info
-{
-    pjsua_acc_id        index;
-    pj_str_t            acc_id;
-    pj_bool_t           has_registration;
-    int                 expires;
-    pjsip_status_code   status;
-    pj_str_t            status_text;
-    pj_bool_t           online_status;
-    char                buf[PJ_ERR_MSG_SIZE];
-};
-
-typedef struct pjsua_acc_info pjsua_acc_info;
-
-
-/**
- * Conference port info.
- */
-struct pjsua_conf_port_info
-{
-    pjsua_conf_port_id  slot_id;
-    pj_str_t            name;
+
+    /** Clock rate. */
     unsigned            clock_rate;
+
+    /** Number of channels. */
     unsigned            channel_count;
+
+    /** Samples per frame */
     unsigned            samples_per_frame;
+
+    /** Bits per sample */
     unsigned            bits_per_sample;
+
+    /** Number of listeners in the array. */
     unsigned            listener_cnt;
-    pjsua_conf_port_id  listeners[256];
-};
-
-
-typedef struct pjsua_conf_port_info pjsua_conf_port_info;
+
+    /** Array of listeners (in other words, ports where this port is 
+     *  transmitting to.
+     */
+    pjsua_conf_port_id  listeners[PJSUA_MAX_CONF_PORTS];
+
+} pjsua_conf_port_info;
+
+
+/**
+ * This structure holds information about custom media transport to
+ * be registered to pjsua.
+ */
+typedef struct pjsua_media_transport
+{
+    /**
+     * Media socket information containing the address information
+     * of the RTP and RTCP socket.
+     */
+    pjmedia_sock_info    skinfo;
+
+    /**
+     * The media transport instance.
+     */
+    pjmedia_transport   *transport;
+
+} pjsua_media_transport;
+
+
+/**
+ * This structure describes additional information to be sent with
+ * outgoing SIP message.
+ */
+typedef struct pjsua_msg_data
+{
+    /**
+     * Additional message headers as linked list.
+     */
+    pjsip_hdr   hdr_list;
+
+    /**
+     * MIME type of optional message body. 
+     */
+    pj_str_t    content_type;
+
+    /**
+     * Optional message body.
+     */
+    pj_str_t    msg_body;
+
+} pjsua_msg_data;
+
+
+/**
+ * Initialize message data.
+ *
+ * @param msg_data  Message data to be initialized.
+ */
+PJ_INLINE(void) pjsua_msg_data_init(pjsua_msg_data *msg_data)
+{
+    pj_memset(msg_data, 0, sizeof(*msg_data));
+    pj_list_init(&msg_data->hdr_list);
+}
 
 
 /*****************************************************************************
- * PJSUA API (defined in pjsua_core.c).
- */
-
-/**
- * Initialize pjsua settings with default parameters.
- */
-PJ_DECL(void) pjsua_default_config(pjsua_config *cfg);
-
-
-/**
- * Validate configuration.
- */
-PJ_DECL(pj_status_t) pjsua_test_config(const pjsua_config *cfg,
-                                       char *errmsg,
-                                       int len);
-
-
-/**
- * Instantiate pjsua application. This initializes pjlib/pjlib-util, and 
- * creates memory pool factory to be used by application.
+ * PJSUA Core API
+ */
+
+
+/**
+ * Instantiate pjsua application. Application must call this function before
+ * calling any other functions, to make sure that the underlying libraries
+ * are properly initialized. Once this function has returned success,
+ * application must call pjsua_destroy() before quitting.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
  */
 PJ_DECL(pj_status_t) pjsua_create(void);
@@ -449 +1078 @@
 
 /**
- * Initialize pjsua application with the specified settings.
- *
- * This will initialize all libraries, create endpoint instance, and register
- * pjsip modules. 
- *
- * Application may register module after calling this function.
- */
-PJ_DECL(pj_status_t) pjsua_init(const pjsua_config *cfg,
-                                const pjsua_callback *cb);
-
-
-/**
- * Start pjsua stack. Application calls this after pjsua settings has been
- * configured.
- *
- * This will start the transport, worker threads (if any), and registration 
- * process, if registration is configured.
+ * Initialize pjsua with the specified settings. All the settings are 
+ * optional, and the default values will be used when the config is not
+ * specified.
+ *
+ * @param ua_cfg        User agent configuration.
+ * @param log_cfg       Optional logging configuration.
+ * @param media_cfg     Optional media configuration.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_init(const pjsua_config *ua_cfg,
+                                const pjsua_logging_config *log_cfg,
+                                const pjsua_media_config *media_cfg);
+
+
+/**
+ * Application is recommended to call this function after all initialization
+ * is done, so that the library can do additional checking set up
+ * additional 
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
  */
 PJ_DECL(pj_status_t) pjsua_start(void);
 
-/**
- * Destroy pjsua.
+
+/**
+ * Destroy pjsua. This function must be called once PJSUA is created. To
+ * make it easier for application, application may call this function
+ * several times with no danger.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
  */
 PJ_DECL(pj_status_t) pjsua_destroy(void);
 
-/**
- * Poll pjsua.
+
+/**
+ * Poll pjsua for events, and if necessary block the caller thread for
+ * the specified maximum interval (in miliseconds).
+ *
+ * @param msec_timeout  Maximum time to wait, in miliseconds.
+ *
+ * @return  The number of events that have been handled during the
+ *          poll. Negative value indicates error, and application
+ *          can retrieve the error as (err = -return_value).
  */
 PJ_DECL(int) pjsua_handle_events(unsigned msec_timeout);
@@ -481 +1127 @@
 
 /**
- * Get SIP endpoint instance.
- * Only valid after pjsua_init().
+ * Create memory pool.
+ *
+ * @param name          Optional pool name.
+ * @param size          Initial size of the pool.
+ * @param increment     Increment size.
+ *
+ * @return              The pool, or NULL when there's no memory.
+ */
+PJ_DECL(pj_pool_t*) pjsua_pool_create(const char *name, pj_size_t init_size,
+                                      pj_size_t increment);
+
+
+/**
+ * Application can call this function at any time (after pjsua_create(), of
+ * course) to change logging settings.
+ *
+ * @param c             Logging configuration.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_reconfigure_logging(const pjsua_logging_config *c);
+
+
+/**
+ * Internal function to get SIP endpoint instance of pjsua, which is
+ * needed for example to register module, create transports, etc.
+ * Probably is only valid after #pjsua_init() is called.
+ * 
+ * @return              SIP endpoint instance.
  */
 PJ_DECL(pjsip_endpoint*) pjsua_get_pjsip_endpt(void);
 
 /**
- * Get media endpoint instance.
- * Only valid after pjsua_init().
+ * Internal function to get media endpoint instance.
+ * Only valid after #pjsua_init() is called.
+ *
+ * @return              Media endpoint instance.
  */
 PJ_DECL(pjmedia_endpt*) pjsua_get_pjmedia_endpt(void);
 
-/**
- * Replace media transport.
- */
-PJ_DECL(pj_status_t) pjsua_set_call_media_transport(unsigned call_index,
-                                                    const pjmedia_sock_info *i,
-                                                    pjmedia_transport *tp);
-
 
 /*****************************************************************************
- * PJSUA Call API (defined in pjsua_call.c).
+ * PJSUA SIP Transport API.
+ */
+
+/**
+ * Create SIP transport.
+ *
+ * @param type          Transport type.
+ * @param cfg           Transport configuration.
+ * @param p_id          Optional pointer to receive transport ID.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_transport_create(pjsip_transport_type_e type,
+                                            const pjsua_transport_config *cfg,
+                                            pjsua_transport_id *p_id);
+
+/**
+ * Register transport that has been created by application.
+ *
+ * @param tp            Transport instance.
+ * @param p_id          Optional pointer to receive transport ID.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_transport_register(pjsip_transport *tp,
+                                              pjsua_transport_id *p_id);
+
+
+/**
+ * Enumerate all transports currently created in the system.
+ *
+ * @param id            Array to receive transport ids.
+ * @param count         In input, specifies the maximum number of elements.
+ *                      On return, it contains the actual number of elements.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_enum_transports( pjsua_transport_id id[],
+                                            unsigned *count );
+
+
+/**
+ * Get information about transports.
+ *
+ * @param id            Transport ID.
+ * @param info          Pointer to receive transport info.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_transport_get_info(pjsua_transport_id id,
+                                              pjsua_transport_info *info);
+
+
+/**
+ * Disable a transport or re-enable it. By default transport is always 
+ * enabled after it is created. Disabling a transport does not necessarily
+ * close the socket, it will only discard incoming messages and prevent
+ * the transport from being used to send outgoing messages.
+ *
+ * @param id            Transport ID.
+ * @param enabled       Non-zero to enable, zero to disable.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_transport_set_enable(pjsua_transport_id id,
+                                                pj_bool_t enabled);
+
+
+/**
+ * Close the transport. If transport is forcefully closed, it will be
+ * immediately closed, and any pending transactions that are using the
+ * transport may not terminate properly. Otherwise, the system will wait
+ * until all transactions are closed while preventing new users from
+ * using the transport, and will close the transport when it is safe to
+ * do so.
+ *
+ * @param id            Transport ID.
+ * @param force         Non-zero to immediately close the transport. This
+ *                      is not recommended!
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_transport_close( pjsua_transport_id id,
+                                            pj_bool_t force );
+
+
+/*****************************************************************************
+ * PJSUA Media Transport.
+ */
+
+/**
+ * Create UDP media transports for all the calls. This function creates
+ * one UDP media transport for each call.
+ *
+ * @param cfg           Media transport configuration. The "port" field in the
+ *                      configuration is used as the start port to bind the
+ *                      sockets.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) 
+pjsua_media_transports_create(const pjsua_transport_config *cfg);
+
+
+/**
+ * Register custom media transports to be used by calls. There must
+ * enough media transports for all calls.
+ *
+ * @param tp            The media transport array.
+ * @param count         Number of elements in the array. This number MUST
+ *                      match the number of maximum calls configured when
+ *                      pjsua is created.
+ * @param auto_delete   Flag to indicate whether the transports should be
+ *                      destroyed when pjsua is shutdown.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) 
+pjsua_media_transports_attach( pjsua_media_transport tp[],
+                               unsigned count,
+                               pj_bool_t auto_delete);
+
+
+
+/*****************************************************************************
+ * PJSUA Call API.
  */
 
 /**
  * Get maximum number of calls configured in pjsua.
+ *
+ * @return              Maximum number of calls configured.
  */
 PJ_DECL(unsigned) pjsua_call_get_max_count(void);
 
 /**
- * Get current number of active calls.
+ * Get number of currently active calls.
+ *
+ * @return              Number of currently active calls.
  */
 PJ_DECL(unsigned) pjsua_call_get_count(void);
+
+/**
+ * Enumerate all active calls.
+ *
+ * @param ids           Array of account IDs to be initialized.
+ * @param count         In input, specifies the maximum number of elements.
+ *                      On return, it contains the actual number of elements.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_enum_calls(pjsua_call_id ids[],
+                                      unsigned *count);
+
+
+/**
+ * Make outgoing call to the specified URI using the specified account.
+ *
+ * @param acc_id        The account to be used.
+ * @param target        URI to be put in the request URI.
+ * @param dst_uri       URI to be put in the To header (normally is the same
+ *                      as the target URI).
+ * @param options       Options (must be zero at the moment).
+ * @param user_data     Arbitrary user data to be attached to the call, and
+ *                      can be retrieved later.
+ * @param msg_data      Optional headers etc to be added to outgoing INVITE
+ *                      request, or NULL if no custom header is desired.
+ * @param p_call_id     Pointer to receive call identification.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_call_make_call(pjsua_acc_id acc_id,
+                                          const pj_str_t *dst_uri,
+                                          unsigned options,
+                                          void *user_data,
+                                          const pjsua_msg_data *msg_data,
+                                          pjsua_call_id *p_call_id);
+
 
 /**
  * Check if the specified call has active INVITE session and the INVITE
  * session has not been disconnected.
- */
-PJ_DECL(pj_bool_t) pjsua_call_is_active(unsigned call_index);
-
-
-/**
- * Check if call has a media session.
- */
-PJ_DECL(pj_bool_t) pjsua_call_has_media(unsigned call_index);
-
-
-/**
- * Get call info.
- */
-PJ_DECL(pj_status_t) pjsua_call_get_info(unsigned call_index,
+ *
+ * @param call_id       Call identification.
+ *
+ * @return              Non-zero if call is active.
+ */
+PJ_DECL(pj_bool_t) pjsua_call_is_active(pjsua_call_id call_id);
+
+
+/**
+ * Check if call has an active media session.
+ *
+ * @param call_id       Call identification.
+ *
+ * @return              Non-zero if yes.
+ */
+PJ_DECL(pj_bool_t) pjsua_call_has_media(pjsua_call_id call_id);
+
+
+/**
+ * Get the conference port identification associated with the call.
+ *
+ * @param call_id       Call identification.
+ *
+ * @return              Conference port ID, or PJSUA_INVALID_ID when the 
+ *                      media has not been established or is not active.
+ */
+PJ_DECL(pjsua_conf_port_id) pjsua_call_get_conf_port(pjsua_call_id call_id);
+
+/**
+ * Obtain detail information about the specified call.
+ *
+ * @param call_id       Call identification.
+ * @param info          Call info to be initialized.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_call_get_info(pjsua_call_id call_id,
                                          pjsua_call_info *info);
 
 
 /**
- * Duplicate call info.
- */
-PJ_DECL(void) pjsua_call_info_dup(pj_pool_t *pool,
-                                  pjsua_call_info *dst_info,
-                                  const pjsua_call_info *src_info);
-
-
-/**
- * Make outgoing call.
- */
-PJ_DECL(pj_status_t) pjsua_call_make_call(unsigned acc_id,
-                                          const pj_str_t *dst_uri,
-                                          int *p_call_index);
-
-
-/**
- * Answer call.
- */
-PJ_DECL(pj_status_t) pjsua_call_answer(int call_index, int code);
-
-/**
- * Hangup call.
- */
-PJ_DECL(void) pjsua_call_hangup(int call_index);
-
-
-/**
- * Put call on-hold.
- */
-PJ_DECL(pj_status_t) pjsua_call_set_hold(int call_index);
+ * Attach application specific data to the call.
+ *
+ * @param call_id       Call identification.
+ * @param user_data     Arbitrary data to be attached to the call.
+ *
+ * @return              The user data.
+ */
+PJ_DECL(pj_status_t) pjsua_call_set_user_data(pjsua_call_id call_id,
+                                              void *user_data);
+
+
+/**
+ * Get user data attached to the call.
+ *
+ * @param call_id       Call identification.
+ *
+ * @return              The user data.
+ */
+PJ_DECL(void*) pjsua_call_get_user_data(pjsua_call_id call_id);
+
+
+/**
+ * Send response to incoming INVITE request.
+ *
+ * @param call_id       Incoming call identification.
+ * @param code          Status code, (100-699).
+ * @param reason        Optional reason phrase. If NULL, default text
+ *                      will be used.
+ * @param msg_data      Optional list of headers etc to be added to outgoing
+ *                      response message.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_call_answer(pjsua_call_id call_id, 
+                                       unsigned code,
+                                       const pj_str_t *reason,
+                                       const pjsua_msg_data *msg_data);
+
+/**
+ * Hangup call by using method that is appropriate according to the
+ * call state.
+ *
+ * @param call_id       Call identification.
+ * @param code          Optional status code to be sent when we're rejecting
+ *                      incoming call. If the value is zero, "603/Decline"
+ *                      will be sent.
+ * @param reason        Optional reason phrase to be sent when we're rejecting
+ *                      incoming call.  If NULL, default text will be used.
+ * @param msg_data      Optional list of headers etc to be added to outgoing
+ *                      request/response message.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_call_hangup(pjsua_call_id call_id,
+                                       unsigned code,
+                                       const pj_str_t *reason,
+                                       const pjsua_msg_data *msg_data);
+
+
+/**
+ * Put the specified call on hold.
+ *
+ * @param call_id       Call identification.
+ * @param msg_data      Optional message components to be sent with
+ *                      the request.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_call_set_hold(pjsua_call_id call_id,
+                                         const pjsua_msg_data *msg_data);
 
 
 /**
  * Send re-INVITE (to release hold).
- */
-PJ_DECL(pj_status_t) pjsua_call_reinvite(int call_index);
-
-
-/**
- * Transfer call.
- */
-PJ_DECL(pj_status_t) pjsua_call_xfer(unsigned call_index, const pj_str_t *dest);
-
-/**
- * Dial DTMF.
- */
-PJ_DECL(pj_status_t) pjsua_call_dial_dtmf(unsigned call_index, 
+ *
+ * @param call_id       Call identification.
+ * @param unhold        If this argument is non-zero and the call is locally
+ *                      held, this will release the local hold.
+ * @param msg_data      Optional message components to be sent with
+ *                      the request.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_call_reinvite(pjsua_call_id call_id,
+                                         pj_bool_t unhold,
+                                         const pjsua_msg_data *msg_data);
+
+
+/**
+ * Initiate call transfer to the specified address.
+ *
+ * @param call_id       Call identification.
+ * @param dest          Address of new target to be contacted.
+ * @param msg_data      Optional message components to be sent with
+ *                      the request.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_call_xfer(pjsua_call_id call_id, 
+                                     const pj_str_t *dest,
+                                     const pjsua_msg_data *msg_data);
+
+/**
+ * Send DTMF digits to remote using RFC 2833 payload formats.
+ *
+ * @param call_id       Call identification.
+ * @param digits        DTMF digits to be sent.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_call_dial_dtmf(pjsua_call_id call_id, 
                                           const pj_str_t *digits);
 
-
 /**
  * Send instant messaging inside INVITE session.
- */
-PJ_DECL(pj_status_t) pjsua_call_send_im(int call_index, const pj_str_t *text);
+ *
+ * @param call_id       Call identification.
+ * @param mime_type     Optional MIME type. If NULL, then "text/plain" is 
+ *                      assumed.
+ * @param content       The message content.
+ * @param msg_data      Optional list of headers etc to be included in outgoing
+ *                      request. The body descriptor in the msg_data is 
+ *                      ignored.
+ * @param user_data     Optional user data, which will be given back when
+ *                      the IM callback is called.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_call_send_im( pjsua_call_id call_id, 
+                                         const pj_str_t *mime_type,
+                                         const pj_str_t *content,
+                                         const pjsua_msg_data *msg_data,
+                                         void *user_data);
 
 
 /**
  * Send IM typing indication inside INVITE session.
- */
-PJ_DECL(pj_status_t) pjsua_call_send_typing_ind(int call_index, 
-                                                pj_bool_t is_typing);
+ *
+ * @param call_id       Call identification.
+ * @param is_typing     Non-zero to indicate to remote that local person is
+ *                      currently typing an IM.
+ * @param msg_data      Optional list of headers etc to be included in outgoing
+ *                      request.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_call_send_typing_ind(pjsua_call_id call_id, 
+                                                pj_bool_t is_typing,
+                                                const pjsua_msg_data*msg_data);
 
 /**
@@ -605 +1550 @@
 /**
  * Dump call and media statistics to string.
- */
-PJ_DECL(void) pjsua_call_dump(int call_index, int with_media, 
-                              char *buffer, unsigned maxlen,
-                              const char *indent);
+ *
+ * @param call_id       Call identification.
+ * @param with_media    Non-zero to include media information too.
+ * @param buffer        Buffer where the statistics are to be written to.
+ * @param maxlen        Maximum length of buffer.
+ * @param indent        Spaces for left indentation.
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjsua_call_dump(pjsua_call_id call_id, 
+                                     pj_bool_t with_media, 
+                                     char *buffer, 
+                                     unsigned maxlen,
+                                     const char *indent);
 
 
 /*****************************************************************************
- * PJSUA Account and Client Registration API (defined in pjsua_reg.c).
- */
-
-
-/**
- * Get number of accounts.
- */
-PJ_DECL(unsigned) pjsua_get_acc_count(void);
-
-/**
- * Get account info.
+ * PJSUA Account and Client Registration API.
+ */
+
+
+/**
+ * Get number of current accounts.
+ *
+ * @return              Current number of accounts.
+ */
+PJ_DECL(unsigned) pjsua_acc_get_count(void);
+
+
+/**
+ * Check if the specified account ID is valid.
+ *
+ * @param acc_id        Account ID to check.
+ *
+ * @return              Non-zero if account ID is valid.
+ */
+PJ_DECL(pj_bool_t) pjsua_acc_is_valid(pjsua_acc_id acc_id);
+
+
+/**
+ * Add a new account to pjsua. PJSUA must have been initialized (with
+ * #pjsua_init()) before calling this function.
+ *
+ * @param cfg           Account configuration.
+ * @param is_default    If non-zero, this account will be set as the default
+ *                      account. The default account will be used when sending
+ *                      outgoing requests (e.g. making call) when no account is
+ *                      specified, and when receiving incoming requests when the
+ *                      request does not match any accounts. It is recommended
+ *                      that default account is set to local/LAN account.
+ * @param p_acc_id      Pointer to receive account ID of the new account.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_acc_add(const pjsua_acc_config *cfg,
+                                   pj_bool_t is_default,
+                                   pjsua_acc_id *p_acc_id);
+
+
+/**
+ * Add a local account. A local account is used to identify local endpoint
+ * instead of a specific user, and for this reason, a transport ID is needed
+ * to obtain the local address information.
+ *
+ * @param tid           Transport ID to generate account address.
+ * @param is_default    If non-zero, this account will be set as the default
+ *                      account. The default account will be used when sending
+ *                      outgoing requests (e.g. making call) when no account is
+ *                      specified, and when receiving incoming requests when the
+ *                      request does not match any accounts. It is recommended
+ *                      that default account is set to local/LAN account.
+ * @param p_acc_id      Pointer to receive account ID of the new account.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_acc_add_local(pjsua_transport_id tid,
+                                         pj_bool_t is_default,
+                                         pjsua_acc_id *p_acc_id);
+
+/**
+ * Delete account.
+ *
+ * @param acc_id        Id of the account to be deleted.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_acc_del(pjsua_acc_id acc_id);
+
+
+/**
+ * Modify account information.
+ *
+ * @param acc_id        Id of the account to be modified.
+ * @param cfg           New account configuration.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_acc_modify(pjsua_acc_id acc_id,
+                                      const pjsua_acc_config *cfg);
+
+
+/**
+ * Modify account's presence status to be advertised to remote/presence
+ * subscribers.
+ *
+ * @param acc_id        The account ID.
+ * @param is_online     True of false.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_acc_set_online_status(pjsua_acc_id acc_id,
+                                                 pj_bool_t is_online);
+
+
+/**
+ * Update registration or perform unregistration. 
+ *
+ * @param acc_id        The account ID.
+ * @param renew         If renew argument is zero, this will start 
+ *                      unregistration process.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_acc_set_registration(pjsua_acc_id acc_id, 
+                                                pj_bool_t renew);
+
+
+/**
+ * Get account information.
+ *
+ * @param acc_id        Account identification.
+ * @param info          Pointer to receive account information.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
  */
 PJ_DECL(pj_status_t) pjsua_acc_get_info(pjsua_acc_id acc_id,
@@ -629 +1690 @@
 
 /**
- * Enum accounts id.
- */
-PJ_DECL(pj_status_t) pjsua_acc_enum_id( pjsua_acc_id ids[],
-                                        unsigned *count );
+ * Enum accounts all account ids.
+ *
+ * @param ids           Array of account IDs to be initialized.
+ * @param count         In input, specifies the maximum number of elements.
+ *                      On return, it contains the actual number of elements.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_enum_accs(pjsua_acc_id ids[],
+                                     unsigned *count );
 
 
 /**
  * Enum accounts info.
+ *
+ * @param info          Array of account infos to be initialized.
+ * @param count         In input, specifies the maximum number of elements.
+ *                      On return, it contains the actual number of elements.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
  */
 PJ_DECL(pj_status_t) pjsua_acc_enum_info( pjsua_acc_info info[],
@@ -643 +1716 @@
 
 /**
- * Find account for outgoing request.
+ * This is an internal function to find the most appropriate account to
+ * used to reach to the specified URL.
+ *
+ * @param url           The remote URL to reach.
+ *
+ * @return              Account id.
  */
 PJ_DECL(pjsua_acc_id) pjsua_acc_find_for_outgoing(const pj_str_t *url);
 
-/**
- * Find account for incoming request.
+
+/**
+ * This is an internal function to find the most appropriate account to be
+ * used to handle incoming calls.
+ *
+ * @param rdata         The incoming request message.
+ *
+ * @return              Account id.
  */
 PJ_DECL(pjsua_acc_id) pjsua_acc_find_for_incoming(pjsip_rx_data *rdata);
-
-/**
- * Add a new account.
- * This function should be called after pjsua_init().
- * Application should call pjsua_acc_set_registration() to start 
- * registration for this account.
- */
-PJ_DECL(pj_status_t) pjsua_acc_add(const pjsua_acc_config *cfg,
-                                   pjsua_acc_id *acc_id);
-
-/**
- * Delete account.
- */
-PJ_DECL(pj_status_t) pjsua_acc_del(pjsua_acc_id acc_id);
-
-
-/**
- * Set account's presence status.
- */
-PJ_DECL(pj_status_t) pjsua_acc_set_online_status(pjsua_acc_id acc_id,
-                                                 pj_bool_t is_online);
-
-
-/**
- * Update registration or perform unregistration. If renew argument is zero,
- * this will start unregistration process.
- */
-PJ_DECL(pj_status_t) pjsua_acc_set_registration(pjsua_acc_id acc_id, 
-                                                pj_bool_t renew);
-
 
 
@@ -689 +1743 @@
 
 /**
- * Get buddy count.
+ * Get total number of buddies.
+ *
+ * @return              Number of buddies.
  */
 PJ_DECL(unsigned) pjsua_get_buddy_count(void);
@@ -695 +1751 @@
 
 /**
- * Get buddy info.
- */
-PJ_DECL(pj_status_t) pjsua_buddy_get_info(pjsua_buddy_id buddy_index,
+ * Check if buddy ID is valid.
+ *
+ * @param buddy_id      Buddy ID to check.
+ *
+ * @return              Non-zero if buddy ID is valid.
+ */
+PJ_DECL(pj_bool_t) pjsua_buddy_is_valid(pjsua_buddy_id buddy_id);
+
+
+/**
+ * Enum buddy IDs.
+ *
+ * @param ids           Array of ids to be initialized.
+ * @param count         On input, specifies max elements in the array.
+ *                      On return, it contains actual number of elements
+ *                      that have been initialized.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_enum_buddies(pjsua_buddy_id ids[],
+                                        unsigned *count);
+
+/**
+ * Get detailed buddy info.
+ *
+ * @param buddy_id      The buddy identification.
+ * @param info          Pointer to receive information about buddy.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_buddy_get_info(pjsua_buddy_id buddy_id,
                                           pjsua_buddy_info *info);
 
 /**
  * Add new buddy.
- */
-PJ_DECL(pj_status_t) pjsua_buddy_add(const pj_str_t *uri,
-                                     pjsua_buddy_id *buddy_index);
+ *
+ * @param cfg           Buddy configuration.
+ * @param p_buddy_id    Pointer to receive buddy ID.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_buddy_add(const pjsua_buddy_config *cfg,
+                                     pjsua_buddy_id *p_buddy_id);
 
 
 /**
  * Delete buddy.
- */
-PJ_DECL(pj_status_t) pjsua_buddy_del(pjsua_buddy_id buddy_index);
+ *
+ * @param buddy_id      Buddy identification.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_buddy_del(pjsua_buddy_id buddy_id);
 
 
 /**
  * Enable/disable buddy's presence monitoring.
- */
-PJ_DECL(pj_status_t) pjsua_buddy_subscribe_pres(pjsua_buddy_id buddy_index,
-                                                pj_bool_t monitor);
-
-
-/**
- * Dump presence subscriptions.
- */
-PJ_DECL(void) pjsua_pres_dump(pj_bool_t detail);
+ *
+ * @param buddy_id      Buddy identification.
+ * @param subscribe     Specify non-zero to activate presence subscription to
+ *                      the specified buddy.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_buddy_subscribe_pres(pjsua_buddy_id buddy_id,
+                                                pj_bool_t subscribe);
+
+
+/**
+ * Dump presence subscriptions to log file.
+ *
+ * @param verbose       Yes or no.
+ */
+PJ_DECL(void) pjsua_pres_dump(pj_bool_t verbose);
 
 
@@ -738 +1839 @@
 
 /**
- * Send IM outside dialog.
- */
-PJ_DECL(pj_status_t) pjsua_im_send(int acc_id, const pj_str_t *dst_uri, 
-                                   const pj_str_t *text);
+ * Send instant messaging outside dialog, using the specified account for
+ * route set and authentication.
+ *
+ * @param acc_id        Account ID to be used to send the request.
+ * @param to            Remote URI.
+ * @param mime_type     Optional MIME type. If NULL, then "text/plain" is 
+ *                      assumed.
+ * @param content       The message content.
+ * @param msg_data      Optional list of headers etc to be included in outgoing
+ *                      request. The body descriptor in the msg_data is 
+ *                      ignored.
+ * @param user_data     Optional user data, which will be given back when
+ *                      the IM callback is called.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_im_send(pjsua_acc_id acc_id, 
+                                   const pj_str_t *to,
+                                   const pj_str_t *mime_type,
+                                   const pj_str_t *content,
+                                   const pjsua_msg_data *msg_data,
+                                   void *user_data);
 
 
 /**
  * Send typing indication outside dialog.
- */
-PJ_DECL(pj_status_t) pjsua_im_typing(int acc_id, const pj_str_t *dst_uri, 
-                                     pj_bool_t is_typing);
+ *
+ * @param acc_id        Account ID to be used to send the request.
+ * @param to            Remote URI.
+ * @param is_typing     If non-zero, it tells remote person that local person
+ *                      is currently composing an IM.
+ * @param msg_data      Optional list of headers etc to be added to outgoing
+ *                      request.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_im_typing(pjsua_acc_id acc_id, 
+                                     const pj_str_t *to, 
+                                     pj_bool_t is_typing,
+                                     const pjsua_msg_data *msg_data);
 
 
 
 /*****************************************************************************
- * Media.
+ * Conference bridge manipulation.
  */
 
 /**
  * Get maxinum number of conference ports.
- */
-PJ_DECL(unsigned) pjsua_conf_max_ports(void);
-
-
-/**
- * Enum all conference ports.
- */
-PJ_DECL(pj_status_t) pjsua_conf_enum_port_ids(pjsua_conf_port_id id[],
-                                              unsigned *count);
+ *
+ * @return              Maximum number of ports in the conference bridge.
+ */
+PJ_DECL(unsigned) pjsua_conf_get_max_ports(void);
+
+
+/**
+ * Get current number of active ports in the bridge.
+ *
+ * @return              The number.
+ */
+PJ_DECL(unsigned) pjsua_conf_get_active_ports(void);
+
+
+/**
+ * Enumerate all conference ports.
+ *
+ * @param id            Array of conference port ID to be initialized.
+ * @param count         On input, specifies max elements in the array.
+ *                      On return, it contains actual number of elements
+ *                      that have been initialized.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_enum_conf_ports(pjsua_conf_port_id id[],
+                                           unsigned *count);
 
 
 /**
  * Get information about the specified conference port
+ *
+ * @param id            Port identification.
+ * @param info          Pointer to store the port info.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
  */
 PJ_DECL(pj_status_t) pjsua_conf_get_port_info( pjsua_conf_port_id id,
@@ -777 +1929 @@
 
 /**
- * Connect conference port.
- */
-PJ_DECL(pj_status_t) pjsua_conf_connect(pjsua_conf_port_id src_port,
-                                        pjsua_conf_port_id dst_port);
-
-
-/**
- * Connect conference port connection.
- */
-PJ_DECL(pj_status_t) pjsua_conf_disconnect(pjsua_conf_port_id src_port,
-                                           pjsua_conf_port_id dst_port);
-
-
-/**
- * Create a file player.
+ * Establish unidirectional media flow from souce to sink. One source
+ * may transmit to multiple destinations/sink. And if multiple
+ * sources are transmitting to the same sink, the media will be mixed
+ * together. Source and sink may refer to the same ID, effectively
+ * looping the media.
+ *
+ * If bidirectional media flow is desired, application needs to call
+ * this function twice, with the second one having the arguments
+ * reversed.
+ *
+ * @param source        Port ID of the source media/transmitter.
+ * @param sink          Port ID of the destination media/received.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_conf_connect(pjsua_conf_port_id source,
+                                        pjsua_conf_port_id sink);
+
+
+/**
+ * Disconnect media flow from the source to destination port.
+ *
+ * @param source        Port ID of the source media/transmitter.
+ * @param sink          Port ID of the destination media/received.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_conf_disconnect(pjsua_conf_port_id source,
+                                           pjsua_conf_port_id sink);
+
+
+/*****************************************************************************
+ * File player.
+ */
+
+/**
+ * Create a file player, and automatically connect this player to
+ * the conference bridge.
+ *
+ * @param filename      The filename to be played. Currently only
+ *                      WAV files are supported.
+ * @param options       Options (currently zero).
+ * @param user_data     Arbitrary user data to be associated with the player.
+ * @param p_id          Pointer to receive player ID.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
  */
 PJ_DECL(pj_status_t) pjsua_player_create(const pj_str_t *filename,
-                                         pjsua_player_id *id);
-
-
-/**
- * Get conference port associated with player.
+                                         unsigned options,
+                                         void *user_data,
+                                         pjsua_player_id *p_id);
+
+
+/**
+ * Get conference port ID associated with player.
+ *
+ * @param id            The file player ID.
+ *
+ * @return              Conference port ID associated with this player.
  */
 PJ_DECL(pjsua_conf_port_id) pjsua_player_get_conf_port(pjsua_player_id id);
@@ -805 +1994 @@
 /**
  * Set playback position.
+ *
+ * @param id            The file player ID.
+ * @param samples       The playback position, in samples. Application can
+ *                      specify zero to re-start the playback.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
  */
 PJ_DECL(pj_status_t) pjsua_player_set_pos(pjsua_player_id id,
@@ -811 +2006 @@
 
 /**
- * Destroy player.
+ * Close the file, remove the player from the bridge, and free
+ * resources associated with the file player.
+ *
+ * @param id            The file player ID.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
  */
 PJ_DECL(pj_status_t) pjsua_player_destroy(pjsua_player_id id);
 
 
-
-/**
- * Create a file recorder.
+/*****************************************************************************
+ * File recorder.
+ */
+
+/**
+ * Create a file recorder, and automatically connect this recorder to
+ * the conference bridge.
+ *
+ * @param filename      Output file name.
+ * @param file_format   Specify the file format (currently only WAV is
+ *                      supported, so the value MUST be zero).
+ * @param encoding      Specify the encoding to be applied to the file.
+ *                      Currently only 16bit raw PCM is supported, so
+ *                      the value must be NULL.
+ * @param max_size      Maximum file size. Specify -1 to remove size
+ *                      limitation.
+ * @param options       Optional options.
+ * @param user_data     Arbitrary user data which will be given in the 
+ *                      callback once the recording complete.
+ * @param p_id          Pointer to receive the recorder instance.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
  */
 PJ_DECL(pj_status_t) pjsua_recorder_create(const pj_str_t *filename,
-                                           pjsua_recorder_id *id);
+                                           unsigned file_format,
+                                           const pj_str_t *encoding,
+                                           pj_ssize_t max_size,
+                                           unsigned options,
+                                           void *user_data,
+                                           pjsua_recorder_id *p_id);
 
 
 /**
  * Get conference port associated with recorder.
+ *
+ * @param id            The recorder ID.
+ *
+ * @return              Conference port ID associated with this recorder.
  */
 PJ_DECL(pjsua_conf_port_id) pjsua_recorder_get_conf_port(pjsua_recorder_id id);
@@ -831 +2059 @@
 
 /**
- * Destroy recorder (will complete recording).
+ * Destroy recorder (this will complete recording).
+ *
+ * @param id            The recorder ID.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
  */
 PJ_DECL(pj_status_t) pjsua_recorder_destroy(pjsua_recorder_id id);
 
 
+/*****************************************************************************
+ * Sound devices.
+ */
+
 /**
  * Enum sound devices.
- */
-PJ_DECL(pj_status_t) pjsua_enum_snd_devices(unsigned *count,
-                                            pjmedia_snd_dev_info info[]);
-
-
-/**
- * Select or change sound device.
- * This will only change the device ID in configuration (not changing
- * the current device).
- */
-PJ_DECL(pj_status_t) pjsua_set_snd_dev(int snd_capture_id,
-                                       int snd_player_id);
+ *
+ * @param info          Array of info to be initialized.
+ * @param count         On input, specifies max elements in the array.
+ *                      On return, it contains actual number of elements
+ *                      that have been initialized.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_enum_snd_devs(pjmedia_snd_dev_info info[],
+                                         unsigned *count);
+
+
+/**
+ * Select or change sound device. Application may call this function at
+ * any time to replace current sound device.
+ *
+ * @param capture_dev   Device ID of the capture device.
+ * @param playback_dev  Device ID of the playback device.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_set_snd_dev(int capture_dev,
+                                       int playback_dev);
+
+
+/**
+ * Set pjsua to use null sound device. The null sound device only provides
+ * the timing needed by the conference bridge, and will not interract with
+ * any hardware.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_set_null_snd_dev(void);
+
+
+/*****************************************************************************
+ * Codecs.
+ */
+
+/**
+ * Enum all supported codecs in the system.
+ *
+ * @param id            Array of ID to be initialized.
+ * @param count         On input, specifies max elements in the array.
+ *                      On return, it contains actual number of elements
+ *                      that have been initialized.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_enum_codecs( pjsua_codec_info id[],
+                                        unsigned *count );
+
+
+/**
+ * Change codec priority.
+ *
+ * @param id            Codec ID.
+ * @param priority      Codec priority, 0-255, where zero means to disable
+ *                      the codec.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_codec_set_priority( const pj_str_t *id,
+                                               pj_uint8_t priority );
+
+
+/**
+ * Get codec parameters.
+ *
+ * @param id            Codec ID.
+ * @param param         Structure to receive codec parameters.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_codec_get_param( const pj_str_t *id,
+                                            pjmedia_codec_param *param );
+
+
+/**
+ * Set codec parameters.
+ *
+ * @param id            Codec ID.
+ * @param param         Codec parameter to set.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_codec_set_param( const pj_str_t *id,
+                                            const pjmedia_codec_param *param);
+
+
+
 
 
@@ -857 +2172 @@
  */
 
-/** String to describe invite session states */
-extern const char *pjsua_inv_state_names[];
-
-/**
- * Parse arguments (pjsua_opt.c).
- */
-PJ_DECL(pj_status_t) pjsua_parse_args(int argc, char *argv[],
-                                      pjsua_config *cfg,
-                                      pj_str_t *uri_to_call);
-
-/**
- * Load settings from a file.
- */
-PJ_DECL(pj_status_t) pjsua_load_settings(const char *filename,
-                                         pjsua_config *cfg,
-                                         pj_str_t *uri_to_call);
-
-/**
- * Get pjsua running config.
- */
-PJ_DECL(void) pjsua_get_config(pj_pool_t *pool,
-                               pjsua_config *config);
-
-
-/**
- * Dump settings.
- * If cfg is NULL, it will dump current settings.
- */
-PJ_DECL(int) pjsua_dump_settings(const pjsua_config *cfg,
-                                 char *buf, pj_size_t max);
-
-/**
- * Save settings to a file.
- */
-PJ_DECL(pj_status_t) pjsua_save_settings(const char *filename,
-                                         const pjsua_config *cfg);
-
-
 /*
  * Verify that valid SIP url is given.
- * @return  PJ_SUCCESS if valid.
+ *
+ * @param c_url         The URL, as NULL terminated string.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
  */
 PJ_DECL(pj_status_t) pjsua_verify_sip_url(const char *c_url);
 
-/*
- * Dump application states.
- */
-PJ_DECL(void) pjsua_dump(pj_bool_t detail);
 
 /**
  * Display error message for the specified error code.
+ *
+ * @param sender        The log sender field.
+ * @param title         Message title for the error.
+ * @param status        Status code.
  */
 PJ_DECL(void) pjsua_perror(const char *sender, const char *title, 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -18 +18 @@
  */
 #include <pjsua-lib/pjsua.h>
-#include <pj/log.h>
-#include "pjsua_imp.h"
-
-/*
- * pjsua_call.c
- *
- * Call (INVITE) related stuffs.
- */
-
-#define THIS_FILE   "pjsua_call.c"
-
-
-#define REFRESH_CALL_TIMER      0x63
-#define HANGUP_CALL_TIMER       0x64
-
-/* Proto */
-static void schedule_call_timer( pjsua_call *call, pj_timer_entry *e,
-                                 int timer_type, int duration );
-
-/*
- * Timer callback when UAS needs to send re-INVITE to see if remote
- * is still there.
- */
-static void call_on_timer(pj_timer_heap_t *ht, pj_timer_entry *e)
-{
-    pjsua_call *call = e->user_data;
-
-    PJ_UNUSED_ARG(ht);
-
-    if (e->id == REFRESH_CALL_TIMER) {
-
-        /* If call is still not connected, hangup. */
-        if (call->inv->state != PJSIP_INV_STATE_CONFIRMED) {
-            PJ_LOG(3,(THIS_FILE, "Refresh call timer is called when "
-                      "invite is still not confirmed. Call %d will "
-                      "disconnect.", call->index));
-            pjsua_call_hangup(call->index);
-        } else {
-            PJ_LOG(3,(THIS_FILE, "Refreshing call %d", call->index));
-            schedule_call_timer(call,e,REFRESH_CALL_TIMER,
-                                pjsua.config.uas_refresh);
-            pjsua_call_reinvite(call->index);
-        }
-
-    } else if (e->id == HANGUP_CALL_TIMER) {
-        PJ_LOG(3,(THIS_FILE, "Call %d duration exceeded, disconnecting call",
-                             call->index));
-        pjsua_call_hangup(call->index);
-
-    }
-}
-
-/*
- * Schedule call timer.
- */
-static void schedule_call_timer( pjsua_call *call, pj_timer_entry *e,
-                                 int timer_type, int duration )
-{
-    pj_time_val timeout;
-
-    if (duration == 0) {
-        /* Cancel timer. */
-        if (e->id != 0) {
-            pjsip_endpt_cancel_timer(pjsua.endpt, e);
-            e->id = 0;
-        }
-
-    } else {
-        /* Schedule timer. */
-        timeout.sec = duration;
-        timeout.msec = 0;
-
-        e->cb = &call_on_timer;
-        e->id = timer_type;
-        e->user_data = call;
-
-        pjsip_endpt_schedule_timer( pjsua.endpt, e, &timeout);
-    }
-}
-
-
-/*
- * Destroy the call's media
- */
-static pj_status_t call_destroy_media(int call_index)
-{
-    pjsua_call *call = &pjsua.calls[call_index];
-
-    if (call->conf_slot > 0) {
-        pjmedia_conf_remove_port(pjsua.mconf, call->conf_slot);
-        call->conf_slot = 0;
-    }
-
-    if (call->session) {
-        /* Destroy session (this will also close RTP/RTCP sockets). */
-        pjmedia_session_destroy(call->session);
-        call->session = NULL;
-
-        PJ_LOG(3,(THIS_FILE, "Media session for call %d is destroyed", 
-                             call_index));
-
-    }
-
+#include <pjsua-lib/pjsua_internal.h>
+
+
+#define THIS_FILE               "pjsua_call.c"
+
+
+/* This callback receives notification from invite session when the
+ * session state has changed.
+ */
+static void pjsua_call_on_state_changed(pjsip_inv_session *inv, 
+                                        pjsip_event *e);
+
+/* This callback is called by invite session framework when UAC session
+ * has forked.
+ */
+static void pjsua_call_on_forked( pjsip_inv_session *inv, 
+                                  pjsip_event *e);
+
+/*
+ * Callback to be called when SDP offer/answer negotiation has just completed
+ * in the session. This function will start/update media if negotiation
+ * has succeeded.
+ */
+static void pjsua_call_on_media_update(pjsip_inv_session *inv,
+                                       pj_status_t status);
+
+/*
+ * Called when session received new offer.
+ */
+static void pjsua_call_on_rx_offer(pjsip_inv_session *inv,
+                                   const pjmedia_sdp_session *offer);
+
+/*
+ * This callback is called when transaction state has changed in INVITE
+ * session. We use this to trap:
+ *  - incoming REFER request.
+ *  - incoming MESSAGE request.
+ */
+static void pjsua_call_on_tsx_state_changed(pjsip_inv_session *inv,
+                                            pjsip_transaction *tsx,
+                                            pjsip_event *e);
+
+
+/* Destroy the call's media */
+static pj_status_t call_destroy_media(int call_id);
+
+/* Create inactive SDP for call hold. */
+static pj_status_t create_inactive_sdp(pjsua_call *call,
+                                       pjmedia_sdp_session **p_answer);
+
+
+/*
+ * Reset call descriptor.
+ */
+static void reset_call(pjsua_call_id id)
+{
+    pjsua_call *call = &pjsua_var.calls[id];
+
+    call->index = id;
+    call->inv = NULL;
+    call->user_data = NULL;
+    call->session = NULL;
+    call->xfer_sub = NULL;
+    call->last_code = 0;
+    call->conf_slot = PJSUA_INVALID_ID;
+    call->last_text.ptr = call->last_text_buf_;
+    call->last_text.slen = 0;
+}
+
+
+/*
+ * Init call subsystem.
+ */
+pj_status_t pjsua_call_subsys_init(const pjsua_config *cfg)
+{
+    pjsip_inv_callback inv_cb;
+    unsigned i;
+    pj_status_t status;
+
+    /* Init calls array. */
+    for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.calls); ++i)
+        reset_call(i);
+
+    /* Copy config */
+    pjsua_config_dup(pjsua_var.pool, &pjsua_var.ua_cfg, cfg);
+
+    /* Initialize invite session callback. */
+    pj_memset(&inv_cb, 0, sizeof(inv_cb));
+    inv_cb.on_state_changed = &pjsua_call_on_state_changed;
+    inv_cb.on_new_session = &pjsua_call_on_forked;
+    inv_cb.on_media_update = &pjsua_call_on_media_update;
+    inv_cb.on_rx_offer = &pjsua_call_on_rx_offer;
+    inv_cb.on_tsx_state_changed = &pjsua_call_on_tsx_state_changed;
+
+
+    /* Initialize invite session module: */
+    status = pjsip_inv_usage_init(pjsua_var.endpt, &inv_cb);
+    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+
+    return status;
+}
+
+
+/*
+ * Start call subsystem.
+ */
+pj_status_t pjsua_call_subsys_start(void)
+{
+    /* Nothing to do */
     return PJ_SUCCESS;
 }
 
 
-/**
+/*
  * Get maximum number of calls configured in pjsua.
  */
 PJ_DEF(unsigned) pjsua_call_get_max_count(void)
 {
-    return pjsua.config.max_calls;
-}
-
-
-/**
- * Get current number of active calls.
+    return pjsua_var.ua_cfg.max_calls;
+}
+
+
+/*
+ * Get number of currently active calls.
  */
 PJ_DEF(unsigned) pjsua_call_get_count(void)
 {
-    return pjsua.call_cnt;
-}
-
-
-/**
- * Check if the specified call is active.
- */
-PJ_DEF(pj_bool_t) pjsua_call_is_active(unsigned call_index)
-{
-    PJ_ASSERT_RETURN(call_index < pjsua.config.max_calls,
-                     PJ_EINVAL);
-    return pjsua.calls[call_index].inv != NULL &&
-           pjsua.calls[call_index].inv->state != PJSIP_INV_STATE_DISCONNECTED;
-}
-
-/**
- * Check if call has a media session.
- */
-PJ_DEF(pj_bool_t) pjsua_call_has_media(unsigned call_index)
-{
-    PJ_ASSERT_RETURN(call_index < pjsua.config.max_calls, PJ_EINVAL);
-    return pjsua.calls[call_index].session != NULL;
-}
-
-
-/**
- * Get call info.
- */
-PJ_DEF(pj_status_t) pjsua_call_get_info( unsigned call_index,
-                                         pjsua_call_info *info)
-{
-    pjsua_call *call;
-
-    PJ_ASSERT_RETURN(call_index < pjsua.config.max_calls,
-                     PJ_EINVAL);
-
-    pj_memset(info, 0, sizeof(pjsua_call_info));
-
-    call = &pjsua.calls[call_index];
-    info->active = pjsua_call_is_active(call_index);
-
-    if (call->inv == NULL)
-        return PJ_SUCCESS;
-
-    info->index = call_index;
-    info->role = call->inv->role;
-    info->local_info = call->inv->dlg->local.info_str;
-    info->remote_info = call->inv->dlg->remote.info_str;
-    info->state = call->inv->state;
-    info->state_text = pj_str((char*)pjsip_inv_state_name(info->state));
-    
-    if (info->state >= PJSIP_INV_STATE_DISCONNECTED) {
-
-        info->total_duration = call->dis_time;
-        PJ_TIME_VAL_SUB(info->total_duration, call->start_time);
-
-        if (call->conn_time.sec) {
-            info->connect_duration = call->dis_time;
-            PJ_TIME_VAL_SUB(info->total_duration, call->conn_time);
-        }
-
-    } else if (info->state == PJSIP_INV_STATE_CONFIRMED) {
-
-        pj_gettimeofday(&info->total_duration);
-        PJ_TIME_VAL_SUB(info->total_duration, call->start_time);
-
-        pj_gettimeofday(&info->connect_duration);
-        PJ_TIME_VAL_SUB(info->connect_duration, call->conn_time);
-
-    } else {
-        pj_gettimeofday(&info->total_duration);
-        PJ_TIME_VAL_SUB(info->total_duration, call->start_time);
-    }
-
-    info->last_status = call->last_code;
-    info->last_status_text = *pjsip_get_status_text(info->last_status);
-
-    info->has_media = (call->session != NULL);
-    info->conf_slot = call->conf_slot;
+    return pjsua_var.call_cnt;
+}
+
+
+/*
+ * Enum calls.
+ */
+PJ_DEF(pj_status_t) pjsua_enum_calls( pjsua_call_id ids[],
+                                      unsigned *count)
+{
+    unsigned i, c;
+
+    PJ_ASSERT_RETURN(ids && *count, PJ_EINVAL);
+
+    PJSUA_LOCK();
+
+    for (i=0, c=0; c<*count && i<pjsua_var.ua_cfg.max_calls; ++i) {
+        if (!pjsua_var.calls[i].inv)
+            continue;
+        ids[c] = i;
+        ++c;
+    }
+
+    *count = c;
+
+    PJSUA_UNLOCK();
 
     return PJ_SUCCESS;
@@ -223 +176 @@
 
 
-/**
- * Duplicate call info.
- */
-PJ_DEF(void) pjsua_call_info_dup( pj_pool_t *pool,
-                                  pjsua_call_info *dst_info,
-                                  const pjsua_call_info *src_info)
-{
-    PJ_ASSERT_ON_FAIL(pool && dst_info && src_info, return);
-
-    pj_memcpy(dst_info, src_info, sizeof(pjsua_call_info));
-
-    pj_strdup(pool, &dst_info->local_info, &src_info->local_info);
-    pj_strdup(pool, &dst_info->remote_info, &src_info->remote_info);
-    
-    /* state_text and cause_text belong to pjsip, so don't need to be
-     * duplicated because they'll always be available.
-     */
-}
-
-
-/**
- * Make outgoing call.
- */
-PJ_DEF(pj_status_t) pjsua_call_make_call(unsigned acc_index,
-                                         const pj_str_t *dest_uri,
-                                         int *p_call_index)
+/*
+ * Make outgoing call to the specified URI using the specified account.
+ */
+PJ_DEF(pj_status_t) pjsua_call_make_call( pjsua_acc_id acc_id,
+                                          const pj_str_t *dest_uri,
+                                          unsigned options,
+                                          void *user_data,
+                                          const pjsua_msg_data *msg_data,
+                                          pjsua_call_id *p_call_id)
 {
     pjsip_dialog *dlg = NULL;
     pjmedia_sdp_session *offer;
     pjsip_inv_session *inv = NULL;
-    unsigned call_index;
+    pjsua_acc *acc;
+    pjsua_call *call;
+    unsigned call_id;
     pjsip_tx_data *tdata;
     pj_status_t status;
 
 
-    PJ_ASSERT_RETURN(acc_index==0 || acc_index < pjsua.config.acc_cnt, 
+    /* Check that account is valid */
+    PJ_ASSERT_RETURN(acc_id>=0 || acc_id<PJ_ARRAY_SIZE(pjsua_var.acc), 
                      PJ_EINVAL);
 
+    /* Options must be zero for now */
+    PJ_ASSERT_RETURN(options == 0, PJ_EINVAL);
+
+    PJSUA_LOCK();
+
+    acc = &pjsua_var.acc[acc_id];
+    if (!acc->valid) {
+        pjsua_perror(THIS_FILE, "Unable to make call because account "
+                     "is not valid", PJ_EINVALIDOP);
+        PJSUA_UNLOCK();
+        return PJ_EINVALIDOP;
+    }
 
     /* Find free call slot. */
-    for (call_index=0; call_index<pjsua.config.max_calls; ++call_index) {
-        if (pjsua.calls[call_index].inv == NULL)
+    for (call_id=0; call_id<pjsua_var.ua_cfg.max_calls; ++call_id) {
+        if (pjsua_var.calls[call_id].inv == NULL)
             break;
     }
 
-    if (call_index == pjsua.config.max_calls) {
-        PJ_LOG(3,(THIS_FILE, "Error: too many calls!"));
+    if (call_id == pjsua_var.ua_cfg.max_calls) {
+        pjsua_perror(THIS_FILE, "Error making file", PJ_ETOOMANY);
+        PJSUA_UNLOCK();
         return PJ_ETOOMANY;
     }
 
+    call = &pjsua_var.calls[call_id];
+
     /* Mark call start time. */
-    pj_gettimeofday(&pjsua.calls[call_index].start_time);
+    pj_gettimeofday(&call->start_time);
 
     /* Reset first response time */
-    pjsua.calls[call_index].res_time.sec = 0;
+    call->res_time.sec = 0;
 
     /* Create outgoing dialog: */
     status = pjsip_dlg_create_uac( pjsip_ua_instance(), 
-                                   &pjsua.config.acc_config[acc_index].id,
-                                   &pjsua.config.acc_config[acc_index].contact,
-                                   dest_uri, dest_uri,
-                                   &dlg);
+                                   &acc->cfg.id, &acc->cfg.contact,
+                                   dest_uri, dest_uri, &dlg);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Dialog creation failed", status);
+        PJSUA_UNLOCK();
         return status;
     }
@@ -292 +245 @@
     /* Get media capability from media endpoint: */
 
-    status = pjmedia_endpt_create_sdp( pjsua.med_endpt, dlg->pool, 1, 
-                                       &pjsua.calls[call_index].skinfo, 
-                                       &offer);
+    status = pjmedia_endpt_create_sdp( pjsua_var.med_endpt, dlg->pool, 1, 
+                                       &call->skinfo, &offer);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "pjmedia unable to create SDP", status);
@@ -311 +263 @@
     /* Create and associate our data in the session. */
 
-    pjsua.calls[call_index].inv = inv;
-
-    dlg->mod_data[pjsua.mod.id] = &pjsua.calls[call_index];
-    inv->mod_data[pjsua.mod.id] = &pjsua.calls[call_index];
-
+    call->inv = inv;
+
+    dlg->mod_data[pjsua_var.mod.id] = call;
+    inv->mod_data[pjsua_var.mod.id] = call;
+
+    /* Attach user data */
+    call->user_data = user_data;
 
     /* Set dialog Route-Set: */
-
-    if (!pj_list_empty(&pjsua.acc[acc_index].route_set))
-        pjsip_dlg_set_route_set(dlg, &pjsua.acc[acc_index].route_set);
+    if (!pj_list_empty(&acc->route_set))
+        pjsip_dlg_set_route_set(dlg, &acc->route_set);
 
 
     /* Set credentials: */
-    if (pjsua.config.acc_config[acc_index].cred_count) {
-        pjsua_acc_config *acc_cfg = &pjsua.config.acc_config[acc_index];
+    if (acc->cred_cnt) {
         pjsip_auth_clt_set_credentials( &dlg->auth_sess, 
-                                        acc_cfg->cred_count,
-                                        acc_cfg->cred_info);
+                                        acc->cred_cnt, acc->cred);
     }
 
@@ -341 +292 @@
     }
 
+
+    /* Add additional headers etc */
+
+    pjsua_process_msg_data( tdata, msg_data);
 
     /* Send initial INVITE: */
@@ -357 +312 @@
     }
 
-
     /* Done. */
 
-    ++pjsua.call_cnt;
-
-    if (p_call_index)
-        *p_call_index = call_index;
+    ++pjsua_var.call_cnt;
+
+    if (p_call_id)
+        *p_call_id = call_id;
+
+    PJSUA_UNLOCK();
 
     return PJ_SUCCESS;
@@ -375 +331 @@
     }
 
-    if (call_index != -1) {
-        pjsua.calls[call_index].inv = NULL;
-    }
-    return status;
-}
-
-
-/**
- * Answer call.
- */
-PJ_DEF(pj_status_t) pjsua_call_answer(int call_index, int code)
-{
-    pjsip_tx_data *tdata;
-    pj_status_t status;
-
-    PJ_ASSERT_RETURN( call_index >= 0 && 
-                      call_index < (int)pjsua.config.max_calls,
-                      PJ_EINVAL);
-
-    if (pjsua.calls[call_index].inv == NULL) {
-        PJ_LOG(3,(THIS_FILE, "Call %d already disconnected"));
-        return PJSIP_ESESSIONTERMINATED;
-    }
-
-    status = pjsip_inv_answer(pjsua.calls[call_index].inv,
-                              code, NULL, NULL, &tdata);
-    if (status == PJ_SUCCESS)
-        status = pjsip_inv_send_msg(pjsua.calls[call_index].inv,
-                                    tdata);
-
-    if (status != PJ_SUCCESS)
-        pjsua_perror(THIS_FILE, "Unable to create/send response", 
-                     status);
-
+    if (call_id != -1) {
+        reset_call(call_id);
+    }
+
+    PJSUA_UNLOCK();
     return status;
 }
@@ -415 +342 @@
 /**
  * Handle incoming INVITE request.
+ * Called by pjsua_core.c
  */
 pj_bool_t pjsua_call_on_incoming(pjsip_rx_data *rdata)
@@ -424 +352 @@
     unsigned options = 0;
     pjsip_inv_session *inv = NULL;
-    int acc_index;
-    unsigned call_index;
+    int acc_id;
+    pjsua_call *call;
+    int call_id = -1;
     pjmedia_sdp_session *answer;
     pj_status_t status;
@@ -442 +371 @@
     /* Verify that we can handle the request. */
     status = pjsip_inv_verify_request(rdata, &options, NULL, NULL,
-                                      pjsua.endpt, &response);
+                                      pjsua_var.endpt, &response);
     if (status != PJ_SUCCESS) {
 
@@ -453 +382 @@
 
             pjsip_get_response_addr(response->pool, rdata, &res_addr);
-            pjsip_endpt_send_response(pjsua.endpt, &res_addr, response, 
+            pjsip_endpt_send_response(pjsua_var.endpt, &res_addr, response, 
                                       NULL, NULL);
 
@@ -459 +388 @@
 
             /* Respond with 500 (Internal Server Error) */
-            pjsip_endpt_respond_stateless(pjsua.endpt, rdata, 500, NULL,
+            pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
                                           NULL, NULL);
         }
@@ -472 +401 @@
 
     /* Find free call slot. */
-    for (call_index=0; call_index < pjsua.config.max_calls; ++call_index) {
-        if (pjsua.calls[call_index].inv == NULL)
+    for (call_id=0; call_id<(int)pjsua_var.ua_cfg.max_calls; ++call_id) {
+        if (pjsua_var.calls[call_id].inv == NULL)
             break;
     }
 
-    if (call_index == PJSUA_MAX_CALLS) {
-        pjsip_endpt_respond_stateless(pjsua.endpt, rdata, 
+    if (call_id == (int)pjsua_var.ua_cfg.max_calls) {
+        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 
                                       PJSIP_SC_BUSY_HERE, NULL,
                                       NULL, NULL);
@@ -484 +413 @@
     }
 
+    /* Clear call descriptor */
+    reset_call(call_id);
+
+    call = &pjsua_var.calls[call_id];
+
     /* Mark call start time. */
-    pj_gettimeofday(&pjsua.calls[call_index].start_time);
-
-    /* Reset first response time */
-    pjsua.calls[call_index].res_time.sec = 0;
+    pj_gettimeofday(&call->start_time);
 
     /* Get media capability from media endpoint: */
-
-    status = pjmedia_endpt_create_sdp( pjsua.med_endpt, rdata->tp_info.pool, 1,
-                                       &pjsua.calls[call_index].skinfo, 
-                                       &answer );
-    if (status != PJ_SUCCESS) {
-        pjsip_endpt_respond_stateless(pjsua.endpt, rdata, 500, NULL,
+    status = pjmedia_endpt_create_sdp( pjsua_var.med_endpt, 
+                                       rdata->tp_info.pool, 1,
+                                       &call->skinfo, &answer );
+    if (status != PJ_SUCCESS) {
+        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
                                       NULL, NULL);
-
         return PJ_TRUE;
     }
 
-    /* TODO: 
-     *
+    /* 
      * Get which account is most likely to be associated with this incoming
      * call. We need the account to find which contact URI to put for
      * the call.
      */
-    acc_index = 0;
+    acc_id = pjsua_acc_find_for_incoming(rdata);
 
     /* Create dialog: */
-
     status = pjsip_dlg_create_uas( pjsip_ua_instance(), rdata,
-                                   &pjsua.config.acc_config[acc_index].contact,
+                                   &pjsua_var.acc[acc_id].cfg.contact, 
                                    &dlg);
     if (status != PJ_SUCCESS) {
-        pjsip_endpt_respond_stateless(pjsua.endpt, rdata, 500, NULL,
+        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
                                       NULL, NULL);
 
@@ -522 +449 @@
     }
 
+    /* Set credentials */
+    if (pjsua_var.acc[acc_id].cred_cnt) {
+        pjsip_auth_clt_set_credentials(&dlg->auth_sess, 
+                                       pjsua_var.acc[acc_id].cred_cnt,
+                                       pjsua_var.acc[acc_id].cred);
+    }
 
     /* Create invite session: */
-
     status = pjsip_inv_create_uas( dlg, rdata, answer, 0, &inv);
     if (status != PJ_SUCCESS) {
-
         pjsip_dlg_respond(dlg, rdata, 500, NULL, NULL, NULL);
         pjsip_dlg_terminate(dlg);
@@ -534 +465 @@
 
 
-    /* Create and attach pjsua data to the dialog: */
-
-    pjsua.calls[call_index].inv = inv;
-
-    dlg->mod_data[pjsua.mod.id] = &pjsua.calls[call_index];
-    inv->mod_data[pjsua.mod.id] = &pjsua.calls[call_index];
+    /* Create and attach pjsua_var data to the dialog: */
+    call->inv = inv;
+
+    dlg->mod_data[pjsua_var.mod.id] = call;
+    inv->mod_data[pjsua_var.mod.id] = call;
 
 
@@ -545 +475 @@
      * If auto-answer flag is set, send 200 straight away, otherwise send 100.
      */
-    
     status = pjsip_inv_initial_answer(inv, rdata, 
-                                      (pjsua.config.auto_answer ? 
-                                      pjsua.config.auto_answer : 100), 
-                                      NULL, NULL, &response);
-    if (status != PJ_SUCCESS) {
-        
-        int st_code;
-
+                                      100, NULL, NULL, &response);
+    if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to send answer to incoming INVITE", 
                      status);
 
-        /* If failed to send 2xx response, there's a good chance that it is
-         * because SDP negotiation has failed.
-         */
-        if (pjsua.config.auto_answer/100 == 2)
-            st_code = PJSIP_SC_UNSUPPORTED_MEDIA_TYPE;
-        else
-            st_code = 500;
-
-        pjsip_dlg_respond(dlg, rdata, st_code, NULL, NULL, NULL);
-        pjsip_inv_terminate(inv, st_code, PJ_FALSE);
+        pjsip_dlg_respond(dlg, rdata, 500, NULL, NULL, NULL);
+        pjsip_inv_terminate(inv, 500, PJ_FALSE);
         return PJ_TRUE;
 
@@ -575 +491 @@
     }
 
-    if (pjsua.config.auto_answer < 200) {
-        PJ_LOG(3,(THIS_FILE,
-                  "\nIncoming call!!\n"
-                  "From: %.*s\n"
-                  "To:   %.*s\n"
-                  "(press 'a' to answer, 'h' to decline)",
-                  (int)dlg->remote.info_str.slen,
-                  dlg->remote.info_str.ptr,
-                  (int)dlg->local.info_str.slen,
-                  dlg->local.info_str.ptr));
-    } else {
-        PJ_LOG(3,(THIS_FILE,
-                  "Call From:%.*s To:%.*s was answered with %d (%s)",
-                  (int)dlg->remote.info_str.slen,
-                  dlg->remote.info_str.ptr,
-                  (int)dlg->local.info_str.slen,
-                  dlg->local.info_str.ptr,
-                  pjsua.config.auto_answer,
-                  pjsip_get_status_text(pjsua.config.auto_answer)->ptr ));
-    }
-
-    ++pjsua.call_cnt;
-
-    /* Schedule timer to refresh. */
-    if (pjsua.config.uas_refresh > 0) {
-        schedule_call_timer( &pjsua.calls[call_index], 
-                             &pjsua.calls[call_index].refresh_tm,
-                             REFRESH_CALL_TIMER,
-                             pjsua.config.uas_refresh);
-    }
-
-    /* Schedule timer to hangup call. */
-    if (pjsua.config.uas_duration > 0) {
-        schedule_call_timer( &pjsua.calls[call_index], 
-                             &pjsua.calls[call_index].hangup_tm,
-                             HANGUP_CALL_TIMER,
-                             pjsua.config.uas_duration);
-    }
+    ++pjsua_var.call_cnt;
+
 
     /* Notify application */
-    if (pjsua.cb.on_incoming_call)
-        pjsua.cb.on_incoming_call(acc_index, call_index, rdata);
-
+    if (pjsua_var.ua_cfg.cb.on_incoming_call)
+        pjsua_var.ua_cfg.cb.on_incoming_call(acc_id, call_id, rdata);
 
     /* This INVITE request has been handled. */
@@ -624 +503 @@
 
 
+
+/*
+ * Check if the specified call has active INVITE session and the INVITE
+ * session has not been disconnected.
+ */
+PJ_DEF(pj_bool_t) pjsua_call_is_active(pjsua_call_id call_id)
+{
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+    return pjsua_var.calls[call_id].inv != NULL &&
+           pjsua_var.calls[call_id].inv->state != PJSIP_INV_STATE_DISCONNECTED;
+}
+
+
+/*
+ * Check if call has an active media session.
+ */
+PJ_DEF(pj_bool_t) pjsua_call_has_media(pjsua_call_id call_id)
+{
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls, 
+                     PJ_EINVAL);
+    return pjsua_var.calls[call_id].session != NULL;
+}
+
+
+/*
+ * Get the conference port identification associated with the call.
+ */
+PJ_DEF(pjsua_conf_port_id) pjsua_call_get_conf_port(pjsua_call_id call_id)
+{
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls, 
+                     PJ_EINVAL);
+    return pjsua_var.calls[call_id].conf_slot;
+}
+
+
+/*
+ * Obtain detail information about the specified call.
+ */
+PJ_DEF(pj_status_t) pjsua_call_get_info( pjsua_call_id call_id,
+                                         pjsua_call_info *info)
+{
+    pjsua_call *call;
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+
+    pj_memset(info, 0, sizeof(*info));
+
+    PJSUA_LOCK();
+
+    call = &pjsua_var.calls[call_id];
+
+    if (call->inv == NULL) {
+        PJSUA_UNLOCK();
+        return PJ_SUCCESS;
+    }
+
+    pjsip_dlg_inc_lock(call->inv->dlg);
+
+
+    /* id and role */
+    info->id = call_id;
+    info->role = call->inv->role;
+
+    /* local info */
+    info->local_info.ptr = info->buf_.local_info;
+    pj_strncpy(&info->local_info, &call->inv->dlg->local.info_str,
+               sizeof(info->buf_.local_info));
+
+    /* local contact */
+    info->local_contact.ptr = info->buf_.local_contact;
+    info->local_contact.slen = pjsip_uri_print(PJSIP_URI_IN_CONTACT_HDR,
+                                               call->inv->dlg->local.contact->uri,
+                                               info->local_contact.ptr,
+                                               sizeof(info->buf_.local_contact));
+
+    /* remote info */
+    info->remote_info.ptr = info->buf_.remote_info;
+    pj_strncpy(&info->remote_info, &call->inv->dlg->remote.info_str,
+               sizeof(info->buf_.remote_info));
+
+    /* remote contact */
+    if (call->inv->dlg->remote.contact) {
+        int len;
+        info->remote_contact.ptr = info->buf_.remote_contact;
+        len = pjsip_uri_print(PJSIP_URI_IN_CONTACT_HDR,
+                              call->inv->dlg->remote.contact->uri,
+                              info->remote_contact.ptr,
+                              sizeof(info->buf_.remote_contact));
+        if (len < 0) len = 0;
+        info->remote_contact.slen = len;
+    } else {
+        info->remote_contact.slen = 0;
+    }
+
+    /* call id */
+    info->call_id.ptr = info->buf_.call_id;
+    pj_strncpy(&info->call_id, &call->inv->dlg->call_id->id,
+               sizeof(info->buf_.call_id));
+
+    /* state, state_text */
+    info->state = call->inv->state;
+    info->state_text = pj_str((char*)pjsip_inv_state_name(info->state));
+
+    /* If call is disconnected, set the last_status from the cause code */
+    if (call->inv->state >= PJSIP_INV_STATE_DISCONNECTED) {
+        /* last_status, last_status_text */
+        info->last_status = call->inv->cause;
+
+        info->last_status_text.ptr = info->buf_.last_status_text;
+        pj_strncpy(&info->last_status_text, &call->inv->cause_text,
+                   sizeof(info->buf_.last_status_text));
+    } else {
+        /* last_status, last_status_text */
+        info->last_status = call->last_code;
+
+        info->last_status_text.ptr = info->buf_.last_status_text;
+        pj_strncpy(&info->last_status_text, &call->last_text,
+                   sizeof(info->buf_.last_status_text));
+    }
+    
+    /* media status and dir */
+    info->media_status = call->media_st;
+    info->media_dir = call->media_dir;
+
+
+    /* conference slot number */
+    info->conf_slot = call->conf_slot;
+
+    /* calculate duration */
+    if (info->state >= PJSIP_INV_STATE_DISCONNECTED) {
+
+        info->total_duration = call->dis_time;
+        PJ_TIME_VAL_SUB(info->total_duration, call->start_time);
+
+        if (call->conn_time.sec) {
+            info->connect_duration = call->dis_time;
+            PJ_TIME_VAL_SUB(info->connect_duration, call->conn_time);
+        }
+
+    } else if (info->state == PJSIP_INV_STATE_CONFIRMED) {
+
+        pj_gettimeofday(&info->total_duration);
+        PJ_TIME_VAL_SUB(info->total_duration, call->start_time);
+
+        pj_gettimeofday(&info->connect_duration);
+        PJ_TIME_VAL_SUB(info->connect_duration, call->conn_time);
+
+    } else {
+        pj_gettimeofday(&info->total_duration);
+        PJ_TIME_VAL_SUB(info->total_duration, call->start_time);
+    }
+
+    pjsip_dlg_dec_lock(call->inv->dlg);
+    PJSUA_UNLOCK();
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Attach application specific data to the call.
+ */
+PJ_DEF(pj_status_t) pjsua_call_set_user_data( pjsua_call_id call_id,
+                                              void *user_data)
+{
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+    pjsua_var.calls[call_id].user_data = user_data;
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Get user data attached to the call.
+ */
+PJ_DEF(void*) pjsua_call_get_user_data(pjsua_call_id call_id)
+{
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     NULL);
+    return pjsua_var.calls[call_id].user_data;
+}
+
+
+/*
+ * Send response to incoming INVITE request.
+ */
+PJ_DEF(pj_status_t) pjsua_call_answer( pjsua_call_id call_id, 
+                                       unsigned code,
+                                       const pj_str_t *reason,
+                                       const pjsua_msg_data *msg_data)
+{
+    pjsua_call *call;
+    pjsip_tx_data *tdata;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+
+    PJSUA_LOCK();
+
+    call = &pjsua_var.calls[call_id];
+
+    if (call->inv == NULL) {
+        PJ_LOG(3,(THIS_FILE, "Call %d already disconnected", call_id));
+        PJSUA_UNLOCK();
+        return PJSIP_ESESSIONTERMINATED;
+    }
+
+    /* Create response message */
+    status = pjsip_inv_answer(call->inv, code, reason, NULL, &tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Error creating response", 
+                     status);
+        PJSUA_UNLOCK();
+        return status;
+    }
+
+    /* Add additional headers etc */
+    pjsua_process_msg_data( tdata, msg_data);
+
+    /* Send the message */
+    status = pjsip_inv_send_msg(call->inv, tdata);
+    if (status != PJ_SUCCESS)
+        pjsua_perror(THIS_FILE, "Error sending response", 
+                     status);
+
+    PJSUA_UNLOCK();
+
+    return status;
+}
+
+
+/*
+ * Hangup call by using method that is appropriate according to the
+ * call state.
+ */
+PJ_DEF(pj_status_t) pjsua_call_hangup(pjsua_call_id call_id,
+                                      unsigned code,
+                                      const pj_str_t *reason,
+                                      const pjsua_msg_data *msg_data)
+{
+    pjsua_call *call;
+    pj_status_t status;
+    pjsip_tx_data *tdata;
+
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+
+    PJSUA_LOCK();
+
+    call = &pjsua_var.calls[call_id];
+
+    if (!call->inv) {
+        PJ_LOG(3,(THIS_FILE,"Call has been disconnected"));
+        PJSUA_UNLOCK();
+        return PJ_EINVAL;
+    }
+
+    if (code==0) {
+        if (call->inv->state == PJSIP_INV_STATE_CONFIRMED)
+            code = PJSIP_SC_OK;
+        else if (call->inv->role == PJSIP_ROLE_UAS)
+            code = PJSIP_SC_DECLINE;
+        else
+            code = PJSIP_SC_REQUEST_TERMINATED;
+    }
+
+    status = pjsip_inv_end_session(call->inv, code, reason, &tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, 
+                     "Failed to create end session message", 
+                     status);
+        PJSUA_UNLOCK();
+        return status;
+    }
+
+    /* pjsip_inv_end_session may return PJ_SUCCESS with NULL 
+     * as p_tdata when INVITE transaction has not been answered
+     * with any provisional responses.
+     */
+    if (tdata == NULL) {
+        PJSUA_UNLOCK();
+        return PJ_SUCCESS;
+    }
+
+    /* Add additional headers etc */
+    pjsua_process_msg_data( tdata, msg_data);
+
+    /* Send the message */
+    status = pjsip_inv_send_msg(call->inv, tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, 
+                     "Failed to send end session message", 
+                     status);
+        PJSUA_UNLOCK();
+        return status;
+    }
+
+    PJSUA_UNLOCK();
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Put the specified call on hold.
+ */
+PJ_DEF(pj_status_t) pjsua_call_set_hold(pjsua_call_id call_id,
+                                        const pjsua_msg_data *msg_data)
+{
+    pjmedia_sdp_session *sdp;
+    pjsua_call *call;
+    pjsip_tx_data *tdata;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+
+    PJSUA_LOCK();
+
+    call = &pjsua_var.calls[call_id];
+    
+    if (!call->inv) {
+        PJ_LOG(3,(THIS_FILE,"Call has been disconnected"));
+        PJSUA_UNLOCK();
+        return PJSIP_ESESSIONTERMINATED;
+    }
+
+    if (call->inv->state != PJSIP_INV_STATE_CONFIRMED) {
+        PJ_LOG(3,(THIS_FILE, "Can not hold call that is not confirmed"));
+        PJSUA_UNLOCK();
+        return PJSIP_ESESSIONSTATE;
+    }
+
+    status = create_inactive_sdp(call, &sdp);
+    if (status != PJ_SUCCESS) {
+        PJSUA_UNLOCK();
+        return status;
+    }
+
+    /* Create re-INVITE with new offer */
+    status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create re-INVITE", status);
+        PJSUA_UNLOCK();
+        return status;
+    }
+
+    /* Add additional headers etc */
+    pjsua_process_msg_data( tdata, msg_data);
+
+    /* Send the request */
+    status = pjsip_inv_send_msg( call->inv, tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to send re-INVITE", status);
+        PJSUA_UNLOCK();
+        return status;
+    }
+
+    PJSUA_UNLOCK();
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Send re-INVITE (to release hold).
+ */
+PJ_DEF(pj_status_t) pjsua_call_reinvite( pjsua_call_id call_id,
+                                         pj_bool_t unhold,
+                                         const pjsua_msg_data *msg_data)
+{
+    pjmedia_sdp_session *sdp;
+    pjsip_tx_data *tdata;
+    pjsua_call *call;
+    pj_status_t status;
+
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+
+    PJSUA_LOCK();
+
+    call = &pjsua_var.calls[call_id];
+
+    if (!call->inv) {
+        PJ_LOG(3,(THIS_FILE,"Call has been disconnected"));
+        PJSUA_UNLOCK();
+        return PJSIP_ESESSIONTERMINATED;
+    }
+
+
+    if (call->inv->state != PJSIP_INV_STATE_CONFIRMED) {
+        PJ_LOG(3,(THIS_FILE, "Can not re-INVITE call that is not confirmed"));
+        PJSUA_UNLOCK();
+        return PJSIP_ESESSIONSTATE;
+    }
+
+    /* Create SDP */
+    status = pjmedia_endpt_create_sdp( pjsua_var.med_endpt, call->inv->pool, 
+                                       1, &call->skinfo, &sdp);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint", 
+                     status);
+        PJSUA_UNLOCK();
+        return status;
+    }
+
+    /* Create re-INVITE with new offer */
+    status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create re-INVITE", status);
+        PJSUA_UNLOCK();
+        return status;
+    }
+
+    /* Add additional headers etc */
+    pjsua_process_msg_data( tdata, msg_data);
+
+    /* Send the request */
+    status = pjsip_inv_send_msg( call->inv, tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to send re-INVITE", status);
+        PJSUA_UNLOCK();
+        return status;
+    }
+
+    PJSUA_UNLOCK();
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Initiate call transfer to the specified address.
+ */
+PJ_DEF(pj_status_t) pjsua_call_xfer( pjsua_call_id call_id, 
+                                     const pj_str_t *dest,
+                                     const pjsua_msg_data *msg_data)
+{
+    pjsip_evsub *sub;
+    pjsip_tx_data *tdata;
+    pjsua_call *call;
+    pj_status_t status;
+
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+    
+    PJSUA_LOCK();
+
+    call = &pjsua_var.calls[call_id];
+
+    if (!call->inv) {
+        PJ_LOG(3,(THIS_FILE,"Call has been disconnected"));
+        PJSUA_UNLOCK();
+        return PJSIP_ESESSIONTERMINATED;
+    }
+   
+    /* Create xfer client subscription.
+     * We're not interested in knowing the transfer result, so we
+     * put NULL as the callback.
+     */
+    status = pjsip_xfer_create_uac(call->inv->dlg, NULL, &sub);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create xfer", status);
+        PJSUA_UNLOCK();
+        return status;
+    }
+
+    /*
+     * Create REFER request.
+     */
+    status = pjsip_xfer_initiate(sub, dest, &tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create REFER request", status);
+        PJSUA_UNLOCK();
+        return status;
+    }
+
+    /* Add additional headers etc */
+    pjsua_process_msg_data( tdata, msg_data);
+
+    /* Send. */
+    status = pjsip_xfer_send_request(sub, tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to send REFER request", status);
+        PJSUA_UNLOCK();
+        return status;
+    }
+
+    /* For simplicity (that's what this program is intended to be!), 
+     * leave the original invite session as it is. More advanced application
+     * may want to hold the INVITE, or terminate the invite, or whatever.
+     */
+
+    PJSUA_UNLOCK();
+
+    return PJ_SUCCESS;
+
+}
+
+
+/*
+ * Send DTMF digits to remote using RFC 2833 payload formats.
+ */
+PJ_DEF(pj_status_t) pjsua_call_dial_dtmf( pjsua_call_id call_id, 
+                                          const pj_str_t *digits)
+{
+    pjsua_call *call;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+    
+    PJSUA_LOCK();
+
+    call = &pjsua_var.calls[call_id];
+
+    if (!call->session) {
+        PJ_LOG(3,(THIS_FILE, "Media is not established yet!"));
+        PJSUA_UNLOCK();
+        return PJ_EINVALIDOP;
+    }
+
+    status = pjmedia_session_dial_dtmf( call->session, 0, digits);
+
+    PJSUA_UNLOCK();
+
+    return status;
+}
+
+
+/**
+ * Send instant messaging inside INVITE session.
+ */
+PJ_DEF(pj_status_t) pjsua_call_send_im( pjsua_call_id call_id, 
+                                        const pj_str_t *mime_type,
+                                        const pj_str_t *content,
+                                        const pjsua_msg_data *msg_data,
+                                        void *user_data)
+{
+    pjsua_call *call;
+    const pj_str_t mime_text_plain = pj_str("text/plain");
+    pjsip_media_type ctype;
+    pjsua_im_data *im_data;
+    pjsip_tx_data *tdata;
+    pj_status_t status;
+
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+
+    PJSUA_LOCK();
+
+    call = &pjsua_var.calls[call_id];
+
+    if (!call->inv) {
+        PJ_LOG(3,(THIS_FILE,"Call has been disconnected"));
+        PJSUA_UNLOCK();
+        return PJSIP_ESESSIONTERMINATED;
+    }
+
+    /* Lock dialog. */
+    pjsip_dlg_inc_lock(call->inv->dlg);
+
+    /* Set default media type if none is specified */
+    if (mime_type == NULL) {
+        mime_type = &mime_text_plain;
+    }
+
+    /* Create request message. */
+    status = pjsip_dlg_create_request( call->inv->dlg, &pjsip_message_method,
+                                       -1, &tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create MESSAGE request", status);
+        goto on_return;
+    }
+
+    /* Add accept header. */
+    pjsip_msg_add_hdr( tdata->msg, 
+                       (pjsip_hdr*)pjsua_im_create_accept(tdata->pool));
+
+    /* Parse MIME type */
+    pjsua_parse_media_type(tdata->pool, mime_type, &ctype);
+
+    /* Create "text/plain" message body. */
+    tdata->msg->body = pjsip_msg_body_create( tdata->pool, &ctype.type,
+                                              &ctype.subtype, content);
+    if (tdata->msg->body == NULL) {
+        pjsua_perror(THIS_FILE, "Unable to create msg body", PJ_ENOMEM);
+        pjsip_tx_data_dec_ref(tdata);
+        goto on_return;
+    }
+
+    /* Add additional headers etc */
+    pjsua_process_msg_data( tdata, msg_data);
+
+    /* Create IM data and attach to the request. */
+    im_data = pj_pool_zalloc(tdata->pool, sizeof(*im_data));
+    im_data->acc_id = call->acc_id;
+    im_data->call_id = call_id;
+    im_data->to = call->inv->dlg->remote.info_str;
+    pj_strdup_with_null(tdata->pool, &im_data->body, content);
+    im_data->user_data = user_data;
+
+
+    /* Send the request. */
+    status = pjsip_dlg_send_request( call->inv->dlg, tdata, 
+                                     pjsua_var.mod.id, im_data);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to send MESSAGE request", status);
+        goto on_return;
+    }
+
+on_return:
+    pjsip_dlg_dec_lock(call->inv->dlg);
+    PJSUA_UNLOCK();
+    return status;
+}
+
+
+/*
+ * Send IM typing indication inside INVITE session.
+ */
+PJ_DEF(pj_status_t) pjsua_call_send_typing_ind( pjsua_call_id call_id, 
+                                                pj_bool_t is_typing,
+                                                const pjsua_msg_data*msg_data)
+{
+    pjsua_call *call;
+    pjsip_tx_data *tdata;
+    pj_status_t status;
+
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+
+    PJSUA_LOCK();
+
+    call = &pjsua_var.calls[call_id];
+
+    if (!call->inv) {
+        PJ_LOG(3,(THIS_FILE,"Call has been disconnected"));
+        PJSUA_UNLOCK();
+        return PJSIP_ESESSIONTERMINATED;
+    }
+
+    /* Lock dialog. */
+    pjsip_dlg_inc_lock(call->inv->dlg);
+    
+    /* Create request message. */
+    status = pjsip_dlg_create_request( call->inv->dlg, &pjsip_message_method,
+                                       -1, &tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create MESSAGE request", status);
+        goto on_return;
+    }
+
+    /* Create "application/im-iscomposing+xml" msg body. */
+    tdata->msg->body = pjsip_iscomposing_create_body(tdata->pool, is_typing,
+                                                     NULL, NULL, -1);
+
+    /* Add additional headers etc */
+    pjsua_process_msg_data( tdata, msg_data);
+
+    /* Send the request. */
+    status = pjsip_dlg_send_request( call->inv->dlg, tdata, -1, NULL);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to send MESSAGE request", status);
+        goto on_return;
+    }
+
+on_return:
+    pjsip_dlg_dec_lock(call->inv->dlg);
+    PJSUA_UNLOCK();
+    return status;
+}
+
+
+/*
+ * Terminate all calls.
+ */
+PJ_DEF(void) pjsua_call_hangup_all(void)
+{
+    unsigned i;
+
+    PJSUA_LOCK();
+
+    for (i=0; i<pjsua_var.ua_cfg.max_calls; ++i) {
+        if (pjsua_var.calls[i].inv)
+            pjsua_call_hangup(i, 0, NULL, NULL);
+    }
+
+    PJSUA_UNLOCK();
+}
+
+
+static const char *good_number(char *buf, pj_int32_t val)
+{
+    if (val < 1000) {
+        pj_ansi_sprintf(buf, "%d", val);
+    } else if (val < 1000000) {
+        pj_ansi_sprintf(buf, "%d.%dK", 
+                        val / 1000,
+                        (val % 1000) / 100);
+    } else {
+        pj_ansi_sprintf(buf, "%d.%02dM", 
+                        val / 1000000,
+                        (val % 1000000) / 10000);
+    }
+
+    return buf;
+}
+
+
+/* Dump media session */
+static void dump_media_session(const char *indent, 
+                               char *buf, unsigned maxlen,
+                               pjmedia_session *session)
+{
+    unsigned i;
+    char *p = buf, *end = buf+maxlen;
+    int len;
+    pjmedia_session_info info;
+
+    pjmedia_session_get_info(session, &info);
+
+    for (i=0; i<info.stream_cnt; ++i) {
+        pjmedia_rtcp_stat stat;
+        const char *rem_addr;
+        int rem_port;
+        const char *dir;
+        char last_update[40];
+        char packets[16], bytes[16], ipbytes[16];
+        pj_time_val now;
+
+        pjmedia_session_get_stream_stat(session, i, &stat);
+        rem_addr = pj_inet_ntoa(info.stream_info[i].rem_addr.sin_addr);
+        rem_port = pj_ntohs(info.stream_info[i].rem_addr.sin_port);
+
+        if (info.stream_info[i].dir == PJMEDIA_DIR_ENCODING)
+            dir = "sendonly";
+        else if (info.stream_info[i].dir == PJMEDIA_DIR_DECODING)
+            dir = "recvonly";
+        else if (info.stream_info[i].dir == PJMEDIA_DIR_ENCODING_DECODING)
+            dir = "sendrecv";
+        else
+            dir = "inactive";
+
+        
+        len = pj_ansi_snprintf(buf, end-p, 
+                  "%s  #%d %.*s @%dKHz, %s, peer=%s:%d",
+                  indent, i,
+                  info.stream_info[i].fmt.encoding_name.slen,
+                  info.stream_info[i].fmt.encoding_name.ptr,
+                  info.stream_info[i].fmt.clock_rate / 1000,
+                  dir,
+                  rem_addr, rem_port);
+        if (len < 1 || len > end-p) {
+            *p = '\0';
+            return;
+        }
+
+        p += len;
+        *p++ = '\n';
+        *p = '\0';
+
+        if (stat.rx.update_cnt == 0)
+            strcpy(last_update, "never");
+        else {
+            pj_gettimeofday(&now);
+            PJ_TIME_VAL_SUB(now, stat.rx.update);
+            sprintf(last_update, "%02ldh:%02ldm:%02ld.%03lds ago",
+                    now.sec / 3600,
+                    (now.sec % 3600) / 60,
+                    now.sec % 60,
+                    now.msec);
+        }
+
+        len = pj_ansi_snprintf(p, end-p,
+               "%s     RX pt=%d, stat last update: %s\n"
+               "%s        total %spkt %sB (%sB +IP hdr)\n"
+               "%s        pkt loss=%d (%3.1f%%), dup=%d (%3.1f%%), reorder=%d (%3.1f%%)\n"
+               "%s              (msec)    min     avg     max     last\n"
+               "%s        loss period: %7.3f %7.3f %7.3f %7.3f\n"
+               "%s        jitter     : %7.3f %7.3f %7.3f %7.3f%s",
+               indent, info.stream_info[i].fmt.pt,
+               last_update,
+               indent,
+               good_number(packets, stat.rx.pkt),
+               good_number(bytes, stat.rx.bytes),
+               good_number(ipbytes, stat.rx.bytes + stat.rx.pkt * 32),
+               indent,
+               stat.rx.loss,
+               stat.rx.loss * 100.0 / stat.rx.pkt,
+               stat.rx.dup, 
+               stat.rx.dup * 100.0 / stat.rx.pkt,
+               stat.rx.reorder, 
+               stat.rx.reorder * 100.0 / stat.rx.pkt,
+               indent, indent,
+               stat.rx.loss_period.min / 1000.0, 
+               stat.rx.loss_period.avg / 1000.0, 
+               stat.rx.loss_period.max / 1000.0,
+               stat.rx.loss_period.last / 1000.0,
+               indent,
+               stat.rx.jitter.min / 1000.0,
+               stat.rx.jitter.avg / 1000.0,
+               stat.rx.jitter.max / 1000.0,
+               stat.rx.jitter.last / 1000.0,
+               ""
+               );
+
+        if (len < 1 || len > end-p) {
+            *p = '\0';
+            return;
+        }
+
+        p += len;
+        *p++ = '\n';
+        *p = '\0';
+        
+        if (stat.tx.update_cnt == 0)
+            strcpy(last_update, "never");
+        else {
+            pj_gettimeofday(&now);
+            PJ_TIME_VAL_SUB(now, stat.tx.update);
+            sprintf(last_update, "%02ldh:%02ldm:%02ld.%03lds ago",
+                    now.sec / 3600,
+                    (now.sec % 3600) / 60,
+                    now.sec % 60,
+                    now.msec);
+        }
+
+        len = pj_ansi_snprintf(p, end-p,
+               "%s     TX pt=%d, ptime=%dms, stat last update: %s\n"
+               "%s        total %spkt %sB (%sB +IP hdr)\n"
+               "%s        pkt loss=%d (%3.1f%%), dup=%d (%3.1f%%), reorder=%d (%3.1f%%)\n"
+               "%s              (msec)    min     avg     max     last\n"
+               "%s        loss period: %7.3f %7.3f %7.3f %7.3f\n"
+               "%s        jitter     : %7.3f %7.3f %7.3f %7.3f%s",
+               indent,
+               info.stream_info[i].tx_pt,
+               info.stream_info[i].param->info.frm_ptime *
+                info.stream_info[i].param->setting.frm_per_pkt,
+               last_update,
+
+               indent,
+               good_number(packets, stat.tx.pkt),
+               good_number(bytes, stat.tx.bytes),
+               good_number(ipbytes, stat.tx.bytes + stat.tx.pkt * 32),
+
+               indent,
+               stat.tx.loss,
+               stat.tx.loss * 100.0 / stat.tx.pkt,
+               stat.tx.dup, 
+               stat.tx.dup * 100.0 / stat.tx.pkt,
+               stat.tx.reorder, 
+               stat.tx.reorder * 100.0 / stat.tx.pkt,
+
+               indent, indent,
+               stat.tx.loss_period.min / 1000.0, 
+               stat.tx.loss_period.avg / 1000.0, 
+               stat.tx.loss_period.max / 1000.0,
+               stat.tx.loss_period.last / 1000.0,
+               indent,
+               stat.tx.jitter.min / 1000.0,
+               stat.tx.jitter.avg / 1000.0,
+               stat.tx.jitter.max / 1000.0,
+               stat.tx.jitter.last / 1000.0,
+               ""
+               );
+
+        if (len < 1 || len > end-p) {
+            *p = '\0';
+            return;
+        }
+
+        p += len;
+        *p++ = '\n';
+        *p = '\0';
+
+        len = pj_ansi_snprintf(p, end-p,
+               "%s    RTT msec       : %7.3f %7.3f %7.3f %7.3f", 
+               indent,
+               stat.rtt.min / 1000.0,
+               stat.rtt.avg / 1000.0,
+               stat.rtt.max / 1000.0,
+               stat.rtt.last / 1000.0
+               );
+        if (len < 1 || len > end-p) {
+            *p = '\0';
+            return;
+        }
+
+        p += len;
+        *p++ = '\n';
+        *p = '\0';
+    }
+}
+
+
+/* Print call info */
+static void print_call(const char *title,
+                       int call_id, 
+                       char *buf, pj_size_t size)
+{
+    int len;
+    pjsip_inv_session *inv = pjsua_var.calls[call_id].inv;
+    pjsip_dialog *dlg = inv->dlg;
+    char userinfo[128];
+
+    /* Dump invite sesion info. */
+
+    len = pjsip_hdr_print_on(dlg->remote.info, userinfo, sizeof(userinfo));
+    if (len < 1)
+        pj_ansi_strcpy(userinfo, "<--uri too long-->");
+    else
+        userinfo[len] = '\0';
+    
+    len = pj_ansi_snprintf(buf, size, "%s[%s] %s",
+                           title,
+                           pjsip_inv_state_name(inv->state),
+                           userinfo);
+    if (len < 1 || len >= (int)size) {
+        pj_ansi_strcpy(buf, "<--uri too long-->");
+        len = 18;
+    } else
+        buf[len] = '\0';
+}
+
+
+/*
+ * Dump call and media statistics to string.
+ */
+PJ_DEF(pj_status_t) pjsua_call_dump( pjsua_call_id call_id, 
+                                     pj_bool_t with_media, 
+                                     char *buffer, 
+                                     unsigned maxlen,
+                                     const char *indent)
+{
+    pjsua_call *call;
+    pj_time_val duration, res_delay, con_delay;
+    char tmp[128];
+    char *p, *end;
+    int len;
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+
+    PJSUA_LOCK();
+
+    call = &pjsua_var.calls[call_id];
+
+    *buffer = '\0';
+    p = buffer;
+    end = buffer + maxlen;
+    len = 0;
+
+    if (call->inv == NULL) {
+        PJSUA_UNLOCK();
+        return PJ_EINVALIDOP;
+    }
+
+    print_call(indent, call_id, tmp, sizeof(tmp));
+    
+    len = pj_ansi_strlen(tmp);
+    pj_ansi_strcpy(buffer, tmp);
+
+    p += len;
+    *p++ = '\r';
+    *p++ = '\n';
+
+    /* Calculate call duration */
+    if (call->inv->state >= PJSIP_INV_STATE_CONFIRMED) {
+        pj_gettimeofday(&duration);
+        PJ_TIME_VAL_SUB(duration, call->conn_time);
+        con_delay = call->conn_time;
+        PJ_TIME_VAL_SUB(con_delay, call->start_time);
+    } else {
+        duration.sec = duration.msec = 0;
+        con_delay.sec = con_delay.msec = 0;
+    }
+
+    /* Calculate first response delay */
+    if (call->inv->state >= PJSIP_INV_STATE_EARLY) {
+        res_delay = call->res_time;
+        PJ_TIME_VAL_SUB(res_delay, call->start_time);
+    } else {
+        res_delay.sec = res_delay.msec = 0;
+    }
+
+    /* Print duration */
+    len = pj_ansi_snprintf(p, end-p, 
+                           "%s  Call time: %02dh:%02dm:%02ds, "
+                           "1st res in %d ms, conn in %dms",
+                           indent,
+                           (duration.sec / 3600),
+                           ((duration.sec % 3600)/60),
+                           (duration.sec % 60),
+                           PJ_TIME_VAL_MSEC(res_delay), 
+                           PJ_TIME_VAL_MSEC(con_delay));
+    
+    if (len > 0 && len < end-p) {
+        p += len;
+        *p++ = '\n';
+        *p = '\0';
+    }
+
+    /* Dump session statistics */
+    if (with_media && call->session)
+        dump_media_session(indent, p, end-p, call->session);
+
+    PJSUA_UNLOCK();
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Destroy the call's media
+ */
+static pj_status_t call_destroy_media(int call_id)
+{
+    pjsua_call *call = &pjsua_var.calls[call_id];
+
+    if (call->conf_slot != PJSUA_INVALID_ID) {
+        pjmedia_conf_remove_port(pjsua_var.mconf, call->conf_slot);
+        call->conf_slot = PJSUA_INVALID_ID;
+    }
+
+    if (call->session) {
+        /* Destroy session (this will also close RTP/RTCP sockets). */
+        pjmedia_session_destroy(call->session);
+        call->session = NULL;
+
+        PJ_LOG(4,(THIS_FILE, "Media session for call %d is destroyed", 
+                             call_id));
+
+    }
+
+    call->media_st = PJSUA_CALL_MEDIA_NONE;
+
+    return PJ_SUCCESS;
+}
+
+
 /*
  * This callback receives notification from invite session when the
@@ -631 +1560 @@
                                         pjsip_event *e)
 {
-    pjsua_call *call = inv->dlg->mod_data[pjsua.mod.id];
-
-    if (!call)
+    pjsua_call *call;
+
+    PJSUA_LOCK();
+
+    call = inv->dlg->mod_data[pjsua_var.mod.id];
+
+    if (!call) {
+        PJSUA_UNLOCK();
         return;
+    }
+
 
     /* Get call times */
@@ -643 +1579 @@
                 pj_gettimeofday(&call->res_time);
             call->last_code = e->body.tsx_state.tsx->status_code;
+            pj_strncpy(&call->last_text, 
+                       &e->body.tsx_state.tsx->status_text,
+                       sizeof(call->last_text_buf_));
             break;
         case PJSIP_INV_STATE_CONFIRMED:
@@ -651 +1590 @@
             if (e->body.tsx_state.tsx->status_code > call->last_code) {
                 call->last_code = e->body.tsx_state.tsx->status_code;
+                pj_strncpy(&call->last_text, 
+                           &e->body.tsx_state.tsx->status_text,
+                           sizeof(call->last_text_buf_));
             }
             break;
         default:
             call->last_code = e->body.tsx_state.tsx->status_code;
+            pj_strncpy(&call->last_text, 
+                       &e->body.tsx_state.tsx->status_text,
+                       sizeof(call->last_text_buf_));
             break;
     }
@@ -717 +1662 @@
 
 
-    if (pjsua.cb.on_call_state)
-        (*pjsua.cb.on_call_state)(call->index, e);
+    if (pjsua_var.ua_cfg.cb.on_call_state)
+        (*pjsua_var.ua_cfg.cb.on_call_state)(call->index, e);
 
     /* call->inv may be NULL now */
@@ -730 +1675 @@
             call_destroy_media(call->index);
 
-        /* Remove timers. */
-        schedule_call_timer(call, &call->refresh_tm, REFRESH_CALL_TIMER, 0);
-        schedule_call_timer(call, &call->hangup_tm, HANGUP_CALL_TIMER, 0);
-
         /* Free call */
         call->inv = NULL;
-        --pjsua.call_cnt;
-    }
-}
-
-
-/*
- * Callback called by event framework when the xfer subscription state
- * has changed.
- */
-static void xfer_on_evsub_state( pjsip_evsub *sub, pjsip_event *event)
-{
-    
-    PJ_UNUSED_ARG(event);
-
-    /*
-     * We're only interested when subscription is terminated, to 
-     * clear the xfer_sub member of the inv_data.
-     */
-    if (pjsip_evsub_get_state(sub) == PJSIP_EVSUB_STATE_TERMINATED) {
-        pjsua_call *call;
-
-        call = pjsip_evsub_get_mod_data(sub, pjsua.mod.id);
-        if (!call)
-            return;
-
-        pjsip_evsub_set_mod_data(sub, pjsua.mod.id, NULL);
-        call->xfer_sub = NULL;
-
-        PJ_LOG(3,(THIS_FILE, "Xfer subscription terminated"));
-    }
-}
-
-
-/*
- * Follow transfer (REFER) request.
- */
-static void on_call_transfered( pjsip_inv_session *inv,
-                                pjsip_rx_data *rdata )
-{
-    pj_status_t status;
-    pjsip_tx_data *tdata;
-    pjsua_call *existing_call;
-    int new_call;
-    const pj_str_t str_refer_to = { "Refer-To", 8};
-    pjsip_generic_string_hdr *refer_to;
-    char *uri;
-    pj_str_t tmp;
-    struct pjsip_evsub_user xfer_cb;
-    pjsip_status_code code;
-    pjsip_evsub *sub;
-
-    existing_call = inv->dlg->mod_data[pjsua.mod.id];
-
-    /* Find the Refer-To header */
-    refer_to = (pjsip_generic_string_hdr*)
-        pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &str_refer_to, NULL);
-
-    if (refer_to == NULL) {
-        /* Invalid Request.
-         * No Refer-To header!
-         */
-        PJ_LOG(4,(THIS_FILE, "Received REFER without Refer-To header!"));
-        pjsip_dlg_respond( inv->dlg, rdata, 400, NULL, NULL, NULL);
-        return;
-    }
-
-    /* Notify callback */
-    code = PJSIP_SC_OK;
-    if (pjsua.cb.on_call_transfered)
-        (*pjsua.cb.on_call_transfered)(existing_call->index,
-                                       &refer_to->hvalue, &code);
-
-    if (code < 200)
-        code = 200;
-    if (code >= 300) {
-        /* Application rejects call transfer request */
-        pjsip_dlg_respond( inv->dlg, rdata, code, NULL, NULL, NULL);
-        return;
-    }
-
-    PJ_LOG(3,(THIS_FILE, "Call to %.*s is being transfered to %.*s",
-              (int)inv->dlg->remote.info_str.slen,
-              inv->dlg->remote.info_str.ptr,
-              (int)refer_to->hvalue.slen, 
-              refer_to->hvalue.ptr));
-
-    /* Init callback */
-    pj_memset(&xfer_cb, 0, sizeof(xfer_cb));
-    xfer_cb.on_evsub_state = &xfer_on_evsub_state;
-
-    /* Create transferee event subscription */
-    status = pjsip_xfer_create_uas( inv->dlg, &xfer_cb, rdata, &sub);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create xfer uas", status);
-        pjsip_dlg_respond( inv->dlg, rdata, 500, NULL, NULL, NULL);
-        return;
-    }
-
-    /* Accept the REFER request, send 200 (OK). */
-    pjsip_xfer_accept(sub, rdata, code, NULL);
-
-    /* Create initial NOTIFY request */
-    status = pjsip_xfer_notify( sub, PJSIP_EVSUB_STATE_ACTIVE,
-                                100, NULL, &tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create NOTIFY to REFER", status);
-        return;
-    }
-
-    /* Send initial NOTIFY request */
-    status = pjsip_xfer_send_request( sub, tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to send NOTIFY to REFER", status);
-        return;
-    }
-
-    /* We're cheating here.
-     * We need to get a null terminated string from a pj_str_t.
-     * So grab the pointer from the hvalue and NULL terminate it, knowing
-     * that the NULL position will be occupied by a newline. 
-     */
-    uri = refer_to->hvalue.ptr;
-    uri[refer_to->hvalue.slen] = '\0';
-
-    /* Now make the outgoing call. */
-    tmp = pj_str(uri);
-    status = pjsua_call_make_call(existing_call->acc_index, &tmp, &new_call);
-    if (status != PJ_SUCCESS) {
-
-        /* Notify xferer about the error */
-        status = pjsip_xfer_notify(sub, PJSIP_EVSUB_STATE_TERMINATED,
-                                   500, NULL, &tdata);
-        if (status != PJ_SUCCESS) {
-            pjsua_perror(THIS_FILE, "Unable to create NOTIFY to REFER", 
-                          status);
-            return;
-        }
-        status = pjsip_xfer_send_request(sub, tdata);
-        if (status != PJ_SUCCESS) {
-            pjsua_perror(THIS_FILE, "Unable to send NOTIFY to REFER", 
-                          status);
-            return;
-        }
-        return;
-    }
-
-    /* Put the server subscription in inv_data.
-     * Subsequent state changed in pjsua_inv_on_state_changed() will be
-     * reported back to the server subscription.
-     */
-    pjsua.calls[new_call].xfer_sub = sub;
-
-    /* Put the invite_data in the subscription. */
-    pjsip_evsub_set_mod_data(sub, pjsua.mod.id, &pjsua.calls[new_call]);
-}
-
-
-/*
- * This callback is called when transaction state has changed in INVITE
- * session. We use this to trap:
- *  - incoming REFER request.
- *  - incoming MESSAGE request.
- */
-static void pjsua_call_on_tsx_state_changed(pjsip_inv_session *inv,
-                                            pjsip_transaction *tsx,
-                                            pjsip_event *e)
-{
-    pjsua_call *call = inv->dlg->mod_data[pjsua.mod.id];
-
-    if (tsx->role==PJSIP_ROLE_UAS &&
-        tsx->state==PJSIP_TSX_STATE_TRYING &&
-        pjsip_method_cmp(&tsx->method, &pjsip_refer_method)==0)
-    {
-        /*
-         * Incoming REFER request.
-         */
-        on_call_transfered(call->inv, e->body.tsx_state.src.rdata);
-
-    }
-    else if (tsx->role==PJSIP_ROLE_UAS &&
-             tsx->state==PJSIP_TSX_STATE_TRYING &&
-             pjsip_method_cmp(&tsx->method, &pjsip_message_method)==0)
-    {
-        /*
-         * Incoming MESSAGE request!
-         */
-        pjsip_rx_data *rdata;
-        pjsip_msg *msg;
-        pjsip_accept_hdr *accept_hdr;
-        pj_status_t status;
-
-        rdata = e->body.tsx_state.src.rdata;
-        msg = rdata->msg_info.msg;
-
-        /* Request MUST have message body, with Content-Type equal to
-         * "text/plain".
-         */
-        if (pjsua_im_accept_pager(rdata, &accept_hdr) == PJ_FALSE) {
-
-            pjsip_hdr hdr_list;
-
-            pj_list_init(&hdr_list);
-            pj_list_push_back(&hdr_list, accept_hdr);
-
-            pjsip_dlg_respond( inv->dlg, rdata, PJSIP_SC_NOT_ACCEPTABLE_HERE, 
-                               NULL, &hdr_list, NULL );
-            return;
-        }
-
-        /* Respond with 200 first, so that remote doesn't retransmit in case
-         * the UI takes too long to process the message. 
-         */
-        status = pjsip_dlg_respond( inv->dlg, rdata, 200, NULL, NULL, NULL);
-
-        /* Process MESSAGE request */
-        pjsua_im_process_pager(call->index, &inv->dlg->remote.info_str,
-                               &inv->dlg->local.info_str, rdata);
-    }
-
-}
-
+        --pjsua_var.call_cnt;
+    }
+
+    PJSUA_UNLOCK();
+}
 
 /*
@@ -971 +1696 @@
 }
 
-
-/*
- * Create inactive SDP for call hold.
- */
-static pj_status_t create_inactive_sdp(pjsua_call *call,
-                                       pjmedia_sdp_session **p_answer)
-{
-    pj_status_t status;
-    pjmedia_sdp_conn *conn;
-    pjmedia_sdp_attr *attr;
-    pjmedia_sdp_session *sdp;
-
-    /* Create new offer */
-    status = pjmedia_endpt_create_sdp(pjsua.med_endpt, pjsua.pool, 1,
-                                      &call->skinfo, &sdp);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create local SDP", status);
-        return status;
-    }
-
-    /* Get SDP media connection line */
-    conn = sdp->media[0]->conn;
-    if (!conn)
-        conn = sdp->conn;
-
-    /* Modify address */
-    conn->addr = pj_str("0.0.0.0");
-
-    /* Remove existing directions attributes */
-    pjmedia_sdp_media_remove_all_attr(sdp->media[0], "sendrecv");
-    pjmedia_sdp_media_remove_all_attr(sdp->media[0], "sendonly");
-    pjmedia_sdp_media_remove_all_attr(sdp->media[0], "recvonly");
-    pjmedia_sdp_media_remove_all_attr(sdp->media[0], "inactive");
-
-    /* Add inactive attribute */
-    attr = pjmedia_sdp_attr_create(pjsua.pool, "inactive", NULL);
-    pjmedia_sdp_media_add_attr(sdp->media[0], attr);
-
-    *p_answer = sdp;
-
-    return status;
-}
-
-/*
- * Called when session received new offer.
- */
-static void pjsua_call_on_rx_offer(pjsip_inv_session *inv,
-                                   const pjmedia_sdp_session *offer)
-{
-    pjsua_call *call;
-    pjmedia_sdp_conn *conn;
-    pjmedia_sdp_session *answer;
-    pj_bool_t is_remote_active;
-    pj_status_t status;
-
-    call = inv->dlg->mod_data[pjsua.mod.id];
-
-    /*
-     * See if remote is offering active media (i.e. not on-hold)
-     */
-    is_remote_active = PJ_TRUE;
-
-    conn = offer->media[0]->conn;
-    if (!conn)
-        conn = offer->conn;
-
-    if (pj_strcmp2(&conn->addr, "0.0.0.0")==0 ||
-        pj_strcmp2(&conn->addr, "0")==0)
-    {
-        is_remote_active = PJ_FALSE;
-
-    } 
-    else if (pjmedia_sdp_media_find_attr2(offer->media[0], "inactive", NULL))
-    {
-        is_remote_active = PJ_FALSE;
-    }
-
-    PJ_LOG(4,(THIS_FILE, "Received SDP offer, remote media is %s",
-              (is_remote_active ? "active" : "inactive")));
-
-    /* Supply candidate answer */
-    if (is_remote_active) {
-        status = pjmedia_endpt_create_sdp( pjsua.med_endpt, call->inv->pool, 1,
-                                           &call->skinfo, &answer);
-    } else {
-        status = create_inactive_sdp( call, &answer );
-    }
-
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create local SDP", status);
-        return;
-    }
-
-    status = pjsip_inv_set_sdp_answer(call->inv, answer);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to set answer", status);
-        return;
-    }
-
-}
-
-#if 0
-/* Disconnect call */
-static void call_disconnect(pjsip_inv_session *inv,
-                            int st_code)
-{
-    pjsip_tx_data *tdata;
-    pj_status_t status;
-
-    status = pjsip_inv_end_session(inv, st_code, NULL, &tdata);
-    if (status == PJ_SUCCESS)
-        status = pjsip_inv_send_msg(inv, tdata);
-
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to disconnect call", status);
-    }
-}
-#endif
 
 /*
@@ -1098 +1705 @@
                                        pj_status_t status)
 {
+    int prev_media_st = 0;
     pjsua_call *call;
     pjmedia_session_info sess_info;
@@ -1106 +1714 @@
     char tmp[PJSIP_MAX_URL_SIZE];
 
-    call = inv->dlg->mod_data[pjsua.mod.id];
+    PJSUA_LOCK();
+
+    call = inv->dlg->mod_data[pjsua_var.mod.id];
 
     if (status != PJ_SUCCESS) {
@@ -1120 +1730 @@
             //call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
         }
+
+        PJSUA_UNLOCK();
         return;
-
     }
 
     /* Destroy existing media session, if any. */
 
-    if (call)
+    if (call) {
+        prev_media_st = call->media_st;
         call_destroy_media(call->index);
+    }
 
     /* Get local and remote SDP */
@@ -1137 +1750 @@
                      status);
         //call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
+        PJSUA_UNLOCK();
         return;
     }
@@ -1147 +1761 @@
                      status);
         //call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
+        PJSUA_UNLOCK();
         return;
     }
-
-    if (pjsua.config.null_audio)
-        return;
 
     /* Create media session info based on SDP parameters. 
@@ -1157 +1769 @@
      */    
     status = pjmedia_session_info_from_sdp( call->inv->dlg->pool, 
-                                            pjsua.med_endpt, 
+                                            pjsua_var.med_endpt, 
                                             1,&sess_info, 
                                             local_sdp, remote_sdp);
@@ -1164 +1776 @@
                      status);
         //call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
+        PJSUA_UNLOCK();
         return;
     }
 
-    /* Override ptime, if this option is specified. */
-    if (pjsua.config.ptime) {
-        sess_info.stream_info[0].param->setting.frm_per_pkt = (pj_uint8_t)
-            (pjsua.config.ptime / 
-              sess_info.stream_info[0].param->info.frm_ptime);
-        if (sess_info.stream_info[0].param->setting.frm_per_pkt==0)
-            sess_info.stream_info[0].param->setting.frm_per_pkt = 1;
-    }
-
-    /* Optionally, application may modify other stream settings here
-     * (such as jitter buffer parameters, codec ptime, etc.)
-     */
-
-    /* Create session based on session info. */
-    status = pjmedia_session_create( pjsua.med_endpt, &sess_info,
-                                     &call->med_tp,
-                                     call, &call->session );
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create media session", 
-                     status);
-        //call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
-        return;
-    }
-
-
-    /* Get the port interface of the first stream in the session.
-     * We need the port interface to add to the conference bridge.
-     */
-    pjmedia_session_get_port(call->session, 0, &media_port);
-
-
-    /*
-     * Add the call to conference bridge.
-     */
-    port_name.ptr = tmp;
-    port_name.slen = pjsip_uri_print(PJSIP_URI_IN_REQ_URI,
-                                     call->inv->dlg->remote.info->uri,
-                                     tmp, sizeof(tmp));
-    if (port_name.slen < 1) {
-        port_name = pj_str("call");
-    }
-    status = pjmedia_conf_add_port( pjsua.mconf, call->inv->pool,
-                                    media_port, 
-                                    &port_name,
-                                    &call->conf_slot);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create conference slot", 
-                     status);
-        call_destroy_media(call->index);
-        //call_disconnect(inv, PJSIP_SC_INTERNAL_SERVER_ERROR);
-        return;
-    }
-
-    /* If auto-play is configured, connect the call to the file player 
-     * port 
-     */
-    if (pjsua.config.auto_play && pjsua.config.wav_file.slen && 
-        call->inv->role == PJSIP_ROLE_UAS) 
+    /* Check if media is put on-hold */
+    if (sess_info.stream_cnt == 0 || 
+        sess_info.stream_info[0].dir == PJMEDIA_DIR_NONE)
     {
 
-        pjmedia_conf_connect_port( pjsua.mconf, pjsua.player[0].slot, 
-                                   call->conf_slot, 0);
-
-    }
-    if (pjsua.config.auto_loop && call->inv->role == PJSIP_ROLE_UAS) {
-
-        pjmedia_conf_connect_port( pjsua.mconf, call->conf_slot, 
-                                   call->conf_slot, 0);
-
-    }
-    if (pjsua.config.auto_conf) {
-        unsigned i;
-
-        pjmedia_conf_connect_port( pjsua.mconf, 0, call->conf_slot, 0);
-        pjmedia_conf_connect_port( pjsua.mconf, call->conf_slot, 0, 0);
-
-        for (i=0; i < pjsua.config.max_calls; ++i) {
-
-            if (!pjsua.calls[i].session)
-                continue;
-
-            pjmedia_conf_connect_port( pjsua.mconf, call->conf_slot, 
-                                       pjsua.calls[i].conf_slot, 0);
-            pjmedia_conf_connect_port( pjsua.mconf, pjsua.calls[i].conf_slot,
-                                       call->conf_slot, 0);
+        /* Determine who puts the call on-hold */
+        if (prev_media_st == PJSUA_CALL_MEDIA_ACTIVE) {
+            if (pjmedia_sdp_neg_was_answer_remote(call->inv->neg)) {
+                /* It was local who offer hold */
+                call->media_st = PJSUA_CALL_MEDIA_LOCAL_HOLD;
+            } else {
+                call->media_st = PJSUA_CALL_MEDIA_REMOTE_HOLD;
+            }
         }
 
-    } 
-    
-    /* Normal operation: if no auto_xx is given, connect new call to 
-     * the sound device port (port zero) in the main conference bridge.
-     */
-    if (pjsua.config.auto_play == 0 && pjsua.config.auto_loop == 0 &&
-        pjsua.config.auto_conf == 0)
+        call->media_dir = PJMEDIA_DIR_NONE;
+
+    } else {
+
+        /* Override ptime, if this option is specified. */
+        PJ_TODO(set_codec_ptime_in_call);
+
+
+        /* Optionally, application may modify other stream settings here
+         * (such as jitter buffer parameters, codec ptime, etc.)
+         */
+
+        /* Create session based on session info. */
+        status = pjmedia_session_create( pjsua_var.med_endpt, &sess_info,
+                                         &call->med_tp,
+                                         call, &call->session );
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Unable to create media session", 
+                         status);
+            //call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
+            PJSUA_UNLOCK();
+            return;
+        }
+
+
+        /* Get the port interface of the first stream in the session.
+         * We need the port interface to add to the conference bridge.
+         */
+        pjmedia_session_get_port(call->session, 0, &media_port);
+
+
+        /*
+         * Add the call to conference bridge.
+         */
+        port_name.ptr = tmp;
+        port_name.slen = pjsip_uri_print(PJSIP_URI_IN_REQ_URI,
+                                         call->inv->dlg->remote.info->uri,
+                                         tmp, sizeof(tmp));
+        if (port_name.slen < 1) {
+            port_name = pj_str("call");
+        }
+        status = pjmedia_conf_add_port( pjsua_var.mconf, call->inv->pool,
+                                        media_port, 
+                                        &port_name,
+                                        (unsigned*)&call->conf_slot);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Unable to create conference slot", 
+                         status);
+            call_destroy_media(call->index);
+            //call_disconnect(inv, PJSIP_SC_INTERNAL_SERVER_ERROR);
+            PJSUA_UNLOCK();
+            return;
+        }
+
+        /* Call's media state is active */
+        call->media_st = PJSUA_CALL_MEDIA_ACTIVE;
+        call->media_dir = sess_info.stream_info[0].dir;
+    }
+
+    /* Print info. */
     {
-        pjmedia_conf_connect_port( pjsua.mconf, 0, call->conf_slot, 0);
-        pjmedia_conf_connect_port( pjsua.mconf, call->conf_slot, 0, 0);
-    }
-
-
-    /* Done. */
-    {
-        struct pjmedia_session_info sess_info;
         char info[80];
         int info_len = 0;
         unsigned i;
 
-        pjmedia_session_get_info(call->session, &sess_info);
         for (i=0; i<sess_info.stream_cnt; ++i) {
             int len;
@@ -1305 +1890 @@
                 info_len += len;
         }
-        PJ_LOG(3,(THIS_FILE,"Media started%s", info));
-    }
-}
-
-
-/*
- * Hangup call.
- */
-PJ_DEF(void) pjsua_call_hangup(int call_index)
-{
+        PJ_LOG(4,(THIS_FILE,"Media updates%s", info));
+    }
+
+    /* Call application callback, if any */
+    if (pjsua_var.ua_cfg.cb.on_call_media_state)
+        pjsua_var.ua_cfg.cb.on_call_media_state(call->index);
+
+
+    PJSUA_UNLOCK();
+}
+
+
+/*
+ * Create inactive SDP for call hold.
+ */
+static pj_status_t create_inactive_sdp(pjsua_call *call,
+                                       pjmedia_sdp_session **p_answer)
+{
+    pj_status_t status;
+    pjmedia_sdp_conn *conn;
+    pjmedia_sdp_attr *attr;
+    pjmedia_sdp_session *sdp;
+
+    /* Create new offer */
+    status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, pjsua_var.pool, 1,
+                                      &call->skinfo, &sdp);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create local SDP", status);
+        return status;
+    }
+
+    /* Get SDP media connection line */
+    conn = sdp->media[0]->conn;
+    if (!conn)
+        conn = sdp->conn;
+
+    /* Modify address */
+    conn->addr = pj_str("0.0.0.0");
+
+    /* Remove existing directions attributes */
+    pjmedia_sdp_media_remove_all_attr(sdp->media[0], "sendrecv");
+    pjmedia_sdp_media_remove_all_attr(sdp->media[0], "sendonly");
+    pjmedia_sdp_media_remove_all_attr(sdp->media[0], "recvonly");
+    pjmedia_sdp_media_remove_all_attr(sdp->media[0], "inactive");
+
+    /* Add inactive attribute */
+    attr = pjmedia_sdp_attr_create(pjsua_var.pool, "inactive", NULL);
+    pjmedia_sdp_media_add_attr(sdp->media[0], attr);
+
+    *p_answer = sdp;
+
+    return status;
+}
+
+
+/*
+ * Called when session received new offer.
+ */
+static void pjsua_call_on_rx_offer(pjsip_inv_session *inv,
+                                   const pjmedia_sdp_session *offer)
+{
+    const char *remote_state;
     pjsua_call *call;
-    int code;
+    pjmedia_sdp_conn *conn;
+    pjmedia_sdp_session *answer;
+    pj_bool_t is_remote_active;
+    pj_status_t status;
+
+    PJSUA_LOCK();
+
+    call = inv->dlg->mod_data[pjsua_var.mod.id];
+
+    /*
+     * See if remote is offering active media (i.e. not on-hold)
+     */
+    is_remote_active = PJ_TRUE;
+
+    conn = offer->media[0]->conn;
+    if (!conn)
+        conn = offer->conn;
+
+    if (pj_strcmp2(&conn->addr, "0.0.0.0")==0 ||
+        pj_strcmp2(&conn->addr, "0")==0)
+    {
+        is_remote_active = PJ_FALSE;
+
+    } 
+    else if (pjmedia_sdp_media_find_attr2(offer->media[0], "inactive", NULL))
+    {
+        is_remote_active = PJ_FALSE;
+    }
+
+    remote_state = (is_remote_active ? "active" : "inactive");
+
+    /* Supply candidate answer */
+    if (call->media_st == PJSUA_CALL_MEDIA_LOCAL_HOLD || !is_remote_active) {
+        PJ_LOG(4,(THIS_FILE, 
+                  "Call %d: RX new media offer, creating inactive SDP "
+                  "(media in offer is %s)", call->index, remote_state));
+        status = create_inactive_sdp( call, &answer );
+    } else {
+        PJ_LOG(4,(THIS_FILE, "Call %d: received updated media offer",
+                  call->index));
+        status = pjmedia_endpt_create_sdp( pjsua_var.med_endpt, 
+                                           call->inv->pool, 1,
+                                           &call->skinfo, &answer);     
+    }
+
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create local SDP", status);
+        PJSUA_UNLOCK();
+        return;
+    }
+
+    status = pjsip_inv_set_sdp_answer(call->inv, answer);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to set answer", status);
+        PJSUA_UNLOCK();
+        return;
+    }
+
+    PJSUA_UNLOCK();
+}
+
+
+/*
+ * Callback called by event framework when the xfer subscription state
+ * has changed.
+ */
+static void xfer_on_evsub_state( pjsip_evsub *sub, pjsip_event *event)
+{
+    
+    PJ_UNUSED_ARG(event);
+
+    /*
+     * We're only interested when subscription is terminated, to 
+     * clear the xfer_sub member of the inv_data.
+     */
+    if (pjsip_evsub_get_state(sub) == PJSIP_EVSUB_STATE_TERMINATED) {
+        pjsua_call *call;
+
+        call = pjsip_evsub_get_mod_data(sub, pjsua_var.mod.id);
+        if (!call)
+            return;
+
+        pjsip_evsub_set_mod_data(sub, pjsua_var.mod.id, NULL);
+        call->xfer_sub = NULL;
+
+        PJ_LOG(3,(THIS_FILE, "Xfer subscription terminated"));
+    }
+}
+
+
+/*
+ * Follow transfer (REFER) request.
+ */
+static void on_call_transfered( pjsip_inv_session *inv,
+                                pjsip_rx_data *rdata )
+{
     pj_status_t status;
     pjsip_tx_data *tdata;
-
-
-    call = &pjsua.calls[call_index];
-
-    if (!call->inv) {
-        PJ_LOG(3,(THIS_FILE,"Call has been disconnected"));
+    pjsua_call *existing_call;
+    int new_call;
+    const pj_str_t str_refer_to = { "Refer-To", 8};
+    pjsip_generic_string_hdr *refer_to;
+    char *uri;
+    pj_str_t tmp;
+    struct pjsip_evsub_user xfer_cb;
+    pjsip_status_code code;
+    pjsip_evsub *sub;
+
+    existing_call = inv->dlg->mod_data[pjsua_var.mod.id];
+
+    /* Find the Refer-To header */
+    refer_to = (pjsip_generic_string_hdr*)
+        pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &str_refer_to, NULL);
+
+    if (refer_to == NULL) {
+        /* Invalid Request.
+         * No Refer-To header!
+         */
+        PJ_LOG(4,(THIS_FILE, "Received REFER without Refer-To header!"));
+        pjsip_dlg_respond( inv->dlg, rdata, 400, NULL, NULL, NULL);
         return;
     }
 
-    if (call->inv->state == PJSIP_INV_STATE_CONFIRMED)
-        code = PJSIP_SC_OK;
-    else if (call->inv->role == PJSIP_ROLE_UAS)
-        code = PJSIP_SC_DECLINE;
-    else
-        code = PJSIP_SC_REQUEST_TERMINATED;
-
-    status = pjsip_inv_end_session(call->inv, code, NULL, &tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, 
-                     "Failed to create end session message", 
-                     status);
+    /* Notify callback */
+    code = PJSIP_SC_OK;
+    if (pjsua_var.ua_cfg.cb.on_call_transfered)
+        (*pjsua_var.ua_cfg.cb.on_call_transfered)(existing_call->index,
+                                                  &refer_to->hvalue, &code);
+
+    if (code < 200)
+        code = 200;
+    if (code >= 300) {
+        /* Application rejects call transfer request */
+        pjsip_dlg_respond( inv->dlg, rdata, code, NULL, NULL, NULL);
         return;
     }
 
-    /* pjsip_inv_end_session may return PJ_SUCCESS with NULL 
-     * as p_tdata when INVITE transaction has not been answered
-     * with any provisional responses.
+    PJ_LOG(3,(THIS_FILE, "Call to %.*s is being transfered to %.*s",
+              (int)inv->dlg->remote.info_str.slen,
+              inv->dlg->remote.info_str.ptr,
+              (int)refer_to->hvalue.slen, 
+              refer_to->hvalue.ptr));
+
+    /* Init callback */
+    pj_memset(&xfer_cb, 0, sizeof(xfer_cb));
+    xfer_cb.on_evsub_state = &xfer_on_evsub_state;
+
+    /* Create transferee event subscription */
+    status = pjsip_xfer_create_uas( inv->dlg, &xfer_cb, rdata, &sub);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create xfer uas", status);
+        pjsip_dlg_respond( inv->dlg, rdata, 500, NULL, NULL, NULL);
+        return;
+    }
+
+    /* Accept the REFER request, send 200 (OK). */
+    pjsip_xfer_accept(sub, rdata, code, NULL);
+
+    /* Create initial NOTIFY request */
+    status = pjsip_xfer_notify( sub, PJSIP_EVSUB_STATE_ACTIVE,
+                                100, NULL, &tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create NOTIFY to REFER", status);
+        return;
+    }
+
+    /* Send initial NOTIFY request */
+    status = pjsip_xfer_send_request( sub, tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to send NOTIFY to REFER", status);
+        return;
+    }
+
+    /* We're cheating here.
+     * We need to get a null terminated string from a pj_str_t.
+     * So grab the pointer from the hvalue and NULL terminate it, knowing
+     * that the NULL position will be occupied by a newline. 
      */
-    if (tdata == NULL)
+    uri = refer_to->hvalue.ptr;
+    uri[refer_to->hvalue.slen] = '\0';
+
+    /* Now make the outgoing call. */
+    tmp = pj_str(uri);
+    status = pjsua_call_make_call(existing_call->acc_id, &tmp, 0,
+                                  existing_call->user_data, NULL, 
+                                  &new_call);
+    if (status != PJ_SUCCESS) {
+
+        /* Notify xferer about the error */
+        status = pjsip_xfer_notify(sub, PJSIP_EVSUB_STATE_TERMINATED,
+                                   500, NULL, &tdata);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Unable to create NOTIFY to REFER", 
+                          status);
+            return;
+        }
+        status = pjsip_xfer_send_request(sub, tdata);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Unable to send NOTIFY to REFER", 
+                          status);
+            return;
+        }
         return;
-
-    status = pjsip_inv_send_msg(call->inv, tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, 
-                     "Failed to send end session message", 
-                     status);
-        return;
-    }
-}
-
-
-/*
- * Put call on-Hold.
- */
-PJ_DEF(pj_status_t) pjsua_call_set_hold(int call_index)
-{
-    pjmedia_sdp_session *sdp;
-    pjsua_call *call;
-    pjsip_tx_data *tdata;
-    pj_status_t status;
-
-    call = &pjsua.calls[call_index];
-    
-    if (!call->inv) {
-        PJ_LOG(3,(THIS_FILE,"Call has been disconnected"));
-        return PJSIP_ESESSIONTERMINATED;
-    }
-
-    if (call->inv->state != PJSIP_INV_STATE_CONFIRMED) {
-        PJ_LOG(3,(THIS_FILE, "Can not hold call that is not confirmed"));
-        return PJSIP_ESESSIONSTATE;
-    }
-
-    status = create_inactive_sdp(call, &sdp);
-    if (status != PJ_SUCCESS)
-        return status;
-
-    /* Send re-INVITE with new offer */
-    status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create re-INVITE", status);
-        return status;
-    }
-
-    status = pjsip_inv_send_msg( call->inv, tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to send re-INVITE", status);
-        return status;
-    }
-
-    return PJ_SUCCESS;
-}
-
-
-/*
- * re-INVITE.
- */
-PJ_DEF(pj_status_t) pjsua_call_reinvite(int call_index)
-{
-    pjmedia_sdp_session *sdp;
-    pjsip_tx_data *tdata;
-    pjsua_call *call;
-    pj_status_t status;
-
-    call = &pjsua.calls[call_index];
-
-    if (!call->inv) {
-        PJ_LOG(3,(THIS_FILE,"Call has been disconnected"));
-        return PJSIP_ESESSIONTERMINATED;
-    }
-
-
-    if (call->inv->state != PJSIP_INV_STATE_CONFIRMED) {
-        PJ_LOG(3,(THIS_FILE, "Can not re-INVITE call that is not confirmed"));
-        return PJSIP_ESESSIONSTATE;
-    }
-
-    /* Create SDP */
-    status = pjmedia_endpt_create_sdp( pjsua.med_endpt, call->inv->pool, 1,
-                                       &call->skinfo, &sdp);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint", 
-                     status);
-        return status;
-    }
-
-    /* Send re-INVITE with new offer */
-    status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create re-INVITE", status);
-        return status;
-    }
-
-    status = pjsip_inv_send_msg( call->inv, tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to send re-INVITE", status);
-        return status;
-    }
-
-    return PJ_SUCCESS;
-}
-
-
-/*
- * Transfer call.
- */
-PJ_DEF(pj_status_t) pjsua_call_xfer(unsigned call_index, const pj_str_t *dest)
-{
-    pjsip_evsub *sub;
-    pjsip_tx_data *tdata;
-    pjsua_call *call;
-    pj_status_t status;
-
-    
-    call = &pjsua.calls[call_index];
-
-    if (!call->inv) {
-        PJ_LOG(3,(THIS_FILE,"Call has been disconnected"));
-        return PJSIP_ESESSIONTERMINATED;
-    }
-   
-    /* Create xfer client subscription.
-     * We're not interested in knowing the transfer result, so we
-     * put NULL as the callback.
+    }
+
+    /* Put the server subscription in inv_data.
+     * Subsequent state changed in pjsua_inv_on_state_changed() will be
+     * reported back to the server subscription.
      */
-    status = pjsip_xfer_create_uac(call->inv->dlg, NULL, &sub);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create xfer", status);
-        return status;
-    }
-
-    /*
-     * Create REFER request.
-     */
-    status = pjsip_xfer_initiate(sub, dest, &tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create REFER request", status);
-        return status;
-    }
-
-    /* Send. */
-    status = pjsip_xfer_send_request(sub, tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to send REFER request", status);
-        return status;
-    }
-
-    /* For simplicity (that's what this program is intended to be!), 
-     * leave the original invite session as it is. More advanced application
-     * may want to hold the INVITE, or terminate the invite, or whatever.
-     */
-
-    return PJ_SUCCESS;
-}
-
-
-/**
- * Dial DTMF.
- */
-PJ_DEF(pj_status_t) pjsua_call_dial_dtmf( unsigned call_index, 
-                                          const pj_str_t *digits)
-{
-    pjsua_call *call = &pjsua.calls[call_index];
-
-    PJ_ASSERT_RETURN(call_index < pjsua.config.max_calls, PJ_EINVAL);
-
-    if (!call->session) {
-        PJ_LOG(3,(THIS_FILE, "Media is not established yet!"));
-        return -1;
-    }
-
-    return pjmedia_session_dial_dtmf( call->session, 0, digits);
-}
-
-
-/**
- * Send instant messaging inside INVITE session.
- */
-PJ_DEF(pj_status_t) pjsua_call_send_im(int call_index, const pj_str_t *str)
-{
-    pjsua_call *call;
-    const pj_str_t mime_text = pj_str("text");
-    const pj_str_t mime_plain = pj_str("plain");
-    pjsip_tx_data *tdata;
-    pj_status_t status;
-
-    call = &pjsua.calls[call_index];
-
-    if (!call->inv) {
-        PJ_LOG(3,(THIS_FILE,"Call has been disconnected"));
-        return PJSIP_ESESSIONTERMINATED;
-    }
-
-    /* Lock dialog. */
-    pjsip_dlg_inc_lock(call->inv->dlg);
-    
-    /* Create request message. */
-    status = pjsip_dlg_create_request( call->inv->dlg, &pjsip_message_method,
-                                       -1, &tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create MESSAGE request", status);
-        goto on_return;
-    }
-
-    /* Add accept header. */
-    pjsip_msg_add_hdr( tdata->msg, 
-                       (pjsip_hdr*)pjsua_im_create_accept(tdata->pool));
-
-    /* Create "text/plain" message body. */
-    tdata->msg->body = pjsip_msg_body_create( tdata->pool, &mime_text,
-                                              &mime_plain, str);
-    if (tdata->msg->body == NULL) {
-        pjsua_perror(THIS_FILE, "Unable to create msg body", PJ_ENOMEM);
-        pjsip_tx_data_dec_ref(tdata);
-        goto on_return;
-    }
-
-    /* Send the request. */
-    status = pjsip_dlg_send_request( call->inv->dlg, tdata, -1, NULL);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to send MESSAGE request", status);
-        goto on_return;
-    }
-
-on_return:
-    pjsip_dlg_dec_lock(call->inv->dlg);
-    return status;
-}
-
-
-/**
- * Send IM typing indication inside INVITE session.
- */
-PJ_DEF(pj_status_t) pjsua_call_send_typing_ind(int call_index, 
-                                               pj_bool_t is_typing)
-{
-    pjsua_call *call;
-    pjsip_tx_data *tdata;
-    pj_status_t status;
-
-    call = &pjsua.calls[call_index];
-
-    if (!call->inv) {
-        PJ_LOG(3,(THIS_FILE,"Call has been disconnected"));
-        return PJSIP_ESESSIONTERMINATED;
-    }
-
-    /* Lock dialog. */
-    pjsip_dlg_inc_lock(call->inv->dlg);
-    
-    /* Create request message. */
-    status = pjsip_dlg_create_request( call->inv->dlg, &pjsip_message_method,
-                                       -1, &tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create MESSAGE request", status);
-        goto on_return;
-    }
-
-    /* Create "application/im-iscomposing+xml" msg body. */
-    tdata->msg->body = pjsip_iscomposing_create_body(tdata->pool, is_typing,
-                                                     NULL, NULL, -1);
-
-    /* Send the request. */
-    status = pjsip_dlg_send_request( call->inv->dlg, tdata, -1, NULL);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to send MESSAGE request", status);
-        goto on_return;
-    }
-
-on_return:
-    pjsip_dlg_dec_lock(call->inv->dlg);
-    return status;
-}
-
-
-/*
- * Terminate all calls.
- */
-PJ_DEF(void) pjsua_call_hangup_all(void)
-{
-    unsigned i;
-
-    for (i=0; i<pjsua.config.max_calls; ++i) {
-        pjsip_tx_data *tdata;
-        int st_code;
-        pjsua_call *call;
-
-        if (pjsua.calls[i].inv == NULL)
-            continue;
-
-        call = &pjsua.calls[i];
-
-        if (call->inv->state == PJSIP_INV_STATE_CONFIRMED) {
-            st_code = 200;
-        } else {
-            st_code = PJSIP_SC_GONE;
+    pjsua_var.calls[new_call].xfer_sub = sub;
+
+    /* Put the invite_data in the subscription. */
+    pjsip_evsub_set_mod_data(sub, pjsua_var.mod.id, 
+                             &pjsua_var.calls[new_call]);
+}
+
+
+
+/*
+ * This callback is called when transaction state has changed in INVITE
+ * session. We use this to trap:
+ *  - incoming REFER request.
+ *  - incoming MESSAGE request.
+ */
+static void pjsua_call_on_tsx_state_changed(pjsip_inv_session *inv,
+                                            pjsip_transaction *tsx,
+                                            pjsip_event *e)
+{
+    pjsua_call *call = inv->dlg->mod_data[pjsua_var.mod.id];
+
+    PJSUA_LOCK();
+
+    if (tsx->role==PJSIP_ROLE_UAS &&
+        tsx->state==PJSIP_TSX_STATE_TRYING &&
+        pjsip_method_cmp(&tsx->method, &pjsip_refer_method)==0)
+    {
+        /*
+         * Incoming REFER request.
+         */
+        on_call_transfered(call->inv, e->body.tsx_state.src.rdata);
+
+    }
+    else if (tsx->role==PJSIP_ROLE_UAS &&
+             tsx->state==PJSIP_TSX_STATE_TRYING &&
+             pjsip_method_cmp(&tsx->method, &pjsip_message_method)==0)
+    {
+        /*
+         * Incoming MESSAGE request!
+         */
+        pjsip_rx_data *rdata;
+        pjsip_msg *msg;
+        pjsip_accept_hdr *accept_hdr;
+        pj_status_t status;
+
+        rdata = e->body.tsx_state.src.rdata;
+        msg = rdata->msg_info.msg;
+
+        /* Request MUST have message body, with Content-Type equal to
+         * "text/plain".
+         */
+        if (pjsua_im_accept_pager(rdata, &accept_hdr) == PJ_FALSE) {
+
+            pjsip_hdr hdr_list;
+
+            pj_list_init(&hdr_list);
+            pj_list_push_back(&hdr_list, accept_hdr);
+
+            pjsip_dlg_respond( inv->dlg, rdata, PJSIP_SC_NOT_ACCEPTABLE_HERE, 
+                               NULL, &hdr_list, NULL );
+            PJSUA_UNLOCK();
+            return;
         }
 
-        if (pjsip_inv_end_session(call->inv, st_code, NULL, &tdata)==0) {
-            if (tdata)
-                pjsip_inv_send_msg(call->inv, tdata);
+        /* Respond with 200 first, so that remote doesn't retransmit in case
+         * the UI takes too long to process the message. 
+         */
+        status = pjsip_dlg_respond( inv->dlg, rdata, 200, NULL, NULL, NULL);
+
+        /* Process MESSAGE request */
+        pjsua_im_process_pager(call->index, &inv->dlg->remote.info_str,
+                               &inv->dlg->local.info_str, rdata);
+
+    }
+    else if (tsx->role == PJSIP_ROLE_UAC &&
+             pjsip_method_cmp(&tsx->method, &pjsip_message_method)==0)
+    {
+        /* Handle outgoing pager status */
+        if (tsx->status_code >= 200) {
+            pjsua_im_data *im_data;
+
+            im_data = tsx->mod_data[pjsua_var.mod.id];
+            /* im_data can be NULL if this is typing indication */
+
+            if (im_data && pjsua_var.ua_cfg.cb.on_pager_status) {
+                pjsua_var.ua_cfg.cb.on_pager_status(im_data->call_id,
+                                                    &im_data->to,
+                                                    &im_data->body,
+                                                    im_data->user_data,
+                                                    tsx->status_code,
+                                                    &tsx->status_text);
+            }
         }
     }
-}
-
-
-pj_status_t pjsua_call_init(void)
-{
-    /* Initialize invite session callback. */
-    pjsip_inv_callback inv_cb;
-    pj_status_t status;
-
-    pj_memset(&inv_cb, 0, sizeof(inv_cb));
-    inv_cb.on_state_changed = &pjsua_call_on_state_changed;
-    inv_cb.on_new_session = &pjsua_call_on_forked;
-    inv_cb.on_media_update = &pjsua_call_on_media_update;
-    inv_cb.on_rx_offer = &pjsua_call_on_rx_offer;
-    inv_cb.on_tsx_state_changed = &pjsua_call_on_tsx_state_changed;
-
-
-    /* Initialize invite session module: */
-    status = pjsip_inv_usage_init(pjsua.endpt, &inv_cb);
-    
-    return status;
-}
-
-/**
- * Replace media transport.
- */
-PJ_DEF(pj_status_t) pjsua_set_call_media_transport( unsigned call_index,
-                                                    const pjmedia_sock_info *i,
-                                                    pjmedia_transport *tp)
-{
-    pjsua_call *call = &pjsua.calls[call_index];
-
-    if (i)
-        pj_memcpy(&call->skinfo, i, sizeof(pjmedia_sock_info));
-    
-    if (call->med_tp)
-        (*call->med_tp->op->destroy)(call->med_tp);
-
-    call->med_tp = tp;
-    return PJ_SUCCESS;
-}
+
+
+    PJSUA_UNLOCK();
+}

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -18 +18 @@
  */
 #include <pjsua-lib/pjsua.h>
-#include "pjsua_imp.h"
-
-/*
- * pjsua_core.c
+#include <pjsua-lib/pjsua_internal.h>
+
+
+#define THIS_FILE   "pjsua_core.c"
+
+
+/* PJSUA application instance. */
+struct pjsua_data pjsua_var;
+
+
+/* Display error */
+PJ_DEF(void) pjsua_perror( const char *sender, const char *title, 
+                           pj_status_t status)
+{
+    char errmsg[PJ_ERR_MSG_SIZE];
+
+    pj_strerror(status, errmsg, sizeof(errmsg));
+    PJ_LOG(3,(sender, "%s: %s [status=%d]", title, errmsg, status));
+}
+
+
+static void init_data()
+{
+    unsigned i;
+
+    for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.acc); ++i)
+        pjsua_var.acc[i].index = i;
+    
+    for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.tpdata); ++i)
+        pjsua_var.tpdata[i].index = i;
+}
+
+
+
+/*****************************************************************************
+ * This is a very simple PJSIP module, whose sole purpose is to display
+ * incoming and outgoing messages to log. This module will have priority
+ * higher than transport layer, which means:
  *
- * Core application functionalities.
- */
-
-#define THIS_FILE   "pjsua_core.c"
-
-
-/* 
- * Global variable.
- */
-struct pjsua pjsua;
-
-
-/* 
- * Default local URI, if none is specified in cmd-line 
- */
-#define PJSUA_LOCAL_URI     "<sip:user@127.0.0.1>"
-
-
-
-/*
- * Init default application parameters.
- */
-PJ_DEF(void) pjsua_default_config(pjsua_config *cfg)
-{
-    unsigned i;
-
-    pj_memset(cfg, 0, sizeof(pjsua_config));
-
-    cfg->thread_cnt = 1;
-    cfg->media_has_ioqueue = 1;
-    cfg->media_thread_cnt = 1;
-    cfg->udp_port = 5060;
-    cfg->start_rtp_port = 4000;
-    cfg->msg_logging = PJ_TRUE;
-    cfg->max_calls = 4;
-    cfg->conf_ports = 0;
-
-#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
-    pjsua.clock_rate = 44100;
-#endif
-
-    cfg->complexity = 10;
-    cfg->quality = 10;
+ *  - incoming messages will come to this module first before reaching
+ *    transaction layer.
+ *
+ *  - outgoing messages will come to this module last, after the message
+ *    has been 'printed' to contiguous buffer by transport layer and
+ *    appropriate transport instance has been decided for this message.
+ *
+ */
+
+/* Notification on incoming messages */
+static pj_bool_t logging_on_rx_msg(pjsip_rx_data *rdata)
+{
+    PJ_LOG(4,(THIS_FILE, "RX %d bytes %s from %s:%d:\n"
+                         "%s\n"
+                         "--end msg--",
+                         rdata->msg_info.len,
+                         pjsip_rx_data_get_info(rdata),
+                         rdata->pkt_info.src_name,
+                         rdata->pkt_info.src_port,
+                         rdata->msg_info.msg_buf));
     
-    cfg->auto_answer = 100;
-    cfg->uas_duration = 3600;
-
-    /* Default logging settings: */
-    cfg->log_level = 5;
-    cfg->app_log_level = 4;
-    cfg->log_decor =  PJ_LOG_HAS_SENDER | PJ_LOG_HAS_TIME | 
-                      PJ_LOG_HAS_MICRO_SEC | PJ_LOG_HAS_NEWLINE;
-
-
-    /* Also init logging settings in pjsua.config, because log
-     * may be written before pjsua_init() is called.
+    /* Always return false, otherwise messages will not get processed! */
+    return PJ_FALSE;
+}
+
+/* Notification on outgoing messages */
+static pj_status_t logging_on_tx_msg(pjsip_tx_data *tdata)
+{
+    
+    /* Important note:
+     *  tp_info field is only valid after outgoing messages has passed
+     *  transport layer. So don't try to access tp_info when the module
+     *  has lower priority than transport layer.
      */
-    pjsua.config.log_level = 5;
-    pjsua.config.app_log_level = 4;
-
-
-    /* Init accounts: */
-    for (i=0; i<PJ_ARRAY_SIZE(pjsua.acc); ++i) {
-        cfg->acc_config[i].reg_timeout = 55;
-    }
-
-}
-
-
-#define strncpy_with_null(dst,src,len)  \
-do { \
-    strncpy(dst, src, len); \
-    dst[len-1] = '\0'; \
-} while (0)
-
-
-
-PJ_DEF(pj_status_t) pjsua_test_config( const pjsua_config *cfg,
-                                       char *errmsg,
-                                       int len)
-{
-    unsigned i;
-
-    /* If UDP port is zero, then sip_host and sip_port must be specified */
-    if (cfg->udp_port == 0) {
-        if (cfg->sip_host.slen==0 || cfg->sip_port==0) {
-            strncpy_with_null(errmsg, 
-                              "sip_host and sip_port must be specified",
-                              len);
-            return -1;
-        }
-    }
-
-    if (cfg->max_calls < 1) {
-        strncpy_with_null(errmsg, 
-                          "max_calls needs to be at least 1",
-                          len);
-      &nbs

@@ -8 +8 @@
 *.suo
 *.pdb
+activex-pjsua_p.c
+dlldata.c