sr-dev April 2016

sr-dev@lists.kamailio.org

23 participants
430 discussions

git:master:8543993e: core: test if AF_PACKET is defined at compile time
by Daniel-Constantin Mierla 01 Apr '16

01 Apr '16

Module: kamailio Branch: master Commit: 8543993e1f702aef80887c0e72b9bf67c62c1617 URL: https://github.com/kamailio/kamailio/commit/8543993e1f702aef80887c0e72b9bf6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-01T11:10:46+02:00 core: test if AF_PACKET is defined at compile time - mac os x (and perhaps *BSDs) doesn't have it --- Modified: socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/8543993e1f702aef80887c0e72b9bf6… Patch: https://github.com/kamailio/kamailio/commit/8543993e1f702aef80887c0e72b9bf6… --- diff --git a/socket_info.c b/socket_info.c index 1d28977..cecfef9 100644 --- a/socket_info.c +++ b/socket_info.c @@ -1205,16 +1205,18 @@ int add_interfaces(char* if_name, int family, unsigned short port, for (ifa = ifap; ifa; ifa = ifa->ifa_next) { +#ifdef AF_PACKET /* skip AF_PACKET addr family since it is of no use later on */ if (ifa->ifa_addr->sa_family == AF_PACKET) continue; +#endif if (if_name && strcmp(if_name, ifa->ifa_name)) continue; if (family && family != ifa->ifa_addr->sa_family) continue; sockaddr2ip_addr(&addr, (struct sockaddr*)ifa->ifa_addr); tmp=ip_addr2a(&addr); - if (ifa->ifa_flags & IFF_LOOPBACK) + if (ifa->ifa_flags & IFF_LOOPBACK) flags = SI_IS_LO; else flags = SI_NONE;

1 0

git:master:597bef35: Merge pull request #558 from schoberw/patch-2
by Daniel-Constantin Mierla 01 Apr '16

01 Apr '16

Module: kamailio Branch: master Commit: 597bef35c74dd3beea693562f45d17e648fd5f6d URL: https://github.com/kamailio/kamailio/commit/597bef35c74dd3beea693562f45d17e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-01T11:06:47+02:00 Merge pull request #558 from schoberw/patch-2 core: skip address family AF_PACKET on -l iface_name --- Modified: socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/597bef35c74dd3beea693562f45d17e… Patch: https://github.com/kamailio/kamailio/commit/597bef35c74dd3beea693562f45d17e… --- diff --git a/socket_info.c b/socket_info.c index d06fdcf..1d28977 100644 --- a/socket_info.c +++ b/socket_info.c @@ -1205,6 +1205,9 @@ int add_interfaces(char* if_name, int family, unsigned short port, for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + /* skip AF_PACKET addr family since it is of no use later on */ + if (ifa->ifa_addr->sa_family == AF_PACKET) + continue; if (if_name && strcmp(if_name, ifa->ifa_name)) continue; if (family && family != ifa->ifa_addr->sa_family)

1 0

git:master:d7fca53e: core: skip address family AF_PACKET on -l iface_name
by schoberw 01 Apr '16

01 Apr '16

Module: kamailio Branch: master Commit: d7fca53e8c5409849ec044098a143e7254129c00 URL: https://github.com/kamailio/kamailio/commit/d7fca53e8c5409849ec044098a143e7… Author: schoberw <walter.schober(a)neotel.at> Committer: schoberw <walter.schober(a)neotel.at> Date: 2016-04-01T10:34:11+02:00 core: skip address family AF_PACKET on -l iface_name - socket_info.c: getifaddrs() returns AF_PACKET, AF_INET and AF_INET6 addressed of an interface. AF_PACKET are of no use and breaks startup with an -l eth0:5060 cmd line param --- Modified: socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/d7fca53e8c5409849ec044098a143e7… Patch: https://github.com/kamailio/kamailio/commit/d7fca53e8c5409849ec044098a143e7… --- diff --git a/socket_info.c b/socket_info.c index d06fdcf..1d28977 100644 --- a/socket_info.c +++ b/socket_info.c @@ -1205,6 +1205,9 @@ int add_interfaces(char* if_name, int family, unsigned short port, for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + /* skip AF_PACKET addr family since it is of no use later on */ + if (ifa->ifa_addr->sa_family == AF_PACKET) + continue; if (if_name && strcmp(if_name, ifa->ifa_name)) continue; if (family && family != ifa->ifa_addr->sa_family)

1 0

git:master:130eb9b2: dialog: refreshed README content with rpc dlg.terminate_dlg
by Daniel-Constantin Mierla 01 Apr '16

01 Apr '16

Module: kamailio Branch: master Commit: 130eb9b259eb3354362a188fde28af6ffe2a6f20 URL: https://github.com/kamailio/kamailio/commit/130eb9b259eb3354362a188fde28af6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-01T09:57:59+02:00 dialog: refreshed README content with rpc dlg.terminate_dlg --- Modified: modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/130eb9b259eb3354362a188fde28af6… Patch: https://github.com/kamailio/kamailio/commit/130eb9b259eb3354362a188fde28af6…

1 0

git:master:ff204f7e: dialog: documentation for rpc command dlg.terminate_dlg
by Daniel-Constantin Mierla 01 Apr '16

01 Apr '16

Module: kamailio Branch: master Commit: ff204f7e4d2bc3a7a1b4460c29d568b5b7b69e83 URL: https://github.com/kamailio/kamailio/commit/ff204f7e4d2bc3a7a1b4460c29d568b… Author: Yasin CANER <yasin.caner(a)netgsm.com.tr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-01T09:57:24+02:00 dialog: documentation for rpc command dlg.terminate_dlg --- Modified: modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ff204f7e4d2bc3a7a1b4460c29d568b… Patch: https://github.com/kamailio/kamailio/commit/ff204f7e4d2bc3a7a1b4460c29d568b… --- diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index 50dffa7..a24e2e2 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -2304,7 +2304,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); <para>Name: <emphasis>dlg.list</emphasis></para> <para>RPC Command Format:</para> <programlisting format="linespecific"> - serctl dlg_list + kamcmd dlg_list </programlisting> </section> @@ -2318,7 +2318,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); <para>Name: <emphasis>dlg.list_ctx</emphasis></para> <para>RPC Command Format:</para> <programlisting format="linespecific"> - serctl dlg.list_ctx + kamcmd dlg.list_ctx </programlisting> </section> @@ -2341,10 +2341,9 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); </itemizedlist> <para>RPC Command Format:</para> <programlisting format="linespecific"> - serctl dlg.list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 + kamcmd dlg.list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 </programlisting> </section> - <section> <title><varname>dlg.dlg_list_ctx</varname></title> <para> @@ -2357,10 +2356,36 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); </para> <para>RPC Command Format:</para> <programlisting format="linespecific"> - serctl dlg.list_ctx abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 + kamcmd dlg.list_ctx abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 + </programlisting> + </section> + <section> + <title><varname>dlg.terminate_dlg</varname></title> + <para> + Terminates an ongoing dialog by sending BYE in both directions, + matching the dialog on call-id, from tag and to tag. + </para> + <para>Name: <emphasis>dlg.terminate_dlg</emphasis></para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para> + <emphasis>callid</emphasis> - callid of dialog to be terminated + </para></listitem> + <listitem><para> + <emphasis>from_tag</emphasis> - from tag of the dialog to terminated + </para></listitem> + <listitem><para> + <emphasis>totag</emphasis> - to tag of the dialog to terminated + </para></listitem> + </itemizedlist> + <para> + The command works only for confirmed dialogs. + </para> + <para>RPC Command Format:</para> + <programlisting format="linespecific"> + kamcmd dlg.dlg_terminate_dlg callid12345 fromtag123 totag123 </programlisting> </section> - <section> <title><varname>dlg.end_dlg</varname></title> <para> @@ -2388,10 +2413,9 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); </para> <para>RPC Command Format:</para> <programlisting format="linespecific"> - serctl dlg.end_dlg 342 56 + kamcmd dlg.end_dlg 342 56 </programlisting> </section> - <section> <title><varname>dlg.profile_get_size</varname></title> <para> @@ -2416,7 +2440,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); </itemizedlist> <para>RPC Command Format:</para> <programlisting format="linespecific"> - serctl dlg.dlg.profile_get_size inbound_calls + kamcmd dlg.dlg.profile_get_size inbound_calls </programlisting> </section> @@ -2444,7 +2468,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); </itemizedlist> <para>RPC Command Format:</para> <programlisting format="linespecific"> - serctl dlg.profile_list inbound_calls + kamcmd dlg.profile_list inbound_calls </programlisting> </section> @@ -2469,7 +2493,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); </itemizedlist> <para>RPC Command Format:</para> <programlisting format="linespecific"> - serctl dlg.list from to op + kamcmd dlg.list from to op </programlisting> </section> </section>

1 0

git:master:72b15ef9: dialog: new rpc function to terminate by sip ids
by Daniel-Constantin Mierla 01 Apr '16

01 Apr '16

Module: kamailio Branch: master Commit: 72b15ef953bf76f2b4ed9d44886ec6040b04a8b6 URL: https://github.com/kamailio/kamailio/commit/72b15ef953bf76f2b4ed9d44886ec60… Author: Yasin CANER <yasin.caner(a)netgsm.com.tr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-01T09:52:55+02:00 dialog: new rpc function to terminate by sip ids - end established dialog by matching callid, from and to tags --- Modified: modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/72b15ef953bf76f2b4ed9d44886ec60… Patch: https://github.com/kamailio/kamailio/commit/72b15ef953bf76f2b4ed9d44886ec60… --- diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index 553715d..db6c3ff 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -1698,6 +1698,9 @@ static const char *rpc_print_dlg_ctx_doc[2] = { static const char *rpc_end_dlg_entry_id_doc[2] = { "End a given dialog based on [h_entry] [h_id]", 0 }; +static const char *rpc_dlg_terminate_dlg_doc[2] = { + "End a given dialog based on callid", 0 +}; static const char *rpc_profile_get_size_doc[2] = { "Returns the number of dialogs belonging to a profile", 0 }; @@ -1722,6 +1725,47 @@ static void rpc_print_dlg(rpc_t *rpc, void *c) { static void rpc_print_dlg_ctx(rpc_t *rpc, void *c) { internal_rpc_print_single_dlg(rpc, c, 1); } + +static void rpc_dlg_terminate_dlg(rpc_t *rpc,void *c){ + str callid = {NULL,0}; + str ftag = {NULL,0}; + str ttag = {NULL,0}; + + dlg_cell_t * dlg = NULL; + unsigned int dir; + int ret=0; + dir = 0; + + + if(rpc->scan(c, ".S.S.S", &callid,&ftag,&ttag)<3) { + LM_ERR("Unable to read the parameters dlg_terminate_dlg \n" ); + rpc->fault(c, 400, "Need a Callid ,from tag ,to tag"); + return; + } + + dlg=get_dlg(&callid, &ftag, &ttag, &dir); + + if(dlg==NULL) { + LM_ERR("Couldnt find callid in dialog '%.*s' \n",callid.len, callid.s); + rpc->fault(c, 500, "Couldnt find callid in dialog"); + return; + } + + LM_DBG("Dialog is found with callid for terminate rpc '%.*s' \n", + callid.len, callid.s); + + ret=dlg_bye_all(dlg, NULL); + + LM_DBG("Dialog bye return code %d \n",ret); + + if(ret>=0) { + LM_WARN("Dialog is terminated callid: '%.*s' \n", + callid.len, callid.s); + dlg_release(dlg); + } +} + + static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) { unsigned int h_entry, h_id; dlg_cell_t * dlg = NULL; @@ -1812,5 +1856,6 @@ static rpc_export_t rpc_methods[] = { {"dlg.profile_get_size", rpc_profile_get_size, rpc_profile_get_size_doc, 0}, {"dlg.profile_list", rpc_profile_print_dlgs, rpc_profile_print_dlgs_doc, RET_ARRAY}, {"dlg.bridge_dlg", rpc_dlg_bridge, rpc_dlg_bridge_doc, 0}, + {"dlg.terminate_dlg", rpc_dlg_terminate_dlg, rpc_dlg_terminate_dlg_doc, 0}, {0, 0, 0, 0} };

