[Opalvoip-svn] SF.net SVN: opalvoip:[20725] ptlib/trunk
Brought to you by:
csoutheren,
rjongbloed
Menu
▾
▴
[Opalvoip-svn] SF.net SVN: opalvoip:[20725] ptlib/trunk
|
From: <ms3...@us...> - 2008-08-22 18:21:07
|
Revision: 20725
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20725&view=rev
Author: ms30002000
Date: 2008-08-22 18:21:16 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Adapted P_QOS option.
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
ptlib/trunk/include/ptbuildopts.h.in
ptlib/trunk/include/ptlib/ipsock.h
ptlib/trunk/include/ptlib/qos.h
ptlib/trunk/include/ptlib/udpsock.h
ptlib/trunk/src/ptlib/common/sockets.cxx
ptlib/trunk/src/ptlib/msos/winsock.cxx
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/configure 2008-08-22 18:21:16 UTC (rev 20725)
@@ -738,6 +738,7 @@
HAS_POP3SMTP
HAS_SOCKAGG
HAS_AUDIO
+HAS_QOS
HAS_VIDEO
HAS_VIDFILE
HAS_APPSHARE
@@ -1389,7 +1390,7 @@
--enable-pop3smtp enable POP3/SMTP support
--enable-sockagg enable socket aggregation
--enable-audio enable audio support
- --disable-qos disable QOS support
+ --enable-qos enable QOS support
--enable-video enable video device support
--enable-vidfile enable video file support
--enable-appshare enable application sharing support
@@ -6640,7 +6641,7 @@
default_alsa=yes
default_oss=yes
default_ipv6=yes
-default_qos=yes
+HAS_QOS=1
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
@@ -6681,7 +6682,7 @@
default_alsa=yes
default_oss=yes
default_ipv6=yes
- default_qos=yes
+ HAS_QOS=1
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
@@ -6721,7 +6722,7 @@
default_alsa=yes
default_oss=no
default_ipv6=no
- default_qos=no
+ HAS_QOS=
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
@@ -12274,26 +12275,59 @@
-# Check whether --enable-qos was given.
+
+ { echo "$as_me:$LINENO: checking enable QOS support" >&5
+echo $ECHO_N "checking enable QOS support... $ECHO_C" >&6; }
+ # Check whether --enable-qos was given.
if test "${enable_qos+set}" = set; then
enableval=$enable_qos;
+ if test "x$enableval" = "xyes"; then
+ HAS_QOS=1
+ else
+ HAS_QOS=
+ fi
+
fi
-if test "${enable_qos}z" = "z" ; then
- enable_qos=$default_qos
-fi
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: qos support disabled due to disabled dependency " >&5
+echo "$as_me: qos support disabled due to disabled dependency " >&6;}
+ HAS_QOS=
+ fi
+ fi
-if test "$enable_qos" != "no" ; then
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: qos support disabled due to disabled dependency " >&5
+echo "$as_me: qos support disabled due to disabled dependency " >&6;}
+ HAS_QOS=
+ fi
+ fi
+
+ if test "x${HAS_QOS}" = "x1"; then
+
cat >>confdefs.h <<\_ACEOF
-#define P_HAS_QOS 1
+#define P_QOS 1
_ACEOF
-fi
+ HAS_QOS=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_QOS=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
{ echo "$as_me:$LINENO: checking enable video device support" >&5
echo $ECHO_N "checking enable video device support... $ECHO_C" >&6; }
# Check whether --enable-video was given.
@@ -15541,6 +15575,7 @@
HAS_POP3SMTP!$HAS_POP3SMTP$ac_delim
HAS_SOCKAGG!$HAS_SOCKAGG$ac_delim
HAS_AUDIO!$HAS_AUDIO$ac_delim
+HAS_QOS!$HAS_QOS$ac_delim
HAS_VIDEO!$HAS_VIDEO$ac_delim
HAS_VIDFILE!$HAS_VIDFILE$ac_delim
HAS_APPSHARE!$HAS_APPSHARE$ac_delim
@@ -15561,7 +15596,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 47; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/configure.ac 2008-08-22 18:21:16 UTC (rev 20725)
@@ -520,7 +520,7 @@
default_alsa=yes
default_oss=yes
default_ipv6=yes
-default_qos=yes
+HAS_QOS=1
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
@@ -561,7 +561,7 @@
default_alsa=yes
default_oss=yes
default_ipv6=yes
- default_qos=yes
+ HAS_QOS=1
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
@@ -601,7 +601,7 @@
default_alsa=yes
default_oss=no
default_ipv6=no
- default_qos=no
+ HAS_QOS=
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
@@ -1488,7 +1488,7 @@
dnl look for QoS functions
dnl MSWIN_DISPLAY qos,QoS Support
-dnl MSWIN_CHECK_FILE qos,qossp.h|QOS_DESTADDR,P_HAS_QOS=1
+dnl MSWIN_CHECK_FILE qos,qossp.h|QOS_DESTADDR,P_QOS=1
dnl MSWIN_DIR_SYMBOL qos,QOS_DIR
dnl MSWIN_CHECK_DIR qos,\Program Files\Microsoft Visual Studio 8\VC\PlatformSDK\Include\
dnl MSWIN_CHECK_DIR qos,\Program Files\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK\Include\
@@ -1496,17 +1496,8 @@
dnl MSWIN_CHECK_DIR qos,\Program Files\Microsoft SDK\include\
dnl MSWIN_CHECK_DIR qos,\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include\
-AC_ARG_ENABLE(qos,
- [ --disable-qos disable QOS support])
+PTLIB_SIMPLE_OPTION([qos], [QOS], [enable QOS support])
-if test "${enable_qos}z" = "z" ; then
- enable_qos=$default_qos
-fi
-
-if test "$enable_qos" != "no" ; then
- AC_DEFINE([P_HAS_QOS], [1], [Have QOS])
-fi
-
dnl ########################################################################
dnl check for video support
dnl MSWIN_DISPLAY video,Video Support
Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/include/ptbuildopts.h.in 2008-08-22 18:21:16 UTC (rev 20725)
@@ -96,10 +96,10 @@
//
#ifndef _WIN32_WCE
-#undef P_HAS_QOS
+#undef P_QOS
#endif // _WIN32_WCE
-#if defined(_MSC_VER) && P_HAS_QOS
+#if defined(_MSC_VER) && P_QOS
#pragma include_alias(<qossp.h>, <@QOS_DIR@/qossp.h>)
Modified: ptlib/trunk/include/ptlib/ipsock.h
===================================================================
--- ptlib/trunk/include/ptlib/ipsock.h 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/include/ptlib/ipsock.h 2008-08-22 18:21:16 UTC (rev 20725)
@@ -40,13 +40,13 @@
#include <ptlib/socket.h>
-#ifdef P_HAS_QOS
+#if P_QOS
#ifdef _WIN32
#ifdef P_KNOCKOUT_WINSOCK2
#include "IPExport.h"
#endif // KNOCKOUT_WINSOCK2
#endif // _WIN32
-#endif // P_HAS_QOS
+#endif // P_QOS
/** This class describes a type of socket that will communicate using the
Internet Protocol.
Modified: ptlib/trunk/include/ptlib/qos.h
===================================================================
--- ptlib/trunk/include/ptlib/qos.h 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/include/ptlib/qos.h 2008-08-22 18:21:16 UTC (rev 20725)
@@ -29,7 +29,7 @@
#pragma interface
#endif
-#if P_HAS_QOS
+#if P_QOS
#ifdef _WIN32
#ifndef P_KNOCKOUT_WINSOCK2
#include <winsock2.h>
@@ -40,7 +40,7 @@
#endif // KNOCKOUT_QOS
#endif // KNOCKOUT_WINSOCK2
#endif // _WIN32
-#endif // P_HAS_QOS
+#endif // P_QOS
#ifndef QOS_NOT_SPECIFIED
#define QOS_NOT_SPECIFIED 0xFFFFFFFF
Modified: ptlib/trunk/include/ptlib/udpsock.h
===================================================================
--- ptlib/trunk/include/ptlib/udpsock.h 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/include/ptlib/udpsock.h 2008-08-22 18:21:16 UTC (rev 20725)
@@ -121,7 +121,7 @@
PQoS * qos ///< QoS specification to use
);
-#if P_HAS_QOS
+#if P_QOS
/** Get the QOS object for the socket.
*/
virtual PQoS & GetQoSSpec();
@@ -177,7 +177,7 @@
#endif
};
-#if P_HAS_QOS
+#if P_QOS
#ifdef _WIN32
#include <winbase.h>
@@ -201,7 +201,7 @@
#endif // _WIN32_WCE
#endif // _WIN32
-#endif // P_HAS_QOS
+#endif // P_QOS
#endif
Modified: ptlib/trunk/src/ptlib/common/sockets.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/sockets.cxx 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/src/ptlib/common/sockets.cxx 2008-08-22 18:21:16 UTC (rev 20725)
@@ -48,7 +48,7 @@
#include <ConfigurationClass.h>
#endif
-#if P_HAS_QOS
+#if P_QOS
#ifdef _WIN32
#include <winbase.h>
@@ -64,7 +64,7 @@
#endif // _WIN32_WCE
#endif // _WIN32
-#endif // P_HAS_QOS
+#endif // P_QOS
#if P_HAS_IPV6
@@ -2415,12 +2415,12 @@
return PTrue;
}
-#if P_HAS_QOS
+#if P_QOS
PQoS & PUDPSocket::GetQoSSpec()
{
return qosSpec;
}
-#endif
+#endif //P_QOS
PBoolean PUDPSocket::ApplyQoS()
{
@@ -2452,7 +2452,7 @@
DSCPval = (char)qosSpec.GetDSCP();
#ifdef _WIN32
-#if P_HAS_QOS
+#if P_QOS
if (disableGQoS)
return PFalse;
@@ -2501,7 +2501,7 @@
if (!usesetsockopt)
return retval;
-#endif // P_HAS_QOS
+#endif // P_QOS
#endif // _WIN32
unsigned int setDSCP = DSCPval<<2;
@@ -2536,7 +2536,7 @@
return ConvertOSError(os_handle = os_socket(af, type, proto));
#endif
-#if defined(_WIN32) && defined(P_HAS_QOS)
+#if defined(_WIN32) && defined(P_QOS)
DWORD bufferSize = 0;
DWORD numProtocols, i;
@@ -2603,7 +2603,7 @@
#ifdef _WIN32
#ifndef _WIN32_WCE
-#ifdef P_HAS_QOS
+#if P_QOS
#define COULD_HAVE_QOS
@@ -2622,9 +2622,9 @@
return PFalse;
}
-#endif
-#endif
-#endif
+#endif // P_QOS
+#endif // _WIN32_WCE
+#endif // _WIN32
PBoolean PUDPSocket::OpenSocket()
{
Modified: ptlib/trunk/src/ptlib/msos/winsock.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/winsock.cxx 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/src/ptlib/msos/winsock.cxx 2008-08-22 18:21:16 UTC (rev 20725)
@@ -602,7 +602,7 @@
disableGQoS = PFalse;
}
-#if P_HAS_QOS
+#if P_QOS
PBoolean PUDPSocket::SupportQoS(const PIPSocket::Address & address)
{
if (disableGQoS)
@@ -643,10 +643,10 @@
{
return PFalse;
}
-#endif // P_HAS_QOS
+#endif // P_QOS
-#if P_HAS_QOS
+#if P_QOS
#ifndef _WIN32_WCE
@@ -699,7 +699,7 @@
#endif // _WIN32_WCE
-#endif // P_HAS_QOS
+#endif // P_QOS
#ifndef _WIN32_WCE
//////////////////////////////////////////////////////////////////////////////
@@ -866,7 +866,7 @@
}
-#ifdef P_HAS_QOS
+#ifdef P_QOS
PBoolean PIPXSocket::GetHostAddress(const PString & /*hostname*/, Address & /*addr*/)
{
return PFalse;
@@ -898,7 +898,7 @@
AssignAddress(addr, *(sockaddr_ipx *)addr_info[0].RemoteAddr.lpSockaddr);
return PTrue;
}
-#endif
+#endif // P_QOS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|