Changeset 451:98d5d2016443 in verona

Timestamp:

Apr 3, 2012 12:44:46 PM (14 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Children:

452:ef158d6b3770, 453:be77f63cf114

rebase_source:

8ca853b359dde096bf1d951a96ce23fed3477f31

Message:

implement sendMessage3 api

Files:

• phapi/phapi.c (modified) (1 diff)
• phapi/phapi.h (modified) (1 diff)
• phcpp/phapipp.cpp (modified) (1 diff)
• phcpp/phapipp.h (modified) (2 diffs)

phapi/phapi.c

@@ -1885 +1885 @@
 
 PHAPI_EXPORT int
+phLineSendMessage3(int vlid, const char *target, const char *uri,
+                const char *buff, const char *mime, int hcount, const struct ph_hdr_val *hdrs)
+{
+        int i,j;
+        struct vline *vl;
+        char from[512];
+        osip_message_t *msg;
+
+
+
+        if (!phIsInitialized)
+                return -PH_NOTINIT;
+
+        vl = ph_valid_vlid(vlid);
+        if (!vl) {
+                return -PH_BADVLID;
+        }
+
+        if ( !nonempty(uri)) {
+                return -PH_BADARG;
+        }
+
+        ph_build_from(from, sizeof(from), vl);
+
+        eXosip_lock();
+        i = eXosip_message_build_request(&msg, "MESSAGE", (char *)uri,
+                        from, vl->proxy);
+
+
+        ph_req_set_body(msg, buff, mime);
+        osip_message_set_contact(msg, vl->contact);
+
+        for (j = 0; j < hcount; j++)
+                set_custom_header(msg, hdrs[j].hdr, hdrs[j].val);
+
+        ph_apply_customizations(msg, NULL, NULL);
+        i = eXosip_message_send_request(msg);
+
+        eXosip_unlock();
+        return i > 0 ? i : -PH_BADARG;
+}
+
+
+PHAPI_EXPORT int
 phCallSendMessage(int cid, const char *buff, const char *mime)
 {

phapi/phapi.h

@@ -475 +475 @@
 PHAPI_EXPORT int phCallSendMessage(int cid, const char *buff, const char *mime);
 
+struct ph_hdr_val;
+PHAPI_EXPORT int
+phLineSendMessage3(int vlid, const char *target, const char *uri,
+                const char *buff, const char *mime, int hcount, const struct ph_hdr_val *hdrs);
 
 

phcpp/phapipp.cpp

@@ -176 +176 @@
 }
 
+int phapi::sendMessage3(int vlid, const char* to,  const char* buff, const char* mime,
+                const std::vector<std::pair<const char*, const char* > >& hdrs, const char* target)
+{
+        return phLineSendMessage3(vlid, target, to, buff, mime, hdrs.size(), (const struct ph_hdr_val*) hdrs.begin() );
+}
 
 

phcpp/phapipp.h

@@ -24 +24 @@
 #include <string>
 #include <map>
+#include <vector>
 
 /*
@@ -98 +99 @@
         virtual int sendMessage(int vlid, const char* to,  const char* buff, const char* mime,
                         const char* target = 0, const char* sipcid = 0);
+        virtual int sendMessage3(int vlid, const char* to,  const char* buff, const char* mime,
+                        const std::vector<std::pair<const char*, const char* > >& hdrs, const char* target = 0);
 
         virtual int subscribe(int vlid, const char* to, int winfo, char *data = 0, int use_proxy = 1, int expire = 600);