sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

git:master: core: proper pv buffer reinitialization

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d52371ec0a6ce6f1fff4f4fc91df3a89e5983228 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d52371e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 22 08:32:31 2012 +0100 core: proper pv buffer reinitialization - reported by Olle Johansson, FS#259 --- pvapi.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pvapi.c b/pvapi.c index b438362..aafc5b8 100644 --- a/pvapi.c +++ b/pvapi.c @@ -1854,9 +1854,11 @@ void pv_destroy_api(void) static char **_pv_print_buffer = NULL; #define PV_DEFAULT_PRINT_BUFFER_SIZE 1024 static int _pv_print_buffer_size = PV_DEFAULT_PRINT_BUFFER_SIZE; +static int _pv_print_buffer_size_active = 0; /* 6 mod params + 4 direct usage from mods */ #define PV_DEFAULT_PRINT_BUFFER_SLOTS 10 static int _pv_print_buffer_slots = PV_DEFAULT_PRINT_BUFFER_SLOTS; +static int _pv_print_buffer_slots_active = 0; static int _pv_print_buffer_index = 0; /** @@ -1890,6 +1892,9 @@ int pv_init_buffer(void) } LM_DBG("PV print buffer initialized to [%d][%d]\n", _pv_print_buffer_slots, _pv_print_buffer_size); + _pv_print_buffer_slots_active = _pv_print_buffer_slots; + _pv_print_buffer_size_active = _pv_print_buffer_size; + return 0; } @@ -1902,12 +1907,14 @@ void pv_destroy_buffer(void) if(_pv_print_buffer==NULL) return; - for(i=0; i<_pv_print_buffer_slots; i++) + for(i=0; i<_pv_print_buffer_slots_active; i++) { if(_pv_print_buffer[i]!=NULL) pkg_free(_pv_print_buffer[i]); } pkg_free(_pv_print_buffer); + _pv_print_buffer_slots_active = 0; + _pv_print_buffer_size_active = 0; _pv_print_buffer = NULL; } @@ -1916,8 +1923,8 @@ void pv_destroy_buffer(void) */ int pv_reinit_buffer(void) { - if(_pv_print_buffer_size==PV_DEFAULT_PRINT_BUFFER_SIZE - && _pv_print_buffer_slots==PV_DEFAULT_PRINT_BUFFER_SLOTS) + if(_pv_print_buffer_size==_pv_print_buffer_size_active + && _pv_print_buffer_slots==_pv_print_buffer_slots_active) return 0; pv_destroy_buffer(); return pv_init_buffer();

12 years

git:master: dialog(k): Reworked dlg_set_timeout_by_profile() code to change dialog

by Alex Balashov

