sr-dev March 2009

sr-dev@lists.kamailio.org

14 participants
188 discussions

by Daniel-Constantin Mierla

Hello, I have seen stun related code in sip-router core. Is there stun server, client or both implementations? Any special purpose for it? Cheers, Daniel -- Daniel-Constantin Mierla SIP Router Masterclass - Kamailio (OpenSER) Training http://www.asipto.com/index.php/sip-router-masterclass/

15 years, 8 months

git:master: Refurbished event header field parser.

by Jan Janak

Module: sip-router Branch: master Commit: 1ee365faf8047d7a921da5a0bf5cc7d20f766a27 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ee365f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 17 17:41:19 2009 +0100 Refurbished event header field parser. This is a new refurbished version of the Event header parser which adds support for extra event packages and parameters needed by kamailio presence modules, however both the implementation and the parser API are different. It turned out that the original k. event parser (which is an extended version of the same parser in ser) did not parse dialog event packages correctly. The parser relies on the recently added extensions to the generic parameter parser. First off, the event structure contains different fields now, field text has been renamed to name and field parsed has been renamed to type. In addition that that there is a new structure dialog which contains the linked list of all parsed parameters in variable list and pointers to well known dialog event package parameters in structure dialog. The test for the presence of the sla dialog event parameter would then look like this: if (e->type == EVENT_DIALOG && e->params.dialog.sla) ... Support for new event types can be easily added by extending the global variable events in parse_event.c, previously it was necessary to modify the parser function, in the refurbished version it is sufficient just to add a new element in the array and define a new event type in parse_event.h The original k. version handled "dialog;sla" and "dialog" as different event types. This is no more so, in both cases event->type will be set to EVENT_DIALOG and the caller can descriminate them by testing for the presence of the sla parameter as described in the text above. Function free_event has been modified to free the linked list of parsed parameters in event->params.list. --- parser/parse_event.c | 101 ++++++++++++++++++++++++++++++------------------- parser/parse_event.h | 42 +++++++++++++-------- 2 files changed, 88 insertions(+), 55 deletions(-) diff --git a/parser/parse_event.c b/parser/parse_event.c index 75b7017..98ca5e5 100644 --- a/parser/parse_event.c +++ b/parser/parse_event.c @@ -44,18 +44,19 @@ #include <stdio.h> /* printf */ #include "../ut.h" - -#define PRES_STR "presence" -#define PRES_STR_LEN 8 - -#define PRES_WINFO_STR "presence.winfo" -#define PRES_WINFO_STR_LEN 14 - -#define PRES_XCAP_CHANGE_STR "xcap-change" -#define PRES_XCAP_CHANGE_STR_LEN 11 - -#define PRES_SIP_PROFILE_STR "sip-profile" -#define PRES_SIP_PROFILE_STR_LEN 11 +static struct { + str name; + int type; +} events[] = { + {STR_STATIC_INIT("presence"), EVENT_PRESENCE}, + {STR_STATIC_INIT("presence.winfo"), EVENT_PRESENCE_WINFO}, + {STR_STATIC_INIT("xcap-change"), EVENT_XCAP_CHANGE}, + {STR_STATIC_INIT("sip-profile"), EVENT_SIP_PROFILE}, + {STR_STATIC_INIT("message-summary"), EVENT_MESSAGE_SUMMARY}, + {STR_STATIC_INIT("dialog"), EVENT_DIALOG}, + /* The following must be the last element in the array */ + {STR_NULL, EVENT_OTHER} +}; static inline char* skip_token(char* _b, int _l) @@ -77,41 +78,58 @@ static inline char* skip_token(char* _b, int _l) } -static inline int event_parser(char* _s, int _l, event_t* _e) +int event_parser(char* s, int len, event_t* e) { + int i; str tmp; char* end; + param_hooks_t* phooks = NULL; + enum pclass pclass = CLASS_ANY; - tmp.s = _s; - tmp.len = _l; + if (e == NULL) { + ERR("event_parser: Invalid parameter value\n"); + return -1; + } + tmp.s = s; + tmp.len = len; trim_leading(&tmp); if (tmp.len == 0) { - LOG(L_ERR, "event_parser(): Empty body\n"); + LOG(L_ERR, "event_parser: Empty body\n"); return -1; } - _e->text.s = tmp.s; - + e->name.s = tmp.s; end = skip_token(tmp.s, tmp.len); + e->name.len = end - tmp.s; + + e->type = EVENT_OTHER; + for(i = 0; events[i].name.len; i++) { + if (e->name.len == events[i].name.len && + !strncasecmp(e->name.s, events[i].name.s, e->name.len)) { + e->type = events[i].type; + break; + } + } + + tmp.len -= end - tmp.s; + tmp.s = end; + trim_leading(&tmp); + + if (tmp.s[0] == ';') { + /* We have parameters to parse */ + if (e->type == EVENT_DIALOG) { + pclass = CLASS_EVENT_DIALOG; + phooks = (param_hooks_t*)&e->params.dialog; + } - _e->text.len = end - tmp.s; - - if ((_e->text.len == PRES_STR_LEN) && - !strncasecmp(PRES_STR, tmp.s, _e->text.len)) { - _e->parsed = EVENT_PRESENCE; - } else if ((_e->text.len == PRES_XCAP_CHANGE_STR_LEN) && - !strncasecmp(PRES_XCAP_CHANGE_STR, tmp.s, _e->text.len)) { - _e->parsed = EVENT_XCAP_CHANGE; - } else if ((_e->text.len == PRES_WINFO_STR_LEN) && - !strncasecmp(PRES_WINFO_STR, tmp.s, _e->text.len)) { - _e->parsed = EVENT_PRESENCE_WINFO; - } else if ((_e->text.len == PRES_SIP_PROFILE_STR_LEN) && - !strncasecmp(PRES_SIP_PROFILE_STR, tmp.s, _e->text.len)) { - _e->parsed = EVENT_SIP_PROFILE; + if (parse_params(&tmp, pclass, phooks, &e->params.list) < 0) { + ERR("event_parser: Error while parsing parameters parameters\n"); + return -1; + } } else { - _e->parsed = EVENT_OTHER; + e->params.list = NULL; } return 0; @@ -153,19 +171,24 @@ int parse_event(struct hdr_field* _h) */ void free_event(event_t** _e) { - if (*_e) pkg_free(*_e); - *_e = 0; + if (*_e) { + if ((*_e)->params.list) free_params((*_e)->params.list); + pkg_free(*_e); + *_e = NULL; + } } /* * Print structure, for debugging only */ -void print_event(event_t* _e) +void print_event(event_t* e) { printf("===Event===\n"); - printf("text : \'%.*s\'\n", _e->text.len, ZSW(_e->text.s)); - printf("parsed: %s\n", - (_e->parsed == EVENT_PRESENCE) ? ("EVENT_PRESENCE") : ("EVENT_OTHER")); + printf("name : \'%.*s\'\n", STR_FMT(&e->name)); + printf("type: %d\n", e->type); + if (e->params.list) { + print_params(stdout, e->params.list); + } printf("===/Event===\n"); } diff --git a/parser/parse_event.h b/parser/parse_event.h index 03feb5e..4e90a52 100644 --- a/parser/parse_event.h +++ b/parser/parse_event.h @@ -1,12 +1,6 @@ /* * $Id$ * - * Event header field body parser - * This parser was written for Presence Agent module only. - * it recognizes presence package only, no subpackages, no parameters - * It should be replaced by a more generic parser if subpackages or - * parameters should be parsed too. - * * Copyright (C) 2001-2003 FhG Fokus * * This file is part of ser, a free SIP server. @@ -37,35 +31,51 @@ #include "../str.h" #include "hf.h" +#include "parse_param.h" + +/* Recognized event types */ +enum event_type { + EVENT_OTHER = 0, + EVENT_PRESENCE, + EVENT_PRESENCE_WINFO, + EVENT_SIP_PROFILE, + EVENT_XCAP_CHANGE, + EVENT_DIALOG, + EVENT_MESSAGE_SUMMARY +}; + + +struct event_params { + struct event_dialog_hooks dialog; /* Well known dialog package params */ + param_t* list; /* Linked list of all parsed parameters */ +}; -#define EVENT_OTHER 0 -#define EVENT_PRESENCE 1 -#define EVENT_PRESENCE_WINFO 2 -#define EVENT_SIP_PROFILE 3 -#define EVENT_XCAP_CHANGE 4 typedef struct event { - str text; /* Original string representation */ - int parsed; /* Parsed variant */ + enum event_type type; /* Parsed variant */ + str name; /* Original string representation */ + struct event_params params; } event_t; /* * Parse Event HF body */ -int parse_event(struct hdr_field* _h); +int parse_event(struct hdr_field* hf); /* * Release memory */ -void free_event(event_t** _e); +void free_event(event_t** e); /* * Print structure, for debugging only */ -void print_event(event_t* _e); +void print_event(event_t* e); + +int event_parser(char* s, int l, event_t* e); #endif /* PARSE_EVENT_H */

15 years, 8 months

Does SR forward stateless replies when using TM?

by Iñaki Baz Castillo

Hi, two days ago I added a parameter to Kamailio TM module to drop replies matching no transaction instead of forward them stateless (by insptecting Via): http://kamailio.org/docs/modules/devel/tm.html#id2530689 Which is the default behaviour of SR TM module in this subject? -- Iñaki Baz Castillo

15 years, 8 months

[PATCH] add new modparam("tm", "auto_inv_100_reason", "Trying")

by Andreas.Heise＠nextiraone.de

Hi Jan, the param was added initial in Kamailio tm, but since the next release will be based on sip-router core & tm part, I've ported the patch to sip-router tm to keep the feature after the merge. Patch is attached please review and commit thanks and regards, Andreas

15 years, 8 months

git:master: Support for auto_inv_100_reason tm parameter.

by Jan Janak

Module: sip-router Branch: master Commit: 9d472adf9d2dd7241feeedd6b64699e2a6485fd0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d472ad… Author: Andreas Heise <Andreas.Heise(a)nextiraone.de> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Mar 19 16:32:58 2009 +0100 Support for auto_inv_100_reason tm parameter. This patch adds support for auto_inv_100_reason parameter in tm module. The patch was created originally for kamailio and we merge it into the sr version of tm module too. The parameter allows to configure the reason phrase used in 100 replies. Signed-off-by: Jan Janak <jan(a)iptel.org> --- modules/tm/config.c | 3 +++ modules/tm/config.h | 1 + modules/tm/doc/params.xml | 25 +++++++++++++++++++++++-- modules/tm/t_funcs.c | 2 +- modules/tm/tm.c | 4 +++- 5 files changed, 31 insertions(+), 4 deletions(-) diff --git a/modules/tm/config.c b/modules/tm/config.c index ffa3892..3303560 100644 --- a/modules/tm/config.c +++ b/modules/tm/config.c @@ -66,6 +66,7 @@ struct cfg_group_tm default_tm_cfg = { MAX_NONINV_LIFETIME, /* tm_max_noninv_lifetime */ 1, /* noisy_ctimer */ 1, /* tm_auto_inv_100 */ + "trying -- your call is important to us", /* tm_auto_inv_100_r */ 500, /* tm_unix_tx_timeout -- 500 ms by default */ 1, /* restart_fr_on_each_reply */ 0, /* pass_provisional_replies */ @@ -126,6 +127,8 @@ cfg_def_t tm_cfg_def[] = { "will be always replied"}, {"auto_inv_100", CFG_VAR_INT, 0, 1, 0, 0, "automatically send 100 to an INVITE"}, + {"auto_inv_100_reason", CFG_VAR_STRING, 0, 0, 0, 0, + "reason text of the automatically send 100 to an INVITE"}, {"unix_tx_timeout", CFG_VAR_INT, 0, 0, 0, 0, "Unix socket transmission timeout, in milliseconds"}, {"restart_fr_on_each_reply", CFG_VAR_INT, 0, 1, 0, 0, diff --git a/modules/tm/config.h b/modules/tm/config.h index cf2227d..c2936ea 100644 --- a/modules/tm/config.h +++ b/modules/tm/config.h @@ -111,6 +111,7 @@ struct cfg_group_tm { unsigned int tm_max_noninv_lifetime; int noisy_ctimer; int tm_auto_inv_100; + char *tm_auto_inv_100_r; int tm_unix_tx_timeout; int restart_fr_on_each_reply; int pass_provisional_replies; diff --git a/modules/tm/doc/params.xml b/modules/tm/doc/params.xml index 2fc1723..1b61a59 100644 --- a/modules/tm/doc/params.xml +++ b/modules/tm/doc/params.xml @@ -332,8 +332,8 @@ modparam("tm", "restart_fr_on_each_reply", 0) Default value is 1 (on). </para> <para> - See also: - <function>t_set_auto_inv_100()</function>. + See also: <function>t_set_auto_inv_100()</function> + <varname>auto_inv_100_reason</varname>. </para> <example> <title>Set <varname>auto_inv_100</varname> parameter</title> @@ -345,6 +345,27 @@ modparam("tm", "auto_inv_100", 0) </example> </section> + <section id="auto_inv_100_reason"> + <title><varname>auto_inv_100_reason</varname> (string)</title> + <para> + Set reason text of the automatically send 100 to an INVITE. + </para> + <para> + Default value is "trying -- your call is important to us". + </para> + <para> + See also: <varname>auto_inv_100</varname>. + </para> + <example> + <title>Set <varname>auto_inv_100_reason</varname> parameter</title> + <programlisting> +... +modparam("tm", "auto_inv_100_reason", "Trying") +... + </programlisting> + </example> + </section> + <section id="unix_tx_timeout"> <title><varname>unix_tx_timeout</varname> (integer)</title> <para> diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index 5f62f0e..f07b002 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -324,7 +324,7 @@ int t_relay_to( struct sip_msg *p_msg , struct proxy_l *proxy, int proto, { DBG( "SER: new INVITE\n"); if (!t_reply( t, p_msg , 100 , - "trying -- your call is important to us")) + cfg_get(tm, tm_cfg, tm_auto_inv_100_r))) DBG("SER: ERROR: t_reply (100)\n"); } diff --git a/modules/tm/tm.c b/modules/tm/tm.c index ecb42ed..538e683 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -90,7 +90,8 @@ * t_relay_to_{udp,tcp,tls}(<no param>) (force protocol, but * forward to uri) (andrei) * 2008-08-11 sctp support: t_relay_to_sctp, t_replicate_sctp, - * t_forward_nonack_sctp (andrei + * t_forward_nonack_sctp (andrei) + * 2009-03-18 added a new param: auto_inv_100_reason (aheise) */ @@ -425,6 +426,7 @@ static param_export_t params[]={ {"max_noninv_lifetime", PARAM_INT, &default_tm_cfg.tm_max_noninv_lifetime}, {"noisy_ctimer", PARAM_INT, &default_tm_cfg.noisy_ctimer }, {"auto_inv_100", PARAM_INT, &default_tm_cfg.tm_auto_inv_100 }, + {"auto_inv_100_reason", PARAM_STRING, &default_tm_cfg.tm_auto_inv_100_r }, {"unix_tx_timeout", PARAM_INT, &default_tm_cfg.tm_unix_tx_timeout }, {"restart_fr_on_each_reply", PARAM_INT, &default_tm_cfg.restart_fr_on_each_reply},

15 years, 8 months

purpose of MDBG, difference between memlog, memdbg

by Henning Westerholt

Hi, comparing the memory manager in sip-router and kamilio i wondered what is the purpose of this mem/memdbg.h definitions. Both F_MALLOC and Q_MALLOC use them, but also use the LOG(memlog,..) style of output informations. What is the difference between the memlog parameter (which we also have), and the memdbg parameter? Google tells me that the first is the mem statistics log level, and the former the mem debug level. Is this correct? Thanks, Henning

15 years, 8 months

[PATCH 1/8] Define OPENSER_MOD_INTERFACE in Makefile.

by Jan Janak

This patch adds -DOPENSER_MOD_INTERFACE to the modules Makefile, this is needed to make Kamailio modules compile with the sip router core. --- modules/carrierroute/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/carrierroute/Makefile b/modules/carrierroute/Makefile index 9407069..3a42485 100644 --- a/modules/carrierroute/Makefile +++ b/modules/carrierroute/Makefile @@ -24,4 +24,6 @@ endif DEFS+=$(CONFUSEDEFS) LIBS=$(CONFUSELIBS) +DEFS+=-DOPENSER_MOD_INTERFACE + include ../../Makefile.modules -- 1.5.6.5

15 years, 8 months

git:master: Add support for SET_HOSTALL_T action.

by Jan Janak

Module: sip-router Branch: master Commit: cec6ad973d08ed4c7c7b94ad17a0dddfe72cd2b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cec6ad9… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 17 23:06:02 2009 +0100 Add support for SET_HOSTALL_T action. This patch adds support for SET_HOSTALL_T action which can be used to rewrite the hostname, port, parameters, and headers parts of the Request-URI, all at once. --- action.c | 5 +++++ route_struct.h | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/action.c b/action.c index 47d702c..2baa6cb 100644 --- a/action.c +++ b/action.c @@ -490,6 +490,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) case SET_HOST_T: case SET_HOSTPORT_T: case SET_HOSTPORTTRANS_T: + case SET_HOSTALL_T: case SET_USER_T: case SET_USERPASS_T: case SET_PORT_T: @@ -627,6 +628,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) } if ((a->type==SET_HOST_T) || (a->type==SET_HOSTPORT_T) + || (a->type==SET_HOSTALL_T) || (a->type==SET_HOSTPORTTRANS_T)) { tmp=a->val[0].u.string; if (tmp) len = strlen(tmp); @@ -639,6 +641,8 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) if(crt+len>end) goto error_uri; memcpy(crt,tmp,len);crt+=len; } + if(a->type==SET_HOSTALL_T) + goto done_seturi; /* port */ if ((a->type==SET_HOSTPORT_T) || (a->type==SET_HOSTPORTTRANS_T)) @@ -690,6 +694,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) *crt='?'; crt++; memcpy(crt,tmp,len);crt+=len; } + done_seturi: *crt=0; /* null terminate the thing */ /* copy it to the msg */ if (msg->new_uri.s) pkg_free(msg->new_uri.s); diff --git a/route_struct.h b/route_struct.h index 288b67e..06c0a10 100644 --- a/route_struct.h +++ b/route_struct.h @@ -70,7 +70,7 @@ enum { METHOD_O=1, URI_O, FROM_URI_O, TO_URI_O, SRCIP_O, SRCPORT_O, enum { FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, SET_HOST_T, SET_HOSTPORT_T, SET_USER_T, SET_USERPASS_T, - SET_PORT_T, SET_URI_T, SET_HOSTPORTTRANS_T, + SET_PORT_T, SET_URI_T, SET_HOSTPORTTRANS_T, SET_HOSTALL_T, IF_T, SWITCH_T /* only until fixup*/, BLOCK_T, EVAL_T, SWITCH_JT_T, SWITCH_COND_T, MATCH_COND_T, WHILE_T, MODULE_T, MODULE3_T, MODULE4_T, MODULE5_T, MODULE6_T, MODULEX_T,

15 years, 8 months

git:master: Replace missing logging macros with va_arg support using static buffer.

by Jan Janak

Module: sip-router Branch: master Commit: 713a6e02b866ed337146f2ee21b97cf15e4f9a37 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=713a6e0… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 17 22:06:36 2009 +0100 Replace missing logging macros with va_arg support using static buffer. There is no support for logging macros with va_arg support in the sr core, so we need to reimplement it in conf_error using a static buffer. The function first prints the whole string into a static buffer using vsnprintf and the buffer is then logged using LM_GEN1. --- modules/carrierroute/cr_config.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/carrierroute/cr_config.c b/modules/carrierroute/cr_config.c index 48975a5..642f911 100644 --- a/modules/carrierroute/cr_config.c +++ b/modules/carrierroute/cr_config.c @@ -32,6 +32,8 @@ #include <sys/stat.h> #include <unistd.h> #include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> #include "../../mem/shm_mem.h" #include "../../mem/mem.h" #include "../../ut.h" @@ -50,8 +52,17 @@ * @param ap format arguments */ static void conf_error(cfg_t *cfg, const char * fmt, va_list ap) { - // FIXME this don't seems to work reliable, produces strange error messages - LM_GEN1(L_ERR, (char *) fmt, ap); + int ret; + static char buf[1024]; + + ret = vsnprintf(buf, sizeof(buf), fmt, ap); + if (ret < 0 || ret >= sizeof(buf)) { + LM_ERR("could not print error message\n"); + } else { + // FIXME this don't seems to work reliable in all cases, charset + // problems + LM_GEN1(L_ERR, "%s", buf); + } }

15 years, 8 months

git:master: Adding send_sock to the dlg_t structure.

by Jan Janak

Module: sip-router Branch: master Commit: 1f8f46a3a8f9ecf4d52086f3bb98483e6242aac6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f8f46a… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 17 21:03:46 2009 +0100 Adding send_sock to the dlg_t structure. This patch adds a pointer to the socket to be used for sending into the dlg_t structure. The pointer is not yet used, we will add the code to use the socket later. --- modules/tm/dlg.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/tm/dlg.h b/modules/tm/dlg.h index 2594ce3..8a3a153 100644 --- a/modules/tm/dlg.h +++ b/modules/tm/dlg.h @@ -35,6 +35,7 @@ #include <stdio.h> #include "../../str.h" +#include "../../ip_addr.h" #include "../../parser/parse_rr.h" #include "../../parser/msg_parser.h" @@ -118,6 +119,7 @@ typedef struct dlg { * can be reused when building a message (to * prevent repeated analyzing of the dialog data */ + struct socket_info* send_sock; #ifdef DIALOG_CALLBACKS struct tmcb_head_list dlg_callbacks; #endif

15 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2009