sr-dev October 2010

sr-dev@lists.kamailio.org

33 participants
336 discussions

git:tirpi/cfg_framework_multivalue: cfg framework: cfg_select() and cfg_reset() added
by Miklos Tirpak 04 Oct '10

04 Oct '10

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 415f24a4f46c8f76c58122d18b943f6e4f0b58d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=415f24a… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Oct 4 15:35:59 2010 +0200 cfg framework: cfg_select() and cfg_reset() added cfg_select("group_name", "var_name") can be used to move a group handle to a specifig group instance in the script. Evey variable access within that group will be made from the new group instance until the handle is reset, practically until the end of the script unless cfg_reset("group_name") is explicitely called. This is true both for custom, module, and core variables, i.e. every configuration group can have multiple set of values. --- action.c | 35 +++++++++++++++++++++++++++++++++++ cfg.lex | 6 ++++++ cfg.y | 17 ++++++++++++++++- route.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ route_struct.h | 7 +++++-- 5 files changed, 117 insertions(+), 3 deletions(-) diff --git a/action.c b/action.c index 8349ff9..317b192 100644 --- a/action.c +++ b/action.c @@ -93,6 +93,7 @@ #endif #include "switch.h" #include "events.h" +#include "cfg/cfg_struct.h" #include <sys/types.h> #include <sys/socket.h> @@ -1463,6 +1464,40 @@ match_cleanup: msg->rpl_send_flags.f|= SND_F_CON_CLOSE; ret=1; /* continue processing */ break; + case CFG_SELECT_T: + if (a->val[0].type != CFG_GROUP_ST) { + BUG("unsupported parameter in CFG_SELECT_T: %d\n", + a->val[0].type); + ret=-1; + goto error; + } + switch(a->val[1].type) { + case NUMBER_ST: + v=(int)a->val[1].u.number; + break; + case RVE_ST: + if (rval_expr_eval_int(h, msg, &v, (struct rval_expr*)a->val[1].u.data) < 0) { + ret=-1; + goto error; + } + break; + default: + BUG("unsupported group id type in CFG_SELECT_T: %d\n", + a->val[1].type); + ret=-1; + goto error; + } + ret=(cfg_select((cfg_group_t*)a->val[0].u.data, v) == 0) ? 1 : -1; + break; + case CFG_RESET_T: + if (a->val[0].type != CFG_GROUP_ST) { + BUG("unsupported parameter in CFG_RESET_T: %d\n", + a->val[0].type); + ret=-1; + goto error; + } + ret=(cfg_reset((cfg_group_t*)a->val[0].u.data) == 0) ? 1 : -1; + break; /* default: LOG(L_CRIT, "BUG: do_action: unknown type %d\n", a->type); diff --git a/cfg.lex b/cfg.lex index 11822ea..07c7b90 100644 --- a/cfg.lex +++ b/cfg.lex @@ -251,6 +251,9 @@ WHILE "while" INCLUDEFILE "include_file" +CFG_SELECT "cfg_select" +CFG_RESET "cfg_reset" + /*ACTION LVALUES*/ URIHOST "uri:host" URIPORT "uri:port" @@ -635,6 +638,9 @@ SUBST subst <INITIAL>{INCLUDEFILE} { count(); BEGIN(INCLF); } +<INITIAL>{CFG_SELECT} { count(); yylval.strval=yytext; return CFG_SELECT; } +<INITIAL>{CFG_RESET} { count(); yylval.strval=yytext; return CFG_RESET; } + <INITIAL>{URIHOST} { count(); yylval.strval=yytext; return URIHOST; } <INITIAL>{URIPORT} { count(); yylval.strval=yytext; return URIPORT; } diff --git a/cfg.y b/cfg.y index c43792b..9f913c6 100644 --- a/cfg.y +++ b/cfg.y @@ -101,7 +101,7 @@ * 2010-02-17 added blacklist imask (DST_BLST_*_IMASK) support (andrei) */ -%expect 5 +%expect 6 %{ @@ -347,6 +347,8 @@ extern char *finame; %token CASE %token DEFAULT %token WHILE +%token CFG_SELECT +%token CFG_RESET %token URIHOST %token URIPORT %token MAX_LEN @@ -3259,6 +3261,19 @@ cmd: | SET_RPL_CLOSE { $$=mk_action(SET_RPL_CLOSE_T, 0); set_cfg_pos($$); } + | CFG_SELECT LPAREN STRING COMMA NUMBER RPAREN { + $$=mk_action(CFG_SELECT_T, 2, STRING_ST, $3, NUMBER_ST, (void*)$5); set_cfg_pos($$); + } + | CFG_SELECT LPAREN STRING COMMA rval_expr RPAREN { + $$=mk_action(CFG_SELECT_T, 2, STRING_ST, $3, RVE_ST, $5); set_cfg_pos($$); + } + | CFG_SELECT error { $$=0; yyerror("missing '(' or ')' ?"); } + | CFG_SELECT LPAREN error RPAREN { $$=0; yyerror("bad arguments, string and number expected"); } + | CFG_RESET LPAREN STRING RPAREN { + $$=mk_action(CFG_RESET_T, 1, STRING_ST, $3); set_cfg_pos($$); + } + | CFG_RESET error { $$=0; yyerror("missing '(' or ')' ?"); } + | CFG_RESET LPAREN error RPAREN { $$=0; yyerror("bad arguments, string expected"); } | ID {mod_func_action = mk_action(MODULE0_T, 2, MODEXP_ST, NULL, NUMBER_ST, 0); } LPAREN func_params RPAREN { mod_func_action->val[0].u.data = diff --git a/route.c b/route.c index 45de184..dbdbf78 100644 --- a/route.c +++ b/route.c @@ -94,6 +94,7 @@ #include "ut.h" #include "rvalue.h" #include "switch.h" +#include "cfg/cfg_struct.h" #define RT_HASH_SIZE 8 /* route names hash */ @@ -1149,6 +1150,60 @@ int fix_actions(struct action* a) goto error; } break; + case CFG_SELECT_T: + if (t->val[1].type == RVE_ST) { + rve = t->val[1].u.data; + if (rve_is_constant(rve)) { + /* if expression is constant => evaluate it + as integer and replace it with the corresp. + int */ + rv = rval_expr_eval(0, 0, rve); + if (rv == 0 || + rval_get_int( 0, 0, &i, rv, 0) < 0 ) { + ERR("failed to fix constant rve"); + if (rv) rval_destroy(rv); + ret = E_BUG; + goto error; + } + rval_destroy(rv); + rve_destroy(rve); + t->val[1].type = NUMBER_ST; + t->val[1].u.number = i; + } else { + /* expression is not constant => fixup & + optimize it */ + if ((ret=fix_rval_expr(rve)) + < 0) { + ERR("rve fixup failed\n"); + ret = E_BUG; + goto error; + } + } + } else if (t->val[1].type != NUMBER_ST) { + BUG("invalid subtype %d for cfg_select()\n", + t->val[1].type); + ret = E_BUG; + goto error; + } + + case CFG_RESET_T: + if (t->val[0].type != STRING_ST) { + BUG("invalid subtype %d for cfg_select() or cfg_reset()\n", + t->val[0].type); + ret = E_BUG; + goto error; + } + tmp_p = (void *)cfg_lookup_group(t->val[0].u.string, strlen(t->val[0].u.string)); + if (!tmp_p) { + ERR("configuration group \"%s\" not found\n", + t->val[0].u.string); + ret = E_SCRIPT; + goto error; + } + pkg_free(t->val[0].u.string); + t->val[0].u.data = tmp_p; + t->val[0].type = CFG_GROUP_ST; + break; default: /* no fixup required for the rest */ break; diff --git a/route_struct.h b/route_struct.h index 2d4a643..9c504d1 100644 --- a/route_struct.h +++ b/route_struct.h @@ -115,7 +115,9 @@ enum action_type{ SET_FWD_NO_CONNECT_T, SET_RPL_NO_CONNECT_T, SET_FWD_CLOSE_T, - SET_RPL_CLOSE_T + SET_RPL_CLOSE_T, + CFG_SELECT_T, + CFG_RESET_T }; /* parameter types for actions or types for expression right operands (WARNING right operands only, not working for left operands) */ @@ -130,7 +132,8 @@ enum _operand_subtype{ SELECT_UNFIXED_ST, STRING_RVE_ST /* RVE converted to a string (fparam hack) */, RVE_FREE_FIXUP_ST /* (str)RVE fixed up by a reversable fixup */, - FPARAM_DYN_ST /* temporary only (fparam hack) */ + FPARAM_DYN_ST /* temporary only (fparam hack) */, + CFG_GROUP_ST }; typedef enum _expr_l_type expr_l_type;

