sr-dev

sr-dev@lists.kamailio.org

15 participants
44244 discussions

by Daniel-Constantin Mierla

Hello, as announced previously, today will package the kamailio 3.0.0 release. Please commit any change to kamailio_3.0 branch before 14:00UTC to avoid overlappings. If you are aware of new bugs, just drop an email to devel mailing list. Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

15 years

git:kamailio_3.0: Backport of the changes (see previous commits).

by Carsten Bock

Module: sip-router Branch: kamailio_3.0 Commit: 99d5e6c0d1fa81acb0f42bae137ec256004aba5f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99d5e6c… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Jan 6 16:51:59 2010 +0100 Backport of the changes (see previous commits). --- modules_k/dialog/dlg_handlers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 3cf2a3b..450cc12 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -227,7 +227,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, contact = ((contact_body_t *)msg->contact->parsed)->contacts->uri; /* extract the RR parts */ - if(!msg->record_route && (parse_headers(msg,HDR_RECORDROUTE_F,0)<0) ){ + if(!msg->record_route && (parse_headers(msg,HDR_EOH_F,0)<0) ){ LM_ERR("failed to parse record route header\n"); goto error0; }

15 years

about kamailio with sctp

by mustafa samara

Hello i do not know how to try sctp, imake kmailio 1.5 with sctp=1 could you help me? thnaks -- Eng.Mustafa Al-Samara

15 years

git:kamailio_3.0: core: init the len of sock_str attribute

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: f0d89fb89d1b588f253f048ab8fc22e0db7fff66 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0d89fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 19:02:42 2010 +0100 core: init the len of sock_str attribute --- socket_info.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/socket_info.c b/socket_info.c index 3fa648b..6627d70 100644 --- a/socket_info.c +++ b/socket_info.c @@ -363,6 +363,7 @@ static int fix_sock_str(struct socket_info* si) return -1; } si->sock_str.s[len] = '\0'; + si->sock_str.len = len; return 0; }

15 years

