sr-dev March 2009

sr-dev@lists.kamailio.org

14 participants
188 discussions

git:ser_core_cvs: Adding missing reset_static_buffer()
by Andrei Pelinescu-Onciul 30 Mar '09

30 Mar '09

Module: sip-router Branch: ser_core_cvs Commit: 7bd6ef43d26191a72b837da853cbfe05051739c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7bd6ef4… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 29 15:39:27 2009 +0000 Adding missing reset_static_buffer() --- modules/tm/t_reply.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index cdcd029..… [View More]

1 0

Patch: convert utils module to use sr msg_send
by Henning Westerholt 30 Mar '09

30 Mar '09

Hi, attached patch converts the utils module to use the sr msg_send functionality. Please review if the API is used correct. In kamailio we use this "while( get_next_su( proxy, to, 0) == 0 );" construct to loop over all destinations (e.g. for failover), how this is handled in sr? Thanks, Henning

3 3

git:janakj/kcore: Adding the supported parser from kamailio core
by Jan Janak 29 Mar '09

29 Mar '09

Module: sip-router Branch: janakj/kcore Commit: cb0dd941f2b0d9a579bb98c6689ecabaf7189a6c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb0dd94… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 29 21:50:15 2009 +0200 Adding the supported parser from kamailio core --- lib/kcore/parse_supported.c | 143 +++++++++++++++++++++++++++++++++++++++++++ lib/kcore/parse_supported.h | 84 +++++++++++++++++++++++++ 2 … [View More]files changed, 227 insertions(+), 0 deletions(-) diff --git a/lib/kcore/parse_supported.c b/lib/kcore/parse_supported.c new file mode 100644 index 0000000..ddecf50 --- /dev/null +++ b/lib/kcore/parse_supported.c @@ -0,0 +1,143 @@ +/* + * $Id$ + * + * Copyright (C) 2006 Andreas Granig <agranig(a)linguin.org> + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! + * \file + * \brief Supported parser + * \ingroup parser + */ + +#include "../mem/mem.h" +#include "keys.h" +#include "parse_supported.h" + +#define IS_DELIM(c) (*(c) == ' ' || *(c) == '\t' || *(c) == '\r' || *(c) == '\n' || *(c) == ',') + +/* from parser/parse_hname2.c: */ +#define LOWER_BYTE(b) ((b) | 0x20) +#define LOWER_DWORD(d) ((d) | 0x20202020) +#define READ(val) \ + (*(val + 0) + (*(val + 1) << 8) + (*(val + 2) << 16) + (*(val + 3) << 24)) + + +/*! + * Parse Supported HF body. + */ +static inline int parse_supported_body(str *body, unsigned int *sup) +{ + register char* p; + register unsigned int val; + int len, pos = 0; + + *sup = 0; + + p = body->s; + len = body->len; + + while (pos < len) { + /* skip spaces and commas */ + for (; pos < len && IS_DELIM(p); ++pos, ++p); + + val = LOWER_DWORD(READ(p)); + switch (val) { + + /* "path" */ + case _path_: + if(pos + 4 <= len && IS_DELIM(p+4)) { + *sup |= F_SUPPORTED_PATH; + pos += 5; p += 5; + } + break; + + /* "100rel" */ + case _100r_: + if ( pos+6 <= len + && LOWER_BYTE(*(p+4))=='e' && LOWER_BYTE(*(p+5))=='l' + && IS_DELIM(p+6)) { + *sup |= F_SUPPORTED_100REL; + pos += SUPPORTED_100REL_LEN + 1; + p += SUPPORTED_100REL_LEN + 1; + } + break; + + /* "timer" */ + case _time_: + if ( pos+5 <= len && LOWER_BYTE(*(p+4))=='r' + && IS_DELIM(p+5) ) { + *sup |= F_SUPPORTED_TIMER; + pos += SUPPORTED_TIMER_LEN + 1; + p += SUPPORTED_TIMER_LEN + 1; + } + break; + + /* unknown */ + default: + /* skip element */ + for (; pos < len && !IS_DELIM(p); ++pos, ++p); + break; + } + } + + return 0; +} + +/*! + * Parse all Supported headers + */ +int parse_supported( struct sip_msg *msg) +{ + unsigned int supported; + struct hdr_field *hdr; + struct supported_body *sb; + + /* maybe the header is already parsed! */ + if (msg->supported && msg->supported->parsed) + return 0; + + /* parse to the end in order to get all SUPPORTED headers */ + if (parse_headers(msg,HDR_EOH_F,0)==-1 || !msg->supported) + return -1; + + /* bad luck! :-( - we have to parse them */ + supported = 0; + for( hdr=msg->supported ; hdr ; hdr=hdr->sibling) { + if (hdr->parsed) { + supported |= ((struct supported_body*)hdr->parsed)->supported; + continue; + } + + sb = (struct supported_body*)pkg_malloc(sizeof(struct supported_body)); + if (sb == 0) { + LM_ERR("out of pkg_memory\n"); + return -1; + } + + parse_supported_body(&(hdr->body), &(sb->supported)); + sb->supported_all = 0; + hdr->parsed = (void*)sb; + supported |= sb->supported; + } + + ((struct supported_body*)msg->supported->parsed)->supported_all = + supported; + return 0; +} diff --git a/lib/kcore/parse_supported.h b/lib/kcore/parse_supported.h new file mode 100644 index 0000000..9a177fd --- /dev/null +++ b/lib/kcore/parse_supported.h @@ -0,0 +1,84 @@ +/* + * $Id$ + * + * Copyright (C) 2006 Andreas Granig <agranig(a)linguin.org> + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * + * History: + * ------- + * 2006-03-02 parse_supported() parses and cumulates all SUPPORTED + * headers (bogdan) + */ + +/*! + * \file + * \brief Supported parser + * \ingroup parser + */ + +#ifndef PARSE_SUPPORTED_H +#define PARSE_SUPPORTED_H + +#include "msg_parser.h" +#include "../mem/mem.h" + + +#define F_SUPPORTED_PATH (1 << 0) +#define F_SUPPORTED_100REL (1 << 1) +#define F_SUPPORTED_TIMER (1 << 2) + +#define SUPPORTED_PATH_STR "path" +#define SUPPORTED_PATH_LEN (sizeof(SUPPORTED_PATH_STR)-1) + +/* RFC 3262 */ +#define SUPPORTED_100REL_STR "100rel" +#define SUPPORTED_100REL_LEN (sizeof(SUPPORTED_100REL_STR)-1) + +/* RFC 4028 */ +#define SUPPORTED_TIMER_STR "timer" +#define SUPPORTED_TIMER_LEN (sizeof(SUPPORTED_TIMER_STR)-1) + + +#define get_supported(p_msg) \ + ((p_msg)->supported ? ((struct supported_body*)(p_msg)->supported->parsed)->supported_all : 0) + + +struct supported_body { + unsigned int supported; /* supported mask for the current hdr */ + unsigned int supported_all; /* suppoted mask for the all "supported" hdr + * - it's set only for the first hdr in + * sibling list*/ +}; + + +/*! + * Parse all Supported headers. + */ +int parse_supported( struct sip_msg *msg); + + +static inline void free_supported(struct supported_body **sb) +{ + if (sb && *sb) { + pkg_free(*sb); + *sb = 0; + } +} + +#endif /* PARSE_SUPPORTED_H */ [View Less]

