sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
227 discussions

git:3.1: core: defines to return parsed uri in From and To
by Daniel-Constantin Mierla 05 Jan '11

05 Jan '11

Module: sip-router Branch: 3.1 Commit: b7f6d47058ab5f42617f98732ed7f1428fa6e021 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7f6d47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 18:55:54 2011 +0100 core: defines to return parsed uri in From and To (cherry picked from commit 8016597dbdb1e1aa03576c537a140c81cdc8beeb) --- parser/parse_from.h | 2 ++ parser/parse_to.h | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/parser/parse_from.h b/parser/parse_from.h index 6d35709..13083b1 100644 --- a/parser/parse_from.h +++ b/parser/parse_from.h @@ -39,6 +39,8 @@ #define free_from(_to_body_) free_to(_to_body_) +#define GET_FROM_PURI(p_msg) \ + (&((struct to_body*)(p_msg)->from->parsed)->parsed_uri) /* * From header field parser diff --git a/parser/parse_to.h b/parser/parse_to.h index 0c79a08..d71c4d2 100644 --- a/parser/parse_to.h +++ b/parser/parse_to.h @@ -57,8 +57,10 @@ struct to_body{ /* casting macro for accessing To body */ -#define get_to( p_msg) ((struct to_body*)(p_msg)->to->parsed) +#define get_to(p_msg) ((struct to_body*)(p_msg)->to->parsed) +#define GET_TO_PURI(p_msg) \ + (&((struct to_body*)(p_msg)->to->parsed)->parsed_uri) /*! \brief * To header field parser

1 0

git:3.1: rls(k): fixed double-quotes wrong position
by Daniel-Constantin Mierla 05 Jan '11

05 Jan '11