git:kamailio_3.0: usrloc(k): rpc version for ul.dump

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 3cc229a3c7ba36475c3bd67e4849297f9548bf26 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3cc229a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 20:01:01 2010 +0100 usrloc(k): rpc version for ul.dump - ul.dump is rpc alternative for MI ul_dump - better alternative to avoid pkg frametation in MI process --- modules_k/usrloc/ul_mod.c | 8 ++ modules_k/usrloc/ul_rpc.c | 293 +++++++++++++++++++++++++++++++++++++++++++++ modules_k/usrloc/ul_rpc.h | 28 +++++ 3 files changed, 329 insertions(+), 0 deletions(-) diff --git a/modules_k/usrloc/ul_mod.c b/modules_k/usrloc/ul_mod.c index ff82b73..865763a 100644 --- a/modules_k/usrloc/ul_mod.c +++ b/modules_k/usrloc/ul_mod.c @@ -55,6 +55,7 @@ #include "ul_mod.h" #include "../../sr_module.h" #include "../../dprint.h" +#include "../../rpc_lookup.h" #include "../../timer.h" /* register_timer */ #include "../../globals.h" /* is_main */ #include "../../ut.h" /* str_init */ @@ -63,6 +64,7 @@ #include "urecord.h" /* {insert,delete,get}_ucontact */ #include "ucontact.h" /* update_ucontact */ #include "ul_mi.h" +#include "ul_rpc.h" #include "ul_callback.h" #include "usrloc.h" @@ -228,6 +230,12 @@ static int mod_init(void) return -1; } + if (rpc_register_array(ul_rpc)!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + /* Compute the lengths of string parameters */ user_col.len = strlen(user_col.s); domain_col.len = strlen(domain_col.s); diff --git a/modules_k/usrloc/ul_rpc.c b/modules_k/usrloc/ul_rpc.c new file mode 100644 index 0000000..19d96e0 --- /dev/null +++ b/modules_k/usrloc/ul_rpc.c @@ -0,0 +1,293 @@ +/* + * $Id$ + * + * usrloc module + * + * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com). + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include "../../ip_addr.h" +#include "../../dprint.h" + +#include "ul_rpc.h" +#include "dlist.h" +#include "ucontact.h" +#include "udomain.h" + +static const char* ul_rpc_dump_doc[2] = { + "Dump user location tables", + 0 +}; + +static void ul_rpc_dump(rpc_t* rpc, void* ctx) +{ + struct urecord* r; + dlist_t* dl; + udomain_t* dom; + time_t t; + str brief = {0, 0}; + str empty_str = {"[not set]", 9}; + str state_str = {"[not set]", 9}; + str socket_str = {"[not set]", 9}; + int summary = 0; + ucontact_t* c; + void* th; + void* ah; + void* ih; + void* vh; + void* sh; + int max, n, i; + + rpc->scan(ctx, "*S", &brief); + + if(brief.len==5 && (strncmp(brief.s, "brief", 5)==0)) + summary = 1; + + t = time(0); + for( dl=root ; dl ; dl=dl->next ) { + dom = dl->d; + if (rpc->add(ctx, "{", &th) < 0) + { + rpc->fault(ctx, 500, "Internal error creating top rpc"); + return; + } + if(rpc->struct_add(th, "Sd{", + "Domain", &dl->name, + "Size", (int)dom->size, + "AoRs", &ah)<0) + { + rpc->fault(ctx, 500, "Internal error creating inner struct"); + return; + } + for(i=0,n=0,max=0; i<dom->size; i++) { + lock_ulslot( dom, i); + n += dom->table[i].n; + if(max<dom->table[i].n) + max= dom->table[i].n; + for( r = dom->table[i].first ; r ; r=r->next ) { + if(summary==1) + { + if(rpc->struct_add(ah, "S", + "AoR", &r->aor)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, "Internal error creating aor struct"); + return; + } + } else { + if(rpc->struct_add(ah, "S{", + "AoR", &r->aor, + "Contacts", &ih)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, "Internal error creating aor struct"); + return; + } + for( c=r->contacts ; c ; c=c->next) + { + if(rpc->struct_add(ih, "{", + "Contact", &vh)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, "Internal error creating contact struct"); + return; + } + if(rpc->struct_add(vh, "S", + "Address", &c->c)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding addr"); + return; + } + if (c->expires == 0) { + if(rpc->struct_add(vh, "s", + "Expires", "permanent")<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding expire"); + return; + } + } else if (c->expires == UL_EXPIRED_TIME) { + if(rpc->struct_add(vh, "s", + "Expires", "deleted")<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding expire"); + return; + } + } else if (t > c->expires) { + if(rpc->struct_add(vh, "s", + "Expires", "expired")<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding expire"); + return; + } + } else { + if(rpc->struct_add(vh, "d", + "Expires", (int)(c->expires - t))<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding expire"); + return; + } + } + if (c->state == CS_NEW) { + state_str.s = "CS_NEW"; + state_str.len = 6; + } else if (c->state == CS_SYNC) { + state_str.s = "CS_SYNC"; + state_str.len = 7; + } else if (c->state== CS_DIRTY) { + state_str.s = "CS_DIRTY"; + state_str.len = 8; + } else { + state_str.s = "CS_UNKNOWN"; + state_str.len = 10; + } + if(c->sock) + { + socket_str.s = c->sock->sock_str.s; + socket_str.len = c->sock->sock_str.len; + } + if(rpc->struct_add(vh, "f", + "Q", c->q)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding q"); + return; + } + if(rpc->struct_add(vh, "S", + "Call-ID", &c->callid)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding callid"); + return; + } + if(rpc->struct_add(vh, "d", + "CSeq", c->cseq)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding cseq"); + return; + } + if(rpc->struct_add(vh, "S", + "User-Agent", + (c->user_agent.len)?&c->user_agent: + &empty_str)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding user-agent"); + return; + } + if(rpc->struct_add(vh, "S", + "Received", + (c->received.len)?&c->received: + &empty_str)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding received"); + return; + } + if(rpc->struct_add(vh, "S", + "Path", + (c->path.len)?&c->path: + &empty_str)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding path"); + return; + } + if(rpc->struct_add(vh, "S", + "State", &state_str)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding state"); + return; + } + if(rpc->struct_add(vh, "d", + "Flags", c->flags)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding flags"); + return; + } + if(rpc->struct_add(vh, "d", + "CFlags", c->cflags)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding cflags"); + return; + } + if(rpc->struct_add(vh, "S", + "Socket", &socket_str)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding socket"); + return; + } + if(rpc->struct_add(vh, "d", + "Methods", c->methods)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding methods"); + return; + } + } + } + } + + unlock_ulslot( dom, i); + } + + /* extra attributes node */ + if(rpc->struct_add(th, "{", + "Stats", &sh)<0) + { + rpc->fault(ctx, 500, "Internal error creating stats struct"); + return; + } + if(rpc->struct_add(sh, "dd", + "Records", n, + "Max-Slots", max)<0) + { + rpc->fault(ctx, 500, "Internal error adding stats"); + return; + } + } +} + +rpc_export_t ul_rpc[] = { + {"ul.dump", ul_rpc_dump, ul_rpc_dump_doc, 0}, + {0, 0, 0, 0} +}; + + diff --git a/modules_k/usrloc/ul_rpc.h b/modules_k/usrloc/ul_rpc.h new file mode 100644 index 0000000..b0a8c9a --- /dev/null +++ b/modules_k/usrloc/ul_rpc.h @@ -0,0 +1,28 @@ +/* + * $Id$ + * + * usrloc module + * + * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com). + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef _UL_RPC_H_ +#define _UL_RPC_H_ + +#include "../../rpc.h" + +extern rpc_export_t ul_rpc[]; + +#endif

