Changeset 465:b765fb9c3fc8 in verona

Timestamp:

Apr 19, 2012 5:00:36 PM (13 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

implment subcribe3 with possibility of header customizations

Files:

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

phapi/phapi.c

@@ -2006 +2006 @@
 
 PHAPI_EXPORT int
-phLineSubscribe2(int vlid, const char *uri, const int winfo, char *data, int use_proxy, int expire)
-{
-        int i;
+phLineSubscribe2(int vlid, const char *uri, const int winfo, int use_proxy, int expire)
+{
+        return phLineSuscribe3(vlid, uri, winfo, use_proxy, expire, 0);
+}
+
+PHAPI_EXPORT int
+phLineSubscribe3(int vlid, const char *uri, const int winfo,  int use_proxy, int expire,
+                int hcount, const struct ph_hdr_val *hdrs)
+{
+        int i,j;
         struct vline *vl;
         char from[512];
@@ -2036 +2043 @@
         if (!i)
         {
-                if (data)
-                {               
-                        osip_header_t *data_header;
-
-                        osip_header_init(&data_header);
-                        osip_header_set_name(data_header, osip_strdup("X-Addressbook"));
-                        osip_header_set_value(data_header, osip_strdup(data));
-                        osip_list_add(&msg->headers, data_header, 0);
-                }
+                for (j = 0; j < hcount; j++)
+                        set_customized_header(msg, hdrs[j].hdr, hdrs[j].val);
                 ph_apply_customizations(msg, NULL, NULL);
                 i = eXosip_subscribe_send_initial_request(msg);
@@ -7682 +7682 @@
         const char* reqname;
         int i;
-        const int NHDRS = 64;
+        const int N = 64;
         struct ph_hdr_val tmpval[64];
         struct ph_hdr_list tmphlist = { 0, tmpval };

phapi/phapi.h

@@ -493 +493 @@
  * @return 0 if success else -1
 */
-PHAPI_EXPORT int phLineSubscribe2(int vlid, const char *to, const int winfo, char *data, int use_proxy, int expire);
-
+PHAPI_EXPORT int phLineSubscribe2(int vlid, const char *to, const int winfo, int use_proxy, int expire);
+PHAPI_EXPORT int phLineSubscribe3(int vlid, const char *to, const int winfo, int use_proxy, int expire, int hcount, const struct ph_hdr_val *hdrs);
 /**
  * Subscribe to presence

phcpp/phapipp.cpp

@@ -183 +183 @@
 
 
-int phapi::subscribe(int vlid, const char* to, int winfo, char* data, int use_proxy, int expire)
-{
-        return phLineSubscribe2(vlid, to, winfo, data, use_proxy, expire);
+int phapi::subscribe(int vlid, const char* to, int winfo, int use_proxy, int expire,
+                const std::vector<std::pair<const char*, const char* > >* hdrs)
+{
+        return phLineSubscribe3(vlid, to, winfo, use_proxy, expire, hdrs ? (const struct ph_hdr_val*) &hdrs->front() : 0);
 }
 
@@ -203 +204 @@
         return phLinePublish2(vlid, to, evt, ctt, content, expires);
 }
-
 
 

phcpp/phapipp.h

@@ -117 +117 @@
                         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);
+        virtual int subscribe(int vlid, const char* to, int winfo, int use_proxy = 1, int expire = 600,
+                        const std::vector<std::pair<const char*, const char* > >* hdrs = 0);
         virtual int unsubscribe(int sid, int winfo);
         virtual int publish(int vlid, const char* to, const char* evt, const char* ctt, const char* content,