1 1

git:master: modules/lcr: added note about 'kamctl eval_weights' command
by Juha Heinanen 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: fcd61b36e044a560432fc150170aba3a04b06b7c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fcd61b3… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Oct 4 18:04:02 2010 +0300 modules/lcr: added note about 'kamctl eval_weights' command --- modules/lcr/README | 7 ++++--- modules/lcr/doc/lcr_admin.xml | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index 8fa8a98..617c0e0 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -235,9 +235,10 @@ Chapter 1. Admin Guide Weight is an integer value from 1 to 254. Weight implementation is fast, but unfair favoring larger weight values at the expense smaller ones. For example, if two gateways have weights 1 and 2, probability - that the gateway with weight 1 is tried first is 1/4, not 1/3. A script - is provided in lcr/utils directory that can be used to check the - probabilities resulting from a given set of weight values. + that the gateway with weight 1 is tried first is 1/4, not 1/3. Two + scripts are provided in lcr/utils directory that can be used to check + the probabilities resulting from a given set of weight values. Same can + be done with command 'kamctl eval_weights'. The function next_gw() can then be used to select one gateway at a time for forwarding. Upon each call, unless "dont_strip_of_tag" flag is set, diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 562a7c0..12f2d09 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -73,8 +73,9 @@ fast, but unfair favoring larger weight values at the expense smaller ones. For example, if two gateways have weights 1 and 2, probability that the gateway with weight 1 is tried first is 1/4, not 1/3. - A script is provided in lcr/utils directory that can be used to + Two scripts are provided in lcr/utils directory that can be used to check the probabilities resulting from a given set of weight values. + Same can be done with command 'kamctl eval_weights'. </para> <para> The function <emphasis>next_gw()</emphasis> can then be used to

1 0

About child_init function
by Iñaki Baz Castillo 04 Oct '10

04 Oct '10

Hi, according to kamailio-devel-guide child_init function is just called for kamailio workers: 16.10.6. Module Child Init Function This is the function called just after KAMAILIO (OPENSER) forks its worker processes. but later it says: The function gets as parameter the rank of the child process. The rank is a positive number if it is a worker process and negative for special processes like timer processes or TCP attendant. So my question is: should I check the rank parameter in child_init function just to run the code for real workers? For example, in modules_k/alias_db module I see: ----------------------------------------------- static int child_init(int rank) { if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) return 0; /* do nothing for the main process */ db_handle = adbf.init(&db_url); if (!db_handle) { LM_ERR("unable to connect database\n"); return -1; } return 0; } --------------------------------------------- But in modules/db_flatstore I see: --------------------------------------------- /* * FIXME: We should check whether just calling km_child_init would really work * here. This function comes from kamailio and since the core of sip-router is * based on SER 2.0, the way how child_init is called and values of the rank * variable could be incompatible with km_child_init function. A solution here * would be to rewrite km_child_init with ser 2.0 init stuff in mind. */ static int child_init(int rank) { char* tmp; unsigned int v; km_child_init(rank); if (rank <= 0) { v = -rank; } else { v = rank - PROC_MIN; } [...] --------------------------------------------- I just want child_init to be run for workers, and no por other special processes. Also I'm writting the module under modules/ so, what should I do to achieve it? Thanks a lot. -- Iñaki Baz Castillo <ibc(a)aliax.net>

3 6

git:tirpi/cfg_framework_multivalue: cfg framework: group handle can be moved runtime
by Miklos Tirpak 04 Oct '10

04 Oct '10

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: b062f42f4353802b03dba4cee41909657b4a5ffe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b062f42… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Oct 4 15:26:58 2010 +0200 cfg framework: group handle can be moved runtime Added support for moving the group handles between the default configuration and different group instances runtime. The handles are reset when cfg_update() is called the next time, or it can be reset explicitely. --- cfg/cfg_struct.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++- cfg/cfg_struct.h | 52 +++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+), 1 deletions(-) diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index 358e4eb..30bd101 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -32,6 +32,7 @@ #include "../mem/shm_mem.h" #include "../ut.h" #include "../locking.h" +#include "../bit_scan.h" #include "cfg_ctx.h" #include "cfg_script.h" #include "cfg_select.h" @@ -42,7 +43,7 @@ cfg_block_t **cfg_global = NULL; /* pointer to the active cfg block */ cfg_block_t *cfg_local = NULL; /* per-process pointer to the active cfg block. Updated only when the child process finishes working on the SIP message */ -static int cfg_block_size = 0; /* size of the cfg block including the meta-data (constant) */ +int cfg_block_size = 0; /* size of the cfg block including the meta-data (constant) */ gen_lock_t *cfg_global_lock = 0; /* protects *cfg_global */ gen_lock_t *cfg_writer_lock = 0; /* This lock makes sure that two processes do not try to clone *cfg_global at the same time. @@ -55,6 +56,7 @@ cfg_child_cb_t **cfg_child_cb_first = NULL; /* first item of the per-child proce callback list */ cfg_child_cb_t **cfg_child_cb_last = NULL; /* last item of the above list */ cfg_child_cb_t *cfg_child_cb = NULL; /* pointer to the previously executed cb */ +int cfg_ginst_count = 0; /* number of group instances set within the child process */ /* forward declarations */ @@ -1057,3 +1059,96 @@ error: shm_free(new_array); return -1; } + +/* Move the group handle to the specified group instance pointed by dst_ginst. + * src_ginst shall point to the active group instance. + * Both parameters can be NULL meaning that the src/dst config is the default, + * not an additional group instance. + * The function executes all the per-child process callbacks which are different + * in the two instaces. + */ +void cfg_move_handle(cfg_group_t *group, cfg_group_inst_t *src_ginst, cfg_group_inst_t *dst_ginst) +{ + cfg_mapping_t *var; + unsigned int bitmap; + int i, pos; + str gname, vname; + + if (src_ginst == dst_ginst) + return; /* nothing to do */ + + /* move the handle to the variables of the dst group instance, + or to the local config if no dst group instance is specified */ + *(group->handle) = dst_ginst ? + dst_ginst->vars + : CFG_GROUP_DATA(cfg_local, group); + + /* call the per child process callback of those variables + that have different value in the two group instances */ + /* TODO: performance optimization: this entire loop can be + skipped if the group does not have any variable with + per-child process callback. Use some flag in the group + structure for this purpose. */ + gname.s = group->name; + gname.len = group->name_len; + for (i = 0; i < CFG_MAX_VAR_NUM/(sizeof(int)*8); i++) { + bitmap = ((src_ginst) ? src_ginst->set[i] : 0U) + | ((dst_ginst) ? dst_ginst->set[i] : 0U); + while (bitmap) { + pos = bit_scan_forward32(bitmap); + var = &group->mapping[pos + i*sizeof(int)*8]; + if (var->def->on_set_child_cb) { + vname.s = var->def->name; + vname.len = var->name_len; + var->def->on_set_child_cb(&gname, &vname); + } + bitmap -= (1U << pos); + } + } + /* keep track of how many group instences are set in the child process */ + if (!src_ginst && dst_ginst) + cfg_ginst_count++; + else if (!dst_ginst) + cfg_ginst_count--; +#ifdef EXTRA_DEBUG + if (cfg_ginst_count < 0) + LOG(L_ERR, "ERROR: cfg_select(): BUG, cfg_ginst_count is negative: %d. group=%.*s\n", + cfg_ginst_count, group->name_len, group->name); +#endif + return; +} + +/* Move the group handle to the specified group instance. */ +int cfg_select(cfg_group_t *group, unsigned int id) +{ + cfg_group_inst_t *ginst; + + if (!(ginst = cfg_find_group(CFG_GROUP_META(cfg_local, group), + group->size, + id)) + ) { + LOG(L_ERR, "ERROR: cfg_select(): group instance '%.*s[%u]' does not exist\n", + group->name_len, group->name, id); + return -1; + } + + cfg_move_handle(group, + CFG_HANDLE_TO_GINST(*(group->handle)), /* the active group instance */ + ginst); + + LOG(L_DBG, "DEBUG: cfg_select(): group instance '%.*s[%u]' has been selected\n", + group->name_len, group->name, id); + return 0; +} + +/* Reset the group handle to the default, local configuration */ +int cfg_reset(cfg_group_t *group) +{ + cfg_move_handle(group, + CFG_HANDLE_TO_GINST(*(group->handle)), /* the active group instance */ + NULL); + + LOG(L_DBG, "DEBUG: cfg_reset(): default group '%.*s' has been selected\n", + group->name_len, group->name); + return 0; +} diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h index 545554c..0c62a3d 100644 --- a/cfg/cfg_struct.h +++ b/cfg/cfg_struct.h @@ -163,12 +163,14 @@ typedef struct _cfg_child_cb { extern cfg_group_t *cfg_group; extern cfg_block_t **cfg_global; extern cfg_block_t *cfg_local; +extern int cfg_block_size; extern gen_lock_t *cfg_global_lock; extern gen_lock_t *cfg_writer_lock; extern int cfg_shmized; extern cfg_child_cb_t **cfg_child_cb_first; extern cfg_child_cb_t **cfg_child_cb_last; extern cfg_child_cb_t *cfg_child_cb; +extern int cfg_ginst_count; /* magic value for cfg_child_cb for processes that do not want to execute per-child callbacks */ @@ -196,6 +198,15 @@ extern cfg_child_cb_t *cfg_child_cb; #define CFG_VAR_TEST_AND_SET(group_inst, var) \ bit_test_and_set((var)->pos % (sizeof(int)*8), (group_inst)->set + (var)->pos/(sizeof(int)*8)) +/* Return the group instance pointer from a handle, + * or NULL if the handle points to the default configuration block */ +#define CFG_HANDLE_TO_GINST(h) \ + ( (((unsigned char*)(h) < cfg_local->vars) \ + || ((unsigned char*)(h) > cfg_local->vars + cfg_block_size) \ + ) ? \ + (cfg_group_inst_t*)((char*)(h) - (unsigned long)&((cfg_group_inst_t *)0)->vars) \ + : NULL ) + /* initiate the cfg framework */ int sr_cfg_init(void); @@ -268,6 +279,16 @@ static inline void cfg_block_free(cfg_block_t *block) shm_free(block); } +/* Move the group handle to the specified group instance pointed by dst_ginst. + * src_ginst shall point to the active group instance. + * Both parameters can be NULL meaning that the src/dst config is the default, + * not an additional group instance. + * The function executes all the per-child process callbacks which are different + * in the two instaces. + */ +void cfg_move_handle(cfg_group_t *group, cfg_group_inst_t *src_ginst, cfg_group_inst_t *dst_ginst); + + /* lock and unlock the global cfg block -- used only at the * very last step when the block is replaced */ #define CFG_LOCK() lock_get(cfg_global_lock); @@ -352,6 +373,29 @@ static inline void cfg_update_local(int no_cbs) } } +/* Reset all the group handles to the default, local configuration */ +static inline void cfg_reset_handles(void) +{ + cfg_group_t *group; + + if (!cfg_local) + return; + + for ( group = cfg_group; + group && cfg_ginst_count; /* cfg_ginst_count is decreased every time + a group handle is reset. When it reaches 0, + needless to continue the loop */ + group = group->next + ) { + if (((unsigned char*)*(group->handle) < cfg_local->vars) + || ((unsigned char*)*(group->handle) > cfg_local->vars + cfg_block_size) + ) + cfg_move_handle(group, + CFG_HANDLE_TO_GINST(*(group->handle)), + NULL); + } +} + /* sets the local cfg block to the active block * * If your module forks a new process that implements @@ -361,6 +405,8 @@ static inline void cfg_update_local(int no_cbs) */ #define cfg_update() \ do { \ + if (unlikely(cfg_ginst_count)) \ + cfg_reset_handles(); \ if (unlikely(cfg_local != *cfg_global)) \ cfg_update_local(0); \ } while(0) @@ -446,4 +492,10 @@ void cfg_child_cb_free(cfg_child_cb_t *child_cb_first); int new_add_var(str *group_name, unsigned int group_id, str *var_name, void *val, unsigned int type); +/* Move the group handle to the specified group instance. */ +int cfg_select(cfg_group_t *group, unsigned int id); + +/* Reset the group handle to the default, local configuration */ +int cfg_reset(cfg_group_t *group); + #endif /* _CFG_STRUCT_H */

1 0

git:tirpi/cfg_framework_multivalue: cfg framework: timer must reset the handles more frequently
by Miklos Tirpak 04 Oct '10

04 Oct '10

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 58829230eec1efba3cd1b217d6d55127fec152d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5882923… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Oct 4 16:27:24 2010 +0200 cfg framework: timer must reset the handles more frequently The timer processes must reset the cfg group handles after each registered timer function is executed, otherwise cfg_select() in one function may influence another function. --- cfg/cfg_struct.h | 10 ++++++++++ timer.c | 4 ++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h index 0c62a3d..adde858 100644 --- a/cfg/cfg_struct.h +++ b/cfg/cfg_struct.h @@ -421,6 +421,16 @@ static inline void cfg_reset_handles(void) cfg_update_local(1); \ } while(0) +/* Reset all the group handles in the child process, + * i.e. move them back to the default local configuration. + */ +#define cfg_reset_all() \ + do { \ + if (unlikely(cfg_ginst_count)) \ + cfg_reset_handles(); \ + } while(0) + + /* searches a group by name */ cfg_group_t *cfg_lookup_group(char *name, int len); diff --git a/timer.c b/timer.c index ddce7e2..efba92d 100644 --- a/timer.c +++ b/timer.c @@ -892,6 +892,8 @@ inline static void timer_list_expire(ticks_t t, struct timer_head* h #endif UNLOCK_TIMER_LIST(); /* acts also as write barrier */ ret=tl->f(t, tl, tl->data); + /* reset the configuration group handles */ + cfg_reset_all(); if (ret==0){ UNSET_RUNNING(); LOCK_TIMER_LIST(); @@ -1147,6 +1149,8 @@ void slow_timer_main() SET_RUNNING_SLOW(tl); UNLOCK_SLOW_TIMER_LIST(); ret=tl->f(*ticks, tl, tl->data); + /* reset the configuration group handles */ + cfg_reset_all(); if (ret==0){ /* one shot */ UNSET_RUNNING_SLOW();

1 0

