sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: core: mhomed: fix fd leak on error, ipv6, fd no

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: fe6207c8413f2f14d026bfe6eb1032fd903126d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe6207c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 1 20:15:27 2010 +0100 core: mhomed: fix fd leak on error, ipv6, fd no - on error the cached fds were set to 0, without closing them. Now they are not overwritten anymore (opening another one would not help). - try ipv6 only if USE_IPV6 is defined - 0 is a valid value for a fd => changed the initial values and the comparisons to use -1 / <0 - if connect fails with EISCONN disable future caching of the socket (return to the old open new socket, connect(), close() mode). This way mhomed will work even in the unlikely case of an OS where connect()-ing multiple times the same udp socket is not allowed. --- forward.c | 50 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 34 insertions(+), 16 deletions(-) diff --git a/forward.c b/forward.c index c81e95a..2e6f05e 100644 --- a/forward.c +++ b/forward.c @@ -115,12 +115,15 @@ * multihomed hosts */ -static int sock_inet = 0; -static int sock_inet6 = 0; +static int mhomed_sock_cache_disabled = 0; +static int sock_inet = -1; +#ifdef USE_IPV6 +static int sock_inet6 = -1; +#endif /* USE_IPV6 */ struct socket_info* get_out_socket(union sockaddr_union* to, int proto) { - int temp_sock; + int* temp_sock; socklen_t len; union sockaddr_union from; struct socket_info* si; @@ -130,57 +133,72 @@ struct socket_info* get_out_socket(union sockaddr_union* to, int proto) LOG(L_CRIT, "BUG: get_out_socket can only be called for UDP\n"); return 0; } - +retry: switch(to->s.sa_family){ case AF_INET : { - if(sock_inet <= 0){ + if(sock_inet < 0){ sock_inet = socket(AF_INET, SOCK_DGRAM, 0); if (sock_inet==-1) { LM_ERR("socket() failed: %s\n", strerror(errno)); return 0; } } - temp_sock = sock_inet; + temp_sock = &sock_inet; break; } +#ifdef USE_IPV6 case AF_INET6 : { - if(sock_inet6 <= 0){ + if(sock_inet6 < 0){ sock_inet6 = socket(AF_INET6, SOCK_DGRAM, 0); if (sock_inet6==-1) { LM_ERR("socket() failed: %s\n", strerror(errno)); return 0; } } - temp_sock = sock_inet6; + temp_sock = &sock_inet6; break; - } + } +#endif /* USE_IPV6 */ default: { - LM_ERR("Unknow protocol family \n"); + LM_ERR("Unknown protocol family \n"); return 0; } } - if (connect(temp_sock, &to->s, sockaddru_len(*to))==-1) { + if (connect(*temp_sock, &to->s, sockaddru_len(*to))==-1) { + if (errno==EISCONN && !mhomed_sock_cache_disabled){ + /* no multiple connects support on the same socket */ + mhomed_sock_cache_disabled=1; + sock_inet=-1; +#ifdef USE_IPV6 + sock_inet6=-1; +#endif /* USE_IPV6 */ + goto retry; + } LOG(L_ERR, "ERROR: get_out_socket: connect failed: %s\n", strerror(errno)); - sock_inet = 0; - sock_inet6 = 0; goto error; } len=sizeof(from); - if (getsockname(temp_sock, &from.s, &len)==-1) { + if (getsockname(*temp_sock, &from.s, &len)==-1) { LOG(L_ERR, "ERROR: get_out_socket: getsockname failed: %s\n", strerror(errno)); - sock_inet = 0; - sock_inet6 = 0; goto error; } su2ip_addr(&ip, &from); si=find_si(&ip, 0, proto); if (si==0) goto error; DBG("DEBUG: get_out_socket: socket determined: %p\n", si ); + if (unlikely(mhomed_sock_cache_disabled)){ + close(*temp_sock); + *temp_sock=-1; + } return si; error: LOG(L_ERR, "ERROR: get_out_socket: no socket found\n"); + if (unlikely(*temp_sock >=0 && mhomed_sock_cache_disabled)){ + close(*temp_sock); + *temp_sock=-1; + } return 0; }

14 years, 12 months