1 0

Broken: kamailio/kamailio#2168 (master - 271554b)
by Travis CI 01 Apr '16

01 Apr '16

Build Update for kamailio/kamailio ------------------------------------- Build: #2168 Status: Broken Duration: 11 minutes and 46 seconds Commit: 271554b (master) Author: Daniel-Constantin Mierla Message: Merge pull request #553 from adubovikov/master modules/sipcapture: fixed correlation_id pointer for HEPv2/v1 View the changeset: https://github.com/kamailio/kamailio/compare/6643604b1406...271554b9100e View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/120002204 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:master:271554b9: Merge pull request #553 from adubovikov/master
by Daniel-Constantin Mierla 01 Apr '16

01 Apr '16

Module: kamailio Branch: master Commit: 271554b9100eb6f1c7d7a23861a8a8e2d74fd939 URL: https://github.com/kamailio/kamailio/commit/271554b9100eb6f1c7d7a23861a8a8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-01T09:20:56+02:00 Merge pull request #553 from adubovikov/master modules/sipcapture: fixed correlation_id pointer for HEPv2/v1 --- Modified: modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/271554b9100eb6f1c7d7a23861a8a8e… Patch: https://github.com/kamailio/kamailio/commit/271554b9100eb6f1c7d7a23861a8a8e… --- diff --git a/modules/sipcapture/hep.c b/modules/sipcapture/hep.c index 6c934dc..bbafa5a 100644 --- a/modules/sipcapture/hep.c +++ b/modules/sipcapture/hep.c @@ -66,6 +66,9 @@ int hep_msg_received(void *data) len = (unsigned *)srevp[1]; ri = (struct receive_info *)srevp[2]; + correlation_id = NULL; + authkey = NULL; + count++; struct hep_hdr *heph; /* hep_hdr */ @@ -100,6 +103,9 @@ int hepv2_received(char *buf, unsigned int len, struct receive_info *ri){ memset(heptime, 0, sizeof(struct hep_timehdr)); struct hep_ip6hdr *hepip6h = NULL; + + correlation_id = NULL; + authkey = NULL; hep_offset = 0;

1 0

git:master:b400123d: Update hep.c
by Alexandr Dubovikov 01 Apr '16

01 Apr '16

Module: kamailio Branch: master Commit: b400123d272edc98f7b9fa3fde6f7ff650a81f89 URL: https://github.com/kamailio/kamailio/commit/b400123d272edc98f7b9fa3fde6f7ff… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2016-03-29T13:53:19+02:00 Update hep.c --- Modified: modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/b400123d272edc98f7b9fa3fde6f7ff… Patch: https://github.com/kamailio/kamailio/commit/b400123d272edc98f7b9fa3fde6f7ff… --- diff --git a/modules/sipcapture/hep.c b/modules/sipcapture/hep.c index 6c934dc..bbafa5a 100644 --- a/modules/sipcapture/hep.c +++ b/modules/sipcapture/hep.c @@ -66,6 +66,9 @@ int hep_msg_received(void *data) len = (unsigned *)srevp[1]; ri = (struct receive_info *)srevp[2]; + correlation_id = NULL; + authkey = NULL; + count++; struct hep_hdr *heph; /* hep_hdr */ @@ -100,6 +103,9 @@ int hepv2_received(char *buf, unsigned int len, struct receive_info *ri){ memset(heptime, 0, sizeof(struct hep_timehdr)); struct hep_ip6hdr *hepip6h = NULL; + + correlation_id = NULL; + authkey = NULL; hep_offset = 0;

1 0

[kamailio/kamailio] modules/sipcapture: fixed correlation_id pointer for HEPv2/v1 (#553)
by Alexandr Dubovikov 01 Apr '16

01 Apr '16

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/553 -- Commit Summary -- * Update hep.c -- File Changes -- M modules/sipcapture/hep.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/553.patch https://github.com/kamailio/kamailio/pull/553.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/553

2 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2016