Changeset 499:8844ce6b2c20 in verona

Timestamp:

Jun 7, 2012 11:50:50 AM (12 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

implement phAnswerMessage to allow explicity generateion of answers to incoming MESSAGE requests

Files:

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

phapi/phapi.c

@@ -2020 +2020 @@
 
 PHAPI_EXPORT int
+phAnswerMessage(int tid, int code)
+{
+        int i;
+
+        eXosip_lock();
+        i = eXosip_message_send_answer(tid, code, NULL);
+        eXosip_unlock();
+        return i >= 0 ? i : -PH_BADARG;
+}
+        
+PHAPI_EXPORT int
 phLineSubscribe(int vlid, const char *uri, const int winfo)
 {
@@ -6889 +6900 @@
                 info.rawctt = rawCtt;
 
-                eXosip_message_send_answer(je->tid, 202, NULL);
+                if (!phcfg.no_msg_auto_reply)
+                    eXosip_message_send_answer(je->tid, 202, NULL);
                 if (phcb->msgProgress != NULL)
                         phcb->msgProgress(je->tid, &info);

phapi/phapi.h

@@ -482 +482 @@
 
 
+PHAPI_EXPORT int
+phAnswerMessage(int tid, int code);
+
+
 /**
  * Subscribe to presence
@@ -1333 +1337 @@
   int qos;                  /* QoS bits to add to TOS to : 0x2 min cost, 0x4 max reliability, 0x8 max throughput, 0x10 min delay */
   unsigned int hdxlevel;    /* if bit31=1  HDX level is valid and bits0-30 contains the power threshold */
-
+  int no_msg_auto_reply;            /* when 1 avoid auto answering message requests */
 };
 

phcpp/phapipp.cpp

@@ -180 +180 @@
 {
         return phLineSendMessage3(vlid, target, to, buff, mime, hdrs.size(), (const struct ph_hdr_val*) &hdrs.front() );
+}
+
+int phapi::answerMessage(int tid, int code)
+{
+        return phAnswerMessage(tid, code);
 }
 

phcpp/phapipp.h

@@ -121 +121 @@
                         const std::vector<std::pair<const char*, const char* > >& hdrs, const char* target = 0);
 
+        virtual int answerMessage(int tid, int code);
+
         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);