sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

git:master: * Forward ported DB_CAP_FETCH usage from k 1.5.
by Juha Heinanen 07 May '09

07 May '09

Module: sip-router Branch: master Commit: 61721cae91354f0a635a8ce369729b28118b265d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61721ca… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu May 7 20:29:07 2009 +0300 * Forward ported DB_CAP_FETCH usage from k 1.5. --- modules_k/presence/subscribe.c | 251 ++++++++++++++++++++++------------------ 1 files changed, 139 insertions(+), 112 deletions(-) diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index 6234619..cfec2c8 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -46,6 +46,8 @@ #include "notify.h" #include "../pua/hash.h" +#define ACTW_FETCH_SIZE 128 + int get_stored_info(struct sip_msg* msg, subs_t* subs, int* error_ret, str* reply_str); int get_database_info(struct sip_msg* msg, subs_t* subs, int* error_ret, @@ -1620,8 +1622,8 @@ void update_db_subs(db1_con_t *db,db_func_t dbf, shtable_t hash_table, int restore_db_subs(void) { db_key_t result_cols[22]; - db1_res_t *res= NULL; - db_row_t *row = NULL; + db1_res_t *result= NULL; + db_row_t *rows = NULL; db_val_t *row_vals= NULL; int i; int n_result_cols= 0; @@ -1635,6 +1637,7 @@ int restore_db_subs(void) event_t parsed_event; unsigned int expires; unsigned int hash_code; + int nr_rows; result_cols[pres_uri_col=n_result_cols++] =&str_presentity_uri_col; result_cols[expires_col=n_result_cols++]=&str_expires_col; @@ -1669,142 +1672,166 @@ int restore_db_subs(void) return -1; } - if(pa_dbf.query(pa_db,0, 0, 0, result_cols,0, n_result_cols, 0,&res)< 0) + /* select the whole table and all the columns */ + if (DB_CAPABILITY(pa_dbf, DB_CAP_FETCH)) { - LM_ERR("while querrying table\n"); - if(res) + if(pa_dbf.query(pa_db,0,0,0,result_cols, 0, + n_result_cols, 0, 0) < 0) { - pa_dbf.free_result(pa_db, res); - res = NULL; + LM_ERR("Error while querying (fetch) database\n"); + return -1; } - return -1; - } - if(res== NULL) - return -1; - - if(res->n<=0) + if(pa_dbf.fetch_result(pa_db,&result,ACTW_FETCH_SIZE)<0) + { + LM_ERR("fetching rows failed\n"); + return -1; + } + } else { - LM_INFO("The query returned no result\n"); - pa_dbf.free_result(pa_db, res); - res = NULL; - return 0; + if (pa_dbf.query (pa_db, 0, 0, 0,result_cols,0, n_result_cols, + 0, &result) < 0) + { + LM_ERR("querying presentity\n"); + goto error; + } } - LM_DBG("found %d db entries\n", res->n); - - for(i =0 ; i< res->n ; i++) - { - row = &res->rows[i]; - row_vals = ROW_VALUES(row); - memset(&s, 0, sizeof(subs_t)); - - expires= row_vals[expires_col].val.int_val; - - if(expires< (int)time(NULL)) - continue; - - s.pres_uri.s= (char*)row_vals[pres_uri_col].val.string_val; - s.pres_uri.len= strlen(s.pres_uri.s); - - s.to_user.s=(char*)row_vals[to_user_col].val.string_val; - s.to_user.len= strlen(s.to_user.s); + nr_rows = RES_ROW_N(result); - s.to_domain.s=(char*)row_vals[to_domain_col].val.string_val; - s.to_domain.len= strlen(s.to_domain.s); - s.from_user.s=(char*)row_vals[from_user_col].val.string_val; - s.from_user.len= strlen(s.from_user.s); - - s.from_domain.s=(char*)row_vals[from_domain_col].val.string_val; - s.from_domain.len= strlen(s.from_domain.s); + do { + LM_DBG("loading information from database %i records\n", nr_rows); - s.to_tag.s=(char*)row_vals[totag_col].val.string_val; - s.to_tag.len= strlen(s.to_tag.s); + rows = RES_ROWS(result); - s.from_tag.s=(char*)row_vals[fromtag_col].val.string_val; - s.from_tag.len= strlen(s.from_tag.s); + /* for every row */ + for(i=0; i<nr_rows; i++) + { - s.callid.s=(char*)row_vals[callid_col].val.string_val; - s.callid.len= strlen(s.callid.s); + row_vals = ROW_VALUES(rows +i); + memset(&s, 0, sizeof(subs_t)); - ev_sname.s= (char*)row_vals[event_col].val.string_val; - ev_sname.len= strlen(ev_sname.s); + expires= row_vals[expires_col].val.int_val; - event= contains_event(&ev_sname, &parsed_event); - if(event== NULL) - { - LM_DBG("insert a new event structure in the list waiting" - " to be filled in\n"); + if(expires< (int)time(NULL)) + continue; - /*insert a new event structure in the list waiting to be filled in*/ - event= (pres_ev_t*)shm_malloc(sizeof(pres_ev_t)); - if(event== NULL) - { - free_event_params(parsed_event.params.list, PKG_MEM_TYPE); - ERR_MEM(SHM_MEM_STR); - } - memset(event, 0, sizeof(pres_ev_t)); - event->name.s= (char*)shm_malloc(ev_sname.len* sizeof(char)); - if(event->name.s== NULL) - { - free_event_params(parsed_event.params.list, PKG_MEM_TYPE); - ERR_MEM(SHM_MEM_STR); - } - memcpy(event->name.s,ev_sname.s, ev_sname.len); - event->name.len= ev_sname.len; + s.pres_uri.s= (char*)row_vals[pres_uri_col].val.string_val; + s.pres_uri.len= strlen(s.pres_uri.s); + + s.to_user.s=(char*)row_vals[to_user_col].val.string_val; + s.to_user.len= strlen(s.to_user.s); - event->evp= shm_copy_event(&parsed_event); - if(event->evp== NULL) - { - LM_ERR("ERROR copying event_t structure\n"); - free_event_params(parsed_event.params.list, PKG_MEM_TYPE); - goto error; - } - event->next= EvList->events; - EvList->events= event; - } + s.to_domain.s=(char*)row_vals[to_domain_col].val.string_val; + s.to_domain.len= strlen(s.to_domain.s); + + s.from_user.s=(char*)row_vals[from_user_col].val.string_val; + s.from_user.len= strlen(s.from_user.s); - free_event_params(parsed_event.params.list, PKG_MEM_TYPE); + s.from_domain.s=(char*)row_vals[from_domain_col].val.string_val; + s.from_domain.len= strlen(s.from_domain.s); + + s.to_tag.s=(char*)row_vals[totag_col].val.string_val; + s.to_tag.len= strlen(s.to_tag.s); - s.event= event; + s.from_tag.s=(char*)row_vals[fromtag_col].val.string_val; + s.from_tag.len= strlen(s.from_tag.s); - s.event_id.s=(char*)row_vals[event_id_col].val.string_val; - if(s.event_id.s) - s.event_id.len= strlen(s.event_id.s); + s.callid.s=(char*)row_vals[callid_col].val.string_val; + s.callid.len= strlen(s.callid.s); - s.remote_cseq= row_vals[remote_cseq_col].val.int_val; - s.local_cseq= row_vals[local_cseq_col].val.int_val; - s.version= row_vals[version_col].val.int_val; + ev_sname.s= (char*)row_vals[event_col].val.string_val; + ev_sname.len= strlen(ev_sname.s); - s.expires= expires- (int)time(NULL); - s.status= row_vals[status_col].val.int_val; + event= contains_event(&ev_sname, &parsed_event); + if(event== NULL) + { + LM_DBG("insert a new event structure in the list waiting" + " to be filled in\n"); + + /*insert a new event structure in the list waiting to be filled in*/ + event= (pres_ev_t*)shm_malloc(sizeof(pres_ev_t)); + if(event== NULL) + { + free_event_params(parsed_event.params.list, PKG_MEM_TYPE); + ERR_MEM(SHM_MEM_STR); + } + memset(event, 0, sizeof(pres_ev_t)); + event->name.s= (char*)shm_malloc(ev_sname.len* sizeof(char)); + if(event->name.s== NULL) + { + free_event_params(parsed_event.params.list, PKG_MEM_TYPE); + ERR_MEM(SHM_MEM_STR); + } + memcpy(event->name.s,ev_sname.s, ev_sname.len); + event->name.len= ev_sname.len; + + event->evp= shm_copy_event(&parsed_event); + if(event->evp== NULL) + { + LM_ERR("ERROR copying event_t structure\n"); + free_event_params(parsed_event.params.list, PKG_MEM_TYPE); + goto error; + } + event->next= EvList->events; + EvList->events= event; + } + + free_event_params(parsed_event.params.list, PKG_MEM_TYPE); + + s.event= event; - s.reason.s= (char*)row_vals[reason_col].val.string_val; - if(s.reason.s) - s.reason.len= strlen(s.reason.s); + s.event_id.s=(char*)row_vals[event_id_col].val.string_val; + if(s.event_id.s) + s.event_id.len= strlen(s.event_id.s); + + s.remote_cseq= row_vals[remote_cseq_col].val.int_val; + s.local_cseq= row_vals[local_cseq_col].val.int_val; + s.version= row_vals[version_col].val.int_val; + + s.expires= expires- (int)time(NULL); + s.status= row_vals[status_col].val.int_val; - s.contact.s=(char*)row_vals[contact_col].val.string_val; - s.contact.len= strlen(s.contact.s); + s.reason.s= (char*)row_vals[reason_col].val.string_val; + if(s.reason.s) + s.reason.len= strlen(s.reason.s); - s.local_contact.s=(char*)row_vals[local_contact_col].val.string_val; - s.local_contact.len= strlen(s.local_contact.s); - - s.record_route.s=(char*)row_vals[record_route_col].val.string_val; - if(s.record_route.s) - s.record_route.len= strlen(s.record_route.s); + s.contact.s=(char*)row_vals[contact_col].val.string_val; + s.contact.len= strlen(s.contact.s); + + s.local_contact.s=(char*)row_vals[local_contact_col].val.string_val; + s.local_contact.len= strlen(s.local_contact.s); + + s.record_route.s=(char*)row_vals[record_route_col].val.string_val; + if(s.record_route.s) + s.record_route.len= strlen(s.record_route.s); - s.sockinfo_str.s=(char*)row_vals[sockinfo_col].val.string_val; - s.sockinfo_str.len= strlen(s.sockinfo_str.s); + s.sockinfo_str.s=(char*)row_vals[sockinfo_col].val.string_val; + s.sockinfo_str.len= strlen(s.sockinfo_str.s); + + hash_code= core_hash(&s.pres_uri, &s.event->name, shtable_size); + if(insert_shtable(subs_htable, hash_code, &s)< 0) + { + LM_ERR("adding new record in hash table\n"); + goto error; + } + } - hash_code= core_hash(&s.pres_uri, &s.event->name, shtable_size); - if(insert_shtable(subs_htable, hash_code, &s)< 0) - { - LM_ERR("adding new record in hash table\n"); + /* any more data to be fetched ?*/ + if (DB_CAPABILITY(pa_dbf, DB_CAP_FETCH)) { + if (pa_dbf.fetch_result( pa_db, &result, + ACTW_FETCH_SIZE ) < 0) { + LM_ERR("fetching more rows failed\n"); goto error; + } + nr_rows = RES_ROW_N(result); + } else { + nr_rows = 0; } - } - pa_dbf.free_result(pa_db, res); + }while (nr_rows>0); + + pa_dbf.free_result(pa_db, result); /* delete all records */ if(pa_dbf.delete(pa_db, 0,0,0,0)< 0) @@ -1816,8 +1843,8 @@ int restore_db_subs(void) return 0; error: - if(res) - pa_dbf.free_result(pa_db, res); + if(result) + pa_dbf.free_result(pa_db, result); return -1; }

1 0

git:master: ctl(s): documentation added
by Andrei Pelinescu-Onciul 07 May '09

07 May '09

Module: sip-router Branch: master Commit: ed28ad4af408aa4a47e7b6b41b10fe6e093d7911 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed28ad4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 7 18:48:34 2009 +0200 ctl(s): documentation added --- modules_s/ctl/README | 196 ++++++++++++++++++++++++++++++++++++++++++ modules_s/ctl/doc/Makefile | 4 + modules_s/ctl/doc/ctl.xml | 90 +++++++++++++++++++ modules_s/ctl/doc/params.xml | 169 ++++++++++++++++++++++++++++++++++++ modules_s/ctl/doc/rpc.xml | 63 ++++++++++++++ 5 files changed, 522 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ed2…

1 0

git:master: dialog(k): port db setup to different child_init behaviour on sr
by Henning Westerholt 07 May '09

07 May '09

Module: sip-router Branch: master Commit: ffcf29e66d0e78fed90d25fb70425c8ad002d6c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ffcf29e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 7 15:09:09 2009 +0200 dialog(k): port db setup to different child_init behaviour on sr - port db setup to different child_init behaviour on sr, here child_init is called two times for PROC_MAIN - don't open a DB connection in PROC_MAIN in DB_MODE_DELAYED - don't close the connection during mod_destroy if nothing was opened --- modules_k/dialog/dialog.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 1e6c5de..caae794 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -570,10 +570,9 @@ static int child_init(int rank) if_update_stat(dlg_enable_stats, early_dlgs, early_dlgs_cnt); } - if ( (dlg_db_mode==DB_MODE_REALTIME && (rank>0 || rank==PROC_TIMER)) || - (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN)) || - (dlg_db_mode==DB_MODE_DELAYED && (rank==PROC_MAIN || rank==PROC_TIMER || - rank>0) )){ + if ( ((dlg_db_mode==DB_MODE_REALTIME || DB_MODE_DELAYED) && + (rank>0 || rank==PROC_TIMER)) || + (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN)) ) { if ( dlg_connect_db(&db_url) ) { LM_ERR("failed to connect to database (rank=%d)\n",rank); return -1; @@ -584,6 +583,11 @@ static int child_init(int rank) * for the rest of the processes will be the same as DB_MODE_NONE */ if (dlg_db_mode==DB_MODE_SHUTDOWN && rank!=PROC_MAIN) dlg_db_mode = DB_MODE_NONE; + /* in DB_MODE_REALTIME and DB_MODE_DELAYED the PROC_MAIN or the ones + * with negative rank will have no db connection */ + if ( (dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) && + (rank<0 || rank==PROC_MAIN)) + dlg_db_mode = DB_MODE_NONE; return 0; }

1 0

git:master: dialog(k): refine change ffcf29e66d, we need to take care only of PROC_MAIN
by Henning Westerholt 07 May '09

07 May '09

Module: sip-router Branch: master Commit: 7c79fc7a29d4a9509f69f7aca55a992c6b4cbff7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c79fc7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 7 15:26:38 2009 +0200 dialog(k): refine change ffcf29e66d, we need to take care only of PROC_MAIN --- modules_k/dialog/dialog.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index caae794..7a5d198 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -583,10 +583,9 @@ static int child_init(int rank) * for the rest of the processes will be the same as DB_MODE_NONE */ if (dlg_db_mode==DB_MODE_SHUTDOWN && rank!=PROC_MAIN) dlg_db_mode = DB_MODE_NONE; - /* in DB_MODE_REALTIME and DB_MODE_DELAYED the PROC_MAIN or the ones - * with negative rank will have no db connection */ + /* in DB_MODE_REALTIME and DB_MODE_DELAYED the PROC_MAIN have no DB handle */ if ( (dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) && - (rank<0 || rank==PROC_MAIN)) + rank==PROC_MAIN) dlg_db_mode = DB_MODE_NONE; return 0;

