Changeset 2156 for pjproject/trunk/pjsip-apps/src/python/_pjsua.h

Timestamp:

Jul 18, 2008 11:00:56 PM (16 years ago)

Author:

bennylp

Message:

Implemented ticket #192 for Python: Add callback to notify application about incoming SUBSCRIBE request, and add subscription state and termination reason in buddy info

File:

• pjproject/trunk/pjsip-apps/src/python/_pjsua.h (modified) (10 diffs)

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

@@ -508 +508 @@
     PyObject * on_call_replaced;
     PyObject * on_reg_state;
+    PyObject * on_incoming_subscribe;
     PyObject * on_buddy_state;
     PyObject * on_pager;
@@ -530 +531 @@
     Py_XDECREF(self->on_call_replaced);
     Py_XDECREF(self->on_reg_state);
+    Py_XDECREF(self->on_incoming_subscribe);
     Py_XDECREF(self->on_buddy_state);
     Py_XDECREF(self->on_pager);
@@ -617 +619 @@
             return NULL;
         }
+        Py_INCREF(Py_None);
+        self->on_incoming_subscribe = Py_None;
         Py_INCREF(Py_None);
         self->on_buddy_state = Py_None;
@@ -718 +722 @@
         "Notify application when registration status has changed. Application "
         "may then query the account info to get the registration details."
+    },
+    {
+        "on_incoming_subscribe", T_OBJECT_EX,
+        offsetof(PyObj_pjsua_callback, on_incoming_subscribe), 0,
+        "Notification when incoming SUBSCRIBE request is received."
     },
     {
@@ -2769 +2778 @@
     int          monitor_pres;
     int          activity;
+    int          sub_state;
+    PyObject    *sub_term_reason;
 } PyObj_pjsua_buddy_info;
 
@@ -2782 +2793 @@
     Py_XDECREF(self->contact);
     Py_XDECREF(self->status_text);
+    Py_XDECREF(self->sub_term_reason);
     
     self->ob_type->tp_free((PyObject*)self);
@@ -2801 +2813 @@
     obj->monitor_pres = info->monitor_pres;
     obj->activity = info->rpid.activity;
+    obj->sub_state = info->sub_state;
+    Py_XDECREF(obj->sub_term_reason);
+    obj->sub_term_reason = PyString_FromStringAndSize(info->sub_term_reason.ptr, 
+                                                      info->sub_term_reason.slen);
 }
 
@@ -2824 +2840 @@
             Py_DECREF(self);
             return NULL;
-        }        
+        }
         self->contact = PyString_FromString("");
         if (self->contact == NULL) {
@@ -2835 +2851 @@
             return NULL;
         }
-        
+        self->sub_term_reason = PyString_FromString("");
     }
     return (PyObject *)self;
@@ -2882 +2898 @@
         offsetof(PyObj_pjsua_buddy_info, activity), 0,
         "Activity type. "
+    },
+    {
+        "sub_state", T_INT, 
+        offsetof(PyObj_pjsua_buddy_info, sub_state), 0,
+        "Subscription state."
+    },
+    {
+        "sub_term_reason", T_INT, 
+        offsetof(PyObj_pjsua_buddy_info, sub_term_reason), 0,
+        "Subscription termination reason."
     },