sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
298 discussions

git:master: modules/utils: updated xcap table version to match schema

by Juha Heinanen

Module: sip-router Branch: master Commit: 442413cc843bd14e6cc8378fb430d4dd1036a5c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=442413c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Sep 14 09:49:30 2011 +0300 modules/utils: updated xcap table version to match schema --- modules/utils/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/utils/utils.c b/modules/utils/utils.c index 86f71ea..b734a69 100644 --- a/modules/utils/utils.c +++ b/modules/utils/utils.c @@ -57,7 +57,7 @@ MODULE_VERSION -#define XCAP_TABLE_VERSION 3 +#define XCAP_TABLE_VERSION 4 /* Module parameter variables */ int http_query_timeout = 4;

13 years, 2 months

git:jh/32plus: modules_k/textops: added documentation of in_list() function .

by Juha Heinanen

Module: sip-router Branch: jh/32plus Commit: aaf46c6b60b7093e97bc21b8730b35bca851be6a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aaf46c6… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Sep 14 09:46:35 2011 +0300 modules_k/textops: added documentation of in_list() function. --- modules_k/textops/README | 56 +++++++++++++++++++++--------- modules_k/textops/doc/textops_admin.xml | 24 +++++++++++++ 2 files changed, 63 insertions(+), 17 deletions(-) diff --git a/modules_k/textops/README b/modules_k/textops/README index b0ccfe4..7210ff5 100644 --- a/modules_k/textops/README +++ b/modules_k/textops/README @@ -73,9 +73,10 @@ Juha Heinanen 3.30. has_body(), has_body(mime) 3.31. is_audio_on_hold() 3.32. is_privacy(privacy_type) - 3.33. cmp_str(str1, str2) - 3.34. cmp_istr(str1, str2) - 3.35. starts_with(str1, str2) + 3.33. in_list(subject, list, separator) + 3.34. cmp_str(str1, str2) + 3.35. cmp_istr(str1, str2) + 3.36. starts_with(str1, str2) 4. Known Limitations @@ -119,9 +120,10 @@ Juha Heinanen 1.30. has_body usage 1.31. is_audio_on_hold usage 1.32. is_privacy usage - 1.33. cmp_str usage + 1.33. in_list() usage 1.34. cmp_str usage - 1.35. starts_with usage + 1.35. cmp_str usage + 1.36. starts_with usage Chapter 1. Admin Guide @@ -170,9 +172,10 @@ Chapter 1. Admin Guide 3.30. has_body(), has_body(mime) 3.31. is_audio_on_hold() 3.32. is_privacy(privacy_type) - 3.33. cmp_str(str1, str2) - 3.34. cmp_istr(str1, str2) - 3.35. starts_with(str1, str2) + 3.33. in_list(subject, list, separator) + 3.34. cmp_str(str1, str2) + 3.35. cmp_istr(str1, str2) + 3.36. starts_with(str1, str2) 4. Known Limitations @@ -244,9 +247,10 @@ From: medabeda 3.30. has_body(), has_body(mime) 3.31. is_audio_on_hold() 3.32. is_privacy(privacy_type) - 3.33. cmp_str(str1, str2) - 3.34. cmp_istr(str1, str2) - 3.35. starts_with(str1, str2) + 3.33. in_list(subject, list, separator) + 3.34. cmp_str(str1, str2) + 3.35. cmp_istr(str1, str2) + 3.36. starts_with(str1, str2) 3.1. search(re) @@ -886,7 +890,25 @@ if(is_privacy("id")) } ... -3.33. cmp_str(str1, str2) +3.33. in_list(subject, list, separator) + + Function checks if subject string is found in list string where list + items are separated by separator string. Subject and list strings may + contain pseudo variables. Separator string needs to be one character + long. Returns 1 if subject is found and -1 otherwise. + + Function can be used from all kinds of routes. + + Example 1.33. in_list() usage +... +$var(subject) = "fi"; +$var(list) = "dk,fi,no,se"; +if (in_list("$var(subject)", "$var(list)", ",") { + xlog("L_INFO", "subject is found in list\n"); +} +... + +3.34. cmp_str(str1, str2) The function returns true if the two parameters matches as string case sensitive comparison. @@ -894,7 +916,7 @@ if(is_privacy("id")) This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE and BRANCH_ROUTE. - Example 1.33. cmp_str usage + Example 1.34. cmp_str usage ... if(cmp_str("$rU", "kamailio")) { @@ -902,7 +924,7 @@ if(cmp_str("$rU", "kamailio")) } ... -3.34. cmp_istr(str1, str2) +3.35. cmp_istr(str1, str2) The function returns true if the two parameters matches as string case insensitive comparison. @@ -910,7 +932,7 @@ if(cmp_str("$rU", "kamailio")) This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE and BRANCH_ROUTE. - Example 1.34. cmp_str usage + Example 1.35. cmp_str usage ... if(cmp_istr("$rU@you", "kamailio@YOU")) { @@ -918,7 +940,7 @@ if(cmp_istr("$rU@you", "kamailio@YOU")) } ... -3.35. starts_with(str1, str2) +3.36. starts_with(str1, str2) The function returns true if the first string starts with the second string. @@ -926,7 +948,7 @@ if(cmp_istr("$rU@you", "kamailio@YOU")) This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE and BRANCH_ROUTE. - Example 1.35. starts_with usage + Example 1.36. starts_with usage ... if (starts_with("$rU", "+358")) { diff --git a/modules_k/textops/doc/textops_admin.xml b/modules_k/textops/doc/textops_admin.xml index 75633a6..fbec64c 100644 --- a/modules_k/textops/doc/textops_admin.xml +++ b/modules_k/textops/doc/textops_admin.xml @@ -1247,6 +1247,30 @@ if(is_privacy("id")) <section> <title> + <function moreinfo="none">in_list(subject, list, separator)</function> + </title> + <para> + Function checks if subject string is found in list string where list items are separated by separator string. Subject and list strings may contain pseudo variables. Separator string needs to be one character long. Returns 1 if subject is found and -1 otherwise. + </para> + <para> + Function can be used from all kinds of routes. + </para> + <example> + <title><function>in_list()</function> usage</title> + <programlisting format="linespecific"> +... +$var(subject) = "fi"; +$var(list) = "dk,fi,no,se"; +if (in_list("$var(subject)", "$var(list)", ",") { + xlog("L_INFO", "subject is found in list\n"); +} +... + </programlisting> + </example> + </section> + + <section> + <title> <function moreinfo="none">cmp_str(str1, str2)</function> </title> <para>

13 years, 2 months

git:jh/32plus: modules/mtree and modules_k/textops: new stuff for release after 3.2

by Juha Heinanen

Module: sip-router Branch: jh/32plus Commit: 1d5937377bd1bab4a2dc423ebdf3bd8515e02755 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d59373… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Sep 14 09:37:53 2011 +0300 modules/mtree and modules_k/textops: new stuff for release after 3.2 - mtree enhancements - new in_list() textops function --- modules/mtree/README | 44 +++++--- modules/mtree/doc/mtree_admin.xml | 28 ++++- modules/mtree/mtree.c | 218 ++++++++++++++++++++++--------------- modules/mtree/mtree.h | 27 +++-- modules/mtree/mtree_mod.c | 27 ++++- modules_k/textops/textops.c | 97 ++++++++++++++++- 6 files changed, 319 insertions(+), 122 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1d5…

13 years, 2 months

[tracker] Task closed: Via parser does not accept any token as transport

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#149 - Via parser does not accept any token as transport User who did this - Iñaki Baz Castillo (ibc) Reason for closing: Implemented Additional comments about closing: Fixed. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=149 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, 2 months

[tracker] Comment added: Via parser does not accept any token as transport

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#149 - Via parser does not accept any token as transport User who did this - Iñaki Baz Castillo (ibc) ---------- Fixed: Branch: master Commit: 4554192745fb4273ad082b65e7453d55fec3c48d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4554192… ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=149#comment274 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, 2 months

[tracker] User took ownership: Via parser does not accept any token as transport

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Iñaki Baz Castillo has taken ownership of the following task: FS#149 - Via parser does not accept any token as transport More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=149 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, 2 months

git:master: [core] Bug fixed in Via parser when \r or \n after Via transport.

by I�aki Baz Castillo

Module: sip-router Branch: master Commit: 4554192745fb4273ad082b65e7453d55fec3c48d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4554192… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Wed Sep 14 00:03:24 2011 +0200 [core] Bug fixed in Via parser when \r or \n after Via transport. --- parser/parse_via.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/parser/parse_via.c b/parser/parse_via.c index 5a50673..5c54e09 100644 --- a/parser/parse_via.c +++ b/parser/parse_via.c @@ -1463,7 +1463,8 @@ parse_again: /* finished proto parsing */ vb->transport.len=tmp-vb->transport.s; vb->proto=PROTO_OTHER; - state=F_HOST; /* start looking for host*/ + state=F_LF; + saved_state=F_HOST; /* start looking for host*/ goto main_via; case FIN_SIP: vb->name.len=tmp-vb->name.s; @@ -1539,7 +1540,8 @@ parse_again: /* finished proto parsing */ vb->transport.len=tmp-vb->transport.s; vb->proto=PROTO_OTHER; - state=F_HOST; /* start looking for host*/ + state=F_CR; + saved_state=F_HOST; goto main_via; case FIN_SIP: vb->name.len=tmp-vb->name.s;

13 years, 2 months

git:master: core: Via parser now allows any token as Via transport field.

by I�aki Baz Castillo

Module: sip-router Branch: master Commit: cf4651db94cc88b6523918faed6d89e8497da2c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf4651d… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Tue Sep 13 23:59:25 2011 +0200 core: Via parser now allows any token as Via transport field. --- ip_addr.c | 2 + ip_addr.h | 4 +- parser/parse_via.c | 265 +++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 267 insertions(+), 4 deletions(-) diff --git a/ip_addr.c b/ip_addr.c index 331bfaa..502b4ea 100644 --- a/ip_addr.c +++ b/ip_addr.c @@ -350,6 +350,8 @@ char* proto2a(enum sip_protos proto) return "tls"; case PROTO_SCTP: return "sctp"; + case PROTO_OTHER: + return "other"; } return "unknown"; } diff --git a/ip_addr.h b/ip_addr.h index d9cbf02..86c2502 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -52,8 +52,8 @@ #include "dprint.h" -enum sip_protos { PROTO_NONE, PROTO_UDP, PROTO_TCP, PROTO_TLS, PROTO_SCTP }; -#define PROTO_LAST PROTO_SCTP +enum sip_protos { PROTO_NONE, PROTO_UDP, PROTO_TCP, PROTO_TLS, PROTO_SCTP, PROTO_OTHER }; +#define PROTO_LAST PROTO_OTHER #ifdef USE_COMP enum comp_methods { COMP_NONE, COMP_SIGCOMP, COMP_SERGZ }; diff --git a/parser/parse_via.c b/parser/parse_via.c index d17df8d..5a50673 100644 --- a/parser/parse_via.c +++ b/parser/parse_via.c @@ -96,6 +96,7 @@ enum { TCP_TLS1, TCP2, FIN_TCP, TLS2, FIN_TLS, SCTP1, SCTP2, SCTP3, FIN_SCTP, + OTHER_PROTO, L_PROTO, F_PROTO }; @@ -1371,6 +1372,25 @@ parse_again: vb->proto=PROTO_SCTP; state=F_HOST; /* start looking for host*/ goto main_via; + case OTHER_PROTO: + /* finished proto parsing */ + vb->transport.len=tmp-vb->transport.s; + vb->proto=PROTO_OTHER; + state=F_HOST; /* start looking for host*/ + goto main_via; + case UDP1: + case UDP2: + case TCP_TLS1: + case TCP2: + case TLS2: + case SCTP1: + case SCTP2: + case SCTP3: + /* finished proto parsing */ + vb->transport.len=tmp-vb->transport.s; + vb->proto=PROTO_OTHER; + state=F_HOST; /* start looking for host*/ + goto main_via; case FIN_SIP: vb->name.len=tmp-vb->name.s; state=L_VER; @@ -1418,6 +1438,33 @@ parse_again: state=F_LF; saved_state=F_HOST; /* start looking for host*/ goto main_via; + case FIN_SCTP: + /* finished proto parsing */ + vb->transport.len=tmp-vb->transport.s; + vb->proto=PROTO_SCTP; + state=F_LF; + saved_state=F_HOST; /* start looking for host*/ + goto main_via; + case OTHER_PROTO: + /* finished proto parsing */ + vb->transport.len=tmp-vb->transport.s; + vb->proto=PROTO_OTHER; + state=F_LF; + saved_state=F_HOST; /* start looking for host*/ + goto main_via; + case UDP1: + case UDP2: + case TCP_TLS1: + case TCP2: + case TLS2: + case SCTP1: + case SCTP2: + case SCTP3: + /* finished proto parsing */ + vb->transport.len=tmp-vb->transport.s; + vb->proto=PROTO_OTHER; + state=F_HOST; /* start looking for host*/ + goto main_via; case FIN_SIP: vb->name.len=tmp-vb->name.s; state=F_LF; @@ -1469,6 +1516,31 @@ parse_again: state=F_CR; saved_state=F_HOST; goto main_via; + case FIN_SCTP: + vb->transport.len=tmp-vb->transport.s; + vb->proto=PROTO_SCTP; + state=F_CR; + saved_state=F_HOST; + goto main_via; + case OTHER_PROTO: + vb->transport.len=tmp-vb->transport.s; + vb->proto=PROTO_OTHER; + state=F_CR; + saved_state=F_HOST; + goto main_via; + case UDP1: + case UDP2: + case TCP_TLS1: + case TCP2: + case TLS2: + case SCTP1: + case SCTP2: + case SCTP3: + /* finished proto parsing */ + vb->transport.len=tmp-vb->transport.s; + vb->proto=PROTO_OTHER; + state=F_HOST; /* start looking for host*/ + goto main_via; case FIN_SIP: vb->name.len=tmp-vb->name.s; state=F_CR; @@ -1528,6 +1600,21 @@ parse_again: state=SCTP1; vb->transport.s=tmp; break; + case OTHER_PROTO: + break; + case UDP1: + case UDP2: + case FIN_UDP: + case TCP_TLS1: + case TCP2: + case FIN_TCP: + case FIN_TLS: + case SCTP1: + case SCTP2: + case SCTP3: + case FIN_SCTP: + state=OTHER_PROTO; + break; default: LOG(L_ERR, "ERROR: parse_via: bad char <%c> on" " state %d\n", *tmp, state); @@ -1540,6 +1627,22 @@ parse_again: case SIP1: state=SIP2; break; + case OTHER_PROTO: + break; + case UDP1: + case UDP2: + case FIN_UDP: + case TCP_TLS1: + case TCP2: + case FIN_TCP: + case TLS2: + case FIN_TLS: + case SCTP1: + case SCTP2: + case SCTP3: + case FIN_SCTP: + state=OTHER_PROTO; + break; default: LOG(L_ERR, "ERROR: parse_via: bad char <%c> on" " state %d\n", *tmp, state); @@ -1562,6 +1665,19 @@ parse_again: case SCTP3: state=FIN_SCTP; break; + case OTHER_PROTO: + break; + case UDP1: + case FIN_UDP: + case TCP_TLS1: + case FIN_TCP: + case TLS2: + case FIN_TLS: + case SCTP1: + case SCTP2: + case FIN_SCTP: + state=OTHER_PROTO; + break; default: LOG(L_ERR, "ERROR: parse_via: bad char <%c> on" " state %d\n", *tmp, state); @@ -1575,6 +1691,22 @@ parse_again: state=UDP1; vb->transport.s=tmp; break; + case OTHER_PROTO: + break; + case UDP1: + case UDP2: + case FIN_UDP: + case TCP_TLS1: + case TCP2: + case FIN_TCP: + case TLS2: + case FIN_TLS: + case SCTP1: + case SCTP2: + case SCTP3: + case FIN_SCTP: + state=OTHER_PROTO; + break; default: LOG(L_ERR, "ERROR: parse_via: bad char <%c> on" " state %d\n", *tmp, state); @@ -1587,6 +1719,21 @@ parse_again: case UDP1: state=UDP2; break; + case OTHER_PROTO: + break; + case UDP2: + case FIN_UDP: + case TCP_TLS1: + case TCP2: + case FIN_TCP: + case TLS2: + case FIN_TLS: + case SCTP1: + case SCTP2: + case SCTP3: + case FIN_SCTP: + state=OTHER_PROTO; + break; default: LOG(L_ERR, "ERROR: parse_via: bad char <%c> on" " state %d\n", *tmp, state); @@ -1603,6 +1750,21 @@ parse_again: case SCTP2: state=SCTP3; break; + case OTHER_PROTO: + break; + case UDP1: + case UDP2: + case FIN_UDP: + case TCP_TLS1: + case TCP2: + case FIN_TCP: + case TLS2: + case FIN_TLS: + case SCTP1: + case SCTP3: + case FIN_SCTP: + state=OTHER_PROTO; + break; default: LOG(L_ERR, "ERROR: parse_via: bad char <%c> on" " state %d\n", *tmp, state); @@ -1618,6 +1780,20 @@ parse_again: case SCTP1: state=SCTP2; break; + case OTHER_PROTO: + break; + case UDP1: + case UDP2: + case FIN_UDP: + case TCP2: + case FIN_TCP: + case TLS2: + case FIN_TLS: + case SCTP2: + case SCTP3: + case FIN_SCTP: + state=OTHER_PROTO; + break; default: LOG(L_ERR, "ERROR: parse_via: bad char <%c> on" " state %d\n", *tmp, state); @@ -1630,6 +1806,21 @@ parse_again: case TCP_TLS1: state=TLS2; break; + case OTHER_PROTO: + break; + case UDP1: + case UDP2: + case FIN_UDP: + case TCP2: + case FIN_TCP: + case TLS2: + case FIN_TLS: + case SCTP1: + case SCTP2: + case SCTP3: + case FIN_SCTP: + state=OTHER_PROTO; + break; default: LOG(L_ERR, "ERROR: parse_via: bad char <%c> on" " state %d\n", *tmp, state); @@ -1643,6 +1834,22 @@ parse_again: state=VER1; vb->version.s=tmp; break; + case OTHER_PROTO: + break; + case UDP1: + case UDP2: + case FIN_UDP: + case TCP_TLS1: + case TCP2: + case FIN_TCP: + case TLS2: + case FIN_TLS: + case SCTP1: + case SCTP2: + case SCTP3: + case FIN_SCTP: + state=OTHER_PROTO; + break; default: LOG(L_ERR, "ERROR: parse_via: bad char <%c> on" " state %d\n", *tmp, state); @@ -1654,6 +1861,22 @@ parse_again: case VER1: state=VER2; break; + case OTHER_PROTO: + break; + case UDP1: + case UDP2: + case FIN_UDP: + case TCP_TLS1: + case TCP2: + case FIN_TCP: + case TLS2: + case FIN_TLS: + case SCTP1: + case SCTP2: + case SCTP3: + case FIN_SCTP: + state=OTHER_PROTO; + break; default: LOG(L_ERR, "ERROR: parse_via: bad char <%c> on" " state %d\n", *tmp, state); @@ -1665,17 +1888,55 @@ parse_again: case VER2: state=FIN_VER; break; + case OTHER_PROTO: + break; + case UDP1: + case UDP2: + case FIN_UDP: + case TCP_TLS1: + case TCP2: + case FIN_TCP: + case TLS2: + case FIN_TLS: + case SCTP1: + case SCTP2: + case SCTP3: + case FIN_SCTP: + state=OTHER_PROTO; + break; default: LOG(L_ERR, "ERROR: parse_via: bad char <%c> on" " state %d\n", *tmp, state); goto error; } break; - default: + switch(state){ + case F_PROTO: + state=OTHER_PROTO; + vb->transport.s=tmp; + break; + case OTHER_PROTO: + break; + case UDP1: + case UDP2: + case FIN_UDP: + case TCP_TLS1: + case TCP2: + case FIN_TCP: + case TLS2: + case FIN_TLS: + case SCTP1: + case SCTP2: + case SCTP3: + case FIN_SCTP: + state=OTHER_PROTO; + break; + default: LOG(L_ERR, "ERROR: parse_via: bad char <%c> on" - " state %d\n", *tmp, state); + " state %d\n", *tmp, state); goto error; + } break; } } /* for tmp*/

13 years, 2 months

git:3.1: sctp: update the cfg before handling notifications

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 39387157697847f6cb87531956a9da7c3c4e530d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3938715… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 2 10:22:35 2011 +0200 sctp: update the cfg before handling notifications Update the local config immediately after successfully reading a message (before processing notifications, since some of the notifications processing makes use of cfg values). (cherry picked from commit 5813703a7931f288b95840b9a93c628773c33a03) --- sctp_server.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sctp_server.c b/sctp_server.c index cfd7015..fbe83ea 100644 --- a/sctp_server.c +++ b/sctp_server.c @@ -2460,6 +2460,9 @@ int sctp_rcv_loop() continue; /* goto skip;*/ else goto error; } + /* update the local config */ + cfg_update(); + if (unlikely(msg.msg_flags & MSG_NOTIFICATION)){ /* intercept useful notifications */ sctp_handle_notification(bind_address, &ri.src_su, buf, len); @@ -2518,8 +2521,6 @@ int sctp_rcv_loop() #ifdef USE_COMP ri.comp=COMP_NONE; #endif - /* update the local config */ - cfg_update(); #ifdef SCTP_CONN_REUSE if (likely(cfg_get(sctp, sctp_cfg, assoc_tracking) && sinfo)){ ri.proto_reserved1 = sctp_con_track(sinfo->sinfo_assoc_id,

13 years, 2 months

git:master: xcap_server: check xml document validity for db interaction

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b111f84d6afc3cfe1b4906771e0d406e377f2e31 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b111f84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 13 18:56:54 2011 +0200 xcap_server: check xml document validity for db interaction - check if xcap doc is xml valid before inserting in db as well as when retrieving from db - better safety check for retrieval of etag value from database record - reported and intial patch by Laura Testi --- modules_k/xcap_server/xcap_misc.c | 20 ++++++++++++++++++++ modules_k/xcap_server/xcap_misc.h | 1 + modules_k/xcap_server/xcap_server.c | 21 +++++++++++++++++---- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/modules_k/xcap_server/xcap_misc.c b/modules_k/xcap_server/xcap_misc.c index f8a0228..0a0b559 100644 --- a/modules_k/xcap_server/xcap_misc.c +++ b/modules_k/xcap_server/xcap_misc.c @@ -665,6 +665,26 @@ error: } /** + * check if provided XML doc is valid + * - return -1 if document is invalid or 0 if document is valid + */ +int xcaps_check_doc_validity(str *doc) +{ + + xmlDocPtr docxml = NULL; + + if(doc==NULL || doc->s==NULL || doc->len<0) + return -1; + + docxml = xmlParseMemory(doc->s, doc->len); + if(docxml==NULL) + return -1; + xmlFreeDoc(docxml); + return 0; +} + + +/** * xcapuri PV export */ typedef struct _pv_xcap_uri { diff --git a/modules_k/xcap_server/xcap_misc.h b/modules_k/xcap_server/xcap_misc.h index 4fcd3d1..05476ba 100644 --- a/modules_k/xcap_server/xcap_misc.h +++ b/modules_k/xcap_server/xcap_misc.h @@ -53,6 +53,7 @@ typedef struct xcap_uri { int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri); int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf); int xcaps_xpath_get(str *inbuf, str *xpaths, str *outbuf); +int xcaps_check_doc_validity(str *doc); int pv_get_xcap_uri(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index be98fb4..33f5629 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -335,6 +335,11 @@ static int xcaps_put_db(str* user, str *domain, xcap_uri_t *xuri, str *etag, db_val_t qvals[9]; int ncols = 0; + if(xcaps_check_doc_validity(doc)<0) + { + LM_ERR("invalid xml doc to insert in database\n"); + goto error; + } /* insert in xcap table*/ qcols[ncols] = &str_username_col; @@ -680,6 +685,12 @@ static int xcaps_get_db_doc(str* user, str *domain, xcap_uri_t *xuri, str *doc) memcpy(doc->s, s.s, s.len); doc->s[doc->len] = '\0'; + if(xcaps_check_doc_validity(doc)<0) + { + LM_ERR("invalid xml doc retrieved from database\n"); + goto error; + } + xcaps_dbf.free_result(xcaps_db, db_res); return 0; @@ -694,6 +705,8 @@ error: } /** + * get the etag from database record for (user@domain, xuri) + * - return: -1 error; 0 - found; 1 - not found * */ static int xcaps_get_db_etag(str* user, str *domain, xcap_uri_t *xuri, str *etag) @@ -970,9 +983,9 @@ static int w_xcaps_del(sip_msg_t* msg, char* puri, char* ppath) str uri; str path; xcap_uri_t xuri; - str body; - str etag_hdr; - str etag; + str body = {0, 0}; + str etag_hdr = {0, 0}; + str etag = {0, 0}; str tbuf; if(puri==0 || ppath==0) @@ -1016,7 +1029,7 @@ static int w_xcaps_del(sip_msg_t* msg, char* puri, char* ppath) goto error; } - if(xcaps_get_db_etag(&turi.user, &turi.host, &xuri, &etag)<0) + if(xcaps_get_db_etag(&turi.user, &turi.host, &xuri, &etag)!=0) { LM_ERR("could not fetch etag for xcap document\n"); goto error;

13 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2011