[svn-commits] twilson: branch group/srtp_reboot r244648 - in /team/group/srtp_reboot/channe...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Feb 3 18:13:15 CST 2010
Author: twilson
Date: Wed Feb 3 18:13:12 2010
New Revision: 244648
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=244648
Log:
Yay channels/sip directory
Added:
team/group/srtp_reboot/channels/sip/include/sdp_crypto.h (props changed)
- copied unchanged from r244637, team/group/srtp_reboot/channels/sdp_crypto.h
team/group/srtp_reboot/channels/sip/include/srtp.h (props changed)
- copied unchanged from r244637, team/group/srtp_reboot/channels/sip_srtp.h
team/group/srtp_reboot/channels/sip/sdp_crypto.c (contents, props changed)
- copied, changed from r244637, team/group/srtp_reboot/channels/sdp_crypto.c
team/group/srtp_reboot/channels/sip/srtp.c (contents, props changed)
- copied, changed from r244637, team/group/srtp_reboot/channels/sip_srtp.c
Removed:
team/group/srtp_reboot/channels/sdp_crypto.c
team/group/srtp_reboot/channels/sdp_crypto.h
team/group/srtp_reboot/channels/sip_srtp.c
team/group/srtp_reboot/channels/sip_srtp.h
Modified:
team/group/srtp_reboot/channels/Makefile
team/group/srtp_reboot/channels/chan_sip.c
Modified: team/group/srtp_reboot/channels/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/group/srtp_reboot/channels/Makefile?view=diff&rev=244648&r1=244647&r2=244648
==============================================================================
--- team/group/srtp_reboot/channels/Makefile (original)
+++ team/group/srtp_reboot/channels/Makefile Wed Feb 3 18:13:12 2010
@@ -69,7 +69,7 @@
rm -f h323/Makefile
$(if $(filter chan_iax2,$(EMBEDDED_MODS)),modules.link,chan_iax2.so): iax2-parser.o iax2-provision.o
-$(if $(filter chan_sip,$(EMBEDDED_MODS)),modules.link,chan_sip.so): sip/config_parser.o sip/reqresp_parser.o
+$(if $(filter chan_sip,$(EMBEDDED_MODS)),modules.link,chan_sip.so): sip/config_parser.o sip/reqresp_parser.o sip/srtp.o sip/sdp_crypto.o
$(if $(filter chan_dahdi,$(EMBEDDED_MODS)),modules.link,chan_dahdi.so): sig_analog.o sig_pri.o
ifneq ($(filter chan_h323,$(EMBEDDED_MODS)),)
@@ -85,8 +85,6 @@
$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
endif
endif
-
-chan_sip.so: sip_srtp.o sdp_crypto.o
chan_misdn.o: _ASTCFLAGS+=-Imisdn
Modified: team/group/srtp_reboot/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/srtp_reboot/channels/chan_sip.c?view=diff&rev=244648&r1=244647&r2=244648
==============================================================================
--- team/group/srtp_reboot/channels/chan_sip.c (original)
+++ team/group/srtp_reboot/channels/chan_sip.c Wed Feb 3 18:13:12 2010
@@ -266,8 +266,8 @@
#include "sip/include/config_parser.h"
#include "sip/include/reqresp_parser.h"
#include "sip/include/sip_utils.h"
-#include "sip_srtp.h"
-#include "sdp_crypto.h"
+#include "sip/include/srtp.h"
+#include "sip/include/sdp_crypto.h"
/*** DOCUMENTATION
Propchange: team/group/srtp_reboot/channels/sip/include/sdp_crypto.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/group/srtp_reboot/channels/sip/include/sdp_crypto.h
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/group/srtp_reboot/channels/sip/include/sdp_crypto.h
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: team/group/srtp_reboot/channels/sip/include/sdp_crypto.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: team/group/srtp_reboot/channels/sip/include/srtp.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/group/srtp_reboot/channels/sip/include/srtp.h
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/group/srtp_reboot/channels/sip/include/srtp.h
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: team/group/srtp_reboot/channels/sip/include/srtp.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: team/group/srtp_reboot/channels/sip/sdp_crypto.c (from r244637, team/group/srtp_reboot/channels/sdp_crypto.c)
URL: http://svnview.digium.com/svn/asterisk/team/group/srtp_reboot/channels/sip/sdp_crypto.c?view=diff&rev=244648&p1=team/group/srtp_reboot/channels/sdp_crypto.c&r1=244637&p2=team/group/srtp_reboot/channels/sip/sdp_crypto.c&r2=244648
==============================================================================
--- team/group/srtp_reboot/channels/sdp_crypto.c (original)
+++ team/group/srtp_reboot/channels/sip/sdp_crypto.c Wed Feb 3 18:13:12 2010
@@ -31,7 +31,7 @@
#include "asterisk/options.h"
#include "asterisk/utils.h"
-#include "sdp_crypto.h"
+#include "include/sdp_crypto.h"
#define SRTP_MASTER_LEN 30
#define SRTP_MASTERKEY_LEN 16
Propchange: team/group/srtp_reboot/channels/sip/sdp_crypto.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/group/srtp_reboot/channels/sip/sdp_crypto.c
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/group/srtp_reboot/channels/sip/sdp_crypto.c
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: team/group/srtp_reboot/channels/sip/sdp_crypto.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: team/group/srtp_reboot/channels/sip/srtp.c (from r244637, team/group/srtp_reboot/channels/sip_srtp.c)
URL: http://svnview.digium.com/svn/asterisk/team/group/srtp_reboot/channels/sip/srtp.c?view=diff&rev=244648&p1=team/group/srtp_reboot/channels/sip_srtp.c&r1=244637&p2=team/group/srtp_reboot/channels/sip/srtp.c&r2=244648
==============================================================================
--- team/group/srtp_reboot/channels/sip_srtp.c (original)
+++ team/group/srtp_reboot/channels/sip/srtp.c Wed Feb 3 18:13:12 2010
@@ -30,7 +30,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/utils.h"
-#include "sip_srtp.h"
+#include "include/srtp.h"
struct sip_srtp *sip_srtp_alloc(void)
{
Propchange: team/group/srtp_reboot/channels/sip/srtp.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/group/srtp_reboot/channels/sip/srtp.c
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/group/srtp_reboot/channels/sip/srtp.c
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: team/group/srtp_reboot/channels/sip/srtp.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
More information about the svn-commits
mailing list