فهرست منبع

working on sctp support

mom040267 10 سال پیش
والد
کامیت
ade9f32943
3فایلهای تغییر یافته به همراه8 افزوده شده و 25 حذف شده
  1. 1 0
      ChangeLog
  2. 3 25
      configure
  3. 4 0
      src/ns_turn_defs.h

+ 1 - 0
ChangeLog

@@ -6,6 +6,7 @@ Version 4.4.5.2 'Ardee West':
 	version 14 of the draft;
 	- C++ compilation fixes;
 	- cosmetic fixes;
+	- support for older RedHat release 5.x added.
 
 3/31/2015 Oleg Moskalenko <[email protected]>
 Version 4.4.4.2 'Ardee West':

+ 3 - 25
configure

@@ -1169,33 +1169,11 @@ fi
 
 if [ -z "${TURN_NO_SCTP}" ] ; then
     if [ -z "${TURN_SCTP_INCLUDE}" ] ; then
-	if [ -f /usr/include/linux/sctp.h ] ; then
-	    TURN_SCTP_INCLUDE="-DTURN_SCTP_INCLUDE=\"\\\"/usr/include/linux/sctp.h\\\"\""
-	elif [ -f /usr/include/netinet/sctp.h ] ; then
-	    TURN_SCTP_INCLUDE="-DTURN_SCTP_INCLUDE=\"</usr/include/netinet/sctp.h>\""
-	else
-	    if ! [ "${PREFIX}" = "/usr" ] ; then
-		if ! [ "${PREFIX}" = "/usr/local" ] ; then
-		    TURN_SCTP_INCLUDE=`${FIND_CMD} ${PREFIX}/include/ -name sctp.h`
+		if [ -f /usr/include/netinet/sctp.h ] ; then
+	    	TURN_SCTP_INCLUDE="-DTURN_SCTP_INCLUDE=\"</usr/include/netinet/sctp.h>\""
 		fi
-	    fi
-	    if [ -z "${TURN_SCTP_INCLUDE}" ] ; then
-		TURN_SCTP_INCLUDE=`${FIND_CMD} /usr/local/include/ -name sctp.h`
-	    fi
-	    if [ -z "${TURN_SCTP_INCLUDE}" ] ; then
-		TURN_SCTP_INCLUDE=`${FIND_CMD} /usr/include/ -name sctp.h`
-	    fi
-	    if [ -z "${TURN_SCTP_INCLUDE}" ] ; then
-		TURN_NO_SCTP="-DTURN_NO_SCTP"
-	    else
-		for ip in ${TURN_SCTP_INCLUDE} ; do
-		    TURN_SCTP_INCLUDE="-DTURN_SCTP_INCLUDE=\"\\\"${ip}\\\"\""
-		    break
-		done
-	    fi
-	fi
     else
-	TURN_SCTP_INCLUDE="-DTURN_SCTP_INCLUDE=\"\\\"${TURN_SCTP_INCLUDE}\\\"\""
+		TURN_SCTP_INCLUDE="-DTURN_SCTP_INCLUDE=\"\\\"${TURN_SCTP_INCLUDE}\\\"\""
     fi
 else
     TURN_NO_SCTP="-DTURN_NO_SCTP"

+ 4 - 0
src/ns_turn_defs.h

@@ -218,6 +218,10 @@ typedef u32bits turn_time_t;
 
 ////////////////////////////////////////////////////////
 
+#if !defined(IPPROTO_SCTP)
+#define TURN_NO_SCTP
+#endif
+
 #define CLIENT_DGRAM_SOCKET_TYPE SOCK_DGRAM
 #define CLIENT_DGRAM_SOCKET_PROTOCOL IPPROTO_IP