More ticket #485: added TURN client application

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1867 74dad513-b988-da41-8d7b-12977e46ad98

4 files changed, 59 insertions, 47 deletions

diff --git a/pjnath/build/pjnath.dsw b/pjnath/build/pjnath.dsw
index 8eaa0776..7e479164 100644
--- a/pjnath/build/pjnath.dsw
+++ b/pjnath/build/pjnath.dsw
@@ -60,7 +60,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "pjstun_client"=.\pjstun_client.dsp - Package Owner=<4>

+Project: "pjstun_srv_test"=.\pjstun_srv_test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -81,7 +81,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "pjstun_srv_test"=.\pjstun_srv_test.dsp - Package Owner=<4>

+Project: "pjturn_client"=.\pjturn_client.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/pjnath/build/pjnath.vcproj b/pjnath/build/pjnath.vcproj
index 47720b09..766f1846 100644
--- a/pjnath/build/pjnath.vcproj
+++ b/pjnath/build/pjnath.vcproj
@@ -319,6 +319,14 @@
 					/>

 				</FileConfiguration>

 			</File>

+			<File

+				RelativePath="..\src\pjnath\turn_session.c"

+				>

+			</File>

+			<File

+				RelativePath="..\src\pjnath\turn_udp.c"

+				>

+			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

@@ -373,7 +381,11 @@
 				>

 			</File>

 			<File

-				RelativePath="..\include\pjnath\turn_client.h"

+				RelativePath="..\include\pjnath\turn_session.h"

+				>

+			</File>

+			<File

+				RelativePath="..\include\pjnath\turn_udp.h"

 				>

 			</File>

 			<File

diff --git a/pjnath/build/pjstun_client.dsp b/pjnath/build/pjturn_client.dsp
index 9cbbbfde..ff591c94 100644
--- a/pjnath/build/pjstun_client.dsp
+++ b/pjnath/build/pjturn_client.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="pjstun_client" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="pjturn_client" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=pjstun_client - Win32 Debug

+CFG=pjturn_client - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

-!MESSAGE NMAKE /f "pjstun_client.mak".

+!MESSAGE NMAKE /f "pjturn_client.mak".

 !MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "pjstun_client.mak" CFG="pjstun_client - Win32 Debug"

+!MESSAGE NMAKE /f "pjturn_client.mak" CFG="pjturn_client - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "pjstun_client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "pjstun_client - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "pjturn_client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "pjturn_client - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -28,17 +28,17 @@ CFG=pjstun_client - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "pjstun_client - Win32 Release"

+!IF  "$(CFG)" == "pjturn_client - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "./output/pjstun-client-i386-win32-vc6-release"

-# PROP BASE Intermediate_Dir "./output/pjstun-client-i386-win32-vc6-release"

+# PROP BASE Output_Dir "./output/pjturn-client-i386-win32-vc6-release"

+# PROP BASE Intermediate_Dir "./output/pjturn-client-i386-win32-vc6-release"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "./output/pjstun-client-i386-win32-vc6-release"

-# PROP Intermediate_Dir "./output/pjstun-client-i386-win32-vc6-release"

+# PROP Output_Dir "./output/pjturn-client-i386-win32-vc6-release"

+# PROP Intermediate_Dir "./output/pjturn-client-i386-win32-vc6-release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

@@ -50,19 +50,19 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../bin/pjstun-client-i386-win32-vc6-release.exe"

+# ADD LINK32 netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../bin/pjturn-client-i386-win32-vc6-release.exe"

 

-!ELSEIF  "$(CFG)" == "pjstun_client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "pjturn_client - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "./output/pjstun-client-i386-win32-vc6-debug"

-# PROP BASE Intermediate_Dir "./output/pjstun-client-i386-win32-vc6-debug"

+# PROP BASE Output_Dir "./output/pjturn-client-i386-win32-vc6-debug"

+# PROP BASE Intermediate_Dir "./output/pjturn-client-i386-win32-vc6-debug"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "./output/pjstun-client-i386-win32-vc6-debug"

-# PROP Intermediate_Dir "./output/pjstun-client-i386-win32-vc6-debug"

+# PROP Output_Dir "./output/pjturn-client-i386-win32-vc6-debug"

+# PROP Intermediate_Dir "./output/pjturn-client-i386-win32-vc6-debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

@@ -74,20 +74,20 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 netapi32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../bin/pjstun-client-i386-win32-vc6-debug.exe" /pdbtype:sept

+# ADD LINK32 netapi32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../bin/pjturn-client-i386-win32-vc6-debug.exe" /pdbtype:sept

 

 !ENDIF 

 

 # Begin Target

 

-# Name "pjstun_client - Win32 Release"

-# Name "pjstun_client - Win32 Debug"

+# Name "pjturn_client - Win32 Release"

+# Name "pjturn_client - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE="..\src\pjstun-client\client_main.c"

+SOURCE="..\src\pjturn-client\client_main.c"

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/pjnath/build/pjstun_client.vcproj b/pjnath/build/pjturn_client.vcproj
index 5d421bce..eb3cf8c6 100644
--- a/pjnath/build/pjstun_client.vcproj
+++ b/pjnath/build/pjturn_client.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8.00"