git:master: jabber(s): module moved to obsolete/jabber_s
by Daniel-Constantin Mierla 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: d786ff957bb997826ec8c027bc15ef56db7e3df8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d786ff9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 4 16:26:25 2010 +0200 jabber(s): module moved to obsolete/jabber_s --- {modules_s/jabber => obsolete/jabber_s}/Makefile | 0 {modules_s/jabber => obsolete/jabber_s}/README | 0 .../jabber => obsolete/jabber_s}/doc/Makefile | 0 .../jabber => obsolete/jabber_s}/doc/admin.xml | 0 .../jabber => obsolete/jabber_s}/doc/faq.txt | 0 .../jabber => obsolete/jabber_s}/doc/functions.xml | 0 .../jabber => obsolete/jabber_s}/doc/gateways.txt | 0 .../jabber => obsolete/jabber_s}/doc/jabber.xml | 0 .../jabber => obsolete/jabber_s}/doc/params.xml | 0 .../jabber => obsolete/jabber_s}/doc/regjab.pl | 0 .../jabber_s}/doc/web/libjab.php | 0 .../jabber_s}/doc/web/subscribe.php | 0 .../jabber => obsolete/jabber_s}/doc/xjab.cfg | 0 .../jabber => obsolete/jabber_s}/doc/xjab.sql | 0 .../jabber => obsolete/jabber_s}/doc/xxjab.cfg | 0 {modules_s/jabber => obsolete/jabber_s}/jabber.c | 0 {modules_s/jabber => obsolete/jabber_s}/mdefines.h | 0 .../jabber => obsolete/jabber_s}/ser-jabber.cfg | 0 {modules_s/jabber => obsolete/jabber_s}/sha.c | 0 {modules_s/jabber => obsolete/jabber_s}/tree234.c | 0 {modules_s/jabber => obsolete/jabber_s}/tree234.h | 0 .../jabber => obsolete/jabber_s}/xjab_base.c | 0 .../jabber => obsolete/jabber_s}/xjab_base.h | 0 .../jabber => obsolete/jabber_s}/xjab_dmsg.h | 0 .../jabber => obsolete/jabber_s}/xjab_jcon.c | 0 .../jabber => obsolete/jabber_s}/xjab_jcon.h | 0 .../jabber => obsolete/jabber_s}/xjab_jconf.c | 0 .../jabber => obsolete/jabber_s}/xjab_jconf.h | 0 .../jabber => obsolete/jabber_s}/xjab_load.c | 0 .../jabber => obsolete/jabber_s}/xjab_load.h | 0 .../jabber => obsolete/jabber_s}/xjab_presence.c | 0 .../jabber => obsolete/jabber_s}/xjab_presence.h | 0 .../jabber => obsolete/jabber_s}/xjab_util.c | 0 .../jabber => obsolete/jabber_s}/xjab_util.h | 0 .../jabber => obsolete/jabber_s}/xjab_wlist.c | 0 .../jabber => obsolete/jabber_s}/xjab_worker.c | 0 .../jabber => obsolete/jabber_s}/xjab_worker.h | 0 {modules_s/jabber => obsolete/jabber_s}/xode.c | 0 {modules_s/jabber => obsolete/jabber_s}/xode.h | 0 .../jabber => obsolete/jabber_s}/xode_from.c | 0 {modules_s/jabber => obsolete/jabber_s}/xode_str.c | 0 {modules_s/jabber => obsolete/jabber_s}/xpool.c | 0 .../jabber => obsolete/jabber_s}/xsnprintf.c | 0 {modules_s/jabber => obsolete/jabber_s}/xstream.c | 0 44 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_s/jabber/Makefile b/obsolete/jabber_s/Makefile similarity index 100% rename from modules_s/jabber/Makefile rename to obsolete/jabber_s/Makefile diff --git a/modules_s/jabber/README b/obsolete/jabber_s/README similarity index 100% rename from modules_s/jabber/README rename to obsolete/jabber_s/README diff --git a/modules_s/jabber/doc/Makefile b/obsolete/jabber_s/doc/Makefile similarity index 100% rename from modules_s/jabber/doc/Makefile rename to obsolete/jabber_s/doc/Makefile diff --git a/modules_s/jabber/doc/admin.xml b/obsolete/jabber_s/doc/admin.xml similarity index 100% rename from modules_s/jabber/doc/admin.xml rename to obsolete/jabber_s/doc/admin.xml diff --git a/modules_s/jabber/doc/faq.txt b/obsolete/jabber_s/doc/faq.txt similarity index 100% rename from modules_s/jabber/doc/faq.txt rename to obsolete/jabber_s/doc/faq.txt diff --git a/modules_s/jabber/doc/functions.xml b/obsolete/jabber_s/doc/functions.xml similarity index 100% rename from modules_s/jabber/doc/functions.xml rename to obsolete/jabber_s/doc/functions.xml diff --git a/modules_s/jabber/doc/gateways.txt b/obsolete/jabber_s/doc/gateways.txt similarity index 100% rename from modules_s/jabber/doc/gateways.txt rename to obsolete/jabber_s/doc/gateways.txt diff --git a/modules_s/jabber/doc/jabber.xml b/obsolete/jabber_s/doc/jabber.xml similarity index 100% rename from modules_s/jabber/doc/jabber.xml rename to obsolete/jabber_s/doc/jabber.xml diff --git a/modules_s/jabber/doc/params.xml b/obsolete/jabber_s/doc/params.xml similarity index 100% rename from modules_s/jabber/doc/params.xml rename to obsolete/jabber_s/doc/params.xml diff --git a/modules_s/jabber/doc/regjab.pl b/obsolete/jabber_s/doc/regjab.pl similarity index 100% rename from modules_s/jabber/doc/regjab.pl rename to obsolete/jabber_s/doc/regjab.pl diff --git a/modules_s/jabber/doc/web/libjab.php b/obsolete/jabber_s/doc/web/libjab.php similarity index 100% rename from modules_s/jabber/doc/web/libjab.php rename to obsolete/jabber_s/doc/web/libjab.php diff --git a/modules_s/jabber/doc/web/subscribe.php b/obsolete/jabber_s/doc/web/subscribe.php similarity index 100% rename from modules_s/jabber/doc/web/subscribe.php rename to obsolete/jabber_s/doc/web/subscribe.php diff --git a/modules_s/jabber/doc/xjab.cfg b/obsolete/jabber_s/doc/xjab.cfg similarity index 100% rename from modules_s/jabber/doc/xjab.cfg rename to obsolete/jabber_s/doc/xjab.cfg diff --git a/modules_s/jabber/doc/xjab.sql b/obsolete/jabber_s/doc/xjab.sql similarity index 100% rename from modules_s/jabber/doc/xjab.sql rename to obsolete/jabber_s/doc/xjab.sql diff --git a/modules_s/jabber/doc/xxjab.cfg b/obsolete/jabber_s/doc/xxjab.cfg similarity index 100% rename from modules_s/jabber/doc/xxjab.cfg rename to obsolete/jabber_s/doc/xxjab.cfg diff --git a/modules_s/jabber/jabber.c b/obsolete/jabber_s/jabber.c similarity index 100% rename from modules_s/jabber/jabber.c rename to obsolete/jabber_s/jabber.c diff --git a/modules_s/jabber/mdefines.h b/obsolete/jabber_s/mdefines.h similarity index 100% rename from modules_s/jabber/mdefines.h rename to obsolete/jabber_s/mdefines.h diff --git a/modules_s/jabber/ser-jabber.cfg b/obsolete/jabber_s/ser-jabber.cfg similarity index 100% rename from modules_s/jabber/ser-jabber.cfg rename to obsolete/jabber_s/ser-jabber.cfg diff --git a/modules_s/jabber/sha.c b/obsolete/jabber_s/sha.c similarity index 100% rename from modules_s/jabber/sha.c rename to obsolete/jabber_s/sha.c diff --git a/modules_s/jabber/tree234.c b/obsolete/jabber_s/tree234.c similarity index 100% rename from modules_s/jabber/tree234.c rename to obsolete/jabber_s/tree234.c diff --git a/modules_s/jabber/tree234.h b/obsolete/jabber_s/tree234.h similarity index 100% rename from modules_s/jabber/tree234.h rename to obsolete/jabber_s/tree234.h diff --git a/modules_s/jabber/xjab_base.c b/obsolete/jabber_s/xjab_base.c similarity index 100% rename from modules_s/jabber/xjab_base.c rename to obsolete/jabber_s/xjab_base.c diff --git a/modules_s/jabber/xjab_base.h b/obsolete/jabber_s/xjab_base.h similarity index 100% rename from modules_s/jabber/xjab_base.h rename to obsolete/jabber_s/xjab_base.h diff --git a/modules_s/jabber/xjab_dmsg.h b/obsolete/jabber_s/xjab_dmsg.h similarity index 100% rename from modules_s/jabber/xjab_dmsg.h rename to obsolete/jabber_s/xjab_dmsg.h diff --git a/modules_s/jabber/xjab_jcon.c b/obsolete/jabber_s/xjab_jcon.c similarity index 100% rename from modules_s/jabber/xjab_jcon.c rename to obsolete/jabber_s/xjab_jcon.c diff --git a/modules_s/jabber/xjab_jcon.h b/obsolete/jabber_s/xjab_jcon.h similarity index 100% rename from modules_s/jabber/xjab_jcon.h rename to obsolete/jabber_s/xjab_jcon.h diff --git a/modules_s/jabber/xjab_jconf.c b/obsolete/jabber_s/xjab_jconf.c similarity index 100% rename from modules_s/jabber/xjab_jconf.c rename to obsolete/jabber_s/xjab_jconf.c diff --git a/modules_s/jabber/xjab_jconf.h b/obsolete/jabber_s/xjab_jconf.h similarity index 100% rename from modules_s/jabber/xjab_jconf.h rename to obsolete/jabber_s/xjab_jconf.h diff --git a/modules_s/jabber/xjab_load.c b/obsolete/jabber_s/xjab_load.c similarity index 100% rename from modules_s/jabber/xjab_load.c rename to obsolete/jabber_s/xjab_load.c diff --git a/modules_s/jabber/xjab_load.h b/obsolete/jabber_s/xjab_load.h similarity index 100% rename from modules_s/jabber/xjab_load.h rename to obsolete/jabber_s/xjab_load.h diff --git a/modules_s/jabber/xjab_presence.c b/obsolete/jabber_s/xjab_presence.c similarity index 100% rename from modules_s/jabber/xjab_presence.c rename to obsolete/jabber_s/xjab_presence.c diff --git a/modules_s/jabber/xjab_presence.h b/obsolete/jabber_s/xjab_presence.h similarity index 100% rename from modules_s/jabber/xjab_presence.h rename to obsolete/jabber_s/xjab_presence.h diff --git a/modules_s/jabber/xjab_util.c b/obsolete/jabber_s/xjab_util.c similarity index 100% rename from modules_s/jabber/xjab_util.c rename to obsolete/jabber_s/xjab_util.c diff --git a/modules_s/jabber/xjab_util.h b/obsolete/jabber_s/xjab_util.h similarity index 100% rename from modules_s/jabber/xjab_util.h rename to obsolete/jabber_s/xjab_util.h diff --git a/modules_s/jabber/xjab_wlist.c b/obsolete/jabber_s/xjab_wlist.c similarity index 100% rename from modules_s/jabber/xjab_wlist.c rename to obsolete/jabber_s/xjab_wlist.c diff --git a/modules_s/jabber/xjab_worker.c b/obsolete/jabber_s/xjab_worker.c similarity index 100% rename from modules_s/jabber/xjab_worker.c rename to obsolete/jabber_s/xjab_worker.c diff --git a/modules_s/jabber/xjab_worker.h b/obsolete/jabber_s/xjab_worker.h similarity index 100% rename from modules_s/jabber/xjab_worker.h rename to obsolete/jabber_s/xjab_worker.h diff --git a/modules_s/jabber/xode.c b/obsolete/jabber_s/xode.c similarity index 100% rename from modules_s/jabber/xode.c rename to obsolete/jabber_s/xode.c diff --git a/modules_s/jabber/xode.h b/obsolete/jabber_s/xode.h similarity index 100% rename from modules_s/jabber/xode.h rename to obsolete/jabber_s/xode.h diff --git a/modules_s/jabber/xode_from.c b/obsolete/jabber_s/xode_from.c similarity index 100% rename from modules_s/jabber/xode_from.c rename to obsolete/jabber_s/xode_from.c diff --git a/modules_s/jabber/xode_str.c b/obsolete/jabber_s/xode_str.c similarity index 100% rename from modules_s/jabber/xode_str.c rename to obsolete/jabber_s/xode_str.c diff --git a/modules_s/jabber/xpool.c b/obsolete/jabber_s/xpool.c similarity index 100% rename from modules_s/jabber/xpool.c rename to obsolete/jabber_s/xpool.c diff --git a/modules_s/jabber/xsnprintf.c b/obsolete/jabber_s/xsnprintf.c similarity index 100% rename from modules_s/jabber/xsnprintf.c rename to obsolete/jabber_s/xsnprintf.c diff --git a/modules_s/jabber/xstream.c b/obsolete/jabber_s/xstream.c similarity index 100% rename from modules_s/jabber/xstream.c rename to obsolete/jabber_s/xstream.c

