sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: core: don't use conditionals in macro arguments

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b7ef15763937e08779fa24d9ad4681be56c2b622 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7ef157… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:46:19 2010 +0200 core: don't use conditionals in macro arguments Older gccs (< 3.3) do not like #ifdefs inside macro calls. --- io_wait.h | 8 +++++--- sctp_server.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/io_wait.h b/io_wait.h index f3ce324..7220dd5 100644 --- a/io_wait.h +++ b/io_wait.h @@ -812,12 +812,14 @@ inline static int io_watch_chg(io_wait_h* h, int fd, short events, int idx ) del_events=e->events & ~events; switch(h->poll_method){ case POLL_POLL: - fd_array_chg(events #ifdef POLLRDHUP + fd_array_chg(events | /* listen to POLLRDHUP by default (if POLLIN) */ - | (((int)!(events & POLLIN) - 1) & POLLRDHUP) -#endif /* POLLRDHUP */ + (((int)!(events & POLLIN) - 1) & POLLRDHUP) ); +#else /* POLLRDHUP */ + fd_array_chg(events); +#endif /* POLLRDHUP */ break; #ifdef HAVE_SELECT case POLL_SELECT: diff --git a/sctp_server.c b/sctp_server.c index 81bd3b7..cfd7015 100644 --- a/sctp_server.c +++ b/sctp_server.c @@ -2475,12 +2475,17 @@ int sctp_rcv_loop() /* get ancillary data */ for (cmsg=CMSG_FIRSTHDR(&msg); cmsg; cmsg=CMSG_NXTHDR(&msg, cmsg)){ +#ifdef SCTP_EXT if (likely((cmsg->cmsg_level==IPPROTO_SCTP) && ((cmsg->cmsg_type==SCTP_SNDRCV) -#ifdef SCTP_EXT || (cmsg->cmsg_type==SCTP_EXTRCV) -#endif - ) && (cmsg->cmsg_len>=CMSG_LEN(sizeof(*sinfo)))) ){ + ) && (cmsg->cmsg_len>=CMSG_LEN(sizeof(*sinfo)))) ) +#else /* !SCTP_EXT -- same as above but w/o SCTP_EXTRCV */ + if (likely((cmsg->cmsg_level==IPPROTO_SCTP) && + ((cmsg->cmsg_type==SCTP_SNDRCV) + ) && (cmsg->cmsg_len>=CMSG_LEN(sizeof(*sinfo)))) ) +#endif /*SCTP_EXT */ + { sinfo=(struct sctp_sndrcvinfo*)CMSG_DATA(cmsg); DBG("sctp recv: message from %s:%d stream %d ppid %x" " flags %x%s tsn %u" " cumtsn %u assoc_id %d\n",

14 years, 5 months

git:master: core: pointer aliasing warning fixes for fix_rval_expr

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: d6dd5f5649bd5b41c7535bde7230251802e88641 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d6dd5f5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:44:59 2010 +0200 core: pointer aliasing warning fixes for fix_rval_expr --- route.c | 18 +++++++++--------- rvalue.c | 21 +++++++++------------ rvalue.h | 2 +- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/route.c b/route.c index f198193..45de184 100644 --- a/route.c +++ b/route.c @@ -549,7 +549,7 @@ int fix_expr(struct expr* exp) to non-rvals, e.g. string, avp a.s.o and needs to be done before MATCH_OP and other fixups) */ if (exp->l_type==RVEXP_O){ - if ((ret=fix_rval_expr(&exp->l.param))<0){ + if ((ret=fix_rval_expr(exp->l.param))<0){ ERR("Unable to fix left rval expression\n"); return ret; } @@ -557,7 +557,7 @@ int fix_expr(struct expr* exp) exp_optimize_left(exp); } if (exp->r_type==RVE_ST){ - if ((ret=fix_rval_expr(&exp->r.param))<0){ + if ((ret=fix_rval_expr(exp->r.param))<0){ ERR("Unable to fix right rval expression\n"); return ret; } @@ -747,7 +747,7 @@ int fix_actions(struct action* a) return E_UNSPEC; } */ - if ((ret=fix_rval_expr(&t->val[0].u.data))<0) + if ((ret=fix_rval_expr(t->val[0].u.data))<0) goto error; } if ( (t->val[1].type==ACTIONS_ST)&&(t->val[1].u.data) ){ @@ -775,7 +775,7 @@ int fix_actions(struct action* a) goto error; } if (t->val[0].u.data){ - if ((ret=fix_rval_expr(&t->val[0].u.data))<0) + if ((ret=fix_rval_expr(t->val[0].u.data))<0) goto error; }else{ LOG(L_CRIT, "BUG: fix_actions: null switch()" @@ -827,7 +827,7 @@ int fix_actions(struct action* a) ret = E_SCRIPT; goto error; } - if ((ret=fix_rval_expr(&t->val[0].u.data))<0) + if ((ret=fix_rval_expr(t->val[0].u.data))<0) goto error; }else{ LOG(L_CRIT, "BUG: fix_actions: null while()" @@ -871,7 +871,7 @@ int fix_actions(struct action* a) ret = E_SCRIPT; goto error; } - if ((ret=fix_rval_expr(&t->val[0].u.data))<0) + if ((ret=fix_rval_expr(t->val[0].u.data))<0) goto error; }else{ LOG(L_CRIT, "BUG: fix_actions: null drop/return" @@ -910,7 +910,7 @@ int fix_actions(struct action* a) goto error; } } - if ((ret=fix_rval_expr(&t->val[1].u.data))<0) + if ((ret=fix_rval_expr(t->val[1].u.data))<0) goto error; break; @@ -963,7 +963,7 @@ int fix_actions(struct action* a) /* expression is not constant => fixup & optimize it */ rve_param_no++; - if ((ret=fix_rval_expr(&t->val[i+2].u.data)) + if ((ret=fix_rval_expr(t->val[i+2].u.data)) < 0) { ERR("rve fixup failed\n"); ret = E_BUG; @@ -1104,7 +1104,7 @@ int fix_actions(struct action* a) if (t->val[0].type == RVE_ST) { rve=(struct rval_expr*)t->val[0].u.data; if (!rve_is_constant(rve)) { - if ((ret=fix_rval_expr(&t->val[0].u.data)) < 0){ + if ((ret=fix_rval_expr(t->val[0].u.data)) < 0){ ERR("route() failed to fix rve at %s:%d\n", (t->cfile)?t->cfile:"line", t->cline); ret = E_BUG; diff --git a/rvalue.c b/rvalue.c index 707a7f4..eeac3d5 100644 --- a/rvalue.c +++ b/rvalue.c @@ -2899,7 +2899,7 @@ static int fix_match_rve(struct rval_expr* rve) v.s.s=0; v.re.regex=0; /* normal fix-up for the left side */ - ret=fix_rval_expr((void**)&rve->left.rve); + ret=fix_rval_expr((void*)rve->left.rve); if (ret<0) return ret; /* fixup the right side (RE) */ @@ -2946,7 +2946,7 @@ static int fix_match_rve(struct rval_expr* rve) goto error; }else{ /* right side is not constant => normal fixup */ - return fix_rval_expr((void**)&rve->right.rve); + return fix_rval_expr((void*)rve->right.rve); } return 0; error: @@ -3688,19 +3688,16 @@ error: /** fix a rval_expr. * fixes action, bexprs, resolves selects, pvars and * optimizes simple sub expressions (e.g. 1+2). - * It might modify *p. * - * @param p - double pointer to a rval_expr (might be changed to a new one) - * @return 0 on success, <0 on error (modifies also *p) + * @param p - pointer to a rval_expr + * @return 0 on success, <0 on error (modifies also *(struct rval_expr*)p) */ -int fix_rval_expr(void** p) +int fix_rval_expr(void* p) { - struct rval_expr** prve; struct rval_expr* rve; int ret; - prve=(struct rval_expr**)p; - rve=*prve; + rve=(struct rval_expr*)p; switch(rve->op){ case RVE_NONE_OP: @@ -3716,7 +3713,7 @@ int fix_rval_expr(void** p) case RVE_DEFINED_OP: case RVE_INT_OP: case RVE_STR_OP: - ret=fix_rval_expr((void**)&rve->left.rve); + ret=fix_rval_expr((void*)rve->left.rve); if (ret<0) return ret; break; case RVE_MUL_OP: @@ -3740,9 +3737,9 @@ int fix_rval_expr(void** p) case RVE_STREQ_OP: case RVE_STRDIFF_OP: case RVE_CONCAT_OP: - ret=fix_rval_expr((void**)&rve->left.rve); + ret=fix_rval_expr((void*)rve->left.rve); if (ret<0) return ret; - ret=fix_rval_expr((void**)&rve->right.rve); + ret=fix_rval_expr((void*)rve->right.rve); if (ret<0) return ret; break; case RVE_MATCH_OP: diff --git a/rvalue.h b/rvalue.h index 90c02b3..8e67c2e 100644 --- a/rvalue.h +++ b/rvalue.h @@ -240,5 +240,5 @@ struct rval_expr* mk_rval_expr2(enum rval_expr_op op, struct rval_expr* rve1, void rve_destroy(struct rval_expr* rve); /** fix a rval_expr. */ -int fix_rval_expr(void** p); +int fix_rval_expr(void* p); #endif /* _rvalue_h */

14 years, 5 months

git:master: core: use const char*/str* for hash functions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: e8ef6f9a86e14e50634a8bae6db0b0e164cda917 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8ef6f9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:40:45 2010 +0200 core: use const char*/str* for hash functions --- hashes.h | 25 +++++++++++++------------ str_hash.h | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/hashes.h b/hashes.h index 58debe4..e6b5f7f 100644 --- a/hashes.h +++ b/hashes.h @@ -83,7 +83,7 @@ /* "raw" 2 strings hash * returns an unsigned int (which you can use modulo table_size as hash value) */ -inline static unsigned int get_hash2_raw(str* key1, str* key2) +inline static unsigned int get_hash2_raw(const str* key1, const str* key2) { char* p; register unsigned v; @@ -101,9 +101,9 @@ inline static unsigned int get_hash2_raw(str* key1, str* key2) /* "raw" 1 string hash * returns an unsigned int (which you can use modulo table_size as hash value) */ -inline static unsigned int get_hash1_raw(char* s, int len) +inline static unsigned int get_hash1_raw(const char* s, int len) { - char* p; + const char* p; register unsigned v; register unsigned h; @@ -148,9 +148,9 @@ inline static unsigned int get_hash1_raw(char* s, int len) /* a little slower than get_hash1_raw() , but better distribution for * numbers and about the same for strings */ -inline static unsigned int get_hash1_raw2(char* s, int len) +inline static unsigned int get_hash1_raw2(const char* s, int len) { - char* p; + const char* p; register unsigned v; register unsigned h; @@ -165,7 +165,7 @@ inline static unsigned int get_hash1_raw2(char* s, int len) /* "raw" 2 strings hash optimized for numeric strings (see above) * returns an unsigned int (which you can use modulo table_size as hash value) */ -inline static unsigned int get_hash2_raw2(str* key1, str* key2) +inline static unsigned int get_hash2_raw2(const str* key1, const str* key2) { char* p; register unsigned v; @@ -184,7 +184,7 @@ inline static unsigned int get_hash2_raw2(str* key1, str* key2) * insensitive) * returns an unsigned int (which you can use modulo table_size as hash value) */ -inline static unsigned int get_hash2_case_raw(str* key1, str* key2) +inline static unsigned int get_hash2_case_raw(const str* key1, const str* key2) { char* p; register unsigned v; @@ -202,9 +202,9 @@ inline static unsigned int get_hash2_case_raw(str* key1, str* key2) /* "raw" 1 string case insensitive hash * returns an unsigned int (which you can use modulo table_size as hash value) */ -inline static unsigned int get_hash1_case_raw(char* s, int len) +inline static unsigned int get_hash1_case_raw(const char* s, int len) { - char* p; + const char* p; register unsigned v; register unsigned h; @@ -218,9 +218,9 @@ inline static unsigned int get_hash1_case_raw(char* s, int len) /* same as get_hash1_raw2, but case insensitive and slower * returns an unsigned int (which you can use modulo table_size as hash value) */ -inline static unsigned int get_hash1_case_raw2(char* s, int len) +inline static unsigned int get_hash1_case_raw2(const char* s, int len) { - char* p; + const char* p; register unsigned v; register unsigned h; @@ -236,7 +236,8 @@ inline static unsigned int get_hash1_case_raw2(char* s, int len) * same as get_hash2_raw2 but case insensitive and slower * returns an unsigned int (which you can use modulo table_size as hash value) */ -inline static unsigned int get_hash2_case_raw2(str* key1, str* key2) +inline static unsigned int get_hash2_case_raw2(const str* key1, + const str* key2) { char* p; register unsigned v; diff --git a/str_hash.h b/str_hash.h index 3c0e17c..1de9748 100644 --- a/str_hash.h +++ b/str_hash.h @@ -96,7 +96,7 @@ inline static void str_hash_add(struct str_hash_table* ht, inline static struct str_hash_entry* str_hash_get(struct str_hash_table* ht, - char* key, int len) + const char* key, int len) { int h; struct str_hash_entry* e;

14 years, 5 months

git:master: core: use const in some ip_addr functions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: e18010e954268a69ccbf72025eaf5f52865d88d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e18010e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:42:54 2010 +0200 core: use const in some ip_addr functions Fixes various warnings (gcc-4.2) in other parts of the code. --- ip_addr.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ip_addr.h b/ip_addr.h index 50fbf58..d751781 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -365,7 +365,8 @@ static inline void sockaddr2ip_addr(struct ip_addr* ip, struct sockaddr* sa) /* compare 2 sockaddr_unions */ -static inline int su_cmp(union sockaddr_union* s1, union sockaddr_union* s2) +static inline int su_cmp(const union sockaddr_union* s1, + const union sockaddr_union* s2) { if (s1->s.sa_family!=s2->s.sa_family) return 0; switch(s1->s.sa_family){ @@ -387,7 +388,7 @@ static inline int su_cmp(union sockaddr_union* s1, union sockaddr_union* s2) /* gets the port number (host byte order) */ -static inline unsigned short su_getport(union sockaddr_union* su) +static inline unsigned short su_getport(const union sockaddr_union* su) { switch(su->s.sa_family){ case AF_INET:

14 years, 5 months

git:master: tm: warnings and avp param init. fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: ff78f8722f20c68f2614788c55300581819a04b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff78f87… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:33:45 2010 +0200 tm: warnings and avp param init. fixes - wrong pointer was passed to pv_get_avp_name(): int instead of unsigned short ( => not the whole int was set and problems on big endian archs). - unneeded pointer casts removed - variables declared at the function start (otherwise older compilers won't work) --- modules/tm/t_funcs.c | 11 +++++++---- modules/tm/t_msgbuilder.c | 4 ++-- modules/tm/t_reply.c | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index 76bd6d8..13e3952 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -402,6 +402,7 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, char* contacts_avp_param) { pv_spec_t avp_spec; + unsigned short avp_type; if (fr_timer_param && *fr_timer_param) { fr_timer_str.s = fr_timer_param; @@ -417,12 +418,12 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, return -1; } - if(pv_get_avp_name(0, &avp_spec.pvp, &fr_timer_avp, - (unsigned short*)&fr_timer_avp_type)!=0) + if(pv_get_avp_name(0, &avp_spec.pvp, &fr_timer_avp, &avp_type)!=0) { LM_ERR("[%s]- invalid AVP definition\n", fr_timer_param); return -1; } + fr_timer_avp_type = avp_type; } else { if (parse_avp_spec( &fr_timer_str, &fr_timer_avp_type, &fr_timer_avp, &fr_timer_index)<0) { @@ -448,11 +449,12 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, } if(pv_get_avp_name(0, &avp_spec.pvp, &fr_inv_timer_avp, - (unsigned short*)&fr_inv_timer_avp_type)!=0) + &avp_type)!=0) { LM_ERR("[%s]- invalid AVP definition\n", fr_inv_timer_param); return -1; } + fr_inv_timer_avp_type = avp_type; } else { if (parse_avp_spec( &fr_inv_timer_str, &fr_inv_timer_avp_type, &fr_inv_timer_avp, &fr_inv_timer_index)<0) { @@ -476,10 +478,11 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, } if(pv_get_avp_name(0, &(avp_spec.pvp), &contacts_avp, - (unsigned short*)&contacts_avp_type) != 0) { + &avp_type) != 0) { LM_ERR("invalid AVP definition <%s>\n", contacts_avp_param); return -1; } + contacts_avp_type = avp_type; } else { if (parse_avp_spec( &contacts_avp_str, &contacts_avp_type, &contacts_avp, &contacts_avp_index)<0) { diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index b334380..340f99a 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -808,7 +808,7 @@ static unsigned long nhop_type(sip_msg_t *orig_inv, rte_t *rtset, * equals the address provided by this route; if does -> loose */ DEBUG("checking INVITE's destination against its first route.\n"); URI_PORT(&topr_uri, uri_port); - if (! (dst_port = su_getport((void *)&dst_inv->to))) + if (! (dst_port = su_getport(&dst_inv->to))) return 0; /* not really expected */ if (dst_port != uri_port) return F_RB_NH_STRICT; @@ -821,7 +821,7 @@ static unsigned long nhop_type(sip_msg_t *orig_inv, rte_t *rtset, /* we have an IP address in route -> comparison can go swiftly */ if (init_su(&uri_sau, uri_ia, uri_port) < 0) return 0; /* not really expected */ - if (su_cmp(&uri_sau, (void *)&dst_inv->to)) + if (su_cmp(&uri_sau, &dst_inv->to)) /* ;lr and sent there */ return F_RB_NH_LOOSE; else diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 1a90844..fcf214d 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1595,6 +1595,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, /* retransmission structure of outbound reply and request */ struct retr_buf *uas_rb; str* to_tag; + str reason; #ifdef TMCB_ONSEND struct tmcb_params onsend_params; #endif @@ -1605,7 +1606,6 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, relayed_msg=0; relayed_code=0; totag_retr=0; - str reason; /* remember, what was sent upstream to know whether we are

14 years, 5 months

git:master: core: typo fix in dns_cache_clone_entry()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 31b1244704964cb123989bac4f03bcff43f5b1fc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=31b1244… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:39:33 2010 +0200 core: typo fix in dns_cache_clone_entry() --- dns_cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index ef3a986..22d1676 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -4112,7 +4112,7 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, /* fix the values and pointers */ new->next = new->prev = NULL; #ifdef DNS_LU_LST - new->last_used_lst.next = new->last_used_lst.next = NULL; + new->last_used_lst.next = new->last_used_lst.prev = NULL; #endif new->rr_lst = (struct dns_rr*)translate_pointer((char*)new, (char*)e, (char*)new->rr_lst);

14 years, 5 months

git:master: nat_traversal(k): register stats only ifdef STATISTICS

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b3c6ac1339901e83fcec6f689c0f007f69a101b4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b3c6ac1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:30:44 2010 +0200 nat_traversal(k): register stats only ifdef STATISTICS --- modules_k/nat_traversal/nat_traversal.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/nat_traversal/nat_traversal.c b/modules_k/nat_traversal/nat_traversal.c index 3e90117..559fb49 100644 --- a/modules_k/nat_traversal/nat_traversal.c +++ b/modules_k/nat_traversal/nat_traversal.c @@ -260,6 +260,7 @@ static pv_export_t pvars[] = { {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; +#ifdef STATISTICS static stat_export_t statistics[] = { {"keepalive_endpoints", STAT_NO_RESET, &keepalive_endpoints}, {"registered_endpoints", STAT_NO_RESET, &registered_endpoints}, @@ -267,6 +268,7 @@ static stat_export_t statistics[] = { {"dialog_endpoints", STAT_NO_RESET, &dialog_endpoints}, {0, 0, 0} }; +#endif struct module_exports exports = { "nat_traversal", // module name @@ -1785,11 +1787,13 @@ mod_init(void) keepalive_params.callid_counter = rand(); keepalive_params.from_tag = rand(); +#ifdef STATISTICS // we need the statistics initialized before restoring the keepalive state if (register_module_stats(exports.name, statistics) < 0) { LM_ERR("failed to initialize module statistics\n"); return -1; } +#endif /*STATISTICS*/ // create hash table to hold NAT contacts nat_table = HashTable_new();

14 years, 5 months

git:master: sst(k): don't register statistics twice

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 53fb4b2bc0c8983a0df6d04dcaf790a8f438aa91 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53fb4b2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:29:28 2010 +0200 sst(k): don't register statistics twice Include kstats_wraper.h and don't register statistics twice (both form mod_init() and via the module exports structure). --- modules_k/sst/sst.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules_k/sst/sst.c b/modules_k/sst/sst.c index 1c162b7..f7c65a8 100644 --- a/modules_k/sst/sst.c +++ b/modules_k/sst/sst.c @@ -50,6 +50,9 @@ #include "../../modules/sl/sl.h" #include "sst_handlers.h" /* also includes sr_module.h needed by handlers */ +#ifdef STATISTICS +#include "../../lib/kcore/kstats_wrapper.h" +#endif MODULE_VERSION @@ -118,6 +121,7 @@ static param_export_t mod_params[]={ { 0,0,0 } }; +#ifdef STATISTICS /* * Export the statistics we have */ @@ -125,13 +129,14 @@ static stat_export_t mod_stats[] = { {"expired_sst", 0, &expired_sst}, {0,0,0} }; +#endif /* STATISTICS */ struct module_exports exports= { "sst", /* module's name */ DEFAULT_DLFLAGS, /* dlopen flags */ cmds, /* exported functions */ mod_params, /* param exports */ - mod_stats, /* exported statistics */ + 0, /* exported statistics (they are registered from mod_init) */ 0, /* exported MI functions */ 0, /* exported pseudo-variables */ 0, /* extra processes */

14 years, 5 months

git:master: nathelper(k): add missing mi.h include

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 40944265f59fafe29dcc5040d8408ff1b935e817 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4094426… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:22:50 2010 +0200 nathelper(k): add missing mi.h include --- modules_k/nathelper/nathelper.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 2706d10..cf55d4b 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -210,6 +210,7 @@ #include "../../pt.h" #include "../../timer_proc.h" #include "../../lib/kmi/attr.h" +#include "../../lib/kmi/mi.h" #include "../../lib/kcore/km_ut.h" #include "../../lib/kcore/parser_helpers.h" #include "../../pvar.h"

14 years, 5 months

git:sr_3.0: modules_k/nathelper: better add_contact_alias/ handle_ruri_alias fix

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: 553e42836221286db831dee39bb907253770ecc2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=553e428… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Aug 26 19:54:49 2010 +0300 modules_k/nathelper: better add_contact_alias/handle_ruri_alias fix - In add_contact_alias/handle_ruri_alias functions, use ~ char both as port and transport protocol separator in (cherry picked from commit 9d80a7e32f1db5e1f166175e55e7868ee75879e7) --- modules_k/nathelper/nathelper.c | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 2113e32..c9808e2 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -1442,7 +1442,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) return -1; } param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ + - 1 /* t */ + 1 /* proto */; + 1 /* ~ */ + 1 /* proto */; param = (char*)pkg_malloc(param_len); if (!param) { LM_ERR("no pkg memory left for alias param\n"); @@ -1460,7 +1460,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) append_chr(at, '~'); port = int2str(msg->rcv.src_port, &len); append_str(at, port, len); - append_chr(at, 't'); + append_chr(at, '~'); if ((msg->rcv.proto < PROTO_UDP) || (msg->rcv.proto > PROTO_SCTP)) { pkg_free(param); LM_ERR("invalid transport protocol\n"); @@ -1500,8 +1500,8 @@ static int handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) { str uri, proto; - char buf[MAX_URI_SIZE], *val, *sep, *trans, *at, *next, *cur_uri, *rest, - *col; + char buf[MAX_URI_SIZE], *val, *sep, *at, *next, *cur_uri, *rest, + *port, *trans; unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, ip_port_len; @@ -1535,25 +1535,24 @@ handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) /* set dst uri based on alias param value */ val = rest + ALIAS_LEN; val_len = rest_len - ALIAS_LEN; - sep = memchr(val, 116 /* t */, val_len); - if (sep == NULL) { - LM_ERR("no 't' in alias param value\n"); + port = memchr(val, 126 /* ~ */, val_len); + if (port == NULL) { + LM_ERR("no '~' in alias param value\n"); return -1; } - at = &(buf[0]); - append_str(at, "sip:", 4); - ip_port_len = sep - val; - alias_len = SALIAS_LEN + ip_port_len + 2 /* tn */; - /* replace ~ with : */ - col = memchr(val, 126 /* ~ */, ip_port_len); - if (col == NULL) { - LM_ERR("no '~' in alias param value\n"); + *(port++) = ':'; + trans = memchr(port, 126 /* ~ */, val_len - (port - val)); + if (trans == NULL) { + LM_ERR("no second '~' in alias param value\n"); return -1; } - *(col) = ':'; + at = &(buf[0]); + append_str(at, "sip:", 4); + ip_port_len = trans - val; + alias_len = SALIAS_LEN + ip_port_len + 2 /* ~n */; memcpy(at, val, ip_port_len); at = at + ip_port_len; - trans = sep + 1; + trans = trans + 1; if ((ip_port_len + 2 > val_len) || (*trans == ';') || (*trans == '?')) { LM_ERR("no proto in alias param\n"); return -1;

14 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev