Changeset 563 for pjproject/trunk/pjsip/build

Timestamp:

Jun 28, 2006 4:46:49 PM (18 years ago)

Author:

bennylp

Message:

Major improvements in PJSIP to support TCP. The changes fall into these categories: (1) the TCP transport implementation itself (*.[hc]), (2) bug-fix in SIP transaction when using reliable transports, (3) support for TCP transport in PJSUA-LIB/PJSUA, and (4) changes in PJSIP-TEST to support TCP testing.

Location:

pjproject/trunk/pjsip/build

Files:

• . (modified) (1 prop)
• Makefile (modified) (6 diffs)
• test_pjsip.dsp (modified) (2 diffs)

pjproject/trunk/pjsip/build

@@ -10 +10 @@
 *.sln
 *.suo
+*.htm
+*.html

@@ -10 +10 @@
 *.sln
 *.suo
+*.htm
+*.html

pjproject/trunk/pjsip/build/Makefile

@@ -26 +26 @@
                    $(subst /,$(HOST_PSEP),$(PJSIP_SIMPLE_LIB)) \
                    $(subst /,$(HOST_PSEP),$(PJSIP_LIB)) \
-                   $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
                    $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
                    $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \
@@ -41 +40 @@
                 sip_errno.o sip_msg.o sip_parser.o sip_tel_uri.o sip_uri.o \
                 sip_endpoint.o sip_util.o sip_util_proxy.o \
-                sip_resolve.o sip_transport.o sip_transport_loop.o sip_transport_udp.o \
-                sip_auth_client.o sip_auth_msg.o sip_auth_parser.o sip_auth_server.o \
+                sip_resolve.o sip_transport.o sip_transport_loop.o \
+                sip_transport_udp.o sip_transport_tcp.o \
+                sip_auth_client.o sip_auth_msg.o sip_auth_parser.o \
+                sip_auth_server.o \
                 sip_transaction.o sip_util_statefull.o \
                 sip_dialog.o sip_ua_layer.o
@@ -77 +78 @@
 
 export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 
+
+###############################################################################
+# Defines for building test application
+#
+export TEST_SRCDIR = ../src/test-pjsip
+export TEST_OBJS += dlg_core_test.o msg_err_test.o msg_logger.o msg_test.o \
+                    test.o transport_loop_test.o transport_tcp_test.o \
+                    transport_test.o transport_udp_test.o \
+                    tsx_basic_test.o tsx_bench.o tsx_uac_test.o \
+                    tsx_uas_test.o txdata_test.o uri_test.o
+export TEST_OBJS += main.o
+export TEST_CFLAGS += $(_CFLAGS)
+export TEST_LDFLAGS += $(_LDFLAGS)
+export TEST_EXE := ../bin/pjsip-test-$(TARGET_NAME)$(HOST_EXE)
+
+        
+export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 
 ###############################################################################
 # Main entry
 #
 #
-TARGETS := pjsip pjsip-ua pjsip-simple pjsua-lib
+TARGETS := pjsip pjsip-ua pjsip-simple pjsua-lib pjsip-test
 
 .PHONY: $(TARGETS)
@@ -106 +124 @@
 pjsua-lib: 
         $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(PJSUA_LIB_LIB)
+
+pjsip-test:
+        $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $(TEST_EXE)
 
 .PHONY: ../lib/pjsip.ko
@@ -132 +153 @@
         $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $@
         $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@
+        $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $@
 
 realclean:
@@ -141 +163 @@
         $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $@
         $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $@
+        $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $@
         $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@
 

pjproject/trunk/pjsip/build/test_pjsip.dsp

@@ -118 +118 @@
 # Begin Source File
 
+SOURCE="..\src\test-pjsip\transport_tcp_test.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\src\test-pjsip\transport_test.c"
 # End Source File
@@ -127 +131 @@
 
 SOURCE="..\src\test-pjsip\tsx_basic_test.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\src\test-pjsip\tsx_bench.c"
 # End Source File
 # Begin Source File

@@ -10 +10 @@
 *.sln
 *.suo
+*.htm
+*.html