[asterisk-commits] res pjsip asterisk.c: Fix compile error if libsrtp is not in... (asterisk[master])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Sat Mar 18 05:36:34 CDT 2017


Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/5238 )

Change subject: res_pjsip_asterisk.c: Fix compile error if libsrtp is not installed.
......................................................................


res_pjsip_asterisk.c: Fix compile error if libsrtp is not installed.

struct ast_rtcp does not define the dtls member if SRTP is not enabled.

ASTERISK-26732

Change-Id: Id15ea212e04490e012f2cf4a56818b4dd948875e
---
M res/res_rtp_asterisk.c
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  George Joseph: Looks good to me, approved
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, but someone else must approve



diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index a67bc81..0a906dc 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -5040,7 +5040,9 @@
 					return;
 				}
 				rtp->rtcp->s = -1;
+#ifdef HAVE_OPENSSL_SRTP
 				rtp->rtcp->dtls.timeout_timer = -1;
+#endif
 				rtp->rtcp->schedid = -1;
 			}
 

-- 
To view, visit https://gerrit.asterisk.org/5238
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id15ea212e04490e012f2cf4a56818b4dd948875e
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>



More information about the asterisk-commits mailing list