res_pjsip_pubsub.c: Use pjsip version for pending NOTIFY check. (#47)

The functionality we are interested in is present only in pjsip 2.13
and newer.

Resolves: #45

diff --git a/configure b/configure
index bf78e2aade7730e427a270978f0ba342133dead4..979cf7fbd2086b4a39ae93d3e50fd8cdf6083f70 100755 (executable)
--- a/configure
+++ b/configure
@@ -912,10 +912,6 @@ PBX_POPT
 POPT_DIR
 POPT_INCLUDE
 POPT_LIB
-PBX_PJSIP_EVSUB_PENDING_NOTIFY
-PJSIP_EVSUB_PENDING_NOTIFY_DIR
-PJSIP_EVSUB_PENDING_NOTIFY_INCLUDE
-PJSIP_EVSUB_PENDING_NOTIFY_LIB
 PBX_PJSIP_TLS_TRANSPORT_RESTART
 PJSIP_TLS_TRANSPORT_RESTART_DIR
 PJSIP_TLS_TRANSPORT_RESTART_INCLUDE
@@ -10198,9 +10194,6 @@ $as_echo "#define HAVE_PJPROJECT_ON_VALID_ICE_PAIR_CALLBACK 1" >>confdefs.h
 $as_echo "#define HAVE_PJSIP_TLS_TRANSPORT_RESTART 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJSIP_EVSUB_PENDING_NOTIFY 1" >>confdefs.h
-
-
 
 
 
@@ -12160,18 +12153,6 @@ PBX_PJSIP_TLS_TRANSPORT_RESTART=0
 
 
 
-
-PJSIP_EVSUB_PENDING_NOTIFY_DESCRIP="PJSIP NOTIFY Required on SUBSCRIBE"
-PJSIP_EVSUB_PENDING_NOTIFY_OPTION=pjsip
-PJSIP_EVSUB_PENDING_NOTIFY_DIR=${PJPROJECT_DIR}
-
-PBX_PJSIP_EVSUB_PENDING_NOTIFY=0
-
-
-
-
-
-
 fi
 
 
@@ -25902,20 +25883,6 @@ _ACEOF
 fi
 
 
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pending_notify in evsub.c" >&5
-                  $as_echo_n "checking for pending_notify in evsub... " >&6; }
-                pending_notify=$(${SED} -n -r -e '/^struct\s+pjsip_evsub/,/^\s+void\s+*mod_data/!d ; /pending_notify/p' $(find $PJSIP_EVSUB_PENDING_NOTIFY_DIR -name evsub.c))
-                if test -n "$pending_notify" ; then
-
-$as_echo "#define HAVE_PJSIP_EVSUB_PENDING_NOTIFY 1" >>confdefs.h
-
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-                         $as_echo "yes" >&6; }
-                else
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-                         $as_echo "no" >&6; }
-                fi
       fi
    fi
 

diff --git a/configure.ac b/configure.ac
index ab6632beac5afcc838fd671d2c1975c3668aeb7b..5d4187a552c97483b5aa653ef73a4d89a3c26686 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -588,7 +588,6 @@ AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_ENDPOINT_COMPACT_FORM], [PJSIP Compact Form Su
 AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE], [PJSIP Transport Connection Reuse Disabling], [PJPROJECT], [pjsip])
 AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_OAUTH_AUTHENTICATION], [PJSIP OAuth Authentication Support], [PJPROJECT], [pjsip])
 AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_TLS_TRANSPORT_RESTART], [PJSIP TLS Transport Restart Support], [PJPROJECT], [pjsip])
-AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_EVSUB_PENDING_NOTIFY], [PJSIP NOTIFY Required on SUBSCRIBE], [PJPROJECT], [pjsip])
 fi
 
 AST_EXT_LIB_SETUP([POPT], [popt], [popt])
@@ -2508,18 +2507,6 @@ if test "$USE_PJPROJECT" != "no" ; then
          AST_EXT_LIB_CHECK([PJSIP_AUTH_CLT_DEINIT], [pjsip], [pjsip_auth_clt_deinit], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
          AST_EXT_LIB_CHECK([PJSIP_TSX_LAYER_FIND_TSX2], [pjsip], [pjsip_tsx_layer_find_tsx2], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
          AST_EXT_LIB_CHECK([PJSIP_TLS_TRANSPORT_RESTART], [pjsip], [pjsip_tls_transport_restart], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pending_notify in evsub.c" >&5
-                  $as_echo_n "checking for pending_notify in evsub... " >&6; }
-                pending_notify=$(${SED} -n -r -e '/^struct\s+pjsip_evsub/,/^\s+void\s+*mod_data/!d ; /pending_notify/p' $(find $PJSIP_EVSUB_PENDING_NOTIFY_DIR -name evsub.c))
-                if test -n "$pending_notify" ; then
-                       AC_DEFINE(HAVE_PJSIP_EVSUB_PENDING_NOTIFY, 1, [Define to 1 if evsub requires a NOTIFY on SUBSCRIBE.])
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-                         $as_echo "yes" >&6; }
-                else
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-                         $as_echo "no" >&6; }
-                fi
       fi
    fi
 

diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index 224421440244759b69f0c595dd93e821a3983201..5eb2818c7e97e354c02974c7c683a9dc7f88d803 100644 (file)
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -623,9 +623,6 @@
 /* Define to 1 if PJPROJECT has the PJSIP EVSUB Group Lock support feature. */
 #undef HAVE_PJSIP_EVSUB_GRP_LOCK
 
-/* Define to 1 if evsub requires a NOTIFY on SUBSCRIBE. */
-#undef HAVE_PJSIP_EVSUB_PENDING_NOTIFY
-
 /* Define to 1 if PJPROJECT has the PJSIP External Resolver Support feature.
    */
 #undef HAVE_PJSIP_EXTERNAL_RESOLVER

diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c
index 6ddb2fd38b0448862f7d81d570103b16dcfb522d..9bab0d6423df596b5359b1ad1040a4e98e6f7641 100644 (file)
--- a/res/res_pjsip_pubsub.c
+++ b/res/res_pjsip_pubsub.c
@@ -3890,6 +3890,11 @@ static void clean_sub_tree(pjsip_evsub *evsub){
        ao2_ref(sub_tree, -1);
 }
 
+/* This functionality appeared in pjsip 2.13 */
+#if PJ_VERSION_NUM >= 0x020D0000
+# define HAVE_PJSIP_EVSUB_PENDING_NOTIFY 1
+#endif
+
 /*!
  * \brief PJSIP callback when underlying SIP subscription changes state
  *

diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4
index b16738c9ac738fe3b7497a42d87fb56aa4b18610..0995cfc9927c441a29348caf4576bcb48e215727 100644 (file)
--- a/third-party/pjproject/configure.m4
+++ b/third-party/pjproject/configure.m4
@@ -136,7 +136,6 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
                AC_DEFINE([HAVE_PJSIP_OAUTH_AUTHENTICATION], 1, [Define if your system has HAVE_PJSIP_OAUTH_AUTHENTICATION declared])
                AC_DEFINE([HAVE_PJPROJECT_ON_VALID_ICE_PAIR_CALLBACK], 1, [Define if your system has the on_valid_pair pjnath callback.])
                AC_DEFINE([HAVE_PJSIP_TLS_TRANSPORT_RESTART], 1, [Define if your system has pjsip_tls_transport_restart support.])
-               AC_DEFINE([HAVE_PJSIP_EVSUB_PENDING_NOTIFY], 1, [Define to 1 if evsub requires a NOTIFY on SUBSCRIBE.])
 
                AC_SUBST([PJPROJECT_BUNDLED])
                AC_SUBST([PJPROJECT_BUNDLED_OOT])