1 0

git:master: jabber(k): module moved to obsolete/jabber_k
by Daniel-Constantin Mierla 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: 85ca752aea199050b912a246a2dd2aa92423e5e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=85ca752… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 4 16:25:44 2010 +0200 jabber(k): module moved to obsolete/jabber_k --- {modules_k/jabber => obsolete/jabber_k}/Makefile | 0 {modules_k/jabber => obsolete/jabber_k}/README | 0 .../jabber => obsolete/jabber_k}/doc/Makefile | 0 .../jabber => obsolete/jabber_k}/doc/jabber.cfg | 0 .../jabber => obsolete/jabber_k}/doc/jabber.gws | 0 .../jabber => obsolete/jabber_k}/doc/jabber.sql | 0 .../jabber => obsolete/jabber_k}/doc/jabber.xml | 0 .../jabber_k}/doc/jabber_admin.xml | 0 .../jabber => obsolete/jabber_k}/doc/jabberreg.pl | 0 .../jabber => obsolete/jabber_k}/doc/jabberx.cfg | 0 .../jabber_k}/doc/web/libjab.php | 0 .../jabber_k}/doc/web/subscribe.php | 0 {modules_k/jabber => obsolete/jabber_k}/jabber.c | 0 {modules_k/jabber => obsolete/jabber_k}/mdefines.h | 0 {modules_k/jabber => obsolete/jabber_k}/sha.c | 0 {modules_k/jabber => obsolete/jabber_k}/tree234.c | 0 {modules_k/jabber => obsolete/jabber_k}/tree234.h | 0 .../jabber => obsolete/jabber_k}/xjab_base.c | 0 .../jabber => obsolete/jabber_k}/xjab_base.h | 0 .../jabber => obsolete/jabber_k}/xjab_dmsg.h | 0 .../jabber => obsolete/jabber_k}/xjab_jcon.c | 0 .../jabber => obsolete/jabber_k}/xjab_jcon.h | 0 .../jabber => obsolete/jabber_k}/xjab_jconf.c | 0 .../jabber => obsolete/jabber_k}/xjab_jconf.h | 0 .../jabber => obsolete/jabber_k}/xjab_load.c | 0 .../jabber => obsolete/jabber_k}/xjab_load.h | 0 .../jabber => obsolete/jabber_k}/xjab_presence.c | 0 .../jabber => obsolete/jabber_k}/xjab_presence.h | 0 .../jabber => obsolete/jabber_k}/xjab_util.c | 0 .../jabber => obsolete/jabber_k}/xjab_util.h | 0 .../jabber => obsolete/jabber_k}/xjab_wlist.c | 0 .../jabber => obsolete/jabber_k}/xjab_worker.c | 0 .../jabber => obsolete/jabber_k}/xjab_worker.h | 0 {modules_k/jabber => obsolete/jabber_k}/xode.c | 0 {modules_k/jabber => obsolete/jabber_k}/xode.h | 0 .../jabber => obsolete/jabber_k}/xode_from.c | 0 {modules_k/jabber => obsolete/jabber_k}/xode_str.c | 0 {modules_k/jabber => obsolete/jabber_k}/xpool.c | 0 .../jabber => obsolete/jabber_k}/xsnprintf.c | 0 {modules_k/jabber => obsolete/jabber_k}/xstream.c | 0 40 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_k/jabber/Makefile b/obsolete/jabber_k/Makefile similarity index 100% rename from modules_k/jabber/Makefile rename to obsolete/jabber_k/Makefile diff --git a/modules_k/jabber/README b/obsolete/jabber_k/README similarity index 100% rename from modules_k/jabber/README rename to obsolete/jabber_k/README diff --git a/modules_k/jabber/doc/Makefile b/obsolete/jabber_k/doc/Makefile similarity index 100% rename from modules_k/jabber/doc/Makefile rename to obsolete/jabber_k/doc/Makefile diff --git a/modules_k/jabber/doc/jabber.cfg b/obsolete/jabber_k/doc/jabber.cfg similarity index 100% rename from modules_k/jabber/doc/jabber.cfg rename to obsolete/jabber_k/doc/jabber.cfg diff --git a/modules_k/jabber/doc/jabber.gws b/obsolete/jabber_k/doc/jabber.gws similarity index 100% rename from modules_k/jabber/doc/jabber.gws rename to obsolete/jabber_k/doc/jabber.gws diff --git a/modules_k/jabber/doc/jabber.sql b/obsolete/jabber_k/doc/jabber.sql similarity index 100% rename from modules_k/jabber/doc/jabber.sql rename to obsolete/jabber_k/doc/jabber.sql diff --git a/modules_k/jabber/doc/jabber.xml b/obsolete/jabber_k/doc/jabber.xml similarity index 100% rename from modules_k/jabber/doc/jabber.xml rename to obsolete/jabber_k/doc/jabber.xml diff --git a/modules_k/jabber/doc/jabber_admin.xml b/obsolete/jabber_k/doc/jabber_admin.xml similarity index 100% rename from modules_k/jabber/doc/jabber_admin.xml rename to obsolete/jabber_k/doc/jabber_admin.xml diff --git a/modules_k/jabber/doc/jabberreg.pl b/obsolete/jabber_k/doc/jabberreg.pl similarity index 100% rename from modules_k/jabber/doc/jabberreg.pl rename to obsolete/jabber_k/doc/jabberreg.pl diff --git a/modules_k/jabber/doc/jabberx.cfg b/obsolete/jabber_k/doc/jabberx.cfg similarity index 100% rename from modules_k/jabber/doc/jabberx.cfg rename to obsolete/jabber_k/doc/jabberx.cfg diff --git a/modules_k/jabber/doc/web/libjab.php b/obsolete/jabber_k/doc/web/libjab.php similarity index 100% rename from modules_k/jabber/doc/web/libjab.php rename to obsolete/jabber_k/doc/web/libjab.php diff --git a/modules_k/jabber/doc/web/subscribe.php b/obsolete/jabber_k/doc/web/subscribe.php similarity index 100% rename from modules_k/jabber/doc/web/subscribe.php rename to obsolete/jabber_k/doc/web/subscribe.php diff --git a/modules_k/jabber/jabber.c b/obsolete/jabber_k/jabber.c similarity index 100% rename from modules_k/jabber/jabber.c rename to obsolete/jabber_k/jabber.c diff --git a/modules_k/jabber/mdefines.h b/obsolete/jabber_k/mdefines.h similarity index 100% rename from modules_k/jabber/mdefines.h rename to obsolete/jabber_k/mdefines.h diff --git a/modules_k/jabber/sha.c b/obsolete/jabber_k/sha.c similarity index 100% rename from modules_k/jabber/sha.c rename to obsolete/jabber_k/sha.c diff --git a/modules_k/jabber/tree234.c b/obsolete/jabber_k/tree234.c similarity index 100% rename from modules_k/jabber/tree234.c rename to obsolete/jabber_k/tree234.c diff --git a/modules_k/jabber/tree234.h b/obsolete/jabber_k/tree234.h similarity index 100% rename from modules_k/jabber/tree234.h rename to obsolete/jabber_k/tree234.h diff --git a/modules_k/jabber/xjab_base.c b/obsolete/jabber_k/xjab_base.c similarity index 100% rename from modules_k/jabber/xjab_base.c rename to obsolete/jabber_k/xjab_base.c diff --git a/modules_k/jabber/xjab_base.h b/obsolete/jabber_k/xjab_base.h similarity index 100% rename from modules_k/jabber/xjab_base.h rename to obsolete/jabber_k/xjab_base.h diff --git a/modules_k/jabber/xjab_dmsg.h b/obsolete/jabber_k/xjab_dmsg.h similarity index 100% rename from modules_k/jabber/xjab_dmsg.h rename to obsolete/jabber_k/xjab_dmsg.h diff --git a/modules_k/jabber/xjab_jcon.c b/obsolete/jabber_k/xjab_jcon.c similarity index 100% rename from modules_k/jabber/xjab_jcon.c rename to obsolete/jabber_k/xjab_jcon.c diff --git a/modules_k/jabber/xjab_jcon.h b/obsolete/jabber_k/xjab_jcon.h similarity index 100% rename from modules_k/jabber/xjab_jcon.h rename to obsolete/jabber_k/xjab_jcon.h diff --git a/modules_k/jabber/xjab_jconf.c b/obsolete/jabber_k/xjab_jconf.c similarity index 100% rename from modules_k/jabber/xjab_jconf.c rename to obsolete/jabber_k/xjab_jconf.c diff --git a/modules_k/jabber/xjab_jconf.h b/obsolete/jabber_k/xjab_jconf.h similarity index 100% rename from modules_k/jabber/xjab_jconf.h rename to obsolete/jabber_k/xjab_jconf.h diff --git a/modules_k/jabber/xjab_load.c b/obsolete/jabber_k/xjab_load.c similarity index 100% rename from modules_k/jabber/xjab_load.c rename to obsolete/jabber_k/xjab_load.c diff --git a/modules_k/jabber/xjab_load.h b/obsolete/jabber_k/xjab_load.h similarity index 100% rename from modules_k/jabber/xjab_load.h rename to obsolete/jabber_k/xjab_load.h diff --git a/modules_k/jabber/xjab_presence.c b/obsolete/jabber_k/xjab_presence.c similarity index 100% rename from modules_k/jabber/xjab_presence.c rename to obsolete/jabber_k/xjab_presence.c diff --git a/modules_k/jabber/xjab_presence.h b/obsolete/jabber_k/xjab_presence.h similarity index 100% rename from modules_k/jabber/xjab_presence.h rename to obsolete/jabber_k/xjab_presence.h diff --git a/modules_k/jabber/xjab_util.c b/obsolete/jabber_k/xjab_util.c similarity index 100% rename from modules_k/jabber/xjab_util.c rename to obsolete/jabber_k/xjab_util.c diff --git a/modules_k/jabber/xjab_util.h b/obsolete/jabber_k/xjab_util.h similarity index 100% rename from modules_k/jabber/xjab_util.h rename to obsolete/jabber_k/xjab_util.h diff --git a/modules_k/jabber/xjab_wlist.c b/obsolete/jabber_k/xjab_wlist.c similarity index 100% rename from modules_k/jabber/xjab_wlist.c rename to obsolete/jabber_k/xjab_wlist.c diff --git a/modules_k/jabber/xjab_worker.c b/obsolete/jabber_k/xjab_worker.c similarity index 100% rename from modules_k/jabber/xjab_worker.c rename to obsolete/jabber_k/xjab_worker.c diff --git a/modules_k/jabber/xjab_worker.h b/obsolete/jabber_k/xjab_worker.h similarity index 100% rename from modules_k/jabber/xjab_worker.h rename to obsolete/jabber_k/xjab_worker.h diff --git a/modules_k/jabber/xode.c b/obsolete/jabber_k/xode.c similarity index 100% rename from modules_k/jabber/xode.c rename to obsolete/jabber_k/xode.c diff --git a/modules_k/jabber/xode.h b/obsolete/jabber_k/xode.h similarity index 100% rename from modules_k/jabber/xode.h rename to obsolete/jabber_k/xode.h diff --git a/modules_k/jabber/xode_from.c b/obsolete/jabber_k/xode_from.c similarity index 100% rename from modules_k/jabber/xode_from.c rename to obsolete/jabber_k/xode_from.c diff --git a/modules_k/jabber/xode_str.c b/obsolete/jabber_k/xode_str.c similarity index 100% rename from modules_k/jabber/xode_str.c rename to obsolete/jabber_k/xode_str.c diff --git a/modules_k/jabber/xpool.c b/obsolete/jabber_k/xpool.c similarity index 100% rename from modules_k/jabber/xpool.c rename to obsolete/jabber_k/xpool.c diff --git a/modules_k/jabber/xsnprintf.c b/obsolete/jabber_k/xsnprintf.c similarity index 100% rename from modules_k/jabber/xsnprintf.c rename to obsolete/jabber_k/xsnprintf.c diff --git a/modules_k/jabber/xstream.c b/obsolete/jabber_k/xstream.c similarity index 100% rename from modules_k/jabber/xstream.c rename to obsolete/jabber_k/xstream.c

