sr-dev

sr-dev@lists.kamailio.org

15 participants
43426 discussions

by Andrei Pelinescu-Onciul

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d2d401… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 16 17:20:17 2009 +0000 tcp: fix compilation problem on solaris (FIONREAD) - on solaris include <sys/filio.h> if present, else define BSD_COMP before including ioctl.h. Reported-by: Vance Shipley vances at motivity ca. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f3449b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 16 15:35:56 2009 +0000 core: fix bad level name in new LOG() - the syslog LOG_() used log_level_info[(level)].name (which produced a wrong log level) instead of LOG_LEVEL2NAME(level) - coding style fixes ( lines < 80 chars) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=611a9ba… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Jan 28 14:49:55 2009 +0000 t_check_status() checks also the blind UACs if t_pick_branch() fails to determine the picked branch in failure_route. Closes SER-434. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=259b61e… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Jan 20 12:45:20 2009 +0000 Documenting t_lookup_cancel() script function. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd0668e… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Jan 20 10:38:50 2009 +0000 Removing set_t() from t_lookup_cancel() function, and introducing an optional parameter. See the bug report SER-432. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=19e6b61… Author: Michal Matyska <michal.matyska(a)iptel.org> Date: Mon Jan 19 15:47:25 2009 +0000 updated udp_mtu handling code - fixes SER-433 - call apply lumps with the original send_info, so the lumps are generated the same way their length was calculated, so there is no buffer overflow. - this has also the expected and wanted side-effect that the record route is done as the outgoing path would be UDP (do not insert double record-route header) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4043c62… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Fri Jan 16 09:47:58 2009 +0000 documenting t_is_expired() function URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de4df2a… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Fri Jan 16 09:24:49 2009 +0000 t_is_expired() script function is introduced. It returns true if the transaction lifetime timer has already been expired. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf79b58… Author: Ondrej Martinek <ondra(a)iptel.org> Date: Tue Jan 6 17:14:12 2009 +0000 * logging API updated (see doc/logging-api.txt for details) - LOG(LEVEL, FMT, ARGS...) and the short macro corresponding to LEVEL level made eqvivalent (eg. LOG(L_DBG, FMT, ARGS...) and DBG(FMT, ARGS...) prints always the same message) - changed the format of log messages produced by the macros to include the log level, module name, filename, line (if applicable) - added new, internal LOG_(LEVEL, PREFIX, FORMAT, ARGS...) macro - removed DPrint() and DEBUG() macros, L_DEFAULT log level and dprint() function !!! !!! IMPORTANT! READ ME! !!! These changes (mainly the first two) require reformating of the most log messages in SER core and module source files. This step can be done automatically by running "scripts/logging/fix-logs-all" script BUT it was NOT originally performed because it would have generated too many changes in CVS which was discouraged by Andrei. Instead, the developers are expected to run it when ready. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03b7bce… Author: Bogdan Pintea <bogdan(a)iptego.com> Date: Mon Jan 5 21:32:26 2009 +0000 - AS support disabled by default. - added forgotten define guards for a mem free specific to AS support code only. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d65cdd3… Author: Bogdan Pintea <bogdan(a)iptego.com> Date: Mon Jan 5 21:26:44 2009 +0000 When building the route set of ACKs for local UACs, only the reply is now evaluated; this is insufficient, since replies to in-dialog requests normally miss the route set. The patch fixes that: evals INVITE, if this was in-dialog; otherwise, the reply (since the req. doesn't have yet complete route set). Add support for the SASI if'ace, adding the implemenation for two more TM API functions: - t_get_canceled_ident(): returns the hash coordinates (bucket/index) of the transaction the currently processed CANCEL is targeting - ack_local_uac(): allow generating the ACKs for 2xx'ed locally originated INVITEs - new headers and body can now also be appended to it. Fully closes #SER-346. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5137b02… Author: Bogdan Pintea <bogdan(a)iptego.com> Date: Sun Jan 4 15:34:54 2009 +0000 In case the AVP is a regexp, an allocation is required to build an AVP "ident". The patch adds the functionality to free it. Closes #SER-344. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eddf3e3… Author: Bogdan Pintea <bogdan(a)iptego.com> Date: Sun Jan 4 15:27:39 2009 +0000 Currently, SER matches E2E ACKs only if there is an equality between From HF in INVITE and ACK. While this is pretty safe, there are UAs that do mess small things, like display name, or some bigger ones, like URI, in generated ACK. However, matching over the full URI (or worse, HF) is not needed and was even intended for deprecation (see 1st comment of 3261#Sec. 12.2.1.1). The applied patch should boost a bit the matching flexibility - only compare the tag. Closes #SER-419. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=713d776… Author: Bogdan Pintea <bogdan(a)iptego.com> Date: Sun Jan 4 15:02:11 2009 +0000 The calculate_routeset_length() produces an invalid result in the case dlg_t.hooks.last_route is set (and .first_route not). Applied patch fixes that (and should hopefully be a bit cleaner). Closes #SER-421. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f92150… Author: Bogdan Pintea <bogdan(a)iptego.com> Date: Sun Jan 4 14:58:36 2009 +0000 'memapp' and 'append_mem_block' are now both only used in source t_msgbuilder.c. Applied patch removes the definition of both from .h.: memapp moved to .c, append_mem_block only left in .c. (Interestingly, gcc complained over different definitions, but accepted same definition twice, for same identifier.) Closes #SER-422. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c711622… Author: Bogdan Pintea <bogdan(a)iptego.com> Date: Sun Jan 4 14:52:42 2009 +0000 "Route :" prefix (and separator) is used some more time across the source. It was defined 3 times (with a small variation). Applied patch moves the definition to global config.h. Closes #SER-420. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f62c96d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 18 16:09:16 2008 +0000 script: udp_mtu fallback script config & commands new config variables: - udp_mtu = number - size in bytes after which fallback to another protocol will be attempted. Default 0 (off), recommended 1300. - udp_mtu_try_proto = TCP|TLS|SCTP|UDP - protocol to fallback to. Default: UDP (off). - force_rport = yes|no - global force_rport(). new script commands: - udp_mtu_try_proto(TCP|TLS|SCTP|UDP) - like udp_mtu_try_proto above but works on a per packet basis and not globally. Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf8dfee… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 18 16:06:03 2008 +0000 core: forward: tcp fallback for big udp packets - support for tcp, tls or sctp fallback for udp forwarded requests that end up bigger then udp_mtu (configurable, disabled by default). For such messages only the Via is changed (for example the original built for udp Record-Route is kept untouched so that subsequent messages in the dialog will use udp if smaller then udp_mtu). - udp_mtu and udp_mtu_try_proto (fallback proto) can be changed at runtime via the cfg framework (e.g. sercmd cfg.set_now_int core udp_mtu 1300; cfg.set_now_int core udp_mtu_try_proto 2 ) - force_rport can now be set globally using the config framework (e.g. sercmd cfg.set_now_int core force_rport 1 ) Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org>

15 years, 7 months

Wiki adjustments

by Dmitry Semyonov

Hi all, I suggest to enable the following configuration options for the SIP-Router wiki: $conf['breadcrumbs'] = 7; //how many recent visited pages to show $conf['rss_content'] = 'diff'; The former one adds 'Trace:' line near 'You are here:' one with links to recently visited pages. The latter one makes RSS feeds more useful (IMHO) -- they start showing what was actually changed. -- ...Bye..Dmitry.

15 years, 7 months

git:andrei/switch: rvalues: fix rval_new( empty string )

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/switch Commit: 5b37abcf81bade64b5bb8bc07ad4352e96c9d7b6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b37abc… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 19 21:51:43 2009 +0100 rvalues: fix rval_new( empty string ) - rval_new(RV_STR, empty string, ...) did not set properly the string pointer --- rvalue.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rvalue.c b/rvalue.c index 4c7472d..8bd0aa2 100644 --- a/rvalue.c +++ b/rvalue.c @@ -233,13 +233,17 @@ struct rvalue* rval_new(enum rval_type t, union rval_val* v, int extra_size) { struct rvalue* rv; - if (t==RV_STR && v && v->s.len) + if (t==RV_STR && v && v->s.s) return rval_new_str(&v->s, extra_size); rv=rval_new_empty(extra_size); if (likely(rv)){ rv->type=t; - if (likely(v)){ + if (likely(v && t!=RV_STR)){ rv->v=*v; + }else if (t==RV_STR){ + rv->v.s.s=&rv->buf[0]; + rv->v.s.len=0; + if (likely(extra_size)) rv->v.s.s[0]=0; }else memset (&rv->v, 0, sizeof(rv->v)); }

15 years, 7 months

git:andrei/switch: script engine: string switch optimization and fixup

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/switch Commit: cd26bc545339bc351f5a1bcec370adbaccc9c331 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd26bc5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 19 23:47:10 2009 +0100 script engine: string switch optimization and fixup - fixup and optimize (if constant) string switches --- switch.c | 341 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 337 insertions(+), 4 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=cd2…

15 years, 7 months

git:andrei/switch: core: sint2str check for space before adding the sign

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/switch Commit: b660455a30f075efae5b0dcb082260d3ae240324 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b660455… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 19 19:17:13 2009 +0100 core: sint2str check for space before adding the sign --- ut.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ut.h b/ut.h index 013f963..be79f5d 100644 --- a/ut.h +++ b/ut.h @@ -312,7 +312,7 @@ static inline char* sint2str(long l, int* len) l = -l; } p = int2str((unsigned long)l, len); - if(sign) { + if(sign && *len<(INT2STR_MAX_LEN-1)) { *(--p) = '-'; if (len) (*len)++; }

15 years, 7 months

git:andrei/switch: script engine: string switch execution

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/switch Commit: cfeefb4a0564d4b08cdbe33477a8a3e8c498f357 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cfeefb4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 19 23:38:37 2009 +0100 script engine: string switch execution - support for matching strings and regular expressions in a string switch (MATCH_T). --- action.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ route_struct.h | 4 +- switch.h | 32 +++++++++++++++++++++++++- 3 files changed, 99 insertions(+), 4 deletions(-) diff --git a/action.c b/action.c index 079bbfe..cf7ac9c 100644 --- a/action.c +++ b/action.c @@ -116,6 +116,11 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) struct switch_cond_table* sct; struct switch_jmp_table* sjt; struct rval_expr* rve; + struct match_cond_table* mct; + struct rvalue* rv; + struct rvalue* rv1; + struct rval_cache c1; + str s; /* reset the value of error to E_UNSPEC so avoid unknowledgable @@ -907,6 +912,68 @@ sw_jt_def: returns passthrough */ } break; + case MATCH_COND_T: + mct=(struct match_cond_table*)a->val[1].u.data; + rval_cache_init(&c1); + rv=0; + rv1=0; + ret=rval_expr_eval_rvint(h, msg, &rv, &v, + (struct rval_expr*)a->val[0].u.data, &c1); + + if (unlikely( ret<0)){ + /* handle error in expression => use default */ + ret=-1; + goto match_cond_def; + } + if (h->run_flags & EXIT_R_F){ + ret=0; + break; + } + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & break + in expr */ + if (likely(rv)){ + rv1=rval_convert(h, msg, RV_STR, rv, &c1); + if (unlikely(rv1==0)){ + ret=-1; + goto match_cond_def; + } + s=rv1->v.s; + }else{ + /* int result in v */ + rval_cache_clean(&c1); + s.s=sint2str(v, &s.len); + } + ret=1; /* default is continue */ + for(i=0; i<mct->n; i++) + if (( mct->match[i].type==MATCH_STR && + mct->match[i].l.s.len==s.len && + memcmp(mct->match[i].l.s.s, s.s, s.len) == 0 ) || + ( mct->match[i].type==MATCH_RE && + regexec(mct->match[i].l.regex, s.s, 0, 0, 0) == 0) + ){ + if (likely(mct->jump[i])){ + ret=run_actions(h, mct->jump[i], msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } + goto match_cleanup; + } +match_cond_def: + if (mct->def){ + ret=run_actions(h, mct->def, msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } +match_cleanup: + if (rv1){ + rval_destroy(rv1); + rval_destroy(rv); + rval_cache_clean(&c1); + }else if (rv){ + rval_destroy(rv); + rval_cache_clean(&c1); + } + break; case WHILE_T: i=0; flags=0; diff --git a/route_struct.h b/route_struct.h index 85242af..888fadf 100644 --- a/route_struct.h +++ b/route_struct.h @@ -71,7 +71,7 @@ enum { FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, SET_HOST_T, SET_HOSTPORT_T, SET_USER_T, SET_USERPASS_T, SET_PORT_T, SET_URI_T, SET_HOSTPORTTRANS_T, IF_T, SWITCH_T /* only until fixup*/, - BLOCK_T, EVAL_T, SWITCH_JT_T, SWITCH_COND_T, WHILE_T, + BLOCK_T, EVAL_T, SWITCH_JT_T, SWITCH_COND_T, MATCH_COND_T, WHILE_T, MODULE_T, MODULE3_T, MODULE4_T, MODULE5_T, MODULE6_T, MODULEX_T, SETFLAG_T, RESETFLAG_T, ISFLAGSET_T , AVPFLAG_OPER_T, @@ -99,7 +99,7 @@ enum { NOSUBTYPE=0, STRING_ST, NET_ST, NUMBER_ST, IP_ST, RE_ST, PROXY_ST, SELECT_ST, PVAR_ST, LVAL_ST, RVE_ST, RETCODE_ST, CASE_ST, - BLOCK_ST, JUMPTABLE_ST, CONDTABLE_ST + BLOCK_ST, JUMPTABLE_ST, CONDTABLE_ST, MATCH_CONDTABLE_ST }; /* run flags */ diff --git a/switch.h b/switch.h index e92cbad..a598a07 100644 --- a/switch.h +++ b/switch.h @@ -27,15 +27,24 @@ #ifndef __switch_h #define __switch_h +#include <regex.h> + #include "route_struct.h" + struct case_stms{ struct rval_expr* ct_rve; struct action* actions; struct case_stms* next; struct case_stms** append; - int int_label; + int type; /**< type: MATCH_UNKOWN, MATCH_INT, MATCH_STR, MATCH_RE */ + int re_flags; /**< used only for REs */ int is_default; + union { + int match_int; + str match_str; + regex_t* match_re; + } label; /**< fixed case argument */ }; @@ -43,7 +52,7 @@ struct switch_cond_table{ int n; /**< size */ int* cond; /**< int labels array */ struct action** jump; /**< jump points array */ - struct action* def; /**< default jump */ + struct action* def; /**< default jump */ }; @@ -54,6 +63,25 @@ struct switch_jmp_table{ struct switch_cond_table rest; /**< normal cond. table for the rest */ }; + +enum match_str_type { MATCH_UNKNOWN, MATCH_INT, MATCH_STR, MATCH_RE }; + +struct match_str{ + enum match_str_type type;/**< string or RE */ + int flags; /**< flags for re */ + union{ + str s; /* string */ + regex_t* regex; /**< compiled regex */ + }l; +}; + +struct match_cond_table{ + int n; /**< size */ + struct match_str* match; /**< match array */ + struct action** jump; /**< jump points array */ + struct action* def; /**< default jmp */ +}; + int fix_switch(struct action* t); #endif /*__switch_h*/

15 years, 7 months

Kamailio MI in shared modules

by Jan Janak

Hello, I just figured that the kamailio interface in shared modules (such as db_berkeley and db_flatstore) wouldn't work. Such modules are defined with -DSER_MOD_INTERFACE and thus use the module_exports structure from SER, which does not have the MI structure entry. So although such modules have all the MI commands and they link with libkmi, none of the management functions gets exported through the module API. Is there any solution to this yet? Jan.

15 years, 7 months

git:janakj/flatstore DELETED: Make km_sources compile, part two.

by Jan Janak

Module: sip-router Branch: janakj/flatstore DELETED Commit: 46b6981987a2ce15a2327f6da09741d860f25cb8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=46b6981… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 23:43:12 2009 +0100 Make km_sources compile, part two. List of changes: * Call km_mod_init, km_child_init, km_mod_destroy from the real init functions in flatstore_mod.c and make the km_ functions non-static so that they are callable from other object files. * Renamed non-static global variables in km_flatstore_mod.c to avoid conflicts with variables with the same name in flatstore_mod.c (local_timestamp->km_local_timestamp, flat_rotate->km_flat_rotate) --- modules/db_flatstore/flatstore_mod.c | 15 ++++++++++++- modules/db_flatstore/km_flat_mi.c | 3 +- modules/db_flatstore/km_flatstore.c | 4 +- modules/db_flatstore/km_flatstore_mod.c | 32 ++++++++++++------------------ modules/db_flatstore/km_flatstore_mod.h | 10 +++++++- 5 files changed, 38 insertions(+), 26 deletions(-) diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index 78c29e8..0f7b5b5 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -29,8 +29,8 @@ /** \file * Flatstore module interface. */ - #include "flatstore_mod.h" +#include "km_flatstore_mod.h" #include "flat_con.h" #include "flat_cmd.h" #include "flat_rpc.h" @@ -166,22 +166,33 @@ static int mod_init(void) *flat_rotate = time(0); flat_local_timestamp = *flat_rotate; - return 0; + + return km_mod_init(); } static void mod_destroy(void) { + km_mod_destroy(); if (flat_pid.s) free(flat_pid.s); if (flat_rotate) shm_free(flat_rotate); } +/* + * 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 { diff --git a/modules/db_flatstore/km_flat_mi.c b/modules/db_flatstore/km_flat_mi.c index 992e2a4..2200148 100644 --- a/modules/db_flatstore/km_flat_mi.c +++ b/modules/db_flatstore/km_flat_mi.c @@ -23,6 +23,7 @@ */ #include "flatstore_mod.h" +#include "km_flatstore_mod.h" #include "km_flat_mi.h" @@ -34,7 +35,7 @@ struct mi_root* mi_flat_rotate_cmd(struct mi_root* cmd_tree, void* param) if(rpl_tree == NULL) return rpl_tree; - *flat_rotate = time(0); + *km_flat_rotate = time(0); return rpl_tree; } diff --git a/modules/db_flatstore/km_flatstore.c b/modules/db_flatstore/km_flatstore.c index 499a98e..7a2fbaf 100644 --- a/modules/db_flatstore/km_flatstore.c +++ b/modules/db_flatstore/km_flatstore.c @@ -158,9 +158,9 @@ int flat_db_insert(const db1_con_t* h, const db_key_t* k, const db_val_t* v, int l; char *s, *p; - if (local_timestamp < *flat_rotate) { + if (km_local_timestamp < *km_flat_rotate) { flat_rotate_logs(); - local_timestamp = *flat_rotate; + km_local_timestamp = *km_flat_rotate; } f = CON_FILE(h); diff --git a/modules/db_flatstore/km_flatstore_mod.c b/modules/db_flatstore/km_flatstore_mod.c index d968594..ebb5304 100644 --- a/modules/db_flatstore/km_flatstore_mod.c +++ b/modules/db_flatstore/km_flatstore_mod.c @@ -37,12 +37,6 @@ /*MODULE_VERSION*/ -static int child_init(int rank); - -static int mod_init(void); - -static void mod_destroy(void); - int db_flat_bind_api(db_func_t *dbb); /* @@ -61,9 +55,9 @@ char* km_flat_delimiter = "|"; * Timestamp of the last log rotation request from * the FIFO interface */ -time_t* flat_rotate; +time_t* km_flat_rotate; -time_t local_timestamp; +time_t km_local_timestamp; /* * Flatstore database module interface @@ -98,40 +92,40 @@ struct kam_module_exports km_exports = { mi_cmds, /* exported MI functions */ 0, /* exported pseudo-variables */ 0, /* extra processes */ - mod_init, /* module initialization function */ + km_mod_init, /* module initialization function */ 0, /* response function*/ - mod_destroy, /* destroy function */ - child_init /* per-child init function */ + km_mod_destroy, /* destroy function */ + km_child_init /* per-child init function */ }; -static int mod_init(void) +int km_mod_init(void) { if (strlen(km_flat_delimiter) != 1) { LM_ERR("delimiter has to be exactly one character\n"); return -1; } - flat_rotate = (time_t*)shm_malloc(sizeof(time_t)); - if (!flat_rotate) { + km_flat_rotate = (time_t*)shm_malloc(sizeof(time_t)); + if (!km_flat_rotate) { LM_ERR("no shared memory left\n"); return -1; } - *flat_rotate = time(0); - local_timestamp = *flat_rotate; + *km_flat_rotate = time(0); + km_local_timestamp = *km_flat_rotate; return 0; } -static void mod_destroy(void) +void km_mod_destroy(void) { - if (flat_rotate) shm_free(flat_rotate); + if (km_flat_rotate) shm_free(km_flat_rotate); } -static int child_init(int rank) +int km_child_init(int rank) { if (rank <= 0) { km_flat_pid = - rank; diff --git a/modules/db_flatstore/km_flatstore_mod.h b/modules/db_flatstore/km_flatstore_mod.h index b605c11..3ca8c50 100644 --- a/modules/db_flatstore/km_flatstore_mod.h +++ b/modules/db_flatstore/km_flatstore_mod.h @@ -48,14 +48,20 @@ extern char* km_flat_delimiter; * The timestamp of log rotation request from * the FIFO interface */ -extern time_t* flat_rotate; +extern time_t* km_flat_rotate; /* * Local timestamp marking the time of the * last log rotation in the process */ -extern time_t local_timestamp; +extern time_t km_local_timestamp; + +int km_mod_init(void); + +void km_mod_destroy(void); + +int km_child_init(int rank); #endif /* KM_FLATSTORE_MOD_H */

15 years, 7 months

git:janakj/bdb DELETED: Module renamed to db_bdb.

by Jan Janak

Module: sip-router Branch: janakj/bdb DELETED Commit: 7800eaf035782f64bd1c9786c1834bff5dc783f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7800eaf… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 15:14:48 2009 +0100 Module renamed to db_bdb. --- modules/db_berkeley/bdb_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/bdb_mod.c b/modules/db_berkeley/bdb_mod.c index 268527e..3ce1920 100644 --- a/modules/db_berkeley/bdb_mod.c +++ b/modules/db_berkeley/bdb_mod.c @@ -89,7 +89,7 @@ static param_export_t params[] = { }; struct module_exports exports = { - "bdb", + "db_bdb", cmds, /* Exported functions */ 0, /* RPC method */ params, /* Exported parameters */

15 years, 7 months

git:janakj/oracle DELETED: Merge branch 'master' of ssh://janakj@git. sip-router.org/sip-router into oracle

by Jan Janak

Module: sip-router Branch: janakj/oracle DELETED Commit: aad1137e2ea0cdc92201e7b30fda5429c31c9987 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aad1137… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 15:18:04 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into oracle * 'master' of ssh://janakj@git.sip-router.org/sip-router: SER replaced with SIP Router in the doxygen main file. ---

15 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev