Fix an issue with res_http_websocket where the chan_sip WebSocket handler could not...
authorJoshua Colp <jcolp@digium.com>
Wed, 31 Oct 2012 18:01:09 +0000 (18:01 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 31 Oct 2012 18:01:09 +0000 (18:01 +0000)
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

res/res_http_websocket.exports.in

index c5d8e39..e0ddd95 100644 (file)
@@ -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:
                *;
 };