From: Joshua Colp <jcolp@digium.com>
Date: Wed, 31 Oct 2012 18:01:09 +0000 (+0000)
Subject: Fix an issue with res_http_websocket where the chan_sip WebSocket handler could not... 
X-Git-Tag: 13.0.0-beta1~2384
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6de0b18b3b460ffe2d893c864c581b94a837d2e4;p=thirdparty%2Fasterisk.git

Fix an issue with res_http_websocket where the chan_sip WebSocket handler could not be registered.

On some systems the optional API support uses the GCC compiler attribute "weakref" to provide its
functionality. This code changes the function names and prefixes "__" to the front. The
res_http_websocket exports file did not take this into account, thereby not allowing those functions
to be global and ultimately found.

(closes issue ASTERISK-20631)
Reported by: danjenkins
........

Merged revisions 375559 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_http_websocket.exports.in b/res/res_http_websocket.exports.in
index c5d8e39369..e0ddd95702 100644
--- a/res/res_http_websocket.exports.in
+++ b/res/res_http_websocket.exports.in
@@ -1,18 +1,18 @@
 {
 	global:
-		LINKER_SYMBOL_PREFIXast_websocket_add_protocol;
-		LINKER_SYMBOL_PREFIXast_websocket_remove_protocol;
-		LINKER_SYMBOL_PREFIXast_websocket_read;
-		LINKER_SYMBOL_PREFIXast_websocket_write;
-		LINKER_SYMBOL_PREFIXast_websocket_close;
-		LINKER_SYMBOL_PREFIXast_websocket_reconstruct_enable;
-		LINKER_SYMBOL_PREFIXast_websocket_reconstruct_disable;
-		LINKER_SYMBOL_PREFIXast_websocket_ref;
-		LINKER_SYMBOL_PREFIXast_websocket_unref;
-		LINKER_SYMBOL_PREFIXast_websocket_fd;
-		LINKER_SYMBOL_PREFIXast_websocket_remote_address;
-		LINKER_SYMBOL_PREFIXast_websocket_is_secure;
-		LINKER_SYMBOL_PREFIXast_websocket_set_nonblock;
+		LINKER_SYMBOL_PREFIX*ast_websocket_add_protocol;
+		LINKER_SYMBOL_PREFIX*ast_websocket_remove_protocol;
+		LINKER_SYMBOL_PREFIX*ast_websocket_read;
+		LINKER_SYMBOL_PREFIX*ast_websocket_write;
+		LINKER_SYMBOL_PREFIX*ast_websocket_close;
+		LINKER_SYMBOL_PREFIX*ast_websocket_reconstruct_enable;
+		LINKER_SYMBOL_PREFIX*ast_websocket_reconstruct_disable;
+		LINKER_SYMBOL_PREFIX*ast_websocket_ref;
+		LINKER_SYMBOL_PREFIX*ast_websocket_unref;
+		LINKER_SYMBOL_PREFIX*ast_websocket_fd;
+		LINKER_SYMBOL_PREFIX*ast_websocket_remote_address;
+		LINKER_SYMBOL_PREFIX*ast_websocket_is_secure;
+		LINKER_SYMBOL_PREFIX*ast_websocket_set_nonblock;
 	local:
 		*;
 };