Module: sip-router Branch: 3.1 Commit: 0a69c6b9aa0037e014a710043d6e258188e28c2b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a69c6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 15:11:39 2011 +0100 rls(k): fixed double-quotes wrong position - reported by Klaus Darilion (cherry picked from commit 7e01915b757da740d7fff31ba1a25c4aa5a96908) --- modules_k/rls/notify.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index 9d22036..9b83f21 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -602,9 +602,10 @@ str* rls_notify_extra_hdr(subs_t* subs, char* start_cid, char* boundary_string) if(start_cid && boundary_string) { str_hdr->len+= sprintf(str_hdr->s+str_hdr->len, - "Content-Type: \"multipart/related;type=\"application/rlmi+xml\""); + "Content-Type: multipart/related;type=\"application/rlmi+xml\""); str_hdr->len+= sprintf(str_hdr->s+str_hdr->len, - ";start= <%s>;boundary=%s\r\n", start_cid, boundary_string); + ";start=\"<%s>\";boundary=\"%s\"\r\n", + start_cid, boundary_string); } if(str_hdr->len> RLS_HDR_LEN) {

1 0

git:carstenbock/ims: SCSCF is now compilable
by Carsten Bock 05 Jan '11

05 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 81adf157a0cd2c3d2ce215a88ff503dd97557a1c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81adf15… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Dec 28 16:28:23 2010 +0100 SCSCF is now compilable --- modules/scscf/Makefile | 7 +++++++ modules/scscf/dlg_state.c | 8 +++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/scscf/Makefile b/modules/scscf/Makefile index ea09637..569b398 100644 --- a/modules/scscf/Makefile +++ b/modules/scscf/Makefile @@ -11,6 +11,12 @@ include ../../Makefile.defs auto_gen= NAME=scscf.so +ifeq ($(CFG_NAME),kamailio) + DEFS+=-DSER_MOD_INTERFACE + SERLIBPATH=../../lib + SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 + #LIBS+=-L../../lib/cds -lser_cds +else ifeq ($(CFG_NAME),sip-router) DEFS+=-DSER_MOD_INTERFACE SERLIBPATH=../../lib @@ -19,6 +25,7 @@ ifeq ($(CFG_NAME),sip-router) else LIBS+=-L../../lib/cds -l_ser_cds endif +endif DEFS += -DCDP_FOR_SER DEFS += -I/usr/include/libxml2 -I../../lib -DSER -I../.. diff --git a/modules/scscf/dlg_state.c b/modules/scscf/dlg_state.c index b03da4d..f8b493c 100644 --- a/modules/scscf/dlg_state.c +++ b/modules/scscf/dlg_state.c @@ -57,11 +57,9 @@ #include "dlg_state.h" #include "../../modules/tm/tm_load.h" -#ifdef SER_MOD_INTERFACE - #include "../../modules_s/sl/sl_funcs.h" -#else - #include "../../modules/sl/sl_funcs.h" -#endif + +#include "../../modules/sl/sl_funcs.h" + #include "../../mem/shm_mem.h" #include "../../parser/parse_rr.h"

1 0

git:carstenbock/ims: Initial Import of the OpenIMS-Core Modules into the Kamailio/sip-router. org Core
by Carsten Bock 05 Jan '11

05 Jan '11

1 0

git:carstenbock/ims: Modified Makefile in order to compile using Kamailio.
by Carsten Bock 05 Jan '11

05 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 2a88d5b2c4cabd2c9f320e2778edac7ddded70d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a88d5b… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Mon Jan 3 20:00:23 2011 +0100 Modified Makefile in order to compile using Kamailio. --- modules/pcscf/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/pcscf/Makefile b/modules/pcscf/Makefile index 0e2bf50..3c9a7e7 100644 --- a/modules/pcscf/Makefile +++ b/modules/pcscf/Makefile @@ -14,7 +14,7 @@ ifeq ($(CFG_NAME),kamailio) DEFS+=-DSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 - LIBS+=-L../../lib/cds -lser_cds + #LIBS+=-L../../lib/cds -lser_cds else ifeq ($(CFG_NAME),sip-router) DEFS+=-DSER_MOD_INTERFACE

1 0

git:carstenbock/ims: More making it compilable under sip-router.org/ Kamailio
by Carsten Bock 05 Jan '11

05 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: ed6ae7ce91ce027172e7da05d7cca6d176c2672f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed6ae7c… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Dec 28 10:35:40 2010 +0100 More making it compilable under sip-router.org/Kamailio --- modules/cdp/Makefile | 4 + modules/cdp/configexample/.svn/all-wcprops | 11 -- modules/cdp/configexample/.svn/dir-prop-base | 8 -- modules/cdp/configexample/.svn/entries | 62 ------------ .../.svn/prop-base/ConfigExample.xml.svn-base | 5 - .../.svn/text-base/ConfigExample.xml.svn-base | 105 -------------------- modules/cdp/globals.c | 4 +- modules/cdp/peermanager.c | 2 +- modules/cdp/receiver.c | 2 +- modules/cdp/tcp_accept.c | 2 +- modules/cdp/transaction.c | 2 +- modules/cdp_avp/Makefile | 5 + modules/isc/Makefile | 3 + modules/mgcf/Makefile | 6 +- modules/pcscf/Makefile | 7 ++ modules/pcscf/dlg_state.c | 6 +- modules/pcscf/release_call.c | 2 +- parser/msg_parser.h | 2 +- parser/parse_uri.c | 16 +++- select_core.c | 2 + 20 files changed, 47 insertions(+), 209 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ed6…

1 0

git:master: core: defines to return parsed uri in From and To
by Daniel-Constantin Mierla 05 Jan '11

05 Jan '11

Module: sip-router Branch: master Commit: 8016597dbdb1e1aa03576c537a140c81cdc8beeb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8016597… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 18:55:54 2011 +0100 core: defines to return parsed uri in From and To --- parser/parse_from.h | 2 ++ parser/parse_to.h | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/parser/parse_from.h b/parser/parse_from.h index 6d35709..13083b1 100644 --- a/parser/parse_from.h +++ b/parser/parse_from.h @@ -39,6 +39,8 @@ #define free_from(_to_body_) free_to(_to_body_) +#define GET_FROM_PURI(p_msg) \ + (&((struct to_body*)(p_msg)->from->parsed)->parsed_uri) /* * From header field parser diff --git a/parser/parse_to.h b/parser/parse_to.h index 0c79a08..d71c4d2 100644 --- a/parser/parse_to.h +++ b/parser/parse_to.h @@ -57,8 +57,10 @@ struct to_body{ /* casting macro for accessing To body */ -#define get_to( p_msg) ((struct to_body*)(p_msg)->to->parsed) +#define get_to(p_msg) ((struct to_body*)(p_msg)->to->parsed) +#define GET_TO_PURI(p_msg) \ + (&((struct to_body*)(p_msg)->to->parsed)->parsed_uri) /*! \brief * To header field parser

1 0

git:master: msilo(k): simplified getting of From/To
by Daniel-Constantin Mierla 05 Jan '11

05 Jan '11

Module: sip-router Branch: master Commit: c8e8193d3d5d933445afbd636288074c1b277945 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c8e8193… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 20:00:49 2011 +0100 msilo(k): simplified getting of From/To --- modules_k/msilo/msilo.c | 73 +++++++--------------------------------------- 1 files changed, 11 insertions(+), 62 deletions(-) diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index f9571a9..aeb8388 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -480,7 +480,7 @@ static int child_init(int rank) static int m_store(struct sip_msg* msg, char* owner, char* s2) { str body, str_hdr, ctaddr; - struct to_body to, *pto, *pfrom; + struct to_body *pto, *pfrom; struct sip_uri puri; str duri, owner_s; db_key_t db_keys[NR_KEYS-1]; @@ -528,34 +528,13 @@ static int m_store(struct sip_msg* msg, char* owner, char* s2) } /* get TO URI */ - if(!msg->to || !msg->to->body.s) + if(parse_to_header(msg)<0) { - LM_ERR("cannot find 'to' header!\n"); + LM_ERR("failed getting 'to' header!\n"); goto error; } - if(msg->to->parsed != NULL) - { - pto = (struct to_body*)msg->to->parsed; - LM_DBG("the 'To' header ALREADY PARSED: <%.*s>\n", - pto->uri.len, pto->uri.s ); - } - else - { - LM_DBG("the 'To' header NOT PARSED ->parsing ...\n"); - memset( &to , 0, sizeof(to) ); - parse_to(msg->to->body.s, msg->to->body.s+msg->to->body.len+1, &to); - if(to.uri.len > 0) /* && to.error == PARSE_OK) */ - { - LM_DBG("'To' parsed OK <%.*s>.\n", to.uri.len, to.uri.s); - pto = &to; - } - else - { - LM_ERR("'To' cannot be parsed\n"); - goto error; - } - } + pto = get_to(msg); /* get the owner */ memset(&puri, 0, sizeof(struct sip_uri)); @@ -649,23 +628,12 @@ static int m_store(struct sip_msg* msg, char* owner, char* s2) nr_keys++; /* check FROM URI */ - if(!msg->from || !msg->from->body.s) + if ( parse_from_header( msg )<0 ) { - LM_ERR("cannot find 'from' header!\n"); + LM_ERR("cannot parse From header\n"); goto error; } - - if(msg->from->parsed == NULL) - { - LM_DBG("'From' header not parsed\n"); - /* parsing from header */ - if ( parse_from_header( msg )<0 ) - { - LM_ERR("cannot parse From header\n"); - goto error; - } - } - pfrom = (struct to_body*)msg->from->parsed; + pfrom = get_from(msg); LM_DBG("'From' header: <%.*s>\n", pfrom->uri.len, pfrom->uri.s); db_keys[nr_keys] = &sc_from; @@ -859,7 +827,7 @@ error: */ static int m_dump(struct sip_msg* msg, char* owner, char* str2) { - struct to_body to, *pto = NULL; + struct to_body *pto = NULL; db_key_t db_keys[3]; db_key_t ob_key; db_op_t db_ops[3]; @@ -900,32 +868,13 @@ static int m_dump(struct sip_msg* msg, char* owner, char* str2) body_str.len=1024; /* check for TO header */ - if(msg->to==NULL && (parse_headers(msg, HDR_TO_F, 0)==-1 - || msg->to==NULL || msg->to->body.s==NULL)) + if(parse_to_header(msg)<0) { - LM_ERR("cannot find TO HEADER!\n"); + LM_ERR("failed parsing To header\n"); goto error; } - /* get TO header URI */ - if(msg->to->parsed != NULL) - { - pto = (struct to_body*)msg->to->parsed; - LM_DBG("'To' header ALREADY PARSED: <%.*s>\n", - pto->uri.len, pto->uri.s ); - } - else - { - memset( &to , 0, sizeof(to) ); - parse_to(msg->to->body.s, - msg->to->body.s + msg->to->body.len + 1, &to); - if(to.uri.len <= 0) /* || to.error != PARSE_OK) */ - { - LM_ERR("'To' header NOT parsed\n"); - goto error; - } - pto = &to; - } + pto = get_to(msg); /** * check if has expires=0 (REGISTER)

1 0

git:master: kcore: extended supported parser with eventlist
by Daniel-Constantin Mierla 05 Jan '11

05 Jan '11

Module: sip-router Branch: master Commit: 6baa261b6494736034af8f5b90446237500eee79 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6baa261… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 15:11:08 2011 +0100 kcore: extended supported parser with eventlist --- lib/kcore/parse_supported.c | 15 ++++++++++++--- lib/kcore/parse_supported.h | 12 ++++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/kcore/parse_supported.c b/lib/kcore/parse_supported.c index e655d30..8720397 100644 --- a/lib/kcore/parse_supported.c +++ b/lib/kcore/parse_supported.c @@ -92,10 +92,19 @@ static inline int parse_supported_body(str *body, unsigned int *sup) } break; - /* unknown */ + /* extra supported or unknown */ default: - /* skip element */ - for (; pos < len && !IS_DELIM(p); ++pos, ++p); + if(pos+SUPPORTED_EVENTLIST_LEN<=len + && strncasecmp(p, SUPPORTED_EVENTLIST_STR, + SUPPORTED_EVENTLIST_LEN)==0 + && IS_DELIM(p+9) ) { + *sup |= F_SUPPORTED_EVENTLIST; + pos += SUPPORTED_EVENTLIST_LEN + 1; + p += SUPPORTED_EVENTLIST_LEN + 1; + } else { + /* skip element */ + for (; pos < len && !IS_DELIM(p); ++pos, ++p); + } break; } } diff --git a/lib/kcore/parse_supported.h b/lib/kcore/parse_supported.h index c618b8d..126f56e 100644 --- a/lib/kcore/parse_supported.h +++ b/lib/kcore/parse_supported.h @@ -39,14 +39,15 @@ #include "../../mem/mem.h" -#define F_SUPPORTED_PATH (1 << 0) -#define F_SUPPORTED_100REL (1 << 1) -#define F_SUPPORTED_TIMER (1 << 2) +#define F_SUPPORTED_PATH (1 << 0) +#define F_SUPPORTED_100REL (1 << 1) +#define F_SUPPORTED_TIMER (1 << 2) +#define F_SUPPORTED_EVENTLIST (1 << 3) #define SUPPORTED_PATH_STR "path" #define SUPPORTED_PATH_LEN (sizeof(SUPPORTED_PATH_STR)-1) -/* RFC 3262 */ +/* RFC 3262 (PRACK) */ #define SUPPORTED_100REL_STR "100rel" #define SUPPORTED_100REL_LEN (sizeof(SUPPORTED_100REL_STR)-1) @@ -54,6 +55,9 @@ #define SUPPORTED_TIMER_STR "timer" #define SUPPORTED_TIMER_LEN (sizeof(SUPPORTED_TIMER_STR)-1) +/* RFC 4662 (RLS) */ +#define SUPPORTED_EVENTLIST_STR "eventlist" +#define SUPPORTED_EVENTLIST_LEN (sizeof(SUPPORTED_EVENTLIST_STR)-1) #define get_supported(p_msg) \ ((p_msg)->supported ? ((struct supported_body*)(p_msg)->supported->parsed)->supported_all : 0)

