sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
346 discussions

git:master: Makefile: version set to 3.3.0-dev8

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a7dce0e68164ea94c18f950bb862bce7416e3fdf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7dce0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 15 12:23:02 2012 +0200 Makefile: version set to 3.3.0-dev8 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 86ddc01..4fd657f 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev7 +EXTRAVERSION = -dev8 # memory debugger switcher # 0 - off (release mode)

12 years, 7 months

git:master: siputils: new function is_gruu(uri)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0a8ad0ac8f5b8c125a3cc3a0074386409898cf10 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a8ad0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 15 12:15:17 2012 +0200 siputils: new function is_gruu(uri) - wrapper function to test quickly if a SIP URI indicates a GRUU address or not --- modules_k/siputils/README | 102 +++++++++++++++++------------ modules_k/siputils/doc/siputils_admin.xml | 29 ++++++++ modules_k/siputils/sipops.c | 30 +++++++++ modules_k/siputils/sipops.h | 1 + modules_k/siputils/siputils.c | 4 + 5 files changed, 125 insertions(+), 41 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0a8…

12 years, 7 months

git:master: sdpops: support for codecs with same name and many different ids

by Kristen Eisenberg

Daniel-Constantin Mierla writes: > sdpops: support for codecs with same name and many different ids thanks, i did new tests and now sdp_keep_codecs_by_name works ok. Kristen Eisenberg Billige Flüge Marketing GmbH Emanuelstr. 3, 10317 Berlin Deutschland Telefon: +49 (33) 5310967 Email: utebachmeier at gmail.com Site: http://flug.airego.de - Billige Flüge vergleichen

12 years, 7 months

