[sr-dev] git:master: xmlrpc(s): remove the K sl define

Module: sip-router Branch: master Commit: 0658a37570683eaec57f138e5a07feb59f4bfbaf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0658a37… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Fri Aug 28 11:44:37 2009 +0300 xmlrpc(s): remove the K sl define - no more needed - the modules should work the same with any version of sl module --- modules_s/xmlrpc/Makefile | 7 ------- modules_s/xmlrpc/xmlrpc.c | 27 +-------------------------- 2 files changed, 1 insertions(+), 33 deletions(-) diff --git a/modules_s/xmlrpc/Makefile b/modules_s/xmlrpc/Makefile index 93651a6..efcbf38 100644 --- a/modules_s/xmlrpc/Makefile +++ b/modules_s/xmlrpc/Makefile @@ -3,9 +3,6 @@ # # WARNING: do not run this directly, it should be run by the master Makefile -# Set to true if you want to use K sl module API -USE_K_SL_API=false - include ../../Makefile.defs auto_gen= NAME=xmlrpc.so @@ -14,8 +11,4 @@ LIBS +=-lxml2 DEFS+=-DSER_MOD_INTERFACE -ifeq ($(USE_K_SL_API),true) -DEFS+=-DUSE_K_SL_API -endif - include ../../Makefile.modules diff --git a/modules_s/xmlrpc/xmlrpc.c b/modules_s/xmlrpc/xmlrpc.c index 4f82b12..c140626 100644 --- a/modules_s/xmlrpc/xmlrpc.c +++ b/modules_s/xmlrpc/xmlrpc.c @@ -55,11 +55,7 @@ #include "../../msg_translator.h" #include "../../select.h" #include "../../receive.h" /* needed by process_rpc / receive_msg() */ -#ifdef USE_K_SL_API -#include "../../modules_k/sl/sl_api.h" -#else #include "../sl/sl.h" -#endif #include "../../nonsip_hooks.h" #include "../../action.h" /* run_actions */ #include "../../script_cb.h" /* exec_*_script_cb */ @@ -382,11 +378,7 @@ static char* xmlrpc_route=0; /* default is the main route */ /** Reference to the sl (stateless replies) module of SER The sl module of SER * is needed so that the xmlrpc SER module can send replies back to clients */ -#ifdef USE_K_SL_API -struct sl_binds sl; -#else sl_api_t sl; -#endif static int xmlrpc_route_no=DEFAULT_RT; /* if set, try autoconverting to the requested type if possible @@ -743,20 +735,10 @@ static int send_reply(sip_msg_t* msg, str* body) return -1; } -#ifdef USE_K_SL_API - str s; - s.s = "OK"; - s.len = 2; - if (sl.send_reply(msg, 200, &s) == -1) { - ERR("Error while sending reply\n"); - return -1; - } -#else if (sl.reply(msg, 200, "OK") == -1) { ERR("Error while sending reply\n"); return -1; } -#endif return 0; } @@ -2214,20 +2196,13 @@ static int mod_init(void) * We will need sl_send_reply from stateless * module for sending replies */ -#ifdef USE_K_SL_API - if (load_sl_api(&sl)!=0) { - ERR("This module requires sl module\n"); - return -1; - } -#else - bind_sl_t bind_sl; + bind_sl_t bind_sl; bind_sl = (bind_sl_t)find_export("bind_sl", 0, 0); if (!bind_sl) { ERR("This module requires sl module\n"); return -1; } if (bind_sl(&sl) < 0) return -1; -#endif func_param.send = (rpc_send_f)rpc_send; func_param.fault = (rpc_fault_f)rpc_fault;