sr-dev October 2009

sr-dev@lists.kamailio.org

30 participants
468 discussions

git:master: Merge branch 'master' of ssh://oej@git.sip-router.org/ sip-router

by Olle E. Johansson

Module: sip-router Branch: master Commit: bba1990c3fe72aa73ca4ff5519be76234885d78f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bba1990… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Thu Oct 8 15:29:07 2009 +0200 Merge branch 'master' of ssh://oej@git.sip-router.org/sip-router * 'master' of ssh://oej@git.sip-router.org/sip-router: pdb(sr): add missing doc Makefile, fix include for pdb_admin.xml, regenerate docs ---

15 years, 2 months

git:master: Updating LDAP readme

by Olle E. Johansson

Module: sip-router Branch: master Commit: ad51cad095d2181a16b3a734926614e84adf6081 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad51cad… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Thu Oct 8 15:10:48 2009 +0200 Updating LDAP readme --- modules_k/ldap/README | 846 +++++++++++++++++++------------------ modules_k/ldap/doc/ldap_admin.xml | 1 + 2 files changed, 436 insertions(+), 411 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ad5…

15 years, 2 months

git:master: pdb(sr): add missing doc Makefile, fix include for pdb_admin. xml, regenerate docs

by Henning Westerholt

Module: sip-router Branch: master Commit: 0f4c425c133dbec19386e73be43bdccdbc77f256 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f4c425… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 8 14:50:31 2009 +0200 pdb(sr): add missing doc Makefile, fix include for pdb_admin.xml, regenerate docs --- modules/pdb/README | 143 +++++++++++++++++++++++++---------------- modules/pdb/doc/Makefile | 4 + modules/pdb/doc/pdb_admin.xml | 9 +++ 3 files changed, 101 insertions(+), 55 deletions(-) diff --git a/modules/pdb/README b/modules/pdb/README index 47e7f8a..af034bf 100644 --- a/modules/pdb/README +++ b/modules/pdb/README @@ -11,36 +11,36 @@ Henning Westerholt 1&1 Internet AG <henning.westerholt(a)1und1.de> - Copyright 2009 1&1 Internet AG + Copyright � 2009 1&1 Internet AG Revision History - Revision $Revision: 4863 $ $Date: 2008-09-05 13:11:33 +0200 - (Fri, 05 Sep 2008) $ - __________________________________________________________ + Revision $Revision: 4863 $ $Date: 2008-09-05 13:11:33 +0200 (Fri, 05 + Sep 2008) $ + __________________________________________________________________ Table of Contents 1. Admin Guide - 1.1. Overview - 1.2. Dependencies + 1. Overview + 2. Dependencies - 1.2.1. Kamailio Modules - 1.2.2. External Libraries or Applications + 2.1. Kamailio Modules + 2.2. External Libraries or Applications - 1.3. Exported Parameters + 3. Exported Parameters - 1.3.1. timeout (integer) - 1.3.2. server (string) + 3.1. timeout (integer) + 3.2. server (string) - 1.4. Exported Functions + 4. Exported Functions - 1.4.1. pdb_query (string query, string dstavp) + 4.1. pdb_query (string query, string dstavp) - 1.5. MI Commands + 5. MI Commands - 1.5.1. pdb_status - 1.5.2. pdb_activate - 1.5.3. pdb_deactivate + 5.1. pdb_status + 5.2. pdb_activate + 5.3. pdb_deactivate List of Examples @@ -53,31 +53,60 @@ Henning Westerholt Chapter 1. Admin Guide -1.1. Overview + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Parameters + + 3.1. timeout (integer) + 3.2. server (string) + + 4. Exported Functions + + 4.1. pdb_query (string query, string dstavp) - The pdb module allows Kamailio to send queries to a list of - servers and store the answer in an AVP. The idea is to ask all - servers in parallel and use the first answer, that comes back. - A timeout for the query can be defined in milliseconds. The - queying can be activated and deactivated using FIFO commands. + 5. MI Commands -1.2. Dependencies + 5.1. pdb_status + 5.2. pdb_activate + 5.3. pdb_deactivate -1.2.1. Kamailio Modules +1. Overview - The module depends on the following modules (in the other words - the listed modules must be loaded before this module): + The pdb module allows Kamailio to send queries to a list of servers and + store the answer in an AVP. The idea is to ask all servers in parallel + and use the first answer, that comes back. A timeout for the query can + be defined in milliseconds. The queying can be activated and + deactivated using FIFO commands. + +2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + +2.1. Kamailio Modules + + The module depends on the following modules (in the other words the + listed modules must be loaded before this module): * none -1.2.2. External Libraries or Applications +2.2. External Libraries or Applications - The following libraries or applications must be installed - before running Kamailio with this module loaded: + The following libraries or applications must be installed before + running Kamailio with this module loaded: * none -1.3. Exported Parameters +3. Exported Parameters -1.3.1. timeout (integer) + 3.1. timeout (integer) + 3.2. server (string) + +3.1. timeout (integer) This is the timeout in milliseconds for the pdb_query function. @@ -88,28 +117,29 @@ Chapter 1. Admin Guide modparam("pdb", "timeout", 10) ... -1.3.2. server (string) +3.2. server (string) - This is the list of servers to be used by the pdb_query - function. Queries will be sent in parallel to all servers - configured in this list. This parameter is mandatory. + This is the list of servers to be used by the pdb_query function. + Queries will be sent in parallel to all servers configured in this + list. This parameter is mandatory. Example 1.2. Set server parameter ... -modparam("pdb", "server", "localhost:10001,host.name:10001,192.168.1. -7:10002") +modparam("pdb", "server", "localhost:10001,host.name:10001,192.168.1.7:10002") ... -1.4. Exported Functions +4. Exported Functions + + 4.1. pdb_query (string query, string dstavp) -1.4.1. pdb_query (string query, string dstavp) +4.1. pdb_query (string query, string dstavp) - Sends the query string to all configured servers and stores the - answer in dstavp. If it takes more than the configured timeout, - false is returned. Pseudo-variables or AVPs can be used for the - query string. The answer must consist of the null terminated - query string followed by a two byte integer value in network - byte order. The integer value will be stored in the given AVP. + Sends the query string to all configured servers and stores the answer + in dstavp. If it takes more than the configured timeout, false is + returned. Pseudo-variables or AVPs can be used for the query string. + The answer must consist of the null terminated query string followed by + a two byte integer value in network byte order. The integer value will + be stored in the given AVP. Example 1.3. pdb_query usage ... @@ -120,9 +150,13 @@ if (!pdb_query("$rU", "$avp(i:82)")) cr_route("$avp(i:82)", "$rd", "$rU", "$rU", "call_id"); ... -1.5. MI Commands +5. MI Commands + + 5.1. pdb_status + 5.2. pdb_activate + 5.3. pdb_deactivate -1.5.1. pdb_status +5.1. pdb_status Prints the status of the module. This can either be "active" or "deactivated". @@ -132,21 +166,20 @@ cr_route("$avp(i:82)", "$rd", "$rU", "$rU", "call_id"); kamctl fifo pdb_status ... -1.5.2. pdb_activate +5.2. pdb_activate - Activates the module. This is the default after loading the - module. + Activates the module. This is the default after loading the module. Example 1.5. pdb_activate usage ... kamctl fifo pdb_activate ... -1.5.3. pdb_deactivate +5.3. pdb_deactivate - Deactivates the module. No more queries are performed until it - is activated again. As long as the module is deactivated, the - pdb_query function will return -1. + Deactivates the module. No more queries are performed until it is + activated again. As long as the module is deactivated, the pdb_query + function will return -1. Example 1.6. pdb_deactivate usage ... diff --git a/modules/pdb/doc/Makefile b/modules/pdb/doc/Makefile new file mode 100644 index 0000000..7a0d755 --- /dev/null +++ b/modules/pdb/doc/Makefile @@ -0,0 +1,4 @@ +docs = pdb.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/pdb/doc/pdb_admin.xml b/modules/pdb/doc/pdb_admin.xml index 468fda4..7076328 100644 --- a/modules/pdb/doc/pdb_admin.xml +++ b/modules/pdb/doc/pdb_admin.xml @@ -1,3 +1,12 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + <chapter> <title>&adminguide;</title>

15 years, 2 months

Updating README

by Olle E. Johansson

If I change the README XML docs in modules_k/modulename/doc and run "make modules-readme" the README is not changed... Is this a problem with the "modules-readme" make target or a problem with my knowledge of how we're generating the README's? /O

15 years, 2 months

LDAP module docs

by Olle E. Johansson

"The configuration file follows the Windows INI file syntax," How many remembers that old syntax nowadays? :-) /O

15 years, 2 months

git:master: pv: added init and working destroy functions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 8c3a715892421cdbc309ab37b16dcf349078f487 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c3a715… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 8 12:14:29 2009 +0200 pv: added init and working destroy functions - added init and destroy functions (declared in pvapi_init.h) - fixed pv_table_free() and tr_table_free() bug --- main.c | 5 ++++- pvapi.c | 26 +++++++++++++++++++++----- pvapi_init.h | 31 +++++++++++++++++++++++++++++++ pvar.h | 1 - 4 files changed, 56 insertions(+), 7 deletions(-) diff --git a/main.c b/main.c index 01a6fde..e5e0833 100644 --- a/main.c +++ b/main.c @@ -172,6 +172,7 @@ #include "cfg_core.h" #include "endianness.h" /* init */ #include "basex.h" /* init */ +#include "pvapi_init.h" /* init */ #include "pv_core.h" /* register core pvars */ #ifdef DEBUG_DMALLOC @@ -532,6 +533,7 @@ void cleanup(show_status) destroy_sctp(); #endif destroy_timer(); + destroy_pv_api(); destroy_script_cb(); destroy_nonsip_hooks(); destroy_routes(); @@ -1764,9 +1766,10 @@ int main(int argc, char** argv) if (init_routes()<0) goto error; if (init_nonsip_hooks()<0) goto error; if (init_script_cb()<0) goto error; + if (init_pv_api()<0) goto error; + if (pv_register_core_vars()!=0) goto error; if (init_rpcs()<0) goto error; if (register_core_rpcs()!=0) goto error; - if (pv_register_core_vars()!=0) goto error; /* Fix the value of cfg_file variable.*/ if (fix_cfg_file() < 0) goto error; diff --git a/pvapi.c b/pvapi.c index 34ef819..99226da 100644 --- a/pvapi.c +++ b/pvapi.c @@ -36,6 +36,7 @@ #include "dprint.h" #include "hashes.h" #include "route.h" +#include "pvapi_init.h" #include "pvar.h" #define is_in_str(p, in) (p<in->s+in->len && *p) @@ -196,9 +197,9 @@ int pv_table_free(void) xe = xe->next; pkg_free(xe1); } - memset(_pv_table, 0, sizeof(pv_item_t*)*PV_TABLE_SIZE); - _pv_table_set = 0; } + memset(_pv_table, 0, sizeof(pv_item_t*)*PV_TABLE_SIZE); + _pv_table_set = 0; return 0; } @@ -1445,9 +1446,9 @@ int tr_table_free(void) te = te->next; pkg_free(te1); } - memset(_tr_table, 0, sizeof(tr_item_t*)*TR_TABLE_SIZE); - _tr_table_set = 0; } + memset(_tr_table, 0, sizeof(tr_item_t*)*TR_TABLE_SIZE); + _tr_table_set = 0; return 0; } @@ -1478,8 +1479,23 @@ tr_export_t* tr_lookup_class(str *tclass) return NULL; } -void pv_api_destroy(void) + +/** init pv api (optional). + * @return 0 on success, -1 on error + */ +int init_pv_api(void) +{ + pv_init_table(); + tr_init_table(); + return 0; +} + + +/** destroy pv api. */ +void destroy_pv_api(void) { /* free PV and TR hash tables */ + pv_table_free(); + tr_table_free(); return; } diff --git a/pvapi_init.h b/pvapi_init.h new file mode 100644 index 0000000..1d4ccd6 --- /dev/null +++ b/pvapi_init.h @@ -0,0 +1,31 @@ +/* + * $Id$ + * + * Copyright (C) 2009 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * pvapi_init.h - pvapi init and destroy functions. + */ + +#ifndef __pvapi_init_h +#define __pvapi_init_h + +int init_pv_api(void); +void destroy_pv_api(void); + + +#endif /*__pvapi_init_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/pvar.h b/pvar.h index bb98ef0..19b9310 100644 --- a/pvar.h +++ b/pvar.h @@ -184,7 +184,6 @@ int pv_parse_format(str *in, pv_elem_p *el); int pv_parse_index(pv_spec_p sp, str *in); int pv_init_iname(pv_spec_p sp, int param); int pv_printf_s(struct sip_msg* msg, pv_elem_p list, str *s); -void pv_api_destroy(void); typedef struct _pvname_list { pv_spec_t sname;

15 years, 2 months

git:master: mem: nicer fm_status() & fm_sums() output

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 0b79ce29dadb655301490724f360c9ae7055edeb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b79ce2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 8 12:11:39 2009 +0200 mem: nicer fm_status() & fm_sums() output Removed useless and confusing current file location information (we are interested where the fragment was allocated from, and not where the information is printed). --- mem/f_malloc.c | 45 +++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/mem/f_malloc.c b/mem/f_malloc.c index d457f9d..c49a252 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -583,29 +583,34 @@ void fm_status(struct fm_block* qm) int memlog; memlog=cfg_get(core, core_cfg, memlog); - LOG(memlog, "fm_status (%p):\n", qm); + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", "fm_status (%p):\n", qm); if (!qm) return; - LOG(memlog, " heap size= %ld\n", qm->size); + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", " heap size= %ld\n", + qm->size); #if defined(DBG_F_MALLOC) || defined(MALLOC_STATS) - LOG(memlog, " used= %lu, used+overhead=%lu, free=%lu\n", + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", + " used= %lu, used+overhead=%lu, free=%lu\n", qm->used, qm->real_used, qm->size-qm->real_used); - LOG(memlog, " max used (+overhead)= %lu\n", qm->max_real_used); + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", + " max used (+overhead)= %lu\n", qm->max_real_used); #endif /* - LOG(memlog, "dumping all fragments:\n"); + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", "dumping all fragments:\n"); for (f=qm->first_frag, i=0;((char*)f<(char*)qm->last_frag) && (i<10); f=FRAG_NEXT(f), i++){ - LOG(memlog, " %3d. %c address=%x size=%d\n", i, + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", + " %3d. %c address=%x size=%d\n", i, (f->u.reserved)?'a':'N', (char*)f+sizeof(struct fm_frag), f->size); #ifdef DBG_F_MALLOC - LOG(memlog, " %s from %s: %s(%d)\n", + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", + " %s from %s: %s(%d)\n", (f->u.is_free)?"freed":"alloc'd", f->file, f->func, f->line); #endif } */ - LOG(memlog, "dumping free list:\n"); + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", "dumping free list:\n"); for(h=0,i=0,size=0;h<F_HASH_SIZE;h++){ unused=0; for (f=qm->free_hash[h].first,j=0; f; @@ -613,14 +618,16 @@ void fm_status(struct fm_block* qm) if (!FRAG_WAS_USED(f)){ unused++; #ifdef DBG_F_MALLOC - LOG(memlog, "unused fragm.: hash = %3d, fragment %p," + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", + "unused fragm.: hash = %3d, fragment %p," " address %p size %lu, created from %s: %s(%ld)\n", h, f, (char*)f+sizeof(struct fm_frag), f->size, f->file, f->func, f->line); #endif }; } - if (j) LOG(memlog, "hash = %3d fragments no.: %5d, unused: %5d\n\t\t" + if (j) LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", + "hash = %3d fragments no.: %5d, unused: %5d\n\t\t" " bucket size: %9lu - %9lu (first %9lu)\n", h, j, unused, UN_HASH(h), ((h<=F_MALLOC_OPTIMIZE/ROUNDTO)?1:2)* UN_HASH(h), @@ -632,7 +639,8 @@ void fm_status(struct fm_block* qm) } /* { - LOG(memlog, " %5d.[%3d:%3d] %c address=%x size=%d(%x)\n", + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", + " %5d.[%3d:%3d] %c address=%x size=%d(%x)\n", i, h, j, (f->u.reserved)?'a':'N', (char*)f+sizeof(struct fm_frag), f->size, f->size); @@ -643,8 +651,10 @@ void fm_status(struct fm_block* qm) } */ } - LOG(memlog, "TOTAL: %6d free fragments = %6lu free bytes\n", i, size); - LOG(memlog, "-----------------------------\n"); + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", + "TOTAL: %6d free fragments = %6lu free bytes\n", i, size); + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", + "-----------------------------\n"); } @@ -756,7 +766,8 @@ void fm_sums(struct fm_block* qm) if (!qm) return; memlog=cfg_get(core, core_cfg, memlog); - LOG(memlog, "summarizing all alloc'ed. fragments:\n"); + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", + "summarizing all alloc'ed. fragments:\n"); for (f=qm->first_frag, i=0; (char*)f<(char*)qm->last_frag; f=FRAG_NEXT(f), i++){ @@ -777,7 +788,8 @@ void fm_sums(struct fm_block* qm) } x = root; while(x){ - LOG(memlog, " count=%6d size=%10lu bytes from %s: %s(%ld)\n", + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", + " count=%6d size=%10lu bytes from %s: %s(%ld)\n", x->count,x->size, x->file, x->func, x->line ); @@ -785,7 +797,8 @@ void fm_sums(struct fm_block* qm) free(x); x = root; } - LOG(memlog, "-----------------------------\n"); + LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", + "-----------------------------\n"); } #endif /* DBG_F_MALLOC */

15 years, 2 months

git:master: mem: include the module name in the debugging info

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 220ac6e202bd7bbd69989bc812465cb4173831a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=220ac6e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 8 11:33:25 2009 +0200 mem: include the module name in the debugging info - use <module_name: file> when recording the filename information for debugging (DBQ_QM_MALLOC defined) - added a new file that should define in a portable way the various location info (file, function, a.s.o.) --- mem/mem.h | 29 +++++++++---------- mem/shm_mem.h | 14 ++++----- mem/src_loc.h | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 23 deletions(-) diff --git a/mem/mem.h b/mem/mem.h index ab052bd..aed1442 100644 --- a/mem/mem.h +++ b/mem/mem.h @@ -62,23 +62,22 @@ # ifdef DBG_QM_MALLOC -#ifdef __SUNPRO_C - #define __FUNCTION__ "" /* gcc specific */ -#endif + +# include "src_loc.h" /* src location macros: _SRC_* */ # ifdef F_MALLOC -# define pkg_malloc(s) fm_malloc(mem_block, (s),__FILE__, \ - __FUNCTION__, __LINE__) -# define pkg_free(p) fm_free(mem_block, (p), __FILE__, \ - __FUNCTION__, __LINE__) -# define pkg_realloc(p, s) fm_realloc(mem_block, (p), (s),__FILE__, \ - __FUNCTION__, __LINE__) +# define pkg_malloc(s) fm_malloc(mem_block, (s), _SRC_LOC_, \ + _SRC_FUNCTION_, _SRC_LINE_) +# define pkg_free(p) fm_free(mem_block, (p), _SRC_LOC_, \ + _SRC_FUNCTION_, _SRC_LINE_) +# define pkg_realloc(p, s) fm_realloc(mem_block, (p), (s), \ + _SRC_LOC_, _SRC_FUNCTION_, _SRC_LINE_) # else -# define pkg_malloc(s) qm_malloc(mem_block, (s),__FILE__, \ - __FUNCTION__, __LINE__) -# define pkg_realloc(p, s) qm_realloc(mem_block, (p), (s),__FILE__, \ - __FUNCTION__, __LINE__) -# define pkg_free(p) qm_free(mem_block, (p), __FILE__, \ - __FUNCTION__, __LINE__) +# define pkg_malloc(s) qm_malloc(mem_block, (s),_SRC_LOC_, \ + _SRC_FUNCTION_, _SRC_LINE_) +# define pkg_realloc(p, s) qm_realloc(mem_block, (p), (s), \ + _SRC_LOC_, _SRC_FUNCTION_, _SRC_LINE_) +# define pkg_free(p) qm_free(mem_block, (p), _SRC_LOC_, \ + _SRC_FUNCTION_, _SRC_LINE_) # endif # else # ifdef F_MALLOC diff --git a/mem/shm_mem.h b/mem/shm_mem.h index e4009a5..2dce31a 100644 --- a/mem/shm_mem.h +++ b/mem/shm_mem.h @@ -187,12 +187,10 @@ void shm_mem_destroy(); #ifdef DBG_QM_MALLOC -#ifdef __SUNPRO_C - #define __FUNCTION__ "" /* gcc specific */ -#endif +#include "src_loc.h" #define shm_malloc_unsafe(_size ) \ - MY_MALLOC(shm_block, (_size), __FILE__, __FUNCTION__, __LINE__ ) + MY_MALLOC(shm_block, (_size), _SRC_LOC_, _SRC_FUNCTION_, _SRC_LINE_ ) inline static void* _shm_malloc(unsigned int size, @@ -218,15 +216,15 @@ inline static void* _shm_realloc(void *ptr, unsigned int size, } #define shm_malloc( _size ) _shm_malloc((_size), \ - __FILE__, __FUNCTION__, __LINE__ ) + _SRC_LOC_, _SRC_FUNCTION_, _SRC_LINE_ ) #define shm_realloc( _ptr, _size ) _shm_realloc( (_ptr), (_size), \ - __FILE__, __FUNCTION__, __LINE__ ) + _SRC_LOC_, _SRC_FUNCTION_, _SRC_LINE_ ) #define shm_free_unsafe( _p ) \ - MY_FREE( shm_block, (_p), __FILE__, __FUNCTION__, __LINE__ ) + MY_FREE( shm_block, (_p), _SRC_LOC_, _SRC_FUNCTION_, _SRC_LINE_ ) #define shm_free(_p) \ do { \ @@ -240,7 +238,7 @@ do { \ void* _shm_resize(void* ptr, unsigned int size, const char* f, const char* fn, int line); #define shm_resize(_p, _s ) _shm_resize((_p), (_s), \ - __FILE__, __FUNCTION__, __LINE__ ) + _SRC_LOC_, _SRC_FUNCTION_, _SRC_LINE_ ) /*#define shm_resize(_p, _s ) shm_realloc( (_p), (_s))*/ diff --git a/mem/src_loc.h b/mem/src_loc.h new file mode 100644 index 0000000..3877d17 --- /dev/null +++ b/mem/src_loc.h @@ -0,0 +1,83 @@ +/* + * $Id$ + * + * Copyright (C) 2009 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * mem/src_loc.h - defines for src location ( function name, module a.s.o.), + * used for recording a *malloc()/ *free() caller. + * + * Expects MOD_NAME defined for modules (if it's not defined "core" will be + * assumed). + * Defines: + * _SRC_FUNCTION_ - current function name + * _SRC_FILENAME_ - current .c filename + * _SRC_LINE_ - current line + * _SRC_MODULE_ - module name, lib name or "<core>" (depends on MOD_NAME + * being properly set) + * _SRC_LOC_ - module name + file name + * + */ +/* + * History: + * -------- + * 2009-10-08 initial version (andrei) +*/ + +#ifndef __src_loc_h +#define __src_loc_h + + +/* C >= 99 has __func__, older gcc versions have __FUNCTION__ */ +#ifndef _SRC_FUNCTION_ +# if __STDC_VERSION__ < 199901L +# if __GNUC__ >= 2 +# define _SRC_FUNCTION_ __FUNCTION__ +# else +# define _SRC_FUNCTION_ "" +# endif +# else +# define _SRC_FUNCTION_ __func__ +# endif /* __STDC_VERSION_ < 199901L */ +#endif /* _FUNC_NAME_ */ + + +#ifndef _SRC_FILENAME_ +# define _SRC_FILENAME_ __FILE__ +#endif /* _SRC_FILENAME_ */ + + +#ifndef _SRC_LINE_ +# define _SRC_LINE_ __LINE__ +#endif /* _SRC_LINE_ */ + + +#ifndef _SRC_MODULE_ +# ifdef MOD_NAME +# define _SRC_MODULE_ MOD_NAME +# else +# define _SRC_MODULE_ "<core>" +# endif /* MOD_NAME */ +#endif /* _SRC_MODULE_ */ + + +#ifndef _SRC_LOC_ +# define _SRC_LOC_ _SRC_MODULE_ ": " _SRC_FILENAME_ +#endif /*_SRC_LOC_ */ + + +#endif /*__src_loc_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */

15 years, 2 months

SF.net SVN: openser:[5934] trunk/INSTALL

by Olle E. Johansson

Revision: 5934 http://openser.svn.sourceforge.net/openser/?rev=5934&view=rev Author: oej Date: 2009-10-08 08:35:06 +0000 (Thu, 08 Oct 2009) Log Message: ----------- Formatting changes Modified Paths: -------------- trunk/INSTALL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 2 months

git:master: pv(k): removed $rc and $retcode (they are now in core)

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: e0d9b790d1971995823020777525cda63638973c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e0d9b79… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 8 00:03:25 2009 +0200 pv(k): removed $rc and $retcode (they are now in core) --- modules_k/pv/pv.c | 6 +++--- modules_k/pv/pv_core.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index b284bbd..90fb460 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -252,12 +252,12 @@ static pv_export_t mod_pvs[] = { {{"rb", (sizeof("rb")-1)}, /* */ PVT_MSG_BODY, pv_get_msg_body, 0, 0, 0, 0, 0}, - {{"rc", (sizeof("rc")-1)}, /* */ + /* {{"rc", (sizeof("rc")-1)}, PVT_OTHER, pv_get_return_code, 0, 0, 0, 0, 0}, - {{"retcode", (sizeof("retcode")-1)}, /* */ + {{"retcode", (sizeof("retcode")-1)}, PVT_OTHER, pv_get_return_code, 0, - 0, 0, 0, 0}, + 0, 0, 0, 0}, */ {{"rd", (sizeof("rd")-1)}, /* */ PVT_RURI_DOMAIN, pv_get_ruri_attr, pv_set_ruri_host, 0, 0, pv_init_iname, 2}, diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index f8e527e..71186dd 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -78,12 +78,13 @@ int pv_get_5060(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return pv_get_strintval(msg, param, res, &str_5060, 5060); } -extern int _last_returned_code; +/*extern int _last_returned_code; int pv_get_return_code(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { return pv_get_sintval(msg, param, res, _last_returned_code); } +*/ int pv_get_pid(struct sip_msg *msg, pv_param_t *param, pv_value_t *res)

15 years, 2 months

← Newer
1
...
35
36
37
38
39
40
41
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2009