merge with sofia darcs trunk:

Fri Oct 12 08:42:17 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * Makefile.am: fixed ordering of SUBDIRS

Fri Oct 12 13:32:02 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * win32/utils/stunc.dsp: fixed include paths

Fri Oct 12 13:32:19 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * win32/tests/torture_su_root: fixed include paths

Fri Oct 12 13:32:52 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * win32: added missing files from Makefile.am, .dsp, vproj

Fri Oct 12 13:33:42 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * win32/build_sources.cmd: added extra headers to sip_tag.c and sip_parser_table.c

Fri Oct 12 13:37:00 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * win32/check.cmd: added option -a to relevant tests. 
    Optionally check Release build.

Fri Oct 12 13:37:25 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * url.h: silenced warning on URL_INIT_AS()

Fri Oct 12 13:37:43 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * tstdef.h: silenced warnings on TEST_M()

Fri Oct 12 13:38:15 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * nta_internal.h, nua_params.c: fixed NTATAG_UDP_MTU() type

Fri Oct 12 13:39:06 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * test_class.h: fixed test_auth_class, test_numeric_class declaration

Fri Oct 12 13:39:51 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * Fixed various tests on win32.

Fri Oct 12 13:39:58 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * sip_basic.c: removed dead code

Fri Oct 12 14:38:02 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * nea_server.c: avoid raporting un-SUBSCRIBE twice

Fri Oct 12 14:38:31 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * test_sip_events.c: checking some nua_i_notifier/nua_i_subscriber events

Fri Oct 12 14:38:42 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  tagged Release candidate 2 for 1.12.7

Mon Oct 15 04:03:22 EDT 2007  Pekka.Pessi@nokia.com
  * configure.ac, RELEASE: version 1.12.7

Mon Oct 15 08:27:13 EDT 2007  Pekka.Pessi@nokia.com
  * open_c: included in the dist

Tue Oct 16 08:07:46 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * nua: Open C fixes

Wed Oct 17 06:50:11 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * nua.docs: replace reference to nua_cli.c with sofsip_cli

Wed Oct 17 08:43:11 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  tagged rel-sofia-sip-1_12_7

Wed Oct 17 08:43:15 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  tagged 1.12.7

Wed Oct 17 11:01:12 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * libsofia-sip-ua/su/Makefile.am: fixed problem with automake 1.9

Wed Oct 17 11:13:15 EDT 2007  Pekka.Pessi@nokia.com
  * configure.ac, RELEASE: opened tree for development

Tue Oct 23 10:45:17 EDT 2007  Pekka.Pessi@nokia.com
  * su_alloc.c: fixed su_home_init() (not initializing pointer to mutexes)

Thu Oct 25 13:15:45 EDT 2007  Pekka.Pessi@nokia.com
  * nua_notifier.c: updated nua_i_subscribe, nua_notify() and nua_r_notify documentation

