Changeset 4657

Timestamp:

Nov 27, 2013 9:37:32 AM (11 years ago)

Author:

nanang

Message:

Re #1519: Added presence API in pjsua2.

Location:

pjproject/branches/projects/pjsua2

Files:

• pjsip-apps/src/pygui/account.py (modified) (1 diff)
• pjsip-apps/src/pygui/accountsetting.py (modified) (1 diff)
• pjsip-apps/src/pygui/application.py (modified) (16 diffs)
• pjsip-apps/src/pygui/buddy.py (added)
• pjsip-apps/src/swig/importsym.py (modified) (2 diffs)
• pjsip-apps/src/swig/pjsua2.i (modified) (3 diffs)
• pjsip-apps/src/swig/symbols.i (modified) (2 diffs)
• pjsip-apps/src/swig/symbols.lst (modified) (1 diff)
• pjsip/build/Makefile (modified) (1 diff)
• pjsip/include/pjsip-simple/evsub.h (modified) (2 diffs)
• pjsip/include/pjsua2.hpp (modified) (1 diff)
• pjsip/include/pjsua2/account.hpp (modified) (16 diffs)
• pjsip/include/pjsua2/endpoint.hpp (modified) (6 diffs)
• pjsip/include/pjsua2/persistent.hpp (modified) (3 diffs)
• pjsip/include/pjsua2/presence.hpp (added)
• pjsip/include/pjsua2/siptypes.hpp (modified) (1 diff)
• pjsip/include/pjsua2/types.hpp (modified) (1 diff)
• pjsip/src/pjsua2/account.cpp (modified) (14 diffs)
• pjsip/src/pjsua2/endpoint.cpp (modified) (13 diffs)
• pjsip/src/pjsua2/json.cpp (modified) (2 diffs)
• pjsip/src/pjsua2/persistent.cpp (modified) (2 diffs)
• pjsip/src/pjsua2/presence.cpp (added)
• pjsip/src/pjsua2/siptypes.cpp (modified) (2 diffs)
• pjsip/src/pjsua2/util.hpp (modified) (1 diff)

pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/account.py

@@ -46 +46 @@
                 self.cfg =  pj.AccountConfig()
                 self.cfgChanged = False
+                self.buddyList = []
 
         def statusText(self):

pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/accountsetting.py

@@ -41 +41 @@
                 self.transient(parent)
                 self.parent = parent
+                self.geometry("+100+100")
                 self.title('Account settings')
                 

pjproject/branches/projects/pjsua2/pjsip-apps/src/pygui/application.py

@@ -33 +33 @@
 import accountsetting
 import account
+import buddy
 import endpoint
 
@@ -63 +64 @@
                 self.pack(expand='yes', fill='both')
                 self.master.title('pjsua2 Demo')
+                self.master.geometry('500x500+100+100')
                 
                 # Logger
@@ -72 +74 @@
                 # GUI variables
                 self.showLogWindow = tk.IntVar()
-                self.showLogWindow.set(1)
+                self.showLogWindow.set(0)
                 self.quitting = False 
                 
@@ -100 +102 @@
                 t.cfg.port = 0
                 self.transportCfgs.append(t)
+                t = SipTransportConfig()
+                t.type = pj.PJSIP_TRANSPORT_TCP
+                t.cfg.port = 0
+                self.transportCfgs.append(t)
                 
         
@@ -116 +122 @@
                 node = json.writeNewArray("accounts")
                 for acc in self.accList:
-                        node.writeObject(acc.cfg);
+                        acc_node = node.writeNewContainer("Account")
+                        acc_node.writeObject(acc.cfg);
+
+                        # Write buddy configs
+                        buddy_node = acc_node.writeNewArray("buddies")
+                        for bud in acc.buddyList:
+                                buddy_node.writeObject(bud.cfg)
+                                
                 json.saveFile(filename)
         
@@ -141 +154 @@
                         node = json.readArray("accounts")
                         while node.hasUnread():
-                                cfg = pj.AccountConfig()
-                                cfg.readObject(node)
-                                acc_cfgs.append(cfg)
-                
+                                acc_node = node.readContainer("Account")
+                                acc_cfg = pj.AccountConfig()
+                                acc_cfg.readObject(acc_node)
+                
+                                # Load buddy configs
+                                buddy_cfgs = []
+                                buddy_node = acc_node.readArray("buddies")
+                                while buddy_node.hasUnread():
+                                        buddy_cfg = pj.BuddyConfig()
+                                        buddy_cfg.readObject(buddy_node)
+                                        buddy_cfgs.append(buddy_cfg)
+
+                                acc_cfgs.append((acc_cfg, buddy_cfgs))
+                                
+                                
                 # Initialize library
                 self.epCfg.uaConfig.userAgent = "pygui-" + self.ep.libVersion().full;
@@ -155 +179 @@
                         
                 # Add accounts
-                for cfg in acc_cfgs:
+                for cfg, buddy_cfgs in acc_cfgs:
                         self._createAcc(cfg)
-                
+                        acc = self.accList[-1]
+                        for buddy_cfg in buddy_cfgs:
+                                self._createBuddy(acc, buddy_cfg)
+                                
                 # Start library
                 self.ep.libStart()
@@ -173 +200 @@
                         self.tv.item(iid, text=text, values=values)
                 else:
-                        self.tv.insert('', 0,  iid, open=True, text=text, values=values)
-                        self.tv.insert(iid, 0, '', open=True, text='Buddy 1', values=('Online',))
-                        self.tv.insert(iid, 1, '', open=True, text='Buddy 2', values=('Online',))
+                        self.tv.insert('', 'end',  iid, open=True, text=text, values=values)
+                
+        def updateBuddy(self, bud):
+                iid = 'buddy' + str(bud.randId)
+                text = bud.cfg.uri
+                status = bud.statusText()
+                
+                values = (status,)
+                if self.tv.exists(iid):
+                        self.tv.item(iid, text=text, values=values)
+                else:
+                        self.tv.insert(str(bud.account.randId), 'end',  iid, open=True, text=text, values=values)
                 
         def _createAcc(self, acc_cfg):
@@ -186 +222 @@
                 self.updateAccount(acc)
                                 
+        def _createBuddy(self, acc, buddy_cfg):
+                bud = buddy.Buddy(self)
+                bud.cfg = buddy_cfg
+                bud.account = acc
+                bud.create(acc, bud.cfg)
+                self.updateBuddy(bud)
+                acc.buddyList.append(bud)
+
         def _createWidgets(self):
                 self._createAppMenu()
@@ -222 +266 @@
         def _createContextMenu(self):
                 top = self.winfo_toplevel()
+
+                # Create Account context menu
                 self.accMenu = tk.Menu(top, tearoff=False)
                 # Labels, must match with _onAccContextMenu()
-                labels = ['Unregister', 'Reregister', '-', 'Online', 'Invisible', 'Away', 'Busy', '-', 'Settings...', '-', 'Delete...']
+                labels = ['Unregister', 'Reregister', 'Add buddy...', '-',
+                          'Online', 'Invisible', 'Away', 'Busy', '-',
+                          'Settings...', '-',
+                          'Delete...']
                 for label in labels:
                         if label=='-':
@@ -232 +281 @@
                                 self.accMenu.add_command(label=label, command=cmd)
                 
