Changeset 458:d13060301571 in verona

Timestamp:

Apr 19, 2012 12:00:04 PM (13 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

change signature of onMessagePorgress method

Files:

• phcpp/phapipp.cpp (modified) (2 diffs)
• phcpp/phapipp.h (modified) (2 diffs)
• swig/verona.i (modified) (2 diffs)

phcpp/phapipp.cpp

@@ -481 +481 @@
 void phapi::onConfProgress(int cfid, const phConfStateInfo_t *info)  { }
 void phapi::onRegProgress(int regid, int status)  { }
-void phapi::onMsgProgress(int mid,  const phMsgStateInfo_t *info)  
+void phapi::onMsgProgress(int mid,  const phMsgStateInfo2 *info)
 {
         onMsgProgress2(mid,     (char *)info->rawctt, (char *)info->content);
@@ -530 +530 @@
 void phapi::msgProgress(int mid,  const phMsgStateInfo_t *info)
 {
-        if (uniqueobj)
-                uniqueobj->onMsgProgress(mid, info);
+        if (uniqueobj) {
+                phMsgStateInfo2  mi2;
+
+                mi2.event = info->event;
+                mi2.status = info->status;
+                mi2.from = info->from;
+                mi2.to = info->to;
+                mi2.ctype = info->ctype;
+                mi2.subtype = info->subtype;
+                mi2.content = info->content;
+                mi2.rawctt = info->rawctt;
+                mi2.tid = info->tid;
+                mi2.cid = info->cid;
+
+                typedef std::pair<const char*, const char*>  cstrpair;
+                for( int i = 0; i < info->hlist.count; i++) {
+                        const struct ph_hdr_val* e = info->hlist.elems + i;
+                        mi2.hlist.push_back(cstrpair(e->hdr, e->val));
+                }
+
+                uniqueobj->onMsgProgress(mid, &mi2);
+        }
 
 }

phcpp/phapipp.h

@@ -48 +48 @@
 
  */
+
+struct phMsgStateInfo2 {
+  enum phMsgEvent event;
+  int   status;
+  const char *from;
+  const char *to;
+  const char *ctype;
+  const char *subtype;
+  const char *content;
+  const char *rawctt;
+  int   tid;     /*!<  Trasnaction id of corresponding MESSAGE request */
+  int   cid;     /*!<  when non-zero this is message inside a dialog corresponding to call 'cid' */
+  std::vector<std::pair<const char*, const char*> > hlist;
+};
+
 
 namespace verona {
@@ -196 +211 @@
         virtual void onConfProgress(int cfid, const phConfStateInfo_t *info);
         virtual void onRegProgress(int regid, int status);
-        virtual void onMsgProgress(int mid,  const phMsgStateInfo_t *info);
+        virtual void onMsgProgress(int mid,  const phMsgStateInfo2 *info);
         virtual void onMsgProgress2(int mid,  char * type, char * content);
         virtual void onConnectionLost(const char* host, int port);

swig/verona.i

@@ -111 +111 @@
       
   return result;    
+}
+
+PyObject*
+make_hdrlist2(const std::vector<std::pair<const char*, const char*> >& hl ) {
+  PyObject* result;
+
+  result = PyList_New(hl.size());
+  for(int i = 0; i < hl.size(); i++)
+     PyList_SET_ITEM(result, i, Py_BuildValue("ss", hl[i].first, hl[i].second));
+      
+  return result;      
 }
 %}
@@ -179 +190 @@
 }
 
+%typemap(directorin) const phMsgStateInfo2 * {
+
+        $input = Py_BuildValue("iissssssio", $1_name->event, $1_name->status, $1_name->from, $1_name->to, 
+                        $1_name->ctype, $1_name->subtype, $1_name->content, $1_name->rawctt, $1_name->cid, 
+                 make_hdrlist2($1_name->hlist));
+
+}
+
 
 %typemap(directorin) const pCallStateInfo_t * {