1 0

git:master: Merge commit 'origin/ser_core_cvs'
by Andrei Pelinescu-Onciul 07 May '09

07 May '09

Module: sip-router Branch: master Commit: 271bfb0e8f48fbc171f4ff04dbf092ace8f980c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=271bfb0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 7 14:55:01 2009 +0200 Merge commit 'origin/ser_core_cvs' * commit 'origin/ser_core_cvs': core: log L_CRIT fix sctp: internal macro/hooks for sctp events sctp: internal macro-hooks for stats Conflicts: dprint.c dprint.h ---

1 0

git:ser_core_cvs: core: log L_CRIT fix
by Andrei Pelinescu-Onciul 07 May '09

07 May '09

Module: sip-router Branch: ser_core_cvs Commit: 54dc33029c49da6f0ab28545c80a5aa99483ce42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54dc330… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 7 11:50:41 2009 +0000 core: log L_CRIT fix - don't add a "BUG" prefix to L_CRIT log messages (there are many L_CRIT messages that are not bugs, e.g. parse errors). - added a new level L_BUG, special for BUG use (automatically adds a "BUG" prefix). --- dprint.c | 3 ++- dprint.h | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dprint.c b/dprint.c index ace2d78..aca97ba 100644 --- a/dprint.c +++ b/dprint.c @@ -63,7 +63,8 @@ static int int_fac[]={LOG_AUTH , LOG_CRON , LOG_DAEMON , struct log_level_info log_level_info[] = { {"ALERT", LOG_ALERT}, /* L_ALERT */ - {"BUG", LOG_CRIT}, /* L_CRIT */ + {"BUG", LOG_CRIT}, /* L_BUG */ + {"", LOG_CRIT}, /* L_CRIT */ {"ERROR", LOG_ERR}, /* L_ERR */ {"WARNING", LOG_WARNING}, /* L_WARN */ {"NOTICE", LOG_NOTICE}, /* L_NOTICE */ diff --git a/dprint.h b/dprint.h index 083bd2e..4865bdf 100644 --- a/dprint.h +++ b/dprint.h @@ -72,7 +72,8 @@ /* * Log levels */ -#define L_ALERT -3 +#define L_ALERT -4 +#define L_BUG -3 #define L_CRIT -2 #define L_ERR -1 #define L_WARN 0 @@ -230,7 +231,7 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val); */ #ifdef __SUNPRO_C # define ALERT(...) LOG(L_ALERT, __VA_ARGS__) -# define BUG(...) LOG(L_CRIT, __VA_ARGS__) +# define BUG(...) LOG(L_BUG, __VA_ARGS__) # define ERR(...) LOG(L_ERR, __VA_ARGS__) # define WARN(...) LOG(L_WARN, __VA_ARGS__) # define NOTICE(...) LOG(L_NOTICE, __VA_ARGS__) @@ -247,7 +248,7 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val); #else # define ALERT(fmt, args...) LOG(L_ALERT, fmt, ## args) -# define BUG(fmt, args...) LOG(L_CRIT, fmt, ## args) +# define BUG(fmt, args...) LOG(L_BUG, fmt, ## args) # define ERR(fmt, args...) LOG(L_ERR, fmt, ## args) # define WARN(fmt, args...) LOG(L_WARN, fmt, ## args) # define NOTICE(fmt, args...) LOG(L_NOTICE, fmt, ## args)

1 0

git:ser_core_cvs: sctp: internal macro/hooks for sctp events
by Andrei Pelinescu-Onciul 07 May '09

07 May '09

Module: sip-router Branch: ser_core_cvs Commit: e11d7294437cee6544fb04c2394a6f31be09c4b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e11d729… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 30 16:39:10 2009 +0000 sctp: internal macro/hooks for sctp events Added macros for sctp events (for now empty, or defined to simple example DBG()): SCTP_EV_ASSOC_CHANGE SCTP_EV_PEER_ADDR_CHANGE SCTP_EV_REMOTE_ERROR SCTP_EV_SEND_FAILED SCTP_EV_SHUTDOWN_EVENT SCTP_EV_SENDER_DRY_EVENT --- sctp_ev.h | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sctp_server.c | 14 ++++++++ 2 files changed, 111 insertions(+), 0 deletions(-) diff --git a/sctp_ev.h b/sctp_ev.h new file mode 100644 index 0000000..f801023 --- /dev/null +++ b/sctp_ev.h @@ -0,0 +1,97 @@ +/* + * $Id$ + * + * Copyright (C) 2009 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * sctp_ev.h - sctp events + */ +/* + * History: + * -------- + * 2009-04-28 initial version (andrei) +*/ + +#ifndef __sctp_ev_h +#define __sctp_ev_h + +#include <errno.h> +#include <string.h> + +#ifndef USE_SCTP_EV + +#define SCTP_EV_ASSOC_CHANGE(lip, lport, src, reason, state) +#define SCTP_EV_PEER_ADDR_CHANGE(lip, lport, src, reason, state, addr_su) +#define SCTP_EV_REMOTE_ERROR(lip, lport, src, err) +#define SCTP_EV_SEND_FAILED(lip, lport, src, err) +#define SCTP_EV_SHUTDOWN_EVENT(lip, lport, src) +#define SCTP_EV_SENDER_DRY_EVENT(lip, lport, src) + +#else /* USE_SCTP_EV */ + +#include "ip_addr.h" + + +/** an association has either been opened or closed. + * called for each SCTP_ASSOC_CHANGE event. + * + * @param err - if 0 it should be ignored (no corresp. libc error), if non-0 + * it will contain the errno. + * @param lip - pointer to an ip_addr containing the local ip + * or 0 if dynamic (WARNING can be 0). + * @param lport - pointer to an ip_addr containing the local port or 0 + * if unknown/dynamic. + * @param src - pointer to a sockaddr_union containing the src. + * @param proto - protocol used + */ +#define SCTP_EV_ASSOC_CHANGE(lip, lport, src, reason, state) \ + DBG("SCTP_ASSOC_CHANGE from %s on %s:%d: %s\n", \ + su2a(src, sizeof(*(src))), ip_addr2a(lip), lport, reason) + +/** an address part of an assoc. changed state. + * called for the SCTP_PEER_ADDR_CHANGE event.*/ +#define SCTP_EV_PEER_ADDR_CHANGE(lip, lport, src, reason, state, addr_su) \ + DBG("SCTP_PEER_ADDR_CHANGE from %s on %s:%d: %s\n", \ + su2a(src, sizeof(*(src))), ip_addr2a(lip), lport, reason) + +/** remote operation error from the peer. + * called for the SCTP_REMOTE_ERROR event.*/ +#define SCTP_EV_REMOTE_ERROR(lip, lport, src, err) \ + DBG("SCTP_REMOTE_ERROR from %s on %s:%d: %d\n", \ + su2a(src, sizeof(*(src))), ip_addr2a(lip), lport, err) + +/** send failed. + * called for the SCTP_SEND_FAILED event.*/ +#define SCTP_EV_SEND_FAILED(lip, lport, src, err) \ + DBG("SCTP_SEND_FAILED from %s on %s:%d: %d\n", \ + su2a(src, sizeof(*(src))), ip_addr2a(lip), lport, err) + +/** the peer has sent a shutdown. + * called for the SCTP_SHUTDOWN_EVENT event.*/ +#define SCTP_EV_SHUTDOWN_EVENT(lip, lport, src) \ + DBG("SCTP_SHUTDOWN_EVENT from %s on %s:%d\n", \ + su2a(src, sizeof(*(src))), ip_addr2a(lip), lport) + +/** kernel has finished sending all the queued data. + * called for the SCTP_SENDER_DRY_EVENT event.*/ +#define SCTP_EV_SENDER_DRY_EVENT(lip, lport, src) \ + DBG("SCTP_SENDER_DRY_EVENT from %s on %s:%d\n", \ + su2a(src, sizeof(*(src))), ip_addr2a(lip), lport) + +#endif /* USE_SCTP_EV */ + +#endif /*__sctp_ev_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/sctp_server.c b/sctp_server.c index b4aed18..077947d 100644 --- a/sctp_server.c +++ b/sctp_server.c @@ -59,6 +59,7 @@ #include "error.h" #include "timer.h" #include "sctp_stats.h" +#include "sctp_ev.h" @@ -1793,6 +1794,8 @@ static int sctp_handle_notification(struct socket_info* si, case SCTP_REMOTE_ERROR: ERR_LEN_TOO_SMALL(len, sizeof(struct sctp_remote_error), si, su, "SCTP_REMOTE_ERROR"); + SCTP_EV_REMOTE_ERROR(&si->address, si->port_no, su, + ntohs(snp->sn_remote_error.sre_error) ); SNOT("sctp notification from %s on %.*s:%d: SCTP_REMOTE_ERROR:" " %d, len %d\n, assoc_id %d", su2a(su, sizeof(*su)), si->name.len, si->name.s, @@ -1805,6 +1808,8 @@ static int sctp_handle_notification(struct socket_info* si, case SCTP_SEND_FAILED: ERR_LEN_TOO_SMALL(len, sizeof(struct sctp_send_failed), si, su, "SCTP_SEND_FAILED"); + SCTP_EV_SEND_FAILED(&si->address, si->port_no, su, + snp->sn_send_failed.ssf_error); SNOT("sctp notification from %s on %.*s:%d: SCTP_SEND_FAILED:" " error %d, assoc_id %d, flags %x\n", su2a(su, sizeof(*su)), si->name.len, si->name.s, @@ -1816,6 +1821,10 @@ static int sctp_handle_notification(struct socket_info* si, case SCTP_PEER_ADDR_CHANGE: ERR_LEN_TOO_SMALL(len, sizeof(struct sctp_paddr_change), si, su, "SCTP_PEER_ADDR_CHANGE"); + SCTP_EV_PEER_ADDR_CHANGE(&si->address, si->port_no, su, + sctp_paddr_change_state2s(snp->sn_paddr_change.spc_state), + snp->sn_paddr_change.spc_state, + &snp->sn_paddr_change.spc_aaddr); strcpy(su_buf, su2a((union sockaddr_union*) &snp->sn_paddr_change.spc_aaddr, sizeof(snp->sn_paddr_change.spc_aaddr))); @@ -1831,6 +1840,7 @@ static int sctp_handle_notification(struct socket_info* si, SCTP_STATS_REMOTE_SHUTDOWN(); ERR_LEN_TOO_SMALL(len, sizeof(struct sctp_shutdown_event), si, su, "SCTP_SHUTDOWN_EVENT"); + SCTP_EV_SHUTDOWN_EVENT(&si->address, si->port_no, su); SNOT("sctp notification from %s on %.*s:%d: SCTP_SHUTDOWN_EVENT:" " assoc_id %d\n", su2a(su, sizeof(*su)), si->name.len, si->name.s, @@ -1839,6 +1849,9 @@ static int sctp_handle_notification(struct socket_info* si, case SCTP_ASSOC_CHANGE: ERR_LEN_TOO_SMALL(len, sizeof(struct sctp_assoc_change), si, su, "SCTP_ASSOC_CHANGE"); + SCTP_EV_ASSOC_CHANGE(&si->address, si->port_no, su, + sctp_assoc_change_state2s(snp->sn_assoc_change.sac_state), + snp->sn_assoc_change.sac_state); SNOT("sctp notification from %s on %.*s:%d: SCTP_ASSOC_CHANGE" ": %s: assoc_id %d, ostreams %d, istreams %d\n", su2a(su, sizeof(*su)), si->name.len, si->name.s, @@ -1877,6 +1890,7 @@ static int sctp_handle_notification(struct socket_info* si, case SCTP_SENDER_DRY_EVENT: ERR_LEN_TOO_SMALL(len, sizeof(struct sctp_sender_dry_event), si, su, "SCTP_SENDER_DRY_EVENT"); + SCTP_EV_REMOTE_ERROR(&si->address, si->port_no, su); SNOT("sctp notification from %s on %.*s:%d: " "SCTP_SENDER_DRY_EVENT on %d\n", su2a(su, sizeof(*su)), si->name.len, si->name.s,

1 0

git:ser_core_cvs: sctp: internal macro-hooks for stats
by Andrei Pelinescu-Onciul 07 May '09

07 May '09

Module: sip-router Branch: ser_core_cvs Commit: 7a66235b9f972d735575ebb839f87f2eaa1b0c61 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a66235… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 30 16:38:54 2009 +0000 sctp: internal macro-hooks for stats Added macros for sctp statistics. (for now empty, keeping more statistics will only involve redefining them): SCTP_STATS_ESTABLISHED() - new association is opened successfully SCTP_STATS_CONNECT_FAILED() - attempt to open new assoc. failed SCTP_STATS_LOCAL_REJECT() - local reject of a "connect" attempt (unused for now) SCTP_STATS_REMOTE_SHUTDOWN() SCTP_STATS_COMM_LOST() - error on open association SCTP_STATS_SENDQ_FULL() - send failed due to full buffers (kernel) SCTP_STATS_SEND_FAILED() - send failed for some other reason SCTP_STATS_SEND_FORCE_RETRY() - send failed and retried (sctp_send_retries!=0) --- sctp_server.c | 14 ++++++++ sctp_stats.h | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 0 deletions(-) diff --git a/sctp_server.c b/sctp_server.c index ff2e778..b4aed18 100644 --- a/sctp_server.c +++ b/sctp_server.c @@ -23,6 +23,7 @@ * -------- * 2008-08-07 initial version (andrei) * 2009-02-27 blacklist support (andrei) + * 2009-04-28 sctp stats & events macros (andrei) */ #ifdef USE_SCTP @@ -57,6 +58,7 @@ #include "clist.h" #include "error.h" #include "timer.h" +#include "sctp_stats.h" @@ -1496,6 +1498,10 @@ int init_sctp() int ret; ret=0; + if (INIT_SCTP_STATS()!=0){ + ERR("sctp init: failed to intialize sctp stats\n"); + goto error; + } /* sctp options must be initialized before calling this function */ sctp_conn_no=shm_malloc(sizeof(*sctp_conn_tracked)); if ( sctp_conn_no==0){ @@ -1522,6 +1528,7 @@ void destroy_sctp() #ifdef SCTP_CONN_REUSE destroy_sctp_con_tracking(); #endif + DESTROY_SCTP_STATS(); } @@ -1613,6 +1620,7 @@ static int sctp_handle_send_failed(struct socket_info* si, int ret; ret=-1; + SCTP_STATS_SEND_FAILED(); snp=(union sctp_notification*) buf; retries=snp->sn_send_failed.ssf_info.sinfo_context; @@ -1623,6 +1631,7 @@ static int sctp_handle_send_failed(struct socket_info* si, */ if (retries && (snp->sn_send_failed.ssf_error==0)) { DBG("sctp: RETRY-ing (%d)\n", retries); + SCTP_STATS_SEND_FORCE_RETRY(); retries--; data=(char*)snp->sn_send_failed.ssf_data; data_len=snp->sn_send_failed.ssf_length - @@ -1685,6 +1694,7 @@ static int sctp_handle_assoc_change(struct socket_info* si, ret=-1; switch(state){ case SCTP_COMM_UP: + SCTP_STATS_ESTABLISHED(); atomic_inc(sctp_conn_no); #ifdef SCTP_CONN_REUSE /* new connection, track it */ @@ -1707,6 +1717,7 @@ again: #endif /* SCTP_CONN_REUSE */ break; case SCTP_COMM_LOST: + SCTP_STATS_COMM_LOST(); #ifdef USE_DST_BLACKLIST /* blacklist only if send_retries is turned off (if on we don't know here if we did retry or we are at the first error) */ @@ -1732,6 +1743,7 @@ again: /* do nothing on restart */ break; case SCTP_CANT_STR_ASSOC: + SCTP_STATS_CONNECT_FAILED(); /* do nothing when failing to start an assoc (in this case we never see SCTP_COMM_UP so we never track the assoc) */ @@ -1816,6 +1828,7 @@ static int sctp_handle_notification(struct socket_info* si, ); break; case SCTP_SHUTDOWN_EVENT: + SCTP_STATS_REMOTE_SHUTDOWN(); ERR_LEN_TOO_SMALL(len, sizeof(struct sctp_shutdown_event), si, su, "SCTP_SHUTDOWN_EVENT"); SNOT("sctp notification from %s on %.*s:%d: SCTP_SHUTDOWN_EVENT:" @@ -2162,6 +2175,7 @@ again: "one possible reason is the server is bound to localhost and\n" "attempts to send to the net\n"); }else if (errno==EAGAIN || errno==EWOULDBLOCK){ + SCTP_STATS_SENDQ_FULL(); LOG(L_ERR, "ERROR: sctp_msg_send: failed to send, send buffers" " full\n"); } diff --git a/sctp_stats.h b/sctp_stats.h new file mode 100644 index 0000000..e895ce8 --- /dev/null +++ b/sctp_stats.h @@ -0,0 +1,99 @@ +/* + * $Id$ + * + * Copyright (C) 2009 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * sctp_stats.h - sctp statistics macros + */ +/* + * History: + * -------- + * 2009-04-28 initial version (andrei) +*/ + +#ifndef __sctp_stats_h +#define __sctp_stats_h + + +#ifndef USE_SCTP_STATS + +#define INIT_SCTP_STATS() 0 /* success */ +#define DESTROY_SCTP_STATS() + +#define SCTP_STATS_ESTABLISHED() +#define SCTP_STATS_CONNECT_FAILED() +#define SCTP_STATS_LOCAL_REJECT() +#define SCTP_STATS_REMOTE_SHUTDOWN() +#define SCTP_STATS_COMM_LOST() +#define SCTP_STATS_SENDQ_FULL() +#define SCTP_STATS_SEND_FAILED() +#define SCTP_STATS_SEND_FORCE_RETRY() + +#else /* USE_SCTP_STATS */ + +#define INIT_SCTP_STATS() 0 /* success */ + +#define DESTROY_SCTP_STATS() + + +/** called each time a new sctp assoc. is established. + * sctp notification: SCTP_COMM_UP. + */ +#define SCTP_STATS_ESTABLISHED() + +/** called each time a new outgoing connection/assoc open fails. + * sctp notification: SCTP_CANT_STR_ASSOC + */ +#define SCTP_STATS_CONNECT_FAILED() + +/** called each time a new incoming connection is rejected. */ +#define SCTP_STATS_LOCAL_REJECT() + + +/** called each time a connection is closed by the peer. + * sctp notification: SCTP_SHUTDOWN_EVENT + */ +#define SCTP_STATS_REMOTE_SHUTDOWN() + + +/** called each time an established connection is closed due to some error. + * sctp notification: SCTP_COMM_LOST + */ +#define SCTP_STATS_COMM_LOST() + + +/** called each time a send fails due to the buffering capacity being exceeded. + * (send fails due to full kernel buffers) + */ +#define SCTP_STATS_SENDQ_FULL() + + +/** called each time a send fails. + * (send fails for any reason except buffers full) + * sctp notification: SCTP_SEND_FAILED + */ +#define SCTP_STATS_SEND_FAILED() + +/** called each time a failed send is force-retried. + * (possible only if sctp_send_retries is != 0) + */ +#define SCTP_STATS_SEND_FORCE_RETRY() + +#endif /* USE_SCTP_STATS */ + +#endif /*__sctp_stats_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */

1 0

module startup: Process limit of 36 exceeded.
by Henning Westerholt 07 May '09

07 May '09

Hi, i've tried to run some of my tests written for kamailio on kamailio-3.0 in order to check if the modules can be load. With test/2.cfg i've run into this error: BUG: <core> [pt.c:283]: ERROR: fork_process(): Process limit of 36 exceeded. Will simulate fork fail. Is this something critical? Why is there a limit on the process number and how can i extend this? Thanks, Henning

2 6

Re: [SR-Dev] git:master: tmx: doc updated
by Henning Westerholt 07 May '09

07 May '09

On Sonntag, 3. Mai 2009, Daniel-Constantin Mierla wrote: > 1. Admin Guide > > - 1.1. Overview > - 1.2. Dependencies > [..] > + 1. Overview > + 2. Dependencies (sent again because of some spelling errors in the first mail :-)) Hi Jan, i noticed that the READMEs generated for modules_k looks now a bit different then the ones generated for the modules_s. The k ones uses "1.", the s ones "1.1", for the first chapter for example. Another thing that is missing in the modules_s READMEs, is the list of the examples. Is this a bug or do you wanted to change this? Cheers, Henning

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009