[svn-commits] twilson: branch group/srtp_reboot r259016 - in /team/group/srtp_reboot: ./ in...

[SVN commits to the Digium repositories]

Author: twilson
Date: Mon Apr 26 15:59:49 2010
New Revision: 259016

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=259016
Log:
Remove unused declarations, fix exports, staticify funcs

Added:
    team/group/srtp_reboot/res/res_srtp.exports.in   (with props)
Removed:
    team/group/srtp_reboot/res/res_srtp.exports
Modified:
    team/group/srtp_reboot/configure
    team/group/srtp_reboot/include/asterisk/res_srtp.h
    team/group/srtp_reboot/res/res_srtp.c

Modified: team/group/srtp_reboot/include/asterisk/res_srtp.h
URL: http://svnview.digium.com/svn/asterisk/team/group/srtp_reboot/include/asterisk/res_srtp.h?view=diff&rev=259016&r1=259015&r2=259016
==============================================================================
--- team/group/srtp_reboot/include/asterisk/res_srtp.h (original)
+++ team/group/srtp_reboot/include/asterisk/res_srtp.h Mon Apr 26 15:59:49 2010
@@ -54,8 +54,6 @@
 	void (*set_ssrc)(struct ast_srtp_policy *policy, unsigned long ssrc, int inbound);
 };
 
-void ast_srtp_set_srtp_cb(struct ast_rtp_instance *rtp, const struct ast_srtp_cb *cb, void *data);
-int ast_rtp_add_srtp_policy(struct ast_rtp_instance *rtp, struct ast_srtp_policy *policy);
 struct ast_srtp_policy *ast_srtp_policy_alloc(void);
 int ast_srtp_policy_set_suite(struct ast_srtp_policy *policy, enum ast_srtp_suite suite);
 int ast_srtp_policy_set_master_key(struct ast_srtp_policy *policy, const unsigned char *key, size_t key_len, const unsigned char *salt, size_t salt_len);

Modified: team/group/srtp_reboot/res/res_srtp.c
URL: http://svnview.digium.com/svn/asterisk/team/group/srtp_reboot/res/res_srtp.c?view=diff&rev=259016&r1=259015&r2=259016
==============================================================================
--- team/group/srtp_reboot/res/res_srtp.c (original)
+++ team/group/srtp_reboot/res/res_srtp.c Mon Apr 26 15:59:49 2010
@@ -70,14 +70,14 @@
 static int g_initialized = 0;
 
 /* SRTP functions */
-int ast_srtp_create(struct ast_srtp **srtp, struct ast_rtp_instance *rtp, struct ast_srtp_policy *policy);
-void ast_srtp_destroy(struct ast_srtp *srtp);
-int ast_srtp_add_stream(struct ast_srtp *srtp, struct ast_srtp_policy *policy);
-
-int ast_srtp_unprotect(struct ast_srtp *srtp, void *buf, int *len, int rtcp);
-int ast_srtp_protect(struct ast_srtp *srtp, void **buf, int *len, int rtcp);
+static int ast_srtp_create(struct ast_srtp **srtp, struct ast_rtp_instance *rtp, struct ast_srtp_policy *policy);
+static void ast_srtp_destroy(struct ast_srtp *srtp);
+static int ast_srtp_add_stream(struct ast_srtp *srtp, struct ast_srtp_policy *policy);
+
+static int ast_srtp_unprotect(struct ast_srtp *srtp, void *buf, int *len, int rtcp);
+static int ast_srtp_protect(struct ast_srtp *srtp, void **buf, int *len, int rtcp);
+static void ast_srtp_set_cb(struct ast_srtp *srtp, const struct ast_srtp_cb *cb, void *data);
 int ast_srtp_get_random(unsigned char *key, size_t len);
-void ast_srtp_set_cb(struct ast_srtp *srtp, const struct ast_srtp_cb *cb, void *data);
 
 /* Policy functions */
 struct ast_srtp_policy *ast_srtp_policy_alloc(void);
@@ -267,7 +267,7 @@
 	return crypto_get_random(key, len) != err_status_ok ? -1: 0;
 }
 
-void ast_srtp_set_cb(struct ast_srtp *srtp, const struct ast_srtp_cb *cb, void *data)
+static void ast_srtp_set_cb(struct ast_srtp *srtp, const struct ast_srtp_cb *cb, void *data)
 {
 	if (!srtp) {
 		return;
@@ -278,7 +278,7 @@
 }
 
 /* Vtable functions */
-int ast_srtp_unprotect(struct ast_srtp *srtp, void *buf, int *len, int rtcp)
+static int ast_srtp_unprotect(struct ast_srtp *srtp, void *buf, int *len, int rtcp)
 {
 	int res = 0;
 	int i;
@@ -310,7 +310,7 @@
 	return *len;
 }
 
-int ast_srtp_protect(struct ast_srtp *srtp, void **buf, int *len, int rtcp)
+static int ast_srtp_protect(struct ast_srtp *srtp, void **buf, int *len, int rtcp)
 {
 	int res;
 
@@ -329,7 +329,7 @@
 	return *len;
 }
 
-int ast_srtp_create(struct ast_srtp **srtp, struct ast_rtp_instance *rtp, struct ast_srtp_policy *policy)
+static int ast_srtp_create(struct ast_srtp **srtp, struct ast_rtp_instance *rtp, struct ast_srtp_policy *policy)
 {
 	struct ast_srtp *temp;
 
@@ -347,7 +347,7 @@
 	return 0;
 }
 
-void ast_srtp_destroy(struct ast_srtp *srtp)
+static void ast_srtp_destroy(struct ast_srtp *srtp)
 {
 	if (srtp->session) {
 		srtp_dealloc(srtp->session);
@@ -356,7 +356,7 @@
 	ast_free(srtp);
 }
 
-int ast_srtp_add_stream(struct ast_srtp *srtp, struct ast_srtp_policy *policy)
+static int ast_srtp_add_stream(struct ast_srtp *srtp, struct ast_srtp_policy *policy)
 {
 	if (!srtp->has_stream && srtp_add_stream(srtp->session, &policy->sp) != err_status_ok) {
 		return -1;

Added: team/group/srtp_reboot/res/res_srtp.exports.in
URL: http://svnview.digium.com/svn/asterisk/team/group/srtp_reboot/res/res_srtp.exports.in?view=auto&rev=259016
==============================================================================
--- team/group/srtp_reboot/res/res_srtp.exports.in (added)
+++ team/group/srtp_reboot/res/res_srtp.exports.in Mon Apr 26 15:59:49 2010
@@ -1,0 +1,11 @@
+{
+	global:
+		LINKER_SYMBOL_PREFIXast_srtp_get_random;
+		LINKER_SYMBOL_PREFIXast_srtp_policy_alloc;
+		LINKER_SYMBOL_PREFIXast_srtp_policy_destroy;
+		LINKER_SYMBOL_PREFIXast_srtp_policy_set_suite;
+		LINKER_SYMBOL_PREFIXast_srtp_policy_set_master_key;
+		LINKER_SYMBOL_PREFIXast_srtp_policy_set_ssrc;
+	local:
+		*;
+};

Propchange: team/group/srtp_reboot/res/res_srtp.exports.in
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/group/srtp_reboot/res/res_srtp.exports.in
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/group/srtp_reboot/res/res_srtp.exports.in
------------------------------------------------------------------------------
    svn:mime-type = text/plain