sr-dev August 2013

sr-dev@lists.kamailio.org

29 participants
148 discussions

dialog: possible race condition/segfault
by Jason Penton 21 Aug '13

21 Aug '13

Hi, It seems to me that there is a possible race condition in dialog module that can potentially cause segfault. Let me explain my thinking. In the dlg_timer routine we call get_expired_dlgs (line 4). This function returns a list of dlg_tl's that have expired. This code is executed in the timer process and I can't see any reason why if a dialog is terminated (user hangs up) at the same time as the expiry timer fires that the dialog can't be nuked between lines 4 and 5 below. This will ultimately result in segfault in the later lines (5 and onwards) or in the specific timer_hdl callback function where the dialog is retrieved using some pointer arithmetic.... 1. void dlg_timer_routine(unsigned int ticks , void * attr) 2. { 3. struct dlg_tl *tl, *ctl; 4. tl = get_expired_dlgs( ticks ); 5. while (tl) { 6. ctl = tl; 7. tl = tl->next; 8. ctl->next = NULL; 9. LM_DBG("tl=%p next=%p\n", ctl, tl); 10. timer_hdl( ctl ); 11. } 12. } I would imagine we should look at incrementing ref for every dlg that goes into the tl. Then unref when removed or when fired.... (but at quick glance it looks like there could be a few locking issues with this solution) Cheers Jason

2 2

[tracker] Comment added: avpops: avp_check, allow avp as second parameter on re operation
by sip-router 20 Aug '13

20 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#333 - avpops: avp_check, allow avp as second parameter on re operation User who did this - Daniel-Constantin Mierla (miconda) ---------- Few remarks: - i think the pkg malloc for compiling the re from PV at runtime can be avoided by using a local variable. Let the pkg malloc only for fixup when the parameter is a string (like it was in the fixup function) - runtime constructed re needs to be regfree(...) to avoid leaks ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=333#comment1053 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.

1 0

[tracker] Comment added: add arbitrary params in Path header
by sip-router 20 Aug '13

20 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#332 - add arbitrary params in Path header User who did this - Daniel-Constantin Mierla (miconda) ---------- Thanks for the patch. I wonder if really makes sense to restrict the parameter to be an AVP. XAVP is similar, but any other pseudo-variable can do it. Have you had any specific reason to stick to avp only? ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=332#comment1052 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.

1 0

git:admorten/sca: modules/sca: AoR should not be treated as SCA if there are no subscribers.
by Andrew Mortensen 20 Aug '13

20 Aug '13

Module: sip-router Branch: admorten/sca Commit: cf5f7437ba64c5b1277a9f39947afa471fe041ee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf5f743… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Tue Aug 20 15:54:17 2013 -0400 modules/sca: AoR should not be treated as SCA if there are no subscribers. --- modules/sca/sca_appearance.c | 18 ++++++++++++++++++ modules/sca/sca_appearance.h | 1 + modules/sca/sca_call_info.c | 2 ++ 3 files changed, 21 insertions(+), 0 deletions(-) diff --git a/modules/sca/sca_appearance.c b/modules/sca/sca_appearance.c index ca26735..ca50e9e 100644 --- a/modules/sca/sca_appearance.c +++ b/modules/sca/sca_appearance.c @@ -386,6 +386,24 @@ done: return( rc ); } + int +sca_appearance_unregister( sca_mod *scam, str *aor ) +{ + int rc = 0; + + assert( scam != NULL ); + assert( aor != NULL ); + + if ( sca_uri_is_shared_appearance( scam, aor )) { + if (( rc = sca_hash_table_kv_delete( scam->appearances, aor )) == 0 ) { + rc = 1; + LM_INFO( "unregistered SCA AoR %.*s", STR_FMT( aor )); + } + } + + return( rc ); +} + sca_appearance * sca_appearance_seize_index_unsafe( sca_mod *scam, str *aor, str *owner_uri, int app_idx, int slot_idx, int *seize_error ) diff --git a/modules/sca/sca_appearance.h b/modules/sca/sca_appearance.h index 9fa9a10..7ad3d38 100644 --- a/modules/sca/sca_appearance.h +++ b/modules/sca/sca_appearance.h @@ -155,6 +155,7 @@ sca_appearance *sca_appearance_for_tags_unsafe( sca_mod *, str *, str *, str *, str *, int ); int sca_appearance_register( sca_mod *, str * ); +int sca_appearance_unregister( sca_mod *, str * ); void sca_appearance_list_insert_appearance( sca_appearance_list *, sca_appearance * ); sca_appearance *sca_appearance_list_unlink_index( sca_appearance_list *, int ); diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index 5e758b8..2d36eae 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -1979,12 +1979,14 @@ sca_call_info_update( sip_msg_t *msg, char *p1, char *p2 ) if ( !sca_subscription_aor_has_subscribers( SCA_EVENT_TYPE_CALL_INFO, &from_aor )) { call_info.ua_shared &= ~SCA_CALL_INFO_SHARED_CALLER; + sca_appearance_unregister( sca, &from_aor ); } } else if ( SCA_CALL_INFO_IS_SHARED_CALLEE( &call_info ) && msg->first_line.type == SIP_REPLY ) { if ( !sca_subscription_aor_has_subscribers( SCA_EVENT_TYPE_CALL_INFO, &to_aor )) { call_info.ua_shared &= ~SCA_CALL_INFO_SHARED_CALLEE; + sca_appearance_unregister( sca, &to_aor ); } } }

1 0

git:admorten/sca: modules/sca: improved handling of host-only Contact URIs
by Andrew Mortensen 20 Aug '13

20 Aug '13

Module: sip-router Branch: admorten/sca Commit: 5219cf7a8e10f2308ceba3f8ab7de4ae5790ee5b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5219cf7… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Tue Aug 20 15:14:26 2013 -0400 modules/sca: improved handling of host-only Contact URIs --- modules/sca/sca_call_info.c | 25 ++++++++++--------------- modules/sca/sca_util.c | 18 ++++++++++++++++-- modules/sca/sca_util.h | 7 +++++++ 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index 5b6b2c7..5e758b8 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -1142,11 +1142,10 @@ done: } static int -sca_call_info_insert_asserted_identity( sip_msg_t *msg, str *contact_uri, - struct to_body *tf ) +sca_call_info_insert_asserted_identity( sip_msg_t *msg, str *display, + int ua_type ) { struct lump *anchor; - sip_uri_t c_uri; str aor = STR_NULL; str hdr = STR_NULL; int len; @@ -1158,22 +1157,17 @@ sca_call_info_insert_asserted_identity( sip_msg_t *msg, str *contact_uri, goto done; } - if ( parse_uri( contact_uri->s, contact_uri->len, &c_uri ) < 0 ) { - LM_ERR( "insert_asserted_identity: parse_uri %.*s failed", - STR_FMT( contact_uri )); - return( -1 ); - } - if ( sca_aor_create_from_info( &aor, c_uri.type, &c_uri.user, - &GET_TO_PURI( msg )->host, &GET_TO_PURI( msg )->port ) < 0 ) { - LM_ERR( "insert_asserted_identity: sca_aor_create_from_info failed" ); - return( -1 ); + if ( sca_create_canonical_aor_for_ua( msg, &aor, ua_type ) < 0 ) { + LM_ERR( "sca_call_info_insert_asserted_identity: failed to create " + "canonical AoR" ); + goto done; } #define SCA_P_ASSERTED_IDENTITY_HDR_PREFIX "P-Asserted-Identity: " #define SCA_P_ASSERTED_IDENTITY_HDR_PREFIX_LEN strlen("P-Asserted-Identity: ") len = SCA_P_ASSERTED_IDENTITY_HDR_PREFIX_LEN; - len += tf->display.len; + len += display->len; /* +1 for space, +1 for <, + 1 for > */ len += 1 + 1 + aor.len + 1 + CRLF_LEN; @@ -1187,7 +1181,7 @@ sca_call_info_insert_asserted_identity( sip_msg_t *msg, str *contact_uri, SCA_P_ASSERTED_IDENTITY_HDR_PREFIX_LEN ); hdr.len = SCA_P_ASSERTED_IDENTITY_HDR_PREFIX_LEN; - SCA_STR_APPEND( &hdr, &tf->display ); + SCA_STR_APPEND( &hdr, display ); *(hdr.s + hdr.len) = ' '; hdr.len++; @@ -1246,7 +1240,8 @@ sca_call_info_invite_reply_200_handler( sip_msg_t *msg, goto done; } - if ( sca_call_info_insert_asserted_identity( msg, contact_uri, to ) < 0 ) { + if ( sca_call_info_insert_asserted_identity( msg, &to->display, + SCA_AOR_TYPE_UAS ) < 0 ) { LM_WARN( "sca_call_info_invite_reply_200_handler: failed to " "add P-Asserted-Identity header to response from %.*s", STR_FMT( contact_uri )); diff --git a/modules/sca/sca_util.c b/modules/sca/sca_util.c index a9f959e..143ac47 100644 --- a/modules/sca/sca_util.c +++ b/modules/sca/sca_util.c @@ -340,7 +340,7 @@ sca_aor_create_from_info( str *aor, uri_type type, str *user, str *domain, } int -sca_create_canonical_aor( sip_msg_t *msg, str *c_aor ) +sca_create_canonical_aor_for_ua( sip_msg_t *msg, str *c_aor, int ua_opts ) { struct to_body *tf = NULL; sip_uri_t c_uri; @@ -353,7 +353,15 @@ sca_create_canonical_aor( sip_msg_t *msg, str *c_aor ) memset( c_aor, 0, sizeof( str )); - if ( msg->first_line.type == SIP_REQUEST ) { + if (( ua_opts & SCA_AOR_TYPE_AUTO )) { + if ( msg->first_line.type == SIP_REQUEST ) { + ua_opts = SCA_AOR_TYPE_UAC; + } else { + ua_opts = SCA_AOR_TYPE_UAS; + } + } + + if (( ua_opts & SCA_AOR_TYPE_UAC )) { if ( sca_get_msg_from_header( msg, &tf ) < 0 ) { LM_ERR( "sca_create_canonical_aor: failed to get From header" ); goto done; @@ -410,6 +418,12 @@ done: return( rc ); } + int +sca_create_canonical_aor( sip_msg_t *msg, str *c_aor ) +{ + return( sca_create_canonical_aor_for_ua( msg, c_aor, SCA_AOR_TYPE_AUTO )); +} + /* XXX this considers any held stream to mean the call is on hold. correct? */ int sca_call_is_held( sip_msg_t *msg ) diff --git a/modules/sca/sca_util.h b/modules/sca/sca_util.h index 012148b..b2f01ee 100644 --- a/modules/sca/sca_util.h +++ b/modules/sca/sca_util.h @@ -26,6 +26,12 @@ #include "sca_common.h" +enum { + SCA_AOR_TYPE_AUTO = (1 << 0), + SCA_AOR_TYPE_UAC = (1 << 1), + SCA_AOR_TYPE_UAS = (1 << 2), +}; + /* get method, regardless of whether message is a request or response */ int sca_get_msg_method( sip_msg_t * ); @@ -55,6 +61,7 @@ int sca_uri_build_aor( str *, int, str *, str * ); int sca_aor_create_from_info( str *, uri_type, str *, str *, str * ); +int sca_create_canonical_aor_for_ua( sip_msg_t *, str *, int ); int sca_create_canonical_aor( sip_msg_t *, str * ); /* convenient call hold detection */

1 0

[tracker] Task opened: avpops: avp_check, allow avp as second parameter on re operation (Attachment added)
by sip-router 20 Aug '13

20 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Víctor Seva (linuxmaniac) Attached to Project - sip-router Summary - avpops: avp_check, allow avp as second parameter on re operation Task Type - Improvement Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - I don't know if this is the best way to implement this. But it's a start. Example: #!ifdef WITH_AVPOPS $avp(s:foo) = "sip:nono@bar.net"; $avp(s:test_re) = "sip:.*@bar.net"; $avp(s:test_re) = "sip:.*@ar.net"; if(avp_check("$avp(s:foo)","re/sip:.*@bar.net/g")) { xlog("L_INFO", "[0] found!\n"); } if(avp_check("$avp(s:foo)","re/$avp(s:test_re)/g")) { xlog("L_INFO", "[1] found!\n"); } $avp(s:foo) = "sip:yes@tar.net"; $avp(s:test_re) = "sip:yes@.*"; if(avp_check("$avp(s:foo)","re/sip:.*@tar.net/g")) { xlog("L_INFO", "[2] found!\n"); } if(avp_check("$avp(s:foo)","re/$avp(s:test_re)/g")) { xlog("L_INFO", "[3] found!\n"); } 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=333 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.

1 0

git:master: fixed spelling errors catched by lintian
by Victor Seva 20 Aug '13

20 Aug '13

Module: sip-router Branch: master Commit: c86b04459a716af353d0ca40a793d6b13c6a6fe7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c86b044… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Aug 20 10:24:53 2013 +0200 fixed spelling errors catched by lintian --- modules/cdp/diameter_peer.c | 4 ++-- modules/ims_auth/authims_mod.c | 2 +- modules/ims_auth/authorize.c | 4 ++-- modules/ims_auth/doc/ims_auth_admin.xml | 2 +- modules/ims_icscf/db.c | 2 +- modules/ims_isc/mark.c | 2 +- modules/iptrtpproxy/doc/iptrtpproxy_admin.xml | 2 +- modules/mangler/contact_ops.c | 2 +- modules/presence/event_list.c | 2 +- modules/presence/hash.c | 2 +- modules/pua_mi/mi_func.c | 4 ++-- modules/uid_avp_db/uid_avp_db.c | 4 ++-- modules/xhttp_pi/xhttp_pi_fnc.c | 2 +- utils/kamctl/kamctl.8 | 14 +++++++------- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/modules/cdp/diameter_peer.c b/modules/cdp/diameter_peer.c index 4c01bb4..ce86e1a 100644 --- a/modules/cdp/diameter_peer.c +++ b/modules/cdp/diameter_peer.c @@ -417,8 +417,8 @@ void diameter_peer_destroy() lock_release(shutdownx_lock); } - /* wait for all childs to clean up nicely (acceptor, receiver, timer, workers) */ - LM_INFO("destroy_diameter_peer(): Terminating all childs...\n"); + /* wait for all children to clean up nicely (acceptor, receiver, timer, workers) */ + LM_INFO("destroy_diameter_peer(): Terminating all children...\n"); while(pid_list->tail){ pid = dp_last_pid(); if (pid<=0||pid==getpid()){ diff --git a/modules/ims_auth/authims_mod.c b/modules/ims_auth/authims_mod.c index a23e7ce..b245d85 100644 --- a/modules/ims_auth/authims_mod.c +++ b/modules/ims_auth/authims_mod.c @@ -110,7 +110,7 @@ str cxdx_forced_peer; /* fixed parameter storage */ str scscf_name_str; /**< fixed name of the S-CSCF */ -/* used mainly in testing - load balancing with SIPP where we dont want to worry about auth */ +/* used mainly in testing - load balancing with SIPP where we don't want to worry about auth */ int ignore_failed_auth = 0; /* diff --git a/modules/ims_auth/authorize.c b/modules/ims_auth/authorize.c index 9f58554..026e3b5 100644 --- a/modules/ims_auth/authorize.c +++ b/modules/ims_auth/authorize.c @@ -666,7 +666,7 @@ int authenticate(struct sip_msg* msg, char* _realm, char* str2, int is_proxy_aut LM_ERR("no matching auth vector found - maybe timer expired\n"); if (ignore_failed_auth) { - LM_WARN("NB: Ignoring all failed auth - check your config if you dont expect this\n"); + LM_WARN("NB: Ignoring all failed auth - check your config if you don't expect this\n"); ret = AUTH_OK; } @@ -801,7 +801,7 @@ int authenticate(struct sip_msg* msg, char* _realm, char* str2, int is_proxy_aut } if (ignore_failed_auth) { - LM_WARN("NB: Ignoring all failed auth - check your config if you dont expect this\n"); + LM_WARN("NB: Ignoring all failed auth - check your config if you don't expect this\n"); ret = AUTH_OK; } diff --git a/modules/ims_auth/doc/ims_auth_admin.xml b/modules/ims_auth/doc/ims_auth_admin.xml index 3357cc9..240c3ef 100644 --- a/modules/ims_auth/doc/ims_auth_admin.xml +++ b/modules/ims_auth/doc/ims_auth_admin.xml @@ -296,7 +296,7 @@ modparam("ims_auth", "add_authinfo_hdr", 0) <title><varname>ignore_failed_auth</varname> (integer)</title> <para>Ignore invalid passwords (only IMPI/IMPU is checked).</para> - <para>It should be used only for testing, e.g. load balancing with SIPP where we dont want to worry about auth.</para> + <para>It should be used only for testing, e.g. load balancing with SIPP where we don't want to worry about auth.</para> <para>Default value is <quote>0</quote> (don't ingnore the failed authentication).</para> diff --git a/modules/ims_icscf/db.c b/modules/ims_icscf/db.c index 343d92d..05c81ad 100644 --- a/modules/ims_icscf/db.c +++ b/modules/ims_icscf/db.c @@ -343,7 +343,7 @@ int ims_icscf_db_get_capabilities(scscf_capabilities *cap[],int cap_cnt) } if (res->n == 0) { - LM_DBG("DBG:ims_icscf_db_get_capabilities: No Capabilites found... not critical...\n"); + LM_DBG("DBG:ims_icscf_db_get_capabilities: No Capabilities found... not critical...\n"); return 1; } else { diff --git a/modules/ims_isc/mark.c b/modules/ims_isc/mark.c index e13593b..470a20d 100644 --- a/modules/ims_isc/mark.c +++ b/modules/ims_isc/mark.c @@ -165,7 +165,7 @@ void isc_mark_get(str x, isc_mark *mark) { } break; default: - LM_ERR("isc_mark_get: unkown parameter found: %c !\n", x.s[i]); + LM_ERR("isc_mark_get: unknown parameter found: %c !\n", x.s[i]); } i = j + 1; } else diff --git a/modules/iptrtpproxy/doc/iptrtpproxy_admin.xml b/modules/iptrtpproxy/doc/iptrtpproxy_admin.xml index b17b0a0..593d6a2 100644 --- a/modules/iptrtpproxy/doc/iptrtpproxy_admin.xml +++ b/modules/iptrtpproxy/doc/iptrtpproxy_admin.xml @@ -27,7 +27,7 @@ <para> This &kamailio; module is written as a light-weight module, there is no - dialog managment as in <emphasis>Nathelper</emphasis>. The reason is that such an API + dialog management as in <emphasis>Nathelper</emphasis>. The reason is that such an API should be provided by core or a specialized dialog manager module. Because such module is not in git, session information may be stored in extra attributes of the <emphasis>avp_db</emphasis> module and diff --git a/modules/mangler/contact_ops.c b/modules/mangler/contact_ops.c index c39f8f6..bdde099 100644 --- a/modules/mangler/contact_ops.c +++ b/modules/mangler/contact_ops.c @@ -369,7 +369,7 @@ encode2format (struct sip_msg* msg, str* uri, struct uri_format *format) format->rcv_proto=s_sctp; break; default: - BUG("unkown proto %d\n", msg->rcv.proto); + BUG("unknown proto %d\n", msg->rcv.proto); } }else{ format->rcv_proto.s=0; diff --git a/modules/presence/event_list.c b/modules/presence/event_list.c index ee272c1..ece09a0 100644 --- a/modules/presence/event_list.c +++ b/modules/presence/event_list.c @@ -255,7 +255,7 @@ int add_event(pres_ev_t* event) } EvList->ev_count++; - LM_DBG("succesfully added event: %.*s - len= %d\n",ev->name.len, + LM_DBG("successfully added event: %.*s - len= %d\n",ev->name.len, ev->name.s, ev->name.len); done: free_event_params(parsed_event.params.list, PKG_MEM_TYPE); diff --git a/modules/presence/hash.c b/modules/presence/hash.c index c7d366a..de7f08f 100644 --- a/modules/presence/hash.c +++ b/modules/presence/hash.c @@ -634,7 +634,7 @@ int update_phtable(presentity_t* presentity, str pres_uri, str body) if(presentity->event->get_rules_doc(&presentity->user, &presentity->domain, &xcap_doc)< 0) { - LM_ERR("failed to retreive xcap document\n"); + LM_ERR("failed to retrieve xcap document\n"); ret= -1; goto done; } diff --git a/modules/pua_mi/mi_func.c b/modules/pua_mi/mi_func.c index 6343f61..d0061de 100644 --- a/modules/pua_mi/mi_func.c +++ b/modules/pua_mi/mi_func.c @@ -220,7 +220,7 @@ struct mi_root* mi_pua_publish(struct mi_root* cmd, void* param) publ.event= get_event_flag(&event); if(publ.event< 0) { - LM_ERR("unkown event\n"); + LM_ERR("unknown event\n"); return init_mi_tree(400, "Unknown event", 13); } if(content_type.len!= 1) @@ -461,7 +461,7 @@ struct mi_root* mi_pua_subscribe(struct mi_root* cmd, void* param) subs.event= get_event_flag(&event); if(subs.event< 0) { - LM_ERR("unkown event\n"); + LM_ERR("unknown event\n"); return init_mi_tree(400, "Unknown event", 13); } diff --git a/modules/uid_avp_db/uid_avp_db.c b/modules/uid_avp_db/uid_avp_db.c index 5d3b5e4..7970740 100644 --- a/modules/uid_avp_db/uid_avp_db.c +++ b/modules/uid_avp_db/uid_avp_db.c @@ -285,7 +285,7 @@ static int load_uri_attrs(struct sip_msg* msg, unsigned long flags, fparam_t* fp uri_type_to_str(puri.type, &(load_uri_attrs_cmd->match[2].v.lstr)); if (db_exec(&res, load_uri_attrs_cmd) < 0) { - ERR("Error while quering database\n"); + ERR("Error while querying database\n"); return -1; } @@ -307,7 +307,7 @@ static int load_user_attrs(struct sip_msg* msg, unsigned long flags, fparam_t* f } if (db_exec(&res, load_user_attrs_cmd) < 0) { - ERR("Error while quering database\n"); + ERR("Error while querying database\n"); return -1; } diff --git a/modules/xhttp_pi/xhttp_pi_fnc.c b/modules/xhttp_pi/xhttp_pi_fnc.c index b822e8a..761a277 100644 --- a/modules/xhttp_pi/xhttp_pi_fnc.c +++ b/modules/xhttp_pi/xhttp_pi_fnc.c @@ -2498,7 +2498,7 @@ int getVal(db_val_t *val, db_type_t val_type, db_key_t key, ph_db_table_t *table LM_DBG("[%.*s] has flags [%d]\n", key->len, key->s, flags); if(flags){ XHTTP_PI_BUILD_REPLY(ctx, - "Unkown validation [%d] for %s.", + "Unknown validation [%d] for %s.", table->cols[i].validation, key->s); goto done; } diff --git a/utils/kamctl/kamctl.8 b/utils/kamctl/kamctl.8 index 83db5d7..f0d225e 100644 --- a/utils/kamctl/kamctl.8 +++ b/utils/kamctl/kamctl.8 @@ -43,7 +43,7 @@ Ping <uri> with SIP OPTIONS .TP 16 -.I Access control list (acl) managment commands: +.I Access control list (acl) management commands: .TP .B acl show [<username>] Show user membership @@ -55,7 +55,7 @@ Grant user membership (*) Grant user membership(s) (*) .TP 16 -.I Least cost routes (lcr) managment command: +.I Least cost routes (lcr) management command: .TP .B lcr dump Show in memory gateways and routes tables @@ -64,7 +64,7 @@ Show in memory gateways and routes tables Reload lcr gateways and routes .TP 16 -.I Carrierroute tables('cr') managment commands: +.I Carrierroute tables('cr') management commands: .TP .B cr show Show tables @@ -88,7 +88,7 @@ Add a carrier (prob, strip, rewrite_prefix, rewrite_suffix, flags, mask and comm Remove a carrier .TP 16 -.I Remote-Party-ID (RPID) managment commands: +.I Remote-Party-ID (RPID) management commands: .TP .B rpid add <username> <rpid> Add rpid for a user (*) @@ -100,7 +100,7 @@ Set rpid to NULL for a user (*) Show rpid of a user .TP 16 -.I Subscriber managment commands: +.I Subscriber management commands: .TP .B add <username> <password> Add a new subscriber (*) @@ -130,7 +130,7 @@ Add a new entry (from_pattern and tag are optional arguments) Remove all entres for the given src_ip .TP 16 -.I Dispatcher managment commands: +.I Dispatcher management commands: .TP .B dispatcher show Show dispatcher gateways @@ -154,7 +154,7 @@ Delete gateway Restart phone configured for <uri> .TP 16 -.I User location('ul') or aliases managment commands: +.I User location('ul') or aliases management commands: .B ul show [<username>] Show in-RAM online users .TP

1 0

git:master: htable: updated readme with rpc command htable.stats
by Elena-Ramona Modroiu 19 Aug '13

19 Aug '13

Module: sip-router Branch: master Commit: 64e39dbf89bc1581722abeaadf7811e0883390bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=64e39db… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Mon Aug 19 17:43:16 2013 +0200 htable: updated readme with rpc command htable.stats --- modules/htable/README | 20 +++++++++++++++++++- modules/htable/doc/htable_admin.xml | 29 ++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/modules/htable/README b/modules/htable/README index fe0c37f..45e45af 100644 --- a/modules/htable/README +++ b/modules/htable/README @@ -70,6 +70,7 @@ Alex Balashov 7.5. htable.dump htable 7.6. htable.reload htable 7.7. htable.listTables + 7.8. htable.stats 8. Event routes @@ -147,6 +148,7 @@ Chapter 1. Admin Guide 7.5. htable.dump htable 7.6. htable.reload htable 7.7. htable.listTables + 7.8. htable.stats 8. Event routes @@ -594,6 +596,7 @@ sht_unlock("ha=>test"); 7.5. htable.dump htable 7.6. htable.reload htable 7.7. htable.listTables + 7.8. htable.stats 7.1. htable.get htable key @@ -693,7 +696,7 @@ kamcmd htable.reload ipban Lists all defined tables - Name: dhtable.listTables + Name: htable.listTables Parameters: * None @@ -703,6 +706,21 @@ kamcmd htable.reload ipban kamcmd htable.listTables ... +7.8. htable.stats + + Get statistics for hash tables - name, number of slots, number of + items, max number of items per slot, min number of items per slot. + + Name: htable.stats + + Parameters: + * None + + Example: +... +kamcmd htable.stats +... + 8. Event routes 8.1. htable:mod-init diff --git a/modules/htable/doc/htable_admin.xml b/modules/htable/doc/htable_admin.xml index 3331bff..815d16b 100644 --- a/modules/htable/doc/htable_admin.xml +++ b/modules/htable/doc/htable_admin.xml @@ -891,7 +891,7 @@ kamcmd htable.reload ipban Lists all defined tables </para> <para> - Name: <emphasis>dhtable.listTables</emphasis> + Name: <emphasis>htable.listTables</emphasis> </para> <para>Parameters:</para> <itemizedlist> @@ -908,6 +908,33 @@ kamcmd htable.listTables ... </programlisting> </section> + <section> + <title> + <function moreinfo="none">htable.stats</function> + </title> + <para> + Get statistics for hash tables - name, number of slots, + number of items, max number of items per slot, min number + of items per slot. + </para> + <para> + Name: <emphasis>htable.stats</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>None</para> + </listitem> + + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +kamcmd htable.stats +... +</programlisting> + </section> </section>

1 0

git:master: htbale: added rpc command htable.stats
by Elena-Ramona Modroiu 19 Aug '13

19 Aug '13

Module: sip-router Branch: master Commit: d33106994516e27944657c3bf17c3ccb5a521a50 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d331069… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Mon Aug 19 17:39:26 2013 +0200 htbale: added rpc command htable.stats - print stats about htables: name, number of slots, number of items, max number of items per slot, min number of items per slot --- modules/htable/htable.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 37c68f4..5dba9e0 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -632,6 +632,10 @@ static const char* htable_list_doc[2] = { "List all htables.", 0 }; +static const char* htable_stats_doc[2] = { + "Statistics about htables.", + 0 +}; static const char* htable_reload_doc[2] = { "Reload hash table.", 0 @@ -900,6 +904,60 @@ error: return; } +static void htable_rpc_stats(rpc_t* rpc, void* c) +{ + ht_t *ht; + void* th; + unsigned int min; + unsigned int max; + unsigned int all; + unsigned int i; + + ht = ht_get_root(); + if(ht==NULL) + { + rpc->fault(c, 500, "No htables"); + return; + } + while (ht != NULL) + { + /* add entry node */ + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating structure rpc"); + goto error; + } + all = 0; + max = 0; + min = 4294967295U; + for(i=0; i<ht->htsize; i++) { + lock_get(&ht->entries[i].lock); + if(ht->entries[i].esize<min) + min = ht->entries[i].esize; + if(ht->entries[i].esize>max) + max = ht->entries[i].esize; + all += ht->entries[i].esize; + lock_release(&ht->entries[i].lock); + } + + if(rpc->struct_add(th, "Sddd", + "name", &ht->name, /* str */ + "slots", (int)ht->htsize, /* uint */ + "all", (int)all, /* uint */ + "min", (int)min, /* uint */ + "max", (int)max /* uint */ + ) < 0) { + rpc->fault(c, 500, "Internal error creating rpc structure"); + goto error; + } + ht = ht->next; + } + +error: + return; +} + + /*! \brief RPC htable.reload command to reload content of a hash table */ static void htable_rpc_reload(rpc_t* rpc, void* c) { @@ -986,6 +1044,7 @@ rpc_export_t htable_rpc[] = { {"htable.seti", htable_rpc_seti, htable_seti_doc, 0}, {"htable.listTables", htable_rpc_list, htable_list_doc, 0}, {"htable.reload", htable_rpc_reload, htable_reload_doc, 0}, + {"htable.stats", htable_rpc_stats, htable_stats_doc, 0}, {0, 0, 0, 0} };

1 0

git:master: htable: lifted limit for max number of slots to 2^31
by Elena-Ramona Modroiu 19 Aug '13

19 Aug '13

Module: sip-router Branch: master Commit: ee7dcac57501cd0563c69ae967ba785cec035062 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ee7dcac… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Mon Aug 19 16:48:01 2013 +0200 htable: lifted limit for max number of slots to 2^31 - there can be systems with large amount of memory - clarification in docs about the case when the value is out of exected range --- modules/htable/README | 4 ++-- modules/htable/doc/htable_admin.xml | 4 ++-- modules/htable/ht_api.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/htable/README b/modules/htable/README index 3324807..fe0c37f 100644 --- a/modules/htable/README +++ b/modules/htable/README @@ -299,8 +299,8 @@ if(is_present_hf("Authorization")) * size - number specifying the size of hash table. Larger value means less collisions. The number of entries (aka slots or buckets) in the table is 2^size. The possible range for this value is from 2 to - 14, smaller or larger values will be increased or decreased - respectivly. + 31, smaller or larger values will be increased to 3 (8 slots) or + decreased to 14 (16384 slots). * autoexpire -time in seconds to delete an item from hash table if no update was done to it. If is missing or set to 0, the items won't expire. diff --git a/modules/htable/doc/htable_admin.xml b/modules/htable/doc/htable_admin.xml index c38e555..3331bff 100644 --- a/modules/htable/doc/htable_admin.xml +++ b/modules/htable/doc/htable_admin.xml @@ -236,8 +236,8 @@ if(is_present_hf("Authorization")) <emphasis>size</emphasis> - number specifying the size of hash table. Larger value means less collisions. The number of entries (aka slots or buckets) in the table is 2^size. The possible range - for this value is from 2 to 14, smaller or larger values will be - increased or decreased respectivly. + for this value is from 2 to 31, smaller or larger values will be + increased to 3 (8 slots) or decreased to 14 (16384 slots). </para> </listitem> <listitem> diff --git a/modules/htable/ht_api.c b/modules/htable/ht_api.c index 84eb2e0..3dd96cc 100644 --- a/modules/htable/ht_api.c +++ b/modules/htable/ht_api.c @@ -248,7 +248,7 @@ int ht_add_table(str *name, int autoexp, str *dbtable, int size, int dbmode, if(size<=1) ht->htsize = 8; - else if(size>14) + else if(size>31) ht->htsize = 1<<14; else ht->htsize = 1<<size; ht->htid = htid;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
15
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2013