From 8686b3135348bcd69bdb3c3cb6660a82d989bb30 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Wed, 23 Jan 2008 20:39:07 +0000 Subject: Ticket #61: Implement SRTP support in PJMEDIA and PJSUA-LIB, and updated applications because of the changes. This is a major modification back ported from SRTP branch. See ticket #61 for changelog detail of this commit git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1735 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/build/Makefile | 10 ++++++++-- pjmedia/build/pjmedia.dsp | 12 ++++++++++-- pjmedia/build/pjmedia.vcproj | 12 ++++++++++-- 3 files changed, 28 insertions(+), 6 deletions(-) (limited to 'pjmedia/build') diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index ce0b887a..42f4684c 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -3,6 +3,10 @@ include ../../build.mak THIRD_PARTY:=$(PJDIR)/third_party PA_DIR := $(THIRD_PARTY)/build/portaudio/src +SRTP_INC=$(CC_INC)$(THIRD_PARTY)/build/srtp \ + $(CC_INC)$(THIRD_PARTY)/srtp/crypto/include \ + $(CC_INC)$(THIRD_PARTY)/srtp/include + include $(PJDIR)/build/common.mak RULES_MAK := $(PJDIR)/build/rules.mak @@ -25,7 +29,8 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ $(CC_INC)../../pjlib/include \ $(CC_INC)../../pjlib-util/include \ $(CC_INC)../../pjnath/include \ - $(CC_INC)../.. + $(CC_INC)../.. \ + $(SRTP_INC) export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ $(HOST_CXXFLAGS) $(CXXFLAGS) export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ @@ -48,7 +53,8 @@ export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ resample_resample.o resample_libsamplerate.o \ resample_port.o rtcp.o rtp.o sdp.o sdp_cmp.o sdp_neg.o \ session.o silencedet.o sound_port.o stream.o \ - tonegen.o transport_ice.o transport_udp.o \ + tonegen.o transport_ice.o transport_srtp.o \ + transport_udp.o \ wav_player.o wav_playlist.o wav_writer.o wave.o \ $(SOUND_OBJS) $(NULLSOUND_OBJS) diff --git a/pjmedia/build/pjmedia.dsp b/pjmedia/build/pjmedia.dsp index 2a386070..8533138c 100644 --- a/pjmedia/build/pjmedia.dsp +++ b/pjmedia/build/pjmedia.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c +# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../../third_party/build/srtp" /I "../../third_party/srtp/crypto/include" /I "../../third_party/srtp/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -67,7 +67,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c +# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../../third_party/build/srtp" /I "../../third_party/srtp/crypto/include" /I "../../third_party/srtp/include" /I "../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -249,6 +249,10 @@ SOURCE=..\src\pjmedia\transport_ice.c # End Source File # Begin Source File +SOURCE=..\src\pjmedia\transport_srtp.c +# End Source File +# Begin Source File + SOURCE=..\src\pjmedia\transport_udp.c # End Source File # Begin Source File @@ -409,6 +413,10 @@ SOURCE=..\include\pjmedia\transport_ice.h # End Source File # Begin Source File +SOURCE=..\include\pjmedia\transport_srtp.h +# End Source File +# Begin Source File + SOURCE=..\include\pjmedia\transport_udp.h # End Source File # Begin Source File diff --git a/pjmedia/build/pjmedia.vcproj b/pjmedia/build/pjmedia.vcproj index 8e45f9f8..e3ed7298 100644 --- a/pjmedia/build/pjmedia.vcproj +++ b/pjmedia/build/pjmedia.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../.." + AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../.." PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1" StringPooling="true" RuntimeLibrary="2" @@ -119,7 +119,7 @@ + + @@ -1216,6 +1220,10 @@ RelativePath="..\include\pjmedia\transport_ice.h" > + + -- cgit v1.2.3