sr-dev September 2022

sr-dev@lists.kamailio.org

16 participants
275 discussions

git:5.6:ebda78c9: sipdump: use the right flag to parse ipv6

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: ebda78c92c21770af1a32afc2930740b80d73fd3 URL: https://github.com/kamailio/kamailio/commit/ebda78c92c21770af1a32afc2930740… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-17T10:23:38+02:00 sipdump: use the right flag to parse ipv6 (cherry picked from commit 9a15781f4804ef6620fad5a09ff2e9aacae871cb) --- Modified: src/modules/sipdump/sipdump_pcap.c --- Diff: https://github.com/kamailio/kamailio/commit/ebda78c92c21770af1a32afc2930740… Patch: https://github.com/kamailio/kamailio/commit/ebda78c92c21770af1a32afc2930740… --- diff --git a/src/modules/sipdump/sipdump_pcap.c b/src/modules/sipdump/sipdump_pcap.c index e808ff23fe..0db2697790 100644 --- a/src/modules/sipdump/sipdump_pcap.c +++ b/src/modules/sipdump/sipdump_pcap.c @@ -198,8 +198,8 @@ void sipdump_write_pcap(FILE *fs, sipdump_data_t *spd) return; } memcpy(&v_pcap_ipv6_header.ip6_src, &ip6addr, sizeof(struct in6_addr)); - if (inet_pton(AF_INET, spd->dst_ip.s, &ip6addr) != 1) { - LM_ERR("failed to parse IPv4 address %s\n", spd->dst_ip.s); + if (inet_pton(AF_INET6, spd->dst_ip.s, &ip6addr) != 1) { + LM_ERR("failed to parse IPv6 address %s\n", spd->dst_ip.s); return; } memcpy(&v_pcap_ipv6_header.ip6_dst, &ip6addr, sizeof(struct in6_addr));

2 years, 2 months

git:5.6:d0300a9c: sipdump: make dest ipv6 addresses without square brackets

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: d0300a9c69c522b7a6e3f69f21160df30f05f2ff URL: https://github.com/kamailio/kamailio/commit/d0300a9c69c522b7a6e3f69f21160df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-17T10:23:18+02:00 sipdump: make dest ipv6 addresses without square brackets (cherry picked from commit 0a61ec2f137414a7bfc2535dfe4df9b72e500cf8) --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d0300a9c69c522b7a6e3f69f21160df… Patch: https://github.com/kamailio/kamailio/commit/d0300a9c69c522b7a6e3f69f21160df… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 4b2d87c260..8e871cc980 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -422,7 +422,8 @@ int sipdump_msg_sent(sr_event_param_t *evp) isd.src_port = (int)evp->dst->send_sock->port_no; } su2ip_addr(&ip, &evp->dst->to); - isd.dst_ip.len = ip_addr2sbufz(&ip, dstip_buf, IP_ADDR_MAX_STRZ_SIZE); + isd.dst_ip.len = ip_addr2sbuf(&ip, dstip_buf, IP_ADDR_MAX_STRZ_SIZE); + dstip_buf[isd.dst_ip.len] = '\0'; isd.dst_ip.s = dstip_buf; isd.dst_port = (int)su_getport(&evp->dst->to);

2 years, 2 months

git:master:9a15781f: sipdump: use the right flag to parse ipv6

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9a15781f4804ef6620fad5a09ff2e9aacae871cb URL: https://github.com/kamailio/kamailio/commit/9a15781f4804ef6620fad5a09ff2e9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-17T10:22:22+02:00 sipdump: use the right flag to parse ipv6 --- Modified: src/modules/sipdump/sipdump_pcap.c --- Diff: https://github.com/kamailio/kamailio/commit/9a15781f4804ef6620fad5a09ff2e9a… Patch: https://github.com/kamailio/kamailio/commit/9a15781f4804ef6620fad5a09ff2e9a… --- diff --git a/src/modules/sipdump/sipdump_pcap.c b/src/modules/sipdump/sipdump_pcap.c index e808ff23fe..0db2697790 100644 --- a/src/modules/sipdump/sipdump_pcap.c +++ b/src/modules/sipdump/sipdump_pcap.c @@ -198,8 +198,8 @@ void sipdump_write_pcap(FILE *fs, sipdump_data_t *spd) return; } memcpy(&v_pcap_ipv6_header.ip6_src, &ip6addr, sizeof(struct in6_addr)); - if (inet_pton(AF_INET, spd->dst_ip.s, &ip6addr) != 1) { - LM_ERR("failed to parse IPv4 address %s\n", spd->dst_ip.s); + if (inet_pton(AF_INET6, spd->dst_ip.s, &ip6addr) != 1) { + LM_ERR("failed to parse IPv6 address %s\n", spd->dst_ip.s); return; } memcpy(&v_pcap_ipv6_header.ip6_dst, &ip6addr, sizeof(struct in6_addr));

2 years, 2 months

[kamailio/kamailio] pkg/kamailio/obs: added readline-devel build dependency (PR #3233)

by Gustavo Almeida

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description The purpose of this pull request is to allow, when generating rpm's, the possibility of history/autocomplete to be seen in the interactive mode of kamcmd. The proposed solution is to ensure that the readline-devel library is a requirement when building Kamailio, thus ensuring that kamcmd is compiled with this library. Currently the specfile has as BuildRequires, the pkgconfig library. This library is installed by the readline-devel library (via ncurses-devel dependency), i.e. all existing logic remains unchanged. Furthermore, the readline-devel library is accessible on all distros that use this specfile, namely: Centos, Fedora, OpenSuse, RedHat. Initially in my testing, I thought I needed to change the Makefile of kamcmd to look at mock path’s (find path of readline.h), but this is not necessary (at least in CentOS). The possibility of adopting this solution in later branches would be useful, especially in the case of branch 5.6.1. The tests were performed in a CentOS 7 environment (docker image), following the usual process for generating the rpm's (make rpm). This solution was tested on branch 5.5.4 and on master. In both cases, the history/autocomplete is successfully visible in the interactive mode of kamcmd. ```Shell Script [root@kamailio-build kamailio]# cat /etc/centos-release CentOS Linux release 7.9.2009 (Core) [root@kamailio-build kamailio]# uname -a Linux kamailio-build 5.10.124-linuxkit #1 SMP PREEMPT Thu Jun 30 08:18:26 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ``` I would appreciate if you could evaluate this solution, since the presence of the autocomplete in kamcmd is very useful. Feel free to adopt changes to the proposed solution. Thanks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3233 -- Commit Summary -- * pkg/kamailio/obs: added readline-devel build dependency -- File Changes -- M pkg/kamailio/obs/kamailio.spec (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3233.patch https://github.com/kamailio/kamailio/pull/3233.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3233 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3233(a)github.com>

2 years, 2 months

git:5.5:33dde3f6: pkg/kamailio/obs: added readline-devel build dependency (#3233)

by Sergey Safarov

Module: kamailio Branch: 5.5 Commit: 33dde3f66687b120123b227107a385129d65fc8e URL: https://github.com/kamailio/kamailio/commit/33dde3f66687b120123b227107a3851… Author: Gustavo Almeida <gustavo.abcdef(a)hotmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-09-16T23:13:18+03:00 pkg/kamailio/obs: added readline-devel build dependency (#3233) - Added a readline-devel dependency when generating rpm's. This ensures that when generating rpm's (mock context), kamcmd uses this library in its compilation and autocomplete is available in kamcmd's interactive mode. (cherry picked from commit e49e5a52ded4bef36b5958a748b9556af52d2d33) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/33dde3f66687b120123b227107a3851… Patch: https://github.com/kamailio/kamailio/commit/33dde3f66687b120123b227107a3851… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 4a26128e8c..1833f6086e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -282,7 +282,7 @@ Conflicts: kamailio-utils < %ver, kamailio-websocket < %ver Conflicts: kamailio-xhttp-pi < %ver, kamailio-xmlops < %ver Conflicts: kamailio-xmlrpc < %ver, kamailio-xmpp < %ver Conflicts: kamailio-uuid < %ver -BuildRequires: bison, flex, which, make, gcc, gcc-c++, pkgconfig +BuildRequires: bison, flex, which, make, gcc, gcc-c++, pkgconfig, readline-devel %if 0%{?rhel} != 6 Requires: systemd BuildRequires: systemd-devel @@ -2359,6 +2359,8 @@ fi %changelog +* Tue Sep 13 2022 Gustavo Almeida <galmeida(a)broadvoice.com> + - added readline-devel build dependency * Sat Aug 31 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-dev7 - Packaged kemix, lost and xhttp_prom modules * Sat Mar 30 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0

2 years, 2 months

git:5.6:7cfa1fed: pkg/kamailio/obs: added readline-devel build dependency (#3233)

by Sergey Safarov

Module: kamailio Branch: 5.6 Commit: 7cfa1feddeeb205ebd3628580881397e9215d786 URL: https://github.com/kamailio/kamailio/commit/7cfa1feddeeb205ebd3628580881397… Author: Gustavo Almeida <gustavo.abcdef(a)hotmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-09-16T23:12:25+03:00 pkg/kamailio/obs: added readline-devel build dependency (#3233) - Added a readline-devel dependency when generating rpm's. This ensures that when generating rpm's (mock context), kamcmd uses this library in its compilation and autocomplete is available in kamcmd's interactive mode. (cherry picked from commit e49e5a52ded4bef36b5958a748b9556af52d2d33) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/7cfa1feddeeb205ebd3628580881397… Patch: https://github.com/kamailio/kamailio/commit/7cfa1feddeeb205ebd3628580881397… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 6a2d17d212..f4d7468cf1 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -290,7 +290,7 @@ Conflicts: kamailio-utils < %ver, kamailio-websocket < %ver Conflicts: kamailio-xhttp-pi < %ver, kamailio-xmlops < %ver Conflicts: kamailio-xmlrpc < %ver, kamailio-xmpp < %ver Conflicts: kamailio-uuid < %ver -BuildRequires: bison, flex, which, make, gcc, gcc-c++, pkgconfig +BuildRequires: bison, flex, which, make, gcc, gcc-c++, pkgconfig, readline-devel %if 0%{?rhel} != 6 Requires: systemd BuildRequires: systemd-devel @@ -2420,6 +2420,8 @@ fi %changelog +* Tue Sep 13 2022 Gustavo Almeida <galmeida(a)broadvoice.com> + - added readline-devel build dependency * Sat Aug 31 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-dev7 - Packaged kemix, lost and xhttp_prom modules * Sat Mar 30 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0

2 years, 2 months

git:master:e49e5a52: pkg/kamailio/obs: added readline-devel build dependency (#3233)

by GitHub

Module: kamailio Branch: master Commit: e49e5a52ded4bef36b5958a748b9556af52d2d33 URL: https://github.com/kamailio/kamailio/commit/e49e5a52ded4bef36b5958a748b9556… Author: Gustavo Almeida <gustavo.abcdef(a)hotmail.com> Committer: GitHub <noreply(a)github.com> Date: 2022-09-16T23:06:53+03:00 pkg/kamailio/obs: added readline-devel build dependency (#3233) * pkg/kamailio/obs: added readline-devel build dependency - Added a readline-devel dependency when generating rpm's. This ensures that when generating rpm's (mock context), kamcmd uses this library in its compilation and autocomplete is available in kamcmd's interactive mode. --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/e49e5a52ded4bef36b5958a748b9556… Patch: https://github.com/kamailio/kamailio/commit/e49e5a52ded4bef36b5958a748b9556… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index a82187d682..d1425f6874 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -290,7 +290,7 @@ Conflicts: kamailio-utils < %ver, kamailio-websocket < %ver Conflicts: kamailio-xhttp-pi < %ver, kamailio-xmlops < %ver Conflicts: kamailio-xmlrpc < %ver, kamailio-xmpp < %ver Conflicts: kamailio-uuid < %ver -BuildRequires: bison, flex, which, make, gcc, gcc-c++, pkgconfig +BuildRequires: bison, flex, which, make, gcc, gcc-c++, pkgconfig, readline-devel %if 0%{?rhel} != 6 Requires: systemd BuildRequires: systemd-devel @@ -2420,6 +2420,8 @@ fi %changelog +* Tue Sep 13 2022 Gustavo Almeida <galmeida(a)broadvoice.com> + - added readline-devel build dependency * Sat Aug 31 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-dev7 - Packaged kemix, lost and xhttp_prom modules * Sat Mar 30 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0

2 years, 2 months

git:master:de6a3501: corex: print address family name for rpc corex.list_sockets

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: de6a35012669ad5892760c368cbd141e77bc91db URL: https://github.com/kamailio/kamailio/commit/de6a35012669ad5892760c368cbd141… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-16T16:48:19+02:00 corex: print address family name for rpc corex.list_sockets --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/de6a35012669ad5892760c368cbd141… Patch: https://github.com/kamailio/kamailio/commit/de6a35012669ad5892760c368cbd141… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index 12fd8044afc..67aabde0477 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -65,7 +65,8 @@ static void corex_rpc_list_sockets(rpc_t* rpc, void* ctx) return; } - if(rpc->struct_add(th, "ss{", + if(rpc->struct_add(th, "sss{", + "AF", get_af_name(proto), "PROTO", get_valid_proto_name(proto), "NAME", si->name.s, "ADDRLIST", &ih)<0)

2 years, 2 months

git:master:a5d92da6: core: print address family for rpc core.sockets_list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a5d92da6370f6db15c1ccb69a0ad7b914163c1db URL: https://github.com/kamailio/kamailio/commit/a5d92da6370f6db15c1ccb69a0ad7b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-16T16:45:21+02:00 core: print address family for rpc core.sockets_list --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/a5d92da6370f6db15c1ccb69a0ad7b9… Patch: https://github.com/kamailio/kamailio/commit/a5d92da6370f6db15c1ccb69a0ad7b9… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index c464d3686e..3c9f08e332 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -988,7 +988,8 @@ static void core_sockets_list(rpc_t* rpc, void* c) for(si=list?*list:0; si; si=si->next){ rpc->struct_add(hr, "{", "socket", &ha); if (si->addr_info_lst){ - rpc->struct_add(ha, "ss", + rpc->struct_add(ha, "sss", + "af", get_af_name(si->address.af), "proto", get_proto_name(proto), "address", si->address_str.s); for (ai=si->addr_info_lst; ai; ai=ai->next) @@ -1003,7 +1004,8 @@ static void core_sockets_list(rpc_t* rpc, void* c) printf(" %s: %s", get_proto_name(proto), si->name.s); - rpc->struct_add(ha, "ss", + rpc->struct_add(ha, "sss", + "af", get_af_name(si->address.af), "proto", get_proto_name(proto), "address", si->name.s); if (!(si->flags & SI_IS_IP))

2 years, 2 months

git:master:8bdee74f: core: helper function to get address family name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8bdee74fa6b68012919ddbb403da372187631bd9 URL: https://github.com/kamailio/kamailio/commit/8bdee74fa6b68012919ddbb403da372… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-16T16:42:16+02:00 core: helper function to get address family name --- Modified: src/core/ip_addr.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/8bdee74fa6b68012919ddbb403da372… Patch: https://github.com/kamailio/kamailio/commit/8bdee74fa6b68012919ddbb403da372… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index 77ac233eee..9c91c60e4e 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -717,6 +717,22 @@ char* get_proto_name(unsigned int proto) } } +/** get address family name (asciiz). + * @param af - address family id + * @return string with the adderess family name or "unknown". + */ +char* get_af_name(unsigned int af) +{ + switch(af) { + case AF_INET: + return "IPv4"; + case AF_INET6: + return "IPv6"; + default: + return "unknown"; + } +} + /** * match ip address with net address and bitmask diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 4fcdebbe3e..7f910a49ce 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -304,6 +304,8 @@ char* get_proto_name(unsigned int proto); int get_valid_proto_string(unsigned int iproto, int utype, int vtype, str *sproto); +char* get_af_name(unsigned int af); + #ifdef USE_MCAST /* Returns 1 if the given address is a multicast address */ int is_mcast(struct ip_addr* ip);

2 years, 2 months

← Newer
1
...
17
18
19
20
21
22
23
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2022