1 0

git:master: prefix_route: added xml docbook file
by Daniel-Constantin Mierla 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: c7dc7a88fcf1d2123002c64bcd7b5f20a84b8ad3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c7dc7a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 4 16:11:27 2010 +0200 prefix_route: added xml docbook file - forgotten to add them in previous commit to this module --- modules/prefix_route/doc/Makefile | 4 ++ modules/prefix_route/doc/extra.xml | 33 ++++++++++++++++++++ modules/prefix_route/doc/functions.xml | 26 +++++++++++++++ modules/prefix_route/doc/params.xml | 44 ++++++++++++++++++++++++++ modules/prefix_route/doc/prefix_route.xml | 48 +++++++++++++++++++++++++++++ modules/prefix_route/doc/rpc.xml | 24 ++++++++++++++ 6 files changed, 179 insertions(+), 0 deletions(-) diff --git a/modules/prefix_route/doc/Makefile b/modules/prefix_route/doc/Makefile new file mode 100644 index 0000000..9ec8b5e --- /dev/null +++ b/modules/prefix_route/doc/Makefile @@ -0,0 +1,4 @@ +docs = prefix_route.xml + +docbook_dir=../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/prefix_route/doc/extra.xml b/modules/prefix_route/doc/extra.xml new file mode 100644 index 0000000..6acbd77 --- /dev/null +++ b/modules/prefix_route/doc/extra.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + +<section id="prefixroute.extra" xmlns:xi="http://www.w3.org/2001/XInclude"> + <title>Database Structure</title> + + <para> + A prefix route set consists of three fields: + </para> + <itemizedlist> + <listitem><para>prefix - varchar(64) - Prefix rule</para></listitem> + <listitem><para>route - varchar(64) - Route name</para></listitem> + <listitem><para>comment - varchar(64) - Free-form comment</para></listitem> + </itemizedlist> + <example> + <title>Sample data</title> + <programlisting format="linespecific"> +... + +--------+-------+---------------+ + | prefix | route | comment | + +--------+-------+---------------+ + | 46 | SE | Sweden | + | 47 | NO | Norway | + | 479 | NOMOB | Norway mobile | + | 49 | DE | Deutschland | + | 39 | IT | Italy | + +--------+-------+---------------+ +... +</programlisting> + </example> + +</section> diff --git a/modules/prefix_route/doc/functions.xml b/modules/prefix_route/doc/functions.xml new file mode 100644 index 0000000..fd71954 --- /dev/null +++ b/modules/prefix_route/doc/functions.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + +<section id="prefixroute.functions" xmlns:xi="http://www.w3.org/2001/XInclude"> + <title>Functions</title> + + <section id="prefixroute.prefix_route"> + <title><function>prefix_route()</function></title> + <para> + This function tries to find a route from the user part of the request URI. + If a route is found, it will be used for further processing. Otherwise the + function will return false. + </para> + <example> + <title>prefix_route() usage</title> + <programlisting> +... + if (!prefix_route()) { + xlog("L_ERR", "prefix_route(): no matching routes\n"); + } +... + </programlisting> + </example> + </section> +</section> diff --git a/modules/prefix_route/doc/params.xml b/modules/prefix_route/doc/params.xml new file mode 100644 index 0000000..80bb4e0 --- /dev/null +++ b/modules/prefix_route/doc/params.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + +<section id="prefixroute.parameters" xmlns:xi="http://www.w3.org/2001/XInclude"> + <title>Parameters</title> + + <section id="prefixroute.db_url"> + <title><varname>db_url</varname> (string)</title> + <para> + This is <acronym>URL</acronym> of the database to be used. + </para> + <para> + Default value is "mysql://ser@localhost/ser" + </para> + <example> + <title>Setting db_url parameter</title> + <programlisting> +... +modparam("prefix_route", "db_url", "mysql://ser:pass@db_host/ser") +... + </programlisting> + </example> + </section> + + <section id="prefixroute.db_table"> + <title><varname>db_table</varname> (string)</title> + <para> + The name of table where to read prefix route set. + </para> + <para> + Default value is "prefix_route". + </para> + <example> + <title>Setting db_table parameter</title> + <programlisting> +... +modparam("prefix_route", "db_table", "new_prefix_route") +... + </programlisting> + </example> + </section> + +</section> diff --git a/modules/prefix_route/doc/prefix_route.xml b/modules/prefix_route/doc/prefix_route.xml new file mode 100644 index 0000000..1244849 --- /dev/null +++ b/modules/prefix_route/doc/prefix_route.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + +<section id="blst" xmlns:xi="http://www.w3.org/2001/XInclude"> + <sectioninfo> + <authorgroup> + <author> + <firstname>Alfred E.</firstname> + <surname>Heggestad</surname> + <affiliation><orgname>Telio Telecom</orgname></affiliation> + </author> + </authorgroup> + <copyright> + <year>2007</year> + <holder>Alfred E. Heggestad</holder> + </copyright> + <copyright> + <year>2008</year> + <holder>Telio Telecom AS</holder> + </copyright> + </sectioninfo> + + <title>prefix_route Module</title> + + <section id="prefixroute.overview"> + <title>Overview</title> + <para> + The prefix_route module does routing based on a set of prefixes from the + database. The prefix rule-set is loaded from the database into a binary + tree in memory, either on startup or when issuing the "prefix_route.reload" RPC + command. When calling the "prefix_route()" function from the ser.cfg + configuration script, it will try to match the user part of the request URI + with the best matching route. If a route is found, it will be used for + further processing. If not found normal processing will continue. + </para> + <para> + Development was sponsored by Telio Telecom. + </para> + </section> + + <xi:include href="params.xml"/> + <xi:include href="functions.xml"/> + <xi:include href="rpc.xml"/> + <xi:include href="extra.xml"/> + +</section> + diff --git a/modules/prefix_route/doc/rpc.xml b/modules/prefix_route/doc/rpc.xml new file mode 100644 index 0000000..29a246d --- /dev/null +++ b/modules/prefix_route/doc/rpc.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + +<section id="prefixroute.rpc" xmlns:xi="http://www.w3.org/2001/XInclude"> + <title>RPC Commands</title> + + <section id="prefixroute.reload"> + <title><function>prefix_route.reload</function></title> + <para> + Reload prefix route tree from the database. + Validation is done and the prefix route tree will + only be reloaded if there are no errors. + </para> + </section> + + <section id="prefixroute.dump"> + <title><function>prefix_route.dump</function></title> + <para> + Dump the current prefix route tree. + </para> + </section> + +</section>

1 0

git:master: kamailio.cfg: added sample usage of xmlrpc module
by Daniel-Constantin Mierla 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: 0b5ccf31a6e3e6e1091a97e472539ba314428e04 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b5ccf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 4 16:08:16 2010 +0200 kamailio.cfg: added sample usage of xmlrpc module - enabled with #!define WITH_XMLRPC - based on ser.cfg version --- etc/kamailio.cfg | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 08183ff..9aa3915 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -59,6 +59,10 @@ # - adjust CFGDIR/tls.cfg as needed # - define WITH_TLS # +# *** To enable XMLRPC support execute: +# - define WITH_XMLRPC +# - adjust route[XMLRPC] for access policy +# # *** To enable anti-flood detection execute: # - adjust pike and htable=>ipban settings as needed (default is # block if more than 16 requests in 2 seconds and ban for 300 seconds) @@ -233,6 +237,10 @@ loadmodule "htable.so" loadmodule "pike.so" #!endif +#!ifdef WITH_XMLRPC +loadmodule "xmlrpc.so" +#!endif + # ----------------- setting module-specific parameters --------------- @@ -374,6 +382,12 @@ modparam("pike", "remove_latency", 4) modparam("htable", "htable", "ipban=>size=8;autoexpire=300;") #!endif +#!ifdef WITH_XMLRPC +# ----- xmlrpc params ----- +modparam("xmlrpc", "route", "XMLRPC"); +modparam("xmlrpc", "url_match", "^/RPC") +#!endif + ####### Routing Logic ######## @@ -749,6 +763,26 @@ route[PSTN] { return; } +# XMLRPC routing +#!ifdef WITH_XMLRPC +route[XMLRPC] +{ + # allow XMLRPC from localhost + if ((method=="POST" || method=="GET") + && (src_ip==127.0.0.1)) { + # close connection only for xmlrpclib user agents (there is a bug in + # xmlrpclib: it waits for EOF before interpreting the response). + if ($hdr(User-Agent) =~ "xmlrpclib") + set_reply_close(); + set_reply_no_connect(); + dispatch_rpc(); + exit; + } + send_reply("403", "Forbidden"); + exit; +} +#!endif + # Sample branch router branch_route[BRANCH_ONE] { xdbg("new branch at $ru\n");

