sr-dev February 2017

sr-dev@lists.kamailio.org

29 participants
364 discussions

git:master:b40349db: ims_qos: Safety check on length of ports
by Carsten Bock 02 Feb '17

02 Feb '17

Module: kamailio Branch: master Commit: b40349dbbf73a4c0f90706f86b79d7b9ff3dbb44 URL: https://github.com/kamailio/kamailio/commit/b40349dbbf73a4c0f90706f86b79d7b… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-02-02T08:24:58+01:00 ims_qos: Safety check on length of ports --- Modified: src/modules/ims_qos/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/b40349dbbf73a4c0f90706f86b79d7b… Patch: https://github.com/kamailio/kamailio/commit/b40349dbbf73a4c0f90706f86b79d7b… --- diff --git a/src/modules/ims_qos/rx_avp.c b/src/modules/ims_qos/rx_avp.c index fcf529e..2e0a851 100644 --- a/src/modules/ims_qos/rx_avp.c +++ b/src/modules/ims_qos/rx_avp.c @@ -784,11 +784,11 @@ AAA_AVP *rx_create_media_subcomponent_avp(int number, str* proto, if (int_port_rctp_b % 2 == 0) { int_port_rctp_b ++; } - char c_port_rtcp_a[5]; - port_rtcp_a.len = sprintf(c_port_rtcp_a, "%d", int_port_rctp_a); + char c_port_rtcp_a[10]; + port_rtcp_a.len = snprintf(c_port_rtcp_a, 10, "%d", int_port_rctp_a); port_rtcp_a.s = c_port_rtcp_a; - char c_port_rtcp_b[5]; - port_rtcp_b.len = sprintf(c_port_rtcp_b, "%d", int_port_rctp_b); + char c_port_rtcp_b[10]; + port_rtcp_b.len = snprintf(c_port_rtcp_b, 10, "%d", int_port_rctp_b); port_rtcp_b.s = c_port_rtcp_b; LM_DBG("RTCP A Port [%.*s] RCTP B Port [%.*s]\n", port_rtcp_a.len, port_rtcp_a.s, port_rtcp_b.len, port_rtcp_b.s);

1 0

git:master:29beb58a: ims_qos: Safety check on length of ports
by Carsten Bock 02 Feb '17

02 Feb '17

Module: kamailio Branch: master Commit: 29beb58ae99a61e611973fe8d9d246fb97d6587b URL: https://github.com/kamailio/kamailio/commit/29beb58ae99a61e611973fe8d9d246f… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-02-02T08:22:05+01:00 ims_qos: Safety check on length of ports --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/29beb58ae99a61e611973fe8d9d246f… Patch: https://github.com/kamailio/kamailio/commit/29beb58ae99a61e611973fe8d9d246f… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index d4c299a..e87195f 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -1004,14 +1004,14 @@ int rx_send_aar_register(struct sip_msg *msg, AAASession* auth, saved_transactio raw_stream.s = 0; raw_stream.len = 0; - char c_port_from[5]; + char c_port_from[10]; str port_from; - port_from.len = sprintf(c_port_from, "%u", saved_t_data->via_port); + port_from.len = snprintf(c_port_from, 10, "%u", saved_t_data->via_port); port_from.s = c_port_from; - char c_port_to[5]; + char c_port_to[10]; str port_to; - port_to.len = sprintf(c_port_to, "%u", saved_t_data->recv_port); + port_to.len = snprintf(c_port_to, 10, "%u", saved_t_data->recv_port); port_to.s = c_port_to; str protocol;

1 0

Jenkins build is back to normal : kamailio44-nightly-source » trusty,master #75
by jenkins＠kamailio.sipwise.com 02 Feb '17

02 Feb '17

https://kamailio.sipwise.com/job/kamailio44-nightly-source/distribution=tru…

1 0

Build failed in Jenkins: kamailiodev-nightly-cppcheck-full #1
by jenkins＠kamailio.sipwise.com 01 Feb '17

01 Feb '17

