sr-dev March 2009

sr-dev@lists.kamailio.org

14 participants
188 discussions

git:master: fix compiler warning about uninitialized variable
by Henning Westerholt 03 Mar '09

03 Mar '09

Module: sip-router Branch: master Commit: 2891fdcfebf2b9c8313502478136e891be285341 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2891fdc… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Mar 3 19:12:41 2009 +0100 fix compiler warning about uninitialized variable --- lvalue.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lvalue.c b/lvalue.c index 77a9a86..3c409ff 100644 --- a/lvalue.c +++ b/lvalue.c @@ -52,11 +52,10 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, int_str value; unsigned short flags; struct search_state st; - int ret; - int v; - int destroy_pval; + int ret, v, destroy_pval; destroy_pval=0; + flags = 0; avp=&lv->lv.avps; ret=0; /* If the left attr was specified without indexing brackets delete

1 0

kamailio at FFG 2009
by Henning Westerholt 03 Mar '09

03 Mar '09

Hi all, i'll present in the next week the Kamailio project at the FFG 2009 conference. Topics of my talk are: - overview about Kamailio - applications and usage scenarios - new and interesting stuff in the 1.5.0 release - future developments, the sip-router project Date: Thursday, 12.03.2009 Place: Karlsruhe, Germany Link to the abstract (in german as the talk will be also held in german): http://www.guug.de/veranstaltungen/ffg2009/abstracts.html#3_2_1 More information about the event: http://www.guug.de/veranstaltungen/ffg2009/ I'll provide the slides and eventual some notes after the talk as usual. Cheers, Henning

1 0

git:master: integrate sip-router compatiblity patches from Jan Janak
by Henning Westerholt 03 Mar '09

03 Mar '09

Module: sip-router Branch: master Commit: d1930021c4c72ab8876c734ed634fe97d858abf4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d193002… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Mar 3 12:56:29 2009 +0100 integrate sip-router compatiblity patches from Jan Janak - define OPENSER_MOD_INTERFACE in Makefile - link with shared libraries libtrie, libsrdb1, and libkmi - fix paths to dtrie.h and mi.h header files - various fixes to make the module compatible with libsrdb1 - rename sval and ival attributes in gparam structure - use sip-router style of calling do_action - link with libkcore - include lib/kcore/km_crc.h which contains crc32_uint --- modules/carrierroute/Makefile | 5 +++++ modules/carrierroute/cr_db.c | 12 ++++++------ modules/carrierroute/cr_db.h | 2 +- modules/carrierroute/cr_domain.h | 2 +- modules/carrierroute/cr_fifo.h | 2 +- modules/carrierroute/cr_fixup.c | 12 ++++++------ modules/carrierroute/cr_func.c | 13 +++++++------ modules/carrierroute/db_carrierroute.c | 2 +- modules/carrierroute/db_carrierroute.h | 4 ++-- modules/carrierroute/prime_hash.c | 2 +- 10 files changed, 31 insertions(+), 25 deletions(-) diff --git a/modules/carrierroute/Makefile b/modules/carrierroute/Makefile index 9407069..64d364c 100644 --- a/modules/carrierroute/Makefile +++ b/modules/carrierroute/Makefile @@ -24,4 +24,9 @@ endif DEFS+=$(CONFUSEDEFS) LIBS=$(CONFUSELIBS) +DEFS+=-DOPENSER_MOD_INTERFACE + +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/trie/trie $(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/kmi/kmi $(SERLIBPATH)/kcore/kcore + include ../../Makefile.modules diff --git a/modules/carrierroute/cr_db.c b/modules/carrierroute/cr_db.c index bb4d646..3d967c2 100644 --- a/modules/carrierroute/cr_db.c +++ b/modules/carrierroute/cr_db.c @@ -78,7 +78,7 @@ str * failure_columns[FAILURE_COLUMN_NUM] = { static int load_carrier_map(struct route_data_t *rd) { - db_res_t * res = NULL; + db1_res_t * res = NULL; int i, count; if(!rd){ LM_ERR("invalid parameter\n"); @@ -134,7 +134,7 @@ static int load_carrier_map(struct route_data_t *rd) { static int load_domain_map(struct route_data_t *rd) { - db_res_t * res = NULL; + db1_res_t * res = NULL; int i, count; if(!rd){ LM_ERR("invalid parameter\n"); @@ -190,7 +190,7 @@ static int load_domain_map(struct route_data_t *rd) { int load_user_carrier(str * user, str * domain) { - db_res_t * res; + db1_res_t * res; db_key_t cols[1]; db_key_t keys[2]; db_val_t vals[2]; @@ -205,13 +205,13 @@ int load_user_carrier(str * user, str * domain) { keys[0] = subscriber_columns[SUBSCRIBER_USERNAME_COL]; op[0] = OP_EQ; - VAL_TYPE(vals) = DB_STR; + VAL_TYPE(vals) = DB1_STR; VAL_NULL(vals) = 0; VAL_STR(vals) = *user; keys[1] = subscriber_columns[SUBSCRIBER_DOMAIN_COL]; op[1] = OP_EQ; - VAL_TYPE(vals+1) = DB_STR; + VAL_TYPE(vals+1) = DB1_STR; VAL_NULL(vals+1) = 0; VAL_STR(vals+1) = *domain; @@ -254,7 +254,7 @@ int load_user_carrier(str * user, str * domain) { * */ int load_route_data_db(struct route_data_t * rd) { - db_res_t * res = NULL; + db1_res_t * res = NULL; db_row_t * row = NULL; int i, ret; struct carrier_data_t * tmp_carrier_data; diff --git a/modules/carrierroute/cr_db.h b/modules/carrierroute/cr_db.h index 709babc..097bed7 100644 --- a/modules/carrierroute/cr_db.h +++ b/modules/carrierroute/cr_db.h @@ -30,7 +30,7 @@ #ifndef CR_DB_H #define CR_DB_H -#include "../../db/db.h" +#include "../../lib/srdb1/db.h" #include "db_carrierroute.h" #include "cr_data.h" diff --git a/modules/carrierroute/cr_domain.h b/modules/carrierroute/cr_domain.h index 816a9cb..406af0e 100644 --- a/modules/carrierroute/cr_domain.h +++ b/modules/carrierroute/cr_domain.h @@ -32,7 +32,7 @@ #include "../../str.h" #include "../../flags.h" -#include "../../trie/dtrie.h" +#include "../../lib/trie/dtrie.h" /** diff --git a/modules/carrierroute/cr_fifo.h b/modules/carrierroute/cr_fifo.h index 9c6d073..2976645 100644 --- a/modules/carrierroute/cr_fifo.h +++ b/modules/carrierroute/cr_fifo.h @@ -30,7 +30,7 @@ #ifndef CR_FIFO_H #define CR_FIFO_H -#include "../../mi/mi.h" +#include "../../lib/kmi/mi.h" extern int fifo_err; diff --git a/modules/carrierroute/cr_fixup.c b/modules/carrierroute/cr_fixup.c index eeda611..f832af4 100644 --- a/modules/carrierroute/cr_fixup.c +++ b/modules/carrierroute/cr_fixup.c @@ -129,12 +129,12 @@ static int carrier_fixup(void ** param) { /* This is a name string, convert to a int */ ((gparam_p)(*param))->type=GPARAM_TYPE_INT; /* get carrier id */ - if ((id = carrier_name_2_id(&((gparam_p)(*param))->v.sval)) < 0) { - LM_ERR("could not find carrier name '%.*s' in map\n", ((gparam_p)(*param))->v.sval.len, ((gparam_p)(*param))->v.sval.s); + if ((id = carrier_name_2_id(&((gparam_p)(*param))->v.str)) < 0) { + LM_ERR("could not find carrier name '%.*s' in map\n", ((gparam_p)(*param))->v.str.len, ((gparam_p)(*param))->v.str.s); pkg_free(*param); return -1; } - ((gparam_p)(*param))->v.ival = id; + ((gparam_p)(*param))->v.i = id; } return 0; } @@ -160,12 +160,12 @@ static int domain_fixup(void ** param) { /* This is a name string, convert to a int */ ((gparam_p)(*param))->type=GPARAM_TYPE_INT; /* get domain id */ - if ((id = domain_name_2_id(&(((gparam_p)(*param))->v.sval))) < 0) { - LM_ERR("could not find domain name '%.*s' in map\n", ((gparam_p)(*param))->v.sval.len, ((gparam_p)(*param))->v.sval.s); + if ((id = domain_name_2_id(&(((gparam_p)(*param))->v.str))) < 0) { + LM_ERR("could not find domain name '%.*s' in map\n", ((gparam_p)(*param))->v.str.len, ((gparam_p)(*param))->v.str.s); pkg_free(*param); return -1; } - ((gparam_p)(*param))->v.ival = id; + ((gparam_p)(*param))->v.i = id; } return 0; } diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index d6406c9..325c20b 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -80,7 +80,7 @@ static inline int cr_gp2id(struct sip_msg *_msg, gparam_t *gp, struct name_map_t switch (gp->type) { case GPARAM_TYPE_INT: - return gp->v.ival; + return gp->v.i; break; case GPARAM_TYPE_PVE: /* does this PV hold an AVP? */ @@ -496,6 +496,7 @@ int cr_do_route(struct sip_msg * _msg, gparam_t *_carrier, struct carrier_data_t * carrier_data; struct domain_data_t * domain_data; struct action act; + struct run_act_ctx ra_ctx; if (fixup_get_svalue(_msg, _rewrite_user, &rewrite_user)<0) { LM_ERR("cannot print the rewrite_user\n"); @@ -565,12 +566,12 @@ int cr_do_route(struct sip_msg * _msg, gparam_t *_carrier, LM_INFO("uri %.*s was rewritten to %.*s, carrier %d, domain %d\n", rewrite_user.len, rewrite_user.s, dest.len, dest.s, carrier_id, domain_id); + memset(&act, 0, sizeof(act)); act.type = SET_URI_T; - act.elem[0].type= STRING_ST; - act.elem[0].u.string = dest.s; - act.next = NULL; - - ret = do_action(&act, _msg); + act.val[0].type = STRING_ST; + act.val[0].u.string = dest.s; + init_run_actions_ctx(&ra_ctx); + ret = do_action(&ra_ctx, &act, _msg); if (ret < 0) { LM_ERR("Error in do_action()\n"); } diff --git a/modules/carrierroute/db_carrierroute.c b/modules/carrierroute/db_carrierroute.c index 4d19f35..cfe206f 100644 --- a/modules/carrierroute/db_carrierroute.c +++ b/modules/carrierroute/db_carrierroute.c @@ -23,7 +23,7 @@ /* TODO assign read-write or read-only URI, introduce a parameter in XML */ //extern str carrierroute_db_url; -db_con_t * carrierroute_dbh = NULL; +db1_con_t * carrierroute_dbh = NULL; db_func_t carrierroute_dbf; str carrierroute_table = str_init("carrierroute"); diff --git a/modules/carrierroute/db_carrierroute.h b/modules/carrierroute/db_carrierroute.h index 3be17de..cebc30e 100644 --- a/modules/carrierroute/db_carrierroute.h +++ b/modules/carrierroute/db_carrierroute.h @@ -22,7 +22,7 @@ /* necessary includes */ -#include "../../db/db.h" +#include "../../lib/srdb1/db.h" #include "../../str.h" #include "../../ut.h" @@ -32,7 +32,7 @@ /* database variables */ extern str carrierroute_db_url; -extern db_con_t * carrierroute_dbh; +extern db1_con_t * carrierroute_dbh; extern db_func_t carrierroute_dbf; #define carrierroute_DB_URL { "db_url", STR_PARAM, &carrierroute_db_url.s }, diff --git a/modules/carrierroute/prime_hash.c b/modules/carrierroute/prime_hash.c index 7a3400e..8bb9579 100644 --- a/modules/carrierroute/prime_hash.c +++ b/modules/carrierroute/prime_hash.c @@ -31,7 +31,7 @@ #include "../../parser/parse_uri.h" #include "../../parser/parse_to.h" #include "../../parser/parse_from.h" -#include "../../crc.h" +#include "../../lib/kcore/km_crc.h" #include <ctype.h>

1 0

Will SIP-Router handle better TCP childs avoiding blocking?
by Iñaki Baz Castillo 03 Mar '09

03 Mar '09

Hi, a current limitation in Kamailio (and AFAIK also in SER) is that TCP childs block waiting for the connection being established or ended. For example, if we run Kamailio with "tcp_children=8" and receive 8 "hacked" INVITE's via UDP like: INVITE sip:hello@non.responding.host1;transport=TCP SIP/2.0 INVITE sip:hello@non.responding.host2;transport=TCP SIP/2.0 INVITE sip:hello@non.responding.host3;transport=TCP SIP/2.0 ... INVITE sip:hello@non.responding.host2;transport=TCP SIP/2.0 then Kamailio will have all their TCP childs busy waiting for 8 outgoing TCP connections to timeout. If a new request requires TCP it must wait for long time until one of the TCP childs becomes available. Of course this can be very easily hackeable by an attacker. To improve it, a TCP child should not block waiting for the TCP connection to end. Perhaps I'm wrong (I will check it in a testing escenario soon). If not, is it planned to improve it? Thanks a lot. -- Iñaki Baz Castillo

3 7

git:janakj/kcore: Adding crc32_uint
by Jan Janak 03 Mar '09

03 Mar '09

Module: sip-router Branch: janakj/kcore Commit: eed7087d808428e208db4c14ae44e0d73582432b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eed7087… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 03:00:29 2009 +0100 Adding crc32_uint This function is was added by kamailio to crc32.c --- lib/kcore/km_crc.c | 30 ++++++++++++++++++++++++++++++ lib/kcore/km_crc.h | 9 +++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/lib/kcore/km_crc.c b/lib/kcore/km_crc.c new file mode 100644 index 0000000..0950f4e --- /dev/null +++ b/lib/kcore/km_crc.c @@ -0,0 +1,30 @@ +#include "km_crc.h" + +/*! + * \brief CRC32 value from source string + * \param source_string source string + * \param hash_ret calulated CRC32 + */ +void crc32_uint (str *source_string, unsigned int *hash_ret) +{ + unsigned int hash; + unsigned int len; + const char *data; + + hash = 0xffffffff; + data = source_string->s; + + for (len = source_string->len / 4; len--; data += 4) { + hash = crc_32_tab[((unsigned char)hash) ^ data[0]] ^ (hash >> 8); + hash = crc_32_tab[((unsigned char)hash) ^ data[1]] ^ (hash >> 8); + hash = crc_32_tab[((unsigned char)hash) ^ data[2]] ^ (hash >> 8); + hash = crc_32_tab[((unsigned char)hash) ^ data[3]] ^ (hash >> 8); + } + + for (len = source_string->len % 4; len--; data++) { + hash = crc_32_tab[((unsigned char)hash) ^ *data] ^ (hash >> 8); + } + + *hash_ret = hash; +} + diff --git a/lib/kcore/km_crc.h b/lib/kcore/km_crc.h new file mode 100644 index 0000000..43efd54 --- /dev/null +++ b/lib/kcore/km_crc.h @@ -0,0 +1,9 @@ +#ifndef _KM_CRC_H +#define _KM_CRC_H + +#include "../../crc.h" +#include "../../str.h" + +void crc32_uint (str *source_string, unsigned int *hash_ret); + +#endif /* _KM_CRC_H */

1 0

git:master: Define fixup_spve_null
by Jan Janak 03 Mar '09

03 Mar '09

Module: sip-router Branch: master Commit: 32bf8f8ba1d72c0abac4befd3519d603814ebdf1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=32bf8f8… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 02:50:34 2009 +0100 Define fixup_spve_null --- mod_fix.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mod_fix.c b/mod_fix.c index cbb348e..ccd3744 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -233,4 +233,4 @@ FIXUP_F2FP_T(igp_pvar_pvar, 1, 3, 1, FPARAM_INT|FPARAM_PVS, FPARAM_PVS) FIXUP_F_SPVE_T(spve_spve, 1, 2, 2, 0) FIXUP_F_SPVE_T(spve_uint, 1, 2, 2, FPARAM_INT) FIXUP_F_SPVE_T(spve_str, 1, 2, 2, FPARAM_STR) - +FIXUP_F_SPVE_T(spve_null, 1, 1, 1, 0)

1 0

git:master: Alias LM_NOTICE to NOTICE
by Jan Janak 03 Mar '09

03 Mar '09

Module: sip-router Branch: master Commit: 2d09ec6c90ac6e18a6d373ef61cf0ac9d6972696 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d09ec6… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 02:30:45 2009 +0100 Alias LM_NOTICE to NOTICE --- dprint.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dprint.h b/dprint.h index 842cba8..156d051 100644 --- a/dprint.h +++ b/dprint.h @@ -302,7 +302,7 @@ int log_facility_fixup(void *handle, str *name, void **val); #define LM_CRIT CRIT #define LM_ERR ERR #define LM_WARN WARN -#define LM_NOTICE +#define LM_NOTICE NOTICE #define LM_INFO INFO #define LM_DBG DEBUG

1 0

git:janakj/kcore: File radius.h from kamailio core added to libkcore
by Jan Janak 03 Mar '09

03 Mar '09

Module: sip-router Branch: janakj/kcore Commit: 02363feec26cc2ec858badf0ac30c97d4fbb398f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=02363fe… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 00:51:43 2009 +0100 File radius.h from kamailio core added to libkcore This file was originally located at kamailio/radius.h, since the file is missing from the sip router core we need to put it in the library. --- lib/kcore/radius.h | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 136 insertions(+), 0 deletions(-) diff --git a/lib/kcore/radius.h b/lib/kcore/radius.h new file mode 100644 index 0000000..92a44af --- /dev/null +++ b/lib/kcore/radius.h @@ -0,0 +1,136 @@ +/* + * Copyright (C) 2001-2003 FhG Fokus + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * WARNING: Don't forget to update the dictionary if you update this file !!! + * + * History: + * -------- + * 2005-06-28 multi leg call support added (bogdan) + * 2008-09-03 added type field to attribute structure, which is set + * during INIT_AV. + * + */ + +/*! + * \file + * \brief Radius support + */ + + +#ifndef _RADIUS_CORE_H +#define _RADIUS_CORE_H + +#ifndef USE_FREERADIUS + #include <radiusclient-ng.h> + #define DEFAULT_RADIUSCLIENT_CONF \ + "/usr/local/etc/radiusclient-ng/radiusclient.conf" +#else + #include <freeradius-client.h> + #define DEFAULT_RADIUSCLIENT_CONF "" +#endif + + +struct attr { + const char *n; + int v; + unsigned int t; /* type of attribute */ +}; + +struct val { + const char *n; + int v; +}; + +#define A_USER_NAME 0 +#define A_SERVICE_TYPE 1 +#define A_CALLED_STATION_ID 2 +#define A_CALLING_STATION_ID 3 +#define A_ACCT_STATUS_TYPE 4 +#define A_ACCT_SESSION_ID 5 +#define A_SIP_METHOD 6 +#define A_SIP_RESPONSE_CODE 7 +#define A_SIP_CSEQ 8 +#define A_SIP_TO_TAG 9 +#define A_SIP_FROM_TAG 10 +#define A_DIGEST_RESPONSE 11 +#define A_DIGEST_ATTRIBUTES 12 +#define A_SIP_URI_USER 13 +#define A_SIP_URI_HOST 14 +#define A_DIGEST_REALM 15 +#define A_DIGEST_NONCE 16 +#define A_DIGEST_METHOD 17 +#define A_DIGEST_URI 18 +#define A_DIGEST_QOP 19 +#define A_DIGEST_ALGORITHM 20 +#define A_DIGEST_BODY_DIGEST 21 +#define A_DIGEST_CNONCE 22 +#define A_DIGEST_NONCE_COUNT 23 +#define A_DIGEST_USER_NAME 24 +#define A_SIP_GROUP 25 +#define A_CISCO_AVPAIR 26 +#define A_SIP_AVP 27 +#define A_TIME_STAMP 28 +#define A_SIP_CALL_ID 29 +#define A_SIP_REQUEST_HASH 30 +#define A_MAX 31 + +#define V_STATUS_START 0 +#define V_STATUS_STOP 1 +#define V_STATUS_FAILED 2 +#define V_CALL_CHECK 3 +#define V_SIP_SESSION 4 +#define V_GROUP_CHECK 5 +#define V_SIP_CALLER_AVPS 6 +#define V_SIP_CALLEE_AVPS 7 +#define V_SIP_VERIFY_DESTINATION 8 +#define V_SIP_VERIFY_SOURCE 9 +#define V_MAX 10 + +#define INIT_AV(rh, at, nr_at, vl, nr_vl, fn, e1, e2) \ +{ \ + int i; \ + DICT_ATTR *da; \ + DICT_VALUE *dv; \ + \ + for (i = 0; i < nr_at; i++) { \ + if (at[i].n == NULL) \ + continue; \ + da = rc_dict_findattr(rh, at[i].n); \ + if (da == NULL) { \ + LM_ERR("%s: can't get code for the " \ + "%s attribute\n", fn, at[i].n); \ + return e1; \ + } \ + at[i].v = da->value; \ + at[i].t = da->type; \ + } \ + for (i = 0; i < nr_vl; i++) { \ + if (vl[i].n == NULL) \ + continue; \ + dv = rc_dict_findval(rh, vl[i].n); \ + if (dv == NULL) { \ + LM_ERR("%s: can't get code for the " \ + "%s attribute value\n", fn, vl[i].n);\ + return e2; \ + } \ + vl[i].v = dv->value; \ + } \ +} + +#endif

1 0

git:janakj/kcore: Files local_route.[ch] from kamailio core add to libkcore
by Jan Janak 03 Mar '09

03 Mar '09

Module: sip-router Branch: janakj/kcore Commit: bf3d622b425765640287b00f90755709a0d66007 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf3d622… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 00:40:19 2009 +0100 Files local_route.[ch] from kamailio core add to libkcore Kamailio modules that include "../../local_route.h" should be updated to include "../../lib/kcore/local_route.h" instead. --- lib/kcore/local_route.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/local_route.h | 42 +++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 0 deletions(-) diff --git a/lib/kcore/local_route.c b/lib/kcore/local_route.c new file mode 100644 index 0000000..ba2f156 --- /dev/null +++ b/lib/kcore/local_route.c @@ -0,0 +1,78 @@ +/* + *$Id: local_route.c 5132 2008-10-24 11:49:14Z miconda $ + * + * Copyright (C) 2001-2003 FhG Fokus + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! + * \file + * \brief Local Route related functions. + */ + +#include <string.h> + +#include "../../dprint.h" +#include "../../mem/mem.h" + +#include "local_route.h" + +static lrt_info_t* lrt_info_list = 0; +static int lrt_info_no = 0; + + +int lrt_do_init_child(void) +{ + int i; + + for ( i=0; i< lrt_info_no; i++ ) + { + if ( lrt_info_list[i].init && lrt_info_list[i].init()!=0 ) + { + LM_ERR("failed to init child for local route <%s>\n", + lrt_info_list[i].name); + return -1; + } + } + return 0; +} + +int register_lrt_info(lrt_info_t *lrti) +{ + lrt_info_t *l; + + if(lrti==NULL || lrti->name==NULL || lrti->init==NULL) + return 0; + + l = (lrt_info_t*)pkg_realloc(lrt_info_list, + (lrt_info_no+1)*sizeof(lrt_info_t)); + if (l==0) + { + LM_ERR("no more pkg memory\n"); + return -1; + } + + lrt_info_list = l; + lrt_info_list[lrt_info_no].init = lrti->init; + lrt_info_list[lrt_info_no].name = lrti->name; + lrt_info_no++; + + return 0; +} + + diff --git a/lib/kcore/local_route.h b/lib/kcore/local_route.h new file mode 100644 index 0000000..fe1da2c --- /dev/null +++ b/lib/kcore/local_route.h @@ -0,0 +1,42 @@ +/* + *$Id: local_route.h 5132 2008-10-24 11:49:14Z miconda $ + * + * Copyright (C) 2001-2003 FhG Fokus + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! + * \file + * \brief Local Route related functions. + */ + +#ifndef _LOCAL_ROUTE_H_ +#define _LOCAL_ROUTE_H_ + +typedef int (lrt_child_init_f)(void); + +typedef struct _lrt_info { + char *name; + lrt_child_init_f *init; +} lrt_info_t; + +int lrt_do_init_child(void); +int register_lrt_info(lrt_info_t *lrti); + +#endif +

1 0

git:janakj/kcore: Kamailio functions and macros missing in sip-router/ut.h
by Jan Janak 03 Mar '09

03 Mar '09

Module: sip-router Branch: janakj/kcore Commit: 15bb433960da81e252ed25973a27897bc96228c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15bb433… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 00:36:29 2009 +0100 Kamailio functions and macros missing in sip-router/ut.h This is the supplemental file to sip-router/ut.h, the contents of this file was taken from kamailio/ut.h and it contains only functions, variables and defines which are missing in sip-router/ut.h Kamailio modules that included ut.h should be modified to include "lib/kcore/km_ut.h" _in addition to_ "../../ut.h" --- lib/kcore/km_ut.h | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 120 insertions(+), 0 deletions(-) diff --git a/lib/kcore/km_ut.h b/lib/kcore/km_ut.h new file mode 100644 index 0000000..43fc11b --- /dev/null +++ b/lib/kcore/km_ut.h @@ -0,0 +1,120 @@ +/* + *$Id$ + * + * - various general purpose functions + * + * Copyright (C) 2001-2003 FhG Fokus + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +/*! + * \file + * \brief Various utility functions, mostly related to string handling + */ + +#ifndef _KM_UT_H +#define _KM_UT_H + +#include "../../ut.h" + +#ifndef MIN +#define MIN(a, b) (a<b?a:b) +#endif +#ifndef MAX +#define MAX(a, b) (a>b?a:b) +#endif + + +#define append_str(_dest,_src,_len) \ + do{ \ + memcpy( (_dest) , (_src) , (_len) ); \ + (_dest) += (_len) ; \ + }while(0); \ + + + +/* INTeger-TO-Buffer-STRing : convers an unsigned long to a string + * IMPORTANT: the provided buffer must be at least INT2STR_MAX_LEN size !! */ +static inline char* int2bstr(unsigned long l, char *s, int* len) +{ + int i; + i=INT2STR_MAX_LEN-2; + s[INT2STR_MAX_LEN-1]=0; + /* null terminate */ + do{ + s[i]=l%10+'0'; + i--; + l/=10; + }while(l && (i>=0)); + if (l && (i<0)){ + LM_CRIT("overflow error\n"); + } + if (len) *len=(INT2STR_MAX_LEN-2)-i; + return &s[i+1]; +} + + +inline static int hexstr2int(char *c, int len, unsigned int *val) +{ + char *pc; + int r; + char mychar; + + r=0; + for (pc=c; pc<c+len; pc++) { + r <<= 4 ; + mychar=*pc; + if ( mychar >='0' && mychar <='9') r+=mychar -'0'; + else if (mychar >='a' && mychar <='f') r+=mychar -'a'+10; + else if (mychar >='A' && mychar <='F') r+=mychar -'A'+10; + else return -1; + } + *val = r; + return 0; +} + + + +/* + * Convert a str (base 10 or 16) into integer + */ +static inline int strno2int( str *val, unsigned int *mask ) +{ + /* hexa or decimal*/ + if (val->len>2 && val->s[0]=='0' && val->s[1]=='x') { + return hexstr2int( val->s+2, val->len-2, mask); + } else { + return str2int( val, mask); + } +} + + + +/*! right and left space trimming */ +#define trim_spaces_lr(_s_) \ + do{ \ + for(;(_s_).s[(_s_).len-1]==' ';(_s_).s[--(_s_).len]=0); \ + for(;(_s_).s[0]==' ';(_s_).s=(_s_).s+1,(_s_).len--); \ + \ + } \ + while(0); \ + + + +#endif /* _KM_UT_H */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2009