Module: sip-router Branch: master Commit: c9957ad5bf1b672a2661f4faeb9b781820a1f636 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9957ad… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Alex Balashov <abalashov(a)evaristesys.com> Date: Fri Dec 21 21:08:39 2012 -0500 dialog(k): Reworked dlg_set_timeout_by_profile() code to change dialog timeouts outside of a profile lock. This is in order to avoid deadlock complications arising from lock/ref count operations upstream. It appears that when update_dlg_timer() fails, it does not relinquish control back to the calling function, which created problems with unreleased profile locks. --- modules_k/dialog/dlg_profile.c | 78 ++++++++++++++++++++++++++++++++++------ 1 files changed, 67 insertions(+), 11 deletions(-) diff --git a/modules_k/dialog/dlg_profile.c b/modules_k/dialog/dlg_profile.c index 41802ea..5b388d8 100644 --- a/modules_k/dialog/dlg_profile.c +++ b/modules_k/dialog/dlg_profile.c @@ -714,9 +714,23 @@ int is_known_dlg(struct sip_msg *msg) { int dlg_set_timeout_by_profile(struct dlg_profile_table *profile, str *value, int timeout) { - unsigned int i; + unsigned int i = 0; + dlg_cell_t *this_dlg = NULL; struct dlg_profile_hash *ph = NULL; + /* Private structure necessary for manipulating dialog + * timeouts outside of profile locks. Admittedly, an + * ugly hack, but avoids some concurrency issues. + */ + + struct dlg_map_list { + unsigned int h_id; + unsigned int h_entry; + struct dlg_map_list *next; + } *map_head, *map_scan, *map_scan_next; + + map_head = NULL; + /* If the profile has no value, iterate through every * node and set its timeout. */ @@ -730,11 +744,23 @@ int dlg_set_timeout_by_profile(struct dlg_profile_table *profile, if(!ph) continue; do { - if(update_dlg_timeout(ph->dlg, timeout) < 0) { - lock_release(&profile->lock); + struct dlg_map_list *d = malloc(sizeof(struct dlg_map_list)); + + if(!d) return -1; - } + memset(d, 0, sizeof(struct dlg_map_list)); + + d->h_id = ph->dlg->h_id; + d->h_entry = ph->dlg->h_entry; + + if(map_head == NULL) + map_head = d; + else { + d->next = map_head; + map_head = d; + } + ph = ph->next; } while(ph != profile->entries[i].first); } @@ -750,15 +776,24 @@ int dlg_set_timeout_by_profile(struct dlg_profile_table *profile, ph = profile->entries[i].first; if(ph) { - do { - if(value->len == ph->value.len && - memcmp(value->s, ph->value.s, - value->len) == 0) { + do { + if(ph && value->len == ph->value.len && + memcmp(value->s, ph->value.s, value->len) == 0) { + struct dlg_map_list *d = malloc(sizeof(struct dlg_map_list)); - if(update_dlg_timeout(ph->dlg, - timeout) < 0) { - lock_release(&profile->lock); + if(!d) return -1; + + memset(d, 0, sizeof(struct dlg_map_list)); + + d->h_id = ph->dlg->h_id; + d->h_entry = ph->dlg->h_entry; + + if(map_head == NULL) + map_head = d; + else { + d->next = map_head; + map_head = d; } } @@ -769,6 +804,27 @@ int dlg_set_timeout_by_profile(struct dlg_profile_table *profile, lock_release(&profile->lock); } + /* Walk the list and bulk-set the timeout */ + + for(map_scan = map_head; map_scan != NULL; map_scan = map_scan_next) { + map_scan_next = map_scan->next; + + this_dlg = dlg_lookup(map_scan->h_entry, map_scan->h_id); + + if(!this_dlg) { + LM_CRIT("Unable to find dialog %d:%d\n", map_scan->h_entry, map_scan->h_id); + } else if(this_dlg->state >= DLG_STATE_EARLY) { + if(update_dlg_timeout(this_dlg, timeout) < 0) { + LM_ERR("Unable to set timeout on %d:%d\n", map_scan->h_entry, + map_scan->h_id); + } + + dlg_release(this_dlg); + } + + free(map_scan); + } + return 0; }

12 years

git:pd/outbound: modules_k/outbound: Removed nat_test from here

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 68e07faf94e6aa8664f3d7116026d136062136b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68e07fa… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Dec 21 23:38:28 2012 +0000 modules_k/outbound: Removed nat_test from here - Will just use the one from nathelper when required. --- modules_k/outbound/ob_mod.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/modules_k/outbound/ob_mod.c b/modules_k/outbound/ob_mod.c index 78045b9..fbbee03 100644 --- a/modules_k/outbound/ob_mod.c +++ b/modules_k/outbound/ob_mod.c @@ -29,8 +29,6 @@ #include "../../lib/kcore/kstats_wrapper.h" #include "../../lib/kmi/mi.h" -#include "../nathelper/nat_uac_test.h" - #include "api.h" MODULE_VERSION @@ -42,9 +40,6 @@ static str ob_key = {0, 0}; static cmd_export_t cmds[]= { - { "ob_nat_uac_test", (cmd_function) nat_uac_test_f, - 1, fixup_uint_null, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, { "bind_ob", (cmd_function) bind_ob, 1, 0, 0, 0 },

12 years

git:pd/outbound: Merge branch 'master' into outbound

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 064120b137e05e3799399664dbc48d0d1d5ba01b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=064120b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Dec 21 23:34:35 2012 +0000 Merge branch 'master' into outbound * master: (592 commits) modules/app_lua: Updated app_lua to support URI lookup in registrar modules_k/registrar: Extended C-API to include a URI lookup pkg/kamailio/(centos|fedora): Added more modules moved from modules_s to modules to the build db_text More instructive error message modules_s/maxfwd: moved to obsolete folder maxfwd(k): max_limit module param can be changed at runtime uid_avp_db: fixed include from uid_domain module app_python: fixed complilation warnings [-Wformat] modules_s/uid_uri_db: moved to modules folder modules_s/uid_domain: moved to modules folder modules_s/uid_gflags: moved to modules folder modules_s/uid_avp_db: moved to modules folder modules_s/uid_auth_db: moved to modules folder modules_s/pike: moved to obsolete folder modules_s/uri_db: renamed to uid_uri_db modules_s/gflags: renamed to uid_gflags modules_s/domain: renamed to uid_domain uid_auth_db: updated doc file to the new name modules_s/avp_db: renamed to uid_avp_db modues_s/auth_db: renamed to uid_auth_db ... Conflicts: modules_k/nathelper/nathelper.c pkg/kamailio/centos/6/kamailio-build.appl pkg/kamailio/centos/6/kamailio.appl pkg/kamailio/fedora/16/kamailio-build.appl pkg/kamailio/fedora/16/kamailio.appl pkg/kamailio/fedora/16/kamailio.spec pkg/kamailio/fedora/17/kamailio-build.appl pkg/kamailio/fedora/17/kamailio.appl ---

12 years

git:master: modules/app_lua: Updated app_lua to support URI lookup in registrar

by Peter Dunkley

Module: sip-router Branch: master Commit: 72bee685f57ccd0637e1bc97093c9e5731c2d40f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72bee68… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Dec 21 23:10:05 2012 +0000 modules/app_lua: Updated app_lua to support URI lookup in registrar - Enhancement added by Hugh Waite @ Crocodile RCS --- modules/app_lua/app_lua_exp.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index 856bc0d..fad9864 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -1313,7 +1313,8 @@ static int lua_sr_registrar_save(lua_State *L) static int lua_sr_registrar_lookup(lua_State *L) { int ret; - char *table; + char *table = NULL; + str uri = {NULL, 0}; sr_lua_env_t *env_L; env_L = sr_lua_env_get(); @@ -1328,18 +1329,31 @@ static int lua_sr_registrar_lookup(lua_State *L) LM_WARN("invalid parameters from Lua env\n"); return app_lua_return_error(L); } - if(lua_gettop(L)!=1) + if(lua_gettop(L)==1) + { + table = (char*)lua_tostring(L, -1); + } + else if (lua_gettop(L)==2) + { + table = (char*)lua_tostring(L, -2); + uri.s = (char*)lua_tostring(L, -1); + uri.len = strlen(uri.s); + } else { LM_WARN("invalid number of parameters from Lua\n"); return app_lua_return_error(L); } - table = (char*)lua_tostring(L, -1); if(table==NULL || strlen(table)==0) { LM_WARN("invalid parameters from Lua\n"); return app_lua_return_error(L); } - ret = _lua_registrarb.lookup(env_L->msg, table); + if(lua_gettop(L)==2) + { + ret = _lua_registrarb.lookup_uri(env_L->msg, table, &uri); + } else { + ret = _lua_registrarb.lookup(env_L->msg, table); + } return app_lua_return_int(L, ret); }

12 years

git:master: modules_k/registrar: Extended C-API to include a URI lookup

by Peter Dunkley

Module: sip-router Branch: master Commit: 18a4a8a33939edc6e5d74fdc21c33d9835a62f61 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=18a4a8a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Dec 21 23:09:23 2012 +0000 modules_k/registrar: Extended C-API to include a URI lookup - Enhancement added by Hugh Waite @ Crocodile RCS --- modules_k/registrar/api.c | 16 ++++++++++++++++ modules_k/registrar/api.h | 4 ++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/modules_k/registrar/api.c b/modules_k/registrar/api.c index e676e91..adce1be 100644 --- a/modules_k/registrar/api.c +++ b/modules_k/registrar/api.c @@ -81,6 +81,21 @@ int regapi_lookup(struct sip_msg *msg, char *table) /** * */ +int regapi_lookup_uri(struct sip_msg *msg, char *table, str * uri) +{ + udomain_t* d; + + if(ul.get_udomain(table, &d)<0) + { + LM_ERR("usrloc domain [%s] not found\n", table); + return -1; + } + return lookup(msg, d, uri); +} + +/** + * + */ int regapi_registered(struct sip_msg *msg, char *table) { udomain_t* d; @@ -105,6 +120,7 @@ int bind_registrar(registrar_api_t* api) api->save = regapi_save; api->save_uri = regapi_save_uri; api->lookup = regapi_lookup; + api->lookup_uri = regapi_lookup_uri; api->registered = regapi_registered; return 0; diff --git a/modules_k/registrar/api.h b/modules_k/registrar/api.h index 3756015..006c596 100644 --- a/modules_k/registrar/api.h +++ b/modules_k/registrar/api.h @@ -40,6 +40,9 @@ int regapi_save_uri(struct sip_msg *msg, char *table, int flags, str *uri); typedef int (*regapi_lookup_f)(struct sip_msg *msg, char *table); int regapi_lookup(struct sip_msg *msg, char *table); +typedef int (*regapi_lookup_uri_f)(struct sip_msg *msg, char *table, str *uri); +int regapi_lookup_uri(struct sip_msg *msg, char *table, str *uri); + /** * @brief REGISTRAR API structure */ @@ -47,6 +50,7 @@ typedef struct registrar_api { regapi_save_f save; regapi_save_uri_f save_uri; regapi_lookup_f lookup; + regapi_lookup_uri_f lookup_uri; regapi_lookup_f registered; } registrar_api_t;

12 years

rpc commands for permissions(k)

by Daniel-Constantin Mierla

Hello, any developer with some spare time to add rpc commands to modules_k/permissions module? They should be the equivalent of existing mi commands. That should render modules_s/permissions obsolete. Thanks, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

12 years

git:master: pkg/kamailio/(centos|fedora): Added more modules moved from modules_s to modules to the build

by Peter Dunkley

Module: sip-router Branch: master Commit: 8030130f6b5819804dbe4d563abe197e13d1a54f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8030130… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Dec 21 22:52:55 2012 +0000 pkg/kamailio/(centos|fedora): Added more modules moved from modules_s to modules to the build --- pkg/kamailio/fedora/16/kamailio.spec | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index 93153c7..f3ec261 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -367,14 +367,14 @@ make every-module skip_modules="auth_identity db_cassandra iptrtpproxy \ kxml kperl ksnmpstats kxmpp kcarrierroute kberkeley kldap kutils \ kpurple ktls kwebsocket kpresence klua kpython kgeoip ksqlite kjson \ kredis kmono" \ - include_modules="cdp mangler xhttp_pi" + include_modules="cdp mangler print_lib xhttp_pi" %else make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" \ group_include="kstandard kmysql kpostgres kcpl kunixodbc \ kxml kperl ksnmpstats kxmpp kberkeley kldap kutils \ kpurple ktls kwebsocket kpresence klua kpython ksqlite" \ - include_modules="cdp mangler xhttp_pi" + include_modules="cdp mangler print_lib xhttp_pi" %endif make utils @@ -391,7 +391,7 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ kxml kperl ksnmpstats kxmpp kcarrierroute kberkeley kldap kutils\ kpurple ktls kwebsocket kpresence klua kpython kgeoip ksqlite kjson\ kredis kmono" \ - include_modules="cdp mangler xhttp_pi" + include_modules="cdp mangler print_lib xhttp_pi" mkdir -p $RPM_BUILD_ROOT/%{_unitdir} install -m644 pkg/kamailio/fedora/%{?fedora}/kamailio.service \ @@ -406,7 +406,7 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ group_include="kstandard kmysql kpostgres kcpl kunixodbc \ kxml kperl ksnmpstats kxmpp kberkeley kldap kutils \ kpurple ktls kwebsocket kpresence klua kpython ksqlite" \ - include_modules="cdp mangler xhttp_pi" + include_modules="cdp mangler print_lib xhttp_pi" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d install -m755 pkg/kamailio/centos/%{?centos}/kamailio.init \ @@ -496,6 +496,8 @@ fi %doc %{_docdir}/kamailio/modules/README.pdb %doc %{_docdir}/kamailio/modules/README.pipelimit %doc %{_docdir}/kamailio/modules/README.prefix_route +%doc %{_docdir}/kamailio/modules/README.print +%doc %{_docdir}/kamailio/modules/README.print_lib %doc %{_docdir}/kamailio/modules/README.ratelimit %doc %{_docdir}/kamailio/modules/README.rtpproxy %doc %{_docdir}/kamailio/modules/README.sanity @@ -510,6 +512,11 @@ fi %doc %{_docdir}/kamailio/modules/README.tm %doc %{_docdir}/kamailio/modules/README.tmrec %doc %{_docdir}/kamailio/modules/README.topoh +%doc %{_docdir}/kamailio/modules/README.uid_auth_db +%doc %{_docdir}/kamailio/modules/README.uid_avp_db +%doc %{_docdir}/kamailio/modules/README.uid_domain +%doc %{_docdir}/kamailio/modules/README.uid_gflags +%doc %{_docdir}/kamailio/modules/README.uid_uri_db %doc %{_docdir}/kamailio/modules/README.xhttp %doc %{_docdir}/kamailio/modules/README.xhttp_rpc %doc %{_docdir}/kamailio/modules/README.xlog @@ -587,6 +594,9 @@ fi %{_libdir}/kamailio/libkmi.so %{_libdir}/kamailio/libkmi.so.1 %{_libdir}/kamailio/libkmi.so.1.0 +%{_libdir}/kamailio/libprint.so +%{_libdir}/kamailio/libprint.so.1 +%{_libdir}/kamailio/libprint.so.1.2 %{_libdir}/kamailio/libsrdb1.so %{_libdir}/kamailio/libsrdb1.so.1 %{_libdir}/kamailio/libsrdb1.so.1.0 @@ -627,6 +637,8 @@ fi %{_libdir}/kamailio/modules/pdb.so %{_libdir}/kamailio/modules/pipelimit.so %{_libdir}/kamailio/modules/prefix_route.so +%{_libdir}/kamailio/modules/print.so +%{_libdir}/kamailio/modules/print_lib.so %{_libdir}/kamailio/modules/ratelimit.so %{_libdir}/kamailio/modules/rtpproxy.so %{_libdir}/kamailio/modules/sanity.so @@ -641,6 +653,11 @@ fi %{_libdir}/kamailio/modules/tm.so %{_libdir}/kamailio/modules/tmrec.so %{_libdir}/kamailio/modules/topoh.so +%{_libdir}/kamailio/modules/uid_auth_db.so +%{_libdir}/kamailio/modules/uid_avp_db.so +%{_libdir}/kamailio/modules/uid_domain.so +%{_libdir}/kamailio/modules/uid_gflags.so +%{_libdir}/kamailio/modules/uid_uri_db.so %{_libdir}/kamailio/modules/xhttp.so %{_libdir}/kamailio/modules/xhttp_rpc.so %{_libdir}/kamailio/modules/xlog.so @@ -1006,6 +1023,8 @@ fi %changelog * Fri Dec 21 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Added db2_ldap, db2_ops, and timer to the build + - Added uid_auth_db, uid_avp_db, uid_domain, uid_gflags, uid_uri_db, print, + and print_lib to the build * Thu Dec 13 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Added xhttp_pi framework examples to the installation - Added xhttp_pi README to the installation

12 years

git:oej/permissionsrpc: Merge branch 'master' into oej/permissionsrpc

by Olle E. Johansson

Module: sip-router Branch: oej/permissionsrpc Commit: 0d27bd3bab9af968444a75fe3359163d00030512 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d27bd3… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Fri Dec 21 23:17:18 2012 +0100 Merge branch 'master' into oej/permissionsrpc * master: (24 commits) db_text More instructive error message modules_s/maxfwd: moved to obsolete folder maxfwd(k): max_limit module param can be changed at runtime uid_avp_db: fixed include from uid_domain module app_python: fixed complilation warnings [-Wformat] modules_s/uid_uri_db: moved to modules folder modules_s/uid_domain: moved to modules folder modules_s/uid_gflags: moved to modules folder modules_s/uid_avp_db: moved to modules folder modules_s/uid_auth_db: moved to modules folder modules_s/pike: moved to obsolete folder modules_s/uri_db: renamed to uid_uri_db modules_s/gflags: renamed to uid_gflags modules_s/domain: renamed to uid_domain uid_auth_db: updated doc file to the new name modules_s/avp_db: renamed to uid_avp_db modues_s/auth_db: renamed to uid_auth_db modules_s/print_lib: moved to modules folder modules_s/print: moved to modules folder modules_s/print_lib: added readme and xml docbook files ... ---

12 years

git:oej/permissionsrpc: Adding rpc for address reload

by Olle E. Johansson

Module: sip-router Branch: oej/permissionsrpc Commit: 7e95598b0d5f20fd28afd56922a2d8b85f2478d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7e95598… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Fri Dec 21 23:09:53 2012 +0100 Adding rpc for address reload --- modules_k/permissions/address.c | 36 +++++++++++++++++++++++++++------- modules_k/permissions/mi.c | 12 +++++++++++ modules_k/permissions/mi.h | 1 + modules_k/permissions/permissions.c | 6 +++++ 4 files changed, 47 insertions(+), 8 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index 5dbe547..501d59e 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -1,5 +1,5 @@ + /* - * * allow_address related functions * * Copyright (C) 2006 Juha Heinanen @@ -136,14 +136,34 @@ int reload_address_table(void) for (i = 0; i < RES_ROW_N(res); i++) { val = ROW_VALUES(row + i); /* basic checks to db values */ - if ((ROW_N(row + i) != 5) - || (VAL_TYPE(val) != DB1_INT) || VAL_NULL(val) - || (VAL_INT(val) <= 0) - || (VAL_TYPE(val + 1) != DB1_STRING) || VAL_NULL(val + 1) - || (VAL_TYPE(val + 2) != DB1_INT) || VAL_NULL(val + 2) - || (VAL_TYPE(val + 3) != DB1_INT) || VAL_NULL(val + 3)) + if (ROW_N(row + i) != 5) + { + LM_DBG("failure during checks of db address table: Colums %d - expected 5\n", ROW_N(row + i)); + goto dberror; + } + if ((VAL_TYPE(val) != DB1_INT) || VAL_NULL(val) || (VAL_INT(val) <= 0)) + { + LM_DBG("failure during checks of database value 1 (group) in address table\n"); + goto dberror; + } + if ((VAL_TYPE(val + 1) != DB1_STRING) && (VAL_TYPE(val + 1) != DB1_STR)) + { + LM_DBG("failure during checks of database value 2 (IP address) in address table - not a string value\n"); + goto dberror; + } + if (VAL_NULL(val + 1)) + { + LM_DBG("failure during checks of database value 2 (IP address) in address table - NULL value not permitted\n"); + goto dberror; + } + if ((VAL_TYPE(val + 2) != DB1_INT) || VAL_NULL(val + 2)) + { + LM_DBG("failure during checks of database value 3 (subnet size/CIDR) in address table\n"); + goto dberror; + } + if ((VAL_TYPE(val + 3) != DB1_INT) || VAL_NULL(val + 3)) { - LM_DBG("failure during checks of db values\n"); + LM_DBG("failure during checks of database value 4 (port) in address table\n"); goto dberror; } gid = VAL_UINT(val); diff --git a/modules_k/permissions/mi.c b/modules_k/permissions/mi.c index 9c3fb1a..22a8d47 100644 --- a/modules_k/permissions/mi.c +++ b/modules_k/permissions/mi.c @@ -102,6 +102,18 @@ struct mi_root* mi_address_reload(struct mi_root *cmd_tree, void *param) } } +/*! \brief + * RPC function to reload address table + */ +void rpc_address_reload(rpc_t* rpc, void* c) { + if (reload_address_table () != 1) { + rpc->fault(c, 500, "Reload failed."); + return; + } + + rpc->printf(c, "Reload OK"); + return; +} /* * MI function to print address entries from current hash table diff --git a/modules_k/permissions/mi.h b/modules_k/permissions/mi.h index f37f4d5..5b271bd 100644 --- a/modules_k/permissions/mi.h +++ b/modules_k/permissions/mi.h @@ -45,6 +45,7 @@ void rpc_trusted_reload(rpc_t* rpc, void* c); struct mi_root* mi_trusted_dump(struct mi_root *cmd, void *param); struct mi_root* mi_address_reload(struct mi_root *cmd, void *param); +void rpc_address_reload(rpc_t* rpc, void* c); struct mi_root* mi_address_dump(struct mi_root *cmd, void *param); diff --git a/modules_k/permissions/permissions.c b/modules_k/permissions/permissions.c index 6e4fef0..e96a271 100644 --- a/modules_k/permissions/permissions.c +++ b/modules_k/permissions/permissions.c @@ -989,8 +989,14 @@ static const char* rpc_trusted_reload_doc[2] = { 0 }; +static const char* rpc_address_reload_doc[2] = { + "Reload permissions address table", + 0 +}; + rpc_export_t permissions_rpc[] = { {"permissions.trustedreload", rpc_trusted_reload, rpc_trusted_reload_doc, 0}, + {"permissions.addressreload", rpc_address_reload, rpc_address_reload_doc, 0}, {0, 0, 0, 0} };

12 years

← Newer
1
...
10
11
12
13
14
15
16
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012