https://kamailio.sipwise.com/job/kamailiodev-nightly-cppcheck-full/1/------… Started by user Victor Seva Building remotely on jenkins-debian-glue-slave (i-0f84eca2b7519b817) (slave) in workspace <https://kamailio.sipwise.com/job/kamailiodev-nightly-cppcheck-full/ws/> Cloning the remote Git repository Cloning repository https://github.com/kamailio/kamailio.git > git init <https://kamailio.sipwise.com/job/kamailiodev-nightly-cppcheck-full/ws/source> # timeout=10 Fetching upstream changes from https://github.com/kamailio/kamailio.git > git --version # timeout=10 > git fetch --tags --progress https://github.com/kamailio/kamailio.git +refs/heads/*:refs/remotes/origin/* > git config remote.origin.url https://github.com/kamailio/kamailio.git # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url https://github.com/kamailio/kamailio.git # timeout=10 Fetching upstream changes from https://github.com/kamailio/kamailio.git > git fetch --tags --progress https://github.com/kamailio/kamailio.git +refs/heads/*:refs/remotes/origin/* > git rev-parse origin/master^{commit} # timeout=10 Checking out Revision 93f4e8a02c6ad1f14ccadfbd50d1cc393ee194d7 (origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 93f4e8a02c6ad1f14ccadfbd50d1cc393ee194d7 First time build. Skipping changelog. Unable to find a build for artifact copy from: kamailiodev-nightly-cppcheck-full [kamailiodev-nightly-cppcheck-full] $ /bin/sh -xe /tmp/hudson9130476469826512431.sh + /home/admin/kamailio-deb-jenkins/scripts/jdg-cppcheck fatal: ambiguous argument 'jenkins-kamailiodev-nightly-cppcheck-full-1': unknown revision or path not in the working tree. Use '--' to separate paths from revisions Build step 'Execute shell' marked build as failure Archiving artifacts

1 0

git:master:93f4e8a0: pkg/kamailio/deb: version set to 5.0.0-pre1
by Victor Seva 01 Feb '17

01 Feb '17

Module: kamailio Branch: master Commit: 93f4e8a02c6ad1f14ccadfbd50d1cc393ee194d7 URL: https://github.com/kamailio/kamailio/commit/93f4e8a02c6ad1f14ccadfbd50d1cc3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-01T16:47:07+01:00 pkg/kamailio/deb: version set to 5.0.0-pre1 --- 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/squeeze/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/93f4e8a02c6ad1f14ccadfbd50d1cc3… Patch: https://github.com/kamailio/kamailio/commit/93f4e8a02c6ad1f14ccadfbd50d1cc3… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 1a78c8c..cb31fb5 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~pre1) unstable; urgency=medium + + * version set to 5.0.0-pre1 + + -- Victor Seva <vseva(a)debian.org> Wed, 01 Feb 2017 16:42:26 +0100 + kamailio (5.0.0~pre0) unstable; urgency=medium * version set to 5.0.0-pre0 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 1a78c8c..cb31fb5 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~pre1) unstable; urgency=medium + + * version set to 5.0.0-pre1 + + -- Victor Seva <vseva(a)debian.org> Wed, 01 Feb 2017 16:42:26 +0100 + kamailio (5.0.0~pre0) unstable; urgency=medium * version set to 5.0.0-pre0 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 1a78c8c..cb31fb5 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~pre1) unstable; urgency=medium + + * version set to 5.0.0-pre1 + + -- Victor Seva <vseva(a)debian.org> Wed, 01 Feb 2017 16:42:26 +0100 + kamailio (5.0.0~pre0) unstable; urgency=medium * version set to 5.0.0-pre0 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 1a78c8c..cb31fb5 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~pre1) unstable; urgency=medium + + * version set to 5.0.0-pre1 + + -- Victor Seva <vseva(a)debian.org> Wed, 01 Feb 2017 16:42:26 +0100 + kamailio (5.0.0~pre0) unstable; urgency=medium * version set to 5.0.0-pre0 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index 1a78c8c..cb31fb5 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~pre1) unstable; urgency=medium + + * version set to 5.0.0-pre1 + + -- Victor Seva <vseva(a)debian.org> Wed, 01 Feb 2017 16:42:26 +0100 + kamailio (5.0.0~pre0) unstable; urgency=medium * version set to 5.0.0-pre0 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 1a78c8c..cb31fb5 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~pre1) unstable; urgency=medium + + * version set to 5.0.0-pre1 + + -- Victor Seva <vseva(a)debian.org> Wed, 01 Feb 2017 16:42:26 +0100 + kamailio (5.0.0~pre0) unstable; urgency=medium * version set to 5.0.0-pre0 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 1a78c8c..cb31fb5 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~pre1) unstable; urgency=medium + + * version set to 5.0.0-pre1 + + -- Victor Seva <vseva(a)debian.org> Wed, 01 Feb 2017 16:42:26 +0100 + kamailio (5.0.0~pre0) unstable; urgency=medium * version set to 5.0.0-pre0 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 1a78c8c..cb31fb5 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~pre1) unstable; urgency=medium + + * version set to 5.0.0-pre1 + + -- Victor Seva <vseva(a)debian.org> Wed, 01 Feb 2017 16:42:26 +0100 + kamailio (5.0.0~pre0) unstable; urgency=medium * version set to 5.0.0-pre0 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 1a78c8c..cb31fb5 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~pre1) unstable; urgency=medium + + * version set to 5.0.0-pre1 + + -- Victor Seva <vseva(a)debian.org> Wed, 01 Feb 2017 16:42:26 +0100 + kamailio (5.0.0~pre0) unstable; urgency=medium * version set to 5.0.0-pre0

1 0

git:master:8d2e8f57: Makefile.defs: version set to 5.0.0-pre1
by Daniel-Constantin Mierla 01 Feb '17

01 Feb '17

Module: kamailio Branch: master Commit: 8d2e8f578990c886168dab7f6247a7bf1cc39d9d URL: https://github.com/kamailio/kamailio/commit/8d2e8f578990c886168dab7f6247a7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-01T16:46:30+01:00 Makefile.defs: version set to 5.0.0-pre1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/8d2e8f578990c886168dab7f6247a7b… Patch: https://github.com/kamailio/kamailio/commit/8d2e8f578990c886168dab7f6247a7b… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index f4896e2..3fa6d76 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:6e53e4f2: modules: readme files regenerated - auth_ephemeral ...
by Kamailio Dev 01 Feb '17

01 Feb '17

Module: kamailio Branch: master Commit: 6e53e4f20df3ab21368eeb8ae9eeaedc96ddd9c6 URL: https://github.com/kamailio/kamailio/commit/6e53e4f20df3ab21368eeb8ae9eeaed… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-02-01T16:01:13+01:00 modules: readme files regenerated - auth_ephemeral ... --- Modified: src/modules/auth_ephemeral/README --- Diff: https://github.com/kamailio/kamailio/commit/6e53e4f20df3ab21368eeb8ae9eeaed… Patch: https://github.com/kamailio/kamailio/commit/6e53e4f20df3ab21368eeb8ae9eeaed… --- diff --git a/src/modules/auth_ephemeral/README b/src/modules/auth_ephemeral/README index 535bd8d..88a4af9 100644 --- a/src/modules/auth_ephemeral/README +++ b/src/modules/auth_ephemeral/README @@ -5,7 +5,14 @@ Peter Dunkley Crocodile RCS Ltd <peter.dunkley(a)crocodile-rcs.com> +Carsten Bock + + ng-voice GmbH + <carsten(a)ng-voice.com> + Copyright © 2013 Crocodile RCS Ltd + + Copyright © 2017 ng-voice GmbH __________________________________________________________________ Table of Contents @@ -28,6 +35,7 @@ Peter Dunkley 3.1. secret (string) 3.2. username_format (integer) + 3.3. sha_algorithm (integer) 4. Functions @@ -51,13 +59,14 @@ Peter Dunkley 1.2. Response example 1.3. secret parameter usage 1.4. username_format parameter usage - 1.5. autheph_proxy usage - 1.6. autheph_www usage - 1.7. autheph_check usage - 1.8. autheph_authenticate usage - 1.9. autheph_check_from usage - 1.10. autheph_check_to usage - 1.11. autheph_check_timestamp usage + 1.5. sha_algorithm parameter usage + 1.6. autheph_proxy usage + 1.7. autheph_www usage + 1.8. autheph_check usage + 1.9. autheph_authenticate usage + 1.10. autheph_check_from usage + 1.11. autheph_check_to usage + 1.12. autheph_check_timestamp usage Chapter 1. Admin Guide @@ -79,6 +88,7 @@ Chapter 1. Admin Guide 3.1. secret (string) 3.2. username_format (integer) + 3.3. sha_algorithm (integer) 4. Functions @@ -184,6 +194,7 @@ POST /?service=sip&username=foo(a)bar.com 3.1. secret (string) 3.2. username_format (integer) + 3.3. sha_algorithm (integer) 3.1. secret (string) @@ -211,6 +222,19 @@ modparam("auth_ephemeral", "secret", "kamailio_rules") modparam("auth_ephemeral", "username_format", 0) ... +3.3. sha_algorithm (integer) + + The SHA algorhithm to be used for the Hash. + + * 0 - SHA1 (default, as per IETF/RFC) + * 1 - SHA256 + * 2 - SHA512 + + Example 1.5. sha_algorithm parameter usage +... +modparam("auth_ephemeral", "sha_algorithm", 2) +... + 4. Functions 4.1. autheph_proxy(realm) @@ -241,7 +265,7 @@ Note This function can be used from REQUEST_ROUTE. - Example 1.5. autheph_proxy usage + Example 1.6. autheph_proxy usage ... if (!autheph_proxy("$fd")) { auth_challenge("$fd", "1"); @@ -272,7 +296,7 @@ Note This function can be used from REQUEST_ROUTE. - Example 1.6. autheph_www usage + Example 1.7. autheph_www usage ... if (!autheph_www("$fd")) { auth_challenge("$fd", "1"); @@ -302,7 +326,7 @@ Note This function can be used from REQUEST_ROUTE. - Example 1.7. autheph_check usage + Example 1.8. autheph_check usage ... if (!autheph_check("$fd")) { auth_challenge("$fd", "1"); @@ -329,7 +353,7 @@ Note This function can be used from REQUEST_ROUTE. - Example 1.8. autheph_authenticate usage + Example 1.9. autheph_authenticate usage ... if (!autheph_authenticate("$var(username)", "$var(password)")) { sl_send_reply("403", "Forbidden"); @@ -363,7 +387,7 @@ Note This function can be used from REQUEST_ROUTE. - Example 1.9. autheph_check_from usage + Example 1.10. autheph_check_from usage ... if (!autheph_check_from()) { sl_send_reply("403", "Forbidden"); @@ -397,7 +421,7 @@ Note This function can be used from REQUEST_ROUTE. - Example 1.10. autheph_check_to usage + Example 1.11. autheph_check_to usage ... if (!autheph_check_to()) { sl_send_reply("403", "Forbidden"); @@ -426,7 +450,7 @@ Note This function can be used from REQUEST_ROUTE. - Example 1.11. autheph_check_timestamp usage + Example 1.12. autheph_check_timestamp usage ... if (!autheph_check_timestamp("$var(username)")) { sl_send_reply("403", "Forbidden");

1 0

git:master:765562b2: auth_ephemeral: Support for stronger hashing algorithms
by Carsten Bock 01 Feb '17

01 Feb '17

Module: kamailio Branch: master Commit: 765562b289d6dd37f4b11a71cc296d1cb6f0cbb2 URL: https://github.com/kamailio/kamailio/commit/765562b289d6dd37f4b11a71cc296d1… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-02-01T15:46:48+01:00 auth_ephemeral: Support for stronger hashing algorithms --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.c Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.h Modified: src/modules/auth_ephemeral/authorize.c Modified: src/modules/auth_ephemeral/doc/auth_ephemeral.xml Modified: src/modules/auth_ephemeral/doc/auth_ephemeral_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/765562b289d6dd37f4b11a71cc296d1… Patch: https://github.com/kamailio/kamailio/commit/765562b289d6dd37f4b11a71cc296d1…

1 0

git:4.4:42f5515d: core: avoid overrun-buffer-arg
by Victor Seva 01 Feb '17

01 Feb '17

Module: kamailio Branch: 4.4 Commit: 42f5515df93a182fd33a6c48f1a9dd1850e91965 URL: https://github.com/kamailio/kamailio/commit/42f5515df93a182fd33a6c48f1a9dd1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-01T15:21:05+01:00 core: avoid overrun-buffer-arg > Overrunning array ((struct a_rdata *)rr->rdata)->ip of 4 bytes > by passing it to a function which accesses it at byte offset 15 > using argument len (which evaluates to 16) (cherry picked from commit 5640f696f5364bb88732807f5f87b4afb7a97ba6) --- Modified: dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/42f5515df93a182fd33a6c48f1a9dd1… Patch: https://github.com/kamailio/kamailio/commit/42f5515df93a182fd33a6c48f1a9dd1… --- diff --git a/dns_cache.c b/dns_cache.c index 21b780e..c4b910d 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -2362,6 +2362,7 @@ inline static struct hostent* dns_entry2he(struct dns_hash_entry* e) int af, len; struct dns_rr* rr; unsigned char rr_no; + unsigned char *ip; ticks_t now; int i; @@ -2389,7 +2390,15 @@ inline static struct hostent* dns_entry2he(struct dns_hash_entry* e) for(i=0; rr && (i<DNS_HE_MAX_ADDR); i++, rr=dns_entry_get_rr(e, &rr_no, now)){ p_addr[i]=&address[i*len]; - memcpy(p_addr[i], ((struct a_rdata*)rr->rdata)->ip, len); + switch(e->type){ + case T_A: + ip = ((struct a_rdata*)rr->rdata)->ip; + break; + case T_AAAA: + ip = ((struct aaaa_rdata*)rr->rdata)->ip6; + break; + } + memcpy(p_addr[i], ip, len); } if (i==0){ LM_DBG("no good records found (%d) for %.*s (%d)\n",