git:tmp/k3.0_sr_backports: core: update fwd_reqs stat

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 878d2c6bf05eb2d81f00df2618b3b4f216e16bb0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=878d2c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Oct 13 21:40:04 2009 +0200 core: update fwd_reqs stat (cherry picked from commit 6a84eeebc2575d90d5795abb95af33ab37407aef) --- forward.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/forward.c b/forward.c index d7fb827..a9cfc7f 100644 --- a/forward.c +++ b/forward.c @@ -72,6 +72,7 @@ #include "config.h" #include "parser/msg_parser.h" #include "route.h" +#include "events.h" #include "dprint.h" #include "globals.h" #include "cfg_core.h" @@ -581,6 +582,8 @@ end: #endif if (buf) pkg_free(buf); /* received_buf & line_buf will be freed in receive_msg by free_lump_list*/ + if(ret==0) + sr_event_exec(SREV_CORE_STATS, (void*)1); return ret; }

15 years

git:tmp/k3.0_sr_backports: update fwd_rpls statistics

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 2fd39cac8b5768863a439e946a84db300519a478 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2fd39ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 23 16:20:19 2009 +0200 update fwd_rpls statistics (cherry picked from commit 058f978739d0642d3332301eb8f0a0cd2bc64f37) --- forward.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/forward.c b/forward.c index a9cfc7f..a7328e3 100644 --- a/forward.c +++ b/forward.c @@ -745,6 +745,7 @@ int forward_reply(struct sip_msg* msg) msg->via2->host.len, msg->via2->host.s, (unsigned short) msg->via2->port); + sr_event_exec(SREV_CORE_STATS, (void*)2); pkg_free(new_buf); skip: return 0;

15 years

git:tmp/k3.0_sr_backports: kex: support to update core stats via core events

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 492346e52903c48050a2ffadf2071cbca7e3bf34 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=492346e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Oct 13 21:28:42 2009 +0200 kex: support to update core stats via core events (cherry picked from commit ea5ee19268c6a7e6f69df674b16fb19d2a2d6409) --- modules_k/kex/core_stats.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/core_stats.c b/modules_k/kex/core_stats.c index 121bb15..466dd11 100644 --- a/modules_k/kex/core_stats.c +++ b/modules_k/kex/core_stats.c @@ -36,6 +36,7 @@ #include "../../lib/kcore/statistics.h" #include "../../lib/kmi/mi.h" +#include "../../events.h" #include "../../dprint.h" #include "../../timer.h" #include "../../parser/msg_parser.h" @@ -127,6 +128,49 @@ static int km_cb_rpl_stats(struct sip_msg *msg, return 1; } + +static int sts_update_core_stats(void *data) +{ + int type; + + type = (int)data; + switch(type) { + case 1: + /* fwd_requests */ + update_stat(fwd_reqs, 1); + break; + case 2: + /* fwd_replies */ + update_stat(fwd_rpls, 1); + break; + case 3: + /* drop_requests */ + update_stat(drp_reqs, 1); + break; + case 4: + /* drop_replies */ + update_stat(drp_rpls, 1); + break; + case 5: + /* err_requests */ + update_stat(err_reqs, 1); + break; + case 6: + /* err_replies */ + update_stat(err_rpls, 1); + break; + case 7: + /* bad_URIs_rcvd */ + update_stat(bad_URIs, 1); + break; + case 8: + /* bad_msg_hdr */ + update_stat(bad_msg_hdr, 1); + break; + } + return 0; +} + int register_core_stats(void) { /* register core statistics */ @@ -147,6 +191,7 @@ int register_core_stats(void) LM_ERR("failed to register PRE request callback\n"); return -1; } + sr_event_register_cb(SREV_CORE_STATS, sts_update_core_stats); return 0; }

15 years

git:tmp/k3.0_sr_backports: update drp_rpls statistics

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: c7ccd4a4cd8aa1e4e7bcb0d9419edcc15ae94034 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c7ccd4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 23 16:39:59 2009 +0200 update drp_rpls statistics (cherry picked from commit 770ced3) --- forward.c | 6 +++++- receive.c | 4 ++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/forward.c b/forward.c index a7328e3..eae80ed 100644 --- a/forward.c +++ b/forward.c @@ -736,7 +736,11 @@ int forward_reply(struct sip_msg* msg) } #endif - if (msg_send(&dst, new_buf, new_len)<0) goto error; + if (msg_send(&dst, new_buf, new_len)<0) + { + sr_event_exec(SREV_CORE_STATS, (void*)4); + goto error; + } #ifdef STATS STATS_TX_RESPONSE( (msg->first_line.u.reply.statuscode/100) ); #endif diff --git a/receive.c b/receive.c index 5047d3a..4b0c755 100644 --- a/receive.c +++ b/receive.c @@ -226,7 +226,10 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) on via1 being parsed in a pre-script callback --andrei */ if (exec_pre_script_cb(msg, ONREPLY_CB_TYPE)==0 ) + { + sr_event_exec(SREV_CORE_STATS, (void*)4); goto end; /* drop the request */ + } /* exec the onreply routing script */ if (onreply_rt.rlist[DEFAULT_RT]){ @@ -240,6 +243,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) }else #endif /* NO_ONREPLY_ROUTE_ERROR */ if (unlikely(ret==0 || (ctx.run_flags&DROP_R_F))){ + sr_event_exec(SREV_CORE_STATS, (void*)4); goto skip_send_reply; /* drop the message, no error */ } }

15 years

git:tmp/k3.0_sr_backports: update err_reqs statistics

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: ea647479ab4a89f2a69062d19bd165c5d14f49c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea64747… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 23 16:08:40 2009 +0200 update err_reqs statistics (cherry picked from commit e524a9512dbd24b56713dcf8f0fce1d44b46ae0b) --- receive.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/receive.c b/receive.c index ed75e0d..5047d3a 100644 --- a/receive.c +++ b/receive.c @@ -149,6 +149,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) if ((msg->via1==0) || (msg->via1->error!=PARSE_OK)){ /* no via, send back error ? */ LOG(L_ERR, "ERROR: receive_msg: no via found in request\n"); + sr_event_exec(SREV_CORE_STATS, (void*)5); goto error02; } /* check if necessary to add receive?->moved to forward_req */

15 years

git:tmp/k3.0_sr_backports: update drp_reqs statistics

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 45a368cb040ef8e94fa39d1ddf6fe85faabce8f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45a368c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 23 16:48:16 2009 +0200 update drp_reqs statistics (cherry picked from commit f4b64fc173c4ecc470346f05514af43adbda294a) --- forward.c | 2 ++ receive.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/forward.c b/forward.c index eae80ed..3a4fbf4 100644 --- a/forward.c +++ b/forward.c @@ -584,6 +584,8 @@ end: /* received_buf & line_buf will be freed in receive_msg by free_lump_list*/ if(ret==0) sr_event_exec(SREV_CORE_STATS, (void*)1); + else + sr_event_exec(SREV_CORE_STATS, (void*)3); return ret; } diff --git a/receive.c b/receive.c index 4b0c755..60eefa7 100644 --- a/receive.c +++ b/receive.c @@ -183,7 +183,10 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) on via1 being parsed in a pre-script callback --andrei */ if (exec_pre_script_cb(msg, REQUEST_CB_TYPE)==0 ) + { + sr_event_exec(SREV_CORE_STATS, (void*)3); goto end; /* drop the request */ + } set_route_type(REQUEST_ROUTE); /* exec the routing script */

15 years

git:tmp/k3.0_sr_backports: update bad_msg_hdr statistics

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: f17084c770018a3c43e0161ef6c00764e9dac3df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f17084c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 23 15:51:39 2009 +0200 update bad_msg_hdr statistics (cherry picked from commit 0c7926f1a854aed5af4541518bc0cacdf4fce7e7) --- parser/msg_parser.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 8f3b163..48f666c 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -54,6 +54,7 @@ #include "../data_lump_rpl.h" #include "../mem/mem.h" #include "../error.h" +#include "../events.h" #include "../globals.h" #include "parse_hname2.h" #include "parse_uri.h" @@ -278,6 +279,7 @@ char* get_hdr_field(char* buf, char* end, struct hdr_field* hdr) return tmp; error: DBG("get_hdr_field: error exit\n"); + sr_event_exec(SREV_CORE_STATS, (void*)8); hdr->type=HDR_ERROR_T; hdr->len=tmp-hdr->name.s; return tmp;

15 years

git:tmp/k3.0_sr_backports: update bad_URIs statistics

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 1c18ae3f870eb48a04d13b7a750575b17060cfb3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c18ae3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 23 15:57:40 2009 +0200 update bad_URIs statistics (cherry picked from commit feef8d66b067e34459660be78b1f6b2625eaa533) --- parser/parse_uri.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/parser/parse_uri.c b/parser/parse_uri.c index 741258e..efcc54b 100644 --- a/parser/parse_uri.c +++ b/parser/parse_uri.c @@ -50,6 +50,7 @@ #include "../ut.h" /* q_memchr */ /* #endif */ #include "../error.h" +#include "../events.h" /* buf= pointer to begining of uri (sip:x@foo.bar:5060;a=b?h=i) * len= len of uri @@ -1223,6 +1224,7 @@ error_bug: error_exit: ser_error=E_BAD_URI; uri->type=ERROR_URI_T; + sr_event_exec(SREV_CORE_STATS, (void*)7); return E_BAD_URI; }

