sr-dev

sr-dev@lists.kamailio.org

16 participants
45408 discussions

git:master: xl-lib: shm memory support, regex back reference parsing, xbind
by Miklos Tirpak 05 Feb '10

05 Feb '10

Module: sip-router Branch: master Commit: e6c25ed7be53c692a4cc805a63175a477a6063e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6c25ed… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Nov 11 10:10:52 2009 +0100 xl-lib: shm memory support, regex back reference parsing, xbind - xl-lib parser supports both pkg and shm memory - new wrapper functions for the shm memory version: - xl_shm_parse_format() - xl_elog_shm_free_all() - The parser can identify the regular expression back references (\1, \2, ...) and call a callback function to farther parse the back reference. Wraper functions for this: - xl_parse_format2() - xl_shm_parse_format2() - xbind() module function has been introduced that can be used to bind to the xl API as opposed to search each exported function individually. --- modules_s/xlog/xl_lib.c | 146 ++++++++++++++++++++++++++++++++++++++++++----- modules_s/xlog/xl_lib.h | 30 ++++++++++ modules_s/xlog/xlog.c | 13 +++- 3 files changed, 171 insertions(+), 18 deletions(-) diff --git a/modules_s/xlog/xl_lib.c b/modules_s/xlog/xl_lib.c index 1242184..a583f62 100644 --- a/modules_s/xlog/xl_lib.c +++ b/modules_s/xlog/xl_lib.c @@ -44,6 +44,7 @@ #include "../../dprint.h" #include "../../mem/mem.h" +#include "../../mem/shm_mem.h" #include "../../ut.h" #include "../../trim.h" #include "../../dset.h" @@ -935,6 +936,13 @@ static void xl_free_select(str *hp) free_select((select_t*)hp->s); } +/* shared memory version of xl_free_select() */ +static void xl_shm_free_select(str *hp) +{ + if (hp && hp->s) + shm_free_select((select_t*)hp->s); +} + static int xl_get_avp(struct sip_msg *msg, str *res, str *hp, int hi, int hf) { int_str name, val; @@ -987,7 +995,35 @@ static int xl_get_special(struct sip_msg *msg, str *res, str *hp, int hi, int hf return 0; } -int xl_parse_format(char *s, xl_elog_p *el) +static int _xl_elog_free_all(xl_elog_p log, int shm) +{ + xl_elog_p t; + while(log) + { + t = log; + log = log->next; + if (t->free_f) + (*t->free_f)(&(t->hparam)); + if (shm) + shm_free(t); + else + pkg_free(t); + } + return 0; +} + +/* Parse an xl-formatted string pointed by s. + * el points to the resulted linked list that is allocated + * in shared memory when shm==1 otherwise in pkg memory. + * If parse_cb is not NULL then regular expression back references + * are passed to the parse_cb function that is supposed to farther parse + * the back reference and fill in the xl_elog_t structure. + * + * Return value: + * 0: success + * -1: error + */ +static int _xl_parse_format(char *s, xl_elog_p *el, int shm, xl_parse_cb parse_cb) { char *p, c; int n = 0; @@ -1010,7 +1046,10 @@ int xl_parse_format(char *s, xl_elog_p *el) while(*p) { e0 = e; - e = pkg_malloc(sizeof(xl_elog_t)); + if (shm) + e = shm_malloc(sizeof(xl_elog_t)); + else + e = pkg_malloc(sizeof(xl_elog_t)); if(!e) goto error; memset(e, 0, sizeof(xl_elog_t)); @@ -1047,6 +1086,35 @@ int xl_parse_format(char *s, xl_elog_p *el) e->itf = xl_get_special; e->hindex = '\t'; break; + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + /* Regular expression back reference found */ + if (!parse_cb) { + /* There is no callback function, hence the + * result will be written as it is. */ + e->itf = xl_get_special; + e->hindex = *p; + break; + } + name.s = p; + /* eat all the numeric characters */ + while ((*(p+1) >= '0') && (*(p+1) <= '9')) + p++; + name.len = p - name.s + 1; + if (parse_cb(&name, shm, e)) { + ERR("xlog: xl_parse_format: failed to parse '%.*s'\n", + name.len, name.s); + goto error; + } + break; default: /* not a special character, it will be just written to the result as it is */ @@ -1506,14 +1574,17 @@ int xl_parse_format(char *s, xl_elog_p *el) case '@': /* fill select structure and call resolve_select */ DBG("xlog: xl_parse_format: @\n"); - n=parse_select(&p, &sel); + if (shm) + n=shm_parse_select(&p, &sel); + else + n=parse_select(&p, &sel); if (n<0) { ERR("xlog: xl_parse_format: parse_select returned error\n"); goto error; } e->itf = xl_get_select; e->hparam.s = (char*)sel; - e->free_f = xl_free_select; + e->free_f = (shm) ? xl_shm_free_select : xl_free_select; p--; break; case '%': @@ -1537,11 +1608,43 @@ cont: return 0; error: - xl_elog_free_all(*el); + _xl_elog_free_all(*el, shm); *el = NULL; return -1; } +/* wrapper function for _xl_parse_format() + * pkg memory version + */ +int xl_parse_format(char *s, xl_elog_p *el) +{ + return _xl_parse_format(s, el, 0 /* pkg mem */, NULL /* callback */); +} + +/* wrapper function for _xl_parse_format() + * shm memory version + */ +int xl_shm_parse_format(char *s, xl_elog_p *el) +{ + return _xl_parse_format(s, el, 1 /* shm mem */, NULL /* callback */); +} + +/* wrapper function for _xl_parse_format() + * pkg memory version + */ +int xl_parse_format2(char *s, xl_elog_p *el, xl_parse_cb cb) +{ + return _xl_parse_format(s, el, 0 /* pkg mem */, cb); +} + +/* wrapper function for _xl_parse_format() + * shm memory version + */ +int xl_shm_parse_format2(char *s, xl_elog_p *el, xl_parse_cb cb) +{ + return _xl_parse_format(s, el, 1 /* shm mem */, cb); +} + int xl_print_log(struct sip_msg* msg, xl_elog_p log, char *buf, int *len) { int n, h; @@ -1624,17 +1727,32 @@ done: return 0; } +/* wrapper function for _xl_elog_free_all() + * pkg memory version + */ int xl_elog_free_all(xl_elog_p log) { - xl_elog_p t; - while(log) - { - t = log; - log = log->next; - if (t->free_f) - (*t->free_f)(&(t->hparam)); - pkg_free(t); - } + return _xl_elog_free_all(log, 0 /* pkg mem */); +} + +/* wrapper function for _xl_elog_free_all() + * shm memory version + */ +int xl_elog_shm_free_all(xl_elog_p log) +{ + return _xl_elog_free_all(log, 1 /* shm mem */); +} + +int xl_bind(xl_api_t *xl_api) +{ + xl_api->xprint = xl_print_log; + xl_api->xparse = xl_parse_format; + xl_api->shm_xparse = xl_shm_parse_format; + xl_api->xparse2 = xl_parse_format2; + xl_api->shm_xparse2 = xl_shm_parse_format2; + xl_api->xfree = xl_elog_free_all; + xl_api->shm_xfree = xl_elog_shm_free_all; + xl_api->xnulstr = xl_get_nulstr; return 0; } diff --git a/modules_s/xlog/xl_lib.h b/modules_s/xlog/xl_lib.h index a1b5c5d..ca6651e 100644 --- a/modules_s/xlog/xl_lib.h +++ b/modules_s/xlog/xl_lib.h @@ -44,16 +44,46 @@ typedef struct _xl_elog struct _xl_elog *next; } xl_elog_t, *xl_elog_p; +/* callback function to parse the regular expression + * back references */ +typedef int (*xl_parse_cb) (str *, int, xl_elog_p); + typedef int (xl_elog_free_all_f)(xl_elog_p log); /* int xl_elog_free_all(xl_elog_p log); */ typedef int (xl_parse_format_f)(char *s, xl_elog_p *el); //int xl_parse_format(char *s, xl_elog_p *el); +typedef int (xl_parse_format2_f)(char *s, xl_elog_p *el, xl_parse_cb cb); typedef int (xl_print_log_f)(struct sip_msg*, xl_elog_t*, char*, int*); //int xl_print_log(struct sip_msg* msg, xl_elog_p log, char *buf, int *len); typedef str* (xl_get_nulstr_f)(void); +typedef struct xl_api { + xl_print_log_f *xprint; + xl_parse_format_f *xparse; + xl_parse_format_f *shm_xparse; + xl_parse_format2_f *xparse2; + xl_parse_format2_f *shm_xparse2; + xl_elog_free_all_f *xfree; + xl_elog_free_all_f *shm_xfree; + xl_get_nulstr_f *xnulstr; +} xl_api_t; + +typedef int (xl_bind_f)(xl_api_t *xl_api); + +/* bind to the xl_lib api */ +xl_bind_f xl_bind; +/* parse and free functions that work with pkg memory */ xl_elog_free_all_f xl_elog_free_all; xl_parse_format_f xl_parse_format; +/* parse and free functions that work with shm memory */ +xl_elog_free_all_f xl_elog_shm_free_all; +xl_parse_format_f xl_shm_parse_format; +/* parse function supporting regexp back references - pkg mem version */ +xl_parse_format2_f xl_parse_format2; +/* parse function supporting regexp back references - shm mem version */ +xl_parse_format2_f xl_shm_parse_format2; + + xl_print_log_f xl_print_log; xl_get_nulstr_f xl_get_nulstr; diff --git a/modules_s/xlog/xlog.c b/modules_s/xlog/xlog.c index 612d06f..6de99fa 100644 --- a/modules_s/xlog/xlog.c +++ b/modules_s/xlog/xlog.c @@ -67,10 +67,15 @@ static cmd_export_t cmds[]={ ONREPLY_ROUTE | BRANCH_ROUTE}, {"xdbg", xdbg, 1, xdbg_fixup, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE}, - {"xprint", (cmd_function)xl_print_log, NO_SCRIPT, 0, 0}, - {"xparse", (cmd_function)xl_parse_format, NO_SCRIPT, 0, 0}, - {"xfree", (cmd_function)xl_elog_free_all, NO_SCRIPT, 0, 0}, - {"xnulstr", (cmd_function)xl_get_nulstr, NO_SCRIPT, 0, 0}, + {"xbind", (cmd_function)xl_bind, NO_SCRIPT, 0, 0}, + {"xprint", (cmd_function)xl_print_log, NO_SCRIPT, 0, 0}, + {"xparse", (cmd_function)xl_parse_format, NO_SCRIPT, 0, 0}, + {"shm_xparse", (cmd_function)xl_shm_parse_format, NO_SCRIPT, 0, 0}, + {"xparse2", (cmd_function)xl_parse_format2, NO_SCRIPT, 0, 0}, + {"shm_xparse2", (cmd_function)xl_shm_parse_format2, NO_SCRIPT, 0, 0}, + {"xfree", (cmd_function)xl_elog_free_all, NO_SCRIPT, 0, 0}, + {"shm_xfree", (cmd_function)xl_elog_shm_free_all, NO_SCRIPT, 0, 0}, + {"xnulstr", (cmd_function)xl_get_nulstr, NO_SCRIPT, 0, 0}, {0,0,0,0,0} };

