sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
226 discussions

git:carstenbock/ims: - Fixed Typo in Makefile

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 87cce5a3096e255ee6b796f5567ac91f972aee9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=87cce5a… Author: Carsten Bock <bock(a)bock-tde.(none)> Committer: Carsten Bock <bock(a)bock-tde.(none)> Date: Thu Jan 6 18:45:13 2011 +0100 - Fixed Typo in Makefile --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index f7d52bb..771c701 100644 --- a/Makefile +++ b/Makefile @@ -849,7 +849,7 @@ deb-lenny: fi .PHONY: deb-squeeze -deb-lenny: +deb-squeeze: -@if [ -d debian ]; then \ dpkg-buildpackage -rfakeroot -tc; \ rm debian; \

13 years, 10 months

git:carstenbock/ims: - added building rules for a dedicated "kamailio-ims" package

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: a8f0e347d05d2ee1ec68a5b036dae2aa25b345e5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a8f0e34… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 6 14:33:58 2011 +0100 - added building rules for a dedicated "kamailio-ims" package - added custom Make-Targets for Debian Lenny/Squeeze (make deb-lenny / make deb-squeeze) --- Makefile | 25 +++++++++++++++++++++++++ pkg/kamailio/deb/debian/control | 9 +++++++++ pkg/kamailio/deb/debian/rules | 2 +- pkg/kamailio/deb/lenny/control | 9 +++++++++ pkg/kamailio/deb/lenny/rules | 2 +- pkg/kamailio/deb/lucid/control | 9 +++++++++ pkg/kamailio/deb/lucid/rules | 2 +- pkg/kamailio/deb/squeeze/control | 9 +++++++++ pkg/kamailio/deb/squeeze/rules | 2 +- 9 files changed, 65 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3997a38..f7d52bb 100644 --- a/Makefile +++ b/Makefile @@ -271,6 +271,9 @@ module_group_kpython=app_python # K geoip module module_group_kgeoip=geoip +# K IMS modules +module_group_kims=pcscf cdp + # if not set on the cmd. line, env or in the modules.lst (cfg_group_include) # exclude the below modules. ifneq ($(group_include)$(cfg_group_include),) @@ -834,6 +837,28 @@ deb: rm debian; \ fi +.PHONY: deb-lenny +deb-lenny: + -@if [ -d debian ]; then \ + dpkg-buildpackage -rfakeroot -tc; \ + rm debian; \ + else \ + ln -s pkg/$(MAIN_NAME)/deb/lenny debian; \ + dpkg-buildpackage -rfakeroot -tc; \ + rm debian; \ + fi + +.PHONY: deb-squeeze +deb-lenny: + -@if [ -d debian ]; then \ + dpkg-buildpackage -rfakeroot -tc; \ + rm debian; \ + else \ + ln -s pkg/$(MAIN_NAME)/deb/squeeze debian; \ + dpkg-buildpackage -rfakeroot -tc; \ + rm debian; \ + fi + .PHONY: sunpkg sunpkg: mkdir -p tmp/$(MAIN_NAME) diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 302a40a..da5f1a4 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -275,4 +275,13 @@ Description: Kamailio - package for "nice to have" installation This is a meta-package for easy installation various useful tools that may be handy on server with Kamailio installed. +Package: kamailio-ims-modules +Architecture: any +Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}) +Description: IMS Modules for Kamailio + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package provides the OpenIMS-Modules for Kamailio. diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index fbaccf6..cedfd2a 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -42,7 +42,7 @@ MODULES_SP= # on which other depend first) PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ - snmpstats carrierroute xmpp cpl lua python geoip + snmpstats carrierroute xmpp cpl lua python geoip ims # directories with possible duplicate libraries (that should be deleted # from current module* packages) diff --git a/pkg/kamailio/deb/lenny/control b/pkg/kamailio/deb/lenny/control index 73a1e26..390a1b0 100644 --- a/pkg/kamailio/deb/lenny/control +++ b/pkg/kamailio/deb/lenny/control @@ -275,4 +275,13 @@ Description: Kamailio - package for "nice to have" installation This is a meta-package for easy installation various useful tools that may be handy on server with Kamailio installed. +Package: kamailio-ims-modules +Architecture: any +Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}) +Description: IMS Modules for Kamailio + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package provides the OpenIMS-Modules for Kamailio. diff --git a/pkg/kamailio/deb/lenny/rules b/pkg/kamailio/deb/lenny/rules index 84ebd65..d5582af 100755 --- a/pkg/kamailio/deb/lenny/rules +++ b/pkg/kamailio/deb/lenny/rules @@ -42,7 +42,7 @@ MODULES_SP= # on which other depend first) PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ - snmpstats carrierroute xmpp cpl lua python + snmpstats carrierroute xmpp cpl lua python ims # directories with possible duplicate libraries (that should be deleted # from current module* packages) diff --git a/pkg/kamailio/deb/lucid/control b/pkg/kamailio/deb/lucid/control index 302a40a..da5f1a4 100644 --- a/pkg/kamailio/deb/lucid/control +++ b/pkg/kamailio/deb/lucid/control @@ -275,4 +275,13 @@ Description: Kamailio - package for "nice to have" installation This is a meta-package for easy installation various useful tools that may be handy on server with Kamailio installed. +Package: kamailio-ims-modules +Architecture: any +Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}) +Description: IMS Modules for Kamailio + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package provides the OpenIMS-Modules for Kamailio. diff --git a/pkg/kamailio/deb/lucid/rules b/pkg/kamailio/deb/lucid/rules index fbaccf6..cedfd2a 100755 --- a/pkg/kamailio/deb/lucid/rules +++ b/pkg/kamailio/deb/lucid/rules @@ -42,7 +42,7 @@ MODULES_SP= # on which other depend first) PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ - snmpstats carrierroute xmpp cpl lua python geoip + snmpstats carrierroute xmpp cpl lua python geoip ims # directories with possible duplicate libraries (that should be deleted # from current module* packages) diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control index 22992e0..7304462 100644 --- a/pkg/kamailio/deb/squeeze/control +++ b/pkg/kamailio/deb/squeeze/control @@ -276,3 +276,12 @@ Description: Kamailio - package for "nice to have" installation handy on server with Kamailio installed. +Package: kamailio-ims-modules +Architecture: any +Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}) +Description: IMS Modules for Kamailio + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package provides the OpenIMS-Modules for Kamailio. diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index a64793a..7af28a9 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -42,7 +42,7 @@ MODULES_SP= # on which other depend first) PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils geoip memcached tls \ - snmpstats carrierroute xmpp cpl lua python + snmpstats carrierroute xmpp cpl lua python ims # directories with possible duplicate libraries (that should be deleted # from current module* packages)