1 0

git:master: core: parse_to_header() moved to parser/parse_to.{c, h}
by Daniel-Constantin Mierla 05 Jan '11

05 Jan '11

Module: sip-router Branch: master Commit: 10e4fcf8a75208dc934f9cbc821f7c081e6c4994 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10e4fcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 16:23:44 2011 +0100 core: parse_to_header() moved to parser/parse_to.{c,h} - more convenient way of testing the validity of To header --- parser/parse_to.c | 16 ++++++++++++++++ parser/parse_to.h | 1 + select_core.c | 15 --------------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/parser/parse_to.c b/parser/parse_to.c index 8bfdca7..bcd0bd0 100644 --- a/parser/parse_to.c +++ b/parser/parse_to.c @@ -840,3 +840,19 @@ void free_to(struct to_body* tb) free_to_params(tb); pkg_free(tb); } + + +int parse_to_header(struct sip_msg *msg) +{ + if ( !msg->to && ( parse_headers(msg,HDR_TO_F,0)==-1 || !msg->to)) { + ERR("bad msg or missing TO header\n"); + return -1; + } + + // HDR_TO_T is automatically parsed (get_hdr_field in parser/msg_parser.c) + // so check only ptr validity + if (msg->to->parsed) + return 0; + else + return -1; +} diff --git a/parser/parse_to.h b/parser/parse_to.h index 22a95d6..0c79a08 100644 --- a/parser/parse_to.h +++ b/parser/parse_to.h @@ -69,5 +69,6 @@ void free_to_params(struct to_body* tb); void free_to(struct to_body* tb); +int parse_to_header(struct sip_msg *msg); #endif diff --git a/select_core.c b/select_core.c index f8c668b..42f6aff 100644 --- a/select_core.c +++ b/select_core.c @@ -226,21 +226,6 @@ int select_##_name_##_params(str* res, select_t* s, struct sip_msg* msg) \ return 1; \ } -int parse_to_header(struct sip_msg *msg) -{ - if ( !msg->to && ( parse_headers(msg,HDR_TO_F,0)==-1 || !msg->to)) { - ERR("bad msg or missing TO header\n"); - return -1; - } - - // HDR_TO_T is automatically parsed (get_hdr_field in parser/msg_parser.c) - // so check only ptr validity - if (msg->to->parsed) - return 0; - else - return -1; -} - SELECT_uri_header(to) SELECT_uri_header(from) SELECT_uri_header(refer_to)

1 0

← Newer
1
...
16
17
18
19
20
21
22
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011