sr-dev May 2011

sr-dev@lists.kamailio.org

28 participants
166 discussions

Patch to add oma user-profile and pres-content support to xcap_server

by Peter Dunkley

Hello, Please find attached a patch to add oma user-profile and pres-content (avatar) support to the xcap_server module. To make use of these changes I also had to update my kamailio.cfg (based on the example from http://kb.asipto.com/kamailio:presence:k31-made-simple). In particular I had to update the event_route[xhttp:request] clause so that: * the xcap-caps response includes the auids and namespace entries for user-profile and pres-content * modify the auth user checking because (unlike the XML documents that were already there) any user can retrieve user-profile and pres-content, but only the owner can update them. For reference, my updated event_route[xhttp:request] clause is included below. Regards, Peter event_route[xhttp:request] { #!ifdef WITH_PRESENCE xdbg("===== xhttp: request [$rv] $rm => $hu\n"); #!ifdef WITH_XHTTPAUTH if (!www_authorize("xcap", "subscriber")) { www_challenge("xcap", "0"); exit; } #!endif if($hu=~"^/xcap-root/") { set_reply_close(); set_reply_no_connect(); # xcap ops $xcapuri(u=>data) = $hu; if($xcapuri(u=>xuid)=~"^sip:.+@.+") $var(uri) = $xcapuri(u=>xuid); else if($xcapuri(u=>xuid)=~".+@.+") $var(uri) = "sip:" + $xcapuri(u=>xuid); else $var(uri) = "sip:"+ $xcapuri(u=>xuid) + "@" + $Ri; if($xcapuri(u=>auid)=="xcap-caps") { $var(xbody) = "<?xml version='1.0' encoding='UTF-8'?> <xcap-caps xmlns='urn:ietf:params:xml:ns:xcap-caps'> <auids> <auid>rls-services</auid> <auid>pidf-manipulation</auid> <auid>xcap-caps</auid> <auid>resource-lists</auid> <auid>pres-rules</auid> <auid>org.openmobilealliance.pres-rules</auid> <auid>org.openmobilealliance.user-profile</auid> <auid>org.openmobilealliance.pres-conent</auid> </auids> <extensions> </extensions> <namespaces> <namespace>urn:ietf:params:xml:ns:rls-services</namespace> <namespace>urn:ietf:params:xml:ns:pidf</namespace> <namespace>urn:ietf:params:xml:ns:xcap-caps</namespace> <namespace>urn:ietf:params:xml:ns:resource-lists</namespace> <namespace>urn:ietf:params:xml:ns:pres-rules</namespace> <namespace>urn:oma:xml:xdm:user-profile</namespace> <namespace>urn:oma:xml:prs:pres-content</namespace> </namespaces> </xcap-caps>"; xhttp_reply("200", "ok", "application/xcap-caps+xml", "$var(xbody)"); exit; } switch($rm) { case "PUT": #!ifdef WITH_XHTTPAUTH # be sure only auth user updates its documents if ($au!=$(var(uri){uri.user})) { xhttp_reply("403", "Forbidden", "text/html", "<html><body>$si:$sp</body></html>"); exit; } #!endif xcaps_put("$var(uri)", "$hu", "$rb"); if($xcapuri(u=>auid)=~"pres-rules") { pres_update_watchers("$var(uri)", "presence"); pres_refresh_watchers("$var(uri)", "presence", 1); } exit; break; case "GET": #!ifdef WITH_XHTTPAUTH if (!($xcapuri(u=>auid)=~"user-profile" || $xcapuri(u=>auid)=~"pres-content")) { # be sure only auth user gets non-profile documents if ($au!=$(var(uri){uri.user})) { xhttp_reply("403", "Forbidden", "text/html", "<html><body>$si:$sp</body></html>"); exit; } } #!endif xcaps_get("$var(uri)", "$hu"); exit; break; case "DELETE": #!ifdef WITH_XHTTPAUTH # be sure only auth user deletes its documents if ($au!=$(var(uri){uri.user})) { xhttp_reply("403", "Forbidden", "text/html", "<html><body>$si:$sp</body></html>"); exit; } #!endif xcaps_del("$var(uri)", "$hu"); if($xcapuri(u=>auid)=~"pres-rules") { pres_update_watchers("$var(uri)", "presence"); pres_refresh_watchers("$var(uri)", "presence", 1); } exit; break; } } # http ops xhttp_reply("200", "ok", "text/html", "<html><body>OK: $si:$sp</body></html>"); exit; #!endif } -- Peter Dunkley Technical Director Crocodile RCS Ltd

13 years, 7 months

git:3.1: dialog: safer unref of terminated dialogs

by Timo Reimann

Module: sip-router Branch: 3.1 Commit: 59f7428173b40944f0ba1fbe909254c9ef1ea455 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59f7428… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Fri Mar 4 22:50:02 2011 +0100 dialog: safer unref of terminated dialogs - if reference counter is already <=0, don't deref anymore, dialog in destroyed state - should protect against bogus dereferencing - reported by Anton Roman (cherry picked from commit 2c28a251a87fd66fa81b4802fe960fef3989fb3d) --- modules_k/dialog/dlg_hash.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 0c14f05..95e541c 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -543,11 +543,10 @@ void link_dlg(struct dlg_cell *dlg, int n) */ #define unref_dlg_unsafe(_dlg,_cnt,_d_entry) \ do { \ - (_dlg)->ref -= (_cnt); \ - LM_DBG("unref dlg %p with %d -> %d\n",\ + LM_DBG("unref dlg %p with %d, crt ref count: %d\n",\ (_dlg),(_cnt),(_dlg)->ref);\ - if ((_dlg)->ref<0) {\ - LM_CRIT("bogus ref %d with cnt %d for dlg %p [%u:%u] "\ + if ((_dlg)->ref<=0) {\ + LM_CRIT("bogus op: ref %d with cnt %d for dlg %p [%u:%u] "\ "with clid '%.*s' and tags '%.*s' '%.*s'\n",\ (_dlg)->ref, _cnt, _dlg,\ (_dlg)->h_entry, (_dlg)->h_id,\ @@ -556,11 +555,13 @@ void link_dlg(struct dlg_cell *dlg, int n) (_dlg)->tag[DLG_CALLER_LEG].s,\ (_dlg)->tag[DLG_CALLEE_LEG].len,\ (_dlg)->tag[DLG_CALLEE_LEG].s); \ - }\ - if ((_dlg)->ref<=0) { \ - unlink_unsafe_dlg( _d_entry, _dlg);\ - LM_DBG("ref <=0 for dialog %p\n",_dlg);\ - destroy_dlg(_dlg);\ + } else { \ + (_dlg)->ref -= (_cnt); \ + if ((_dlg)->ref<=0) { \ + unlink_unsafe_dlg( _d_entry, _dlg);\ + LM_DBG("ref <=0 for dialog %p\n",_dlg);\ + destroy_dlg(_dlg);\ + }\ }\ }while(0)

13 years, 7 months

git:master: modules/carrieroute: fixed a bug in carrieroute

by Marius Ovidiu Bucur

Module: sip-router Branch: master Commit: f5f934fa55a7938cb85b85e7661d5a9dcc5629c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f5f934f… Author: Marius Bucur <marius.bucur(a)1and1.ro> Committer: Marius Bucur <marius.bucur(a)1and1.ro> Date: Wed May 11 13:43:08 2011 +0300 modules/carrieroute: fixed a bug in carrieroute the bug caused carrieroute to crash when an invalid SIP message is received (e.g. with no callid) --- modules/carrierroute/cr_func.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index 714a130..1006228 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -437,7 +437,7 @@ static int rewrite_on_rule(struct route_flags *rf_head, flag_t flags, str * dest } break; case alg_crc32_nofallback: - if ((prob = (hash_func(msg, hash_source, rf->max_targets) + 1)) < 0) { + if ((prob = (hash_func(msg, hash_source, rf->max_targets))) < 0) { LM_ERR("could not hash message with CRC32"); return -1; } @@ -445,7 +445,7 @@ static int rewrite_on_rule(struct route_flags *rf_head, flag_t flags, str * dest * this function just tries only a backup rule and otherwise * returns -1. This way we get an error */ - if ((rr = get_rule_by_hash(rf, prob)) == NULL) { + if ((rr = get_rule_by_hash(rf, prob + 1)) == NULL) { LM_CRIT("no route found\n"); return -1; }

13 years, 7 months

git:3.1: modules/carrieroute: fixed a bug in carrieroute

by Marius Ovidiu Bucur

Module: sip-router Branch: 3.1 Commit: ea8430ddb32e2f45f29362a97ffed2fee011f6a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea8430d… Author: Marius Bucur <marius.bucur(a)1and1.ro> Committer: Marius Bucur <marius.bucur(a)1and1.ro> Date: Wed May 11 13:43:08 2011 +0300 modules/carrieroute: fixed a bug in carrieroute the bug caused carrieroute to crash when an invalid SIP message is received (e.g. with no callid) --- modules/carrierroute/cr_func.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index 714a130..1006228 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -437,7 +437,7 @@ static int rewrite_on_rule(struct route_flags *rf_head, flag_t flags, str * dest } break; case alg_crc32_nofallback: - if ((prob = (hash_func(msg, hash_source, rf->max_targets) + 1)) < 0) { + if ((prob = (hash_func(msg, hash_source, rf->max_targets))) < 0) { LM_ERR("could not hash message with CRC32"); return -1; } @@ -445,7 +445,7 @@ static int rewrite_on_rule(struct route_flags *rf_head, flag_t flags, str * dest * this function just tries only a backup rule and otherwise * returns -1. This way we get an error */ - if ((rr = get_rule_by_hash(rf, prob)) == NULL) { + if ((rr = get_rule_by_hash(rf, prob + 1)) == NULL) { LM_CRIT("no route found\n"); return -1; }

13 years, 7 months

[tracker] Comment added: Segfault parsing STUN body (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#129 - Segfault parsing STUN body User who did this - Francesco Castellano (fcastellano) ---------- Hi Andrei, even if I cannot put the patches directly on our production system; I finally succeeded to reproduce the crash through a handycrafted STUN packet. After the patches being added no new crash happened (and correct STUN dialogs continue to work). In attachment the packet I used for the tests (sending it to the sip-router STUN server via "nc -v -q 2 -u SIP_PROXY_HOST SIP_PROXY_PORT < stun.pkt"). Best regards, Francesco Castellano ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=129#comment213 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

13 years, 7 months

[tracker] Comment added: Segfault parsing STUN body (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#129 - Segfault parsing STUN body User who did this - Francesco Castellano (fcastellano) ---------- Hi Andrei, even if I cannot put the patches directly on our production system; I finally succeeded to reproduce the crash through a handycrafted STUN packet. After the patches being added no new crash happened (and correct STUN dialogs continue to work). In attachment the packet I used for the tests (sending it to the sip-router STUN server via "nc -v -q 2 -u SIP_PROXY_HOST SIP_PROXY_PORT < stun.pkt"). Best regards, Francesco Castellano ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=129#comment212 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

13 years, 7 months

git:master: modules_k/siputils: added set_uri_host script function

by Juha Heinanen

Module: sip-router Branch: master Commit: 6d894662c42d976d011a79947b677497a41fe337 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d89466… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue May 10 09:50:14 2011 +0300 modules_k/siputils: added set_uri_host script function --- modules_k/siputils/README | 49 ++++++++++++------ modules_k/siputils/checks.c | 81 +++++++++++++++++++++++++++++ modules_k/siputils/checks.h | 5 ++ modules_k/siputils/doc/siputils_admin.xml | 26 +++++++++- modules_k/siputils/siputils.c | 2 + 5 files changed, 145 insertions(+), 18 deletions(-) diff --git a/modules_k/siputils/README b/modules_k/siputils/README index 8dd3963..ccb849e 100644 --- a/modules_k/siputils/README +++ b/modules_k/siputils/README @@ -91,8 +91,9 @@ Gabriel Vasile 4.18. append_rpid_hf(prefix, suffix) 4.19. is_rpid_user_e164() 4.20. set_uri_user(uri, user) - 4.21. is_request() - 4.22. is_reply() + 4.21. set_uri_host(uri, host) + 4.22. is_request() + 4.23. is_reply() List of Examples @@ -125,8 +126,9 @@ Gabriel Vasile 1.27. append_rpid_hf(prefix, suffix) usage 1.28. is_rpid_user_e164 usage 1.29. set_uri_user usage - 1.30. is_request usage - 1.31. is_reply usage + 1.30. set_uri_host usage + 1.31. is_request usage + 1.32. is_reply usage Chapter 1. Admin Guide @@ -172,8 +174,9 @@ Chapter 1. Admin Guide 4.18. append_rpid_hf(prefix, suffix) 4.19. is_rpid_user_e164() 4.20. set_uri_user(uri, user) - 4.21. is_request() - 4.22. is_reply() + 4.21. set_uri_host(uri, host) + 4.22. is_request() + 4.23. is_reply() 1. Overview @@ -368,8 +371,9 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") 4.18. append_rpid_hf(prefix, suffix) 4.19. is_rpid_user_e164() 4.20. set_uri_user(uri, user) - 4.21. is_request() - 4.22. is_reply() + 4.21. set_uri_host(uri, host) + 4.22. is_request() + 4.23. is_reply() 4.1. ring_insert_callid() @@ -732,11 +736,10 @@ if (is_rpid_user_e164()) { 4.20. set_uri_user(uri, user) - Sets userpart of SIP URI stored in writable pseudo variable uri to - value of pseudo variable user. + Sets userpart of SIP URI stored in writable pseudo variable 'uri' to + value of pseudo variable 'user'. - This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, - FAILURE_ROUTE, and ONREPLY_ROUTE. + This function can be used from ANY_ROUTE. Example 1.29. set_uri_user usage ... @@ -745,26 +748,40 @@ $var(user) = "new_user"; set_uri_user("$var(uri)", "$var(user)"); ... -4.21. is_request() +4.21. set_uri_host(uri, host) + + Sets hostpart of SIP URI stored in writable pseudo variable 'uri' to + value of pseudo variable 'host'. + + This function can be used from ANY_ROUTE. + + Example 1.30. set_uri_host usage +... +$var(uri) = "sip:user@host"; +$var(host) = "new_host"; +set_uri_host("$var(uri)", "$var(host)"); +... + +4.22. is_request() Return true if the SIP message is a request. This function can be used from ANY_ROUTE. - Example 1.30. is_request usage + Example 1.31. is_request usage ... if (is_request()) { ... } ... -4.22. is_reply() +4.23. is_reply() Return true if the SIP message is a reply. This function can be used from ANY_ROUTE. - Example 1.31. is_reply usage + Example 1.32. is_reply usage ... if (is_reply()) { ... diff --git a/modules_k/siputils/checks.c b/modules_k/siputils/checks.c index 83341a4..6ccac04 100644 --- a/modules_k/siputils/checks.c +++ b/modules_k/siputils/checks.c @@ -583,3 +583,84 @@ int set_uri_user(struct sip_msg* _m, char* _uri, char* _value) return 1; } + +/* + * Set hostpart of URI + */ +int set_uri_host(struct sip_msg* _m, char* _uri, char* _value) +{ + pv_spec_t *uri_pv, *value_pv; + pv_value_t uri_val, value_val, res_val; + str uri, value; + char *at, *colon, *c, *next; + unsigned int host_len; + char new_uri[MAX_URI_SIZE + 1]; + + uri_pv = (pv_spec_t *)_uri; + if (uri_pv && (pv_get_spec_value(_m, uri_pv, &uri_val) == 0)) { + if (uri_val.flags & PV_VAL_STR) { + if (uri_val.rs.len == 0 || uri_val.rs.s == NULL) { + LM_ERR("missing uri value\n"); + return -1; + } + } else { + LM_ERR("uri value is not string\n"); + return -1; + } + } else { + LM_ERR("failed to get uri value\n"); + return -1; + } + uri = uri_val.rs; + + value_pv = (pv_spec_t *)_value; + if (value_pv && (pv_get_spec_value(_m, value_pv, &value_val) == 0)) { + if (value_val.flags & PV_VAL_STR) { + if (value_val.rs.s == NULL) { + LM_ERR("missing uri value\n"); + return -1; + } + } else { + LM_ERR("uri value is not string\n"); + return -1; + } + } else { + LM_ERR("failed to get uri value\n"); + return -1; + } + value = value_val.rs; + + if (value.len == 0) { + LM_ERR("hostpart of uri cannot be empty\n"); + return -1; + } + if (uri.len + value.len > MAX_URI_SIZE) { + LM_ERR("resulting uri would be too large\n"); + return -1; + } + + colon = strchr(uri.s, ':'); + if (colon == NULL) { + LM_ERR("uri does not contain ':' character\n"); + return -1; + } + c = &(new_uri[0]); + at = strchr(colon + 1, '@'); + if (at == NULL) { + next = colon + 1; + } else { + next = at + 1; + } + append_str(c, uri.s, next - uri.s); + host_len = strcspn(next, ":;?"); + append_str(c, value.s, value.len); + strcpy(c, next + host_len); + res_val.rs.len = uri.len + value.len - host_len; + res_val.rs.s = &(new_uri[0]); + + LM_DBG("resulting uri: %.*s\n", res_val.rs.len, res_val.rs.s); + res_val.flags = PV_VAL_STR; + uri_pv->setf(_m, &uri_pv->pvp, (int)EQ_T, &res_val); + + return 1; +} diff --git a/modules_k/siputils/checks.h b/modules_k/siputils/checks.h index 42a79e3..706e54b 100644 --- a/modules_k/siputils/checks.h +++ b/modules_k/siputils/checks.h @@ -97,6 +97,11 @@ int is_e164(struct sip_msg* _m, char* _sp, char* _s2); int set_uri_user(struct sip_msg* _m, char* _uri, char* _value); /* + * Set hostpart of URI + */ +int set_uri_host(struct sip_msg* _m, char* _uri, char* _value); + +/* * Return true (1) if SIP message is request, otherwise false (-1) */ int w_is_request(struct sip_msg* msg, char *foo, char *bar); diff --git a/modules_k/siputils/doc/siputils_admin.xml b/modules_k/siputils/doc/siputils_admin.xml index 323a55f..f479d66 100644 --- a/modules_k/siputils/doc/siputils_admin.xml +++ b/modules_k/siputils/doc/siputils_admin.xml @@ -850,10 +850,10 @@ if (is_rpid_user_e164()) { </title> <para> Sets userpart of SIP URI stored in writable pseudo variable - uri to value of pseudo variable user. + 'uri' to value of pseudo variable 'user'. </para> <para> - This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, FAILURE_ROUTE, and ONREPLY_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title>set_uri_user usage</title> @@ -868,6 +868,28 @@ set_uri_user("$var(uri)", "$var(user)"); </section> <section> <title> + <function moreinfo="none">set_uri_host(uri, host)</function> + </title> + <para> + Sets hostpart of SIP URI stored in writable pseudo variable + 'uri' to value of pseudo variable 'host'. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title>set_uri_host usage</title> + <programlisting format="linespecific"> +... +$var(uri) = "sip:user@host"; +$var(host) = "new_host"; +set_uri_host("$var(uri)", "$var(host)"); +... +</programlisting> + </example> + </section> + <section> + <title> <function moreinfo="none">is_request()</function> </title> <para> diff --git a/modules_k/siputils/siputils.c b/modules_k/siputils/siputils.c index e018b14..e50fa3d 100644 --- a/modules_k/siputils/siputils.c +++ b/modules_k/siputils/siputils.c @@ -152,6 +152,8 @@ static cmd_export_t cmds[]={ 0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, {"set_uri_user", (cmd_function)set_uri_user, 2, fixup_set_uri, fixup_free_set_uri, ANY_ROUTE}, + {"set_uri_host", (cmd_function)set_uri_host, 2, fixup_set_uri, + fixup_free_set_uri, ANY_ROUTE}, {"bind_siputils", (cmd_function)bind_siputils, 0, 0, 0, 0}, {"is_request", (cmd_function)w_is_request, 0, 0,

13 years, 7 months

git:master: htable: new attribute 'initval' to hash table definition

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ac3c5a8087f88f5bf1609fd2000801abc37a153e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac3c5a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 30 19:06:21 2011 +0200 htable: new attribute 'initval' to hash table definition - initval can set init integer value for hash table keys, meaning that if the key is not set, the init value is returned by $sht(htable=>key) - useful for hash tables holding counters - the value can default to 0, avoiding extra check for $null value --- modules_k/htable/ht_api.c | 19 +++++++++++++++++-- modules_k/htable/ht_api.h | 5 ++++- modules_k/htable/ht_var.c | 4 ++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/modules_k/htable/ht_api.c b/modules_k/htable/ht_api.c index 31f8543..23bc59e 100644 --- a/modules_k/htable/ht_api.c +++ b/modules_k/htable/ht_api.c @@ -215,7 +215,8 @@ ht_t* ht_get_table(str *name) return NULL; } -int ht_add_table(str *name, int autoexp, str *dbtable, int size, int dbmode) +int ht_add_table(str *name, int autoexp, str *dbtable, int size, int dbmode, + int itype, int_str *ival) { unsigned int htid; ht_t *ht; @@ -254,6 +255,9 @@ int ht_add_table(str *name, int autoexp, str *dbtable, int size, int dbmode) if(dbtable!=NULL && dbtable->len>0) ht->dbtable = *dbtable; ht->dbmode = dbmode; + ht->flags = itype; + if(ival!=NULL) + ht->initval = *ival; ht->next = _ht_root; _ht_root = ht; @@ -605,6 +609,8 @@ int ht_table_spec(char *spec) str in; str tok; param_t *pit=NULL; + int_str ival; + int itype; if(!shm_initialized()) { @@ -620,6 +626,8 @@ int ht_table_spec(char *spec) return -1; } name = kval.key; + itype = PV_VAL_NONE; + memset(&ival, 0, sizeof(int_str)); for (pit = kval.u.params; pit; pit=pit->next) { @@ -643,10 +651,17 @@ int ht_table_spec(char *spec) goto error; LM_DBG("htable [%.*s] - dbmode [%u]\n", name.len, name.s, dbmode); + } else if(pit->name.len==7 && strncmp(pit->name.s, "initval", 7)==0) { + if(str2sint(&tok, &ival.n)!=0) + goto error; + itype = PV_VAL_INT; + LM_DBG("htable [%.*s] - initval [%d]\n", name.len, name.s, + ival.n); } else { goto error; } } - return ht_add_table(&name, autoexpire, &dbtable, size, dbmode); + return ht_add_table(&name, autoexpire, &dbtable, size, dbmode, + itype, &ival); error: LM_ERR("invalid htable parameter [%.*s]\n", in.len, in.s); diff --git a/modules_k/htable/ht_api.h b/modules_k/htable/ht_api.h index a55e6cd..6a92f29 100644 --- a/modules_k/htable/ht_api.h +++ b/modules_k/htable/ht_api.h @@ -55,6 +55,8 @@ typedef struct _ht unsigned int htexpire; str dbtable; int dbmode; + int flags; + int_str initval; unsigned int htsize; ht_entry_t *entries; struct _ht *next; @@ -66,7 +68,8 @@ typedef struct _ht_pv { pv_elem_t *pve; } ht_pv_t, *ht_pv_p; -int ht_add_table(str *name, int autoexp, str *dbtable, int size, int dbmode); +int ht_add_table(str *name, int autoexp, str *dbtable, int size, int dbmode, + int itype, int_str *ival); int ht_init_tables(void); int ht_destroy(void); int ht_set_cell(ht_t *ht, str *name, int type, int_str *val, int mode); diff --git a/modules_k/htable/ht_var.c b/modules_k/htable/ht_var.c index 03ca66f..0d52254 100644 --- a/modules_k/htable/ht_var.c +++ b/modules_k/htable/ht_var.c @@ -48,7 +48,11 @@ int pv_get_ht_cell(struct sip_msg *msg, pv_param_t *param, } htc = ht_cell_pkg_copy(hpv->ht, &htname, _htc_local); if(htc==NULL) + { + if(hpv->ht->flags==PV_VAL_INT) + return pv_get_sintval(msg, param, res, hpv->ht->initval.n); return pv_get_null(msg, param, res); + } if(_htc_local!=htc) { ht_cell_pkg_free(_htc_local);

13 years, 7 months

git:carstenbock/ims: - extended the API of Record-Route in order to retrieve the routeset and the remote URI (needed for later validation/enforcement of route-sets in requests)

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: a80729125de45d2e147a970315c08df378626f64 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a807291… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Mon May 9 13:55:16 2011 +0200 - extended the API of Record-Route in order to retrieve the routeset and the remote URI (needed for later validation/enforcement of route-sets in requests) --- modules_k/rr/api.c | 3 + modules_k/rr/api.h | 10 ++++ modules_k/rr/loose.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++- modules_k/rr/loose.h | 19 ++++++++ 4 files changed, 151 insertions(+), 1 deletions(-) diff --git a/modules_k/rr/api.c b/modules_k/rr/api.c index 55af538..0835b72 100644 --- a/modules_k/rr/api.c +++ b/modules_k/rr/api.c @@ -64,6 +64,9 @@ int load_rr( struct rr_binds *rrb ) rrb->get_route_param = get_route_param; rrb->register_rrcb = register_rrcb; rrb->append_fromtag = append_fromtag; + rrb->get_remoteuri = get_remoteuri; + rrb->get_routeset = get_routeset; + rrb->rr_type = rr_type; return 1; } diff --git a/modules_k/rr/api.h b/modules_k/rr/api.h index 09c9a4e..91da2ea 100644 --- a/modules_k/rr/api.h +++ b/modules_k/rr/api.h @@ -46,12 +46,19 @@ #include "loose.h" #include "rr_cb.h" +#define RR_TYPE_STRICT_LOOSE (1<<1) +#define RR_TYPE_STRICT_STRICT (1<<2) +#define RR_TYPE_LOOSE_LOOSE (1<<3) +#define RR_TYPE_LOOSE_STRICT (1<<4) + typedef int (*add_rr_param_t)(struct sip_msg*, str*); typedef int (*check_route_param_t)(struct sip_msg*, regex_t*); typedef int (*is_direction_t)(struct sip_msg*, int); typedef int (*get_route_param_t)(struct sip_msg*, str*, str*); typedef int (*record_route_f)(struct sip_msg*, str*); typedef int (*loose_route_f)(struct sip_msg*); +typedef str* (*get_remoteuri_t)(struct sip_msg*); +typedef str* (*get_routeset_t)(struct sip_msg*, int *nr_routes); /*! record-route API export binding */ typedef struct rr_binds { @@ -63,6 +70,9 @@ typedef struct rr_binds { get_route_param_t get_route_param; register_rrcb_t register_rrcb; int append_fromtag; + get_remoteuri_t get_remoteuri; + get_routeset_t get_routeset; + int rr_type; } rr_api_t; typedef int (*load_rr_f)( struct rr_binds* ); diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index 9cf1ef9..5d0fccf 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -43,6 +43,7 @@ #include "loose.h" #include "rr_cb.h" #include "rr_mod.h" +#include "api.h" #define RR_ERROR -1 /*!< An error occured while processing route set */ @@ -639,6 +640,8 @@ static inline int after_strict(struct sip_msg* _m) if (is_strict(&puri.params)) { LM_DBG("Next hop: '%.*s' is strict router\n", uri.len, ZSW(uri.s)); + rr_type = RR_TYPE_STRICT_STRICT; + /* Previous hop was a strict router and the next hop is strict * router too. There is no need to save R-URI again because it * is saved already. In fact, in this case we will behave exactly @@ -671,6 +674,7 @@ static inline int after_strict(struct sip_msg* _m) } else { LM_DBG("Next hop: '%.*s' is loose router\n", uri.len, ZSW(uri.s)); + rr_type = RR_TYPE_STRICT_LOOSE; if(get_maddr_uri(&uri, &puri)!=0) { LM_ERR("failed to check maddr\n"); @@ -800,6 +804,9 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) if (res > 0) { /* No next route found */ LM_DBG("No next URI found\n"); status = (preloaded ? NOT_RR_DRIVEN : RR_DRIVEN); + + rr_type = RR_TYPE_LOOSE_LOOSE; + goto done; } rt = (rr_t*)hdr->parsed; @@ -835,6 +842,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) if (res > 0) { /* No next route found */ LM_DBG("no next URI found\n"); status = (preloaded ? NOT_RR_DRIVEN : RR_DRIVEN); + rr_type = RR_TYPE_LOOSE_LOOSE; goto done; } rt = (rr_t*)hdr->parsed; @@ -858,6 +866,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) LM_DBG("URI to be processed: '%.*s'\n", uri.len, ZSW(uri.s)); if (is_strict(&puri.params)) { LM_DBG("Next URI is a strict router\n"); + rr_type = RR_TYPE_LOOSE_STRICT; if (handle_sr(_m, hdr, rt) < 0) { LM_ERR("failed to handle strict router\n"); return RR_ERROR; @@ -865,7 +874,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } else { /* Next hop is loose router */ LM_DBG("Next URI is a loose router\n"); - + rr_type = RR_TYPE_LOOSE_LOOSE; if(get_maddr_uri(&uri, &puri)!=0) { LM_ERR("checking maddr failed\n"); return RR_ERROR; @@ -905,6 +914,7 @@ done: int loose_route(struct sip_msg* _m) { int ret; + rr_type = 0; if (find_first_route(_m) != 0) { LM_DBG("There is no Route HF\n"); @@ -1133,3 +1143,111 @@ upstream: last_dir = RR_FLOW_UPSTREAM; return (dir==RR_FLOW_UPSTREAM)?0:-1; } + +/*! + * \brief Gets the URI of the remote destination, based on the route-set. + * + * \param msg - request that will have the Route header parameter searched + * \return A str with the URI of the remote target. + */ +str* get_remoteuri(struct sip_msg *msg) { + int res; + struct hdr_field *hdr; + rr_t *rt,*prev; + str *uri; + + if (msg == NULL) { + LM_ERR("No SIP-Message, internal error?!?!\n"); + return NULL; + } + /* If we are a loose-router, + we find the Remote URI in the Request URI. */ + if ((rr_type == RR_TYPE_LOOSE_LOOSE) + || (rr_type == RR_TYPE_LOOSE_STRICT)) { + return &msg->first_line.u.request.uri; + } else if (rr_type == RR_TYPE_STRICT_LOOSE) { + /* We are a strict router, so the loose_route() sets the + new URI from the previous strict routing. */ + return &msg->new_uri; + } else if (rr_type == RR_TYPE_STRICT_STRICT) { + res = find_rem_target(msg, &hdr, &rt, &prev); + if (res < 0) { + /* Failed to find the last route-target */ + LM_ERR("Failed to find the last route-target\n"); + return NULL; + } else if (res > 0) { + /* No remote target found */ + LM_ERR("No remote target found!\n"); + return NULL; + } + uri = &rt->nameaddr.uri; + if(get_maddr_uri(uri, 0)!=0) { + LM_ERR("failed to check maddr\n"); + return 0; + } + return uri; + } else { + LM_ERR("Unknown / invalid routing type %d\n", rr_type); + return 0; + } +} + +/*! + * \brief Returns a list of the URI's from the route-headers + * + * \param msg - request that will have the Route header parameter searched + * \return An array of str with the URI of the next hops. + */ +#define MAX_HDRS 32 +str* get_routeset(struct sip_msg *msg,int *nr_routes) { + /* The destination, where the URI's are stored */ + static str uris[MAX_HDRS]; + /* Iterator for all record-route headers */ + struct hdr_field *hdr; + /* The parsed route-header structure */ + rr_t * rr; + + if (msg == NULL || msg->route == NULL) { + LM_ERR("No SIP-Message or no route-headers!\n"); + return NULL; + } + + if (!nr_routes) { + LM_ERR("nr_routes parameter is invalid!\n"); + return NULL; + } + *nr_routes = 0; + + if ((rr_type == RR_TYPE_STRICT_STRICT) + || (rr_type == RR_TYPE_LOOSE_STRICT)) { + /* must manually insert RURI, as it was part + * of the route deleted to make up for strict routing */ + uris[(*nr_routes)++] = msg->new_uri; + } + + hdr = msg->route; + while (hdr != NULL) { + if (parse_rr(hdr) < 0) { + LM_ERR("Invalid Route-Header, failed to parse\n"); + return NULL; + } + /* Get the parsed content of the route-header */ + rr = (rr_t*)hdr->parsed; + while (rr) { + uris[(*nr_routes)++] = rr->nameaddr.uri; + if(*nr_routes==MAX_HDRS) { + LM_ERR("Too many route-headers!!!\n"); + return 0; + } + rr = rr->next; + } + hdr = hdr->next; + } + + + /* if SS - remove last route */ + if (rr_type == RR_TYPE_STRICT_STRICT) + (*nr_routes)--; + + return uris; +} diff --git a/modules_k/rr/loose.h b/modules_k/rr/loose.h index 6b1bdc9..31157d1 100644 --- a/modules_k/rr/loose.h +++ b/modules_k/rr/loose.h @@ -38,6 +38,10 @@ #define RR_FLOW_DOWNSTREAM (1<<0) #define RR_FLOW_UPSTREAM (1<<1) +/*! + * \brief Next-Hop is a strict or loose-router? + */ +int rr_type; /*! * \brief Do loose routing as per RFC3261 @@ -92,5 +96,20 @@ int is_direction(struct sip_msg *msg, int dir); */ int get_route_param( struct sip_msg *msg, str *name, str *val); +/*! + * \brief Gets the URI of the remote destination, based on the route-set. + * + * \param msg - request that will have the Route header parameter searched + * \return A str with the URI of the remote target. + */ +str* get_remoteuri(struct sip_msg *msg); + +/*! + * \brief Returns a list of the URI's from the route-headers + * + * \param msg - request that will have the Route header parameter searched + * \return An array of str with the URI of the next hops. + */ +str* get_routeset(struct sip_msg *msg, int *nr_routes); #endif /* LOOSE_H */

13 years, 7 months

git:3.1: pkg: deb lib dir name is set by variable LIBDIR

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 41e576663d1826fd94106d8aa1b8aff0fc7104ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41e5766… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 6 06:42:51 2011 +0200 pkg: deb lib dir name is set by variable LIBDIR - fixes the check for duplicate libs to variants of deb distros - reported in FS#130 and FS#128 (cherry picked from commit 807b73d8a242ae12f93564b024baaa38dce89c8e) --- pkg/kamailio/deb/lenny/rules | 15 +++++++++------ pkg/kamailio/deb/lucid/rules | 15 +++++++++------ pkg/kamailio/deb/squeeze/rules | 15 +++++++++------ 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/pkg/kamailio/deb/lenny/rules b/pkg/kamailio/deb/lenny/rules index d9ec443..38066c0 100755 --- a/pkg/kamailio/deb/lenny/rules +++ b/pkg/kamailio/deb/lenny/rules @@ -44,10 +44,13 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ snmpstats carrierroute xmpp cpl lua python +# name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) +LIBDIR ?= lib + # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/$(LIBDIR)/kamailio \ + $(CURDIR)/debian/kamailio-db-modules/usr/$(LIBDIR)/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP))) @@ -80,10 +83,10 @@ define PACKAGE_GRP_INSTALL_template doc-dir=share/doc/kamailio-$(grp)-modules # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) @@ -98,10 +101,10 @@ define PACKAGE_MODULE_INSTALL_template doc-dir=share/doc/kamailio-$(call mod_name,$(mod))-module # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) diff --git a/pkg/kamailio/deb/lucid/rules b/pkg/kamailio/deb/lucid/rules index fbaccf6..30feea7 100755 --- a/pkg/kamailio/deb/lucid/rules +++ b/pkg/kamailio/deb/lucid/rules @@ -44,10 +44,13 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ snmpstats carrierroute xmpp cpl lua python geoip +# name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) +LIBDIR ?= lib + # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/$(LIBDIR)/kamailio \ + $(CURDIR)/debian/kamailio-db-modules/usr/$(LIBDIR)/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP))) @@ -80,10 +83,10 @@ define PACKAGE_GRP_INSTALL_template doc-dir=share/doc/kamailio-$(grp)-modules # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) @@ -98,10 +101,10 @@ define PACKAGE_MODULE_INSTALL_template doc-dir=share/doc/kamailio-$(call mod_name,$(mod))-module # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index a64793a..0f2e2a5 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -44,10 +44,13 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils geoip memcached tls \ snmpstats carrierroute xmpp cpl lua python +# name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) +LIBDIR ?= lib + # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/$(LIBDIR)/kamailio \ + $(CURDIR)/debian/kamailio-db-modules/usr/$(LIBDIR)/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP))) @@ -80,10 +83,10 @@ define PACKAGE_GRP_INSTALL_template doc-dir=share/doc/kamailio-$(grp)-modules # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) @@ -98,10 +101,10 @@ define PACKAGE_MODULE_INSTALL_template doc-dir=share/doc/kamailio-$(call mod_name,$(mod))-module # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done )

13 years, 7 months

← Newer
1
...
10
11
12
13
14
15
16
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2011