Changeset 4723 for pjproject/trunk

Timestamp:

Jan 30, 2014 4:33:27 AM (11 years ago)

Author:

nanang

Message:

Close #1730: Added srtp_deinit()/shutdown() detection for external SRTP in configure script.

Location:

pjproject/trunk

Files:

• aconfigure (modified) (2 diffs)
• aconfigure.ac (modified) (1 diff)
• pjmedia/build/os-auto.mak.in (modified) (1 diff)
• pjmedia/src/pjmedia/transport_srtp.c (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -652 +652 @@
 ac_pjmedia_snd
 ac_pjmedia_resample
+ac_srtp_shutdown_present
+ac_srtp_deinit_present
 ac_external_srtp
 ac_external_gsm
@@ -5846 +5848 @@
 
 
+if test "x$ac_external_srtp" = "x1"; then
+        ac_srtp_deinit_present=0
+
+        ac_srtp_shutdown_present=0
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_deinit in -lsrtp" >&5
+$as_echo_n "checking for srtp_deinit in -lsrtp... " >&6; }
+if ${ac_cv_lib_srtp_srtp_deinit+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsrtp  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char srtp_deinit ();
+int
+main ()
+{
+return srtp_deinit ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_srtp_srtp_deinit=yes
+else
+  ac_cv_lib_srtp_srtp_deinit=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_deinit" >&5
+$as_echo "$ac_cv_lib_srtp_srtp_deinit" >&6; }
+if test "x$ac_cv_lib_srtp_srtp_deinit" = xyes; then :
+  ac_srtp_deinit_present=1
+fi
+
+        if test "x$ac_srtp_deinit_present" != "x1"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_shutdown in -lsrtp" >&5
+$as_echo_n "checking for srtp_shutdown in -lsrtp... " >&6; }
+if ${ac_cv_lib_srtp_srtp_shutdown+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsrtp  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char srtp_shutdown ();
+int
+main ()
+{
+return srtp_shutdown ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_srtp_srtp_shutdown=yes
+else
+  ac_cv_lib_srtp_srtp_shutdown=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_shutdown" >&5
+$as_echo "$ac_cv_lib_srtp_srtp_shutdown" >&6; }
+if test "x$ac_cv_lib_srtp_srtp_shutdown" = xyes; then :
+  ac_srtp_shutdown_present=1
+fi
+
+        fi
+fi
 
 ac_pjmedia_resample=libresample

pjproject/trunk/aconfigure.ac

@@ -549 +549 @@
     )
 
+dnl # For external SRTP, check availability of srtp_deinit() or srtp_shutdown()
+if test "x$ac_external_srtp" = "x1"; then
+        AC_SUBST(ac_srtp_deinit_present,0)
+        AC_SUBST(ac_srtp_shutdown_present,0)
+        AC_CHECK_LIB(srtp,srtp_deinit,[ac_srtp_deinit_present=1])
+        if test "x$ac_srtp_deinit_present" != "x1"; then
+                AC_CHECK_LIB(srtp,srtp_shutdown,[ac_srtp_shutdown_present=1])
+        fi
+fi
 
 dnl # Resample implementation

pjproject/trunk/pjmedia/build/os-auto.mak.in

@@ -135 +135 @@
 # External SRTP
 export CFLAGS += -DPJMEDIA_EXTERNAL_SRTP=1
+# SRTP srtp_deinit()/srtp_shutdown() API availability settings
+export CFLAGS += -DPJMEDIA_SRTP_HAS_DEINIT=@ac_srtp_deinit_present@ \
+                 -DPJMEDIA_SRTP_HAS_SHUTDOWN=@ac_srtp_shutdown_present@
 else
 # Our SRTP in third_party

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -324 +324 @@
     PJ_UNUSED_ARG(endpt);
 
+#if defined(PJMEDIA_EXTERNAL_SRTP) && (PJMEDIA_EXTERNAL_SRTP != 0)
+
+# if defined(PJMEDIA_SRTP_HAS_DEINIT) && PJMEDIA_SRTP_HAS_DEINIT!=0
     err = srtp_deinit();
+# elif defined(PJMEDIA_SRTP_HAS_SHUTDOWN) && PJMEDIA_SRTP_HAS_SHUTDOWN!=0
+    err = srtp_shutdown();
+# else
+    err = err_status_ok;
+# endif
+
+#else
+    err = srtp_deinit();
+#endif
     if (err != err_status_ok) {
         PJ_LOG(4, (THIS_FILE, "Failed to deinitialize libsrtp: %s",