15 years

git:tmp/k3.0_sr_backports: core: stats events cbs are called only if USE_CORE_STATS is defined

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 6b109fa2ae51e1b5676d163f015c8cda7ea4eef6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b109fa… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 1 18:20:10 2010 +0100 core: stats events cbs are called only if USE_CORE_STATS is defined Use macros instead of triggering directly various SREV_CORE_STATS callbacks. This way if compiled without core stats support (USE_CORE_STATS), there will be no performance impact (the macros will be empty). All the macros are defined in core_stats.h. --- core_stats.h | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++ forward.c | 11 ++++-- parser/msg_parser.c | 4 +- parser/parse_uri.c | 4 +- receive.c | 13 ++++--- 5 files changed, 117 insertions(+), 14 deletions(-) diff --git a/core_stats.h b/core_stats.h new file mode 100644 index 0000000..729d73e --- /dev/null +++ b/core_stats.h @@ -0,0 +1,99 @@ +/* + * $Id$ + * + * Copyright (C) 2010 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. + */ +/** macros used for various core statistics. + * (if USE_CORE_STATS is not defined they won't do anything) + * @file core_stats.h + * @ingroup core + */ +/* + * History: + * -------- + * 2010-02-01 initial version (andrei) +*/ + +#ifndef __core_stats_h +#define __core_stats_h + +/* define USE_CORE_STATS to enable statistics events + (SREV_CORE_STATS callbacks) */ +/*#define USE_CORE_STATS */ + +#ifndef USE_CORE_STATS + +#define STATS_REQ_FWD_DROP() +#define STATS_REQ_FWD_OK() +#define STATS_RPL_FWD_DROP() +#define STATS_RPL_FWD_OK() +#define STATS_BAD_MSG() +#define STATS_BAD_RPL() +#define STATS_BAD_URI() +#define STATS_BAD_MSG_HDR() + +#else /* USE_CORE_STATS */ + +#include "events.h" + +/** called each time a received request is dropped. + * The request might be dropped explicitly (e.g. pre script callback) + * or there might be an error while trying to forward it (e.g. send). + */ +#define STATS_REQ_FWD_DROP() sr_event_exec(SREV_CORE_STATS, (void*)3) + + +/** called each time forwarding a request succeeds (send).*/ +#define STATS_REQ_FWD_OK() sr_event_exec(SREV_CORE_STATS, (void*)1) + + +/** called each time forwarding a reply fails. + * The reply forwarding might fail due to send errors, + * pre script callbacks (module denying forwarding) or explicit script + * drop (drop or module function returning 0). + */ +#define STATS_RPL_FWD_DROP() sr_event_exec(SREV_CORE_STATS, (void*)4) + + +/* called each time forwarding a reply succeeds. */ +#define STATS_RPL_FWD_OK() sr_event_exec(SREV_CORE_STATS, (void*)2) + + +/** called each time a received request is too bad to process. + * For now it's called in case the message does not have any via. + */ +#define STATS_BAD_MSG() sr_event_exec(SREV_CORE_STATS, (void*)5) + + +/** called each time a received reply is too bad to process. + * For now it's called in case the message does not have any via. + */ +#define STATS_BAD_RPL() sr_event_exec(SREV_CORE_STATS, (void*)6) + + +/** called each time uri parsing fails. */ +#define STATS_BAD_URI() sr_event_exec(SREV_CORE_STATS, (void*)7) + + +/** called each time parsing some header fails. */ +#define STATS_BAD_MSG_HDR() sr_event_exec(SREV_CORE_STATS, (void*)8) + + + +#endif /* USE_CORE_STATS */ + +#endif /*__core_stats_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/forward.c b/forward.c index 3a4fbf4..4b88780 100644 --- a/forward.c +++ b/forward.c @@ -94,6 +94,7 @@ #include "dst_blacklist.h" #endif #include "compiler_opt.h" +#include "core_stats.h" #ifdef DEBUG_DMALLOC #include <dmalloc.h> @@ -582,10 +583,12 @@ end: #endif if (buf) pkg_free(buf); /* received_buf & line_buf will be freed in receive_msg by free_lump_list*/ +#if defined STATS_REQ_FWD_OK || defined STATS_REQ_FWD_DROP if(ret==0) - sr_event_exec(SREV_CORE_STATS, (void*)1); + STATS_REQ_FWD_OK(); else - sr_event_exec(SREV_CORE_STATS, (void*)3); + STATS_REQ_FWD_DROP(); +#endif /* STATS_REQ_FWD_* */ return ret; } @@ -740,7 +743,7 @@ int forward_reply(struct sip_msg* msg) #endif if (msg_send(&dst, new_buf, new_len)<0) { - sr_event_exec(SREV_CORE_STATS, (void*)4); + STATS_RPL_FWD_DROP(); goto error; } #ifdef STATS @@ -751,7 +754,7 @@ int forward_reply(struct sip_msg* msg) msg->via2->host.len, msg->via2->host.s, (unsigned short) msg->via2->port); - sr_event_exec(SREV_CORE_STATS, (void*)2); + STATS_RPL_FWD_OK(); pkg_free(new_buf); skip: return 0; diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 48f666c..1cb530c 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -54,7 +54,7 @@ #include "../data_lump_rpl.h" #include "../mem/mem.h" #include "../error.h" -#include "../events.h" +#include "../core_stats.h" #include "../globals.h" #include "parse_hname2.h" #include "parse_uri.h" @@ -279,7 +279,7 @@ char* get_hdr_field(char* buf, char* end, struct hdr_field* hdr) return tmp; error: DBG("get_hdr_field: error exit\n"); - sr_event_exec(SREV_CORE_STATS, (void*)8); + STATS_BAD_MSG_HDR(); hdr->type=HDR_ERROR_T; hdr->len=tmp-hdr->name.s; return tmp; diff --git a/parser/parse_uri.c b/parser/parse_uri.c index efcc54b..47cb1bc 100644 --- a/parser/parse_uri.c +++ b/parser/parse_uri.c @@ -50,7 +50,7 @@ #include "../ut.h" /* q_memchr */ /* #endif */ #include "../error.h" -#include "../events.h" +#include "../core_stats.h" /* buf= pointer to begining of uri (sip:x@foo.bar:5060;a=b?h=i) * len= len of uri @@ -1224,7 +1224,7 @@ error_bug: error_exit: ser_error=E_BAD_URI; uri->type=ERROR_URI_T; - sr_event_exec(SREV_CORE_STATS, (void*)7); + STATS_BAD_URI(); return E_BAD_URI; } diff --git a/receive.c b/receive.c index 60eefa7..2496e41 100644 --- a/receive.c +++ b/receive.c @@ -64,6 +64,7 @@ #include "tcp_server.h" /* for tcpconn_add_alias */ #include "tcp_options.h" /* for access to tcp_accept_aliases*/ #include "cfg/cfg.h" +#include "core_stats.h" #ifdef DEBUG_DMALLOC #include <mem/dmalloc.h> @@ -149,7 +150,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) if ((msg->via1==0) || (msg->via1->error!=PARSE_OK)){ /* no via, send back error ? */ LOG(L_ERR, "ERROR: receive_msg: no via found in request\n"); - sr_event_exec(SREV_CORE_STATS, (void*)5); + STATS_BAD_MSG(); goto error02; } /* check if necessary to add receive?->moved to forward_req */ @@ -184,7 +185,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) */ if (exec_pre_script_cb(msg, REQUEST_CB_TYPE)==0 ) { - sr_event_exec(SREV_CORE_STATS, (void*)3); + STATS_REQ_FWD_DROP(); goto end; /* drop the request */ } @@ -212,7 +213,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) if ((msg->via1==0) || (msg->via1->error!=PARSE_OK)){ /* no via, send back error ? */ LOG(L_ERR, "ERROR: receive_msg: no via found in reply\n"); - sr_event_exec(SREV_CORE_STATS, (void*)6); + STATS_BAD_RPL(); goto error02; } @@ -230,8 +231,8 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) */ if (exec_pre_script_cb(msg, ONREPLY_CB_TYPE)==0 ) { - sr_event_exec(SREV_CORE_STATS, (void*)4); - goto end; /* drop the request */ + STATS_RPL_FWD_DROP(); + goto end; /* drop the reply */ } /* exec the onreply routing script */ @@ -246,7 +247,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) }else #endif /* NO_ONREPLY_ROUTE_ERROR */ if (unlikely(ret==0 || (ctx.run_flags&DROP_R_F))){ - sr_event_exec(SREV_CORE_STATS, (void*)4); + STATS_RPL_FWD_DROP(); goto skip_send_reply; /* drop the message, no error */ } }

15 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev