sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Joshua Colp 2012-10-31 18:01:09 +00:00
parent 05cee7b717
commit 6de0b18b3b
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
res/res_http_websocket.exports.in
View 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:
*;
};