sr-dev

sr-dev@lists.kamailio.org

16 participants
45408 discussions

git:andrei/fixups: avp: minor fixes & comments
by Andrei Pelinescu-Onciul 27 Nov '08

27 Nov '08

Module: sip-router Branch: andrei/fixups Commit: 36fe005907cf7e27b0014f0a50d9ae3095174bbb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36fe005… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 27 01:20:52 2008 +0100 avp: minor fixes & comments - free_avp_name() for a regexp avp did not use regfree(...) - changed free_avp_name() prototype to use avp_flags_t for the type - added comments for parse_avp_ident() --- usr_avp.c | 41 +++++++++++++++++++++++++++++++++++++++-- usr_avp.h | 2 +- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/usr_avp.c b/usr_avp.c index e70479c..eea9894 100644 --- a/usr_avp.c +++ b/usr_avp.c @@ -838,6 +838,39 @@ int parse_avp_name( str *name, int *type, int_str *avp_name, int *index) return ret; } + +/** parse an avp indentifier. + * + * Parses the following avp indentifier forms: + * - "i:<number>" - old form, deprecated (e.g. i:42) + * - "s:<string>" - old form, deprecated (e.g. s:foo) + * - "<track>.<name>" (e.g.: f.bar) + * - "<track>.<name>[<index>]" (e.g.: f.bar[1]) + * - "<track><class>.<name>" (e.g: tu.bar) + * - "<track><class>.<name>[<index>]" (e.g: fd.bar[2]) + * - "<string>" (e.g.: foo) + * Where: + * <string> = ascii string + * <id> = ascii string w/o '[', ']', '.' and '/' + * <name> = <id> | '/' regex '/' + * (Note: regex use is deprecated) + * <track> = 'f' | 't' | 'g' + * (from, to or global) + * <class> = 'r' | 'u' | 'd' + * (uri, user or domain) + * <index> = <number> | '-' <number> | '' + * (the avp index, if missing it means AVP_INDEX_ALL, but + * it's use is deprecated) + * More examples: + * "fr.bar[1]" - from track, uri class, avp "bar", the value 1. + * "tu./^foo/" - to track, user class, all avps for which the name + * starts with foo (note RE in avp names are deprecated). + * "t.did" - to track, "did" avp + * + * @param name - avp identifier + * @param *attr - the result will be stored here + * @return 0 on success, -1 on error + */ int parse_avp_ident( str *name, avp_ident_t* attr) { unsigned int id; @@ -967,6 +1000,7 @@ int parse_avp_ident( str *name, avp_ident_t* attr) name->s[name->len-1]=0; if (regcomp(attr->name.re, name->s+1, REG_EXTENDED|REG_NOSUB|REG_ICASE)) { pkg_free(attr->name.re); + attr->name.re=0; name->s[name->len-1] = '/'; goto error; } @@ -1010,10 +1044,13 @@ int parse_avp_spec( str *name, int *type, int_str *avp_name, int *index) } } -void free_avp_name( int *type, int_str *avp_name) +void free_avp_name(avp_flags_t *type, int_str *avp_name) { - if ((*type & AVP_NAME_RE) && (avp_name->re)) + if ((*type & AVP_NAME_RE) && (avp_name->re)){ + regfree(avp_name->re); pkg_free(avp_name->re); + avp_name->re=0; + } } int add_avp_galias_str(char *alias_definition) diff --git a/usr_avp.h b/usr_avp.h index 2b68107..49741cc 100644 --- a/usr_avp.h +++ b/usr_avp.h @@ -197,7 +197,7 @@ int add_avp_galias(str *alias, int type, int_str avp_name); int parse_avp_ident( str *name, avp_ident_t* attr); int parse_avp_name( str *name, int *type, int_str *avp_name, int *index); int parse_avp_spec( str *name, int *type, int_str *avp_name, int *index); -void free_avp_name( int *type, int_str *avp_name); +void free_avp_name( avp_flags_t *type, int_str *avp_name); /* AVP flags functions */ #define MAX_AVPFLAG ((unsigned int)( sizeof(avp_flags_t) * CHAR_BIT - 1 - AVP_CUSTOM_FLAGS))

1 0

git:andrei/fixups: fixups: generic fixups work now on kamailio pvars
by Andrei Pelinescu-Onciul 27 Nov '08

27 Nov '08

Module: sip-router Branch: andrei/fixups Commit: ad4f08c9cf437d8280c07f3673cb050dc3fd714a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad4f08c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 27 01:30:26 2008 +0100 fixups: generic fixups work now on kamailio pvars - fix_param() supports now FPARAM_PVS and FPARAM_PVE (kamailio GPARAM_TYPE_PVS and GPARAM_TYPE_PVE) - added fparam_free_contents() which frees the contents of a fparam_t --- sr_module.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- sr_module.h | 5 ++- 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/sr_module.c b/sr_module.c index 919bde5..114f0d2 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1031,6 +1031,7 @@ int fix_param(int type, void** param) if (regcomp(p->v.regex, *param, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { pkg_free(p->v.regex); + p->v.regex=0; ERR("Bad regular expression '%s'\n", (char*)*param); goto error; } @@ -1058,7 +1059,7 @@ int fix_param(int type, void** param) if (!name.len || name.s[0] != '@') { /* Not a select identifier */ pkg_free(p); - return 1; + return 1; } if (parse_select(&name.s, &p->v.select) < 0) { ERR("Error while parsing select identifier\n"); @@ -1071,7 +1072,37 @@ int fix_param(int type, void** param) p->v.subst = subst_parser(&s); if (!p->v.subst) { ERR("Error while parsing regex substitution\n"); - goto error; + goto error; + } + break; + case FPARAM_PVS: + name.s = (char*)*param; + name.len = strlen(name.s); + trim(&name); + if (!name.len || name.s[0] != '$'){ + /* not a pvs identifier */ + pkg_free(p); + return 1; + } + p->v.pvs=pkg_malloc(sizeof(pv_spec_t)); + if (p->v.pvs==0){ + ERR("out of memory while parsing pv_spec_t\n"); + goto error; + } + if (pv_parse_spec(&name, p->v.pvs)==0){ + ERR("unsupported user field indentifier \"%.*s\"\n", + name.len, name.s); + pkg_free(p->v.pvs); + p->v.pvs=0; + goto error; + } + break; + case FPARAM_PVE: + name.s = (char*)*param; + name.len = strlen(name.s); + if (pv_parse_format(&name, &p->v.pve)<0){ + ERR("bad PVE format: \"%.*s\"\n", name.len, name.s); + goto error; } break; } @@ -1086,6 +1117,63 @@ error: } + +/** fparam_t free function. + * Frees the "content" of a fparam, but not the fparam itself. + * Assumes pkg_malloc'ed content. + * @param fp - fparam to be freed + * + */ +void fparam_free_contents(fparam_t* fp) +{ + + if (fp==0) + return; + switch(fp->type) { + case FPARAM_UNSPEC: + case FPARAM_STRING: /* asciiz string, not str */ + case FPARAM_INT: + case FPARAM_STR: + /* nothing to do */ + return; + case FPARAM_REGEX: + if (fp->v.regex){ + regfree(fp->v.regex); + pkg_free(fp->v.regex); + fp->v.regex=0; + } + break; + case FPARAM_AVP: + free_avp_name(&fp->v.avp.flags, &fp->v.avp.name); + break; + case FPARAM_SELECT: + if (fp->v.select){ + free_select(fp->v.select); + fp->v.select=0; + } + break; + case FPARAM_SUBST: + if (fp->v.subst){ + subst_expr_free(fp->v.subst); + fp->v.subst=0; + } + break; + case FPARAM_PVS: + if (fp->v.pvs){ + pv_spec_free(fp->v.pvs); + fp->v.pvs=0; + } + break; + case FPARAM_PVE: + if (fp->v.pve){ + pv_elem_free_all(fp->v.pve); + fp->v.pve=0; + } + break; + } +} + + /* * Fixup variable string, the parameter can be * AVP, SELECT, or ordinary string. AVP and select diff --git a/sr_module.h b/sr_module.h index 69d476f..1af0ea4 100644 --- a/sr_module.h +++ b/sr_module.h @@ -261,8 +261,8 @@ typedef struct fparam { avp_ident_t avp; /* AVP identifier */ select_t* select; /* select structure */ struct subst_expr* subst; /* Regex substitution */ - struct pv_spec_t* pvs; /* kamailo pseudo-vars */ - struct pv_elem_t* pve; /* kamailo pseudo-vars */ + pv_spec_t* pvs; /* kamailo pseudo-vars */ + pv_elem_t* pve; /* kamailo pseudo-vars in a string */ } v; } fparam_t; @@ -417,6 +417,7 @@ int fix_flag( modparam_t type, void* val, * parameter types */ int fix_param(int type, void** param); +void fparam_free_contents(fparam_t* fp); /* * Fixup variable string, the parameter can be

1 0

git:master: Merge ssh://git.sip-router.org/sip-router into my_branch
by Henning Westerholt 26 Nov '08

26 Nov '08

Module: sip-router Branch: master Commit: 8d41196809f014e00346785b6517bd2c4051901a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d41196… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 24 19:13:59 2008 +0100 Merge ssh://git.sip-router.org/sip-router into my_branch ---

2 10

git:ser_core_cvs: dns: fixed missing sctp SRV queries
by Andrei Pelinescu-Onciul 25 Nov '08

25 Nov '08

Module: sip-router Branch: ser_core_cvs Commit: 887ca9955a33b892e89f6bf0f97be5971da814e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=887ca99… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Nov 25 19:15:05 2008 +0000 dns: fixed missing sctp SRV queries - support for sctp SRV queries was missing --- config.h | 3 +++ resolve.c | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/config.h b/config.h index 4fec2d9..393d1f3 100644 --- a/config.h +++ b/config.h @@ -126,6 +126,9 @@ #define SRV_TLS_PREFIX "_sips._tcp." #define SRV_TLS_PREFIX_LEN (sizeof(SRV_TLS_PREFIX) - 1) +#define SRV_SCTP_PREFIX "_sip._sctp." +#define SRV_SCTP_PREFIX_LEN (sizeof(SRV_SCTP_PREFIX) - 1) + #define SRV_MAX_PREFIX_LEN SRV_TLS_PREFIX_LEN /*used only if PKG_MALLOC is defined*/ diff --git a/resolve.c b/resolve.c index e492244..94e0558 100644 --- a/resolve.c +++ b/resolve.c @@ -1019,6 +1019,11 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, memcpy(tmp+SRV_TLS_PREFIX_LEN, name->s, name->len); tmp[SRV_TLS_PREFIX_LEN + name->len] = '\0'; break; + case PROTO_SCTP: + memcpy(tmp, SRV_SCTP_PREFIX, SRV_SCTP_PREFIX_LEN); + memcpy(tmp+SRV_SCTP_PREFIX_LEN, name->s, name->len); + tmp[SRV_SCTP_PREFIX_LEN + name->len] = '\0'; + break; default: LOG(L_CRIT, "BUG: sip_resolvehost: unknown proto %d\n", srv_proto);

1 0

master branch reverted 2 commits back
by Andrei Pelinescu-Onciul 25 Nov '08

25 Nov '08

I've reverted the master branch back 2 commits back to: 7e69be0441a98653ea0d94c831f64a2947aa4fff (the current master head). If you did git fetch origin or git pull origin master yesterday or today you need to make sure your local repo mirrors the undo on master: git fetch origin If you have a local branch tracking master, on which you haven't done _any_ changes, use: git checkout my_master # example name git reset --hard origin/master # WARNING: you will loose all local # changes! If you did merge (git merge or git pull) master during these 2 days into one of your branches and you did some commit afterwards, backup (e.g. git branch my_branch my_branch_backup) and then try: git checkout my_branch git rebase --onto 7e69be0441a98653ea0d94c831f64a2947aa4fff 8d41196809f014e00346785b6517bd2c4051901a WARNING1: do it only if you have the offending commits in your branch. You can check using: git rev-list my_branch |grep 7e69be0441a98653ea0d94c831f64a2947aa4fff git rev-list my_branch |grep 8d41196809f014e00346785b6517bd2c4051901a WARNING2: look at the log and maybe run gitk. If it doesn't look ok you can revert: git reset --hard ORIG_HEAD If you have local uncommitted changes, either commit them before, or use git stash. Andrei

1 0

git:master: Revert "Merge ssh://git.sip-router.org/ sip-router into my_branch"
by Henning Westerholt 25 Nov '08

25 Nov '08

Module: sip-router Branch: master Commit: 702c132a7320a052e4c1b2cd80cad13aefa557c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=702c132… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Nov 25 12:43:49 2008 +0100 Revert "Merge ssh://git.sip-router.org/sip-router into my_branch" This reverts commit 8d41196809f014e00346785b6517bd2c4051901a. --- lib/README | 3 - lib/trie/Makefile | 9 -- lib/trie/dtrie.c | 248 ----------------------------------------------------- lib/trie/dtrie.h | 174 ------------------------------------- mem/mem.h | 9 -- 5 files changed, 0 insertions(+), 443 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=702…

1 0

git:sip-router: libsr_dbk: added kamailio db interface as lib
by Andrei Pelinescu-Onciul 24 Nov '08

24 Nov '08

Module: sip-router Branch: andrei/dbk_lib Commit: 174881d2ffeb43a06566b57707a398ee8a1bcdf5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=174881d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Nov 21 03:31:32 2008 +0100 libsr_dbk: added kamailio db interface as lib - kamailio db interface tranformed into library (Makefile added, include path changed) --- lib/sr_dbk/Makefile | 14 ++++++++++++++ lib/sr_dbk/README | 14 +++++++++----- lib/sr_dbk/db.c | 8 ++++---- lib/sr_dbk/db_con.h | 2 +- lib/sr_dbk/db_id.c | 6 +++--- lib/sr_dbk/db_id.h | 2 +- lib/sr_dbk/db_key.h | 2 +- lib/sr_dbk/db_pool.c | 2 +- lib/sr_dbk/db_query.c | 2 +- lib/sr_dbk/db_res.c | 4 ++-- lib/sr_dbk/db_row.c | 4 ++-- lib/sr_dbk/db_ut.c | 4 ++-- lib/sr_dbk/db_val.h | 2 +- 13 files changed, 42 insertions(+), 24 deletions(-) diff --git a/lib/sr_dbk/Makefile b/lib/sr_dbk/Makefile new file mode 100644 index 0000000..2c21b96 --- /dev/null +++ b/lib/sr_dbk/Makefile @@ -0,0 +1,14 @@ +# +# example library makefile +# + +include ../../Makefile.defs +auto_gen= +NAME:=sr_dbk +MAJOR_VER=1 +MINOR_VER=0 +BUGFIX_VER=0 +LIBS= + +include ../../Makefile.libs + diff --git a/lib/sr_dbk/README b/lib/sr_dbk/README index bbdc03e..cd4fb44 100644 --- a/lib/sr_dbk/README +++ b/lib/sr_dbk/README @@ -1,7 +1,11 @@ $Id$ -This directory contains generic database support interface. The interface -should be used by all modules willing to communicate with a database. Kamailio -can then switch from one database to another simply by loading a different -database support module. Directory example contains a very simple example -how to use the interface. Directory doc contains the API documentation. +This directory contains the Kamailio generic database support library. +The library should be used by all modules willing to communicate with a +database. Kamailio can then switch from one database to another simply by +loading a different database support module. Directory example contains a +very simple example how to use the interface. Directory doc contains the API +documentation. + +Note that you can use sip-router with 2 different database interfaces: + ser and kamailio. diff --git a/lib/sr_dbk/db.c b/lib/sr_dbk/db.c index f24646a..772bb12 100644 --- a/lib/sr_dbk/db.c +++ b/lib/sr_dbk/db.c @@ -57,10 +57,10 @@ * - \ref db_unixodbc */ -#include "../dprint.h" -#include "../sr_module.h" -#include "../mem/mem.h" -#include "../ut.h" +#include "../../dprint.h" +#include "../../sr_module.h" +#include "../../mem/mem.h" +#include "../../ut.h" #include "db_cap.h" #include "db_id.h" #include "db_pool.h" diff --git a/lib/sr_dbk/db_con.h b/lib/sr_dbk/db_con.h index 08aa0f1..7804f07 100644 --- a/lib/sr_dbk/db_con.h +++ b/lib/sr_dbk/db_con.h @@ -30,7 +30,7 @@ #ifndef DB_CON_H #define DB_CON_H -#include "../str.h" +#include "../../str.h" /*! \brief diff --git a/lib/sr_dbk/db_id.c b/lib/sr_dbk/db_id.c index ad23881..3be3307 100644 --- a/lib/sr_dbk/db_id.c +++ b/lib/sr_dbk/db_id.c @@ -28,9 +28,9 @@ */ #include "db_id.h" -#include "../dprint.h" -#include "../mem/mem.h" -#include "../ut.h" +#include "../../dprint.h" +#include "../../mem/mem.h" +#include "../../ut.h" #include <stdlib.h> #include <string.h> diff --git a/lib/sr_dbk/db_id.h b/lib/sr_dbk/db_id.h index 2650e6e..641417d 100644 --- a/lib/sr_dbk/db_id.h +++ b/lib/sr_dbk/db_id.h @@ -30,7 +30,7 @@ #ifndef _DB_ID_H #define _DB_ID_H -#include "../str.h" +#include "../../str.h" /** Structure representing a database ID */ struct db_id { diff --git a/lib/sr_dbk/db_key.h b/lib/sr_dbk/db_key.h index a03795a..50fd8aa 100644 --- a/lib/sr_dbk/db_key.h +++ b/lib/sr_dbk/db_key.h @@ -30,7 +30,7 @@ #ifndef DB_KEY_H #define DB_KEY_H -#include "../ut.h" +#include "../../ut.h" /** diff --git a/lib/sr_dbk/db_pool.c b/lib/sr_dbk/db_pool.c index a87f7c4..6a1a9fc 100644 --- a/lib/sr_dbk/db_pool.c +++ b/lib/sr_dbk/db_pool.c @@ -27,7 +27,7 @@ * \ingroup db */ -#include "../dprint.h" +#include "../../dprint.h" #include "db_pool.h" diff --git a/lib/sr_dbk/db_query.c b/lib/sr_dbk/db_query.c index eb7a798..609e935 100644 --- a/lib/sr_dbk/db_query.c +++ b/lib/sr_dbk/db_query.c @@ -33,7 +33,7 @@ */ #include <stdio.h> -#include "../dprint.h" +#include "../../dprint.h" #include "db_ut.h" #include "db_query.h" diff --git a/lib/sr_dbk/db_res.c b/lib/sr_dbk/db_res.c index 27d162f..d82fae6 100644 --- a/lib/sr_dbk/db_res.c +++ b/lib/sr_dbk/db_res.c @@ -33,8 +33,8 @@ #include "db_res.h" #include "db_row.h" -#include "../dprint.h" -#include "../mem/mem.h" +#include "../../dprint.h" +#include "../../mem/mem.h" #include <string.h> diff --git a/lib/sr_dbk/db_row.c b/lib/sr_dbk/db_row.c index 090adb7..e690d5b 100644 --- a/lib/sr_dbk/db_row.c +++ b/lib/sr_dbk/db_row.c @@ -33,8 +33,8 @@ #include "db_row.h" #include <string.h> -#include "../dprint.h" -#include "../mem/mem.h" +#include "../../dprint.h" +#include "../../mem/mem.h" /* * Release memory used by row diff --git a/lib/sr_dbk/db_ut.c b/lib/sr_dbk/db_ut.c index 2c86b17..cf7abf3 100644 --- a/lib/sr_dbk/db_ut.c +++ b/lib/sr_dbk/db_ut.c @@ -32,8 +32,8 @@ #include "db_ut.h" -#include "../mem/mem.h" -#include "../dprint.h" +#include "../../mem/mem.h" +#include "../../dprint.h" #include <limits.h> #include </usr/include/limits.h> #include <errno.h> diff --git a/lib/sr_dbk/db_val.h b/lib/sr_dbk/db_val.h index ab9314b..fad0b24 100644 --- a/lib/sr_dbk/db_val.h +++ b/lib/sr_dbk/db_val.h @@ -37,7 +37,7 @@ #define DB_VAL_H #include <time.h> -#include "../str.h" +#include "../../str.h" /**

6 13

master updated
by Andrei Pelinescu-Onciul 24 Nov '08

24 Nov '08

I've merged into master the following branches: andrei/module_interface andrei/mod_f_params andrei/mod_register daniel/pv andrei/fixups I have not merged yet: andrei/dbk_lib janakj/db They have to be sorted out before: lib/sr_dbk taken from andrei/dbk_lib together with the history (contains entire kamailio db history), then renamed into lib/srdb1 and Jan changes applied, + lib/srdb2 from janakj/db. There is also henning/trie, but I guess that could be merged much later (and I don't know if it's ready anyway). Andrei

1 0

git:master: Merge commit 'origin/andrei/mod_f_params'
by Andrei Pelinescu-Onciul 24 Nov '08

24 Nov '08

Module: sip-router Branch: master Commit: bc8bd3d7dbfe7f5ad838fe6afd413f895830c545 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc8bd3d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Nov 24 14:16:52 2008 +0100 Merge commit 'origin/andrei/mod_f_params' * commit 'origin/andrei/mod_f_params': script: variable number of params for functions mod if: more prototypes and defines ---

1 0

git:master: Merge commit 'origin/andrei/fixups'
by Andrei Pelinescu-Onciul 24 Nov '08

24 Nov '08

Module: sip-router Branch: master Commit: 7e69be0441a98653ea0d94c831f64a2947aa4fff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7e69be0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Nov 24 14:18:27 2008 +0100 Merge commit 'origin/andrei/fixups' * commit 'origin/andrei/fixups': fixups: call them even for 0 params. functions str: kamailio str_init compatibility macro fparam_t/gparam_t unification ---

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