1 0

git:janakj/kcore: Adding the sst parser from kamailio core
by Jan Janak 29 Mar '09

29 Mar '09

Module: sip-router Branch: janakj/kcore Commit: d434e7ed08e5d560a37de02f6fa70f3b08eb4dec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d434e7e… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 29 21:49:57 2009 +0200 Adding the sst parser from kamailio core --- lib/kcore/parse_sst.c | 241 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/parse_sst.h | 128 ++++++++++++++++++++++++++ 2 files … [View More]

1 0

git:janakj/kcore: Make the parser work with the sr core
by Jan Janak 29 Mar '09

29 Mar '09

Module: sip-router Branch: janakj/kcore Commit: 0f17a8a5a322bc75fdd5e2fb158b33dd059b25d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f17a8a… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 29 22:01:50 2009 +0200 Make the parser work with the sr core List of changes: * Fix header paths * Include defines that are missing from keys.h * Replace hf->sibling with next_sibling_hdr --- lib/kcore/… [View More]

1 0

git:janakj/kcore: Update header field paths, we moved the parser to libkcore
by Jan Janak 29 Mar '09

29 Mar '09

Module: sip-router Branch: janakj/kcore Commit: dccf49124b598ccd5bd4507c170d25729c64eba3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dccf491… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 29 22:01:09 2009 +0200 Update header field paths, we moved the parser to libkcore --- lib/kcore/parse_sst.c | 6 +++--- lib/kcore/parse_sst.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --… [View More]

1 0

git:janakj/kcore: Function to retrieve the first URI from Path headers.
by Jan Janak 29 Mar '09

29 Mar '09

Module: sip-router Branch: janakj/kcore Commit: 49e8baef3465862976999224eeb58123edfa240b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49e8bae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 29 20:07:28 2009 +0200 Function to retrieve the first URI from Path headers. Signed-off-by: Jan Janak <jan(a)iptel.org> --- lib/kcore/parser_helpers.c | 26 ++++++++++++++++++++++++++ lib/… [View More]

1 0

git:master: Use shorter default send and SSL handshake timeouts
by Jan Janak 29 Mar '09

29 Mar '09

Module: sip-router Branch: master Commit: 2701984ddd24dd074c2e29b6ac6ea22faffdb1b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2701984… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sat Mar 28 12:13:24 2009 +0100 Use shorter default send and SSL handshake timeouts Instead of 120 seconds we use use 30 seconds by default for both SSL handshake timeouts and send timeouts, this way the server can detect connection … [View More]

2 1

git:master: Use run_top_route where appropriate
by Jan Janak 29 Mar '09

29 Mar '09

Module: sip-router Branch: master Commit: 4a8fd3e4d16e460b315083b22ce3b52b6d1e0667 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a8fd3e… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 29 18:05:24 2009 +0200 Use run_top_route where appropriate This patch replaces the sequence of reset_static_buffer(); init_run_actions_ctx(); run_actions(); at the following places in the code: * execution of a … [View More]branch route in tm * execution of a failure route in tm * execution of an onreply route in tm * execution of on_sl_reply in tm * execution of a route block after t_continue has been called * execution of the top-level route block in the core when a new SIP request arrives * execution of the top-level onreply route block in the core when a new SIP reply arrives --- modules/tm/t_fwd.c | 11 ++++------- modules/tm/t_reply.c | 16 ++++------------ modules/tm/t_suspend.c | 6 ++---- receive.c | 8 ++------ 4 files changed, 12 insertions(+), 29 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 9e7249c..23ebd2e 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -116,7 +116,6 @@ #ifdef USE_DST_BLACKLIST #include "../../dst_blacklist.h" #endif -#include "../../select_buf.h" /* reset_static_buffer() */ #ifdef POSTPONE_MSG_CLONING #include "../../atomic_ops.h" /* membar_depends() */ #endif @@ -152,7 +151,6 @@ static char *print_uac_request( struct cell *t, struct sip_msg *i_req, struct sip_uri parsed_uri_bak; int parsed_uri_ok_bak, uri_backed_up; str msg_uri_bak; - struct run_act_ctx ra_ctx; shbuf=0; msg_uri_bak.s=0; /* kill warnings */ @@ -190,13 +188,12 @@ static char *print_uac_request( struct cell *t, struct sip_msg *i_req, i_req->body_lumps = dup_lump_list(i_req->body_lumps); if (unlikely(branch_route)) { - reset_static_buffer(); /* run branch_route actions if provided */ set_route_type(BRANCH_ROUTE); - init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, branch_rt.rlist[branch_route], i_req) < 0) { - LOG(L_ERR, "ERROR: print_uac_request: Error in run_actions\n"); - } + + if (run_top_route(branch_rt.rlist[branch_route], i_req) < 0) { + LOG(L_ERR, "ERROR: print_uac_request: Error in run_top_route\n"); + } } /* run the specific callbacks for this transaction */ diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 4e8a884..a8d1ec3 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -114,7 +114,6 @@ #include "../../usr_avp.h" #include "../../atomic_ops.h" /* membar_write() */ #include "../../compiler_opt.h" -#include "../../select_buf.h" /* reset_static_buffer() */ #ifdef USE_DST_BLACKLIST #include "../../dst_blacklist.h" #endif @@ -824,7 +823,6 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, static struct sip_msg faked_req; struct sip_msg *shmem_msg = t->uas.request; int on_failure; - struct run_act_ctx ra_ctx; /* failure_route for a local UAC? */ if (!shmem_msg) { @@ -859,11 +857,9 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, * on failure */ on_failure = t->on_negative; t->on_negative=0; - reset_static_buffer(); /* run a reply_route action if some was marked */ - init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, failure_rt.rlist[on_failure], &faked_req)<0) - LOG(L_ERR, "ERROR: run_failure_handlers: Error in do_action\n"); + if (run_top_route(failure_rt.rlist[on_failure], &faked_req)<0) + LOG(L_ERR, "ERROR: run_failure_handlers: Error in run_top_route\n"); } /* restore original environment and free the fake msg */ @@ -1818,7 +1814,6 @@ int reply_received( struct sip_msg *p_msg ) avp_list_t* backup_user_from, *backup_user_to; avp_list_t* backup_domain_from, *backup_domain_to; avp_list_t* backup_uri_from, *backup_uri_to; - struct run_act_ctx ra_ctx; #ifdef USE_DNS_FAILOVER int branch_ret; int prev_branch; @@ -1962,9 +1957,7 @@ int reply_received( struct sip_msg *p_msg ) backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to ); backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from ); backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); - reset_static_buffer(); - init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, onreply_rt.rlist[t->on_reply], p_msg)<0) + if (run_top_route(onreply_rt.rlist[t->on_reply], p_msg)<0) LOG(L_ERR, "ERROR: on_reply processing failed\n"); /* transfer current message context back to t */ if (t->uas.request) t->uas.request->flags=p_msg->flags; @@ -2090,8 +2083,7 @@ trans_not_found: if (goto_on_sl_reply) { /* the script writer has a chance to decide whether to forward the reply or not */ - init_run_actions_ctx(&ra_ctx); - return run_actions(&ra_ctx, onreply_rt.rlist[goto_on_sl_reply], p_msg); + return run_top_route(onreply_rt.rlist[goto_on_sl_reply], p_msg); } else { /* let the core forward the reply */ return 1; diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 9b418c1..4a31b80 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -106,7 +106,6 @@ int t_continue(unsigned int hash_index, unsigned int label, { struct cell *t; struct sip_msg faked_req; - struct run_act_ctx ra_ctx; int branch; if (t_lookup_ident(&t, hash_index, label) < 0) { @@ -148,9 +147,8 @@ int t_continue(unsigned int hash_index, unsigned int label, } faked_env( t, &faked_req); - init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, route, &faked_req)<0) - LOG(L_ERR, "ERROR: t_continue: Error in run_action\n"); + if (run_top_route(route, &faked_req)<0) + LOG(L_ERR, "ERROR: t_continue: Error in run_top_route\n"); /* TODO: save_msg_lumps should clone the lumps to shm mem */ diff --git a/receive.c b/receive.c index beb4c58..9941df7 100644 --- a/receive.c +++ b/receive.c @@ -85,7 +85,6 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) { struct sip_msg* msg; int ret; - struct run_act_ctx ra_ctx; #ifdef STATS int skipped = 1; struct timeval tvb, tve; @@ -123,7 +122,6 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* ... clear branches from previous message */ clear_branches(); - reset_static_buffer(); if (msg->first_line.type==SIP_REQUEST){ if (!IS_SIP(msg)){ @@ -171,8 +169,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) set_route_type(REQUEST_ROUTE); /* exec the routing script */ - init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, main_rt.rlist[DEFAULT_RT], msg)<0){ + if (run_top_route(main_rt.rlist[DEFAULT_RT], msg)<0){ LOG(L_WARN, "WARNING: receive_msg: " "error while trying script\n"); goto error_req; @@ -215,8 +212,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* exec the onreply routing script */ if (onreply_rt.rlist[DEFAULT_RT]){ set_route_type(ONREPLY_ROUTE); - init_run_actions_ctx(&ra_ctx); - ret=run_actions(&ra_ctx, onreply_rt.rlist[DEFAULT_RT], msg); + ret=run_top_route(onreply_rt.rlist[DEFAULT_RT], msg); if (ret<0){ LOG(L_WARN, "WARNING: receive_msg: " "error while trying onreply script\n"); [View Less]

1 0

git:master: Introducing run_top_route function
by Jan Janak 29 Mar '09

29 Mar '09

Module: sip-router Branch: master Commit: 8402508053d83414ab3eea62a9a24731c4b23bd3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8402508… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 29 17:53:58 2009 +0200 Introducing run_top_route function Function run_top_route can be used to initialize the environment before a SIP message starts processing in *_route blocks. Internally it resets the script flags, … [View More]

1 0

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