sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
482 discussions

git:master:c7b93907: core: tcp read - removed unused variable
by Daniel-Constantin Mierla 03 Nov '17

03 Nov '17

Module: kamailio Branch: master Commit: c7b93907c95c2a9e8d72b6c43668d70d8a2a9025 URL: https://github.com/kamailio/kamailio/commit/c7b93907c95c2a9e8d72b6c43668d70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-03T13:57:24+01:00 core: tcp read - removed unused variable --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/c7b93907c95c2a9e8d72b6c43668d70… Patch: https://github.com/kamailio/kamailio/commit/c7b93907c95c2a9e8d72b6c43668d70… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 17150fec3f..e001fcf98b 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1239,7 +1239,7 @@ static int ws_process_msg(char* tcpbuf, unsigned int len, static int tcp_read_hep3(struct tcp_connection *c, int* read_flags) { int bytes; - uint32_t size, mask_present, len; + uint32_t size, len; char *p; struct tcp_req *r;

1 0

git:master:32d1c953: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 03 Nov '17

03 Nov '17

Module: kamailio Branch: master Commit: 32d1c9530fd64459da33dce60a25f319d65f7cb9 URL: https://github.com/kamailio/kamailio/commit/32d1c9530fd64459da33dce60a25f31… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-03T13:31:21+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/32d1c9530fd64459da33dce60a25f31… Patch: https://github.com/kamailio/kamailio/commit/32d1c9530fd64459da33dce60a25f31… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index b8faee9efb..74a9672951 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -924,7 +924,13 @@ modparam("usrloc", "db_raw_fetch_type", 1) 3.42. db_insert_null (int) If set to 1, the insert operation to database will add null values in - the sql statement. + the statement. It has to be set to 1 for the database systems that do + not have table definitions that create automatically the null fields + (e.g., db_mongodb) for each stored record. + + When set to 0, the fiels that default to null are not added to the DB + insert statement if they don't have a different value, making the query + smaller. Default value is “0” (don't add null fields in insert statement).

1 0

git:master:7c52ffb9: usrloc: more docs for db_insert_null parameter
by Daniel-Constantin Mierla 03 Nov '17

03 Nov '17

Module: kamailio Branch: master Commit: 7c52ffb920ec0552a8720833223a54813affe8ee URL: https://github.com/kamailio/kamailio/commit/7c52ffb920ec0552a8720833223a548… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-03T13:21:11+01:00 usrloc: more docs for db_insert_null parameter --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7c52ffb920ec0552a8720833223a548… Patch: https://github.com/kamailio/kamailio/commit/7c52ffb920ec0552a8720833223a548… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index fde16498d7..f7ac066c29 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1088,7 +1088,14 @@ modparam("usrloc", "db_raw_fetch_type", 1) <title><varname>db_insert_null</varname> (int)</title> <para> If set to 1, the insert operation to database will add null values - in the sql statement. + in the statement. It has to be set to 1 for the database systems + that do not have table definitions that create automatically the + null fields (e.g., db_mongodb) for each stored record. + </para> + <para> + When set to 0, the fiels that default to null are not + added to the DB insert statement if they don't have a different + value, making the query smaller. </para> <para> <emphasis>

1 0

git:master:db8f664a: pua_usrloc: no publish requests at shutdown time
by Daniel-Constantin Mierla 03 Nov '17

03 Nov '17

Module: kamailio Branch: master Commit: db8f664aa72a4fabc9a5f5c4b06d629fd4c8946a URL: https://github.com/kamailio/kamailio/commit/db8f664aa72a4fabc9a5f5c4b06d629… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-03T13:02:05+01:00 pua_usrloc: no publish requests at shutdown time - operations are useless, being related to db operations - safer for races between modules during cleanup, reported by GH #1287 --- Modified: src/modules/pua_usrloc/ul_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/db8f664aa72a4fabc9a5f5c4b06d629… Patch: https://github.com/kamailio/kamailio/commit/db8f664aa72a4fabc9a5f5c4b06d629… --- diff --git a/src/modules/pua_usrloc/ul_publish.c b/src/modules/pua_usrloc/ul_publish.c index 14b318ff34..0afd6d4201 100644 --- a/src/modules/pua_usrloc/ul_publish.c +++ b/src/modules/pua_usrloc/ul_publish.c @@ -211,6 +211,8 @@ void ul_publish(ucontact_t* c, int type, void* param) str content_type; int error; + if(destroy_modules_phase()) return; + content_type.s= "application/pidf+xml"; content_type.len= 20;

1 0

git:master:8a56a109: pkg/kamailio/deb: version set to 5.1.0~pre0
by Victor Seva 03 Nov '17

03 Nov '17

Module: kamailio Branch: master Commit: 8a56a10903c8c63409e92575d105e1e07f483a69 URL: https://github.com/kamailio/kamailio/commit/8a56a10903c8c63409e92575d105e1e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-03T10:11:33+01:00 pkg/kamailio/deb: version set to 5.1.0~pre0 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/8a56a10903c8c63409e92575d105e1e… Patch: https://github.com/kamailio/kamailio/commit/8a56a10903c8c63409e92575d105e1e… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index c141ede2f5..e050b15184 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~pre0) unstable; urgency=medium + + * version set to 5.1.0-pre0 + + -- Victor Seva <vseva(a)debian.org> Fri, 03 Nov 2017 10:09:31 +0100 + kamailio (5.1.0~dev8) unstable; urgency=medium * version set to 5.1.0~dev8 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index c141ede2f5..e050b15184 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~pre0) unstable; urgency=medium + + * version set to 5.1.0-pre0 + + -- Victor Seva <vseva(a)debian.org> Fri, 03 Nov 2017 10:09:31 +0100 + kamailio (5.1.0~dev8) unstable; urgency=medium * version set to 5.1.0~dev8 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index c141ede2f5..e050b15184 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~pre0) unstable; urgency=medium + + * version set to 5.1.0-pre0 + + -- Victor Seva <vseva(a)debian.org> Fri, 03 Nov 2017 10:09:31 +0100 + kamailio (5.1.0~dev8) unstable; urgency=medium * version set to 5.1.0~dev8 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index c141ede2f5..e050b15184 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~pre0) unstable; urgency=medium + + * version set to 5.1.0-pre0 + + -- Victor Seva <vseva(a)debian.org> Fri, 03 Nov 2017 10:09:31 +0100 + kamailio (5.1.0~dev8) unstable; urgency=medium * version set to 5.1.0~dev8 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index c141ede2f5..e050b15184 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~pre0) unstable; urgency=medium + + * version set to 5.1.0-pre0 + + -- Victor Seva <vseva(a)debian.org> Fri, 03 Nov 2017 10:09:31 +0100 + kamailio (5.1.0~dev8) unstable; urgency=medium * version set to 5.1.0~dev8 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index c141ede2f5..e050b15184 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~pre0) unstable; urgency=medium + + * version set to 5.1.0-pre0 + + -- Victor Seva <vseva(a)debian.org> Fri, 03 Nov 2017 10:09:31 +0100 + kamailio (5.1.0~dev8) unstable; urgency=medium * version set to 5.1.0~dev8 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index c141ede2f5..e050b15184 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~pre0) unstable; urgency=medium + + * version set to 5.1.0-pre0 + + -- Victor Seva <vseva(a)debian.org> Fri, 03 Nov 2017 10:09:31 +0100 + kamailio (5.1.0~dev8) unstable; urgency=medium * version set to 5.1.0~dev8 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index c141ede2f5..e050b15184 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~pre0) unstable; urgency=medium + + * version set to 5.1.0-pre0 + + -- Victor Seva <vseva(a)debian.org> Fri, 03 Nov 2017 10:09:31 +0100 + kamailio (5.1.0~dev8) unstable; urgency=medium * version set to 5.1.0~dev8 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index c141ede2f5..e050b15184 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~pre0) unstable; urgency=medium + + * version set to 5.1.0-pre0 + + -- Victor Seva <vseva(a)debian.org> Fri, 03 Nov 2017 10:09:31 +0100 + kamailio (5.1.0~dev8) unstable; urgency=medium * version set to 5.1.0~dev8

1 0

git:master:d3405822: evapi: enable tcp keepalive on client connections
by Daniel-Constantin Mierla 03 Nov '17

03 Nov '17

Module: kamailio Branch: master Commit: d340582267174ccb0a5d816049c582fe75d2177b URL: https://github.com/kamailio/kamailio/commit/d340582267174ccb0a5d816049c582f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-03T09:24:13+01:00 evapi: enable tcp keepalive on client connections --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/d340582267174ccb0a5d816049c582f… Patch: https://github.com/kamailio/kamailio/commit/d340582267174ccb0a5d816049c582f… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index e5b11b18cf..c70e1a2789 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -488,6 +488,8 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent struct ev_io *evapi_client; int i; evapi_env_t evenv; + int optval; + socklen_t optlen; if(_evapi_clients==NULL) { LM_ERR("no client structures\n"); @@ -538,6 +540,12 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent return; } } + optval = 1; + optlen = sizeof(optval); + if(setsockopt(csock, SOL_SOCKET, SO_KEEPALIVE, + &optval, optlen) < 0) { + LM_WARN("failed to enable keepalive on socket %d\n", csock); + } _evapi_clients[i].connected = 1; _evapi_clients[i].sock = csock; _evapi_clients[i].af = caddr.sa_family;

1 0

git:master:9193afeb: modules: readme files regenerated - evapi ... [skip ci]
by Kamailio Dev 03 Nov '17

03 Nov '17

Module: kamailio Branch: master Commit: 9193afeb3e4041f16e13d07520b69ed33129db31 URL: https://github.com/kamailio/kamailio/commit/9193afeb3e4041f16e13d07520b69ed… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-03T09:16:31+01:00 modules: readme files regenerated - evapi ... [skip ci] --- Modified: src/modules/evapi/README --- Diff: https://github.com/kamailio/kamailio/commit/9193afeb3e4041f16e13d07520b69ed… Patch: https://github.com/kamailio/kamailio/commit/9193afeb3e4041f16e13d07520b69ed…

1 0

git:master:feb987db: evapi: documentation for max_clients parameter
by Daniel-Constantin Mierla 03 Nov '17

03 Nov '17

Module: kamailio Branch: master Commit: feb987dbb2c761006056136dae24731d957367db URL: https://github.com/kamailio/kamailio/commit/feb987dbb2c761006056136dae24731… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-03T09:10:25+01:00 evapi: documentation for max_clients parameter --- Modified: src/modules/evapi/doc/evapi_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/feb987dbb2c761006056136dae24731… Patch: https://github.com/kamailio/kamailio/commit/feb987dbb2c761006056136dae24731… --- diff --git a/src/modules/evapi/doc/evapi_admin.xml b/src/modules/evapi/doc/evapi_admin.xml index 41bb01bc23..5a9630e240 100644 --- a/src/modules/evapi/doc/evapi_admin.xml +++ b/src/modules/evapi/doc/evapi_admin.xml @@ -154,6 +154,25 @@ end </programlisting> </example> </section> + <section id="evapi.p.max_clients"> + <title><varname>max_clients</varname> (int)</title> + <para> + Maximum number of clients that can connect to evapi socket. + </para> + <para> + <emphasis> + Default value is 8. + </emphasis> + </para> + <example> + <title>Set <varname>max_clients</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("evapi", "max_clients", 4) +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:4643c510: evapi: allow setting max number of clients via param
by Daniel-Constantin Mierla 03 Nov '17

03 Nov '17

Module: kamailio Branch: master Commit: 4643c51032b8d28c1dede12792c1e1737fdb60e8 URL: https://github.com/kamailio/kamailio/commit/4643c51032b8d28c1dede12792c1e17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-03T09:07:55+01:00 evapi: allow setting max number of clients via param - reported by GH #1290 --- Modified: src/modules/evapi/evapi_dispatch.c Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4643c51032b8d28c1dede12792c1e17… Patch: https://github.com/kamailio/kamailio/commit/4643c51032b8d28c1dede12792c1e17… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 93eef3c445..e5b11b18cf 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -47,6 +47,7 @@ static int _evapi_netstring_format = 1; extern str _evapi_event_callback; extern int _evapi_dispatcher_pid; +extern int _evapi_max_clients; #define EVAPI_IPADDR_SIZE 64 #define EVAPI_TAG_SIZE 64 @@ -75,9 +76,10 @@ typedef struct _evapi_msg { int unicast; } evapi_msg_t; -#define EVAPI_MAX_CLIENTS 8 +#define EVAPI_MAX_CLIENTS _evapi_max_clients + /* last one used for error handling, not a real connected client */ -static evapi_client_t _evapi_clients[EVAPI_MAX_CLIENTS+1]; +static evapi_client_t *_evapi_clients = NULL; typedef struct _evapi_evroutes { int con_new; @@ -176,7 +178,7 @@ int evapi_run_cfg_route(evapi_env_t *evenv, int rt, str *rtname) */ int evapi_close_connection(int cidx) { - if(cidx<0 || cidx>=EVAPI_MAX_CLIENTS) + if(cidx<0 || cidx>=EVAPI_MAX_CLIENTS || _evapi_clients==NULL) return -1; if(_evapi_clients[cidx].connected==1 && _evapi_clients[cidx].sock >= 0) { @@ -212,7 +214,7 @@ int evapi_set_tag(sip_msg_t* msg, str* stag) { evapi_env_t *evenv; - if(msg==NULL || stag==NULL) + if(msg==NULL || stag==NULL || _evapi_clients==NULL) return -1; evenv = evapi_get_msg_env(msg); @@ -280,6 +282,10 @@ int evapi_dispatch_notify(evapi_msg_t *emsg) int n; int wlen; + if(_evapi_clients==NULL) { + return 0; + } + n = 0; for(i=0; i<EVAPI_MAX_CLIENTS; i++) { if(_evapi_clients[i].connected==1 && _evapi_clients[i].sock>=0) { @@ -319,7 +325,11 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) char *efp; if(EV_ERROR & revents) { - perror("received invalid event\n"); + LM_ERR("received invalid event (%d)\n", revents); + return; + } + if(_evapi_clients==NULL) { + LM_ERR("no client structures\n"); return; } @@ -479,6 +489,10 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent int i; evapi_env_t evenv; + if(_evapi_clients==NULL) { + LM_ERR("no client structures\n"); + return; + } evapi_client = (struct ev_io*) malloc (sizeof(struct ev_io)); if(evapi_client==NULL) { LM_ERR("no more memory\n"); @@ -601,6 +615,12 @@ int evapi_run_dispatcher(char *laddr, int lport) LM_DBG("starting dispatcher processing\n"); + _evapi_clients = (evapi_client_t*)malloc(sizeof(evapi_client_t) + * (EVAPI_MAX_CLIENTS+1)); + if(_evapi_clients==NULL) { + LM_ERR("failed to allocate client structures\n"); + exit(-1); + } memset(_evapi_clients, 0, sizeof(evapi_client_t) * EVAPI_MAX_CLIENTS); for(i=0; i<EVAPI_MAX_CLIENTS; i++) { _evapi_clients[i].sock = -1; @@ -872,6 +892,9 @@ 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_clients==NULL) { + return pv_get_null(msg, param, res); + } evenv = evapi_get_msg_env(msg); if(evenv==NULL || evenv->conidx<0 || evenv->conidx>=EVAPI_MAX_CLIENTS) diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index e5eac596ae..7673cb262e 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -53,6 +53,7 @@ static int _evapi_netstring_format_param = 1; str _evapi_event_callback = STR_NULL; int _evapi_dispatcher_pid = -1; +int _evapi_max_clients = 8; static tm_api_t tmb; @@ -98,6 +99,7 @@ static param_export_t params[]={ {"bind_addr", PARAM_STRING, &_evapi_bind_param}, {"netstring_format", INT_PARAM, &_evapi_netstring_format_param}, {"event_callback", PARAM_STR, &_evapi_event_callback}, + {"max_clients", PARAM_INT, &_evapi_max_clients}, {0, 0, 0} };

1 0

git:master:bb91d6c4: evapi: do close() on client socket if libev detects it is gone
by Daniel-Constantin Mierla 03 Nov '17

03 Nov '17

Module: kamailio Branch: master Commit: bb91d6c4fa88324c31d3b7a91687057e0ae8bfa0 URL: https://github.com/kamailio/kamailio/commit/bb91d6c4fa88324c31d3b7a91687057… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-03T08:46:08+01:00 evapi: do close() on client socket if libev detects it is gone - handle socket values for valid range >=0 --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/bb91d6c4fa88324c31d3b7a91687057… Patch: https://github.com/kamailio/kamailio/commit/bb91d6c4fa88324c31d3b7a91687057… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 40ab0e5ed1..93eef3c445 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -179,10 +179,10 @@ int evapi_close_connection(int cidx) if(cidx<0 || cidx>=EVAPI_MAX_CLIENTS) return -1; if(_evapi_clients[cidx].connected==1 - && _evapi_clients[cidx].sock > 0) { + && _evapi_clients[cidx].sock >= 0) { close(_evapi_clients[cidx].sock); _evapi_clients[cidx].connected = 0; - _evapi_clients[cidx].sock = 0; + _evapi_clients[cidx].sock = -1; return 0; } return -2; @@ -221,7 +221,7 @@ int evapi_set_tag(sip_msg_t* msg, str* stag) return -1; if(!(_evapi_clients[evenv->conidx].connected==1 - && _evapi_clients[evenv->conidx].sock > 0)) { + && _evapi_clients[evenv->conidx].sock >= 0)) { LM_ERR("connection not established\n"); return -1; } @@ -246,7 +246,8 @@ int evapi_init_notify_sockets(void) LM_ERR("opening notify stream socket pair\n"); return -1; } - LM_DBG("inter-process event notification sockets initialized\n"); + LM_DBG("inter-process event notification sockets initialized: %d ~ %d\n", + _evapi_notify_sockets[0], _evapi_notify_sockets[1]); return 0; } @@ -281,7 +282,7 @@ int evapi_dispatch_notify(evapi_msg_t *emsg) n = 0; for(i=0; i<EVAPI_MAX_CLIENTS; i++) { - if(_evapi_clients[i].connected==1 && _evapi_clients[i].sock>0) { + if(_evapi_clients[i].connected==1 && _evapi_clients[i].sock>=0) { if(emsg->tag.s==NULL || (emsg->tag.len = _evapi_clients[i].stag.len && strncmp(_evapi_clients[i].stag.s, emsg->tag.s, emsg->tag.len)==0)) { @@ -355,7 +356,10 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) evapi_run_cfg_route(&evenv, _evapi_rts.con_closed, &_evapi_rts.con_closed_name); _evapi_clients[i].connected = 0; - _evapi_clients[i].sock = 0; + if(_evapi_clients[i].sock>=0) { + close(_evapi_clients[i].sock); + } + _evapi_clients[i].sock = -1; _evapi_clients[i].rpos = 0; ev_io_stop(loop, watcher); free(watcher); @@ -593,11 +597,14 @@ int evapi_run_dispatcher(char *laddr, int lport) struct ev_io io_notify; int yes_true = 1; int fflags = 0; + int i; LM_DBG("starting dispatcher processing\n"); memset(_evapi_clients, 0, sizeof(evapi_client_t) * EVAPI_MAX_CLIENTS); - + for(i=0; i<EVAPI_MAX_CLIENTS; i++) { + _evapi_clients[i].sock = -1; + } loop = ev_default_loop(0); if(loop==NULL) { @@ -871,7 +878,7 @@ int pv_get_evapi(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); if(_evapi_clients[evenv->conidx].connected==0 - && _evapi_clients[evenv->conidx].sock <= 0) + && _evapi_clients[evenv->conidx].sock < 0) return pv_get_null(msg, param, res); switch(param->pvn.u.isname.name.n)

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 November 2017