Changeset 2976 for pjproject

Timestamp:

Oct 29, 2009 8:16:46 AM (14 years ago)

Author:

bennylp

Message:

More ticket #982: added MWI support for Python

Location:

pjproject/trunk/pjsip-apps/src/python

Files:

• _pjsua.c (modified) (2 diffs)
• _pjsua.h (modified) (8 diffs)
• pjsua.py (modified) (4 diffs)

pjproject/trunk/pjsip-apps/src/python/_pjsua.c

@@ -631 +631 @@
 
 
+/*
+ * on_mwi_info
+ */
+static void cb_on_mwi_info(pjsua_acc_id acc_id, pjsua_mwi_info *mwi_info)
+{
+    if (PyCallable_Check(g_obj_callback->on_mwi_info)) {
+        PyObject *param_acc_id, *param_body;
+        pj_str_t body;
+
+        ENTER_PYTHON();
+
+        body.ptr = mwi_info->rdata->msg_info.msg->body->data;
+        body.slen = mwi_info->rdata->msg_info.msg->body->len;
+
+        PyObject_CallFunctionObjArgs(
+                g_obj_callback->on_mwi_info,
+                param_acc_id    = Py_BuildValue("i",acc_id),
+                param_body      = PyString_FromPJ(&body),
+                NULL
+            );
+
+        Py_DECREF(param_acc_id);
+        Py_DECREF(param_body);
+
+        LEAVE_PYTHON();
+    }
+}
 
 /* 
@@ -902 +929 @@
         cfg_ua.cb.on_pager_status2 = &cb_on_pager_status;
         cfg_ua.cb.on_typing2 = &cb_on_typing;
+        cfg_ua.cb.on_mwi_info = &cb_on_mwi_info;
 
         p_cfg_ua = &cfg_ua;

pjproject/trunk/pjsip-apps/src/python/_pjsua.h

@@ -236 +236 @@
     PyObject * on_pager_status;
     PyObject * on_typing;
+    PyObject * on_mwi_info;
 } PyObj_pjsua_callback;
 
@@ -259 +260 @@
     Py_XDECREF(self->on_pager_status);
     Py_XDECREF(self->on_typing);
+    Py_XDECREF(self->on_mwi_info);
     self->ob_type->tp_free((PyObject*)self);
 }
@@ -292 +294 @@
         self->on_pager_status = Py_BuildValue("");
         self->on_typing = Py_BuildValue("");
+        self->on_mwi_info = Py_BuildValue("");
     }
 
@@ -394 +397 @@
         offsetof(PyObj_pjsua_callback, on_typing), 0,
         "Notify application about typing indication."
+    },
+    {
+        "on_mwi_info", T_OBJECT_EX, 
+        offsetof(PyObj_pjsua_callback, on_mwi_info), 0,
+        "Notify application about MWI indication."
     },
     {NULL}  /* Sentinel */
@@ -1646 +1654 @@
     PyObject        *reg_uri;
     int              publish_enabled;
+    int              mwi_enabled;
     PyObject        *force_contact;
     PyListObject    *proxy;
@@ -1699 +1708 @@
     obj->reg_uri    = PyString_FromPJ(&cfg->reg_uri);
     obj->publish_enabled = cfg->publish_enabled;
+    obj->mwi_enabled = cfg->mwi_enabled;
     Py_XDECREF(obj->force_contact);
     obj->force_contact = PyString_FromPJ(&cfg->force_contact);
@@ -1754 +1764 @@
     cfg->reg_uri    = PyString_ToPJ(obj->reg_uri);
     cfg->publish_enabled = obj->publish_enabled;
+    cfg->mwi_enabled = obj->mwi_enabled;
     cfg->force_contact = PyString_ToPJ(obj->force_contact);
 
@@ -1857 +1868 @@
         offsetof(PyObj_pjsua_acc_config, publish_enabled), 0,
         "Publish presence? "
+    },
+    {
+        "mwi_enabled", T_INT, 
+        offsetof(PyObj_pjsua_acc_config, mwi_enabled), 0,
+        "Enable MWI subscription "
     },
     {

pjproject/trunk/pjsip-apps/src/python/pjsua.py

@@ -994 +994 @@
         pass
 
+    def on_mwi_info(self, body):
+        """
+        Notification about change in Message Summary / Message Waiting
+        Indication (RFC 3842) status. MWI subscription must be enabled
+        in the account config to receive this notification.
+
+        Keyword arguments:
+        body      -- String containing message body as received in the
+                     NOTIFY request.
+
+        """
+        pass
+
 
 
@@ -2114 +2127 @@
         py_ua_cfg.cb.on_pager_status = _cb_on_pager_status
         py_ua_cfg.cb.on_typing = _cb_on_typing
+        py_ua_cfg.cb.on_mwi_info = _cb_on_mwi_info;
 
         err = _pjsua.init(py_ua_cfg, log_cfg._cvt_to_pjsua(), 
@@ -2764 +2778 @@
                 acc._cb.on_typing(from_uri, contact, is_typing)
 
+    def _cb_on_mwi_info(self, acc_id, body):
+        acc = self._lookup_account(acc_id)
+        if acc:
+            return acc._cb.on_mwi_info(body)
+
     def _cb_on_buddy_state(self, buddy_id):
         buddy = self._lookup_buddy(buddy_id)
@@ -2817 +2836 @@
     _lib._cb_on_typing(call_id, from_uri, to, contact, is_typing, acc_id)
 
+def _cb_on_mwi_info(acc_id, body):
+    _lib._cb_on_mwi_info(acc_id, body)
 
 # Worker thread