1 0

git:master:5640f696: core: avoid overrun-buffer-arg
by Victor Seva 01 Feb '17

01 Feb '17

Module: kamailio Branch: master Commit: 5640f696f5364bb88732807f5f87b4afb7a97ba6 URL: https://github.com/kamailio/kamailio/commit/5640f696f5364bb88732807f5f87b4a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-01T15:08:42+01:00 core: avoid overrun-buffer-arg > Overrunning array ((struct a_rdata *)rr->rdata)->ip of 4 bytes > by passing it to a function which accesses it at byte offset 15 > using argument len (which evaluates to 16) --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/5640f696f5364bb88732807f5f87b4a… Patch: https://github.com/kamailio/kamailio/commit/5640f696f5364bb88732807f5f87b4a… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 21b780e..c4b910d 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2362,6 +2362,7 @@ inline static struct hostent* dns_entry2he(struct dns_hash_entry* e) int af, len; struct dns_rr* rr; unsigned char rr_no; + unsigned char *ip; ticks_t now; int i; @@ -2389,7 +2390,15 @@ inline static struct hostent* dns_entry2he(struct dns_hash_entry* e) for(i=0; rr && (i<DNS_HE_MAX_ADDR); i++, rr=dns_entry_get_rr(e, &rr_no, now)){ p_addr[i]=&address[i*len]; - memcpy(p_addr[i], ((struct a_rdata*)rr->rdata)->ip, len); + switch(e->type){ + case T_A: + ip = ((struct a_rdata*)rr->rdata)->ip; + break; + case T_AAAA: + ip = ((struct aaaa_rdata*)rr->rdata)->ip6; + break; + } + memcpy(p_addr[i], ip, len); } if (i==0){ LM_DBG("no good records found (%d) for %.*s (%d)\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 February 2017