15 years

git:kamailio_3.0: ctl: added parameters to control buffer size

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: acfc2142ed5ef3e61138792136eb32616502229d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=acfc214… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 16:56:54 2010 +0100 ctl: added parameters to control buffer size - new parameters to control binrpc buffers size: - binrpc_max_body_size - binrpc_struct_max_body_size --- modules/ctl/README | 28 +++++++++++++++++++++++++--- modules/ctl/binrpc_run.c | 7 ++++--- modules/ctl/ctl.c | 13 ++++++++++++- modules/ctl/doc/params.xml | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 7 deletions(-) diff --git a/modules/ctl/README b/modules/ctl/README index 12850b3..7b5c876 100644 --- a/modules/ctl/README +++ b/modules/ctl/README @@ -19,6 +19,8 @@ Andrei Pelinescu-Onciul 1.3.4. group (integer or string) 1.3.5. fifo (integer) 1.3.6. autoconversion (integer) + 1.3.7. binrpc_max_body_size (integer) + 1.3.8. binrpc_struct_max_body_size (integer) 1.4. RPC Functions @@ -180,6 +182,26 @@ modparam("ctl", "fifo", "tcp:*:2050") # fifo over tcp Example 7. Set the autoconversion parameter modparam("ctl", "autoconversion", 1) +1.3.7. binrpc_max_body_size (integer) + + Set the size of binrpc buffer for RPC reply. Value represents + kilobytes. + + Default: 4 (meaning 4KB); + + Example 8. Set the binrpc_max_body_size parameter +modparam("ctl", "binrpc_max_body_size", 10) + +1.3.8. binrpc_struct_max_body_size (integer) + + Set the size of binrpc structure buffer for RPC reply. Value represents + kilobytes. + + Default: 1 (meaning 1KB); + + Example 9. Set the binrpc_struct_max_body_size parameter +modparam("ctl", "binrpc_struct_max_body_size", 3) + 1.4. RPC Functions Revision History @@ -189,7 +211,7 @@ modparam("ctl", "autoconversion", 1) List all the sockets on which the ctl module listens. - Example 8. print usage + Example 10. print usage $ sercmd -f"[%v] %v:%v %v\n" ctl.listen [binrpc] unix_stream:/tmp/ser_ctl @@ -199,7 +221,7 @@ modparam("ctl", "autoconversion", 1) Returns the number of open binrpc connections (to the ctl module). - Example 9. ctl.connections usage + Example 11. ctl.connections usage $ sercmd ctl.connections 1 @@ -207,7 +229,7 @@ modparam("ctl", "autoconversion", 1) List open binrpc connections (to the ctl module). - Example 10. ctl.who usage + Example 12. ctl.who usage $ sercmd -f"[%v] %v: %v %v -> %v %v\n" ctl.who [binrpc] unix_stream: <anonymous unix socket> -> /tmp/ser_ctl diff --git a/modules/ctl/binrpc_run.c b/modules/ctl/binrpc_run.c index 8ad914f..989f889 100644 --- a/modules/ctl/binrpc_run.c +++ b/modules/ctl/binrpc_run.c @@ -46,9 +46,10 @@ rpc->scan (default: not set) */ int autoconvert=0; - -#define BINRPC_MAX_BODY 4096 /* maximum body for send */ -#define STRUCT_MAX_BODY 1024 +int binrpc_max_body_size = 4; /* multiplied by 1024 in mod init */ +int binrpc_struct_max_body_size = 1; /* multiplied by 1024 in mod init */ +#define BINRPC_MAX_BODY binrpc_max_body_size /* maximum body for send */ +#define STRUCT_MAX_BODY binrpc_struct_max_body_size #define MAX_MSG_CHUNKS 96 #define BINRPC_GC_IBSIZE 4 /* initial gc block size (pointers no.) */ diff --git a/modules/ctl/ctl.c b/modules/ctl/ctl.c index 8e50e51..bd675f8 100644 --- a/modules/ctl/ctl.c +++ b/modules/ctl/ctl.c @@ -70,6 +70,8 @@ static int usock_gid=-1; /* if set try to automatically convert values to the requested type in rpc->scan (default: not set) */ extern int autoconvert; +extern int binrpc_max_body_size; +extern int binrpc_struct_max_body_size; static int add_binrpc_socket(modparam_t type, void * val); #ifdef USE_FIFO @@ -104,6 +106,8 @@ static param_export_t params[]={ {"user", PARAM_STRING|PARAM_USE_FUNC, fix_user }, {"group", PARAM_STRING|PARAM_USE_FUNC, fix_group }, {"autoconversion", PARAM_INT, &autoconvert }, + {"binrpc_max_body_size", PARAM_INT, &binrpc_max_body_size }, + {"binrpc_struct_max_body_size", PARAM_INT, &binrpc_struct_max_body_size }, {0,0,0} }; /* no params */ @@ -224,7 +228,14 @@ error: static int mod_init(void) { struct id_list* l; - + + if(binrpc_max_body_size<=0) + binrpc_max_body_size = 4; + if(binrpc_struct_max_body_size<=0) + binrpc_struct_max_body_size = 1; + binrpc_max_body_size *= 1024; + binrpc_struct_max_body_size *= 1024; + if (listen_lst==0) { add_binrpc_socket(PARAM_STRING, DEFAULT_CTL_SOCKET); } diff --git a/modules/ctl/doc/params.xml b/modules/ctl/doc/params.xml index c2b06c2..a61e013 100644 --- a/modules/ctl/doc/params.xml +++ b/modules/ctl/doc/params.xml @@ -192,4 +192,40 @@ modparam("ctl", "autoconversion", 1) </example> </section> + <section id="binrpc_max_body_size"> + <title><varname>binrpc_max_body_size</varname> (integer)</title> + <para> + Set the size of binrpc buffer for RPC reply. Value represents + kilobytes. + </para> + <para> + Default: 4 (meaning 4KB); + </para> + <example> + <title>Set the <varname>binrpc_max_body_size</varname> parameter + </title> + <programlisting> +modparam("ctl", "binrpc_max_body_size", 10) + </programlisting> + </example> + </section> + + <section id="binrpc_struct_max_body_size"> + <title><varname>binrpc_struct_max_body_size</varname> (integer)</title> + <para> + Set the size of binrpc structure buffer for RPC reply. Value represents + kilobytes. + </para> + <para> + Default: 1 (meaning 1KB); + </para> + <example> + <title>Set the <varname>binrpc_struct_max_body_size</varname> parameter + </title> + <programlisting> +modparam("ctl", "binrpc_struct_max_body_size", 3) + </programlisting> + </example> + </section> + </section>

15 years

git:kamailio_3.0: htable(k): rpc commad to dump htable

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 5997048fdbefee51aebb8c996178ceb44120a482 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5997048… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 15:56:10 2010 +0100 htable(k): rpc commad to dump htable - htable can get big, rpc behaves better than MI --- modules_k/htable/htable.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 2d49864..d2d1b5f 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -33,6 +33,8 @@ #include "../../route.h" #include "../../dprint.h" #include "../../ut.h" +#include "../../rpc.h" +#include "../../rpc_lookup.h" #include "../../lib/kmi/mi.h" #include "../../lib/kcore/faked_msg.h" @@ -46,6 +48,8 @@ MODULE_VERSION int ht_timer_interval = 20; +static int htable_init_rpc(void); + /** module functions */ static int ht_print(struct sip_msg*, char*, char*); static int mod_init(void); @@ -134,6 +138,11 @@ static int mod_init(void) LM_ERR("failed to register MI commands\n"); return -1; } + if(htable_init_rpc()!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } if(ht_shm_init()!=0) return -1; @@ -444,3 +453,95 @@ error: return 0; } +static const char* htable_dump_doc[2] = { + "Dump the contents of hash table.", + 0 +}; + +static void htable_rpc_dump(rpc_t* rpc, void* c) +{ + str htname; + ht_t *ht; + ht_cell_t *it; + int i; + void* th; + void* ih; + void* vh; + + if (rpc->scan(c, "S", &htname) < 1) + { + rpc->fault(c, 500, "No htable name given"); + return; + } + ht = ht_get_table(&htname); + if(ht==NULL) + { + rpc->fault(c, 500, "No such htable"); + return; + } + for(i=0; i<ht->htsize; i++) + { + lock_get(&ht->entries[i].lock); + it = ht->entries[i].first; + if(it) + { + /* add entry node */ + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return; + } + if(rpc->struct_add(th, "dd{", + "entry", i, + "size", (int)ht->entries[i].esize, + "slot", &ih)<0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return; + } + while(it) + { + if(rpc->struct_add(ih, "{", + "item", &vh)<0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return; + } + if(it->flags&AVP_VAL_STR) { + if(rpc->struct_add(vh, "SS", + "name", &it->name.s, + "value", &it->value.s)<0) + { + rpc->fault(c, 500, "Internal error adding item"); + return; + } + } else { + if(rpc->struct_add(vh, "Sd", + "name", &it->name.s, + "value", (int)it->value.n)) + { + rpc->fault(c, 500, "Internal error adding item"); + return; + } + } + it = it->next; + } + } + lock_release(&ht->entries[i].lock); + } +} + +rpc_export_t htable_rpc[] = { + {"htable.dump", htable_rpc_dump, htable_dump_doc, 0}, + {0, 0, 0, 0} +}; + +static int htable_init_rpc(void) +{ + if (rpc_register_array(htable_rpc)!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + return 0; +}

15 years

[tracker] Task changed: check symbol conflicts

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#12 - check symbol conflicts User who did this: Daniel-Constantin Mierla (miconda) Severity: High -> Medium More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=12 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

15 years

[tracker] Comment added: $shv problems

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#22 - $shv problems User who did this - Daniel-Constantin Mierla (miconda) ---------- Should be fixed now.Let me know if works. Thanks to Andrei for addition of early shm initialisation. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=22#comment25 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

15 years

git:kamailio_3.0: pv(k): fixed $shv engine

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: b69e1c96bf65a4c4f8fa6bec28699607ea03e24d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b69e1c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 14:25:54 2010 +0100 pv(k): fixed $shv engine - shv relies on early shm initialization - got rid of hacks to define first in pkg and move in shm at mod_init - fixes 3.0 specific issues reported by Andrey 'Krieger' Utkin - closes FS#22 --- modules_k/pv/pv.c | 5 - modules_k/pv/pv_shv.c | 201 ++++++++++-------------------------------------- modules_k/pv/pv_shv.h | 1 - 3 files changed, 42 insertions(+), 165 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 700267e..53cf407 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -433,11 +433,6 @@ static int mod_init(void) return -1; } - if(init_shvars()<0) - { - LM_ERR("init shvars failed\n"); - return -1; - } return 0; } diff --git a/modules_k/pv/pv_shv.c b/modules_k/pv/pv_shv.c index b32874f..548ab04 100644 --- a/modules_k/pv/pv_shv.c +++ b/modules_k/pv/pv_shv.c @@ -28,6 +28,8 @@ #include "../../dprint.h" #include "../../mem/mem.h" +#include "../../mem/shm_mem.h" +#include "../../shm_init.h" #include "../../ut.h" #include "../../pvar.h" @@ -38,9 +40,6 @@ gen_lock_set_t* shvar_locks=0; static sh_var_t *sh_vars = 0; static str shv_cpy = {0, 0}; -static script_var_t *sh_local_vars = 0; -static pv_spec_list_t *sh_pv_list = 0; -static int shvar_initialized = 0; /* * Initialize locks @@ -48,6 +47,11 @@ static int shvar_initialized = 0; int shvar_init_locks(void) { int i; + + /* already initialized */ + if(shvar_locks!=0) + return 0; + i = shvar_locks_no; do { if ((( shvar_locks=lock_set_alloc(i))!=0)&& @@ -146,6 +150,18 @@ sh_var_t* add_shvar(str *name) if(name==0 || name->s==0 || name->len<=0) return 0; + if(!shm_initialized()) + { + LM_ERR("shm not intialized - cannot define shm now\n"); + return 0; + } + + if(shvar_init_locks()!=0) + { + LM_ERR("cannot init shv locks\n"); + return 0; + } + for(sit=sh_vars; sit; sit=sit->next) { if(sit->name.len==name->len @@ -189,131 +205,6 @@ sh_var_t* add_shvar(str *name) return sit; } -script_var_t* add_local_shvar(str *name) -{ - script_var_t *it; - - if(name==0 || name->s==0 || name->len<=0) - return 0; - - for(it=sh_local_vars; it; it=it->next) - { - if(it->name.len==name->len - && strncmp(name->s, it->name.s, name->len)==0) - return it; - } - it = (script_var_t*)pkg_malloc(sizeof(script_var_t)); - if(it==0) - { - LM_ERR("out of pkg mem\n"); - return 0; - } - memset(it, 0, sizeof(script_var_t)); - it->name.s = (char*)pkg_malloc((name->len+1)*sizeof(char)); - - if(it->name.s==0) - { - LM_ERR("out of pkg mem!\n"); - return 0; - } - it->name.len = name->len; - strncpy(it->name.s, name->s, name->len); - it->name.s[it->name.len] = '\0'; - - it->next = sh_local_vars; - - sh_local_vars = it; - - return it; -} - - -int init_shvars(void) -{ - script_var_t *lit = 0; - sh_var_t *sit = 0; - pv_spec_list_t *pvi = 0; - pv_spec_list_t *pvi0 = 0; - - if(shvar_init_locks()!=0) - return -1; - - LM_DBG("moving shvars in share memory\n"); - for(lit=sh_local_vars; lit; lit=lit->next) - { - sit = (sh_var_t*)shm_malloc(sizeof(sh_var_t)); - if(sit==0) - { - LM_ERR("out of sh mem\n"); - return -1; - } - memset(sit, 0, sizeof(sh_var_t)); - sit->name.s = (char*)shm_malloc((lit->name.len+1)*sizeof(char)); - - if(sit->name.s==0) - { - LM_ERR("out of pkg mem!\n"); - shm_free(sit); - return -1; - } - sit->name.len = lit->name.len; - strncpy(sit->name.s, lit->name.s, lit->name.len); - sit->name.s[sit->name.len] = '\0'; - - if(sh_vars!=0) - sit->n = sh_vars->n + 1; - else - sit->n = 1; - -#ifdef GEN_LOCK_T_PREFERED - sit->lock = &shvar_locks->locks[sit->n%shvar_locks_no]; -#else - sit->lockidx = sit->n%shvar_locks_no; -#endif - - if(set_shvar_value(sit, &lit->v.value, lit->v.flags)==NULL) - { - shm_free(sit->name.s); - shm_free(sit); - return -1; - } - - pvi0 = 0; - pvi = sh_pv_list; - while(pvi!=NULL) - { - if(pvi->spec->pvp.pvn.u.dname == lit) - { - pvi->spec->pvp.pvn.u.dname = (void*)sit; - if(pvi0!=NULL) - { - pvi0->next = pvi->next; - pkg_free(pvi); - pvi = pvi0->next; - } else { - sh_pv_list = pvi->next; - pkg_free(pvi); - pvi = sh_pv_list; - } - } else { - pvi0 = pvi; - pvi = pvi->next; - } - } - - sit->next = sh_vars; - sh_vars = sit; - } - destroy_vars_list(sh_local_vars); - if(sh_pv_list != NULL) - { - LM_ERR("sh_pv_list not null!\n"); - return -1; - } - shvar_initialized = 1; - return 0; -} - /* call it with lock set */ sh_var_t* set_shvar_value(sh_var_t* shv, int_str *value, int flags) { @@ -432,36 +323,18 @@ void destroy_shvars(void) /********* PV functions *********/ int pv_parse_shvar_name(pv_spec_p sp, str *in) { - pv_spec_list_t *pvi = 0; - if(in==NULL || in->s==NULL || sp==NULL) return -1; sp->pvp.pvn.type = PV_NAME_PVAR; - if(shvar_initialized) - sp->pvp.pvn.u.dname = (void*)add_shvar(in); - else - sp->pvp.pvn.u.dname = (void*)add_local_shvar(in); + sp->pvp.pvn.u.dname = (void*)add_shvar(in); + if(sp->pvp.pvn.u.dname==NULL) { - LM_ERR("cannot register shvar [%.*s] (%d)\n", in->len, in->s, - shvar_initialized); + LM_ERR("cannot register shvar [%.*s]\n", in->len, in->s); return -1; } - if(shvar_initialized==0) - { - pvi = (pv_spec_list_t*)pkg_malloc(sizeof(pv_spec_list_t)); - if(pvi == NULL) - { - LM_ERR("cannot index shvar [%.*s]\n", in->len, in->s); - return -1; - } - pvi->spec = sp; - pvi->next = sh_pv_list; - sh_pv_list = pvi; - } - return 0; } @@ -749,10 +622,14 @@ int param_set_xvar( modparam_t type, void* val, int mode) int_str isv; int flags; int ival; - script_var_t *sv; + script_var_t *pkv; + sh_var_t *shv; - if(shvar_initialized!=0) + if(!shm_initialized()!=0) + { + LM_ERR("shm not initialized - cannot set value for PVs\n"); goto error; + } s.s = (char*)val; if(s.s == NULL || s.s[0] == '\0') @@ -785,14 +662,19 @@ int param_set_xvar( modparam_t type, void* val, int mode) goto error; isv.n = ival; } - if(mode==0) - sv = add_var(&s); - else - sv = add_local_shvar(&s); - if(sv==NULL) - goto error; - if(set_var_value(sv, &isv, flags)==NULL) - goto error; + if(mode==0) { + pkv = add_var(&s); + if(pkv==NULL) + goto error; + if(set_var_value(pkv, &isv, flags)==NULL) + goto error; + } else { + shv = add_shvar(&s); + if(shv==NULL) + goto error; + if(set_shvar_value(shv, &isv, flags)==NULL) + goto error; + } return 0; error: @@ -810,3 +692,4 @@ int param_set_shvar( modparam_t type, void* val) return param_set_xvar(type, val, 1); } +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/modules_k/pv/pv_shv.h b/modules_k/pv/pv_shv.h index 789cd36..d47b0ac 100644 --- a/modules_k/pv/pv_shv.h +++ b/modules_k/pv/pv_shv.h @@ -41,7 +41,6 @@ typedef struct sh_var { struct sh_var *next; } sh_var_t, *sh_var_p; -int init_shvars(void); sh_var_t* set_shvar_value(sh_var_t *shv, int_str *value, int flags); sh_var_t* get_shvar_by_name(str *name);

15 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev