More compliant URI parser, comparison, etc.

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

3 files changed, 35 insertions, 21 deletions

diff --git a/pjsip/build/pjsip.dsw b/pjsip/build/pjsip.dsw
index 562d33eb..5e6dfe03 100644
--- a/pjsip/build/pjsip.dsw
+++ b/pjsip/build/pjsip.dsw
@@ -57,18 +57,6 @@ Package=<4>
 

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

 

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

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

 

 Package=<5>

@@ -108,6 +96,24 @@ Package=<4>
 

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

 

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

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name pjlib

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name pjsip_core

+    End Project Dependency

+}}}

+

+###############################################################################

+

 Global:

 

 Package=<5>

diff --git a/pjsip/build/pjsip_core.dsp b/pjsip/build/pjsip_core.dsp
index cacb9b5d..11de7fd3 100644
--- a/pjsip/build/pjsip_core.dsp
+++ b/pjsip/build/pjsip_core.dsp
@@ -103,7 +103,7 @@ SOURCE=..\src\pjsip\sip_endpoint.c
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\pjsip\sip_misc.c

+SOURCE=..\src\pjsip\sip_errno.c

 # End Source File

 # Begin Source File

 

@@ -133,6 +133,10 @@ SOURCE=..\src\pjsip\sip_transport_udp.c
 

 SOURCE=..\src\pjsip\sip_uri.c

 # End Source File

+# Begin Source File

+

+SOURCE=..\src\pjsip\sip_util.c

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -175,10 +179,6 @@ SOURCE=..\include\pjsip\sip_event.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\include\pjsip\sip_misc.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\include\pjsip\sip_module.h

 # End Source File

 # Begin Source File

@@ -217,6 +217,10 @@ SOURCE=..\include\pjsip\sip_types.h
 

 SOURCE=..\include\pjsip\sip_uri.h

 # End Source File

+# Begin Source File

+

+SOURCE=..\include\pjsip\sip_util.h

+# End Source File

 # End Group

 # Begin Group "Inline Files"

 

diff --git a/pjsip/build/test_pjsip.dsp b/pjsip/build/test_pjsip.dsp
index c01f737b..2d58318d 100644
--- a/pjsip/build/test_pjsip.dsp
+++ b/pjsip/build/test_pjsip.dsp
@@ -51,7 +51,7 @@ 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 wsock32.lib kernel32.lib netapi32.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 /profile /map /debug /machine:I386 /out:"..\bin\test-pjsip-i386-win32-vc6-release.exe"

+# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib netapi32.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 /profile /map /debug /machine:I386 /out:"..\bin\test-pjsip-i386-win32-vc6-release.exe"

 

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

 

@@ -76,7 +76,7 @@ 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 wsock32.lib kernel32.lib netapi32.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\test-pjsip-i386-win32-vc6-debug.exe" /pdbtype:sept

+# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib netapi32.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\test-pjsip-i386-win32-vc6-debug.exe" /pdbtype:sept

 

 !ENDIF 

 

@@ -93,11 +93,15 @@ SOURCE="..\src\test-pjsip\main.c"
 # End Source File

 # Begin Source File

 

-SOURCE="..\src\test-pjsip\test_msg.c"

+SOURCE="..\src\test-pjsip\msg.c"

 # End Source File

 # Begin Source File

 

-SOURCE="..\src\test-pjsip\test_uri.c"

+SOURCE="..\src\test-pjsip\test.c"

+# End Source File

+# Begin Source File

+

+SOURCE="..\src\test-pjsip\uri.c"

 # End Source File

 # End Group

 # Begin Group "Header Files"