1 0

git:master: prefix_route: readme converted to docbook
by Daniel-Constantin Mierla 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: 5816239e3714fc9fcf894cb82de114435447ed92 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5816239… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 4 15:33:42 2010 +0200 prefix_route: readme converted to docbook --- modules/prefix_route/README | 127 ++++++++++++++++++++++++------------------- 1 files changed, 70 insertions(+), 57 deletions(-) diff --git a/modules/prefix_route/README b/modules/prefix_route/README index 267c315..92a9024 100644 --- a/modules/prefix_route/README +++ b/modules/prefix_route/README @@ -1,97 +1,110 @@ -Prefix route module -Alfred E. Heggestad - -Sponsored by Telio Telecom - - - +1. prefix_route Module -Overview +Alfred E. Heggestad - The prefix_route module does routing based on a set of prefixes from the - database. The prefix rule-set is loaded from the database into a binary - tree in memory, either on startup or when issuing the "prefix_route.reload" RPC - command. When calling the "prefix_route()" function from the ser.cfg - configuration script, it will try to match the user part of the request URI - with the best matching route. If a route is found, it will be used for - further processing. If not found normal processing will continue. + Telio Telecom + Copyright © 2007 Alfred E. Heggestad + Copyright © 2008 Telio Telecom AS + __________________________________________________________________ + 1.1. Overview + 1.2. Parameters -Exported Parameters + 1.2.1. db_url (string) + 1.2.2. db_table (string) - db_url (string) + 1.3. Functions - Database URL. + 1.3.1. prefix_route() - Default value is "mysql://ser@localhost/ser". + 1.4. RPC Commands - Example. Set the "db_url" parameter - ... - modparam("prefix_route", "db_url", "mysql://user:passwd@host.com/dbname") - ... + 1.4.1. prefix_route.reload + 1.4.2. prefix_route.dump + 1.5. Database Structure - db_table (string) +1.1. Overview - The name of table where to read prefix route set + The prefix_route module does routing based on a set of prefixes from + the database. The prefix rule-set is loaded from the database into a + binary tree in memory, either on startup or when issuing the + "prefix_route.reload" RPC command. When calling the "prefix_route()" + function from the ser.cfg configuration script, it will try to match + the user part of the request URI with the best matching route. If a + route is found, it will be used for further processing. If not found + normal processing will continue. - Default value is "prefix_route". + Development was sponsored by Telio Telecom. - Example. Set the "db_table" parameter - ... - modparam("prefix_route", "db_table", "prefix_route") - ... +1.2. Parameters +1.2.1. db_url (string) + This is URL of the database to be used. + Default value is "mysql://ser@localhost/ser" -Exported Functions + Example 1. Setting db_url parameter +... +modparam("prefix_route", "db_url", "mysql://ser:pass@db_host/ser") +... - prefix_route() +1.2.2. db_table (string) - This function tries to find a route from the user part of the request URI. - If a route is found, it will be used for further processing. Otherwise the - function will return false. + The name of table where to read prefix route set. - Example: + Default value is "prefix_route". - if (!prefix_route()) { - xlog("L_ERR", "prefix_route(): no matching routes\n"); - } + Example 2. Setting db_table parameter +... +modparam("prefix_route", "db_table", "new_prefix_route") +... +1.3. Functions +1.3.1. prefix_route() + This function tries to find a route from the user part of the request + URI. If a route is found, it will be used for further processing. + Otherwise the function will return false. -RPC commands + Example 3. prefix_route() usage +... + if (!prefix_route()) { + xlog("L_ERR", "prefix_route(): no matching routes\n"); + } +... - "prefix_route.reload" - Reload prefix route tree from the database. - Validation is done and the prefix route tree will - only be reloaded if there are no errors. +1.4. RPC Commands - "prefix_route.dump" - Dump the current prefix route tree. +1.4.1. prefix_route.reload + Reload prefix route tree from the database. Validation is done and the + prefix route tree will only be reloaded if there are no errors. +1.4.2. prefix_route.dump + Dump the current prefix route tree. -Database schema +1.5. Database Structure A prefix route set consists of three fields: + * prefix - varchar(64) - Prefix rule + * route - varchar(64) - Route name + * comment - varchar(64) - Free-form comment - - prefix varchar(64) Prefix rule - - route varchar(64) Route name - - comment varchar(64) Free-form comment - - - Example: - + Example 4. Sample data +... +--------+-------+---------------+ | prefix | route | comment | +--------+-------+---------------+ - | 46 | SE | Sweden | - | 47 | NO | Norway | - | 479 | NOMOB | Norway mobile | - | 49 | DE | Deutschland | - | 39 | IT | Italy | + | 46 | SE | Sweden | + | 47 | NO | Norway | + | 479 | NOMOB | Norway mobile | + | 49 | DE | Deutschland | + | 39 | IT | Italy | +--------+-------+---------------+ +...

1 0

← Newer
1
...
26
27
28
29
30
31
32
33
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2010