Changeset 2730 for pjproject/trunk

Timestamp:

Jun 1, 2009 3:39:52 PM (15 years ago)

Author:

bennylp

Message:

Ticket #869: Make various event/presence subscription time settings configurable (thanks Johan Lantz for the suggestion)

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_config.h (modified) (1 diff)
• src/pjsip-simple/evsub.c (modified) (2 diffs)
• src/pjsip-simple/presence.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -793 +793 @@
 
 
+/*****************************************************************************
+ *  SIP Event framework and presence settings.
+ */
+
+/**
+ * Specify the time (in seconds) to send SUBSCRIBE to refresh client 
+ * subscription before the actual interval expires.
+ *
+ * Default: 5 seconds
+ */
+#ifndef PJSIP_EVSUB_TIME_UAC_REFRESH
+#   define PJSIP_EVSUB_TIME_UAC_REFRESH         5
+#endif
+
+
+/**
+ * Specify the time (in seconds) to wait for the final NOTIFY from the
+ * server after client has sent un-SUBSCRIBE request.
+ *
+ * Default: 5 seconds
+ */
+#ifndef PJSIP_EVSUB_TIME_UAC_TERMINATE
+#   define PJSIP_EVSUB_TIME_UAC_TERMINATE       5
+#endif
+
+
+/**
+ * Specify the time (in seconds) for client subscription to wait for another
+ * NOTIFY from the server, if it has rejected the last NOTIFY with non-2xx
+ * final response (such as 401). If further NOTIFY is not received within
+ * this period, the client will unsubscribe.
+ *
+ * Default: 5 seconds
+ */
+#ifndef PJSIP_EVSUB_TIME_UAC_WAIT_NOTIFY
+#   define PJSIP_EVSUB_TIME_UAC_WAIT_NOTIFY     5
+#endif
+
+
+/**
+ * Specify the default expiration time for presence event subscription, for
+ * both client and server subscription. For client subscription, application
+ * can override this by specifying positive non-zero value in "expires" 
+ * parameter when calling #pjsip_pres_initiate(). For server subscription,
+ * we would take the expiration value from the Expires header sent by client
+ * in the SUBSCRIBE request if the header exists and its value is less than 
+ * this setting, otherwise this setting will be used.
+ *
+ * Default: 600 seconds (10 minutes)
+ */
+#ifndef PJSIP_PRES_DEFAULT_EXPIRES
+#   define PJSIP_PRES_DEFAULT_EXPIRES           600
+#endif
+
+
 PJ_END_DECL
 

pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

@@ -106 +106 @@
 
 /* Number of seconds to send SUBSCRIBE before the actual expiration */
-#define TIME_UAC_REFRESH        5
+#define TIME_UAC_REFRESH        PJSIP_EVSUB_TIME_UAC_REFRESH
 
 /* Time to wait for the final NOTIFY after sending unsubscription */
-#define TIME_UAC_TERMINATE      5
+#define TIME_UAC_TERMINATE      PJSIP_EVSUB_TIME_UAC_TERMINATE
 
 /* If client responds NOTIFY with non-2xx final response (such as 401),
@@ -115 +115 @@
  * unsubscribe
  */
-#define TIME_UAC_WAIT_NOTIFY    5
+#define TIME_UAC_WAIT_NOTIFY    PJSIP_EVSUB_TIME_UAC_WAIT_NOTIFY
 
 

pjproject/trunk/pjsip/src/pjsip-simple/presence.c

@@ -33 +33 @@
 
 #define THIS_FILE                   "presence.c"
-#define PRES_DEFAULT_EXPIRES        600
+#define PRES_DEFAULT_EXPIRES        PJSIP_PRES_DEFAULT_EXPIRES
 
 /*