git:master: registrar(k): added new parameter gruu_enabled

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 21f1a3783ca167ece11658ee148108636b434e27 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21f1a37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 13 19:28:37 2012 +0200 registrar(k): added new parameter gruu_enabled - makes possible to turn off GRUU handling for REGISTER --- modules_k/registrar/README | 47 +++++++++++++++++++-------- modules_k/registrar/doc/registrar_admin.xml | 27 +++++++++++++++ modules_k/registrar/reg_mod.c | 3 ++ modules_k/registrar/reg_mod.h | 1 + modules_k/registrar/save.c | 3 +- 5 files changed, 66 insertions(+), 15 deletions(-) diff --git a/modules_k/registrar/README b/modules_k/registrar/README index ede93b0..7ea05cc 100644 --- a/modules_k/registrar/README +++ b/modules_k/registrar/README @@ -56,6 +56,7 @@ Bogdan-Andre Iancu 3.19. path_use_received (integer) 3.20. reg_callid_avp (string) 3.21. xavp_cfg (string) + 3.22. gruu_enabled (integer) 4. Functions @@ -103,14 +104,15 @@ Bogdan-Andre Iancu 1.18. Set path_use_received parameter 1.19. Set reg_callid_avp parameter 1.20. Set xavp_cfg parameter - 1.21. save usage - 1.22. lookup usage - 1.23. registered usage - 1.24. add_sock_hdr usage - 1.25. registered usage + 1.21. Set gruu_enabled parameter + 1.22. save usage + 1.23. lookup usage + 1.24. registered usage + 1.25. add_sock_hdr usage 1.26. registered usage 1.27. registered usage - 1.28. $ulc(name) usage + 1.28. registered usage + 1.29. $ulc(name) usage Chapter 1. Admin Guide @@ -149,6 +151,7 @@ Chapter 1. Admin Guide 3.19. path_use_received (integer) 3.20. reg_callid_avp (string) 3.21. xavp_cfg (string) + 3.22. gruu_enabled (integer) 4. Functions @@ -258,6 +261,7 @@ Chapter 1. Admin Guide 3.19. path_use_received (integer) 3.20. reg_callid_avp (string) 3.21. xavp_cfg (string) + 3.22. gruu_enabled (integer) 3.1. default_expires (integer) @@ -578,6 +582,21 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") modparam("registrar", "xavp_cfg", "reg") ... +3.22. gruu_enabled (integer) + + If set to 1 and GRUU "+sip.instance" parameter to Contact header of + REGISTER is present, then the value of the parameter is saved to + location and pub-gruu and temp-gruu addresses are generated. + + Set it to 0 if you want to ignore GRUU extensions in REGISTER. + + Default value is 1 (enabled). + + Example 1.21. Set gruu_enabled parameter +... +modparam("registrar", "gruu_enabled", 0) +... + 4. Functions 4.1. save(domain, [, flags [, uri]]) @@ -625,7 +644,7 @@ modparam("registrar", "xavp_cfg", "reg") This function can be used from REQUEST_ROUTE and REPLY_ROUTE. - Example 1.21. save usage + Example 1.22. save usage ... save("location"); save("location", "0x01"); @@ -658,7 +677,7 @@ save("location", "0x00", "sip:test@kamailio.org"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.22. lookup usage + Example 1.23. lookup usage ... lookup("location"); switch ($retcode) { @@ -686,7 +705,7 @@ switch ($retcode) { This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.23. registered usage + Example 1.24. registered usage ... if (registered("location")) { sl_send_reply("100", "Trying"); @@ -706,7 +725,7 @@ if (registered("location")) { This function can be used from REQUEST_ROUTE. - Example 1.24. add_sock_hdr usage + Example 1.25. add_sock_hdr usage ... add_sock_hdr("Sock-Info"); ... @@ -724,7 +743,7 @@ add_sock_hdr("Sock-Info"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.25. registered usage + Example 1.26. registered usage ... unregister("location", "$ru"); unregister("location", "sip:user@kamailio.org"); @@ -746,7 +765,7 @@ unregister("location", "sip:user@kamailio.org"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.26. registered usage + Example 1.27. registered usage ... reg_fetch_contacts("location", "$ru", "callee"); reg_fetch_contacts("location", "sip:user@kamailio.org", "caller"); @@ -765,7 +784,7 @@ reg_fetch_contacts("location", "sip:user@kamailio.org", "caller"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.27. registered usage + Example 1.28. registered usage ... reg_free_contacts("callee"); ... @@ -831,7 +850,7 @@ reg_free_contacts("callee"); The pseudo-variable accepts positive index value to access a specific contact record. - Example 1.28. $ulc(name) usage + Example 1.29. $ulc(name) usage ... if(reg_fetch_contacts("location", "$fu", "caller")) { diff --git a/modules_k/registrar/doc/registrar_admin.xml b/modules_k/registrar/doc/registrar_admin.xml index 13f59bb..a4bec36 100644 --- a/modules_k/registrar/doc/registrar_admin.xml +++ b/modules_k/registrar/doc/registrar_admin.xml @@ -658,6 +658,33 @@ modparam("registrar", "xavp_cfg", "reg") </programlisting> </example> </section> + + <section> + <title><varname>gruu_enabled</varname> (integer)</title> + <para> + If set to 1 and GRUU <quote>+sip.instance</quote> parameter to + Contact header of REGISTER is present, then the value of the + parameter is saved to location and pub-gruu and temp-gruu addresses + are generated. + </para> + <para> + Set it to 0 if you want to ignore GRUU extensions in REGISTER. + </para> + <para> + <emphasis> + Default value is 1 (enabled). + </emphasis> + </para> + <example> + <title>Set <varname>gruu_enabled</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("registrar", "gruu_enabled", 0) +... + </programlisting> + </example> + </section> + </section> diff --git a/modules_k/registrar/reg_mod.c b/modules_k/registrar/reg_mod.c index 0cff0ae..3501efd 100644 --- a/modules_k/registrar/reg_mod.c +++ b/modules_k/registrar/reg_mod.c @@ -117,6 +117,8 @@ int path_use_params = 0; /*!< if the received- and nat-parameters of last Path /* sruid to get internal uid */ sruid_t _reg_sruid; +int reg_gruu_enabled = 1; + /* Populate this AVP if testing for specific registration instance. */ char *reg_callid_avp_param = 0; unsigned short reg_callid_avp_type = 0; @@ -214,6 +216,7 @@ static param_export_t params[] = { {"path_mode", INT_PARAM, &path_mode }, {"path_use_received", INT_PARAM, &path_use_params }, {"xavp_cfg", STR_PARAM, &reg_xavp_cfg.s }, + {"gruu_enabled", INT_PARAM, &reg_gruu_enabled }, {0, 0, 0} }; diff --git a/modules_k/registrar/reg_mod.h b/modules_k/registrar/reg_mod.h index f39ce46..a32f043 100644 --- a/modules_k/registrar/reg_mod.h +++ b/modules_k/registrar/reg_mod.h @@ -83,6 +83,7 @@ extern int method_filtering; extern int path_enabled; extern int path_mode; extern int path_use_params; +extern int reg_gruu_enabled; extern str sock_hdr_name; extern int sock_flag; diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 14b93ef..36bff89 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -357,7 +357,8 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, ci.received = received; } } - if(_c->instance) + if(reg_gruu_enabled==1 && _c->instance!=NULL + && _c->instance->body.len>0) ci.instance = _c->instance->body; if(sruid_next(&_reg_sruid)<0) goto error;

12 years, 7 months

git:master: registrar(k): fixed warning introduced in previous commit

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2fee0880792d97413a288246e49a08d29446802b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2fee088… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 13 15:23:44 2012 +0200 registrar(k): fixed warning introduced in previous commit --- modules_k/registrar/lookup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index bd67f8b..62b76d7 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -192,7 +192,7 @@ int lookup(struct sip_msg* _m, udomain_t* _d, str* _uri) && (ret=-2) && allowed_method(_m,ptr))) goto done; LM_DBG("contact for [%.*s] found by temp gruu [%.*s / %u]\n", - aor.len, ZSW(aor.s), inst.len, inst.s); + aor.len, ZSW(aor.s), inst.len, inst.s, ahash); } ret = 1;

12 years, 7 months

git:master: lib/srdb1: extended definitions for location and aliases tables

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 26b75ccd46643fcf022b3f0d0260087228763b2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26b75cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 13 14:51:20 2012 +0200 lib/srdb1: extended definitions for location and aliases tables - new columns ruid and instance to deal with GRUU RFC5627 --- lib/srdb1/schema/aliases.xml | 21 +++++++++++++++++++-- lib/srdb1/schema/location.xml | 22 ++++++++++++++++++++-- utils/kamctl/db_berkeley/kamailio/aliases | 6 +++--- utils/kamctl/db_berkeley/kamailio/domain | 6 +++--- utils/kamctl/db_berkeley/kamailio/domain_attrs | 10 ++++++++++ utils/kamctl/db_berkeley/kamailio/location | 6 +++--- utils/kamctl/db_berkeley/kamailio/version | 8 +++++--- utils/kamctl/db_sqlite/domain-create.sql | 16 ++++++++++++++-- utils/kamctl/db_sqlite/registrar-create.sql | 6 ++++-- utils/kamctl/db_sqlite/usrloc-create.sql | 6 ++++-- utils/kamctl/dbtext/kamailio/aliases | 2 +- utils/kamctl/dbtext/kamailio/domain | 2 +- utils/kamctl/dbtext/kamailio/domain_attrs | 1 + utils/kamctl/dbtext/kamailio/location | 2 +- utils/kamctl/dbtext/kamailio/version | 7 ++++--- utils/kamctl/mysql/domain-create.sql | 16 ++++++++++++++-- utils/kamctl/mysql/registrar-create.sql | 6 ++++-- utils/kamctl/mysql/usrloc-create.sql | 6 ++++-- utils/kamctl/oracle/domain-create.sql | 24 ++++++++++++++++++++++-- utils/kamctl/oracle/registrar-create.sql | 6 ++++-- utils/kamctl/oracle/usrloc-create.sql | 6 ++++-- utils/kamctl/postgres/domain-create.sql | 16 ++++++++++++++-- utils/kamctl/postgres/registrar-create.sql | 6 ++++-- utils/kamctl/postgres/usrloc-create.sql | 6 ++++-- 24 files changed, 167 insertions(+), 46 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=26b…

12 years, 7 months

git:master: usrloc(k): new columns to store +sip.instance in record id

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 05823430e25f8edb4361c6bf3da3d8cc93be9abf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0582343… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 13 14:42:23 2012 +0200 usrloc(k): new columns to store +sip.instance in record id - each usrloc contact has now an unique internal id, generated via SRUID - the unique id is stored in 'ruid' field - if the Contact header has +sip.instance parameter (GRUU RFC5627), store it in field 'instance' - database schema was updated to reflect the two new columns - more functions were exported via API to deal with GRUU cases --- modules_k/usrloc/README | 166 +++++++++++++++---------- modules_k/usrloc/doc/usrloc_admin.xml | 40 ++++++ modules_k/usrloc/ucontact.c | 82 +++++++++++-- modules_k/usrloc/udomain.c | 218 +++++++++++++++++++++++++++++++-- modules_k/usrloc/udomain.h | 11 ++ modules_k/usrloc/ul_mi.c | 23 ++++ modules_k/usrloc/ul_mod.c | 8 ++ modules_k/usrloc/ul_mod.h | 4 +- modules_k/usrloc/ul_rpc.c | 20 +++- modules_k/usrloc/urecord.c | 47 +++++++- modules_k/usrloc/urecord.h | 15 +++ modules_k/usrloc/usrloc.c | 4 + modules_k/usrloc/usrloc.h | 20 +++- 13 files changed, 564 insertions(+), 94 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=058…

12 years, 7 months

git:master: rr(k): don't match as myself URI with gr parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c199ac2a4a8189ddd0d6cfb505344a3a3d3281cf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c199ac2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 13 14:41:32 2012 +0200 rr(k): don't match as myself URI with gr parameter - they point to a location contact --- modules_k/rr/loose.c | 46 ++++++++++++++++------------------------------ 1 files changed, 16 insertions(+), 30 deletions(-) diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index 7d2c0e2..b74797f 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -118,26 +118,29 @@ static inline int find_first_route(struct sip_msg* _m) * \param _port port * \return 0 if the URI is not myself, 1 otherwise */ -#ifdef ENABLE_USER_CHECK -static inline int is_myself(str *_user, str* _host, unsigned short _port) -#else -static inline int is_myself(str* _host, unsigned short _port) -#endif +static inline int is_myself(sip_uri_t *_puri) { int ret; - ret = check_self(_host, _port ? _port : SIP_PORT, 0);/* match all protos*/ + ret = check_self(&_puri->host, + _puri->port_no?_puri->port_no:SIP_PORT, 0);/* match all protos*/ if (ret < 0) return 0; #ifdef ENABLE_USER_CHECK - if(i_user.len && i_user.len==_user->len - && !strncmp(i_user.s, _user->s, _user->len)) + if(ret==1 && i_user.len && i_user.len==_puri->user.len + && strncmp(i_user.s, _puri->user.s, _puri->user.len)==0) { - LM_DBG("this URI isn't mine\n"); - return -1; + LM_DBG("ignore user matched - URI is not to the server itself\n"); + return 0; } #endif + if(ret==1) { + /* match on host:port, but if gruu, then fail */ + if(_puri->gr.s!=NULL) + return 0; + } + return ret; } @@ -507,13 +510,7 @@ static inline int after_strict(struct sip_msg* _m) return RR_ERROR; } - if ( enable_double_rr && is_2rr(&puri.params) && -#ifdef ENABLE_USER_CHECK - is_myself(&puri.user, &puri.host, puri.port_no) -#else - is_myself(&puri.host, puri.port_no) -#endif - ) { + if ( enable_double_rr && is_2rr(&puri.params) && is_myself(&puri)) { /* double route may occure due different IP and port, so force as * send interface the one advertise in second Route */ si = grep_sock_info( &puri.host, puri.port_no, puri.proto); @@ -677,9 +674,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) rr_t* rt; int res; int status; -#ifdef ENABLE_USER_CHECK int ret; -#endif str uri; struct socket_info *si; @@ -698,12 +693,8 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } /* IF the URI was added by me, remove it */ -#ifdef ENABLE_USER_CHECK - ret=is_myself(&puri.user, &puri.host, puri.port_no); + ret=is_myself(&puri); if (ret>0) -#else - if (is_myself(&puri.host, puri.port_no)) -#endif { LM_DBG("Topmost route URI: '%.*s' is me\n", uri.len, ZSW(uri.s)); @@ -850,12 +841,7 @@ int loose_route(struct sip_msg* _m) } else if (ret == 1) { return after_loose(_m, 1); } else { -#ifdef ENABLE_USER_CHECK - if (is_myself(&_m->parsed_uri.user, &_m->parsed_uri.host, - _m->parsed_uri.port_no)) { -#else - if (is_myself(&_m->parsed_uri.host, _m->parsed_uri.port_no)) { -#endif + if (is_myself(&_m->parsed_uri)) { return after_strict(_m); } else { return after_loose(_m, 0);

12 years, 7 months

git:master: parser: added hook to gr (gruu) parameter in sip_uri_t

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1dd730471dd0620d02b08ce69648c94fc0943818 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1dd7304… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 13 14:38:48 2012 +0200 parser: added hook to gr (gruu) parameter in sip_uri_t - gr is specified by GRUU RFC5627 --- parser/msg_parser.h | 2 + parser/parse_uri.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index cf78326..593c4b4 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -212,6 +212,7 @@ struct sip_uri { str method; str lr; str r2; /*!< ser specific rr parameter */ + str gr; str transport_val; /*!< transport value */ str ttl_val; /*!< TTL value */ str user_param_val; /*!< User= param value */ @@ -219,6 +220,7 @@ struct sip_uri { str method_val; /*!< Method value */ str lr_val; /*!< lr value placeholder for lr=on a.s.o*/ str r2_val; + str gr_val; #ifdef USE_COMP unsigned short comp; #endif diff --git a/parser/parse_uri.c b/parser/parse_uri.c index e6cedcf..a244cf2 100644 --- a/parser/parse_uri.c +++ b/parser/parse_uri.c @@ -82,6 +82,8 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) PLR_L, PLR_R_FIN, PLR_eq, /* r2 */ PR2_R, PR2_2_FIN, PR2_eq, + /* gr */ + PGR_G, PGR_R_FIN, PGR_eq, #ifdef USE_COMP /* comp */ PCOMP_C, PCOMP_O, PCOMP_M, PCOMP_P, PCOMP_eq, @@ -644,6 +646,11 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) b=p; state=PR2_R; break; + case 'g': + case 'G': + b=p; + state=PGR_G; + break; #ifdef USE_COMP case 'c': case 'C': @@ -856,6 +863,42 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) state=URI_VAL_P; } break; + /* gr */ + param_switch(PGR_G, 'r', 'R', PGR_R_FIN); + case PGR_R_FIN: + switch(*p){ + case '@': + still_at_user; + break; + case '=': + state=PGR_eq; + break; + semicolon_case; + uri->gr.s=b; + uri->gr.len=(p-b); + break; + question_case; + uri->gr.s=b; + uri->gr.len=(p-b); + break; + colon_case; + break; + default: + state=URI_PARAM_P; + } + break; + /* handle gr=something case */ + case PGR_eq: + param=&uri->gr; + param_val=&uri->gr_val; + switch(*p){ + param_common_cases; + default: + v=p; + state=URI_VAL_P; + } + break; + #ifdef USE_COMP param_switch(PCOMP_C, 'o', 'O' , PCOMP_O); param_switch(PCOMP_O, 'm', 'M' , PCOMP_M); @@ -1007,7 +1050,8 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) case PM_D: case PM_eq: case PLR_L: /* lr */ - case PR2_R: /* r2 */ + case PR2_R: /* r2 */ + case PGR_G: /* gr */ #ifdef USE_COMP case PCOMP_C: case PCOMP_O: @@ -1033,6 +1077,13 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) uri->r2.s=b; uri->r2.len=p-b; break; + case PGR_R_FIN: + case PGR_eq: + uri->params.s=s; + uri->params.len=p-s; + uri->gr.s=b; + uri->gr.len=p-b; + break; case URI_VAL_P: /* intermediate value states */ case VU_U:

12 years, 7 months

git:master: lib/kcore: parse Supported header recognize gruu

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 74f727eb90ad7d1a7e639da17887bc665e4b64b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74f727e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 13 14:40:47 2012 +0200 lib/kcore: parse Supported header recognize gruu --- lib/kcore/parse_supported.c | 9 ++++++++- lib/kcore/parse_supported.h | 5 +++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/lib/kcore/parse_supported.c b/lib/kcore/parse_supported.c index 8c81cfb..c30225a 100644 --- a/lib/kcore/parse_supported.c +++ b/lib/kcore/parse_supported.c @@ -97,10 +97,17 @@ static inline int parse_supported_body(str *body, unsigned int *sup) if(pos+SUPPORTED_EVENTLIST_LEN<=len && strncasecmp(p, SUPPORTED_EVENTLIST_STR, SUPPORTED_EVENTLIST_LEN)==0 - && IS_DELIM(p+9) ) { + && IS_DELIM(p+SUPPORTED_EVENTLIST_LEN) ) { *sup |= F_SUPPORTED_EVENTLIST; pos += SUPPORTED_EVENTLIST_LEN + 1; p += SUPPORTED_EVENTLIST_LEN + 1; + } else if(pos+SUPPORTED_GRUU_LEN<=len + && strncasecmp(p, SUPPORTED_GRUU_STR, + SUPPORTED_GRUU_LEN)==0 + && IS_DELIM(p+SUPPORTED_GRUU_LEN)) { + *sup |= F_SUPPORTED_GRUU; + pos += SUPPORTED_GRUU_LEN + 1; + p += SUPPORTED_GRUU_LEN + 1; } else { /* skip element */ for (; pos < len && !IS_DELIM(p); ++pos, ++p); diff --git a/lib/kcore/parse_supported.h b/lib/kcore/parse_supported.h index 55f04f8..f479eb5 100644 --- a/lib/kcore/parse_supported.h +++ b/lib/kcore/parse_supported.h @@ -44,6 +44,7 @@ #define F_SUPPORTED_100REL (1 << 1) #define F_SUPPORTED_TIMER (1 << 2) #define F_SUPPORTED_EVENTLIST (1 << 3) +#define F_SUPPORTED_GRUU (1 << 4) #define SUPPORTED_PATH_STR "path" #define SUPPORTED_PATH_LEN (sizeof(SUPPORTED_PATH_STR)-1) @@ -60,6 +61,10 @@ #define SUPPORTED_EVENTLIST_STR "eventlist" #define SUPPORTED_EVENTLIST_LEN (sizeof(SUPPORTED_EVENTLIST_STR)-1) +/* RFC 5627 */ +#define SUPPORTED_GRUU_STR "gruu" +#define SUPPORTED_GRUU_LEN (sizeof(SUPPORTED_GRUU_STR)-1) + #define get_supported(p_msg) \ ((p_msg)->supported ? ((struct supported_body*)(p_msg)->supported->parsed)->supported_all : 0)

12 years, 7 months

← Newer
1
...
25
26
27
28
29
30
31
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012