diff options
Diffstat (limited to 'net/b2bua')
-rw-r--r-- | net/b2bua/Makefile | 47 | ||||
-rw-r--r-- | net/b2bua/distinfo | 2 | ||||
-rw-r--r-- | net/b2bua/files/patch-build::Makefile.pkg | 16 | ||||
-rw-r--r-- | net/b2bua/files/patch-build::Makefile.pre | 14 | ||||
-rw-r--r-- | net/b2bua/files/patch-contrib::Makefile | 14 | ||||
-rw-r--r-- | net/b2bua/files/patch-contrib::Makefile.pkg | 18 | ||||
-rw-r--r-- | net/b2bua/files/patch-contrib::libcext_lgpl::Makefile | 14 | ||||
-rw-r--r-- | net/b2bua/files/patch-contrib::libcext_lgpl::netdb_r.h | 21 | ||||
-rw-r--r-- | net/b2bua/files/patch-gcc34 | 516 | ||||
-rw-r--r-- | net/b2bua/files/patch-sip::b2b::AuthAgent.cxx | 107 | ||||
-rw-r--r-- | net/b2bua/files/patch-sip::b2b::B2bDef.hxx | 15 | ||||
-rw-r--r-- | net/b2bua/files/patch-util::threads::VSemaphore.hxx | 14 | ||||
-rw-r--r-- | net/b2bua/files/patch-util::transport::UdpStack.cxx | 13 | ||||
-rw-r--r-- | net/b2bua/pkg-descr | 9 | ||||
-rw-r--r-- | net/b2bua/pkg-plist | 7 |
15 files changed, 0 insertions, 827 deletions
diff --git a/net/b2bua/Makefile b/net/b2bua/Makefile deleted file mode 100644 index 66d575f5e2d7..000000000000 --- a/net/b2bua/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# New ports collection makefile for: b2bua -# Date created: 6 December 2002 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= b2bua -PORTVERSION= 1.5.0 -PORTREVISION= 2 -CATEGORIES= net -MASTER_SITES= http://www.vovida.org/downloads/sip/${PORTVERSION}/ -DISTNAME= sip-${PORTVERSION} - -MAINTAINER= sobomax@FreeBSD.org -COMMENT= A back-to-back (B2B) SIP user agent - -LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 - -BROKEN= Does not compile with GCC 4.2 -DEPRECATED= does not compile on FreeBSD 7.x or newer -EXPIRATION_DATE=2011-04-17 - -USE_GMAKE= yes -ALL_TARGET= b2bua -CFLAGS+= -Wno-deprecated -MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" \ - PTHREAD_LIBNAME="${PTHREAD_LIBNAME}" \ - VOCAL_USE_SYSTEM_LIBXML=true - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sip/b2b/bin.nodebug.FreeBSD.${MACHINE_ARCH}/b2bua \ - ${PREFIX}/bin - ${MKDIR} ${DOCSDIR} -.for file in LICENSE HOWTO HOWTO.PROV b2bdesign.pdf - ${INSTALL_DATA} ${WRKSRC}/sip/b2b/${file} ${DOCSDIR} -.endfor - ${INSTALL_DATA} ${WRKSRC}/sip/b2b/b2bConfig.xml \ - ${PREFIX}/etc/b2bConfig.xml.sample - -.include <bsd.port.post.mk> diff --git a/net/b2bua/distinfo b/net/b2bua/distinfo deleted file mode 100644 index b0bec24c840e..000000000000 --- a/net/b2bua/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (sip-1.5.0.tar.gz) = 5f6f17ec659f6cd055f09f88a98dbd4458b34a9c9e259e8f8321bd5708781f67 -SIZE (sip-1.5.0.tar.gz) = 6709076 diff --git a/net/b2bua/files/patch-build::Makefile.pkg b/net/b2bua/files/patch-build::Makefile.pkg deleted file mode 100644 index 2c5a9cf54dba..000000000000 --- a/net/b2bua/files/patch-build::Makefile.pkg +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- build/Makefile.pkg.orig Thu Apr 3 00:35:44 2003 -+++ build/Makefile.pkg Fri Apr 4 13:06:17 2003 -@@ -585,8 +585,8 @@ - ifneq ($(OSTYPE),FreeBSD) - PTHREAD_LIBNAME := pthread - else --PTHREAD_LDFLAGS := -pthread --PTHREAD_LIBNAME := c_r -+PTHREAD_LDFLAGS ?= -pthread -+PTHREAD_LIBNAME ?= c_r - endif - - ifeq ($(OSTYPE),IRIX64) diff --git a/net/b2bua/files/patch-build::Makefile.pre b/net/b2bua/files/patch-build::Makefile.pre deleted file mode 100644 index d4144759c4fc..000000000000 --- a/net/b2bua/files/patch-build::Makefile.pre +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- build/Makefile.pre.orig Thu Apr 3 00:35:44 2003 -+++ build/Makefile.pre Fri Apr 4 13:06:17 2003 -@@ -83,7 +83,7 @@ - # please see Makefile.tools for more information. - - VOCAL_TOOLCHAIN_TYPE := gnu --VOCAL_COMPILE_TYPE := debug -+VOCAL_COMPILE_TYPE := nodebug - - - ###################################################################### diff --git a/net/b2bua/files/patch-contrib::Makefile b/net/b2bua/files/patch-contrib::Makefile deleted file mode 100644 index 9331b960ecd4..000000000000 --- a/net/b2bua/files/patch-contrib::Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- contrib/Makefile.orig Thu Feb 20 06:22:29 2003 -+++ contrib/Makefile Fri Apr 4 13:06:17 2003 -@@ -26,7 +26,7 @@ - - INSTALL = install - --CODE_DEPENDS = libxml -+CODE_DEPENDS = - - ifeq ($(OSTYPE),FreeBSD) - CODE_DEPENDS += libcext_bsd libcext_lgpl diff --git a/net/b2bua/files/patch-contrib::Makefile.pkg b/net/b2bua/files/patch-contrib::Makefile.pkg deleted file mode 100644 index b4b9e3f062c7..000000000000 --- a/net/b2bua/files/patch-contrib::Makefile.pkg +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- contrib/Makefile.pkg.orig Sat Feb 1 02:15:57 2003 -+++ contrib/Makefile.pkg Fri Apr 4 13:06:17 2003 -@@ -49,9 +49,9 @@ - # libxml - - ifeq ($(VOCAL_USE_SYSTEM_LIBXML),true) -- LIBXML_INCLUDEDIRS := /usr/local/include/libxml2 /usr/local/include/libxml2/libxml /usr/local/include -- LIBXML_LIBDIRS := /usr/local/lib -- LIBXML_LDLIBS_LAST := -lxml -+ LIBXML_INCLUDEDIRS := ${LOCALBASE}/include/libxml2 ${LOCALBASE}/include/libxml2/libxml ${LOCALBASE}/include -+ LIBXML_LIBDIRS := ${LOCALBASE}/lib -+ LIBXML_LDLIBS_LAST := -lxml2 - else - LIBXML_INCLUDEDIRS := $(ROOT)/contrib/libxml2.$(OS_ARCH) $(ROOT)/contrib/libxml2.$(OS_ARCH)/include/libxml $(ROOT)/contrib/libxml2.$(OS_ARCH)/include - LIBXML_LIBDIRS := $(ROOT)/contrib/libxml2.$(OS_ARCH)/.libs diff --git a/net/b2bua/files/patch-contrib::libcext_lgpl::Makefile b/net/b2bua/files/patch-contrib::libcext_lgpl::Makefile deleted file mode 100644 index 973cb2e98e90..000000000000 --- a/net/b2bua/files/patch-contrib::libcext_lgpl::Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- contrib/libcext_lgpl/Makefile -+++ contrib/libcext_lgpl/Makefile -@@ -19,7 +19,7 @@ - - # FreeBSD - AR=ar r --OBJS = gethostby_r.o getnetby_r.o getprotoby_r.o getpw_r.o getservby_r.o -+OBJS = getpw_r.o - endif - - libcext_lgpl.a: $(OBJS) diff --git a/net/b2bua/files/patch-contrib::libcext_lgpl::netdb_r.h b/net/b2bua/files/patch-contrib::libcext_lgpl::netdb_r.h deleted file mode 100644 index 96c215960a96..000000000000 --- a/net/b2bua/files/patch-contrib::libcext_lgpl::netdb_r.h +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- contrib/libcext_lgpl/netdb_r.h -+++ contrib/libcext_lgpl/netdb_r.h -@@ -2,6 +2,7 @@ - extern "C" { - #endif - -+#if !defined(__FreeBSD__) - struct hostent * - gethostbyaddr_r (const char *addr, int length, int type, - struct hostent *result, char *buffer, int buflen, -@@ -15,6 +16,7 @@ - struct hostent * - gethostent_r (struct hostent *result, char *buffer, int buflen, - int *h_errnop); -+#endif - - #ifdef __cplusplus - } diff --git a/net/b2bua/files/patch-gcc34 b/net/b2bua/files/patch-gcc34 deleted file mode 100644 index dcbb50bde04a..000000000000 --- a/net/b2bua/files/patch-gcc34 +++ /dev/null @@ -1,516 +0,0 @@ ---- util/Timer.h 2004/08/22 17:39:10 1.1 -+++ util/Timer.h 2004/08/22 17:39:44 -@@ -68,6 +68,7 @@ - - #include "global.h" - #include <list> -+#include <iostream> - - bool operator < ( const timeval& lhs, const timeval& rhs); - void addMs ( timeval* lhs, int timeMs); ---- util/mstring.hxx 2004/08/22 17:40:25 1.1 -+++ util/mstring.hxx 2004/08/22 17:45:07 -@@ -206,6 +206,7 @@ - ///Compare two strings ignoring case. The function is provided just for convinience and uniformity - int comparei(const string &str, size_type len = npos) const; - -+#if 0 - ///Compare two strings. The function is provided just for convinience and uniformity - friend int compare(const mstring &str1, const mstring &str2, size_type len = npos) - { -@@ -217,6 +218,7 @@ - { - return str1.comparei(str2, len); - } -+#endif - - ///Insert pair-symb into the string - mstring & ins_pair(const string &chrset, char pair_symb); ---- util/Fifo.cc 2004/08/22 17:47:54 1.1 -+++ util/Fifo.cc 2004/08/22 17:49:21 -@@ -87,7 +87,7 @@ - // This will unlock the object's mutex, wait for a condition's signal, - // and relock. - // -- int error = myCondition.wait(&myMutex, relativeTimeout); -+ int error = myCondition.wait(&this->myMutex, relativeTimeout); - - if ( error != 0 ) - { -@@ -107,5 +107,5 @@ - } - } - -- return ( myFifoSize ); -+ return ( this->myFifoSize ); - } ---- util/PollFifo.cc 2004/08/22 17:50:02 1.1 -+++ util/PollFifo.cc 2004/08/22 17:50:54 -@@ -140,7 +140,7 @@ - // The mutex is locked coming into this method. Unlock it while we - // block so others can use the Fifo. - // -- myMutex.unlock(); -+ this->myMutex.unlock(); - - // Block, waiting for io activity. This may throw a transport - // exception. If so, let it pass through. -@@ -151,7 +151,7 @@ - - // Lock the Fifo back up. - // -- myMutex.lock(); -+ this->myMutex.lock(); - - VDEBUG(log) << fn << ": poll returned. fds active = " << numberFdsActive - << VDEBUG_END(log); ---- sip/sipstack/BaseUrl.hxx 2004/08/22 17:58:41 1.1 -+++ sip/sipstack/BaseUrl.hxx 2004/08/22 18:02:58 -@@ -143,7 +143,7 @@ - namespace std - #endif - { -- struct hash< Sptr < Vocal::BaseUrl > > -+ template <> struct hash< Sptr < Vocal::BaseUrl > > - { - size_t operator() ( const Sptr < Vocal::BaseUrl >& src ) const - { ---- sip/sipstack/SipAcceptEncoding.cxx 2004/08/22 18:07:01 1.1 -+++ sip/sipstack/SipAcceptEncoding.cxx 2004/08/22 18:08:13 -@@ -103,7 +103,7 @@ - - scanAcceptEncoding(vdata); - } -- catch (SipAcceptEncodingParserException exception) -+ catch (SipAcceptEncodingParserException&) - { - - if (SipParserMode::sipParserMode()) ---- sip/sipstack/SipAllow.cxx 2004/08/22 18:10:09 1.1 -+++ sip/sipstack/SipAllow.cxx 2004/08/22 18:10:22 -@@ -109,7 +109,7 @@ - - scanSipAllow(vdata); - } -- catch (SipAllowParserException exception) -+ catch (SipAllowParserException&) - { - - if (SipParserMode::sipParserMode()) ---- sip/sipstack/SipAcceptLanguage.cxx 2004/08/22 18:09:08 1.1 -+++ sip/sipstack/SipAcceptLanguage.cxx 2004/08/22 18:09:20 -@@ -99,7 +99,7 @@ - - scanAcceptLanguage(vdata); - } -- catch (SipAcceptLanguageParserException exception) -+ catch (SipAcceptLanguageParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipAlso.cxx 2004/08/22 18:11:02 1.1 -+++ sip/sipstack/SipAlso.cxx 2004/08/22 18:11:24 -@@ -257,7 +257,7 @@ - - scanSipAlso(data); - } -- catch (SipAlsoParserException exception) -+ catch (SipAlsoParserException&) - { - if (SipParserMode::sipParserMode()) - { -@@ -283,7 +283,7 @@ - { - parse(alsostr); - } -- catch (SipAlsoParserException exception) -+ catch (SipAlsoParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipAuthorization.cxx 2004/08/22 18:12:06 1.1 -+++ sip/sipstack/SipAuthorization.cxx 2004/08/22 18:13:29 -@@ -135,7 +135,7 @@ - { - scanSipAuthorization(nData); - } -- catch (SipAuthorizationParserException exception) -+ catch (SipAuthorizationParserException& exception) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipCSeq.cxx 2004/08/22 18:14:16 1.1 -+++ sip/sipstack/SipCSeq.cxx 2004/08/22 18:14:37 -@@ -173,7 +173,7 @@ - { - parse(cseqstr); - } -- catch (SipCSeqParserException exception) -+ catch (SipCSeqParserException&) - { - - if (SipParserMode::sipParserMode()) -@@ -237,7 +237,7 @@ - { - scanSipCSeq(data); - } -- catch (SipCSeqParserException exception) -+ catch (SipCSeqParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipCallId.cxx 2004/08/22 18:16:07 1.1 -+++ sip/sipstack/SipCallId.cxx 2004/08/22 18:16:25 -@@ -163,7 +163,7 @@ - - scanSipCallId(data); - } -- catch (SipCallIdParserException exception) -+ catch (SipCallIdParserException&) - { - if (SipParserMode::sipParserMode()) - { -@@ -189,7 +189,7 @@ - { - parse(callidstr); - } -- catch (SipCallIdParserException exception) -+ catch (SipCallIdParserException&) - { - - if (SipParserMode::sipParserMode()) ---- sip/sipstack/SipContact.cxx 2004/08/22 18:17:25 1.1 -+++ sip/sipstack/SipContact.cxx 2004/08/22 18:17:39 -@@ -138,7 +138,7 @@ - { - parse(contactstr); - } -- catch (SipContactParserException exception) -+ catch (SipContactParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipContentLength.cxx 2004/08/22 18:21:48 1.1 -+++ sip/sipstack/SipContentLength.cxx 2004/08/22 18:22:00 -@@ -113,7 +113,7 @@ - { - parse(clstr); - } -- catch (SipContentLengthParserException exception) -+ catch (SipContentLengthParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipContentDisposition.cxx 2004/08/22 18:18:37 1.1 -+++ sip/sipstack/SipContentDisposition.cxx 2004/08/22 18:18:53 -@@ -115,7 +115,7 @@ - - scanSipContentDisposition(nData); - } -- catch (SipContentDispositionParserException exception) -+ catch (SipContentDispositionParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipContentEncoding.cxx 2004/08/22 18:19:32 1.1 -+++ sip/sipstack/SipContentEncoding.cxx 2004/08/22 18:19:46 -@@ -112,7 +112,7 @@ - { - scanSipContentEncoding(nData); - } -- catch (SipContentEncodingParserException exception) -+ catch (SipContentEncodingParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipContentLanguage.cxx 2004/08/22 18:20:43 1.1 -+++ sip/sipstack/SipContentLanguage.cxx 2004/08/22 18:20:57 -@@ -123,7 +123,7 @@ - - scanSipContentLanguage(nData); - } -- catch (SipContentLanguageParserException exception) -+ catch (SipContentLanguageParserException& exception) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipDate.cxx 2004/08/22 18:22:49 1.1 -+++ sip/sipstack/SipDate.cxx 2004/08/22 18:23:03 -@@ -110,7 +110,7 @@ - - scanSipDate(nData); - } -- catch (SipDateParserException exception) -+ catch (SipDateParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipDiversion.cxx 2004/08/22 18:23:50 1.1 -+++ sip/sipstack/SipDiversion.cxx 2004/08/22 18:24:07 -@@ -262,7 +262,7 @@ - { - parse(rdata); - } -- catch (SipDiversionParserException exception) -+ catch (SipDiversionParserException&) - { - if (SipParserMode::sipParserMode()) - { -@@ -394,7 +394,7 @@ - - scanSipDiversion(data); - } -- catch (SipDiversionParserException exception) -+ catch (SipDiversionParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipEncryption.cxx 2004/08/22 18:24:48 1.1 -+++ sip/sipstack/SipEncryption.cxx 2004/08/22 18:24:59 -@@ -97,7 +97,7 @@ - { - scanEncryption(data1); - } -- catch (SipEncryptionParserException exception) -+ catch (SipEncryptionParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipExpires.cxx 2004/08/22 18:25:40 1.1 -+++ sip/sipstack/SipExpires.cxx 2004/08/22 18:26:02 -@@ -105,7 +105,7 @@ - - scanSipExpires(nData); - } -- catch (SipExpiresParserException exception) -+ catch (SipExpiresParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipHide.cxx 2004/08/22 18:27:00 1.1 -+++ sip/sipstack/SipHide.cxx 2004/08/22 18:27:15 -@@ -116,7 +116,7 @@ - - scanHide(data1); - } -- catch (SipHideParserException exception) -+ catch (SipHideParserException& exception) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipInReplyTo.cxx 2004/08/22 18:27:59 1.1 -+++ sip/sipstack/SipInReplyTo.cxx 2004/08/22 18:28:26 -@@ -123,7 +123,7 @@ - - scanSipInReplyTo(nData); - } -- catch (SipInReplyToParserException exception) -+ catch (SipInReplyToParserException& exception) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipMaxForwards.cxx 2004/08/22 18:29:14 1.1 -+++ sip/sipstack/SipMaxForwards.cxx 2004/08/22 18:29:33 -@@ -118,7 +118,7 @@ - - scanSipMaxForwards(nData); - } -- catch (SipMaxForwardsParserException exception) -+ catch (SipMaxForwardsParserException& exception) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipMimeVersion.cxx 2004/08/22 18:30:23 1.1 -+++ sip/sipstack/SipMimeVersion.cxx 2004/08/22 18:30:39 -@@ -113,7 +113,7 @@ - - scanSipMimeVersion(nData); - } -- catch (SipMimeVersionParserException exception) -+ catch (SipMimeVersionParserException& exception) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipMinSE.cxx 2004/08/22 18:31:20 1.1 -+++ sip/sipstack/SipMinSE.cxx 2004/08/22 18:31:35 -@@ -101,7 +101,7 @@ - { - scanSipMinSE(nData); - } -- catch (SipMinSEParserException exception) -+ catch (SipMinSEParserException&) - { - parseError("Failed to Decode SipMinSE in decode() " ); - } ---- sip/sipstack/SipOrganization.cxx 2004/08/22 18:32:44 1.1 -+++ sip/sipstack/SipOrganization.cxx 2004/08/22 18:33:01 -@@ -123,7 +123,7 @@ - { - scanSipOrganization(nData); - } -- catch (SipOrganizationParserException exception) -+ catch (SipOrganizationParserException& exception) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipPriority.cxx 2004/08/22 18:33:59 1.1 -+++ sip/sipstack/SipPriority.cxx 2004/08/22 18:34:15 -@@ -136,7 +136,7 @@ - { - scanPriority(data1); - } -- catch (SipPriorityParserException exception) -+ catch (SipPriorityParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipRecordRoute.cxx 2004/08/22 18:38:29 1.1 -+++ sip/sipstack/SipRecordRoute.cxx 2004/08/22 18:38:44 -@@ -115,7 +115,7 @@ - { - parse(rrstr); - } -- catch (SipRecordRouteParserException exception) -+ catch (SipRecordRouteParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipProxyAuthenticate.cxx 2004/08/22 18:35:29 1.1 -+++ sip/sipstack/SipProxyAuthenticate.cxx 2004/08/22 18:35:52 -@@ -135,7 +135,7 @@ - { - scanSipProxyauthorization(nData); - } -- catch (SipProxyAuthenticateParserException exception) -+ catch (SipProxyAuthenticateParserException& exception) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipProxyAuthorization.cxx 2004/08/22 18:37:23 1.1 -+++ sip/sipstack/SipProxyAuthorization.cxx 2004/08/22 18:37:37 -@@ -136,7 +136,7 @@ - { - scanSipProxyauthorization(nData); - } -- catch (SipProxyAuthorizationParserException exception) -+ catch (SipProxyAuthorizationParserException& exception) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipReferredBy.cxx 2004/08/22 18:39:40 1.1 -+++ sip/sipstack/SipReferredBy.cxx 2004/08/22 18:40:00 -@@ -325,7 +325,7 @@ - } - - } -- catch (SipReferredByParserException exception) -+ catch (SipReferredByParserException&) - { - if (SipParserMode::sipParserMode()) - { -@@ -414,7 +414,7 @@ - // AmyS - 05/16/02. Parse w/o Referred-By in the str. - parse(alsostr); - } -- catch (SipReferredByParserException exception) -+ catch (SipReferredByParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipReplaces.cxx 2004/08/22 18:42:21 1.1 -+++ sip/sipstack/SipReplaces.cxx 2004/08/22 18:42:34 -@@ -148,7 +148,7 @@ - pdata += data; - parse(pdata); - } -- catch (SipReplacesParserException exception) -+ catch (SipReplacesParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipRequestLine.cxx 2004/08/22 18:43:23 1.1 -+++ sip/sipstack/SipRequestLine.cxx 2004/08/22 18:43:40 -@@ -146,7 +146,7 @@ - { - scanSipRequestLine(nData); - } -- catch (SipRequestLineParserException exception) -+ catch (SipRequestLineParserException&) - { - cpLog(LOG_ERR, "Failed to Decode in Constructor of Requestline :( "); - throw SipRequestLineParserException( ---- sip/sipstack/SipRequire.cxx 2004/08/22 18:44:25 1.1 -+++ sip/sipstack/SipRequire.cxx 2004/08/22 18:44:38 -@@ -121,7 +121,7 @@ - - scanSipRequire(nData); - } -- catch (SipRequireParserException exception) -+ catch (SipRequireParserException& exception) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipSessionExpires.cxx 2004/08/22 18:46:01 1.1 -+++ sip/sipstack/SipSessionExpires.cxx 2004/08/22 18:46:13 -@@ -105,7 +105,7 @@ - { - scanSipSessionExpires(nData); - } -- catch (SipSessionExpiresParserException exception) -+ catch (SipSessionExpiresParserException&) - { - parseError("Failed to Decode SipSessionExpires in decode() " ); - } ---- sip/sipstack/SipStatusLine.cxx 2004/08/22 18:47:02 1.1 -+++ sip/sipstack/SipStatusLine.cxx 2004/08/22 18:47:23 -@@ -166,7 +166,7 @@ - - scanSipStatusLine(nData); - } -- catch (SipStatusLineParserException exception) -+ catch (SipStatusLineParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipSupported.cxx 2004/08/22 18:48:10 1.1 -+++ sip/sipstack/SipSupported.cxx 2004/08/22 18:48:21 -@@ -117,7 +117,7 @@ - - scanSipSupported(nData); - } -- catch (SipSupportedParserException exception) -+ catch (SipSupportedParserException& exception) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipTransferTo.cxx 2004/08/22 18:50:24 1.1 -+++ sip/sipstack/SipTransferTo.cxx 2004/08/22 18:50:39 -@@ -263,7 +263,7 @@ - - scanSipTransferTo(data); - } -- catch (SipTransferToParserException exception) -+ catch (SipTransferToParserException&) - { - if (SipParserMode::sipParserMode()) - { -@@ -285,7 +285,7 @@ - { - parse(tostr); - } -- catch (SipTransferToParserException exception) -+ catch (SipTransferToParserException&) - { - if (SipParserMode::sipParserMode()) - { ---- sip/sipstack/SipWwwAuthenticate.cxx 2004/08/22 18:52:20 1.1 -+++ sip/sipstack/SipWwwAuthenticate.cxx 2004/08/22 18:52:33 -@@ -137,7 +137,7 @@ - { - scanSipWwwauthorization(nData); - } -- catch (SipWwwAuthenticateParserException exception) -+ catch (SipWwwAuthenticateParserException& exception) - { - if (SipParserMode::sipParserMode()) - { diff --git a/net/b2bua/files/patch-sip::b2b::AuthAgent.cxx b/net/b2bua/files/patch-sip::b2b::AuthAgent.cxx deleted file mode 100644 index 7ccd7dbddcb0..000000000000 --- a/net/b2bua/files/patch-sip::b2b::AuthAgent.cxx +++ /dev/null @@ -1,107 +0,0 @@ - -$FreeBSD$ - ---- sip/b2b/AuthAgent.cxx.orig Fri Apr 4 12:18:19 2003 -+++ sip/b2b/AuthAgent.cxx Fri Apr 4 12:18:19 2003 -@@ -305,6 +305,31 @@ - AuthAgent::doCancel() - { - cpLog(LOG_DEBUG, "AuthAgent::doCancel()"); -+ Sptr<MultiLegCallData> mData = -+ CallDB::instance().getMultiLegCallData(myInvokee->getCallLeg()); -+ assert(mData != 0); -+ -+ Sptr<AccountingData> accData = mData->getAccountingData(); -+ time_t t; -+ t = time(&t); -+ accData->setEndTime(t); -+ -+ if(B2bConfig::instance().getStr(B2bConfig::PP_OPTIONS) -+ != B2bConfig::PP_FREE) -+ { -+ ///Send Stop records to billing -+ int duration = t - accData->getStartTime(); -+ Sptr<BillingData> bData; -+ bData.dynamicCast(myAAAData); -+ assert(bData != 0); -+ bData->setDuration(duration); -+ -+ Sptr<AAAEvent> aEvent = new AAAEvent(this); -+ cpLog(LOG_DEBUG, "AuthAgent::Sending Acct Stop"); -+ B2bFacade::instance().getAAATransceiver()->sendAcctStop(aEvent); -+ } -+ -+ ///Transit the controller state - myState->cancel(*this); - } - -@@ -362,6 +387,31 @@ - AuthAgent::callFailed() - { - cpLog(LOG_DEBUG, "AuthAgent::callFailed()"); -+ Sptr<MultiLegCallData> mData = -+ CallDB::instance().getMultiLegCallData(myInvokee->getCallLeg()); -+ assert(mData != 0); -+ -+ Sptr<AccountingData> accData = mData->getAccountingData(); -+ time_t t; -+ t = time(&t); -+ accData->setEndTime(t); -+ -+ if(B2bConfig::instance().getStr(B2bConfig::PP_OPTIONS) -+ != B2bConfig::PP_FREE) -+ { -+ ///Send Stop records to billing -+ int duration = t - accData->getStartTime(); -+ Sptr<BillingData> bData; -+ bData.dynamicCast(myAAAData); -+ assert(bData != 0); -+ bData->setDuration(duration); -+ -+ Sptr<AAAEvent> aEvent = new AAAEvent(this); -+ cpLog(LOG_DEBUG, "AuthAgent::Sending Acct Stop"); -+ B2bFacade::instance().getAAATransceiver()->sendAcctStop(aEvent); -+ } -+ -+ ///Transit the controller state - myState->fail(*this); - } - -@@ -426,5 +476,37 @@ - void - AuthAgent::receivedStatus(UaBase& agent, const Sptr<SipMsg>& msg) - { -+ Sptr<StatusMsg> statusMsg; -+ statusMsg.dynamicCast(msg); -+ assert(statusMsg != 0); -+ int statusCode = statusMsg->getStatusLine().getStatusCode(); -+ if(statusCode > 200) -+ { -+ Sptr<MultiLegCallData> mData = -+ CallDB::instance().getMultiLegCallData(myInvokee->getCallLeg()); -+ assert(mData != 0); -+ -+ Sptr<AccountingData> accData = mData->getAccountingData(); -+ time_t t; -+ t = time(&t); -+ accData->setEndTime(t); -+ -+ if(B2bConfig::instance().getStr(B2bConfig::PP_OPTIONS) -+ != B2bConfig::PP_FREE) -+ { -+ ///Send Stop records to billing -+ int duration = t - accData->getStartTime(); -+ Sptr<BillingData> bData; -+ bData.dynamicCast(myAAAData); -+ assert(bData != 0); -+ bData->setDuration(duration); -+ bData->setTermCause(BT_SERVICE_UNAVAIL); -+ -+ Sptr<AAAEvent> aEvent = new AAAEvent(this); -+ cpLog(LOG_DEBUG, "AuthAgent::Sending Acct Stop"); -+ B2bFacade::instance().getAAATransceiver()->sendAcctStop(aEvent); -+ } -+ } -+ - MultiLegCallControl::instance().receivedStatus(agent,msg); - } diff --git a/net/b2bua/files/patch-sip::b2b::B2bDef.hxx b/net/b2bua/files/patch-sip::b2b::B2bDef.hxx deleted file mode 100644 index 214906f27acc..000000000000 --- a/net/b2bua/files/patch-sip::b2b::B2bDef.hxx +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- sip/b2b/B2bDef.hxx 2003/01/19 18:01:33 1.1 -+++ sip/b2b/B2bDef.hxx 2003/01/19 18:02:05 -@@ -95,7 +95,8 @@ - { - BT_NONE=0, - BT_USER_REQ=1, -- BT_SESSION_TIMEOUT=5 -+ BT_SESSION_TIMEOUT=5, -+ BT_SERVICE_UNAVAIL=15 - }; - - typedef vector<Sptr<UaBase> > UserAgentPeerList; diff --git a/net/b2bua/files/patch-util::threads::VSemaphore.hxx b/net/b2bua/files/patch-util::threads::VSemaphore.hxx deleted file mode 100644 index 5d6c6a0b39fe..000000000000 --- a/net/b2bua/files/patch-util::threads::VSemaphore.hxx +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- util/threads/VSemaphore.hxx.orig Tue Jun 25 20:01:25 2002 -+++ util/threads/VSemaphore.hxx Fri Apr 4 13:06:17 2003 -@@ -54,7 +54,7 @@ - static const char* const VSemaphore_hxx_version = - "$Id: VSemaphore.hxx,v 1.4 2002/06/25 17:01:25 bko Exp $"; - --#ifdef WIN32 -+#if defined(WIN32) || defined(__FreeBSD__) - #include <pthread.h> - #endif - diff --git a/net/b2bua/files/patch-util::transport::UdpStack.cxx b/net/b2bua/files/patch-util::transport::UdpStack.cxx deleted file mode 100644 index bab283ef1c98..000000000000 --- a/net/b2bua/files/patch-util::transport::UdpStack.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- util/transport/UdpStack.cxx.orig Sun Oct 10 21:24:12 2004 -+++ util/transport/UdpStack.cxx Sun Oct 10 21:26:32 2004 -@@ -97,7 +97,10 @@ - #endif - - #ifdef __FreeBSD__ -+#include <sys/param.h> -+#if __FreeBSD_version < 503001 - #include <isc/eventlib.h> -+#endif - #endif - - #ifdef __APPLE__ diff --git a/net/b2bua/pkg-descr b/net/b2bua/pkg-descr deleted file mode 100644 index 9837fe0f00e0..000000000000 --- a/net/b2bua/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -B2bUa is basically two SIP UAs working back-to-back and thus controlling -the calls going through it.Unlike a sip-proxy, a B2bUa will take an -incoming call, modify it and present it in other form to final -destination.B2bUa is in the call-signalling-path all the times. -There are numerous applications in which b2bUa can be used either -as a media negotiator or simply supervising the calls between two -parties. - -WWW: http://www.vovida.org/applications/downloads/b2bua/ diff --git a/net/b2bua/pkg-plist b/net/b2bua/pkg-plist deleted file mode 100644 index b644997e30de..000000000000 --- a/net/b2bua/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/b2bua -etc/b2bConfig.xml.sample -share/doc/b2bua/HOWTO -share/doc/b2bua/HOWTO.PROV -share/doc/b2bua/LICENSE -share/doc/b2bua/b2bdesign.pdf -@dirrm share/doc/b2bua |