-	Name="pjstun_client"

+	Name="pjturn_client"

 	ProjectGUID="{D13A6424-23A4-4990-998D-F80C63704580}"

-	RootNamespace="pjstun_client"

+	RootNamespace="pjturn_client"

 	>

 	<Platforms>

 		<Platform

@@ -16,8 +16,8 @@
 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="./output/pjstun-client-i386-win32-vc8-release"

-			IntermediateDirectory="./output/pjstun-client-i386-win32-vc8-release"

+			OutputDirectory="./output/pjturn-client-i386-win32-vc8-release"

+			IntermediateDirectory="./output/pjturn-client-i386-win32-vc8-release"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -38,7 +38,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName="./output/pjstun-client-i386-win32-vc8-release/pjstun_client.tlb"

+				TypeLibraryName="./output/pjturn-client-i386-win32-vc8-release/pjturn_client.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -50,10 +50,10 @@
 				StringPooling="true"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="./output/pjstun-client-i386-win32-vc8-release/pjstun_client.pch"

-				AssemblerListingLocation="./output/pjstun-client-i386-win32-vc8-release/"

-				ObjectFile="./output/pjstun-client-i386-win32-vc8-release/"

-				ProgramDataBaseFileName="./output/pjstun-client-i386-win32-vc8-release/"

+				PrecompiledHeaderFile="./output/pjturn-client-i386-win32-vc8-release/pjturn_client.pch"

+				AssemblerListingLocation="./output/pjturn-client-i386-win32-vc8-release/"

+				ObjectFile="./output/pjturn-client-i386-win32-vc8-release/"

+				ProgramDataBaseFileName="./output/pjturn-client-i386-win32-vc8-release/"

 				BrowseInformation="1"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

@@ -72,10 +72,10 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib "

-				OutputFile="../bin/pjstun-client-i386-win32-vc8-release.exe"

+				OutputFile="../bin/pjturn-client-i386-win32-vc8-release.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				ProgramDatabaseFile="./output/pjstun-client-i386-win32-vc8-release/pjstun-client-i386-win32-vc8-release.pdb"

+				ProgramDatabaseFile="./output/pjturn-client-i386-win32-vc8-release/pjturn-client-i386-win32-vc8-release.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -91,7 +91,7 @@
 			<Tool

 				Name="VCBscMakeTool"

 				SuppressStartupBanner="true"

-				OutputFile="./output/pjstun-client-i386-win32-vc8-release/pjstun_client.bsc"

+				OutputFile="./output/pjturn-client-i386-win32-vc8-release/pjturn_client.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -108,8 +108,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="./output/pjstun-client-i386-win32-vc8-debug"

-			IntermediateDirectory="./output/pjstun-client-i386-win32-vc8-debug"

+			OutputDirectory="./output/pjturn-client-i386-win32-vc8-debug"

+			IntermediateDirectory="./output/pjturn-client-i386-win32-vc8-debug"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -130,7 +130,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName="./output/pjstun-client-i386-win32-vc8-debug/pjstun_client.tlb"

+				TypeLibraryName="./output/pjturn-client-i386-win32-vc8-debug/pjturn_client.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -141,10 +141,10 @@
 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

-				PrecompiledHeaderFile="./output/pjstun-client-i386-win32-vc8-debug/pjstun_client.pch"

-				AssemblerListingLocation="./output/pjstun-client-i386-win32-vc8-debug/"

-				ObjectFile="./output/pjstun-client-i386-win32-vc8-debug/"

-				ProgramDataBaseFileName="./output/pjstun-client-i386-win32-vc8-debug/"

+				PrecompiledHeaderFile="./output/pjturn-client-i386-win32-vc8-debug/pjturn_client.pch"

+				AssemblerListingLocation="./output/pjturn-client-i386-win32-vc8-debug/"

+				ObjectFile="./output/pjturn-client-i386-win32-vc8-debug/"

+				ProgramDataBaseFileName="./output/pjturn-client-i386-win32-vc8-debug/"

 				BrowseInformation="1"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

@@ -164,11 +164,11 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="netapi32.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib "

-				OutputFile="../bin/pjstun-client-i386-win32-vc8-debug.exe"

+				OutputFile="../bin/pjturn-client-i386-win32-vc8-debug.exe"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile="./output/pjstun-client-i386-win32-vc8-debug/pjstun-client-i386-win32-vc8-debug.pdb"

+				ProgramDatabaseFile="./output/pjturn-client-i386-win32-vc8-debug/pjturn-client-i386-win32-vc8-debug.pdb"

 				SubSystem="1"

 				TargetMachine="1"

 			/>

@@ -184,7 +184,7 @@
 			<Tool

 				Name="VCBscMakeTool"

 				SuppressStartupBanner="true"

-				OutputFile="./output/pjstun-client-i386-win32-vc8-debug/pjstun_client.bsc"

+				OutputFile="./output/pjturn-client-i386-win32-vc8-debug/pjturn_client.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -208,7 +208,7 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 			>

 			<File

-				RelativePath="..\src\pjstun-client\client_main.c"

+				RelativePath="..\src\pjturn-client\client_main.c"

 				>

 				<FileConfiguration

 					Name="Release|Win32"