+                # Create Buddy context menu
+                # Labels, must match with _onAccContextMenu()
+                self.buddyMenu = tk.Menu(top, tearoff=False)
+                labels = ['Video call', 'Audio call', 'Send instant message', '-',
+                          'Settings...', '-',
+                          'Delete...']
+                
+                for label in labels:
+                        if label=='-':
+                                self.buddyMenu.add_separator()
+                        else:
+                                cmd = lambda arg=label: self._onBuddyContextMenu(arg)
+                                self.buddyMenu.add_command(label=label, command=cmd)
+                
                 if (top.tk.call('tk', 'windowingsystem')=='aqua'):
                         self.tv.bind('<2>', self._onTvRightClick)
@@ -251 +314 @@
                 return accs[0]
         
+        def _getSelectedBuddy(self):
+                items = self.tv.selection()
+                if not items:
+                        return None
+                try:
+                        iid = int(items[0][5:])
+                        iid_parent = int(self.tv.parent(items[0]))
+                except:
+                        return None
+                        
+                accs = [acc for acc in self.accList if acc.randId==iid_parent]
+                if not accs:
+                        return None
+                        
+                buds = [b for b in accs[0].buddyList if b.randId==iid]
+                if not buds:
+                        return None
+                        
+                return buds[0]
+        
         def _onTvRightClick(self, event):
-                iid = self.tv.identify('item', event.x, event.y)
+                iid = self.tv.identify_row(event.y)
+                #iid = self.tv.identify('item', event.x, event.y)
                 if iid:
-                        self.tv.selection_add( (iid,) )
+                        self.tv.selection_set( (iid,) )
                         acc = self._getSelectedAccount()
                         if acc:
@@ -260 +344 @@
                         else:
                                 # A buddy is selected
-                                pass
+                                self.buddyMenu.post(event.x_root, event.y_root)
         
         def _onAccContextMenu(self, label):
@@ -272 +356 @@
                         acc.setRegistration(True)
                 elif label=='Online':
-                        ps = pj.AccountPresenceStatus()
+                        ps = pj.PresenceStatus()
                         ps.isOnline = True
                         acc.setOnlineStatus(ps)
                 elif label=='Invisible':
-                        ps = pj.AccountPresenceStatus()
+                        ps = pj.PresenceStatus()
                         ps.isOnline = False
                         acc.setOnlineStatus(ps)
                 elif label=='Away':
-                        ps = pj.AccountPresenceStatus()
+                        ps = pj.PresenceStatus()
                         ps.isOnline = True
                         ps.activity = pj.PJRPID_ACTIVITY_AWAY
@@ -286 +370 @@
                         acc.setOnlineStatus(ps)
                 elif label=='Busy':
-                        ps = pj.AccountPresenceStatus()
+                        ps = pj.PresenceStatus()
                         ps.isOnline = True
                         ps.activity = pj.PJRPID_ACTIVITY_BUSY
@@ -305 +389 @@
                         del acc
                         self.tv.delete( (iid,) )
+                elif label=='Add buddy...':
+                        cfg = pj.BuddyConfig()
+                        dlg = buddy.SettingDialog(self.master, cfg)
+                        if dlg.doModal():
+                                self._createBuddy(acc, cfg)
                 else:
                         assert not ("Unknown menu " + label)
         
+        def _onBuddyContextMenu(self, label):
+                bud = self._getSelectedBuddy()
+                if not bud:
+                        return
+                acc = bud.account
+                        
+                if label=='Video call':
+                        pass
+                elif label=='Audio call':
+                        pass
+                elif label=='Send instant message':
+                        pass
+                elif label=='Settings...':
+                        subs = bud.cfg.subscribe
+                        uri  = bud.cfg.uri
+                        dlg = buddy.SettingDialog(self.master, bud.cfg)
+                        if dlg.doModal():
+                                self.updateBuddy(bud)
+                                # URI updated?
+                                if uri != bud.cfg.uri:
+                                        cfg = bud.cfg
+                                        # del old
+                                        iid = 'buddy' + str(bud.randId)
+                                        acc.buddyList.remove(bud)
+                                        del bud
+                                        self.tv.delete( (iid,) )
+                                        # add new
+                                        self._createBuddy(acc, cfg)
+                                # presence subscribe setting updated
+                                elif subs != bud.cfg.subscribe:
+                                        bud.subscribePresence(bud.cfg.subscribe)
+                elif label=='Delete...':
+                        msg = "Do you really want to delete buddy '%s'?" % bud.cfg.uri
+                        if msgbox.askquestion('Delete buddy?', msg, default=msgbox.NO) != u'yes':
+                                return
+                        iid = 'buddy' + str(bud.randId)
+                        acc.buddyList.remove(bud)
+                        del bud
+                        self.tv.delete( (iid,) )
+                else:
+                        assert not ("Unknown menu " + label)
+                        
         def _onTimer(self):
                 if not self.quitting:

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/importsym.py

@@ -30 +30 @@
                 return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
         
+        if sys.platform == 'win32' and not program.endswith(".exe"):
+                program += ".exe"
+
         fpath, fname = os.path.split(program)
         if fpath:
@@ -66 +69 @@
 C_HEADING_SECTION = """
 #define PJ_AUTOCONF             1
-#define CC_DUMMY
 #define jmp_buf                 int
 #define __attribute__(x)

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/pjsua2.i

@@ -37 +37 @@
 %feature("director") Endpoint; 
 %feature("director") Account;
+%feature("director") Buddy;
+%feature("director") FindBuddyMatch;
 
 
@@ -60 +62 @@
 %include "pjsua2/types.hpp"
 
+%ignore pj::ContainerNode::op;
+%ignore pj::ContainerNode::data;
 %ignore container_node_op;
+%ignore container_node_internal_data;
 %include "pjsua2/persistent.hpp"
 
+%ignore pj::TransportInfo::TransportInfo(const pjsua_transport_info &info);
 %include "pjsua2/siptypes.hpp"
 
@@ -68 +74 @@
 %template(AuthCredInfoVector)           std::vector<pj::AuthCredInfo>;
 %template(SipMultipartPartVector)       std::vector<pj::SipMultipartPart>;
+%template(BuddyVector)                  std::vector<pj::Buddy*>;
 
 %include "pjsua2/endpoint.hpp"
+%include "pjsua2/presence.hpp"
 %include "pjsua2/account.hpp"
 
-%ignore JsonDocument::allocElement();
-%ignore JsonDocument::getPool();
+%ignore pj::JsonDocument::allocElement;
+%ignore pj::JsonDocument::getPool;
 %include "pjsua2/json.hpp"

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/symbols.i

@@ -55 +55 @@
 typedef enum pjrpid_activity {PJRPID_ACTIVITY_UNKNOWN, PJRPID_ACTIVITY_AWAY, PJRPID_ACTIVITY_BUSY} pjrpid_activity;
 
+typedef enum pjsip_evsub_state {PJSIP_EVSUB_STATE_NULL, PJSIP_EVSUB_STATE_SENT, PJSIP_EVSUB_STATE_ACCEPTED, PJSIP_EVSUB_STATE_PENDING, PJSIP_EVSUB_STATE_ACTIVE, PJSIP_EVSUB_STATE_TERMINATED, PJSIP_EVSUB_STATE_UNKNOWN} pjsip_evsub_state;
+
 enum pjsua_invalid_id_const_ {PJSUA_INVALID_ID = -1};
 
@@ -73 +75 @@
 typedef enum pjsua_ipv6_use {PJSUA_IPV6_DISABLED, PJSUA_IPV6_ENABLED} pjsua_ipv6_use;
 
+typedef enum pjsua_buddy_status {PJSUA_BUDDY_STATUS_UNKNOWN, PJSUA_BUDDY_STATUS_ONLINE, PJSUA_BUDDY_STATUS_OFFLINE} pjsua_buddy_status;
+

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/symbols.lst

@@ -18 +18 @@
 
 pjsip-simple/rpid.h             pjrpid_activity
+pjsip-simple/evsub.h            pjsip_evsub_state
 
-pjsua-lib/pjsua.h               pjsua_invalid_id_const_ pjsua_state pjsua_stun_use pjsua_call_hold_type pjsua_acc_id pjsua_destroy_flag pjsua_100rel_use pjsua_sip_timer_use pjsua_ipv6_use
+pjsua-lib/pjsua.h               pjsua_invalid_id_const_ pjsua_state pjsua_stun_use pjsua_call_hold_type pjsua_acc_id pjsua_destroy_flag pjsua_100rel_use pjsua_sip_timer_use pjsua_ipv6_use pjsua_buddy_status

pjproject/branches/projects/pjsua2/pjsip/build/Makefile

@@ -91 +91 @@
 export PJSUA2_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
                            account.o endpoint.o json.o persistent.o types.o \
-                           siptypes.o
+                           siptypes.o presence.o
 export PJSUA2_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS)
 export PJSUA2_LIB_CXXFLAGS = $(PJSUA2_LIB_CFLAGS) 

pjproject/branches/projects/pjsua2/pjsip/include/pjsip-simple/evsub.h

@@ -59 +59 @@
  * in state_str member of the susbcription structure.
  */
-enum pjsip_evsub_state
+typedef enum pjsip_evsub_state
 {
     PJSIP_EVSUB_STATE_NULL,      /**< State is NULL.                        */
@@ -71 +71 @@
                                       Application can query the state by 
                                       calling #pjsip_evsub_get_state_name().*/
-};
-
-/**
- * @see pjsip_evsub_state
- */
-typedef enum pjsip_evsub_state pjsip_evsub_state;
+} pjsip_evsub_state;
 
 

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

@@ -22 +22 @@
 #include <pjsua2/endpoint.hpp>
 #include <pjsua2/account.hpp>
+#include <pjsua2/presence.hpp>
 #include <pjsua2/json.hpp>
 

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

@@ -26 +26 @@
 #include <pjsua-lib/pjsua.h>
 #include <pjsua2/persistent.hpp>
+#include <pjsua2/presence.hpp>
 #include <pjsua2/siptypes.hpp>
 
@@ -913 +914 @@
 };
 
-/**
- * This describes account presence status.
- */
-struct AccountPresenceStatus
-{
-    /** Basic status. */
-    bool                isOnline;
-
-    /** Activity type. */
-    pjrpid_activity     activity;
-
-    /** Optional text describing the person/element. */
-    string              note;
-
-    /** Optional RPID ID string. */
-    string              rpidId;
-
-public:
-    AccountPresenceStatus();
-};
-
 
 /**
@@ -1071 +1051 @@
 {
     /**
+     * Server presence subscription instance. If application delays
+     * the acceptance of the request, it will need to specify this object
+     * when calling Account::presNotify().
+     */
+    void               *srvPres;
+
+    /**
      *  Sender URI.
      */
@@ -1220 +1207 @@
 };
 
+/**
+ * Parameters for presNotify() account method.
+ */
+struct PresNotifyParam
+{
+    /**
+     * Server presence subscription instance.
+     */
+    void               *srvPres;
+
+    /**
+     * Server presence subscription state to set.
+     */
+    pjsip_evsub_state   state;
+    
+    /**
+     * Optionally specify the state string name, if state is not "active",
+     * "pending", or "terminated".
+     */
+    string              stateStr;
+
+    /**
+     * If the new state is PJSIP_EVSUB_STATE_TERMINATED, optionally specify
+     * the termination reason.
+     */
+    string              reason;
+
+    /**
+     * If the new state is PJSIP_EVSUB_STATE_TERMINATED, this specifies
+     * whether the NOTIFY request should contain message body containing
+     * account's presence information.
+     */
+    bool                withBody;
+
+    /**
+     * Optional list of headers to be sent with the NOTIFY request.
+     */
+    SipTxOption         txOption;
+};
+
+
+/**
+ * Wrapper class for Buddy matching algo.
+ *
+ * Default algo is a simple substring lookup of search-token in the
+ * Buddy URIs, with case sensitive. Application can implement its own
+ * matching algo by overriding this class and specifying its instance
+ * in Account::findBuddy().
+ */
+class FindBuddyMatch
+{
+public:
+    /**
+     * Default algo implementation.
+     */
+    virtual bool match(const string &token, const Buddy &buddy)
+    {
+        BuddyInfo bi = buddy.getInfo();
+        return bi.uri.find(token) != string::npos;
+    }
+
+    /**
+     * Destructor.
+     */
+    virtual ~FindBuddyMatch() {}
+};
 
 /**
@@ -1332 +1385 @@
      * @param pres_st           Presence online status.
      */
-    void setOnlineStatus(const AccountPresenceStatus &pres_st) throw(Error);
+    void setOnlineStatus(const PresenceStatus &pres_st) throw(Error);
 
     /**
@@ -1350 +1403 @@
     void setTransport(TransportId tp_id) throw(Error);
 
+    /**
+     * Send NOTIFY to inform account presence status or to terminate server
+     * side presence subscription. If application wants to reject the incoming
+     * request, it should set the param \a PresNotifyParam.state to
+     * PJSIP_EVSUB_STATE_TERMINATED.
+     *
+     * @param prm               The sending NOTIFY parameter.
+     */
+    void presNotify(const PresNotifyParam &prm) throw(Error);
+    
+    /**
+     * Enumerate all buddies of the account.
+     *
+     * @return                  The buddy list.
+     */
+    const BuddyVector& enumBuddies() const throw(Error);
+
+    /**
+     * Find a buddy in the buddy list with the specified URI. 
+     *
+     * Exception: if buddy is not found, PJ_ENOTFOUND will be thrown.
+     *
+     * @param uri               The buddy URI.
+     * @param buddy_match       The buddy match algo.
+     *
+     * @return                  The pointer to buddy.
+     */
+    Buddy* findBuddy(string uri, FindBuddyMatch *buddy_match = NULL) const
+                    throw(Error);
+
+    /**
+     * An internal function to add a Buddy to Account buddy list.
+     * This function must never be used by application.
+     */
+    void addBuddy(Buddy *buddy);
+
+    /**
+     * An internal function to remove a Buddy from Account buddy list.
+     * This function must never be used by application.
+     */
+    void removeBuddy(Buddy *buddy);
+
 public:
     /*
@@ -1360 +1455 @@
      */
     virtual void onIncomingCall(OnIncomingCallParam &prm)
-    {}
+    { PJ_UNUSED_ARG(prm); }
 
     /**
@@ -1371 +1466 @@
      */
     virtual void onRegStarted(OnRegStartedParam &prm)
-    {}
+    { PJ_UNUSED_ARG(prm); }
 
     /**
@@ -1381 +1476 @@
      */
     virtual void onRegState(OnRegStateParam &prm)
-    {}
+    { PJ_UNUSED_ARG(prm); }
 
     /**
@@ -1403 +1498 @@
      *    user permission whether to accept or reject the request. In this
      *    case, the application MUST set the IncomingSubscribeParam.code
-     *    argument to 202, then IMMEDIATELY calls #pjsua_pres_notify() with
-     *    state PJSIP_EVSUB_STATE_PENDING and later calls #pjsua_pres_notify()
+     *    argument to 202, then IMMEDIATELY calls presNotify() with
+     *    state PJSIP_EVSUB_STATE_PENDING and later calls presNotify()
      *    again to accept or reject the subscription request.
      *
@@ -1416 +1511 @@
      */
     virtual void onIncomingSubscribe(OnIncomingSubscribeParam &prm)
-    {}
+    { PJ_UNUSED_ARG(prm); }
 
     /**
@@ -1425 +1520 @@
      */
     virtual void onInstantMessage(OnInstantMessageParam &prm)
-    {}
+    { PJ_UNUSED_ARG(prm); }
 
     /**
@@ -1434 +1529 @@
      */
     virtual void onInstantMessageStatus(OnInstantMessageStatusParam &prm)
-    {}
+    { PJ_UNUSED_ARG(prm); }
 
     /**
@@ -1442 +1537 @@
      */
     virtual void onTypingIndication(OnTypingIndicationParam &prm)
-    {}
+    { PJ_UNUSED_ARG(prm); }
 
     /**
@@ -1453 +1548 @@
      */
     virtual void onMwiInfo(OnMwiInfoParam &prm)
-    {}
+    { PJ_UNUSED_ARG(prm); }
 
 protected:
@@ -1461 +1556 @@
     pjsua_acc_id         id;
     string               tmpReason;     // for saving response's reason
+    BuddyVector          buddyList;
 };
 

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

@@ -960 +960 @@
     virtual void onNatDetectionComplete(
                         const OnNatDetectionCompleteParam &prm)
-    {}
+    { PJ_UNUSED_ARG(prm); }
 
     /**
@@ -970 +970 @@
     virtual void onNatCheckStunServersComplete(
                         const OnNatCheckStunServersCompleteParam &prm)
-    {}
+    { PJ_UNUSED_ARG(prm); }
 
     /**
@@ -979 +979 @@
     virtual void onTransportState(
                         const OnTransportStateParam &prm)
-    {}
+    { PJ_UNUSED_ARG(prm); }
 
     /**
@@ -988 +988 @@
      */
     virtual void onTimer(const OnTimerParam &prm)
-    {}
+    { PJ_UNUSED_ARG(prm); }
 
     /**
@@ -1006 +1006 @@
      */
     virtual void onSelectAccount(OnSelectAccountParam &prm)
-    {}
+    { PJ_UNUSED_ARG(prm); }
 
 
@@ -1071 +1071 @@
     static void on_mwi_info(pjsua_acc_id acc_id,
                             pjsua_mwi_info *mwi_info);
+    static void on_buddy_state(pjsua_buddy_id buddy_id);
+
 };
 

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

@@ -334 +334 @@
                                       throw(Error);
 };
+
+
+/**
+ * Forward declaration of container_node_op.
+ */
+struct container_node_op;
+
+
+/**
+ * Internal data for ContainerNode. See ContainerNode implementation notes
+ * for more info.
+ */
+struct container_node_internal_data
+{
+    void        *doc;
+    void        *data1;
+    void        *data2;
+};
+
+/**
+ * A container node is a placeholder for storing other data elements, which
+ * could be boolean, number, string, array of strings, or another container.
+ * Each data in the container is basically a name/value pair, with a type
+ * internally associated with it so that written data can be read in the
+ * correct type. Data is read and written serially, hence the order of
+ * reading must be the same as the order of writing.
+ *
+ * Application can read data from it by using the various read methods, and
+ * write data to it using the various write methods. Alternatively, it
+ * may be more convenient to use the provided macros below to read and write
+ * the data, because these macros set the name automatically:
+ *      - NODE_READ_BOOL(node,item)
+ *      - NODE_READ_UNSIGNED(node,item)
+ *      - NODE_READ_INT(node,item)
+ *      - NODE_READ_FLOAT(node,item)
+ *      - NODE_READ_NUM_T(node,type,item)
+ *      - NODE_READ_STRING(node,item)
+ *      - NODE_READ_STRINGV(node,item)
+ *      - NODE_READ_OBJ(node,item)
+ *      - NODE_WRITE_BOOL(node,item)
+ *      - NODE_WRITE_UNSIGNED(node,item)
+ *      - NODE_WRITE_INT(node,item)
+ *      - NODE_WRITE_FLOAT(node,item)
+ *      - NODE_WRITE_NUM_T(node,type,item)
+ *      - NODE_WRITE_STRING(node,item)
+ *      - NODE_WRITE_STRINGV(node,item)
+ *      - NODE_WRITE_OBJ(node,item)
+ *
+ * Implementation notes:
+ *
+ * The ContainerNode class is subclass-able, but not in the usual C++ way.
+ * With the usual C++ inheritance, some methods will be made pure virtual
+ * and must be implemented by the actual class. However, doing so will
+ * require dynamic instantiation of the ContainerNode class, which means
+ * we will need to pass around the class as pointer, for example as the
+ * return value of readContainer() and writeNewContainer() methods. Then
+ * we will need to establish who needs or how to delete these objects, or
+ * use shared pointer mechanism, each of which is considered too inconvenient
+ * or complicated for the purpose.
+ *
+ * So hence we use C style "inheritance", where the methods are declared in
+ * container_node_op and the data in container_node_internal_data structures.
+ * An implementation of ContainerNode class will need to set up these members
+ * with values that makes sense to itself. The methods in container_node_op
+ * contains the pointer to the actual implementation of the operation, which
+ * would be specific according to the format of the document. The methods in
+ * this ContainerNode class are just thin wrappers which call the
+ * implementation in the container_node_op structure.
+ *
+ */
+class ContainerNode
+{
+public:
+    /**
+     * Determine if there is unread element. If yes, then app can use one of
+     * the readXxx() functions to read it.
+     */
+    bool                hasUnread() const;
+
+    /**
+     * Get the name of the next unread element.
+     */
+    string              unreadName() const throw(Error);
+
+    /**
+     * Read an integer value from the document and return the value.
+     * This will throw Error if the current element is not a number.
+     * The read position will be advanced to the next element.
+     *
+     * @param name      If specified, then the function will check if the
+     *                  name of the next element matches the specified
+     *                  name and throw Error if it doesn't match.
+     *
+     * @return          The value.
+     */
+    int                 readInt(const string &name="") const throw(Error);
+
+    /**
+     * Read a number value from the document and return the value.
+     * This will throw Error if the current element is not a number.
+     * The read position will be advanced to the next element.
+     *
+     * @param name      If specified, then the function will check if the
+     *                  name of the next element matches the specified
+     *                  name and throw Error if it doesn't match.
+     *
+     * @return          The value.
+     */
+    float               readNumber(const string &name="") const throw(Error);
+
+    /**
+     * Read a boolean value from the container and return the value.
+     * This will throw Error if the current element is not a boolean.
+     * The read position will be advanced to the next element.
+     *
+     * @param name      If specified, then the function will check if the
+     *                  name of the next element matches the specified
+     *                  name and throw Error if it doesn't match.
+     *
+     * @return          The value.
+     */
+    bool                readBool(const string &name="") const throw(Error);
+
+    /**
+     * Read a string value from the container and return the value.
+     * This will throw Error if the current element is not a string.
+     * The read position will be advanced to the next element.
+     *
+     * @param name      If specified, then the function will check if the
+     *                  name of the next element matches the specified
+     *                  name and throw Error if it doesn't match.
+     *
+     * @return          The value.
+     */
+    string              readString(const string &name="") const throw(Error);
+
+    /**
+     * Read a string array from the container. This will throw Error
+     * if the current element is not a string array. The read position
+     * will be advanced to the next element.
+     *
+     * @param name      If specified, then the function will check if the
+     *                  name of the next element matches the specified
+     *                  name and throw Error if it doesn't match.
+     *
+     * @return          The value.
+     */
+    StringVector        readStringVector(const string &name="") const
+                                         throw(Error);
+
+    /**
+     * Read the specified object from the container. This is equal to
+     * calling PersistentObject.readObject(ContainerNode);
+     *
+     * @param obj       The object to read.
+     */
+    void                readObject(PersistentObject &obj) const throw(Error);
+
+    /**
+     * Read a container from the container. This will throw Error if the
+     * current element is not a container. The read position will be advanced
+     * to the next element.
+     *
+     * @param name      If specified, then the function will check if the
+     *                  name of the next element matches the specified
+     *                  name and throw Error if it doesn't match.
+     *
+     * @return          Container object.
+     */
+    ContainerNode       readContainer(const string &name="") const
+                                      throw(Error);
+
+    /**
+     * Read array container from the container. This will throw Error if the
+     * current element is not an array. The read position will be advanced
+     * to the next element.
+     *
+     * @param name      If specified, then the function will check if the
+     *                  name of the next element matches the specified
+     *                  name and throw Error if it doesn't match.
+     *
+     * @return          Container object.
+     */
+    ContainerNode       readArray(const string &name="") const
+                                  throw(Error);
+
+    /**
+     * Write a number value to the container.
+     *
+     * @param name      The name for the value in the container.
+     * @param value     The value to be written.
+     */
+    void                writeNumber(const string &name,
+                                    float num) throw(Error);
+
+    /**
+     * Write a number value to the container.
+     *
+     * @param name      The name for the value in the container.
+     * @param value     The value to be written.
+     */
+    void                writeInt(const string &name,
+                                 int num) throw(Error);
+
+    /**
+     * Write a boolean value to the container.
+     *
+     * @param name      The name for the value in the container.
+     * @param value     The value to be written.
+     */
+    void                writeBool(const string &name,
+                                  bool value) throw(Error);
+
+    /**
+     * Write a string value to the container.
+     *
+     * @param name      The name for the value in the container.
+     * @param value     The value to be written.
+     */
+    void                writeString(const string &name,
+                                    const string &value) throw(Error);
+
+    /**
+     * Write string vector to the container.
+     *
+     * @param name      The name for the value in the container.
+     * @param array     The vector to be written.
+     */
+    void                writeStringVector(const string &name,
+                                          const StringVector &value)
+                                          throw(Error);
+
+    /**
+     * Write an object to the container. This is equal to calling
+     * PersistentObject.writeObject(ContainerNode);
+     *
+     * @param obj       The object to be written
+     */
+    void                writeObject(const PersistentObject &obj) throw(Error);
+
+    /**
+     * Create and write an empty Object node that can be used as parent
+     * for subsequent write operations.
+     *
+     * @param name      The name for the new container in the container.
+     *
+     * @return          A sub-container.
+     */
+    ContainerNode       writeNewContainer(const string &name)
+                                          throw(Error);
+
+    /**
+     * Create and write an empty array node that can be used as parent
+     * for subsequent write operations.
+     *
+     * @param name      The name for the array.
+     *
+     * @return          A sub-container.
+     */
+    ContainerNode       writeNewArray(const string &name)
+                                      throw(Error);
+
+public:
+    /* internal data */
+    container_node_op *op;
+    container_node_internal_data data;
+};
+
 
 /**
@@ -387 +655 @@
 };
 
-/**
- * Internal data for ContainerNode. See ContainerNode implementation notes
- * for more info.
- */
-struct container_node_internal_data
-{
-    void        *doc;
-    void        *data1;
-    void        *data2;
-};
-
-/**
- * A container node is a placeholder for storing other data elements, which
- * could be boolean, number, string, array of strings, or another container.
- * Each data in the container is basically a name/value pair, with a type
- * internally associated with it so that written data can be read in the
- * correct type. Data is read and written serially, hence the order of
- * reading must be the same as the order of writing.
- *
- * Application can read data from it by using the various read methods, and
- * write data to it using the various write methods. Alternatively, it
- * may be more convenient to use the provided macros below to read and write
- * the data, because these macros set the name automatically:
- *      - NODE_READ_BOOL(node,item)
- *      - NODE_READ_UNSIGNED(node,item)
- *      - NODE_READ_INT(node,item)
- *      - NODE_READ_FLOAT(node,item)
- *      - NODE_READ_NUM_T(node,type,item)
- *      - NODE_READ_STRING(node,item)
- *      - NODE_READ_STRINGV(node,item)
- *      - NODE_READ_OBJ(node,item)
- *      - NODE_WRITE_BOOL(node,item)
- *      - NODE_WRITE_UNSIGNED(node,item)
- *      - NODE_WRITE_INT(node,item)
- *      - NODE_WRITE_FLOAT(node,item)
- *      - NODE_WRITE_NUM_T(node,type,item)
- *      - NODE_WRITE_STRING(node,item)
- *      - NODE_WRITE_STRINGV(node,item)
- *      - NODE_WRITE_OBJ(node,item)
- *
- * Implementation notes:
- *
- * The ContainerNode class is subclass-able, but not in the usual C++ way.
- * With the usual C++ inheritance, some methods will be made pure virtual
- * and must be implemented by the actual class. However, doing so will
- * require dynamic instantiation of the ContainerNode class, which means
- * we will need to pass around the class as pointer, for example as the
- * return value of readContainer() and writeNewContainer() methods. Then
- * we will need to establish who needs or how to delete these objects, or
- * use shared pointer mechanism, each of which is considered too inconvenient
- * or complicated for the purpose.
- *
- * So hence we use C style "inheritance", where the methods are declared in
- * container_node_op and the data in container_node_internal_data structures.
- * An implementation of ContainerNode class will need to set up these members
- * with values that makes sense to itself. The methods in container_node_op
- * contains the pointer to the actual implementation of the operation, which
- * would be specific according to the format of the document. The methods in
- * this ContainerNode class are just thin wrappers which call the
- * implementation in the container_node_op structure.
- *
- */
-class ContainerNode
-{
-public:
-    /**
-     * Determine if there is unread element. If yes, then app can use one of
-     * the readXxx() functions to read it.
-     */
-    bool                hasUnread() const;
-
-    /**
-     * Get the name of the next unread element.
-     */
-    string              unreadName() const throw(Error);
-
-    /**
-     * Read an integer value from the document and return the value.
-     * This will throw Error if the current element is not a number.
-     * The read position will be advanced to the next element.
-     *
-     * @param name      If specified, then the function will check if the
-     *                  name of the next element matches the specified
-     *                  name and throw Error if it doesn't match.
-     *
-     * @return          The value.
-     */
-    int                 readInt(const string &name="") const throw(Error);
-
-    /**
-     * Read a number value from the document and return the value.
-     * This will throw Error if the current element is not a number.
-     * The read position will be advanced to the next element.
-     *
-     * @param name      If specified, then the function will check if the
-     *                  name of the next element matches the specified
-     *                  name and throw Error if it doesn't match.
-     *
-     * @return          The value.
-     */
-    float               readNumber(const string &name="") const throw(Error);
-
-    /**
-     * Read a boolean value from the container and return the value.
-     * This will throw Error if the current element is not a boolean.
-     * The read position will be advanced to the next element.
-     *
-     * @param name      If specified, then the function will check if the
-     *                  name of the next element matches the specified
-     *                  name and throw Error if it doesn't match.
-     *
-     * @return          The value.
-     */
-    bool                readBool(const string &name="") const throw(Error);
-
-    /**
-     * Read a string value from the container and return the value.
-     * This will throw Error if the current element is not a string.
-     * The read position will be advanced to the next element.
-     *
-     * @param name      If specified, then the function will check if the
-     *                  name of the next element matches the specified
-     *                  name and throw Error if it doesn't match.
-     *
-     * @return          The value.
-     */
-    string              readString(const string &name="") const throw(Error);
-
-    /**
-     * Read a string array from the container. This will throw Error
-     * if the current element is not a string array. The read position
-     * will be advanced to the next element.
-     *
-     * @param name      If specified, then the function will check if the
-     *                  name of the next element matches the specified
-     *                  name and throw Error if it doesn't match.
-     *
-     * @return          The value.
-     */
-    StringVector        readStringVector(const string &name="") const
-                                         throw(Error);
-
-    /**
-     * Read the specified object from the container. This is equal to
-     * calling PersistentObject.readObject(ContainerNode);
-     *
-     * @param obj       The object to read.
-     */
-    void                readObject(PersistentObject &obj) const throw(Error);
-
-    /**
-     * Read a container from the container. This will throw Error if the
-     * current element is not a container. The read position will be advanced
-     * to the next element.
-     *
-     * @param name      If specified, then the function will check if the
-     *                  name of the next element matches the specified
-     *                  name and throw Error if it doesn't match.
-     *
-     * @return          Container object.
-     */
-    ContainerNode       readContainer(const string &name="") const
-                                      throw(Error);
-
-    /**
-     * Read array container from the container. This will throw Error if the
-     * current element is not an array. The read position will be advanced
-     * to the next element.
-     *
-     * @param name      If specified, then the function will check if the
-     *                  name of the next element matches the specified
-     *                  name and throw Error if it doesn't match.
-     *
-     * @return          Container object.
-     */
-    ContainerNode       readArray(const string &name="") const
-                                  throw(Error);
-
-    /**
-     * Write a number value to the container.
-     *
-     * @param name      The name for the value in the container.
-     * @param value     The value to be written.
-     */
-    void                writeNumber(const string &name,
-                                    float num) throw(Error);
-
-    /**
-     * Write a number value to the container.
-     *
-     * @param name      The name for the value in the container.
-     * @param value     The value to be written.
-     */
-    void                writeInt(const string &name,
-                                 int num) throw(Error);
-
-    /**
-     * Write a boolean value to the container.
-     *
-     * @param name      The name for the value in the container.
-     * @param value     The value to be written.
-     */
-    void                writeBool(const string &name,
-                                  bool value) throw(Error);
-
-    /**
-     * Write a string value to the container.
-     *
-     * @param name      The name for the value in the container.
-     * @param value     The value to be written.
-     */
-    void                writeString(const string &name,
-                                    const string &value) throw(Error);
-
-    /**
-     * Write string vector to the container.
-     *
-     * @param name      The name for the value in the container.
-     * @param array     The vector to be written.
-     */
-    void                writeStringVector(const string &name,
-                                          const StringVector &value)
-                                          throw(Error);
-
-    /**
-     * Write an object to the container. This is equal to calling
-     * PersistentObject.writeObject(ContainerNode);
-     *
-     * @param obj       The object to be written
-     */
-    void                writeObject(const PersistentObject &obj) throw(Error);
-
-    /**
-     * Create and write an empty Object node that can be used as parent
-     * for subsequent write operations.
-     *
-     * @param name      The name for the new container in the container.
-     *
-     * @return          A sub-container.
-     */
-    ContainerNode       writeNewContainer(const string &name)
-                                          throw(Error);
-
-    /**
-     * Create and write an empty array node that can be used as parent
-     * for subsequent write operations.
-     *
-     * @param name      The name for the array.
-     *
-     * @return          A sub-container.
-     */
-    ContainerNode       writeNewArray(const string &name)
-                                      throw(Error);
-
-public:
-    /* internal data */
-    container_node_op *op;
-    container_node_internal_data data;
-};
 
 /*
@@ -660 +669 @@
 
 #define NODE_WRITE_BOOL(node,item)      node.writeBool(#item, item)
-#define NODE_WRITE_UNSIGNED(node,item)  node.writeNumber(#item, item)
-#define NODE_WRITE_INT(node,item)       node.writeNumber(#item, item)
-#define NODE_WRITE_NUM_T(node,T,item)   node.writeNumber(#item, (int)item)
+#define NODE_WRITE_UNSIGNED(node,item)  node.writeNumber(#item, (float)item)
+#define NODE_WRITE_INT(node,item)       node.writeNumber(#item, (float)item)
+#define NODE_WRITE_NUM_T(node,T,item)   node.writeNumber(#item, (float)item)
 #define NODE_WRITE_FLOAT(node,item)     node.writeNumber(#item, item)
 #define NODE_WRITE_STRING(node,item)    node.writeString(#item, item)

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

@@ -589 +589 @@
      */
     void toPj(pjsua_msg_data &msg_data) const;
+};
+
+
+/**
+ * This structure contains parameters for sending instance message methods,
+ * e.g: Buddy::sendInstantMessage(), Call:sendInstantMessage().
+ */
+struct SendInstantMessageParam
+{
+    /**
+     * MIME type. Default is "text/plain".
+     */
+    string contentType;
+    
+    /**
+     * The message content.
+     */
+    string content;
+    
+    /**
+     * List of headers etc to be included in outgoing request.
+     */
+    SipTxOption txOption;
+
+    /**
+     * User data, which will be given back when the IM callback is called.
+     */
+    Token userData;
+};
+
+
+/**
+ * This structure contains parameters for sending typing indication methods,
+ * e.g: Buddy::sendTypingIndication(), Call:sendTypingIndication().
+ */
+struct SendTypingIndicationParam
+{
+    /**
+     * True to indicate to remote that local person is currently typing an IM.
+     */
+    bool isTyping;
+    
+    /**
+     * List of headers etc to be included in outgoing request.
+     */
+    SipTxOption txOption;
 };
 

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

@@ -20 +20 @@
 #define __PJSUA2_TYPES_HPP__
 
+#ifdef _MSC_VER
+#   pragma warning( disable : 4290 ) // exception spec ignored
+#endif
+
 /**
  * @file pjsua2/types.hpp

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/account.cpp

@@ -19 +19 @@
 #include <pjsua2/account.hpp>
 #include <pjsua2/endpoint.hpp>
+#include <pjsua2/presence.hpp>
 #include <pj/ctype.h>
 #include "util.hpp"
@@ -446 +447 @@
     regConfig.firstRetryIntervalSec = prm.reg_first_retry_interval;
     regConfig.delayBeforeRefreshSec = prm.reg_delay_before_refresh;
-    regConfig.dropCallsOnFail   = prm.drop_calls_on_reg_fail;
+    regConfig.dropCallsOnFail   = PJ2BOOL(prm.drop_calls_on_reg_fail);
     regConfig.unregWaitSec      = prm.unreg_timeout;
     regConfig.proxyUse          = prm.reg_use_proxy;
@@ -484 +485 @@
     sipConfig.contactParams     = pj2Str(prm.contact_params);
     sipConfig.contactUriParams  = pj2Str(prm.contact_uri_params);
-    sipConfig.authInitialEmpty  = prm.auth_pref.initial_auth;
+    sipConfig.authInitialEmpty  = PJ2BOOL(prm.auth_pref.initial_auth);
     sipConfig.authInitialAlgorithm = pj2Str(prm.auth_pref.algorithm);
     sipConfig.transportId       = prm.transport_id;
@@ -504 +505 @@
         hdr = hdr->next;
     }
-    presConfig.publishEnabled   = prm.publish_enabled;
-    presConfig.publishQueue     = prm.publish_opt.queue_request;
+    presConfig.publishEnabled   = PJ2BOOL(prm.publish_enabled);
+    presConfig.publishQueue     = PJ2BOOL(prm.publish_opt.queue_request);
     presConfig.publishShutdownWaitMsec = prm.unpublish_max_wait_time_msec;
     presConfig.pidfTupleId      = pj2Str(prm.pidf_tuple_id);
 
     // AccountMwiConfig
-    mwiConfig.enabled           = prm.mwi_enabled;
+    mwiConfig.enabled           = PJ2BOOL(prm.mwi_enabled);
     mwiConfig.expirationSec     = prm.mwi_expires;
 
@@ -517 +518 @@
     natConfig.mediaStunUse      = prm.media_stun_use;
     if (prm.ice_cfg_use == PJSUA_ICE_CONFIG_USE_CUSTOM) {
-        natConfig.iceEnabled = prm.ice_cfg.enable_ice;
+        natConfig.iceEnabled = PJ2BOOL(prm.ice_cfg.enable_ice);
         natConfig.iceMaxHostCands = prm.ice_cfg.ice_max_host_cands;
-        natConfig.iceAggressiveNomination = prm.ice_cfg.ice_opt.aggressive;
+        natConfig.iceAggressiveNomination = PJ2BOOL(prm.ice_cfg.ice_opt.aggressive);
         natConfig.iceNominatedCheckDelayMsec = prm.ice_cfg.ice_opt.nominated_check_delay;
         natConfig.iceWaitNominationTimeoutMsec = prm.ice_cfg.ice_opt.controlled_agent_want_nom_timeout;
-        natConfig.iceNoRtcp     = prm.ice_cfg.ice_no_rtcp;
-        natConfig.iceAlwaysUpdate = prm.ice_cfg.ice_always_update;
+        natConfig.iceNoRtcp     = PJ2BOOL(prm.ice_cfg.ice_no_rtcp);
+        natConfig.iceAlwaysUpdate = PJ2BOOL(prm.ice_cfg.ice_always_update);
     } else {
         pjsua_media_config default_mcfg;
@@ -530 +531 @@
             mcfg = &default_mcfg;
         }
-        natConfig.iceEnabled    = mcfg->enable_ice;
+        natConfig.iceEnabled    = PJ2BOOL(mcfg->enable_ice);
         natConfig.iceMaxHostCands= mcfg->ice_max_host_cands;
-        natConfig.iceAggressiveNomination = mcfg->ice_opt.aggressive;
+        natConfig.iceAggressiveNomination = PJ2BOOL(mcfg->ice_opt.aggressive);
         natConfig.iceNominatedCheckDelayMsec = mcfg->ice_opt.nominated_check_delay;
         natConfig.iceWaitNominationTimeoutMsec = mcfg->ice_opt.controlled_agent_want_nom_timeout;
-        natConfig.iceNoRtcp     = mcfg->ice_no_rtcp;
-        natConfig.iceAlwaysUpdate = mcfg->ice_always_update;
+        natConfig.iceNoRtcp     = PJ2BOOL(mcfg->ice_no_rtcp);
+        natConfig.iceAlwaysUpdate = PJ2BOOL(mcfg->ice_always_update);
     }
 
     if (prm.turn_cfg_use == PJSUA_TURN_CONFIG_USE_CUSTOM) {
-        natConfig.turnEnabled   = prm.turn_cfg.enable_turn;
+        natConfig.turnEnabled   = PJ2BOOL(prm.turn_cfg.enable_turn);
         natConfig.turnServer    = pj2Str(prm.turn_cfg.turn_server);
         natConfig.turnConnType  = prm.turn_cfg.turn_conn_type;
@@ -552 +553 @@
             mcfg = &default_mcfg;
         }
-        natConfig.turnEnabled   = mcfg->enable_turn;
+        natConfig.turnEnabled   = PJ2BOOL(mcfg->enable_turn);
         natConfig.turnServer    = pj2Str(mcfg->turn_server);
         natConfig.turnConnType  = mcfg->turn_conn_type;
@@ -571 +572 @@
     // AccountMediaConfig
     mediaConfig.transportConfig.fromPj(prm.rtp_cfg);
-    mediaConfig.lockCodecEnabled= prm.lock_codec;
+    mediaConfig.lockCodecEnabled= PJ2BOOL(prm.lock_codec);
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && (PJMEDIA_STREAM_ENABLE_KA != 0)
-    mediaConfig.streamKaEnabled = prm.use_stream_ka;
+    mediaConfig.streamKaEnabled = PJ2BOOL(prm.use_stream_ka);
 #else
     mediaConfig.streamKaEnabled = false;
@@ -582 +583 @@
 
     // AccountVideoConfig
-    videoConfig.autoShowIncoming        = prm.vid_in_auto_show;
-    videoConfig.autoTransmitOutgoing    = prm.vid_out_auto_transmit;
+    videoConfig.autoShowIncoming        = PJ2BOOL(prm.vid_in_auto_show);
+    videoConfig.autoTransmitOutgoing    = PJ2BOOL(prm.vid_out_auto_transmit);
     videoConfig.windowFlags             = prm.vid_wnd_flags;
     videoConfig.defaultCaptureDevice    = prm.vid_cap_dev;
@@ -623 +624 @@
 }
 
-
-///////////////////////////////////////////////////////////////////////////////
-
-AccountPresenceStatus::AccountPresenceStatus()
-: isOnline(false), activity(PJRPID_ACTIVITY_UNKNOWN)
-{
-}
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -662 +656 @@
      */
     if (isValid() && pjsua_get_state() < PJSUA_STATE_CLOSING) {
+        // Cleanup buddies in the buddy list
+        while(buddyList.size() > 0) {
+            Buddy *b = buddyList[0];
+            delete b;
+        }
+
         PJSUA2_CHECK_EXPR( pjsua_acc_set_user_data(id, NULL) );
         PJSUA2_CHECK_EXPR( pjsua_acc_del(id) );
@@ -724 +724 @@
 
 void
-Account::setOnlineStatus(const AccountPresenceStatus &pres_st) throw(Error)
+Account::setOnlineStatus(const PresenceStatus &pres_st) throw(Error)
 {
     pjrpid_element pj_rpid;
@@ -734 +734 @@
     pj_rpid.note        = str2Pj(pres_st.note);
 
-    PJSUA2_CHECK_EXPR( pjsua_acc_set_online_status2(id, pres_st.isOnline,
-                                                    &pj_rpid) );
+    PJSUA2_CHECK_EXPR( pjsua_acc_set_online_status2(
+                            id, pres_st.status == PJSUA_BUDDY_STATUS_ONLINE,
+                            &pj_rpid) );
 }
 
@@ -743 +744 @@
 }
 
+void Account::presNotify(const PresNotifyParam &prm) throw(Error)
+{
+    pj_str_t pj_state_str   = str2Pj(prm.stateStr);
+    pj_str_t pj_reason      = str2Pj(prm.reason);
+    pjsua_msg_data msg_data;
+    prm.txOption.toPj(msg_data);
+
+    PJSUA2_CHECK_EXPR( pjsua_pres_notify(id, (pjsua_srv_pres*)prm.srvPres,
+                                         prm.state, &pj_state_str,
+                                         &pj_reason, prm.withBody,
+                                         &msg_data) );
+}
+
+const BuddyVector& Account::enumBuddies() const throw(Error)
+{
+    return buddyList;
+}
+
+Buddy* Account::findBuddy(string uri, FindBuddyMatch *buddy_match) const
+                throw(Error)
+{
+    if (!buddy_match) {
+        static FindBuddyMatch def_bm;
+        buddy_match = &def_bm;
+    }
+
+    for (unsigned i = 0; i < buddyList.size(); i++) {
+        if (buddy_match->match(uri, *buddyList[i]))
+            return buddyList[i];
+    }
+    PJSUA2_RAISE_ERROR(PJ_ENOTFOUND);
+}
+
+void Account::addBuddy(Buddy *buddy)
+{
+    pj_assert(buddy);
+
+    buddyList.push_back(buddy);
+}
+
+void Account::removeBuddy(Buddy *buddy)
+{
+    pj_assert(buddy);
+
+    BuddyVector::iterator it;
+    for (it = buddyList.begin(); it != buddyList.end(); it++) {
+        if (*it == buddy) {
+            buddyList.erase(it);
+            return;
+        }
+    }
+
+    pj_assert(!"Bug! Buddy to be removed is not in the buddy list!");
+}

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/endpoint.cpp

@@ -19 +19 @@
 #include <pjsua2/endpoint.hpp>
 #include <pjsua2/account.hpp>
+#include <pjsua2/presence.hpp>
 #include "util.hpp"
 
@@ -63 +64 @@
     }
 
-    this->stunIgnoreFailure = ua_cfg.stun_ignore_failure;
+    this->stunIgnoreFailure = PJ2BOOL(ua_cfg.stun_ignore_failure);
     this->natTypeInSdp = ua_cfg.nat_type_in_sdp;
-    this->mwiUnsolicitedEnabled = ua_cfg.enable_unsolicited_mwi;
+    this->mwiUnsolicitedEnabled = PJ2BOOL(ua_cfg.enable_unsolicited_mwi);
 }
 
@@ -205 +206 @@
     this->audioFramePtime = mc.audio_frame_ptime;
     this->maxMediaPorts = mc.max_media_ports;
-    this->hasIoqueue = mc.has_ioqueue;
+    this->hasIoqueue = PJ2BOOL(mc.has_ioqueue);
     this->threadCnt = mc.thread_cnt;
     this->quality = mc.quality;
     this->ptime = mc.ptime;
-    this->noVad = mc.no_vad;
+    this->noVad = PJ2BOOL(mc.no_vad);
     this->ilbcMode = mc.ilbc_mode;
     this->txDropPct = mc.tx_drop_pct;
@@ -222 +223 @@
     this->jbMax = mc.jb_max;
     this->sndAutoCloseTime = mc.snd_auto_close_time;
-    this->vidPreviewEnableNative = mc.vid_preview_enable_native;
+    this->vidPreviewEnableNative = PJ2BOOL(mc.vid_preview_enable_native);
 }
 
@@ -362 +363 @@
     } catch (Error &err) {
         // Ignore
+        PJ_UNUSED_ARG(err);
     }
     delete writer;
@@ -412 +414 @@
                         pj_timer_entry *entry)
 {
+    PJ_UNUSED_ARG(timer_heap);
+
     Endpoint &ep = Endpoint::instance();
     UserTimer *ut = (UserTimer*) entry->user_data;
@@ -505 +509 @@
 
     OnRegStartedParam prm;
-    prm.renew = renew;
+    prm.renew = PJ2BOOL(renew);
     acc->onRegStarted(prm);
 }
@@ -536 +540 @@
                                      pjsua_msg_data *msg_data)
 {
+    PJ_UNUSED_ARG(buddy_id);
+    PJ_UNUSED_ARG(srv_pres);
+
     Account *acc = lookupAcc(acc_id, "on_incoming_subscribe()");
     if (!acc) {
@@ -543 +550 @@
 
     OnIncomingSubscribeParam prm;
+    prm.srvPres         = srv_pres;
     prm.fromUri         = pj2Str(*from);
     prm.rdata.fromPj(*rdata);
     prm.code            = *code;
     prm.reason          = pj2Str(*reason);
+    prm.txOption.fromPj(*msg_data);
 
     acc->onIncomingSubscribe(prm);
@@ -553 +562 @@
     acc->tmpReason = prm.reason;
     *reason = str2Pj(acc->tmpReason);
-    // TODO:
-    //  apply msg_data
+    prm.txOption.toPj(*msg_data);
 }
 
@@ -599 +607 @@
                                  pjsua_acc_id acc_id)
 {
+    PJ_UNUSED_ARG(tdata);
+
     OnInstantMessageStatusParam prm;
     prm.userData        = user_data;
@@ -667 +677 @@
 }
 
+void Endpoint::on_buddy_state(pjsua_buddy_id buddy_id)
+{
+    Buddy *buddy = (Buddy*)pjsua_buddy_get_user_data(buddy_id);
+    if (!buddy || !buddy->isValid()) {
+        /* Ignored */
+        return;
+    }
+
+    buddy->onBuddyState();
+}
+
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -723 +744 @@
     ua_cfg.cb.on_typing2        = &Endpoint::on_typing2;
     ua_cfg.cb.on_mwi_info       = &Endpoint::on_mwi_info;
+    ua_cfg.cb.on_buddy_state    = &Endpoint::on_buddy_state;
 
     /* Init! */

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/json.cpp

@@ -124 +124 @@
         PJSUA2_RAISE_ERROR(PJ_ENOTFOUND);
 
-    pj_ssize_t size = pj_file_size(filename.c_str());
+    pj_ssize_t size = (pj_ssize_t)pj_file_size(filename.c_str());
     pj_status_t status;
 
@@ -359 +359 @@
     json_verify(jdat, "readBool()", name, PJ_JSON_VAL_BOOL);
     jdat->childPtr = jdat->childPtr->next;
-    return jdat->childPtr->prev->value.is_true;
+    return PJ2BOOL(jdat->childPtr->prev->value.is_true);
 }
 

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/persistent.cpp

@@ -85 +85 @@
                                   int num) throw(Error)
 {
-    getRootContainer().writeNumber(name, num);
+    getRootContainer().writeNumber(name, (float)num);
 }
 
@@ -188 +188 @@
                              int num) throw(Error)
 {
-    return op->writeNumber(this, name, num);
+    return op->writeNumber(this, name, (float)num);
 }
 

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/siptypes.cpp

@@ -46 +46 @@
     ContainerNode array_node = node.writeNewArray(array_name);
     for (unsigned i=0; i<v.size(); ++i) {
-        array_node.writeNumber("", v[i]);
+        array_node.writeNumber("", (float)v[i]);
     }
 }
@@ -190 +190 @@
     pj_assert(sizeof(prm.ciphers[0]) == sizeof(int));
     this->ciphers       = IntVector(prm.ciphers, prm.ciphers+prm.ciphers_num);
-    this->verifyServer  = prm.verify_server;
-    this->verifyClient  = prm.verify_client;
-    this->requireClientCert = prm.require_client_cert;
+    this->verifyServer  = PJ2BOOL(prm.verify_server);
+    this->verifyClient  = PJ2BOOL(prm.verify_client);
+    this->requireClientCert = PJ2BOOL(prm.require_client_cert);
     this->msecTimeout   = PJ_TIME_VAL_MSEC(prm.timeout);
     this->qosType       = prm.qos_type;
     this->qosParams     = prm.qos_params;
-    this->qosIgnoreError = prm.qos_ignore_error;
+    this->qosIgnoreError = PJ2BOOL(prm.qos_ignore_error);
 }
 

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/util.hpp

@@ -21 +21 @@
 #include <string>
 
+#define PJ2BOOL(var) ((var) != PJ_FALSE)
+
 namespace pj
 {