13 years, 10 months

git:master: modules/enum: fixed access to service parameter in enum_query.

by Juha Heinanen

Module: sip-router Branch: master Commit: 9f116e23d8b46b5470dc02f5bf731b61c7516fd8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f116e2… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Jan 6 11:14:14 2011 +0200 modules/enum: fixed access to service parameter in enum_query. --- modules/enum/enum.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/enum/enum.c b/modules/enum/enum.c index 695beaf..25c4c23 100644 --- a/modules/enum/enum.c +++ b/modules/enum/enum.c @@ -730,19 +730,20 @@ int enum_query_1(struct sip_msg* _msg, char* _suffix, char* _str2) */ int enum_query_2(struct sip_msg* _msg, char* _suffix, char* _service) { - str suffix, service; + str suffix, *service; if (get_str_fparam(&suffix, _msg, (fparam_t*)_suffix) != 0) { LM_ERR("unable to get suffix\n"); return -1; } - - if (get_str_fparam(&service, _msg, (fparam_t*)_service) != 0) { - LM_ERR("unable to get service\n"); + + service = (str*)_service; + if ((service == NULL) || (service->len == 0)) { + LM_ERR("invalid service parameter"); return -1; } - return enum_query(_msg, &suffix, &service); + return enum_query(_msg, &suffix, service); } @@ -756,6 +757,9 @@ int enum_query(struct sip_msg* _msg, str* suffix, str* service) char name[MAX_DOMAIN_SIZE]; char string[17]; + LM_DBG("enum_query on suffix <%.*s> service <%.*s>\n", + suffix->len, suffix->s, service->len, service->s); + if (parse_sip_msg_uri(_msg) < 0) { LM_ERR("Parsing of R-URI failed\n"); return -1;

13 years, 10 months

git:master: Makefile: increased devel version

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7c4cd425f658264f7c95e56051f021b20b55f442 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c4cd42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 20:25:05 2011 +0100 Makefile: increased devel version --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 6c79d62..9d7fd99 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -160,7 +160,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory debugger switcher # 0 - off (release mode)

13 years, 10 months

git:3.1: kcore: extended supported parser with eventlist

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 47b7207587e2af9262a68a539549589a6ed207d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=47b7207… 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 (cherry picked from commit 6baa261b6494736034af8f5b90446237500eee79) --- 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)

13 years, 10 months

git:3.1: msilo(k): simplified getting of From/To

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 7a78111d3c3a16ec32d698bea367da1566903dfb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a78111… 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 (cherry picked from commit c8e8193d3d5d933445afbd636288074c1b277945) --- 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)

13 years, 10 months

git:3.1: rls(k): control loading db subs

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: eab6b8a69a17131f0827f88b093f1a78f9c07d2b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eab6b8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 15:24:02 2011 +0100 rls(k): control loading db subs - parameter that can be used to control the db load from config (cherry picked from commit 25d8ec8b5962b3193b37186b06be5683e4a22fda) --- modules_k/rls/rls.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index b3fe8f4..7f77425 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -103,6 +103,7 @@ extract_sdialog_info_t pres_extract_sdialog_info; int rls_events= EVENT_PRESENCE; int to_presence_code= 1; int rls_max_expires= 7200; +int rls_reload_db_subs = 0; /* functions imported from xcap_client module */ xcapGetNewDoc_t xcap_GetNewDoc= 0; @@ -186,6 +187,7 @@ static param_export_t params[]={ /*address and port(default: 80):"http://192.168.2.132:8000/xcap-root"*/ { "rls_event", STR_PARAM|USE_FUNC_PARAM,(void*)add_rls_event}, { "outbound_proxy", STR_PARAM, &outbound_proxy.s }, + { "reload_db_subs", INT_PARAM, &rls_reload_db_subs }, {0, 0, 0 } }; @@ -356,10 +358,13 @@ static int mod_init(void) LM_ERR("while creating new hash table\n"); return -1; } - if(rls_restore_db_subs()< 0) + if(rls_reload_db_subs!=0) { - LM_ERR("while restoring rl watchers table\n"); - return -1; + if(rls_restore_db_subs()< 0) + { + LM_ERR("while restoring rl watchers table\n"); + return -1; + } } if(rls_db)

13 years, 10 months

git:3.1: core: parse_to_header() moved to parser/parse_to.{c, h}

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: e4b1dd72ae5afb0cdac78f75f92964382711a35b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4b1dd7… 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 (cherry picked from commit 10e4fcf8a75208dc934f9cbc821f7c081e6c4994) --- 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)

13 years, 10 months

git:3.1: rls(k): module polishing

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 01b11fa9c2a032e0e9745956f71f1bb3ce340c21 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=01b11fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 5 19:52:27 2011 +0100 rls(k): module polishing - optimiezed error checking for broken sip requests - internal naming changes to avoid object conflicts - query for rls services documents (reported by Klaus Darilion) (cherry picked from commit 8d9f412ab0b8cdc19a00e8549722326f4b368cb4) --- modules_k/rls/rls.c | 65 +++--- modules_k/rls/rls.h | 4 +- modules_k/rls/subscribe.c | 568 ++++++++++++++++++++++++--------------------- 3 files changed, 335 insertions(+), 302 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=01b…

13 years, 10 months

git:3.1: core: defines to return parsed uri in From and To

by Daniel-Constantin Mierla

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

13 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011