sr-dev March 2009

sr-dev@lists.kamailio.org

14 participants
188 discussions

git:janakj/kcore: Merge branch 'sr' into kcore
by Jan Janak 23 Mar '09

23 Mar '09

Module: sip-router Branch: janakj/kcore Commit: 534aa29209a94390f6867b406cb7f69960bcb6c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=534aa29… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 23 13:48:17 2009 +0100 Merge branch 'sr' into kcore * sr: (39 commits) New function to return the To tag for local reply Allow parser syn'ced with kamailio version New functions that can be used to search for a … [View More]

1 0

git:janakj/kcore: Merge branch 'master' of ssh://janakj@git.sip-router.org/ sip-router into sr
by Jan Janak 23 Mar '09

23 Mar '09

Module: sip-router Branch: janakj/kcore Commit: 8a7db2aacd98e1ac0a13753a8cfe82cbd1de14d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a7db2a… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 23 10:44:07 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into sr * 'master' of ssh://janakj@git.sip-router.org/sip-router: tcp: minor optimization sercmd: minor makefile fix tcp … [View More]

1 0

git:janakj/kcore: Merge branch 'master' of ssh://janakj@git.sip-router.org/ sip-router into sr
by Jan Janak 23 Mar '09

23 Mar '09

Module: sip-router Branch: janakj/kcore Commit: 9b63900b14a17f46e45c8aad3e0f970dbc17b73f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b63900… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 23 11:16:52 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into sr * 'master' of ssh://janakj@git.sip-router.org/sip-router: New function to return the To tag for local reply Allow … [View More]

1 0

git:janakj/kcore: Kamailio compatiblity: export last_retcode via a global variable
by Jan Janak 23 Mar '09

23 Mar '09

Module: sip-router Branch: janakj/kcore Commit: 68b7a89891c1391ce518d3684d5f813556786d6d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68b7a89… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Mar 19 14:44:52 2009 +0100 Kamailio compatiblity: export last_retcode via a global variable --- action.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/action.c b/action.c index … [View More]2baa6cb..75072dd 100644 --- a/action.c +++ b/action.c @@ -93,7 +93,7 @@ #include <dmalloc.h> #endif - +int _last_returned_code = 0; struct onsend_info* p_onsend=0; /* onsend route send info */ /* ret= 0! if action -> end of list(e.g DROP), @@ -461,6 +461,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) /*ret=((ret=run_actions(rlist[a->val[0].u.number], msg))<0)?ret:1;*/ ret=run_actions(h, main_rt.rlist[a->val[0].u.number], msg); h->last_retcode=ret; + _last_returned_code = h->last_retcode; h->run_flags&=~(RETURN_R_F|BREAK_R_F); /* absorb return & break */ break; case EXEC_T: @@ -745,6 +746,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ); if (ret==0) h->run_flags|=EXIT_R_F; h->last_retcode=ret; + _last_returned_code = h->last_retcode; } else { LOG(L_CRIT,"BUG: do_action: bad module call\n"); } @@ -762,6 +764,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ); if (ret==0) h->run_flags|=EXIT_R_F; h->last_retcode=ret; + _last_returned_code = h->last_retcode; } else { LOG(L_CRIT,"BUG: do_action: bad module call\n"); } @@ -777,6 +780,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ); if (ret==0) h->run_flags|=EXIT_R_F; h->last_retcode=ret; + _last_returned_code = h->last_retcode; } else { LOG(L_CRIT,"BUG: do_action: bad module call\n"); } @@ -793,6 +797,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ); if (ret==0) h->run_flags|=EXIT_R_F; h->last_retcode=ret; + _last_returned_code = h->last_retcode; } else { LOG(L_CRIT,"BUG: do_action: bad module call\n"); } @@ -810,6 +815,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ); if (ret==0) h->run_flags|=EXIT_R_F; h->last_retcode=ret; + _last_returned_code = h->last_retcode; } else { LOG(L_CRIT,"BUG: do_action: bad module call\n"); } @@ -823,6 +829,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ); if (ret==0) h->run_flags|=EXIT_R_F; h->last_retcode=ret; + _last_returned_code = h->last_retcode; } else { LOG(L_CRIT,"BUG: do_action: bad module call\n"); } @@ -1119,6 +1126,7 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) if (h->rec_lev==1){ h->run_flags=0; h->last_retcode=0; + _last_returned_code = h->last_retcode; #ifdef USE_LONGJMP if (setjmp(h->jmp_env)){ h->rec_lev=0; @@ -1142,6 +1150,7 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) if (h->run_flags & EXIT_R_F){ #ifdef USE_LONGJMP h->last_retcode=ret; + _last_returned_code = h->last_retcode; longjmp(h->jmp_env, ret); #endif } [View Less]

1 0

git:master: New function to return the To tag for local reply
by Jan Janak 23 Mar '09

23 Mar '09

Module: sip-router Branch: master Commit: bc384ddb1ddb1ec32ae115548d2dee93d4ebf74d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc384dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 20 17:42:53 2009 +0100 New function to return the To tag for local reply Added t_get_reply_totag() to access the to-tag value for generated replies. This is needed by sl to cope with presence modules … [View More]

1 0

git:master: Allow parser syn'ced with kamailio version
by Jan Janak 23 Mar '09

23 Mar '09

Module: sip-router Branch: master Commit: 0d54a7754641467aa3dab8ed86979a6f6f96532d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d54a77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 20 17:19:22 2009 +0100 Allow parser syn'ced with kamailio version Sync'ed parse_allow_header() prototype name with implementation. New parse_allow() function that work over sim_msg structure Signed-off-by: … [View More]Jan Janak <jan(a)iptel.org> --- parser/hf.c | 2 + parser/parse_allow.c | 83 +++++++++++++++++++++++++++++++++++++++----------- parser/parse_allow.h | 28 ++++++++++++++-- 3 files changed, 91 insertions(+), 22 deletions(-) diff --git a/parser/hf.c b/parser/hf.c index c5f7ba3..f33aaa1 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -52,6 +52,7 @@ #include "parse_subscription_state.h" #include "contact/parse_contact.h" #include "parse_disposition.h" +#include "parse_allow.h" #include "../ut.h" @@ -138,6 +139,7 @@ void clean_hdr_field(struct hdr_field* hf) break; case HDR_ALLOW_T: + free_allow_header(hf); break; case HDR_EVENT_T: diff --git a/parser/parse_allow.c b/parser/parse_allow.c index 62cec93..ce435ac 100644 --- a/parser/parse_allow.c +++ b/parser/parse_allow.c @@ -43,41 +43,88 @@ */ int parse_allow_header(struct hdr_field* _hf) { - unsigned int* methods; - + struct allow_body* ab = 0; + if (!_hf) { LOG(L_ERR, "parse_allow_header: Invalid parameter value\n"); return -1; } - /* maybe the header is already parsed! */ + /* maybe the header is already parsed! */ if (_hf->parsed) { return 0; } - /* bad luck! :-( - we have to parse it */ - methods = pkg_malloc(sizeof(unsigned int)); - if (methods == 0) { - LOG(L_ERR, "ERROR:parse_allow_header: Out of pkg_memory\n"); - return -1; - } + ab = (struct allow_body*)pkg_malloc(sizeof(struct allow_body)); + if (ab == 0) { + LOG(L_ERR, "ERROR:parse_allow_header: out of pkg_memory\n"); + return -1; + } + memset(ab,'\0', sizeof(struct allow_body)); + + if (parse_methods(&(_hf->body), &(ab->allow)) !=0 ) { + LOG(L_ERR, "ERROR:parse_allow_header: bad allow body header\n"); + goto error; + } + + ab->allow_all = 0; + _hf->parsed = (void*)ab; + return 0; + +error: + if (ab) pkg_free(ab); + return -1; +} + +/*! + * \brief This method is used to parse all Allow HF body. + * \param msg sip msg + * \return 0 on success,-1 on failure. + */ +int parse_allow(struct sip_msg *msg) +{ + unsigned int allow; + struct hdr_field *hdr; + + /* maybe the header is already parsed! */ + if (msg->allow && msg->allow->parsed) { + return 0; + } - if (!parse_methods(&(_hf->body), methods)) { - LOG(L_ERR, "ERROR:parse_allow_header: Bad allow header\n"); - pkg_free(methods); + /* parse to the end in order to get all ALLOW headers */ + if (parse_headers(msg,HDR_EOH_F,0)==-1 || !msg->allow) { return -1; - } + } + allow = 0; - _hf->parsed = methods; - return 0; + for(hdr = msg->allow ; hdr ; hdr = next_sibling_hdr(hdr)) { + if (hdr->parsed == 0) { + if(parse_allow_header(hdr) < 0) { + return -1; + } + } + + allow |= ((struct allow_body*)hdr->parsed)->allow; + } + + ((struct allow_body*)msg->allow->parsed)->allow_all = allow; + return 0; } /* * Release memory */ -void free_allow(unsigned int** _methods) +void free_allow_body(struct allow_body **ab) +{ + if (ab && *ab) { + pkg_free(*ab); + *ab = 0; + } +} + + +void free_allow_header(struct hdr_field* hf) { - if (_methods && *_methods) pkg_free(*_methods); - *_methods = 0; + free_allow_body((struct allow_body**)(void*)(&(hf->parsed))); } diff --git a/parser/parse_allow.h b/parser/parse_allow.h index b939c7a..743e6bb 100644 --- a/parser/parse_allow.h +++ b/parser/parse_allow.h @@ -29,23 +29,43 @@ #define PARSE_ALLOW_H #include "hf.h" +#include "msg_parser.h" /* - * casting macro for accessing RPID body + * casting macro for accessing Allow body */ -#define get_allow_methods(p_msg) (unsigned int)(p_msg)->allow->parsed) +#define get_allow_methods(p_msg) \ + (((struct allow_body*)(p_msg)->allow->parsed)->allow_all) + + +struct allow_body { + unsigned int allow; /* allow mask for the current hdr */ + unsigned int allow_all; /* allow mask for the all allow hdr - it's + * set only for the first hdr in sibling + * list*/ +}; + + +/* + * Parse all Allow HFs + */ +int parse_allow(struct sip_msg *msg); /* * Parse Allow HF body */ -int parse_allow(struct hdr_field* _h); +int parse_allow_header(struct hdr_field* _h); /* * Release memory */ -void free_allow(unsigned int** _methods); +void free_allow_body(struct allow_body **ab); + +void free_allow_header(struct hdr_field* hf); + + #endif /* PARSE_ALLOW_H */ [View Less]

1 0

git:master: New functions that can be used to search for a header with given type
by Jan Janak 23 Mar '09

23 Mar '09

Module: sip-router Branch: master Commit: 7b878801737e7f368a22b1adcc1f2c05b9e8585a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b87880… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 20 16:42:26 2009 +0100 New functions that can be used to search for a header with given type This patch adds two new functions to the sip-router core. Function get_hdr can be used to find the first … [View More]

1 0

New commits on branch ser_core_cvs
by Andrei Pelinescu-Onciul 21 Mar '09

21 Mar '09

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0051630… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 20 19:59:14 2009 +0000 tcp: minor optimization - tcp_req complete & has_content_len transformed into flags (4 bytes saved per connection) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e2c4ed6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 20 17:27:15 … [View More]2009 +0000 sercmd: minor makefile fix - clear C_DEFS, since we don't need ser common DEFS for building sercmd (minor compile warning that appeared after the recend DEFS->C_DEFS changes in the main Makefiles) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ffc72fc… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 20 17:26:51 2009 +0000 tcp internal: send timeout is now kept only in ticks - removed send_timeout_s and wq_timeout and replaced them with send_timeout, which is now kept only in ticks. This fixes the cfg.set_delayed_int problem reported by Miklos. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3165726… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 20 16:10:37 2009 +0000 core: typo fix - ';' after if() (again). Fortunately it didn't have any impact since right now nobody returns NONSIP_MSG_ACCEPT from a nonsip_msg callback. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=575a0b4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 19 17:59:14 2009 +0000 tcp: typo & minor optimization - fixed ';' after if() on tcp connection free (luckily that code path was not very common and it was even more improbable to have a ref'ed connection at that point). - changed unlikely() into likely() when checking connect() return in async mode (it's much more probable to get an EINPROGRESS). Reported-by: Libor Chocholaty <libor(a)iptel.org> URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4fb73d… Author: Jan Janak <jan(a)iptel.org> Date: Thu Mar 19 15:15:51 2009 +0000 Rename Contact parameter select 'method' to 'methods' According RFC3840 the correct name of the parameter is 'methods', not 'method'. Reported by Daniel-Constantin Mierla URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=524b467… Author: Jan Janak <jan(a)iptel.org> Date: Thu Mar 19 15:15:04 2009 +0000 Rename Contact parameter 'method' to 'methods' According RFC3840 the correct name of the parameter is 'methods', not 'method'. Reported by Daniel-Constantin Mierla URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5b92e0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 19 14:32:36 2009 +0000 make install: avoid re-linking lib dependent modules - install doesn't try first to build everything, it will build as it installs. This will avoid re-linking ser-lib dependent modules (the normal "make all" would use a local rpath, while "make install" would change rpath to the install destination dir => the module needs to be relinked with a different rpath or on Darwin the lib has to be rebuilt) - avoid an extra make call on lib install URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f072585… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 19 13:42:09 2009 +0000 build system: avoid libraries re-compiling - ignore module DEFS when deciding whether or not to recompile a library: DEFS split into C_DEFS (for common DEFS which are taken into account when deciding whether or not to recompile a lib) and DEFS, which are now visible only inside the module or lib that uses them. Same for INCLUDES and C_INCLUDES. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d88602c… Author: Pavel Kasparek <pavel(a)iptel.org> Date: Mon Mar 16 10:35:10 2009 +0000 fixing missing $ in ser_mysql.sh script URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4914d97… Author: Pavel Kasparek <pavel(a)iptel.org> Date: Mon Mar 16 10:08:44 2009 +0000 Debian packaging - fixing path to mysql sql files in my_create.sh script URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33bfeb9… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Fri Mar 13 13:59:28 2009 +0000 The fixup function prototypes of the config variables have been extended with the group name. All the fixup functions have been updated. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=536065b… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Mar 10 16:26:35 2009 +0000 Strip, prefix, rewriteuser, ... all the SET_* actions preserve the original URI scheme unless the host name is rewritten. If the host name is set, then tel: and tels: URIs are converted to sip: or sips:, and the user=phone parameter is added. A script function, userphone(), is introduced: It adds the "user=phone" parameter to a sip: or sips: RURI if the param is not yet present. (Does not change tel: and tels: URIs). (Patch has been created with cooperation with Michal Matyska.) Fixes SER-435. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=77932db… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Mar 9 13:47:48 2009 +0000 core: check & fix Content-Length when sending on tcp - automatically check & fix wrong Content-Length before forwarding on tcp or tls URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e655392… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Mar 9 13:45:49 2009 +0000 tcp: config option for the async write block size - the block size used for the async writes can now be configured both from ser.cfg (tcp_wq_blk_size) and at runtime. This value has only a little performance impact and only when writes are delayed. Small values are safer (big values on proxies that open thousands of connections over slow links would eat up a lot of memory). For now it's main use is debugging. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=827cd3b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Mar 9 13:45:28 2009 +0000 tcp: config option for the read buffer size - the read buffer size can now be configured both at runtime and from ser.cfg (tcp_rd_buf_size). A high value will help performance for tcp connections with lots of traffic, however it will increase the memory consumption. As a rule of thumb use high values(e.g. 32768, 65536) on servers which open only a few tcp connections and have very heavy traffic on them and a low value (e.g. 4096, 2048) on servers that are expected to have lots of open connections (50k - 100k+). Note also that this value will also limit the maximum sip datagram size that can be received on tcp. The default value is 4096. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a74e06… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Mar 9 13:39:10 2009 +0000 tcp: dyn. config fix for tcp_con_lifetime - cfg.set_delayed_int didn't work (fixup tried to modify another config variable which doesn't work with cfg.set_delayed*) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=efc23dc… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 6 16:54:10 2009 +0000 tcp: diff. connect timeout for async & states cleanup - async mode will now honour tcp_connect_timeout (up to now it used tcp_send_timeout also for connects) - internal states cleanup (dropped S_CONN_PENDING, fixed S_CONN_ACCEPT->S_CONN_OK transition a.s.o) [View Less]

2 1

exlude module from the compilation
by Henning Westerholt 20 Mar '09

20 Mar '09

Hi, is there any equivalent to the "exlude_modules" parameter in Makefiles.defs in the sr tree? For some modules that are contained in the 'all' branch of 'kamailio-3.0' i don't have dependencies installed, and i would like to skip them on 'make all'. Cheers, Henning

3 7

git:master: Merge commit 'origin/ser_core_cvs'
by Andrei Pelinescu-Onciul 20 Mar '09

20 Mar '09

Module: sip-router Branch: master Commit: d240dd18e0f2a51b1add374353dda34621d8c542 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d240dd1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 20 21:47:32 2009 +0100 Merge commit 'origin/ser_core_cvs' * commit 'origin/ser_core_cvs': tcp: minor optimization sercmd: minor makefile fix tcp internal: send timeout is now kept only … [View More]

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
19
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2009