Re: [sr-dev] [kamailio/kamailio] Modules: Evapi async_relay export to kemi (#1563)
@miconda please review -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1563#issuecomment-397787325___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] [dialog] stats incremented twice (#1566)
Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) Checklist: - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue # (replace with an open issue number) Description As you can see looking at the modifications stats counters where increment twice. Hi @oej, If you find a few minutes you could review this MR. Not sure if you remember, this was introduced in a bug fix (see below) I kept some of your modifications, they seem more strait forward anyway. ``` commit b0cd09d2b451005a736396e6f38eac139ec31301 Author: Olle E. Johansson Date: Wed May 11 21:59:44 2016 +0200 dialog Make sure statistics are updated when initializing from database Issue #424 ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1566 -- Commit Summary -- * [dialog] stats incremented twice -- File Changes -- M src/modules/dialog/dialog.c (7) M src/modules/dialog/dlg_db_handler.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1566.patch https://github.com/kamailio/kamailio/pull/1566.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1566 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:94385af9: dispatcher: fixed the conflict in the function names and api
Module: kamailio
Branch: master
Commit: 94385af9143e4b320f05dad501ccb5c446b5048b
URL:
https://github.com/kamailio/kamailio/commit/94385af9143e4b320f05dad501ccb5c446b5048b
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
Date: 2018-06-15T13:33:45+02:00
dispatcher: fixed the conflict in the function names and api
---
Modified: src/modules/dispatcher/dispatch.c
---
Diff:
https://github.com/kamailio/kamailio/commit/94385af9143e4b320f05dad501ccb5c446b5048b.diff
Patch:
https://github.com/kamailio/kamailio/commit/94385af9143e4b320f05dad501ccb5c446b5048b.patch
---
diff --git a/src/modules/dispatcher/dispatch.c
b/src/modules/dispatcher/dispatch.c
index 18e4f51bc3..f5707c11e2 100644
--- a/src/modules/dispatcher/dispatch.c
+++ b/src/modules/dispatcher/dispatch.c
@@ -1663,7 +1663,7 @@ int ds_load_unset(struct sip_msg *msg)
/**
*
*/
-static inline int ds_update_dst(
+static inline int ds_push_dst(
struct sip_msg *msg, str *uri, struct socket_info *sock, int
mode)
{
struct action act;
@@ -2065,7 +2065,7 @@ int ds_select_dst_limit(
hash = i;
if(mode!=DS_SETOP_XAVP) {
- if(ds_update_dst(msg, >dlist[hash].uri,
idx->dlist[hash].sock,
+ if(ds_push_dst(msg, >dlist[hash].uri,
idx->dlist[hash].sock,
mode) != 0) {
LM_ERR("cannot set next hop address with: %.*s\n",
idx->dlist[hash].uri.len,
idx->dlist[hash].uri.s);
@@ -2208,7 +2208,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode)
return -1;
}
- if(ds_update_dst(msg, >val.v.s, sock, mode) != 0) {
+ if(ds_push_dst(msg, >val.v.s, sock, mode) != 0) {
LM_ERR("cannot set dst addr: %.*s\n", lxavp->val.v.s.len,
lxavp->val.v.s.s);
return -1;
@@ -3053,6 +3053,11 @@ void ds_ht_timer(unsigned int ticks, void *param)
return;
}
+int ds_next_dst_api(sip_msg_t *msg, int mode)
+{
+ return ds_update_dst(msg, DS_USE_NEXT, mode);
+}
+
int bind_dispatcher(dispatcher_api_t *api)
{
if(!api) {
@@ -3060,7 +3065,7 @@ int bind_dispatcher(dispatcher_api_t *api)
return -1;
}
api->select = ds_select_dst;
- api->next = ds_next_dst;
+ api->next = ds_next_dst_api;
api->mark = ds_mark_dst;
api->is_from = ds_is_from_list;
return 0;
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] git:master:b55b6fa1: dispatcher: added ds_set_dst() and dst_set_domain()
master is broken now
https://travis-ci.org/kamailio/kamailio/builds/392641648
CC (clang) [M dispatcher.so] dispatch.o
dispatch.c:1666:19: error: static declaration of 'ds_update_dst'
follows non-static declaration
static inline int ds_update_dst(
^
./dispatch.h:127:5: note: previous declaration is here
int ds_update_dst(struct sip_msg *msg, int upos, int mode);
^
dispatch.c:2069:6: error: too many arguments to function call,
expected 3, have 4
mode) != 0) {
^~~~
./dispatch.h:127:1: note: 'ds_update_dst' declared here
int ds_update_dst(struct sip_msg *msg, int upos, int mode);
^
dispatch.c:2211:47: error: too many arguments to function call,
expected 3, have 4
if(ds_update_dst(msg, >val.v.s, sock, mode) != 0) {
~ ^~~~
dispatch.c:2168:1: note: 'ds_update_dst' declared here
int ds_update_dst(struct sip_msg *msg, int upos, int mode)
^
dispatch.c:3063:14: error: use of undeclared identifier 'ds_next_dst'
api->next = ds_next_dst;
^
4 errors generated.
2018-06-15 8:58 GMT+02:00 Daniel-Constantin Mierla :
> Module: kamailio
> Branch: master
> Commit: b55b6fa199828669e48354c10607541d9ae05184
> URL: https://github.com/kamailio/kamailio/commit/
> b55b6fa199828669e48354c10607541d9ae05184
>
> Author: Daniel-Constantin Mierla
> Committer: Daniel-Constantin Mierla
> Date: 2018-06-15T08:54:02+02:00
>
> dispatcher: added ds_set_dst() and dst_set_domain()
>
> - unlike the ds_next_...() variants, these functions just push to
> destination the current xavp_dst, without consuming it
>
> ---
>
> Modified: src/modules/dispatcher/dispatch.c
> Modified: src/modules/dispatcher/dispatch.h
> Modified: src/modules/dispatcher/dispatcher.c
>
> ---
>
> Diff: https://github.com/kamailio/kamailio/commit/
> b55b6fa199828669e48354c10607541d9ae05184.diff
> Patch: https://github.com/kamailio/kamailio/commit/
> b55b6fa199828669e48354c10607541d9ae05184.patch
>
>
> ___
> Kamailio (SER) - Development Mailing List
> sr-dev@lists.kamailio.org
> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
>
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:145e3a1e: core: raw sock - reset the rcv_msg and proper test for totlen
Module: kamailio Branch: master Commit: 145e3a1e461dd53fb1e06bae619d20a09dcffe75 URL: https://github.com/kamailio/kamailio/commit/145e3a1e461dd53fb1e06bae619d20a09dcffe75 Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla Date: 2018-06-15T11:50:31+02:00 core: raw sock - reset the rcv_msg and proper test for totlen --- Modified: src/core/raw_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/145e3a1e461dd53fb1e06bae619d20a09dcffe75.diff Patch: https://github.com/kamailio/kamailio/commit/145e3a1e461dd53fb1e06bae619d20a09dcffe75.patch --- diff --git a/src/core/raw_sock.c b/src/core/raw_sock.c index a8beb6691e..9dd65d2340 100644 --- a/src/core/raw_sock.c +++ b/src/core/raw_sock.c @@ -228,6 +228,7 @@ int recvpkt4(int sock, char* buf, int len, union sockaddr_union* from, iov[0].iov_base=buf; iov[0].iov_len=len; + memset(_msg, 0, sizeof(struct msghdr)); rcv_msg.msg_name=from; rcv_msg.msg_namelen=sockaddru_len(*from); rcv_msg.msg_control=msg_ctrl_buf; @@ -603,7 +604,7 @@ int raw_iphdr_udp4_send(int rsock, char* buf, unsigned int len, int ret; totlen = len + sizeof(hdr); - if (unlikely(totlen) > 65535) + if (unlikely(totlen > 65535)) return -2; memset(_msg, 0, sizeof(snd_msg)); snd_msg.msg_name=>sin; ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] Planning next IRC devel meeting
Hello, I thought of start planning the next IRC devel meeting, it is quite some time since the last one with a busy spring for most of us. Among the topics to be approached would be the roadmap to the next major release, then discuss what else we can do for or with the project. My proposal as a date is Tuesday, June 27, at 14:00 UTC -- I created a page for it: - https://www.kamailio.org/wiki/devel/irc-meetings/2018a List yourself if you can participate or you prefer a different date, as well as add new topics that you consider they should be approached. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] Releasing v5.0.7
Hello, I am considering to release Kamailio v5.0.7, out of git branch 5.0, sometime next week, likely to happen on Thursday, June 21. As usual, if there is any issue not reported yet on github, do it a soon as possible to have a chance to investigate. Soon I will review and backport the commits that apply from branch 5.1 back to 5.0, so keep an eye and notify us if a patch you expect to be in 5.0 is not backported. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:d988af9d: modules: readme files regenerated - dispatcher ... [skip ci]
Module: kamailio Branch: master Commit: d988af9dcdfd739fe33aa3b381c9668367647b8b URL: https://github.com/kamailio/kamailio/commit/d988af9dcdfd739fe33aa3b381c9668367647b8b Author: Kamailio Dev Committer: Kamailio Dev Date: 2018-06-15T09:01:57+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/d988af9dcdfd739fe33aa3b381c9668367647b8b.diff Patch: https://github.com/kamailio/kamailio/commit/d988af9dcdfd739fe33aa3b381c9668367647b8b.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:b55b6fa1: dispatcher: added ds_set_dst() and dst_set_domain()
Module: kamailio Branch: master Commit: b55b6fa199828669e48354c10607541d9ae05184 URL: https://github.com/kamailio/kamailio/commit/b55b6fa199828669e48354c10607541d9ae05184 Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla Date: 2018-06-15T08:54:02+02:00 dispatcher: added ds_set_dst() and dst_set_domain() - unlike the ds_next_...() variants, these functions just push to destination the current xavp_dst, without consuming it --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/b55b6fa199828669e48354c10607541d9ae05184.diff Patch: https://github.com/kamailio/kamailio/commit/b55b6fa199828669e48354c10607541d9ae05184.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:1d4ee772: core: fix Makefile.defs errors to include raw socket support
Module: kamailio Branch: master Commit: 1d4ee7720c6f609077e4497189103f9a950f4194 URL: https://github.com/kamailio/kamailio/commit/1d4ee7720c6f609077e4497189103f9a950f4194 Author: Edwin Fine Committer: Henning Westerholt Date: 2018-06-14T08:22:49+02:00 core: fix Makefile.defs errors to include raw socket support Compiling kamailio on `linux`, `gnu_kfreebsd`, and `freebsd` - unless `RAW_SOCKS` is set up otherwise - should automatically enable raw sockets, according to `Makefile.defs` [L97][]: # enable raw sockets RAW_SOCKS ?= yes ifeq ($(RAW_SOCKS),1) RAW_SOCKS = yes endif By all indications, if `RAW_SOCKS` is unset, set to `1`, or set to `yes` before this `ifeq` statement, it will be set to `yes` after the `endif`. The issue arises later on in `Makefile.defs` [L1758][] (and also [L1808][] and [L1892]): #os specific stuff ifeq ($(OS), linux) # by default use futexes if available use_futex= yes C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN ifneq ($(RAW_SOCKS), yes) ### <--- The issue ### C_DEFS+= -DUSE_RAW_SOCKS endif Clearly, the `ifneq` should be `ifeq`. This commit fixes the issue by making the above changes, and `kamailio` should compile on Linux - by default - with raw sockets support unless `RAW_SOCKS` is explicitly set prior to evaluation to something other than `yes` or `1`. [L97]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17c15bb65/src/Makefile.defs#L97 [L1758]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17c15bb65/src/Makefile.defs#L1758 [L1808]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17c15bb65/src/Makefile.defs#L1808 [L1892]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17c15bb65/src/Makefile.defs#L1892 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1d4ee7720c6f609077e4497189103f9a950f4194.diff Patch: https://github.com/kamailio/kamailio/commit/1d4ee7720c6f609077e4497189103f9a950f4194.patch --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 428a23674a..8e76de7687 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1755,7 +1755,7 @@ ifeq ($(OS), linux) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) @@ -1805,7 +1805,7 @@ ifeq ($(OS), gnu_kfreebsd) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) @@ -1889,7 +1889,7 @@ ifeq ($(OS), freebsd) -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \ -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ -DHAVE_NETINET_IN_SYSTM -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
