Commit 5c228c28 authored by Ghislain MARY's avatar Ghislain MARY

Clean Windows Phone 8 projects and solutions.

parent cf96a82f

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2012 for Windows Phone
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "belle-sip-tester", "belle-sip-tester.vcxproj", "{5EF32C12-4166-4152-ACAA-77F1B4566F14}"
ProjectSection(ProjectDependencies) = postProject
{300E2173-D3DA-48BB-9410-7F4E953CE5D1} = {300E2173-D3DA-48BB-9410-7F4E953CE5D1}
{C7880578-FBD1-40D9-A3D7-E82E6C1A6B10} = {C7880578-FBD1-40D9-A3D7-E82E6C1A6B10}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "belle-sip", "..\belle-sip\belle-sip.vcxproj", "{300E2173-D3DA-48BB-9410-7F4E953CE5D1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cunit", "..\..\..\..\cunit\build\windows\cunit\cunit.vcxproj", "{C7880578-FBD1-40D9-A3D7-E82E6C1A6B10}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libantlr3c", "..\..\..\..\antlr3\runtime\C\build\vsx\libantlr3c\libantlr3c.vcxproj", "{8FA74260-151B-429B-83EF-3CF3EAC8CFD9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Debug|Win32 = Debug|Win32
Release|ARM = Release|ARM
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5EF32C12-4166-4152-ACAA-77F1B4566F14}.Debug|ARM.ActiveCfg = Debug|Win32
{5EF32C12-4166-4152-ACAA-77F1B4566F14}.Debug|Win32.ActiveCfg = Debug|Win32
{5EF32C12-4166-4152-ACAA-77F1B4566F14}.Debug|Win32.Build.0 = Debug|Win32
{5EF32C12-4166-4152-ACAA-77F1B4566F14}.Release|ARM.ActiveCfg = Release|Win32
{5EF32C12-4166-4152-ACAA-77F1B4566F14}.Release|Win32.ActiveCfg = Release|Win32
{5EF32C12-4166-4152-ACAA-77F1B4566F14}.Release|Win32.Build.0 = Release|Win32
{300E2173-D3DA-48BB-9410-7F4E953CE5D1}.Debug|ARM.ActiveCfg = Debug|ARM
{300E2173-D3DA-48BB-9410-7F4E953CE5D1}.Debug|ARM.Build.0 = Debug|ARM
{300E2173-D3DA-48BB-9410-7F4E953CE5D1}.Debug|Win32.ActiveCfg = Debug|Win32
{300E2173-D3DA-48BB-9410-7F4E953CE5D1}.Debug|Win32.Build.0 = Debug|Win32
{300E2173-D3DA-48BB-9410-7F4E953CE5D1}.Release|ARM.ActiveCfg = Release|ARM
{300E2173-D3DA-48BB-9410-7F4E953CE5D1}.Release|ARM.Build.0 = Release|ARM
{300E2173-D3DA-48BB-9410-7F4E953CE5D1}.Release|Win32.ActiveCfg = Release|Win32
{300E2173-D3DA-48BB-9410-7F4E953CE5D1}.Release|Win32.Build.0 = Release|Win32
{C7880578-FBD1-40D9-A3D7-E82E6C1A6B10}.Debug|ARM.ActiveCfg = Debug|ARM
{C7880578-FBD1-40D9-A3D7-E82E6C1A6B10}.Debug|ARM.Build.0 = Debug|ARM
{C7880578-FBD1-40D9-A3D7-E82E6C1A6B10}.Debug|Win32.ActiveCfg = Debug|Win32
{C7880578-FBD1-40D9-A3D7-E82E6C1A6B10}.Debug|Win32.Build.0 = Debug|Win32
{C7880578-FBD1-40D9-A3D7-E82E6C1A6B10}.Release|ARM.ActiveCfg = Release|ARM
{C7880578-FBD1-40D9-A3D7-E82E6C1A6B10}.Release|ARM.Build.0 = Release|ARM
{C7880578-FBD1-40D9-A3D7-E82E6C1A6B10}.Release|Win32.ActiveCfg = Release|Win32
{C7880578-FBD1-40D9-A3D7-E82E6C1A6B10}.Release|Win32.Build.0 = Release|Win32
{8FA74260-151B-429B-83EF-3CF3EAC8CFD9}.Debug|ARM.ActiveCfg = Debug|ARM
{8FA74260-151B-429B-83EF-3CF3EAC8CFD9}.Debug|ARM.Build.0 = Debug|ARM
{8FA74260-151B-429B-83EF-3CF3EAC8CFD9}.Debug|Win32.ActiveCfg = Debug|Win32
{8FA74260-151B-429B-83EF-3CF3EAC8CFD9}.Debug|Win32.Build.0 = Debug|Win32
{8FA74260-151B-429B-83EF-3CF3EAC8CFD9}.Release|ARM.ActiveCfg = Release|ARM
{8FA74260-151B-429B-83EF-3CF3EAC8CFD9}.Release|ARM.Build.0 = Release|ARM
{8FA74260-151B-429B-83EF-3CF3EAC8CFD9}.Release|Win32.ActiveCfg = Release|Win32
{8FA74260-151B-429B-83EF-3CF3EAC8CFD9}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{5EF32C12-4166-4152-ACAA-77F1B4566F14}</ProjectGuid>
<RootNamespace>bellesiptester</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\src;$(ProjectDir)..\..\..\..\cunit\build\windows\cunit\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;HAVE_CU_GET_SUITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<FloatingPointExceptions>true</FloatingPointExceptions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib;belle-sip_dll.lib;libantlr3c_dll.lib;cunit_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level4</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\src;$(ProjectDir)..\..\..\..\cunit\build\windows\cunit\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;HAVE_CU_GET_SUITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<StringPooling>true</StringPooling>
<FloatingPointExceptions>true</FloatingPointExceptions>
</ClCompile>
<Link>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib;belle-sip_dll.lib;libantlr3c_dll.lib;cunit_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\tester\auth_helper_tester.c" />
<ClCompile Include="..\..\..\tester\belle_sdp_tester.c" />
<ClCompile Include="..\..\..\tester\belle_sip_dialog_tester.c" />
<ClCompile Include="..\..\..\tester\belle_sip_headers_tester.c" />
<ClCompile Include="..\..\..\tester\belle_sip_message_tester.c" />
<ClCompile Include="..\..\..\tester\belle_sip_refresher_tester.c" />
<ClCompile Include="..\..\..\tester\belle_sip_register_tester.c" />
<ClCompile Include="..\..\..\tester\belle_sip_resolver_tester.c" />
<ClCompile Include="..\..\..\tester\belle_sip_tester.c" />
<ClCompile Include="..\..\..\tester\belle_sip_uri_tester.c" />
<ClCompile Include="..\..\..\tester\cast_test.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
......@@ -31,22 +31,22 @@ static void belleSipNativeOutputTraceHandler(belle_sip_log_level lev, const char
}
CainSipTesterNative::CainSipTesterNative()
BelleSipTesterNative::BelleSipTesterNative()
{
belle_sip_tester_init();
}
CainSipTesterNative::~CainSipTesterNative()
BelleSipTesterNative::~BelleSipTesterNative()
{
belle_sip_tester_uninit();
}
void CainSipTesterNative::setOutputTraceListener(OutputTraceListener^ traceListener)
void BelleSipTesterNative::setOutputTraceListener(OutputTraceListener^ traceListener)
{
sTraceListener = traceListener;
}
void CainSipTesterNative::run(Platform::String^ suiteName, Platform::String^ caseName, Platform::Boolean verbose)
void BelleSipTesterNative::run(Platform::String^ suiteName, Platform::String^ caseName, Platform::Boolean verbose)
{
std::wstring all(L"ALL");
std::wstring wssuitename = suiteName->Data();
......@@ -67,12 +67,12 @@ void CainSipTesterNative::run(Platform::String^ suiteName, Platform::String^ cas
belle_sip_tester_run_tests(wssuitename == all ? 0 : csuitename, wscasename == all ? 0 : ccasename);
}
unsigned int CainSipTesterNative::nbTestSuites()
unsigned int BelleSipTesterNative::nbTestSuites()
{
return belle_sip_tester_nb_test_suites();
}
unsigned int CainSipTesterNative::nbTests(Platform::String^ suiteName)
unsigned int BelleSipTesterNative::nbTests(Platform::String^ suiteName)
{
std::wstring suitename = suiteName->Data();
char cname[MAX_SUITE_NAME_SIZE] = { 0 };
......@@ -80,7 +80,7 @@ unsigned int CainSipTesterNative::nbTests(Platform::String^ suiteName)
return belle_sip_tester_nb_tests(cname);
}
Platform::String^ CainSipTesterNative::testSuiteName(int index)
Platform::String^ BelleSipTesterNative::testSuiteName(int index)
{
const char *cname = belle_sip_tester_test_suite_name(index);
wchar_t wcname[MAX_SUITE_NAME_SIZE];
......@@ -88,7 +88,7 @@ Platform::String^ CainSipTesterNative::testSuiteName(int index)
return ref new String(wcname);
}
Platform::String^ CainSipTesterNative::testName(Platform::String^ suiteName, int testIndex)
Platform::String^ BelleSipTesterNative::testName(Platform::String^ suiteName, int testIndex)
{
std::wstring suitename = suiteName->Data();
char csuitename[MAX_SUITE_NAME_SIZE] = { 0 };
......
......@@ -11,11 +11,11 @@ namespace belle_sip_tester_native
void outputTrace(Platform::String^ msg);
};
public ref class CainSipTesterNative sealed
public ref class BelleSipTesterNative sealed
{
public:
CainSipTesterNative();
virtual ~CainSipTesterNative();
BelleSipTesterNative();
virtual ~BelleSipTesterNative();
void setOutputTraceListener(OutputTraceListener^ traceListener);
unsigned int nbTestSuites();
unsigned int nbTests(Platform::String^ suiteName);
......
......@@ -56,7 +56,7 @@ namespace belle_sip_tester_wp8
PhoneApplicationService.Current.UserIdleDetectionMode = IdleDetectionMode.Disabled;
}
tester = new CainSipTesterNative();
tester = new BelleSipTesterNative();
suite = null;
}
......@@ -228,7 +228,7 @@ namespace belle_sip_tester_wp8
return (suite != null) && (suite.running);
}
public CainSipTesterNative tester { get; set; }
public BelleSipTesterNative tester { get; set; }
public UnitTestSuite suite { get; set; }
}
}
\ No newline at end of file
......@@ -6,11 +6,11 @@ using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("CainSip Tester")]
[assembly: AssemblyDescription("CainSip tester for Windows Phone 8")]
[assembly: AssemblyTitle("BelleSip Tester")]
[assembly: AssemblyDescription("BelleSip tester for Windows Phone 8")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Belledonne Communications")]
[assembly: AssemblyProduct("CainSip Tester")]
[assembly: AssemblyProduct("BelleSip Tester")]
[assembly: AssemblyCopyright("Copyright © Belledonne Communications 2013")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......
<?xml version="1.0" encoding="utf-8"?>
<Deployment xmlns="http://schemas.microsoft.com/windowsphone/2012/deployment" AppPlatformVersion="8.0">
<DefaultLanguage xmlns="" code="en-US" />
<App xmlns="" ProductID="{2cebcf29-6b23-46c2-b579-588321228f3e}" Title="Cain-Sip Tester" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal" Author="Belledonne Communications" Description="Unit tests for belle-sip" Publisher="Belledonne Communications" PublisherID="{d3d79f42-f87a-4221-aede-ffab79848795}">
<App xmlns="" ProductID="{2cebcf29-6b23-46c2-b579-588321228f3e}" Title="Belle-Sip Tester" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal" Author="Belledonne Communications" Description="Unit tests for belle-sip" Publisher="Belledonne Communications" PublisherID="{d3d79f42-f87a-4221-aede-ffab79848795}">
<IconPath IsRelative="true" IsResource="false">Assets\ApplicationIcon.png</IconPath>
<Capabilities>
<Capability Name="ID_CAP_NETWORKING" />
......
......@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<BELLESIP_PACKAGE_VERSION>"1.2.4"</BELLESIP_PACKAGE_VERSION>
<BELLESIP_PACKAGE_VERSION>"1.3.2"</BELLESIP_PACKAGE_VERSION>
</PropertyGroup>
<PropertyGroup />
<ItemDefinitionGroup />
......
......@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2012 for Windows Phone
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "belle-sip", "belle-sip.vcxproj", "{4C225A82-800B-427B-BA7B-61686A9B347F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libantlr3c", "..\..\..\..\antlr3\runtime\C\build\vsx\libantlr3c\libantlr3c.vcxproj", "{8FA74260-151B-429B-83EF-3CF3EAC8CFD9}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libantlr3c", "..\..\..\..\antlr3\runtime\C\build\wp8\libantlr3c\libantlr3c.vcxproj", "{8FA74260-151B-429B-83EF-3CF3EAC8CFD9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tunnel", "..\..\..\..\tunnel\build\windows\tunnel\tunnel\tunnel.vcxproj", "{59500DD1-B192-4DDF-A402-8A8E3739E032}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tunnel", "..\..\..\..\tunnel\build\wp8\tunnel\tunnel.vcxproj", "{59500DD1-B192-4DDF-A402-8A8E3739E032}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "polarssl", "..\..\..\..\polarssl\build\windows\polarssl\polarssl\polarssl.vcxproj", "{E9F8C5D1-13A2-46B6-A9BC-878030D4BE09}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "polarssl", "..\..\..\..\polarssl\build\wp8\polarssl\polarssl.vcxproj", "{E9F8C5D1-13A2-46B6-A9BC-878030D4BE09}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
......@@ -545,7 +545,7 @@ struct belle_sip_provider{
unsigned char unconditional_answer_enabled;
};
belle_sip_provider_t *belle_sip_provider_new(belle_sip_stack_t *s, belle_sip_listening_point_t *lp);
BELLESIP_INTERNAL_EXPORT belle_sip_provider_t *belle_sip_provider_new(belle_sip_stack_t *s, belle_sip_listening_point_t *lp);
void belle_sip_provider_add_client_transaction(belle_sip_provider_t *prov, belle_sip_client_transaction_t *t);
belle_sip_client_transaction_t *belle_sip_provider_find_matching_client_transaction(belle_sip_provider_t *prov, belle_sip_response_t *resp);
void belle_sip_provider_remove_client_transaction(belle_sip_provider_t *prov, belle_sip_client_transaction_t *t);
......@@ -562,7 +562,7 @@ void belle_sip_provider_remove_internal_sip_listener(belle_sip_provider_t *p, be
belle_sip_client_transaction_t * belle_sip_provider_find_matching_client_transaction_from_req(belle_sip_provider_t *prov, belle_sip_request_t *req);
belle_sip_dialog_t *belle_sip_provider_find_dialog_from_message(belle_sip_provider_t *prov, belle_sip_message_t *msg, int as_uas);
/*for testing purpose only:*/
void belle_sip_provider_dispatch_message(belle_sip_provider_t *prov, belle_sip_message_t *msg);
BELLESIP_INTERNAL_EXPORT void belle_sip_provider_dispatch_message(belle_sip_provider_t *prov, belle_sip_message_t *msg);
typedef struct listener_ctx{
belle_sip_listener_t *listener;
......@@ -973,7 +973,7 @@ belle_sip_header_extension_t* belle_sip_header_extension_new();
belle_sip_header_extension_t* belle_sip_header_extension_parse (const char* extension) ;
belle_sip_header_extension_t* belle_sip_header_extension_create (const char* name,const char* value);
const char* belle_sip_header_extension_get_value(const belle_sip_header_extension_t* extension);
BELLESIP_INTERNAL_EXPORT const char* belle_sip_header_extension_get_value(const belle_sip_header_extension_t* extension);
void belle_sip_header_extension_set_value(belle_sip_header_extension_t* extension,const char* value);
#define BELLE_SIP_HEADER_EXTENSION(t) BELLE_SIP_CAST(t,belle_sip_header_extension_t)
......
......@@ -37,7 +37,7 @@
#include <ws2tcpip.h>
#ifdef _MSC_VER
#define strcasecmp(a,b) _stricmp(a,b)
#define strcasecmp _stricmp
#define snprintf _snprintf
#define vsnprintf _vsnprintf
#define strdup _strdup
......
......@@ -43,7 +43,7 @@ BELLE_SIP_DECLARE_CUSTOM_VPTR_END
void belle_sip_stream_channel_init_client(belle_sip_stream_channel_t *obj, belle_sip_stack_t *stack, const char *bindip, int localport,const char *peer_cname, const char *dest, int port);
belle_sip_channel_t * belle_sip_stream_channel_new_client(belle_sip_stack_t *stack, const char *bindip, int localport, const char *peer_cname, const char *name, int port);
BELLESIP_INTERNAL_EXPORT belle_sip_channel_t * belle_sip_stream_channel_new_client(belle_sip_stack_t *stack, const char *bindip, int localport, const char *peer_cname, const char *name, int port);
belle_sip_channel_t * belle_sip_stream_channel_new_child(belle_sip_stack_t *stack, belle_sip_socket_t sock, struct sockaddr *remote_addr, socklen_t slen);
void stream_channel_close(belle_sip_stream_channel_t *obj);
......@@ -55,5 +55,5 @@ int stream_channel_recv(belle_sip_stream_channel_t *obj, void *buf, size_t bufle
/*for testing purpose*/
void belle_sip_channel_parse_stream(belle_sip_channel_t *obj, int end_of_stream);
BELLESIP_INTERNAL_EXPORT void belle_sip_channel_parse_stream(belle_sip_channel_t *obj, int end_of_stream);
#endif /* STREAM_CHANNEL_H_ */
......@@ -18,6 +18,7 @@
#include "belle-sip/belle-sip.h"
#include "belle_sip_tester.h"
#include "port.h"
#include <stdio.h>
#include "CUnit/Basic.h"
......@@ -546,13 +547,15 @@ static void test_mime_parameter(void) {
belle_sdp_mime_parameter_t* l_param;
belle_sdp_mime_parameter_t* lTmp;
belle_sdp_media_t* l_media;
belle_sip_list_t* mime_parameter_list;
belle_sip_list_t* mime_parameter_list_iterator;
belle_sdp_media_description_t* l_media_description_tmp = belle_sdp_media_description_parse(l_src);
belle_sdp_media_description_t* l_media_description = belle_sdp_media_description_parse(belle_sip_object_to_string(l_media_description_tmp));
belle_sip_object_unref(l_media_description_tmp);
belle_sip_list_t* mime_parameter_list = belle_sdp_media_description_build_mime_parameters(l_media_description);
belle_sip_list_t* mime_parameter_list_iterator=mime_parameter_list;
mime_parameter_list = belle_sdp_media_description_build_mime_parameters(l_media_description);
mime_parameter_list_iterator = mime_parameter_list;
CU_ASSERT_PTR_NOT_NULL(mime_parameter_list);
belle_sip_object_unref(BELLE_SIP_OBJECT(l_media_description));
......
......@@ -28,8 +28,8 @@
#ifndef WIN32
#include <sys/types.h>
#endif
#include <inttypes.h>
#endif
#define INT_TO_VOIDPTR(i) ((void*)(intptr_t)(i))
#define VOIDPTR_TO_INT(p) ((int)(intptr_t)(p))
......
......@@ -390,10 +390,10 @@ static void test_content_length_header(void) {
static belle_sip_header_t* test_header_extension(const char* name,const char* value) {
belle_sip_header_t* L_tmp;
belle_sip_header_t* L_extension;
char header[256];
char* l_raw_header=NULL;
snprintf(header,sizeof(header),"%s:%s",name,value);
belle_sip_header_t* L_extension;
L_extension = belle_sip_header_parse(header);
l_raw_header = belle_sip_object_to_string(BELLE_SIP_OBJECT(L_extension));
belle_sip_object_unref(BELLE_SIP_OBJECT(L_extension));
......@@ -766,6 +766,9 @@ static void _test_date_header(void){
}
static void test_date_header(void){
#ifdef WINAPI_FAMILY_PHONE_APP
// TODO: setenv and unsetenv are not available for Windows Phone 8
#else
char *tz;
/* test in our timezone */
_test_date_header();
......@@ -783,6 +786,7 @@ static void test_date_header(void){
else
unsetenv("TZ");
tzset();
#endif
}
static void test_p_preferred_identity_header(void) {
......
......@@ -500,8 +500,8 @@ static void test_connection_failure(void){
static void test_connection_too_long(void){
belle_sip_request_t *req;
io_error_count=0;
int orig=belle_sip_stack_get_transport_timeout(stack);
io_error_count=0;
belle_sip_stack_set_transport_timeout(stack,2000);
req=try_register_user_at_domain(stack, prov, "TCP",1,"tester","sip.linphone.org",no_response_here,0);
CU_ASSERT_TRUE(io_error_count>=1);
......@@ -510,9 +510,9 @@ static void test_connection_too_long(void){
}
static void test_tls_to_tcp(void){
io_error_count=0;
belle_sip_request_t *req;
int orig=belle_sip_stack_get_transport_timeout(stack);
io_error_count=0;
belle_sip_stack_set_transport_timeout(stack,2000);
req=try_register_user_at_domain(stack, prov, "TLS",1,"tester",test_domain,test_domain_tls_to_tcp,0);
if (req){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment