From 48f4538a8da150b958873bafb4d92f2d9bf89ae0 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Mon, 19 May 2008 15:22:10 +0000 Subject: [PATCH] Make chan_h323 work with pwlib 1.12.0 (closes issue #12682) Reported by: bamby Patches: pwlib_nopipe.diff uploaded by bamby (license 430) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@117081 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/h323/ast_h323.cxx | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/channels/h323/ast_h323.cxx b/channels/h323/ast_h323.cxx index 83c1a8464f..32b674dec9 100644 --- a/channels/h323/ast_h323.cxx +++ b/channels/h323/ast_h323.cxx @@ -62,6 +62,12 @@ extern "C" { #include "cisco-h225.h" #include "caps_h323.h" +#include + +#if PWLIB_MAJOR * 10000 + PWLIB_MINOR * 100 + PWLIB_BUILD >= 1 * 10000 + 12 * 100 + 0 +#define SKIP_PWLIB_PIPE_BUG_WORKAROUND 1 +#endif + /* PWlib Required Components */ #define MAJOR_VERSION 1 #define MINOR_VERSION 0 @@ -81,7 +87,9 @@ static MyH323EndPoint *endPoint = NULL; /** PWLib entry point */ static MyProcess *localProcess = NULL; +#ifndef SKIP_PWLIB_PIPE_BUG_WORKAROUND static int _timerChangePipe[2]; +#endif static unsigned traceOptions = PTrace::Timestamp | PTrace::Thread | PTrace::FileAndLine; @@ -191,8 +199,10 @@ MyProcess::MyProcess(): PProcess("The NuFone Networks", MyProcess::~MyProcess() { +#ifndef SKIP_PWLIB_PIPE_BUG_WORKAROUND _timerChangePipe[0] = timerChangePipe[0]; _timerChangePipe[1] = timerChangePipe[1]; +#endif } void MyProcess::Main() @@ -2460,8 +2470,10 @@ void h323_end_process(void) if (localProcess) { delete localProcess; localProcess = NULL; +#ifndef SKIP_PWLIB_PIPE_BUG_WORKAROUND close(_timerChangePipe[0]); close(_timerChangePipe[1]); +#endif } if (logstream) { PTrace::SetLevel(0);