sr-dev March 2014

sr-dev@lists.kamailio.org

29 participants
298 discussions

git:master: evapi: added evapi_close() function
by Daniel-Constantin Mierla 31 Mar '14

31 Mar '14

Module: sip-router Branch: master Commit: 5ef20abd1fdb45f5398eecedc81af3fad13024a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ef20ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 31 09:29:06 2014 +0200 evapi: added evapi_close() function - close client connection from cfg file --- modules/evapi/evapi_dispatch.c | 19 ++++++++++++++++++- modules/evapi/evapi_dispatch.h | 2 +- modules/evapi/evapi_mod.c | 22 ++++++++++++++++++++-- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 72add89..a13742d 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -129,7 +129,7 @@ int evapi_run_cfg_route(evapi_env_t *evenv, int rt) /** * */ -int evapi_cfg_close_connection(int cidx) +int evapi_close_connection(int cidx) { if(cidx<0 || cidx>=EVAPI_MAX_CLIENTS) return -1; @@ -146,6 +146,23 @@ int evapi_cfg_close_connection(int cidx) /** * */ +int evapi_cfg_close(sip_msg_t *msg) +{ + evapi_env_t *evenv; + + if(msg==NULL) + return -1; + + evenv = (evapi_env_t*)msg->date; + + if(evenv==NULL || evenv->conidx<0 || evenv->conidx>=EVAPI_MAX_CLIENTS) + return -1; + return evapi_close_connection(evenv->conidx); +} + +/** + * + */ int evapi_init_notify_sockets(void) { if (socketpair(PF_UNIX, SOCK_STREAM, 0, _evapi_notify_sockets) < 0) { diff --git a/modules/evapi/evapi_dispatch.h b/modules/evapi/evapi_dispatch.h index ff49946..568576f 100644 --- a/modules/evapi/evapi_dispatch.h +++ b/modules/evapi/evapi_dispatch.h @@ -48,6 +48,6 @@ int pv_set_evapi(sip_msg_t *msg, pv_param_t *param, int op, #define evapi_set_msg_env(_msg, _evenv) do { _msg->date=(hdr_field_t*)_evenv; } while(0) #define evapi_get_msg_env(_msg) ((evapi_env_t*)_msg->date) -int evapi_cfg_close_connection(int cidx); +int evapi_cfg_close(sip_msg_t *msg); #endif diff --git a/modules/evapi/evapi_mod.c b/modules/evapi/evapi_mod.c index 3cef3ca..94c1fff 100644 --- a/modules/evapi/evapi_mod.c +++ b/modules/evapi/evapi_mod.c @@ -55,8 +55,9 @@ static int mod_init(void); static int child_init(int); static void mod_destroy(void); -static int w_evapi_relay(struct sip_msg* msg, char* evdata, char* p2); -static int w_evapi_async_relay(struct sip_msg* msg, char* evdata, char* p2); +static int w_evapi_relay(sip_msg_t* msg, char* evdata, char* p2); +static int w_evapi_async_relay(sip_msg_t* msg, char* evdata, char* p2); +static int w_evapi_close(sip_msg_t* msg, char* p1, char* p2); static int fixup_evapi_relay(void** param, int param_no); static cmd_export_t cmds[]={ @@ -64,6 +65,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"evapi_async_relay", (cmd_function)w_evapi_async_relay, 1, fixup_evapi_relay, 0, REQUEST_ROUTE}, + {"evapi_close", (cmd_function)w_evapi_close, 1, NULL, + 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -291,7 +294,22 @@ static int w_evapi_async_relay(sip_msg_t *msg, char *evdata, char *p2) return 1; } +/** + * + */ static int fixup_evapi_relay(void** param, int param_no) { return fixup_spve_null(param, param_no); } + +/** + * + */ +static int w_evapi_close(sip_msg_t* msg, char* p1, char* p2) +{ + int ret; + ret = evapi_cfg_close(msg); + if(ret>=0) + return ret+1; + return ret; +}

1 0

git:master: evapi: exported pv $evapi(key)
by Daniel-Constantin Mierla 31 Mar '14

31 Mar '14

Module: sip-router Branch: master Commit: f7be3b0588367081f1ed7224a74da59e284d53ab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7be3b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 31 00:55:06 2014 +0200 evapi: exported pv $evapi(key) - key can be: * srcaddr - source ip of client connection * srcport - source port of client connection * msg - message received from client * conidx - internal index of client connection --- modules/evapi/evapi_dispatch.c | 144 +++++++++++++++++++++++++++++++++++---- modules/evapi/evapi_dispatch.h | 7 ++ modules/evapi/evapi_mod.c | 11 +++- 3 files changed, 146 insertions(+), 16 deletions(-) diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 5a13ae4..fadf886 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -49,6 +49,12 @@ typedef struct _evapi_client { char src_addr[EVAPI_IPADDR_SIZE]; } evapi_client_t; +typedef struct _evapi_env { + int eset; + int conidx; + str msg; +} evapi_env_t; + #define EVAPI_MAX_CLIENTS 8 static evapi_client_t _evapi_clients[EVAPI_MAX_CLIENTS]; @@ -60,7 +66,16 @@ typedef struct _evapi_evroutes { static evapi_evroutes_t _evapi_rts; -static int _evapi_con_idx = -1; +static evapi_env_t _evapi_env_data; + +/** + * + */ +void evapi_env_reset(void) +{ + memset(&_evapi_env_data, 0, sizeof(evapi_env_t)); + _evapi_env_data.conidx = -1; +} /** * @@ -68,6 +83,7 @@ static int _evapi_con_idx = -1; void evapi_init_event_routes(void) { memset(&_evapi_rts, 0, sizeof(evapi_evroutes_t)); + evapi_env_reset(); _evapi_rts.con_new = route_get(&event_rt, "evapi:connection-new"); if (_evapi_rts.con_new < 0 || event_rt.rlist[_evapi_rts.con_new] == NULL) @@ -83,25 +99,25 @@ void evapi_init_event_routes(void) /** * */ -int evapi_run_cfg_route(int conidx, int rt) +int evapi_run_cfg_route(int rt) { int backup_rt; struct run_act_ctx ctx; sip_msg_t *fmsg; - if(conidx<0) + if(_evapi_env_data.eset==0) { + LM_ERR("evapi env not set\n"); return -1; + } if(rt<0) return 0; fmsg = faked_msg_next(); backup_rt = get_route_type(); - _evapi_con_idx = conidx; set_route_type(REQUEST_ROUTE); init_run_actions_ctx(&ctx); run_top_route(event_rt.rlist[rt], fmsg, 0); - _evapi_con_idx = -1; set_route_type(backup_rt); return 0; } @@ -111,13 +127,13 @@ int evapi_run_cfg_route(int conidx, int rt) */ int evapi_cfg_close_connection(void) { - if(_evapi_con_idx<0 || _evapi_con_idx>=EVAPI_MAX_CLIENTS) + if(_evapi_env_data.conidx<0 || _evapi_env_data.conidx>=EVAPI_MAX_CLIENTS) return -1; - if(_evapi_clients[_evapi_con_idx].connected==1 - && _evapi_clients[_evapi_con_idx].sock > 0) { - close(_evapi_clients[_evapi_con_idx].sock); - _evapi_clients[_evapi_con_idx].connected = 0; - _evapi_clients[_evapi_con_idx].sock = 0; + if(_evapi_clients[_evapi_env_data.conidx].connected==1 + && _evapi_clients[_evapi_env_data.conidx].sock > 0) { + close(_evapi_clients[_evapi_env_data.conidx].sock); + _evapi_clients[_evapi_env_data.conidx].connected = 0; + _evapi_clients[_evapi_env_data.conidx].sock = 0; return 0; } return -2; @@ -194,7 +210,7 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) } /* read message from client */ - rlen = recv(watcher->fd, rbuffer, CLIENT_BUFFER_SIZE, 0); + rlen = recv(watcher->fd, rbuffer, CLIENT_BUFFER_SIZE-1, 0); if(rlen < 0) { LM_ERR("cannot read the client message\n"); @@ -213,7 +229,10 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) if(rlen == 0) { /* client is gone */ - evapi_run_cfg_route(i, _evapi_rts.con_closed); + _evapi_env_data.eset = 1; + _evapi_env_data.conidx = i; + evapi_run_cfg_route(_evapi_rts.con_closed); + evapi_env_reset(); _evapi_clients[i].connected = 0; _evapi_clients[i].sock = 0; ev_io_stop(loop, watcher); @@ -223,10 +242,17 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) return; } + rbuffer[rlen] = '\0'; + LM_NOTICE("{%d} [%s:%d] - received [%.*s]\n", i, _evapi_clients[i].src_addr, _evapi_clients[i].src_port, (int)rlen, rbuffer); - evapi_run_cfg_route(i, _evapi_rts.msg_received); + _evapi_env_data.conidx = i; + _evapi_env_data.msg.s = rbuffer; + _evapi_env_data.msg.len = rlen; + _evapi_env_data.eset = 1; + evapi_run_cfg_route(_evapi_rts.msg_received); + evapi_env_reset(); } /** @@ -294,7 +320,10 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent LM_DBG("new connection - pos[%d] from: [%s:%d]\n", i, _evapi_clients[i].src_addr, _evapi_clients[i].src_port); - evapi_run_cfg_route(i, _evapi_rts.con_new); + _evapi_env_data.conidx = i; + _evapi_env_data.eset = 1; + evapi_run_cfg_route(_evapi_rts.con_new); + evapi_env_reset(); if(_evapi_clients[i].connected == 0) return; @@ -489,3 +518,88 @@ int evapi_relay(str *event, str *data) return 0; } #endif + +/** + * + */ +int pv_parse_evapi_name(pv_spec_t *sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 3: + if(strncmp(in->s, "msg", 3)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else goto error; + break; + case 6: + if(strncmp(in->s, "conidx", 6)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else goto error; + break; + case 7: + if(strncmp(in->s, "srcaddr", 7)==0) + sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "srcport", 7)==0) + sp->pvp.pvn.u.isname.name.n = 3; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV msrp name %.*s\n", in->len, in->s); + return -1; +} + +/** + * + */ +int pv_get_evapi(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + if(param==NULL || res==NULL) + return -1; + + if(_evapi_env_data.conidx<0 || _evapi_env_data.conidx>=EVAPI_MAX_CLIENTS) + return pv_get_null(msg, param, res); + + if(_evapi_clients[_evapi_env_data.conidx].connected==0 + && _evapi_clients[_evapi_env_data.conidx].sock <= 0) + return pv_get_null(msg, param, res); + + switch(param->pvn.u.isname.name.n) + { + case 0: + return pv_get_sintval(msg, param, res, _evapi_env_data.conidx); + case 1: + if(_evapi_env_data.msg.s==NULL) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &_evapi_env_data.msg); + case 2: + return pv_get_strzval(msg, param, res, + _evapi_clients[_evapi_env_data.conidx].src_addr); + case 3: + return pv_get_sintval(msg, param, res, + _evapi_clients[_evapi_env_data.conidx].src_port); + default: + return pv_get_null(msg, param, res); + } + + return 0; +} + +/** + * + */ +int pv_set_evapi(sip_msg_t *msg, pv_param_t *param, int op, + pv_value_t *val) +{ + return 0; +} diff --git a/modules/evapi/evapi_dispatch.h b/modules/evapi/evapi_dispatch.h index 5db3bd7..4614beb 100644 --- a/modules/evapi/evapi_dispatch.h +++ b/modules/evapi/evapi_dispatch.h @@ -23,6 +23,8 @@ #ifndef _EVAPI_DISPATCH_ #define _EVAPI_DISPATCH_ +#include "../../pvar.h" + int evapi_init_notify_sockets(void); void evapi_close_notify_sockets_child(void); @@ -37,4 +39,9 @@ int evapi_relay(str *evdata); void evapi_init_event_routes(void); +int pv_parse_evapi_name(pv_spec_t *sp, str *in); +int pv_get_evapi(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_set_evapi(sip_msg_t *msg, pv_param_t *param, int op, + pv_value_t *val); + #endif diff --git a/modules/evapi/evapi_mod.c b/modules/evapi/evapi_mod.c index 089be86..3cef3ca 100644 --- a/modules/evapi/evapi_mod.c +++ b/modules/evapi/evapi_mod.c @@ -34,6 +34,7 @@ #include "../../pvar.h" #include "../../mem/shm_mem.h" #include "../../mod_fix.h" +#include "../../pvar.h" #include "../../cfg/cfg_struct.h" #include "../../lib/kcore/faked_msg.h" @@ -72,6 +73,14 @@ static param_export_t params[]={ {0, 0, 0} }; +static pv_export_t mod_pvs[] = { + { {"evapi", (sizeof("evapi")-1)}, PVT_OTHER, pv_get_evapi, + pv_set_evapi, pv_parse_evapi_name, 0, 0, 0}, + + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + + struct module_exports exports = { "evapi", DEFAULT_DLFLAGS, /* dlopen flags */ @@ -79,7 +88,7 @@ struct module_exports exports = { params, 0, 0, /* exported MI functions */ - 0, /* exported pseudo-variables */ + mod_pvs, /* exported pseudo-variables */ 0, /* extra processes */ mod_init, /* module initialization function */ 0, /* response function */

1 0

git:master: evapi: execute cfg event routes
by Daniel-Constantin Mierla 31 Mar '14

31 Mar '14

Module: sip-router Branch: master Commit: 0abf67a47450f0350a7826ec0719e66f4fc61022 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0abf67a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 30 15:27:53 2014 +0200 evapi: execute cfg event routes - event_route[evapi:connection-new] - new client connected - event_route[evapi:connection-closed] - client connection closed - event_route[evapi:message-received] - message received from client --- modules/evapi/Makefile | 1 + modules/evapi/evapi_dispatch.c | 105 ++++++++++++++++++++++++++++++++++++---- modules/evapi/evapi_dispatch.h | 2 + modules/evapi/evapi_mod.c | 9 ++++ 4 files changed, 108 insertions(+), 9 deletions(-) diff --git a/modules/evapi/Makefile b/modules/evapi/Makefile index cd6d856..097c552 100644 --- a/modules/evapi/Makefile +++ b/modules/evapi/Makefile @@ -32,5 +32,6 @@ DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srutils/srutils +SER_LIBS+=$(SERLIBPATH)/kcore/kcore include ../../Makefile.modules diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 59297e2..5a13ae4 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -36,6 +36,7 @@ #include "../../sr_module.h" #include "../../dprint.h" #include "../../ut.h" +#include "../../lib/kcore/faked_msg.h" static int _evapi_notify_sockets[2]; @@ -51,6 +52,77 @@ typedef struct _evapi_client { #define EVAPI_MAX_CLIENTS 8 static evapi_client_t _evapi_clients[EVAPI_MAX_CLIENTS]; +typedef struct _evapi_evroutes { + int con_new; + int con_closed; + int msg_received; +} evapi_evroutes_t; + +static evapi_evroutes_t _evapi_rts; + +static int _evapi_con_idx = -1; + +/** + * + */ +void evapi_init_event_routes(void) +{ + memset(&_evapi_rts, 0, sizeof(evapi_evroutes_t)); + + _evapi_rts.con_new = route_get(&event_rt, "evapi:connection-new"); + if (_evapi_rts.con_new < 0 || event_rt.rlist[_evapi_rts.con_new] == NULL) + _evapi_rts.con_new = -1; + _evapi_rts.con_closed = route_get(&event_rt, "evapi:connection-closed"); + if (_evapi_rts.con_closed < 0 || event_rt.rlist[_evapi_rts.con_closed] == NULL) + _evapi_rts.con_closed = -1; + _evapi_rts.msg_received = route_get(&event_rt, "evapi:message-received"); + if (_evapi_rts.msg_received < 0 || event_rt.rlist[_evapi_rts.msg_received] == NULL) + _evapi_rts.msg_received = -1; +} + +/** + * + */ +int evapi_run_cfg_route(int conidx, int rt) +{ + int backup_rt; + struct run_act_ctx ctx; + sip_msg_t *fmsg; + + if(conidx<0) + return -1; + + if(rt<0) + return 0; + + fmsg = faked_msg_next(); + backup_rt = get_route_type(); + _evapi_con_idx = conidx; + set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], fmsg, 0); + _evapi_con_idx = -1; + set_route_type(backup_rt); + return 0; +} + +/** + * + */ +int evapi_cfg_close_connection(void) +{ + if(_evapi_con_idx<0 || _evapi_con_idx>=EVAPI_MAX_CLIENTS) + return -1; + if(_evapi_clients[_evapi_con_idx].connected==1 + && _evapi_clients[_evapi_con_idx].sock > 0) { + close(_evapi_clients[_evapi_con_idx].sock); + _evapi_clients[_evapi_con_idx].connected = 0; + _evapi_clients[_evapi_con_idx].sock = 0; + return 0; + } + return -2; +} + /** * */ @@ -129,22 +201,32 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) return; } + for(i=0; i<EVAPI_MAX_CLIENTS; i++) { + if(_evapi_clients[i].connected==1 && _evapi_clients[i].sock==watcher->fd) { + break; + } + } + if(i==EVAPI_MAX_CLIENTS) { + LM_ERR("cannot lookup client socket %d\n", watcher->fd); + return; + } + if(rlen == 0) { /* client is gone */ - for(i=0; i<EVAPI_MAX_CLIENTS; i++) { - if(_evapi_clients[i].connected==1 && _evapi_clients[i].sock==watcher->fd) { - _evapi_clients[i].connected = 0; - _evapi_clients[i].sock = 0; - break; - } - } + evapi_run_cfg_route(i, _evapi_rts.con_closed); + _evapi_clients[i].connected = 0; + _evapi_clients[i].sock = 0; ev_io_stop(loop, watcher); free(watcher); - LM_INFO("client closing connection\n"); + LM_INFO("client closing connection - pos [%d] addr [%s:%d]\n", + i, _evapi_clients[i].src_addr, _evapi_clients[i].src_port); return; } - LM_NOTICE("received [%.*s]\n", (int)rlen, rbuffer); + LM_NOTICE("{%d} [%s:%d] - received [%.*s]\n", + i, _evapi_clients[i].src_addr, _evapi_clients[i].src_port, + (int)rlen, rbuffer); + evapi_run_cfg_route(i, _evapi_rts.msg_received); } /** @@ -212,6 +294,11 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent LM_DBG("new connection - pos[%d] from: [%s:%d]\n", i, _evapi_clients[i].src_addr, _evapi_clients[i].src_port); + evapi_run_cfg_route(i, _evapi_rts.con_new); + + if(_evapi_clients[i].connected == 0) + return; + /* start watcher to read messages from whatchers */ ev_io_init(evapi_client, evapi_recv_client, csock, EV_READ); ev_io_start(loop, evapi_client); diff --git a/modules/evapi/evapi_dispatch.h b/modules/evapi/evapi_dispatch.h index 33afdef..5db3bd7 100644 --- a/modules/evapi/evapi_dispatch.h +++ b/modules/evapi/evapi_dispatch.h @@ -35,4 +35,6 @@ int evapi_run_worker(int prank); int evapi_relay(str *evdata); +void evapi_init_event_routes(void); + #endif diff --git a/modules/evapi/evapi_mod.c b/modules/evapi/evapi_mod.c index 9a999d1..089be86 100644 --- a/modules/evapi/evapi_mod.c +++ b/modules/evapi/evapi_mod.c @@ -35,6 +35,7 @@ #include "../../mem/shm_mem.h" #include "../../mod_fix.h" #include "../../cfg/cfg_struct.h" +#include "../../lib/kcore/faked_msg.h" #include "../../modules/tm/tm_load.h" @@ -95,6 +96,12 @@ static int mod_init(void) { char *p; + /* init faked sip msg */ + if(faked_msg_init()<0) { + LM_ERR("failed to init faked sip msg\n"); + return -1; + } + if(load_tm_api( &tmb ) < 0) { LM_INFO("cannot load the TM-functions - async relay disabled\n"); memset(&tmb, 0, sizeof(tm_api_t)); @@ -119,6 +126,8 @@ static int mod_init(void) /* add child to update local config framework structures */ cfg_register_child(1 + _evapi_workers); + evapi_init_event_routes(); + return 0; }

1 0

git:master: evapi: store src ip and port in client connection struct
by Daniel-Constantin Mierla 31 Mar '14

31 Mar '14

Module: sip-router Branch: master Commit: 3d673225829b6dc87281816a7a074417671f395e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d67322… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 30 14:19:04 2014 +0200 evapi: store src ip and port in client connection struct --- modules/evapi/evapi_dispatch.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 05dd6e4..59297e2 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -27,6 +27,8 @@ #include <sys/socket.h> #include <sys/types.h> +#include <netinet/in.h> +#include <arpa/inet.h> #include <fcntl.h> #include <ev.h> @@ -37,9 +39,13 @@ static int _evapi_notify_sockets[2]; +#define EVAPI_IPADDR_SIZE 64 typedef struct _evapi_client { int connected; int sock; + unsigned short af; + unsigned short src_port; + char src_addr[EVAPI_IPADDR_SIZE]; } evapi_client_t; #define EVAPI_MAX_CLIENTS 8 @@ -146,7 +152,7 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) */ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revents) { - struct sockaddr_in caddr; + struct sockaddr caddr; socklen_t clen = sizeof(caddr); int csock; struct ev_io *evapi_client; @@ -172,8 +178,28 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent } for(i=0; i<EVAPI_MAX_CLIENTS; i++) { if(_evapi_clients[i].connected==0) { + if (caddr.sa_family == AF_INET) { + _evapi_clients[i].src_port = ntohs(((struct sockaddr_in*)&caddr)->sin_port); + if(inet_ntop(AF_INET, &((struct sockaddr_in*)&caddr)->sin_addr, + _evapi_clients[i].src_addr, + EVAPI_IPADDR_SIZE)==NULL) { + LM_ERR("cannot convert ipv4 address\n"); + close(csock); + return; + } + } else { + _evapi_clients[i].src_port = ntohs(((struct sockaddr_in6*)&caddr)->sin6_port); + if(inet_ntop(AF_INET6, &((struct sockaddr_in6*)&caddr)->sin6_addr, + _evapi_clients[i].src_addr, + EVAPI_IPADDR_SIZE)==NULL) { + LM_ERR("cannot convert ipv6 address\n"); + close(csock); + return; + } + } _evapi_clients[i].connected = 1; _evapi_clients[i].sock = csock; + _evapi_clients[i].af = caddr.sa_family; break; } } @@ -183,6 +209,9 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent return; } + LM_DBG("new connection - pos[%d] from: [%s:%d]\n", i, + _evapi_clients[i].src_addr, _evapi_clients[i].src_port); + /* start watcher to read messages from whatchers */ ev_io_init(evapi_client, evapi_recv_client, csock, EV_READ); ev_io_start(loop, evapi_client);

1 0

Patch to support symmetric UDP socket in mi_datagram
by Muhammad Shahzad 31 Mar '14

31 Mar '14

Hi, After wasting most of the day trying to make mi_datagram over UDP socket work. I eventually realize that it does asymmetric UDP communication, which creates a lot of trouble for writing a useful MI script using PERL or Python etc. Anyhow, i go through the module code and was able to write a patch for symmetric UDP communication using mi_datagram. I have tested the patch using both Kamailio 4.1 and trunk branches and it seems to compile and run flawlessly. I am attaching here with this patch for Kamailio community. It would be great if Kamailio developers would review and commit this patch to source trunk. Thank you.

2 5

[tracker] Comment added: tls: ssl bug #1491 workaround: not enough memory for safe operation
by sip-router 30 Mar '14

30 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#414 - tls: ssl bug #1491 workaround: not enough memory for safe operation User who did this - Jose Luis Verdeguer (pepelux) ---------- I increased the shm memory to 512Mb. I'll analyze and I'll send feedback Thanks ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=414#comment1371 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.

1 0

[tracker] Task closed: Maximum 70 else if statements
by sip-router 30 Mar '14

30 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#403 - Maximum 70 else if statements User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=403 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.

1 0

[tracker] Comment added: Maximum 70 else if statements
by sip-router 30 Mar '14

30 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#403 - Maximum 70 else if statements User who did this - Daniel-Constantin Mierla (miconda) ---------- Checking the code, I see that inner blocks of actions for IF-ELSE are executed with the same function for calling sub-routes, thus the same limit is used. In older version you would have to recompile and set ROUTE_MAX_REC_LEV to higher value in config.h, or just break the series of ELSE-IF. In the master, I just made the value configurable via global parameter max_recursive_level in kamailio.cfg ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=403#comment1370 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.

1 0

git:master: core: new global parameter max_recursive_level
by Daniel-Constantin Mierla 29 Mar '14

29 Mar '14

Module: sip-router Branch: master Commit: d1c607183049fba9997bbb401da76d3277ab3426 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1c6071… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 30 00:22:17 2014 +0100 core: new global parameter max_recursive_level - replace define ROUTE_MAX_REC_LEV with config paramter - number of allowed recusive levels can be set in config now - it affects calls of route blocks and chained if { ... } else if { ... } else ... --- action.c | 10 +++++++++- action.h | 2 ++ cfg.lex | 3 +++ cfg.y | 2 ++ config.h | 3 --- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/action.c b/action.c index 5fa50ee..f014b0f 100644 --- a/action.c +++ b/action.c @@ -114,6 +114,14 @@ struct onsend_info* p_onsend=0; /* onsend route send info */ /* current action executed from config file */ static cfg_action_t *_cfg_crt_action = 0; +/*!< maximum number of recursive calls for blocks of actions */ +static unsigned int max_recursive_level = 256; + +void set_max_recursive_level(unsigned int lev) +{ + max_recursive_level = lev; +} + /* return current action executed from config file */ cfg_action_t *get_cfg_crt_action(void) { @@ -1567,7 +1575,7 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=E_UNSPEC; h->rec_lev++; - if (unlikely(h->rec_lev>ROUTE_MAX_REC_LEV)){ + if (unlikely(h->rec_lev>max_recursive_level)){ LOG(L_ERR, "WARNING: too many recursive routing table lookups (%d)" " giving up!\n", h->rec_lev); ret=E_UNSPEC; diff --git a/action.h b/action.h index 2ef00f7..fc789fb 100644 --- a/action.h +++ b/action.h @@ -72,6 +72,8 @@ cfg_action_t *get_cfg_crt_action(void); int get_cfg_crt_line(void); char *get_cfg_crt_name(void); +void set_max_recursive_level(unsigned int lev); + #ifdef USE_LONGJMP int run_actions_safe(struct run_act_ctx* c, struct action* a, struct sip_msg* msg); diff --git a/cfg.lex b/cfg.lex index 50e7983..3d4b889 100644 --- a/cfg.lex +++ b/cfg.lex @@ -482,6 +482,8 @@ VERSION_TABLE_CFG "version_table" SERVER_ID "server_id" +MAX_RECURSIVE_LEVEL "max_recursive_level" + LATENCY_LOG latency_log LATENCY_LIMIT_DB latency_limit_db LATENCY_LIMIT_ACTION latency_limit_action @@ -917,6 +919,7 @@ IMPORTFILE "import_file" return HTTP_REPLY_PARSE; } <INITIAL>{VERSION_TABLE_CFG} { count(); yylval.strval=yytext; return VERSION_TABLE_CFG;} <INITIAL>{SERVER_ID} { count(); yylval.strval=yytext; return SERVER_ID;} +<INITIAL>{MAX_RECURSIVE_LEVEL} { count(); yylval.strval=yytext; return MAX_RECURSIVE_LEVEL;} <INITIAL>{LATENCY_LOG} { count(); yylval.strval=yytext; return LATENCY_LOG;} <INITIAL>{MSG_TIME} { count(); yylval.strval=yytext; return MSG_TIME;} <INITIAL>{LATENCY_LIMIT_DB} { count(); yylval.strval=yytext; return LATENCY_LIMIT_DB;} diff --git a/cfg.y b/cfg.y index 195593b..fd0fd2c 100644 --- a/cfg.y +++ b/cfg.y @@ -536,6 +536,7 @@ extern char *finame; %token VERSION_TABLE_CFG %token CFG_DESCRIPTION %token SERVER_ID +%token MAX_RECURSIVE_LEVEL %token LATENCY_LOG %token LATENCY_LIMIT_DB %token LATENCY_LIMIT_ACTION @@ -1559,6 +1560,7 @@ assign_stm: | HTTP_REPLY_PARSE EQUAL NUMBER { http_reply_parse=$3; } | HTTP_REPLY_PARSE EQUAL error { yyerror("boolean value expected"); } | SERVER_ID EQUAL NUMBER { server_id=$3; } + | MAX_RECURSIVE_LEVEL EQUAL NUMBER { set_max_recursive_level($3); } | LATENCY_LOG EQUAL NUMBER { default_core_cfg.latency_log=$3; } | LATENCY_LOG EQUAL error { yyerror("number expected"); } | LATENCY_LIMIT_DB EQUAL NUMBER { default_core_cfg.latency_limit_db=$3; } diff --git a/config.h b/config.h index 32cd55c..48500ef 100644 --- a/config.h +++ b/config.h @@ -66,9 +66,6 @@ #define EVENT_RT_NO RT_NO /*!< event_route routing tables number */ #define DEFAULT_RT 0 /*!< default routing table */ -#define MAX_REC_LEV 100 /*!< maximum number of recursive calls */ -#define ROUTE_MAX_REC_LEV 100 /*!< maximum number of recursive calls for route()*/ - #define MAX_URI_SIZE 1024 /*!< Max URI size used when rewriting URIs */ #define MAX_PATH_SIZE 256 /*!< Maximum length of path header buffer */

1 0

[tracker] Comment added: Crash in websocket module
by sip-router 29 Mar '14

29 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#406 - Crash in websocket module User who did this - Hugh Waite (hugh.waite) ---------- I've had a look through this and it seems OK. I have the following comments. In decode_and_validate_ws_frame, you have removed the 'close_connection' functions and used the status of the returned error text instead. Some of these cases used different websocket error codes, (1002, 1008, 1009) and this information is now lost. In the new function wsconn_get_list, the size of the NULL terminated list should be (list_len + 1) * sizeof(ws_connection_t*). ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=406#comment1369 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.

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 2014