1 0

git:master: tm: TMCB_E2EACK callback fix
by Miklos Tirpak 05 Feb '10

05 Feb '10

Module: sip-router Branch: master Commit: 3da5ebc8bdc3530d1c61b84665e4dadf6c6cb3e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3da5ebc… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Nov 11 12:24:50 2009 +0100 tm: TMCB_E2EACK callback fix TMCB_E2EACK_RETR_IN was called instead of TMCB_E2EACK_IN for the initial e2e-ACK message. --- modules/tm/t_reply.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 02b03e5..0301ad8 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -271,9 +271,9 @@ int unmatched_totag(struct cell *t, struct sip_msg *ack) if (i->tag.len==tag->len && memcmp(i->tag.s, tag->s, tag->len)==0) { DBG("DEBUG: totag for e2e ACK found: %d\n", i->acked); - /* mark totag as acked and return 0 if this was the first ack - * and 1 otherwise */ - return atomic_get_and_set_int(&i->acked, 1); + /* mark totag as acked and return 1 if this was the first ack + * and 0 otherwise */ + return (atomic_get_and_set_int(&i->acked, 1)==0); } i=i->next; }

1 0

git:master: rename the 'class' variable -- reserved keyword in c++
by Miklos Tirpak 05 Feb '10

05 Feb '10

Module: sip-router Branch: master Commit: 113d89909962ad6ef7b2cdeed387129f34011f6e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=113d899… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Fri Nov 6 17:35:12 2009 +0100 rename the 'class' variable -- reserved keyword in c++ --- resolve.c | 4 ++-- resolve.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resolve.c b/resolve.c index be479c9..b68aadc 100644 --- a/resolve.c +++ b/resolve.c @@ -786,7 +786,7 @@ again: goto error; } rd->type=rtype; - rd->class=class; + rd->pclass=class; rd->ttl=ttl; rd->next=0; memcpy(rd->name, rec_name, rec_name_len); @@ -930,7 +930,7 @@ again: goto error; } rd->type=T_CNAME; - rd->class=fullname_rd->class; + rd->pclass=fullname_rd->pclass; rd->ttl=fullname_rd->ttl; rd->next=head; memcpy(rd->name, name, name_len); diff --git a/resolve.h b/resolve.h index 65bd0c0..9f0d4ef 100644 --- a/resolve.h +++ b/resolve.h @@ -88,7 +88,7 @@ union dns_query{ /* rdata struct*/ struct rdata { unsigned short type; - unsigned short class; + unsigned short pclass; unsigned int ttl; void* rdata; struct rdata* next;

1 0

git:master: dns_cahce: add_record function exported
by Miklos Tirpak 05 Feb '10

05 Feb '10

Module: sip-router Branch: master Commit: 13e59ebb3906b2f2e4414767482e11ed3978f2f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13e59eb… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Nov 9 16:35:29 2009 +0100 dns_cahce: add_record function exported dns_cache_add_record() function has been separated from the RPC interface so that it can be used also from other places. --- dns_cache.c | 160 ++++++++++++++++++++++++++++++++++++++--------------------- dns_cache.h | 17 ++++++ 2 files changed, 120 insertions(+), 57 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index 1e657ea..7605ee6 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -4066,16 +4066,19 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, * * Currently only A, AAAA, and SRV records are supported. */ -static void dns_cache_add_record(rpc_t* rpc, void* ctx, unsigned short type) +int dns_cache_add_record(unsigned short type, + str *name, + int ttl, + str *value, + int priority, + int weight, + int port, + int flags) { struct dns_hash_entry *old=NULL, *new=NULL; struct dns_rr *rr; - str name; - int ttl; - str ip, rr_name; - int flags; + str rr_name; struct ip_addr *ip_addr; - int priority, weight, port; ticks_t expire; int err, h; int size; @@ -4083,63 +4086,52 @@ static void dns_cache_add_record(rpc_t* rpc, void* ctx, unsigned short type) /* eliminate gcc warnings */ ip_addr = 0; size = 0; + rr_name.s = NULL; + rr_name.len = 0; if (!cfg_get(core, core_cfg, use_dns_cache)){ - rpc->fault(ctx, 500, "dns cache support disabled (see use_dns_cache)"); - return; + LOG(L_ERR, "ERROR: dns cache support disabled (see use_dns_cache)\n"); + return -1; } - switch(type) { - case T_A: - case T_AAAA: - if (rpc->scan(ctx, "SdSd", &name, &ttl, &ip, &flags) < 4) - return; - break; - case T_SRV: - if (rpc->scan(ctx, "SddddSd", &name, &ttl, &priority, &weight, &port, - &rr_name, &flags) < 7) - return; - break; - case T_CNAME: - case T_NAPTR: - case T_TXT: - case T_EBL: - case T_PTR: - rpc->fault(ctx, 400, "not implemented"); - return; - default: - rpc->fault(ctx, 400, "unknown type"); - return; + if ((type != T_A) && (type != T_AAAA) && (type != T_SRV)) { + LOG(L_ERR, "ERROR: rr type %d is not implemented\n", + type); + return -1; } if (!flags) { /* fix-up the values */ switch(type) { case T_A: - ip_addr = str2ip(&ip); + ip_addr = str2ip(value); if (!ip_addr) { - rpc->fault(ctx, 400, "Malformed ip address"); - goto error; + LOG(L_ERR, "ERROR: Malformed ip address: %.*s\n", + value->len, value->s); + return -1; } break; case T_AAAA: #ifdef USE_IPV6 - ip_addr = str2ip6(&ip); + ip_addr = str2ip6(value); if (!ip_addr) { - rpc->fault(ctx, 400, "Malformed ip address"); - goto error; + LOG(L_ERR, "ERROR: Malformed ip address: %.*s\n", + value->len, value->s); + return -1; } break; #else /* USE_IPV6 */ - rpc->fault(ctx, 400, "IPv6 support disabled "); - return; + LOG(L_ERR, "ERROR: IPv6 support is disabled\n"); + return -1; #endif /* USE_IPV6 */ - /* case T_SRV: nothing to do */ + case T_SRV: + rr_name = *value; + break; } } /* check whether there is a matching entry in the cache */ - old = dns_hash_get(&name, type, &h, &err); + old = dns_hash_get(name, type, &h, &err); if (old && old->type!=type) { /* probably we found a CNAME instead of the specified type, it is not needed */ @@ -4150,9 +4142,10 @@ static void dns_cache_add_record(rpc_t* rpc, void* ctx, unsigned short type) /* prepare the entry */ if (flags) { /* negative entry */ - new = dns_cache_mk_bad_entry(&name, type, ttl, flags); + new = dns_cache_mk_bad_entry(name, type, ttl, flags); if (!new) { - rpc->fault(ctx, 400, "Failed to add the entry to the cache"); + LOG(L_ERR, "ERROR: Failed to create a negative " + "DNS cache entry\n"); goto error; } } else { @@ -4163,10 +4156,9 @@ static void dns_cache_add_record(rpc_t* rpc, void* ctx, unsigned short type) switch(type) { case T_A: case T_AAAA: - new = dns_cache_mk_ip_entry(&name, ip_addr); + new = dns_cache_mk_ip_entry(name, ip_addr); if (!new) { - rpc->fault(ctx, 400, "Failed to add the entry to" - " the cache"); + LOG(L_ERR, "ERROR: Failed to create an A/AAAA record\n"); goto error; } /* fix the expiration time, dns_cache_mk_ip_entry() sets it @@ -4176,11 +4168,10 @@ static void dns_cache_add_record(rpc_t* rpc, void* ctx, unsigned short type) new->rr_lst->expire = expire; break; case T_SRV: - new = dns_cache_mk_srv_entry(&name, priority, weight, port, + new = dns_cache_mk_srv_entry(name, priority, weight, port, &rr_name, ttl); if (!new) { - rpc->fault(ctx, 400, "Failed to add the entry to" - " the cache"); + LOG(L_ERR, "ERROR: Failed to create an SRV record\n"); goto error; } } @@ -4206,8 +4197,8 @@ static void dns_cache_add_record(rpc_t* rpc, void* ctx, unsigned short type) /* the rr was found in the list */ new = dns_cache_clone_entry(old, 0, 0, 0); if (!new) { - rpc->fault(ctx, 400, "Failed to add the entry to " - "the cache"); + LOG(L_ERR, "ERROR: Failed to clone an existing " + "DNS cache entry\n"); goto error; } /* let the rr point to the new structure */ @@ -4243,8 +4234,8 @@ static void dns_cache_add_record(rpc_t* rpc, void* ctx, unsigned short type) } new = dns_cache_clone_entry(old, size, ttl, &rr); if (!new) { - rpc->fault(ctx, 400, "Failed to add the entry to" - " the cache"); + LOG(L_ERR, "ERROR: Failed to clone an existing " + "DNS cache entry\n"); goto error; } @@ -4269,7 +4260,7 @@ static void dns_cache_add_record(rpc_t* rpc, void* ctx, unsigned short type) LOCK_DNS_HASH(); if (dns_cache_add_unsafe(new)) { - rpc->fault(ctx, 400, "Failed to add the entry to the cache"); + LOG(L_ERR, "ERROR: Failed to add the entry to the cache\n"); UNLOCK_DNS_HASH(); goto error; } else { @@ -4281,7 +4272,7 @@ static void dns_cache_add_record(rpc_t* rpc, void* ctx, unsigned short type) if (old) dns_hash_put(old); - return; + return 0; error: /* leave the old entry in the list, and free the new one */ @@ -4289,6 +4280,7 @@ error: dns_hash_put(old); if (new) dns_destroy_entry(new); + return -1; } @@ -4356,22 +4348,76 @@ void dns_cache_rpc_lookup(rpc_t* rpc, void* ctx) /* wrapper functions for adding and deleting records */ void dns_cache_add_a(rpc_t* rpc, void* ctx) { - dns_cache_add_record(rpc, ctx, T_A); + str name; + int ttl; + str ip; + int flags; + + if (rpc->scan(ctx, "SdSd", &name, &ttl, &ip, &flags) < 4) + return; + + if (dns_cache_add_record(T_A, + &name, + ttl, + &ip, + 0 /* priority */, + 0 /* weight */, + 0 /* port */, + flags) + ) + rpc->fault(ctx, 400, "Failed to add the entry to the cache"); } void dns_cache_add_aaaa(rpc_t* rpc, void* ctx) { - dns_cache_add_record(rpc, ctx, T_AAAA); -} + str name; + int ttl; + str ip; + int flags; + + if (rpc->scan(ctx, "SdSd", &name, &ttl, &ip, &flags) < 4) + return; + if (dns_cache_add_record(T_AAAA, + &name, + ttl, + &ip, + 0 /* priority */, + 0 /* weight */, + 0 /* port */, + flags) + ) + rpc->fault(ctx, 400, "Failed to add the entry to the cache"); +} void dns_cache_add_srv(rpc_t* rpc, void* ctx) { - dns_cache_add_record(rpc, ctx, T_SRV); + str name; + int ttl, priority, weight, port; + str rr_name; + int flags; + + if (rpc->scan(ctx, "SddddSd", &name, &ttl, &priority, &weight, &port, + &rr_name, &flags) < 7 + ) + return; + + if (dns_cache_add_record(T_SRV, + &name, + ttl, + &rr_name, + priority, + weight, + port, + flags) + ) + rpc->fault(ctx, 400, "Failed to add the entry to the cache"); } + + void dns_cache_delete_a(rpc_t* rpc, void* ctx) { dns_cache_delete_record(rpc, ctx, T_A); diff --git a/dns_cache.h b/dns_cache.h index 72ad971..a8a4bd4 100644 --- a/dns_cache.h +++ b/dns_cache.h @@ -350,4 +350,21 @@ void dns_set_server_state(int state); int dns_get_server_state(void); #endif /* DNS_WATCHDOG_SUPPORT */ +/* Adds a new record to the cache. + * If there is an existing record with the same name and value + * (ip address in case of A/AAAA record, name in case of SRV record) + * only the remaining fields are updated. + * + * Currently only A, AAAA, and SRV records are supported. + */ +int dns_cache_add_record(unsigned short type, + str *name, + int ttl, + str *value, + int priority, + int weight, + int port, + int flags); + + #endif

1 0

git:master: tm: new select functions
by Miklos Tirpak 05 Feb '10

05 Feb '10

Module: sip-router Branch: master Commit: 7cbf4e9cbf4b877a661baf67446aeff10cd331cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7cbf4e9… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Nov 11 12:51:16 2009 +0100 tm: new select functions New select functions have been introduced: - @tm.uac.response_retransmission Returns "1" if the response is a retransmission otherwise "-1". - @tm.uac.last_status Returns the last saved status code of the current branch. - @tm.uas.request.neg_ack_retransmission Returns "1" if the negative ACK request is a retransmission otherwise "-1". Note: This select function can be used only for negative ACK messages (ACK for >=300 responses), it should be enhanced in the future to work on any type of requests. --- modules/tm/select.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 94 insertions(+), 0 deletions(-) diff --git a/modules/tm/select.c b/modules/tm/select.c index a477512..0024a61 100644 --- a/modules/tm/select.c +++ b/modules/tm/select.c @@ -36,6 +36,7 @@ #include "../../ut.h" #include "../../select.h" #include "../../select_buf.h" +#include "../../parser/msg_parser.h" #define RETURN0_res(x) {*res=(x);return 0;} @@ -121,6 +122,26 @@ static int select_tm_uas_response(str* res, select_t* s, struct sip_msg* msg) { return 0; } +/* TODO: implement a general select function that works with any + * kind of requests not only with negative ACKs + */ +static int select_tm_uas_request_neg_ack_retransmission(str* res, select_t* s, struct sip_msg* msg) { + int rv; + + SELECT_check(msg); + rv = ((msg->REQ_METHOD == METHOD_ACK) + && (t->uas.status >= 300) + /* Misuse the timer flag of the 200 retransmission buffer + * to check whether or not this is an ACK retransmission. + * Warning: this check is not 100% fail-safe because two + * ACKs can be processed in parallel and none of them + * may be considered a retransmission - Miklos */ + && (t->uas.response.t_active == 0)) ? 1 : -1; + + return int_to_static_buffer(res, rv); +} + + static ABSTRACT_F(select_tm_uac); static int select_tm_uac_count(str* res, select_t* s, struct sip_msg* msg) { @@ -135,6 +156,76 @@ static int select_tm_uac_relayed(str* res, select_t* s, struct sip_msg* msg) { static ABSTRACT_F(select_tm_uac_branch); +/** + * Get last_status from current branch. Helper function. + * @see selects select_tm_uac_last_status + * @see select_tm_uac_response_retransmission + */ +static int get_last_status(struct sip_msg* msg, int *last_status) +{ + unsigned int branch; + char *bptr; + int blen; + struct cell *t; + +/* DBG("select_tm_uac_last_status: branch param name: '%.*s', value: '%.*s'\n", + msg->via1->branch->name.len, + msg->via1->branch->name.s, + msg->via1->branch->value.len, + msg->via1->branch->value.s); +*/ + + /* branch ID consist of MAGIC '.' HASHID '.' BRANCH_ID */ + blen = 0; + for (bptr = msg->via1->branch->value.s + msg->via1->branch->value.len - 1; + bptr != msg->via1->branch->value.s; + bptr--, blen++) + { + if (*bptr == '.') break; + } + bptr++; + /* we have a pointer to the branch number */ +/* DBG("branch number: '%.*s'\n", blen, bptr); */ + if (reverse_hex2int(bptr, blen, &branch) < 0) { + ERR("Wrong branch number in Via1 branch param\n"); + return -1; + } + + t = get_t(); + if ( (t == NULL) || (t == T_UNDEFINED) ) { + ERR("get_last_status: no transaction\n"); + return -1; + } + +/* DBG("select_tm_uac_last_status: branch = %d\n", branch); */ + *last_status = t->uac[branch].last_received; + return 1; +} +/** + * Get last status in current branch. + */ +static int select_tm_uac_last_status(str* res, select_t* s, struct sip_msg* msg) { + int last_status; + if (get_last_status(msg, &last_status) < 0) return -1; + return int_to_static_buffer(res, last_status); +} +/** + * Comparison function which compares current status and last status + * in current branch. + * It is a simplified method how to detect incoming retransmited responses. + * @return 1 if @status is less or equal @tm.uac.last_status (retransmited response) + * otherwise returns -1 (not retransmited response). + * @see get_last_status + */ +static int select_tm_uac_response_retransmission(str* res, select_t* s, struct sip_msg* msg) { + int last_status, rv; + if (get_last_status(msg, &last_status) < 0) return -1; + rv = msg->first_line.u.reply.statuscode <= last_status ? 1 : -1; + +/* DBG("select_tm_uac_response_retransmission: %d\n", rv); */ + return int_to_static_buffer(res, rv); +} + static int select_tm_uac_status(str* res, select_t* s, struct sip_msg* msg) { SELECT_check_branch(s, msg); return int_to_static_buffer(res, t->uac[BRANCH_NO(s)].last_received); @@ -174,10 +265,13 @@ static select_row_t select_declaration[] = { { select_tm_uas, SEL_PARAM_STR, STR_STATIC_INIT("local_to_tag"), select_tm_uas_local_to_tag, 0}, { select_tm_uas, SEL_PARAM_STR, STR_STATIC_INIT("response"), select_tm_uas_response, 0}, { select_tm_uas, SEL_PARAM_STR, STR_STATIC_INIT("resp"), select_tm_uas_response, 0}, + { select_tm_uas_request, SEL_PARAM_STR, STR_STATIC_INIT("neg_ack_retransmission"), select_tm_uas_request_neg_ack_retransmission, 0}, { select_tm, SEL_PARAM_STR, STR_STATIC_INIT("uac"), select_tm_uac, SEL_PARAM_EXPECTED}, { select_tm_uac, SEL_PARAM_STR, STR_STATIC_INIT("count"), select_tm_uac_count, 0}, { select_tm_uac, SEL_PARAM_STR, STR_STATIC_INIT("relayed"), select_tm_uac_relayed, 0}, + { select_tm_uac, SEL_PARAM_STR, STR_STATIC_INIT("last_status"), select_tm_uac_last_status, 0}, /* last status of current branch */ + { select_tm_uac, SEL_PARAM_STR, STR_STATIC_INIT("response_retransmission"), select_tm_uac_response_retransmission, 0}, /* last status of current branch */ { select_tm_uac, SEL_PARAM_INT, STR_NULL, select_tm_uac_branch, SEL_PARAM_EXPECTED}, { select_tm_uac_branch, SEL_PARAM_STR, STR_STATIC_INIT("status"), select_tm_uac_status, 0}, { select_tm_uac_branch, SEL_PARAM_STR, STR_STATIC_INIT("uri"), select_tm_uac_uri, 0},

1 0

git:master: selects: shm_free_select wrapper added
by Miklos Tirpak 05 Feb '10

05 Feb '10

Module: sip-router Branch: master Commit: df1f139a9b33467b2f7b3497462198467efd4397 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df1f139… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Nov 9 17:08:08 2009 +0100 selects: shm_free_select wrapper added shm_free_select() function is added that frees the select parsed by shm_parse_select(). --- select.c | 6 ++++++ select.h | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/select.c b/select.c index f99ff02..f247687 100644 --- a/select.c +++ b/select.c @@ -237,6 +237,12 @@ void free_select(select_t *s) pkg_free(s); } +void shm_free_select(select_t *s) +{ + if (s) + shm_free(s); +} + int shm_parse_select (char** p, select_t** s) { select_t* sel; diff --git a/select.h b/select.h index 5b784eb..035d699 100644 --- a/select.h +++ b/select.h @@ -204,6 +204,12 @@ void free_select(select_t *s); */ int shm_parse_select (char** p, select_t** s); +/** + * Frees the select obtained with shm_parse_select(). + */ +void shm_free_select(select_t *s); + + #define SELECT_F(function) extern int function (str* res, select_t* s, struct sip_msg* msg); #define ABSTRACT_F(function) int function (str* res, select_t* s, struct sip_msg* msg) {return -1;}

1 0

git:master: tm: t_suspend() fixes
by Miklos Tirpak 05 Feb '10

05 Feb '10

Module: sip-router Branch: master Commit: 9431f814d8127a7c6bb82593a75eb6d97fc0d7f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9431f81… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Nov 11 15:21:23 2009 +0100 tm: t_suspend() fixes - t_suspend() and t_continue() checks whether a CANCEL has been processed before the transaction is suspended and before it continues to make sure that the suspend/continue is not done needlessly. - t_continue() verifies that the suspended branch has not timed out yet. - t_cancel_suspend() function is introduced: It can be used for revoking the suspension of the transaction. Useful when any failure occures after the transaction has been suspended and it turns out that the transaction should not have been suspended. --- modules/tm/doc/api.xml | 30 ++++++++++- modules/tm/t_suspend.c | 133 +++++++++++++++++++++++++++++++++++++++++------- modules/tm/t_suspend.h | 4 ++ modules/tm/tm.c | 1 + modules/tm/tm_load.c | 5 ++ modules/tm/tm_load.h | 1 + 6 files changed, 154 insertions(+), 20 deletions(-) diff --git a/modules/tm/doc/api.xml b/modules/tm/doc/api.xml index 51c511c..ee6e03f 100644 --- a/modules/tm/doc/api.xml +++ b/modules/tm/doc/api.xml @@ -239,6 +239,34 @@ end of body </itemizedlist> <para>Return value: 0 - success, <0 - error.</para> </section> - </section> + <section id="t_cancel_suspend"> + <title> + <function>int t_cancel_suspend(unsigned int hash_index, unsigned int label)</function> + </title> + <para> + For programmatic use only. + This function is for revoking t_suspend() from the + same process as it was executed before. t_cancel_suspend() can be + used when something fails after t_suspend() has already been executed + and it turns out that the transcation should not have been + suspended. The function cancels the FR timer of the transacation. + </para> + <para> + The message lumps are saved by t_suspend() which cannot be restored. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>hash_index</emphasis> - transaction identifier. + </para> + </listitem> + <listitem> + <para><emphasis>label</emphasis> - transaction identifier. + </para> + </listitem> + </itemizedlist> + <para>Return value: 0 - success, <0 - error.</para> + </section> + </section> </section> diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index f6a57d0..19c7f32 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -64,6 +64,14 @@ int t_suspend(struct sip_msg *msg, return -1; } + if (t->flags & T_CANCELED) { + /* The transaction has already been canceled */ + LOG(L_DBG, "DEBUG: t_suspend: " \ + "trying to suspend an already canceled transaction\n"); + ser_error = E_CANCELED; + return 1; + } + /* send a 100 Trying reply, because the INVITE processing will probably take a long time */ if (msg->REQ_METHOD==METHOD_INVITE && (t->flags&T_AUTO_INV_100) @@ -116,12 +124,20 @@ int t_continue(unsigned int hash_index, unsigned int label, struct sip_msg faked_req; int branch; struct ua_client *uac =NULL; + int ret; if (t_lookup_ident(&t, hash_index, label) < 0) { LOG(L_ERR, "ERROR: t_continue: transaction not found\n"); return -1; } + if (t->flags & T_CANCELED) { + /* The transaction has already been canceled, + * needless to continue */ + UNREF(t); /* t_unref would kill the transaction */ + return 1; + } + /* The transaction has to be locked to protect it * form calling t_continue() multiple times simultaneously */ LOCK_REPLIES(t); @@ -134,13 +150,23 @@ int t_continue(unsigned int hash_index, unsigned int label, if (branch >= 0) { stop_rb_timers(&t->uac[branch].request); + + if (t->uac[branch].last_received != 0) { + /* Either t_continue() has already been + * called or the branch has already timed out. + * Needless to continue. */ + UNLOCK_REPLIES(t); + UNREF(t); /* t_unref would kill the transaction */ + return 1; + } + /* Set last_received to something >= 200, * the actual value does not matter, the branch * will never be picked up for response forwarding. * If last_received is lower than 200, * then the branch may tried to be cancelled later, * for example when t_reply() is called from - * a failure rute => deadlock, because both + * a failure route => deadlock, because both * of them need the reply lock to be held. */ t->uac[branch].last_received=500; uac = &t->uac[branch]; @@ -154,8 +180,8 @@ int t_continue(unsigned int hash_index, unsigned int label, /* fake the request and the environment, like in failure_route */ if (!fake_req(&faked_req, t->uas.request, 0 /* extra flags */, uac)) { LOG(L_ERR, "ERROR: t_continue: fake_req failed\n"); - UNLOCK_REPLIES(t); - return -1; + ret = -1; + goto kill_trans; } faked_env( t, &faked_req); @@ -168,6 +194,7 @@ int t_continue(unsigned int hash_index, unsigned int label, LOG(L_ERR, "ERROR: t_continue: Error in run_top_route\n"); exec_post_script_cb(&faked_req, FAILURE_CB_TYPE); } + /* TODO: save_msg_lumps should clone the lumps to shm mem */ /* restore original environment and free the fake msg */ @@ -193,22 +220,9 @@ int t_continue(unsigned int hash_index, unsigned int label, if (branch == t->nr_of_outgoings) { /* There is not any open branch so there is - * no chance that a final response will be received. - * The script has hopefully set the error code. If not, - * let us reply with a default error. - */ - if ((kill_transaction_unsafe(t, - tm_error ? tm_error : E_UNSPEC)) <=0 - ) { - LOG(L_ERR, "ERROR: t_continue: " - "reply generation failed\n"); - /* The transaction must be explicitely released, - no more timer is running */ - UNLOCK_REPLIES(t); - t_release_transaction(t); - t_unref(t->uas.request); - return 0; - } + * no chance that a final response will be received. */ + ret = 0; + goto kill_trans; } } @@ -218,4 +232,85 @@ int t_continue(unsigned int hash_index, unsigned int label, t_unref(t->uas.request); return 0; + +kill_trans: + /* The script has hopefully set the error code. If not, + * let us reply with a default error. */ + if ((kill_transaction_unsafe(t, + tm_error ? tm_error : E_UNSPEC)) <=0 + ) { + LOG(L_ERR, "ERROR: t_continue: " + "reply generation failed\n"); + /* The transaction must be explicitely released, + * no more timer is running */ + UNLOCK_REPLIES(t); + t_release_transaction(t); + } else { + UNLOCK_REPLIES(t); + } + + t_unref(t->uas.request); + return ret; +} + +/* Revoke the suspension of the SIP request, i.e. + * cancel the fr timer of the blind uac. + * This function can be called when something fails + * after t_suspend() has already been executed in the same + * process, and it turns out that the transaction should + * not have been suspended. + * + * Return value: + * 0 - success + * <0 - failure + */ +int t_cancel_suspend(unsigned int hash_index, unsigned int label) +{ + struct cell *t; + int branch; + + t = get_t(); + if (!t || t == T_UNDEFINED) { + LOG(L_ERR, "ERROR: t_revoke_suspend: " \ + "no active transaction\n"); + return -1; + } + /* Only to double-check the IDs */ + if ((t->hash_index != hash_index) + || (t->label != label) + ) { + LOG(L_ERR, "ERROR: t_revoke_suspend: " \ + "transaction id mismatch\n"); + return -1; + } + /* The transaction does not need to be locked because this + * function is either executed from the original route block + * or from failure route which already locks */ + + reset_kr(); /* the blind UAC of t_suspend has set kr */ + + /* Try to find the blind UAC, and cancel its fr timer. + * We assume that the last blind uac called this function. */ + for ( branch = t->nr_of_outgoings-1; + branch >= 0 && t->uac[branch].request.buffer; + branch--); + + if (branch >= 0) { + stop_rb_timers(&t->uac[branch].request); + /* Set last_received to something >= 200, + * the actual value does not matter, the branch + * will never be picked up for response forwarding. + * If last_received is lower than 200, + * then the branch may tried to be cancelled later, + * for example when t_reply() is called from + * a failure rute => deadlock, because both + * of them need the reply lock to be held. */ + t->uac[branch].last_received=500; + } else { + /* Not a huge problem, fr timer will fire, but CANCEL + will not be sent. last_received will be set to 408. */ + return -1; + } + + return 0; } diff --git a/modules/tm/t_suspend.h b/modules/tm/t_suspend.h index 8a9df8b..1c19be1 100644 --- a/modules/tm/t_suspend.h +++ b/modules/tm/t_suspend.h @@ -39,4 +39,8 @@ int t_continue(unsigned int hash_index, unsigned int label, typedef int (*t_continue_f)(unsigned int hash_index, unsigned int label, struct action *route); +int t_cancel_suspend(unsigned int hash_index, unsigned int label); +typedef int (*t_cancel_suspend_f)(unsigned int hash_index, unsigned int label); + + #endif /* _T_SUSPEND_H */ diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 834517e..bd1b54a 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -488,6 +488,7 @@ static cmd_export_t cmds[]={ #endif {"t_suspend", (cmd_function)t_suspend, NO_SCRIPT, 0, 0}, {"t_continue", (cmd_function)t_continue, NO_SCRIPT, 0, 0}, + {"t_cancel_suspend", (cmd_function)t_cancel_suspend, NO_SCRIPT, 0, 0}, {0,0,0,0,0} }; diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index 1e38676..19e4bb0 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -225,6 +225,11 @@ int load_tm( struct tm_binds *tmb) LOG( L_ERR, LOAD_ERROR "'t_continue' not found\n"); return -1; } + if (! (tmb->t_cancel_suspend=(t_cancel_suspend_f)find_export("t_cancel_suspend", + NO_SCRIPT, 0))) { + LOG( L_ERR, LOAD_ERROR "'t_cancel_suspend' not found\n"); + return -1; + } tmb->t_get_reply_totag = t_get_reply_totag; tmb->t_get_picked_branch = t_get_picked_branch; diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index ff77010..16ed8e3 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -135,6 +135,7 @@ struct tm_binds { #endif t_suspend_f t_suspend; t_continue_f t_continue; + t_cancel_suspend_f t_cancel_suspend; tget_reply_totag_f t_get_reply_totag; tget_picked_f t_get_picked_branch; tlookup_callid_f t_lookup_callid;

1 0

git:master: xlog: API documentation added
by Miklos Tirpak 05 Feb '10

05 Feb '10

Module: sip-router Branch: master Commit: 7ee7b057d33baff56c16b1525323817e1b56fb45 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ee7b05… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Nov 11 11:52:07 2009 +0100 xlog: API documentation added --- modules_s/xlog/README | 287 ++++++++++++++++++++++++++----------------- modules_s/xlog/doc/api.xml | 205 ++++++++++++++++++++++++++++++ modules_s/xlog/doc/xlog.xml | 1 + 3 files changed, 379 insertions(+), 114 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7ee…

1 0

git:master: Makefile:modules fixed usage of -jN flag for modules(_k, _s)
by Marius Zbihlei 05 Feb '10

05 Feb '10

Module: sip-router Branch: master Commit: 329e20e2a88b08f6c092d6db014a6a7f9ea67bb6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=329e20e… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Feb 4 15:06:54 2010 +0200 Makefile:modules fixed usage of -jN flag for modules(_k,_s) Removed the @for construct (launched a new shell) with a @foreach construct which does a textual expansion of the block in question (loop unrolling) --- Makefile | 12 +----------- Makefile.rules | 10 ++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index b6dc645..272cff3 100644 --- a/Makefile +++ b/Makefile @@ -603,17 +603,7 @@ $(1)_target=$(prefix)/$(modules_dir)$(1) .PHONY: $(1) $(1): modules.lst - @for r in $($(1)) "" ; do \ - if [ -n "$$$$r" -a -r "$$$$r/Makefile" ]; then \ - $(call oecho, "" ;) \ - $(call oecho, "" ;) \ - if $(MAKE) -C $$$$r $$(mk_params) || [ ${err_fail} != 1 ] ; then \ - :; \ - else \ - exit 1; \ - fi ; \ - fi ; \ - done; true + @$(foreach r,$($(1)),$(call module_make,$(r),$(mk_params))) .PHONY: $(1)-doc $(1)-doc: modules.lst diff --git a/Makefile.rules b/Makefile.rules index e2ba439..7b46ef3 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -76,6 +76,16 @@ quiet=verbose oecho=echo $(1) endif +module_make= if [ -n "$(1)" -a -r "$(1)/Makefile" ]; then \ + $(call oecho, "" ;) \ + $(call oecho, "" ;) \ + if $$(MAKE) -C $(1) $(2) || [ ${err_fail} != 1 ] ; then \ + :; \ + else \ + exit 1; \ + fi ; \ + fi ; + quote:= " escall= $(subst $$,\$$,$(subst $(quote),\$(quote),$1)) exec_cmd= $(if $($(quiet)_cmd_$(1)),\

1 0

new: interactive debugger for config
by Daniel-Constantin Mierla 04 Feb '10

04 Feb '10

Hello, the new debugger module can be used to do runtime debugging of SIP Router config file, in similar manner of gdb. The module is controlled via the RPC interface, therefore investigation can be done from a remote site. That makes it very handy to use with sercmd as well. One features is to print a log message for each action executed in the config for a SIP message, showing the execution path. The option can be enabled/disabled per process. The other one is step by step execution of config file. When a SIP message message comes it, SIP Router process will stop at first action and wait for commands, like: execute the action, evaluate a pseduo-variable, print to syslog a pseudo-variable, remove the breakpoints and continue execution without interruption, ... See the readme for more: http://sip-router.org/docbook/sip-router/branch/master/modules/debugger/deb… It is still some stuff to complete, some known issues to remove, but the module is usable and may help some of you to troubleshoot migrations from older versions to 3.0 (use master branch until your config is updated and running fine, then use it with stable 3.0). Hope is going to be useful and waiting for feedback to improve. Of course, contributions are most welcome! Cheers, Daniel -- Daniel-Constantin Mierla eLearning class for Kamailio 3.0.0 Starting Feb 8, 2010 * http://www.asipto.com/

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev