Merge "configs/basic-pbx: Modified main IVR to play new Allison prompt."
authorJoshua Colp <jcolp@digium.com>
Sun, 10 May 2015 13:15:29 +0000 (08:15 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Sun, 10 May 2015 13:15:29 +0000 (08:15 -0500)
codecs/lpc10/lpcini.c
res/res_rtp_asterisk.c

index ebe229a..8efb640 100644 (file)
@@ -34,7 +34,8 @@ Some OSS fixes and a few lpc changes to make it actually work
        -lf2c -lm   (in that order)
 */
 
-#include <stdlib.h>
+#define WRAP_LIBC_MALLOC
+#include "asterisk.h"
 #include "f2c.h"
 
 #ifdef P_R_O_T_O_T_Y_P_E_S
index 62601dc..de75626 100644 (file)
@@ -1270,6 +1270,7 @@ static int ast_rtp_dtls_set_configuration(struct ast_rtp_instance *instance, con
        }
 
        if (!ast_rtp_engine_srtp_is_registered()) {
+               ast_log(LOG_ERROR, "SRTP support module is not loaded or available. Try loading res_srtp.so.\n");
                return -1;
        }