January 2012 - sr-dev - kamailio.org

[tracker] Assignee added: Assignment operators don't work
by sip-router 29 May '26

29 May '26

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#100 - Assignment operators don't work User who did this - Alex Hermann (axlh) http://sip-router.org/tracker/index.php?do=details&task_id=100 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 9

git:master: pv: use suip2a(...) for $snd(..)
by Daniel-Constantin Mierla 04 Dec '25

04 Dec '25

Module: sip-router Branch: master Commit: e151a9e99b1fed7805eaed5d16ca3d6466e1f517 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e151a9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 18 22:37:07 2011 +0200 pv: use suip2a(...) for $snd(..) - fixes FS#140, reported by Klaus Darilion --- modules_k/pv/pv_branch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_branch.c b/modules_k/pv/pv_branch.c index a9dd1bc..4081429 100644 --- a/modules_k/pv/pv_branch.c +++ b/modules_k/pv/pv_branch.c @@ -395,7 +395,7 @@ int pv_get_sndto(struct sip_msg *msg, pv_param_t *param, (int)snd_inf->len); default: /* 0 - ip */ - s.s = su2a(snd_inf->to, sizeof(*snd_inf->to)); + s.s = suip2a(snd_inf->to, sizeof(*snd_inf->to)); s.len = strlen(s.s); return pv_get_strval(msg, param, res, &s); }

2 1

current master fails to start
by Juha Heinanen 03 Feb '12

03 Feb '12

Juha Heinanen wrote: > i installed a very bare debian squeeze on a virtual host on the same pc > and there kamailio starts fine. kamailio started fine on virtual host, but the reason turned out to be that i didn't have geoip enabled in the virtual host kamailio instance. once i loaded also geoip module, kamailio crashed the same way as on the real host. i also tried another real host running debian squeeze and also there, kamailio crashes if and only if geoip module is enabled. the crash happens very early during config processing. on one host like this: (gdb) where #0 0xb7870424 in __kernel_vsyscall () #1 0xb75ce781 in raise () from /lib/i686/cmov/libc.so.6 #2 0xb75d1bb2 in abort () from /lib/i686/cmov/libc.so.6 #3 0xb760f584 in ?? () from /lib/i686/cmov/libc.so.6 #4 0xb7611fd4 in ?? () from /lib/i686/cmov/libc.so.6 #5 0xb7613d8c in malloc () from /lib/i686/cmov/libc.so.6 #6 0xb765a7ac in ?? () from /lib/i686/cmov/libc.so.6 #7 0xb765b33e in regcomp () from /lib/i686/cmov/libc.so.6 #8 0x0809a880 in set_mod_param_regex ( regex=0xb71a25f0 "auth_db|dialplan|domain|htable|lcr|local|msilo|mtree|permissions|usrloc", name=0xb71a2678 "db_url", type=1, val=0xb71a2700) at modparam.c:86 #9 0x081807dd in yyparse () at cfg.y:1733 #10 0x08095d9f in main (argc=18, argv=0xbf808934) at main.c:2084 and on another like this: #0 0xb788a424 in __kernel_vsyscall () #1 0xb75e3781 in *__GI_raise (sig=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64 #2 0xb75e6bb2 in *__GI_abort () at abort.c:92 #3 0xb7624584 in __malloc_assert (assertion=<value optimized out>, file=<value optimized out>, line=4636, function=0xb76dbc10 "_int_malloc") at malloc.c:352 #4 0xb7626fd4 in _int_malloc (av=<value optimized out>, bytes=<value optimized out>) at malloc.c:4636 #5 0xb7628d8c in *__GI___libc_malloc (bytes=8) at malloc.c:3661 #6 0xb769690a in nss_parse_file (database=0xb76dcf07 "passwd", alternate_name=0x0, defconfig=0xb76e0d40 "compat [NOTFOUND=return] files", ni=0xb76ff834) at nsswitch.c:542 #7 *__GI___nss_database_lookup (database=0xb76dcf07 "passwd", alternate_name=0x0, defconfig=0xb76e0d40 "compat [NOTFOUND=return] files", ni=0xb76ff834) at nsswitch.c:134 #8 0xb769728e in *__GI___nss_passwd_lookup2 (ni=0xbf96ebe8, fct_name=<value optimized out>, fct2_name=<value optimized out>, fctp=0xbf96ebe4) at XXX-lookup.c:71 #9 0xb764f7ff in __getpwnam_r (name=0xbf96f8cc "root", resbuf=0xb76fdc1c, buffer=0x9497150 "\320\323o\267\320\323o\267d symbol: mod_register", buflen=1024, result=0xbf96ec18) at ../nss/getXXbyYY_r.c:200 #10 0xb764f14f in getpwnam (name=0xbf96f8cc "root") at ../nss/getXXbyYY.c:117 #11 0x08134560 in user2uid (uid=0x81f1c20, gid=0x81f1c24, user=0xbf96f8cc "root") at ut.c:57 #12 0x080ebb91 in init_shm () at shm_init.c:63 #13 0x081807aa in yyparse () at cfg.y:1728 #14 0x08095d9f in main (argc=18, argv=0xbf96f324) at main.c:2084 crash happens no matter if my local module is loaded or it is not the culprit. could there be something wrong with geoip module even when the backtraces are not geoip related? any suggesting on how to dig further are welcome. -- juha

3 12

git:master: snmpstats: safe destroy in case of invalid startup
by Daniel-Constantin Mierla 31 Jan '12

31 Jan '12

Module: sip-router Branch: master Commit: 06e71ad96e8f13bafac1fa5d968538f98bd08df5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=06e71ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 31 23:08:02 2012 +0100 snmpstats: safe destroy in case of invalid startup - some pointers were not intialized yet, but due to destroy of no-startup they were accessed - reported by Klaus Feichtinger --- modules_k/snmpstats/interprocess_buffer.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/modules_k/snmpstats/interprocess_buffer.c b/modules_k/snmpstats/interprocess_buffer.c index c36b079..3ad7113 100644 --- a/modules_k/snmpstats/interprocess_buffer.c +++ b/modules_k/snmpstats/interprocess_buffer.c @@ -61,15 +61,15 @@ * * 2) maps a given aor to a contact list. */ -hashSlot_t *hashTable; +hashSlot_t *hashTable = NULL; /*! All interprocess communication is stored between these two declarations. */ -interprocessBuffer_t *frontRegUserTableBuffer; -interprocessBuffer_t *endRegUserTableBuffer; +interprocessBuffer_t *frontRegUserTableBuffer = NULL; +interprocessBuffer_t *endRegUserTableBuffer = NULL; /*! This is to protect the potential racecondition in which a command is added to * the buffer while it is being consumed */ -gen_lock_t *interprocessCBLock; +gen_lock_t *interprocessCBLock = NULL; /*! * This function takes an element of the interprocess buffer passed to it, and @@ -103,12 +103,23 @@ int initInterprocessBuffers(void) * command was received while the interprocess buffer was being consumed. */ interprocessCBLock = lock_alloc(); + if(interprocessCBLock==NULL) + { + LM_ERR("cannot allocate the lock\n"); + shm_free(frontRegUserTableBuffer); + frontRegUserTableBuffer = NULL; + shm_free(endRegUserTableBuffer); + endRegUserTableBuffer = NULL; + return -1; + } lock_init(interprocessCBLock); hashTable = createHashTable(HASH_SIZE); if(hashTable == NULL) { LM_ERR("no more shared memory\n"); + lock_destroy(interprocessCBLock); + lock_dealloc(interprocessCBLock); shm_free(frontRegUserTableBuffer); frontRegUserTableBuffer = NULL; shm_free(endRegUserTableBuffer); @@ -351,7 +362,9 @@ void freeInterprocessBuffer(void) { interprocessBuffer_t *currentBuffer, *previousBuffer; - if (frontRegUserTableBuffer->next == NULL) { + if (frontRegUserTableBuffer==NULL + || frontRegUserTableBuffer->next == NULL + || endRegUserTableBuffer==NULL) { LM_DBG("Nothing to clean\n"); return; }

1 0

git:master: modules/lcr: added lcr.defunct_gw rpc command
by admin＠sip-router.org 31 Jan '12

31 Jan '12

Module: sip-router Branch: master Commit: 1c6fed07a177593634a8c31a8d004f0aab165d16 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c6fed0… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Jan 31 01:20:10 2012 +0200 modules/lcr: added lcr.defunct_gw rpc command --- modules/lcr/README | 17 +++++++++++++++++ modules/lcr/doc/lcr_admin.xml | 19 +++++++++++++++++++ modules/lcr/lcr_mod.c | 32 ++++++++++++++++++++++++++++++++ modules/lcr/lcr_mod.h | 5 ++--- modules/lcr/lcr_rpc.c | 32 ++++++++++++++++++++++++++++++-- 5 files changed, 100 insertions(+), 5 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index 3e1ab37..b98cb6c 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -78,6 +78,7 @@ Juha Heinanen 5.1. lcr.reload 5.2. lcr.dump_gws 5.3. lcr.dump_rules + 5.4. lcr.defunct_gw 6. Known Limitations @@ -131,6 +132,7 @@ Juha Heinanen 1.46. lcr.reload RPC example 1.47. lcr.dump_gws RPC example 1.48. lcr.dump_rules RPC example + 1.49. lcr.defunct_gw RPC example Chapter 1. Admin Guide @@ -197,6 +199,7 @@ Chapter 1. Admin Guide 5.1. lcr.reload 5.2. lcr.dump_gws 5.3. lcr.dump_rules + 5.4. lcr.defunct_gw 6. Known Limitations @@ -971,6 +974,7 @@ if (to_any_gw("192.55.66.2", 1)) { 5.1. lcr.reload 5.2. lcr.dump_gws 5.3. lcr.dump_rules + 5.4. lcr.defunct_gw 5.1. lcr.reload @@ -1002,6 +1006,19 @@ if (to_any_gw("192.55.66.2", 1)) { Example 1.48. lcr.dump_rules RPC example $ sercmd lcr.dump_rules +5.4. lcr.defunct_gw + + Defuncts gateway loaded into memory for a period of time (seconds) + without a need to store gateway's defunct value into database and + reload the tables. + + Name: lcr.defunct_gw + + Parameters: lcr_id gw_id period + + Example 1.49. lcr.defunct_gw RPC example + $ sercmd lcr.defunct_gw 1 4 120 + 6. Known Limitations In-memory LCR rules and gw tables are switched by two consecutive diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 64854e9..b8e243d 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -1324,6 +1324,25 @@ if (to_any_gw("192.55.66.2", 1)) { </programlisting> </example> </section> + + <section> + <title><function>lcr.defunct_gw</function></title> + <para> + Defuncts gateway loaded into memory for a period of + time (seconds) without a need to store gateway's + defunct value into database and reload the tables. + </para> + <para> + Name: <emphasis>lcr.defunct_gw</emphasis> + </para> + <para>Parameters: <emphasis>lcr_id gw_id period</emphasis></para> + <example> + <title><function>lcr.defunct_gw</function> RPC example</title> + <programlisting format="linespecific"> + $ sercmd lcr.defunct_gw 1 4 120 + </programlisting> + </example> + </section> </section> <section> <title>Known Limitations</title> diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 8f8d373..58dd0cd 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -2049,6 +2049,38 @@ static int defunct_gw(struct sip_msg* _m, char *_defunct_period, char *_s2) /* + * Defunct given gw in given lcr until time period given as argument has passed. + */ +int rpc_defunct_gw(unsigned int lcr_id, unsigned int gw_id, unsigned int period) +{ + struct gw_info *gws; + unsigned int until, i; + + if ((lcr_id < 1) || (lcr_id > lcr_count_param)) { + LM_ERR("invalid lcr_id value <%u>\n", lcr_id); + return 0; + } + + until = time((time_t *)NULL) + period; + + LM_DBG("defuncting gw <lcr_id/gw_id>=<%u/%u> for %u seconds until %d\n", + lcr_id, gw_id, period, until); + + gws = gw_pt[lcr_id]; + for (i = 1; i <= gws[0].ip_addr.u.addr32[0]; i++) { + if (gws[i].gw_id == gw_id) { + gws[i].defunct_until = until; + return 1; + } + } + + LM_ERR("gateway with id <%u> not found\n", gw_id); + + return 0; +} + + +/* * When called first time, rewrites scheme, host, port, and * transport parts of R-URI based on first gw_uri_avp value, which is then * destroyed. Saves R-URI user to ruri_user_avp for later use. diff --git a/modules/lcr/lcr_mod.h b/modules/lcr/lcr_mod.h index e544f68..5ac2406 100644 --- a/modules/lcr/lcr_mod.h +++ b/modules/lcr/lcr_mod.h @@ -110,8 +110,7 @@ extern gen_lock_t *reload_lock; extern struct gw_info **gw_pt; extern struct rule_info ***rule_pt; -int mi_print_gws(struct mi_node* rpl); -int mi_print_lcrs(struct mi_node* rpl); -int reload_tables(); +extern int reload_tables(); +extern int rpc_defunct_gw(unsigned int, unsigned int, unsigned int); #endif /* LCR_MOD_H */ diff --git a/modules/lcr/lcr_rpc.c b/modules/lcr/lcr_rpc.c index f70c042..111bfb0 100644 --- a/modules/lcr/lcr_rpc.c +++ b/modules/lcr/lcr_rpc.c @@ -67,6 +67,8 @@ static void dump_gws(rpc_t* rpc, void* c) str gw_name, hostname, params; str prefix, tag; struct gw_info *gws; + char buf[INT2STR_MAX_LEN], *start; + int len; for (j = 1; j <= lcr_count_param; j++) { @@ -132,12 +134,14 @@ static void dump_gws(rpc_t* rpc, void* c) prefix.len=gws[i].prefix_len; tag.s=gws[i].tag; tag.len=gws[i].tag_len; - rpc->struct_add(st, "dSSdd", + start = int2strbuf(gws[i].defunct_until, &(buf[0]), INT2STR_MAX_LEN, + &len); + rpc->struct_add(st, "dSSds", "strip", gws[i].strip, "prefix", &prefix, "tag", &tag, "flags", gws[i].flags, - "defunct_until", &gws[i].defunct_until + "defunct_until", start ); } } @@ -199,9 +203,33 @@ static void dump_rules(rpc_t* rpc, void* c) } +static const char* defunct_gw_doc[2] = { + "Defunct gateway until speficied time (Unix timestamp).", + 0 +}; + + +static void defunct_gw(rpc_t* rpc, void* c) +{ + unsigned int lcr_id, gw_id, until; + + if (rpc->scan(c, "ddd", &lcr_id, &gw_id, &until) < 3) { + rpc->fault(c, 400, "lcr_id, gw_id, and timestamp parameters required"); + return; + } + + if (rpc_defunct_gw(lcr_id, gw_id, until) == 0) { + rpc->fault(c, 400, "parameter value error (see syslog)"); + } + + return; +} + + rpc_export_t lcr_rpc[] = { {"lcr.reload", reload, reload_doc, 0}, {"lcr.dump_gws", dump_gws, dump_gws_doc, 0}, {"lcr.dump_rules", dump_rules, dump_rules_doc, 0}, + {"lcr.defunct_gw", defunct_gw, defunct_gw_doc, 0}, {0, 0, 0, 0} };

3 2

Kamailio v3.2.2 Released
by Daniel-Constantin Mierla 31 Jan '12

31 Jan '12

Hello, Kamailio SIP Server v3.2.2 stable release is out. This is a maintenance release of the latest stable branch, 3.2, that includes fixes since release of v3.2.1. There is no change to database schema or configuration language structure that you have to do on installations of v3.2.0 or v3.2.1. Deployments running previous v3.2.x versions are strongly recommended to be upgraded to v3.2.2. For more details about version 3.2.2 (including links and hints to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2012/01/kamailio-v3-2-2-released/ RPM packages are currently on the build service, Debian/Ubuntu packages will be available soon as well. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com http://linkedin.com/in/miconda -- http://twitter.com/miconda

1 0

IRC devel meeting
by Daniel-Constantin Mierla 31 Jan '12

31 Jan '12

Hello, I would like to schedule an IRC meeting to discuss about the development of the project in 2012. The topics coming in my mind at this moment: - roadmap to next major release v3.3.0 - outstanding issues at this time, if any - packaging - ways to automate the process better - documentation - suggestions to improve it and attract more contributions in this field - ideas for new features - administration - web site, mailing lists, etc ... do we miss some good resource out there that should be added in the eco-system? Please add your suggestions for agenda to the wiki page: * http://www.kamailio.org/wiki/devel/irc-meetings/2012a I proposed two dates (Jan 26 and Jan 31, 15:00GMT) and made a Doodle poll for it: * http://www.doodle.com/qzteweb62sqax5r6 If you wish other options for dates, let me know. Based on results, we will announce the final date. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com http://linkedin.com/in/miconda -- http://twitter.com/miconda

1 3

git:3.2: ChangeLog: updated for v3.2.2
by Daniel-Constantin Mierla 31 Jan '12

31 Jan '12

Module: sip-router Branch: 3.2 Commit: 98ba92a69c5301f8e41366453790be428591e972 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98ba92a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 31 15:39:31 2012 +0100 ChangeLog: updated for v3.2.2 --- ChangeLog | 550 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 550 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=98b…

1 0

git:3.2: Makefile: version set to 3.2.2
by Daniel-Constantin Mierla 31 Jan '12

31 Jan '12

Module: sip-router Branch: 3.2 Commit: 7c9fa7ba55abf7d67da4bb1fffb6b0d3e9a2fcae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c9fa7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 31 15:36:07 2012 +0100 Makefile: version set to 3.2.2 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 011de38..48cc8fb 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -161,7 +161,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) #version number VERSION = 3 PATCHLEVEL = 2 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory debugger switcher

1 0

git:3.2: rtpproxy: send timeout socket only for U command
by Daniel-Constantin Mierla 31 Jan '12

31 Jan '12

Module: sip-router Branch: 3.2 Commit: 3c6bd5c5d4405fa9e810759e2303515761af1fe3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3c6bd5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 31 15:21:46 2012 +0100 rtpproxy: send timeout socket only for U command - optional parameters are not allowed for other commands - patch by Nick Altmann (nikbyte), FS#196 (cherry picked from commit 7426c76dfb6750b344e19a632c16374c162f5090) --- modules/rtpproxy/rtpproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index f6f018f..277f639 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -2222,7 +2222,7 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc } else { v[3].iov_len = 0; } - if (to_tag.len > 0) { + if (opts.s.s[0] == 'U' && to_tag.len > 0) { iovec_param_count = 18; if (timeout_socket_str.len > 0) { iovec_param_count = 20;

1 0