sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
375 discussions

git:master: core/parser: new internal msg flag - FL_UAC_AUTH
by Daniel-Constantin Mierla 05 Sep '14

05 Sep '14

Module: sip-router Branch: master Commit: b2dcdf63af755200a58baa2c3182806e0f6142e2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b2dcdf6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 5 15:04:41 2014 +0200 core/parser: new internal msg flag - FL_UAC_AUTH - to mark requests that had local uac authentication done (e.g., via uac_auth() from uac module) - it is an … [View More]

1 0

git:master: dialog: add option to increment cseq upon local authentication to next hop
by Daniel-Constantin Mierla 05 Sep '14

05 Sep '14

Module: sip-router Branch: master Commit: 94f18a957484f5e9eada7402f64c8626a6863fa6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94f18a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 5 15:11:57 2014 +0200 dialog: add option to increment cseq upon local authentication to next hop - feature has to be enabled via module parameter track_cseq_updates - it does it only for … [View More]

1 0

git:master: corex: functions for management of msg internal flags
by Daniel-Constantin Mierla 05 Sep '14

05 Sep '14

Module: sip-router Branch: master Commit: eeec4d9905f1ff76fedc46741acf0109d2f556ca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eeec4d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 5 15:06:54 2014 +0200 corex: functions for management of msg internal flags - msg_iflag_set("flagname") - msg_iflag_reset("flagname") - msg_iflag_is_set("flagname") - flagname can be: … [View More]USE_UAC_FROM, USE_UAC_TO or UAC_AUTH - this functions should not be used in configuration file for (re)setting the flags, those are done by various functions internally, however, in very particular cases they might be useful (e.g., changing From/To via textops functions) --- modules/corex/corex_mod.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/modules/corex/corex_mod.c b/modules/corex/corex_mod.c index a554b07..f30163a 100644 --- a/modules/corex/corex_mod.c +++ b/modules/corex/corex_mod.c @@ -40,6 +40,9 @@ static int w_append_branch(sip_msg_t *msg, char *su, char *sq); static int w_send(sip_msg_t *msg, char *su, char *sq); static int w_send_tcp(sip_msg_t *msg, char *su, char *sq); static int w_send_data(sip_msg_t *msg, char *suri, char *sdata); +static int w_msg_iflag_set(sip_msg_t *msg, char *pflag, char *p2); +static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2); +static int w_msg_iflag_is_set(sip_msg_t *msg, char *pflag, char *p2); int corex_alias_subdomains_param(modparam_t type, void *val); @@ -73,6 +76,12 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"is_incoming", (cmd_function)nio_check_incoming, 0, 0, 0, ANY_ROUTE }, + {"msg_iflag_set", (cmd_function)w_msg_iflag_set, 1, fixup_spve_null, + 0, ANY_ROUTE }, + {"msg_iflag_reset", (cmd_function)w_msg_iflag_reset, 1, fixup_spve_null, + 0, ANY_ROUTE }, + {"msg_iflag_is_set", (cmd_function)w_msg_iflag_is_set, 1, fixup_spve_null, + 0, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} }; @@ -204,3 +213,95 @@ error: } +typedef struct _msg_iflag_name { + str name; + int value; +} msg_iflag_name_t; + +static msg_iflag_name_t _msg_iflag_list[] = { + { str_init("USE_UAC_FROM"), FL_USE_UAC_FROM }, + { str_init("USE_UAC_TO"), FL_USE_UAC_TO }, + { str_init("UAC_AUTH"), FL_UAC_AUTH }, + { {0, 0}, 0 } +}; + + +/** + * + */ +static int msg_lookup_flag(str *fname) +{ + int i; + for(i=0; i++; ) { + if(_msg_iflag_list[i].name.len <= 0) break; + if(fname->len==_msg_iflag_list[i].name.len + && strncasecmp(_msg_iflag_list[i].name.s, fname->s, + fname->len)==0) { + return _msg_iflag_list[i].value; + } + } + return -1; +} +/** + * + */ +static int w_msg_iflag_set(sip_msg_t *msg, char *pflag, char *p2) +{ + int fv; + str fname; + if (fixup_get_svalue(msg, (gparam_t*)pflag, &fname)) + { + LM_ERR("cannot get the msg flag name parameter\n"); + return -1; + } + fv = msg_lookup_flag(&fname); + if(fv==1) { + LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); + return -1; + } + msg->msg_flags |= fv; + return 1; +} + +/** + * + */ +static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2) +{ + int fv; + str fname; + if (fixup_get_svalue(msg, (gparam_t*)pflag, &fname)) + { + LM_ERR("cannot get the msg flag name parameter\n"); + return -1; + } + fv = msg_lookup_flag(&fname); + if(fv<0) { + LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); + return -1; + } + msg->msg_flags &= ~fv; + return 1; +} + +/** + * + */ +static int w_msg_iflag_is_set(sip_msg_t *msg, char *pflag, char *p2) +{ + int fv; + str fname; + if (fixup_get_svalue(msg, (gparam_t*)pflag, &fname)) + { + LM_ERR("cannot get the msg flag name parameter\n"); + return -1; + } + fv = msg_lookup_flag(&fname); + if(fv<0) { + LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); + return -1; + } + if(msg->msg_flags & fv) + return 1; + return -2; +} [View Less]

1 0

git:master: uac: mark request with FL_UAC_AUTH upon using uac_auth()
by Daniel-Constantin Mierla 05 Sep '14

05 Sep '14

Module: sip-router Branch: master Commit: 0b08a0bb0051bab16ce8c89ff37dbc874ae37cd7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b08a0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 5 15:06:00 2014 +0200 uac: mark request with FL_UAC_AUTH upon using uac_auth() --- modules/uac/auth.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/… [View More]

1 0

mtree_match problem
by Juha Heinanen 05 Sep '14

05 Sep '14

i tried mt_match mi command that was introduced in master. for some reason, it does not match properly. here is an example. # sip-proxy_ctl mi mt_list lp_out MT:: TNAME=lp_out TPREFIX=+3587234567 TVALUE=20010 MT:: TNAME=lp_out TPREFIX=+3587234568 TVALUE=20010 # sip-proxy_ctl mi mt_match lp_out \+3587234567 2 error: 404 - Not found tvalue i then changed LM_DBG to LM_INFO and got to syslog: Sep 5 11:51:55 siika /usr/bin/sip-proxy[29498]: INFO: mtree [mtree_mod.c:1346]: mt_mi_match(): no … [View More]

2 2

mt_match return value
by Juha Heinanen 05 Sep '14

05 Sep '14

mtree README does not mention about return value of mt_match function. however, code has this: if(mt_match_prefix(msg, tr, &tomatch, mval)<0) { LM_DBG("no prefix found in [%.*s] for [%.*s]\n", tname.len, tname.s, tomatch.len, tomatch.s); goto error; } lock_get( mt_lock ); mt_tree_refcnt--; lock_release( mt_lock ); return 1; error: lock_get( mt_lock ); mt_tree_refcnt--; lock_release( mt_lock ); return -1; so it looks like mt_match would return 1 if match … [View More]

2 1

[tracker] Task opened: To tag parsing bug (Attachment added)
by sip-router 04 Sep '14

04 Sep '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Alekzander Spiridonov (alekz) Attached to Project - sip-router Summary - To tag parsing bug Task Type - Bug Report Category - Core Status - Unconfirmed Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - There is a bug in kamailio message parser\translator: In … [View More]

1 0

git:master: rr: remove_record_route() - config function to remove record-route lumps
by Daniel-Constantin Mierla 04 Sep '14

04 Sep '14

Module: sip-router Branch: master Commit: a207fb24036df343f4cce812ff7305ccb73a41b6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a207fb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 4 15:51:21 2014 +0200 rr: remove_record_route() - config function to remove record-route lumps - re-added from ser rr module --- modules/rr/rr_mod.c | 79 ++++++++++++++++++++++++++++… [View More]+++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/modules/rr/rr_mod.c b/modules/rr/rr_mod.c index 2366724..49133cf 100644 --- a/modules/rr/rr_mod.c +++ b/modules/rr/rr_mod.c @@ -76,6 +76,7 @@ static int w_record_route_advertised_address(struct sip_msg *, char *, char *); static int w_add_rr_param(struct sip_msg *,char *, char *); static int w_check_route_param(struct sip_msg *,char *, char *); static int w_is_direction(struct sip_msg *,char *, char *); +static int remove_record_route(sip_msg_t*, char*, char*); /* PV functions */ static int pv_get_route_uri_f(struct sip_msg *, pv_param_t *, pv_value_t *); /*! @@ -100,6 +101,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE}, {"is_direction", (cmd_function)w_is_direction, 1, direction_fixup, 0, REQUEST_ROUTE}, + {"remove_record_route", remove_record_route, 0, 0, 0, + REQUEST_ROUTE|FAILURE_ROUTE}, {"load_rr", (cmd_function)load_rr, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -400,3 +403,79 @@ pv_get_route_uri_f(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &uri); } +static void free_rr_lump(struct lump **list) +{ + struct lump *prev_lump, *lump, *a, *foo, *next; + int first_shmem; + + first_shmem=1; + next=0; + prev_lump=0; + for(lump=*list;lump;lump=next) { + next=lump->next; + if (lump->type==HDR_RECORDROUTE_T) { + /* may be called from railure_route */ + /* if (lump->flags & (LUMPFLAG_DUPED|LUMPFLAG_SHMEM)){ + LOG(L_CRIT, "BUG: free_rr_lmp: lump %p, flags %x\n", + lump, lump->flags); + */ /* ty to continue */ + /*}*/ + a=lump->before; + while(a) { + foo=a; a=a->before; + if (!(foo->flags&(LUMPFLAG_DUPED|LUMPFLAG_SHMEM))) + free_lump(foo); + if (!(foo->flags&LUMPFLAG_SHMEM)) + pkg_free(foo); + } + a=lump->after; + while(a) { + foo=a; a=a->after; + if (!(foo->flags&(LUMPFLAG_DUPED|LUMPFLAG_SHMEM))) + free_lump(foo); + if (!(foo->flags&LUMPFLAG_SHMEM)) + pkg_free(foo); + } + + if (first_shmem && (lump->flags&LUMPFLAG_SHMEM)) { + /* This is the first element of the + shmemzied lump list, we can not unlink it! + It wound corrupt the list otherwise if we + are in failure_route. -- No problem, only the + anchor is left in the list */ + + LOG(L_DBG, "DEBUG: free_rr_lump: lump %p" \ + " is left in the list\n", + lump); + + if (lump->len) + LOG(L_CRIT, "BUG: free_rr_lump: lump %p" \ + " can not be removed, but len=%d\n", + lump, lump->len); + + prev_lump=lump; + } else { + if (prev_lump) prev_lump->next = lump->next; + else *list = lump->next; + if (!(lump->flags&(LUMPFLAG_DUPED|LUMPFLAG_SHMEM))) + free_lump(lump); + if (!(lump->flags&LUMPFLAG_SHMEM)) + pkg_free(lump); + } + } else { + /* store previous position */ + prev_lump=lump; + } + if (first_shmem && (lump->flags&LUMPFLAG_SHMEM)) + first_shmem=0; + } +} + +/* + * Remove Record-Route header from message lumps + */ +static int remove_record_route(sip_msg_t* _m, char* _s1, char* _s2) +{ + free_rr_lump(&(_m->add_rm)); + return 1; +} [View Less]

1 0

git:master: rr: documentation for remove_record_route()
by Daniel-Constantin Mierla 04 Sep '14

04 Sep '14

Module: sip-router Branch: master Commit: ad4bbd282b22a8fb55544b57f0eb8b8e799b5e3d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad4bbd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 4 15:56:35 2014 +0200 rr: documentation for remove_record_route() --- modules/rr/README | 108 +++++++++++++++++++++++++------------------ modules/rr/doc/rr_admin.xml | 25 … [View More]

1 0

git:alexh/dialog-sync-wip: dialog: Do not delete replicated dialogs immediately to absorb out-of-order syncs
by Alex Hermann 04 Sep '14

04 Sep '14

Module: sip-router Branch: alexh/dialog-sync-wip Commit: aebd669c902e45cf18874feb7f5eca5ace05d536 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aebd669… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Aug 28 11:18:56 2014 +0200 dialog: Do not delete replicated dialogs immediately to absorb out-of-order syncs Use a timer to cleanup dlgs in "deleted" state. This gives a limited timeframe to prevent out-… [View More]

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014