Wed Nov  7 07:58:08 EST 2007  Pekka.Pessi@nokia.com
  * sofia-sip/htable2.h: fixed HTABLE_PROTOS2()



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6219 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris
2007-11-12 16:04:47 +00:00
parent 3f4fd53c97
commit 8ff118dc2c
37 changed files with 689 additions and 300 deletions
+1
View File
@@ -37,6 +37,7 @@ EXTRA_DIST = SofiaSIP.dsw \
tests/torture_su_port/torture_su_port.dsp \
utils/localinfo/localinfo.dsp \
utils/sip_options/sip_options.dsp \
utils/sip_options_static/sip_options_static.dsp \
utils/sip_dig/sip_dig.dsp \
utils/stunc/stunc.dsp \
$(PTHREAD_DIST) \
+14 -7
View File
@@ -44,6 +44,8 @@
PT=%PT% %IN% < NUL
%CHECK%
@set AWK_SIP_AWK=%MSG_AWK% module=sip
@set IN=../libsofia-sip-ua/sip/sofia-sip/sip.h
@set PR=../libsofia-sip-ua/sip/sip_tag.c
@set PR2=../libsofia-sip-ua/sip/sofia-sip/sip_hclasses.h
@@ -53,20 +55,25 @@
@set SIPEXTRA=../libsofia-sip-ua/sip/sip_extra_headers.txt
@set PT=../libsofia-sip-ua/sip/sip_parser_table.c
%MSG_AWK% module=sip PR=%PR% %IN% < NUL
%AWK_SIP_AWK% PR=%PR% %IN% %SIPEXTRA% < NUL
%CHECK%
%MSG_AWK% module=sip PR=%PR2% %IN% < NUL
%AWK_SIP_AWK% PR=%PR2% %IN% < NUL
%CHECK%
%MSG_AWK% module=sip PR=%PR3% %IN% < NUL
%AWK_SIP_AWK% PR=%PR3% %IN% < NUL
%CHECK%
%MSG_AWK% module=sip PR=%PR4% %IN% < NUL
%AWK_SIP_AWK% PR=%PR4% %IN% < NUL
%CHECK%
%MSG_AWK% module=sip PR=%PR5% TEMPLATE1=%PR2%.in TEMPLATE2=%PR3%.in TEMPLATE3=%PR4%.in TEMPLATE=%PR5%.in NO_FIRST=1 NO_LAST=1 < NUL %SIPEXTRA%
%AWK_SIP_AWK% PR=%PR5% NO_FIRST=1 NO_LAST=1 ^
TEMPLATE1=%PR2%.in ^
TEMPLATE2=%PR3%.in ^
TEMPLATE3=%PR4%.in ^
TEMPLATE=%PR5%.in %SIPEXTRA% < NUL
%CHECK%
%MSG_AWK% module=sip TEMPLATE=%PT%.in MC_HASH_SIZE=127 MC_SHORT_SIZE=26 ^
%AWK_SIP_AWK% PT=%PT% TEMPLATE=%PT%.in ^
FLAGFILE=../libsofia-sip-ua/sip/sip_bad_mask ^
PT=%PT% %IN% %SIPEXTRA% < NUL
MC_HASH_SIZE=127 MC_SHORT_SIZE=26 ^
%IN% %SIPEXTRA% < NUL
%CHECK%
@set IN=../libsofia-sip-ua/http/sofia-sip/http.h
+19 -15
View File
@@ -21,47 +21,51 @@
:: Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
:: 02110-1301 USA
::
tests\torture_su_alloc\Debug\torture_su_alloc.exe
set config=\Debug\
:: set config=\Release\
tests\torture_su_alloc%config%torture_su_alloc.exe -a
@if errorlevel 1 ( echo torture_su_alloc: FAIL ) else echo torture_su_alloc: PASS
tests\torture_su_root\Debug\torture_su_root.exe
tests\torture_su_root%config%torture_su_root.exe -a
@if errorlevel 1 ( echo torture_su_root: FAIL ) else echo torture_su_root: PASS
tests\torture_su_tag\Debug\torture_su_tag.exe
tests\torture_su_tag%config%torture_su_tag.exe -a
@if errorlevel 1 ( echo torture_su_tag: FAIL ) else echo torture_su_tag: PASS
tests\test_su\Debug\test_su.exe
tests\test_su%config%test_su.exe
@if errorlevel 1 ( echo test_su: FAIL ) else echo test_su: PASS
tests\torture_su_time\Debug\torture_su_time.exe
tests\torture_su_time%config%torture_su_time.exe -a
@if errorlevel 1 ( echo torture_su_time: FAIL ) else echo torture_su_time: PASS
tests\torture_su_timer\Debug\torture_su_timer.exe
tests\torture_su_timer%config%torture_su_timer.exe
@if errorlevel 1 ( echo torture_su_timer: FAIL ) else echo torture_su_timer: PASS
tests\torture_su\Debug\torture_su.exe
tests\torture_su%config%torture_su.exe -a
@if errorlevel 1 ( echo torture_su: FAIL ) else echo torture_su: PASS
tests\test_memmem\Debug\test_memmem.exe
tests\test_memmem%config%test_memmem.exe -a
@if errorlevel 1 ( echo test_memmem: FAIL ) else echo test_memmem: PASS
tests\test_tport\Debug\test_tport.exe
tests\test_tport%config%test_tport.exe -a
@if errorlevel 1 ( echo test_tport: FAIL ) else echo test_tport: PASS
tests\test_nta\Debug\test_nta.exe
tests\test_nta%config%test_nta.exe -a
@if errorlevel 1 ( echo test_nta: FAIL ) else echo test_nta: PASS
tests\test_nua\Debug\test_nua.exe
tests\test_nua%config%test_nua.exe -a
@if errorlevel 1 ( echo test_nua: FAIL ) else echo test_nua: PASS
tests\test_htable\Debug\test_htable.exe
tests\test_htable%config%test_htable.exe -a
@if errorlevel 1 ( echo test_htable: FAIL ) else echo test_htable: PASS
tests\torture_rbtree\Debug\torture_rbtree.exe
tests\torture_rbtree%config%torture_rbtree.exe -a
@if errorlevel 1 ( echo torture_rbtree: FAIL ) else echo torture_rbtree: PASS
tests\torture_su_bm\Debug\torture_su_bm.exe
tests\torture_su_bm%config%torture_su_bm.exe -a
@if errorlevel 1 ( echo torture_su_bm: FAIL ) else echo torture_su_bm: PASS
:: tests\torture_su_port\Debug\torture_su_port.exe
:: tests\torture_su_port%config%torture_su_port.exe -a
:: @if errorlevel 1 ( echo torture_su_port: FAIL ) else echo torture_su_port: PASS
@@ -109,6 +109,10 @@ SOURCE="..\..\libsofia-sip-ua\su\inet_pton.c"
# End Source File
# Begin Source File
SOURCE="..\..\libsofia-sip-ua\su\smoothsort.c"
# End Source File
# Begin Source File
SOURCE="..\..\libsofia-sip-ua\su\string0.c"
# End Source File
# Begin Source File
@@ -837,10 +841,6 @@ SOURCE="..\..\libsofia-sip-ua\soa\soa.c"
# End Source File
# Begin Source File
SOURCE="..\..\libsofia-sip-ua\soa\sofia-sip\soa_session.h"
# End Source File
# Begin Source File
SOURCE="..\..\libsofia-sip-ua\soa\soa_static.c"
# End Source File
# Begin Source File
@@ -861,6 +861,10 @@ SOURCE="..\..\libsofia-sip-ua\soa\soa_tag_ref.c"
# PROP Default_Filter "su*.h"
# Begin Source File
SOURCE="..\..\libsofia-sip-ua\su\sofia-sip\heap.h"
# End Source File
# Begin Source File
SOURCE="..\..\libsofia-sip-ua\su\sofia-sip\htable.h"
# End Source File
# Begin Source File
@@ -1389,6 +1393,10 @@ SOURCE="..\..\libsofia-sip-ua\soa\sofia-sip\soa_add.h"
# End Source File
# Begin Source File
SOURCE="..\..\libsofia-sip-ua\soa\sofia-sip\soa_session.h"
# End Source File
# Begin Source File
SOURCE="..\..\libsofia-sip-ua\soa\sofia-sip\soa_tag.h"
# End Source File
# End Group
@@ -271,6 +271,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\libsofia-sip-ua\su\smoothsort.c"
>
</File>
<File
RelativePath="..\..\libsofia-sip-ua\su\string0.c"
>
@@ -3757,10 +3761,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\libsofia-sip-ua\soa\sofia-sip\soa_session.h"
>
</File>
<File
RelativePath="..\..\libsofia-sip-ua\soa\soa_static.c"
>
@@ -3837,6 +3837,10 @@
Name="su headers"
Filter="su*.h"
>
<File
RelativePath="..\..\libsofia-sip-ua\su\sofia-sip\heap.h"
>
</File>
<File
RelativePath="..\..\libsofia-sip-ua\su\sofia-sip\htable.h"
>
@@ -4372,6 +4376,10 @@
RelativePath="..\..\libsofia-sip-ua\soa\sofia-sip\soa_add.h"
>
</File>
<File
RelativePath="..\..\libsofia-sip-ua\soa\sofia-sip\soa_session.h"
>
</File>
<File
RelativePath="..\..\libsofia-sip-ua\soa\sofia-sip\soa_tag.h"
>
@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /WX /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c
# ADD CPP /nologo /MD /W3 /WX /GX /O2 /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
# ADD CPP /nologo /MD /W3 /WX /GX /O2 /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\pthread" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
# ADD BASE RSC /l 0x40b /d "NDEBUG"
# ADD RSC /l 0x40b /d "NDEBUG"
BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /WX /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /WX /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /WX /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\pthread" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x40b /d "_DEBUG"
# ADD RSC /l 0x40b /d "_DEBUG"
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..,..\..\..\libsofia-sip-ua\su"
AdditionalIncludeDirectories="..\..,..\..\..\libsofia-sip-ua\su,..\..\pthread"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -140,7 +140,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..,..\..\..\libsofia-sip-ua\su"
AdditionalIncludeDirectories="..\..,..\..\..\libsofia-sip-ua\su,..\..\pthread"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
+2 -2
View File
@@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /WX /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c
# ADD CPP /nologo /MD /W3 /WX /GX /O2 /I ".." /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\..\libsofia-sip-ua\features" /I "..\..\..\libsofia-sip-ua\tport" /I "..\..\..\libsofia-sip-ua\iptsec" /I "..\..\..\libsofia-sip-ua\ipt" /I "..\..\..\libsofia-sip-ua\url" /I "..\..\..\libsofia-sip-ua\nta" /I "..\..\..\libsofia-sip-ua\msg" /I "..\..\..\libsofia-sip-ua\sip" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /WX /GX /O2 /I ".." /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\..\libsofia-sip-ua\features" /I "..\..\..\libsofia-sip-ua\tport" /I "..\..\..\libsofia-sip-ua\iptsec" /I "..\..\..\libsofia-sip-ua\ipt" /I "..\..\..\libsofia-sip-ua\url" /I "..\..\..\libsofia-sip-ua\nta" /I "..\..\..\libsofia-sip-ua\stun" /I "..\..\..\libsofia-sip-ua\msg" /I "..\..\..\libsofia-sip-ua\sip" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -70,7 +70,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /WX /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /WX /Gm /GX /ZI /Od /I ".." /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\..\libsofia-sip-ua\features" /I "..\..\..\libsofia-sip-ua\tport" /I "..\..\..\libsofia-sip-ua\iptsec" /I "..\..\..\libsofia-sip-ua\ipt" /I "..\..\..\libsofia-sip-ua\url" /I "..\..\..\libsofia-sip-ua\nta" /I "..\..\..\libsofia-sip-ua\msg" /I "..\..\..\libsofia-sip-ua\sip" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /WX /Gm /GX /ZI /Od /I ".." /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\..\libsofia-sip-ua\features" /I "..\..\..\libsofia-sip-ua\tport" /I "..\..\..\libsofia-sip-ua\iptsec" /I "..\..\..\libsofia-sip-ua\ipt" /I "..\..\..\libsofia-sip-ua\url" /I "..\..\..\libsofia-sip-ua\nta" /I "..\..\..\libsofia-sip-ua\stun" /I "..\..\..\libsofia-sip-ua\msg" /I "..\..\..\libsofia-sip-ua\sip" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -147,7 +147,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..,..\..,..\..\..\libsofia-sip-ua\su,..\..\..\libsofia-sip-ua\features,..\..\..\libsofia-sip-ua\tport,..\..\..\libsofia-sip-ua\iptsec,..\..\..\libsofia-sip-ua\ipt,..\..\..\libsofia-sip-ua\url,..\..\..\libsofia-sip-ua\nta,..\..\..\libsofia-sip-ua\msg,..\..\..\libsofia-sip-ua\sip"
AdditionalIncludeDirectories="..;..\..;&quot;..\..\..\libsofia-sip-ua\su&quot;;&quot;..\..\..\libsofia-sip-ua\features&quot;;&quot;..\..\..\libsofia-sip-ua\tport&quot;;&quot;..\..\..\libsofia-sip-ua\iptsec&quot;;&quot;..\..\..\libsofia-sip-ua\ipt&quot;;&quot;..\..\..\libsofia-sip-ua\url&quot;;&quot;..\..\..\libsofia-sip-ua\nta&quot;;&quot;..\..\..\libsofia-sip-ua\msg&quot;;&quot;..\..\..\libsofia-sip-ua\sip&quot;;&quot;..\..\..\libsofia-sip-ua\stun&quot;"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"