Finished implementation of UA layer (to be tested)

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

4 files changed, 143 insertions, 54 deletions

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

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

 

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

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

 Project: "pjlib_util"="..\..\pjlib-util\build\pjlib_util.dsp" - Package Owner=<4>

 

 Package=<5>

@@ -39,6 +51,18 @@ Package=<4>
 

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

 

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

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

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

 

 Package=<5>

diff --git a/pjsip/build/pjsip_core.dsp b/pjsip/build/pjsip_core.dsp
index 9a283221..30299861 100644
--- a/pjsip/build/pjsip_core.dsp
+++ b/pjsip/build/pjsip_core.dsp
@@ -85,73 +85,96 @@ LIB32=link.exe -lib
 # Begin Group "Source Files"

 

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

+# Begin Group "Base (.c)"

+

+# PROP Default_Filter ""

 # Begin Source File

 

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

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

 # End Source File

+# End Group

+# Begin Group "Messaging and Parsing (.c)"

+

+# PROP Default_Filter ""

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

+# End Group

+# Begin Group "Core (.c)"

+

+# PROP Default_Filter ""

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

+# End Group

+# Begin Group "Transport Layer (.c)"

+

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=..\src\pjsip\sip_resolve.c

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

+# End Group

+# Begin Group "Authentication (.c)"

+

+# PROP Default_Filter ""

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

+# End Group

+# Begin Group "Transaction Layer (.c)"

+

+# PROP Default_Filter ""

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

@@ -159,40 +182,72 @@ SOURCE=..\src\pjsip\sip_util_statefull.c
 # PROP Exclude_From_Build 1

 # End Source File

 # End Group

+# Begin Group "UA Layer (.c)"

+

+# PROP Default_Filter ""

+# Begin Source File

+

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

+# End Source File

+# Begin Source File

+

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

+# End Source File

+# End Group

+# End Group

 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Group "Base Types (.h)"

+

+# PROP Default_Filter ""

+# Begin Source File

+

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

+# End Source File

 # Begin Source File

 

-SOURCE=..\include\pjsip_core.h

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

+# End Group

+# Begin Group "Messaging and Parsing (.h)"

+

+# PROP Default_Filter ""

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

+# End Source File

+# End Group

+# Begin Group "Core (.h)"

+

+# PROP Default_Filter ""

+# Begin Source File

+

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

 # End Source File

 # Begin Source File

 

@@ -204,51 +259,68 @@ SOURCE=..\include\pjsip\sip_module.h
 # End Source File

 # Begin Source File

 

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

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

 # End Source File

+# End Group

+# Begin Group "Transport Layer (.h)"

+

+# PROP Default_Filter ""

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

+# End Group

+# Begin Group "Authentication (.h)"

+

+# PROP Default_Filter ""

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

+# End Group

+# Begin Group "Transaction Layer (.h)"

+

+# PROP Default_Filter ""

 # Begin Source File

 

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

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

 # End Source File

+# End Group

+# Begin Group "UA Layer (.h)"

+

+# PROP Default_Filter ""

 # Begin Source File

 

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

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

 # End Source File

 # Begin Source File

 

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

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

 # End Source File

+# End Group

 # Begin Source File

 

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

+SOURCE=..\include\pjsip.h

 # End Source File

 # End Group

 # Begin Group "Inline Files"

diff --git a/pjsip/build/pjsip_ua.dsp b/pjsip/build/pjsip_ua.dsp
index 4d7ae9e5..c5986076 100644
--- a/pjsip/build/pjsip_ua.dsp
+++ b/pjsip/build/pjsip_ua.dsp
@@ -87,19 +87,16 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE="..\src\pjsip-ua\sip_dialog.c"

-# End Source File

-# Begin Source File

-

 SOURCE="..\src\pjsip-ua\sip_reg.c"

-# End Source File

-# Begin Source File

 

-SOURCE="..\src\pjsip-ua\sip_ua.c"

-# End Source File

-# Begin Source File

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

+

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

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

 

-SOURCE="..\src\pjsip-ua\sip_ua_private.h"

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -107,16 +104,8 @@ SOURCE="..\src\pjsip-ua\sip_ua_private.h"
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE="..\include\pjsip-ua\sip_dialog.h"

-# End Source File

-# Begin Source File

-

 SOURCE="..\include\pjsip-ua\sip_regc.h"

 # End Source File

-# Begin Source File

-

-SOURCE="..\include\pjsip-ua\sip_ua.h"

-# End Source File

 # End Group

 # End Target

 # End Project

diff --git a/pjsip/build/test_pjsip.dsp b/pjsip/build/test_pjsip.dsp
index d890d9d5..306cb30b 100644
--- a/pjsip/build/test_pjsip.dsp
+++ b/pjsip/build/test_pjsip.dsp
@@ -89,6 +89,10 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

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

+# End Source File

+# Begin Source File

+

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

 # End Source File

 # Begin Source File