sr-dev October 2015

sr-dev@lists.kamailio.org

28 participants
236 discussions

[kamailio] inline function suip2a() (ip_addr.h) not working for ipv6 (#379)

by topotomaso

I observed that the inline function suip2a() (ip_addr.h) contains a silly bug and therefor does not work for IPv6 conversions. This silly bug is preventing sip_trace() to work in the onsend_route block for IPv6 sip messages. Rem.: The function suip2a() is used only by the siptrace module. Test background (just for understanding the use case): - using kamailio 4.1.3 (with an additional patch to let onsend_route be called also for replies taken from kamailio 4.2.x) - kamailio is used as loadbalancer in stateless mode (using forward() only) - sip tracing is used by explictly calling sip_trace() in onsend_route, route and onreply routing block to be able to implement an interface specific sip tracing (no SIP transaction based sip tracing is applied by using the siptrace's trace_flag) The silly bug: In suip2a() the function ip6tosbuf() is called with an odd buffer length argument of value "sizeof(buf)-4" which is equal to "IP6_MAX_STR_SIZE -1". ip6tosbuf() however needs at least a buffer length of IP6_MAX_STR_SIZE (otherwise it returns immediately without writing anything into the buffer). So regarding IPv6 adresses the ascii output of suip2a() is alway an empty IPv6 reference ([]). ``` static inline int ip6tosbuf(unsigned char* ip6, char* buff, int len) { int offset; register unsigned char a,b,c; register unsigned char d; register unsigned short hex4; int r; #define HEXDIG(x) (((x)>=10)?(x)-10+'A':(x)+'0') offset=0; if (unlikely(len<IP6_MAX_STR_SIZE)) return 0; ... } #define SUIP2A_MAX_STR_SIZE (IP6_MAX_STR_SIZE + 2 /* [] */ + 1 /* \0 */) /* returns an asciiz string containing the ip * (<ipv4_addr> or [<ipv6_addr>]) */ static inline char* suip2a(union sockaddr_union* su, int su_len) { static char buf[SUIP2A_MAX_STR_SIZE]; int offs; if (unlikely(su->s.sa_family==AF_INET6)){ if (unlikely(su_len<sizeof(su->sin6))) return "<addr. error>"; buf[0]='['; offs=1+ip6tosbuf((unsigned char*)su->sin6.sin6_addr.s6_addr, &buf[1], sizeof(buf)-4); buf[offs]=']'; offs++; }else if (unlikely(su_len<sizeof(su->sin))) return "<addr. error>"; else offs=ip4tosbuf((unsigned char*)&su->sin.sin_addr, buf, sizeof(buf)-2); buf[offs]=0; return buf; } ``` A possible verfied patch looks like this (using this patch sip_trace() is working now as expected in this use case). ``` --- ip_addr.h 2014-04-24 12:02:35.000000000 +0200 +++ ip_addr.h 2015-10-22 18:48:40.553177206 +0200 @@ -737,14 +737,14 @@ return "<addr. error>"; buf[0]='['; offs=1+ip6tosbuf((unsigned char*)su->sin6.sin6_addr.s6_addr, &buf[1], - sizeof(buf)-4); + IP6_MAX_STR_SIZE); buf[offs]=']'; offs++; }else if (unlikely(su_len<sizeof(su->sin))) return "<addr. error>"; else - offs=ip4tosbuf((unsigned char*)&su->sin.sin_addr, buf, sizeof(buf)-2); + offs=ip4tosbuf((unsigned char*)&su->sin.sin_addr, buf, IP4_MAX_STR_SIZE); buf[offs]=0; return buf; } ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/379

8 years, 6 months

git:master:d6f313e6: core: fixed passed buffer size in suip2a() for ipv6

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d6f313e61b3318924e6653c8ca1184b2016f701d URL: https://github.com/kamailio/kamailio/commit/d6f313e61b3318924e6653c8ca1184b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-26T21:31:59+01:00 core: fixed passed buffer size in suip2a() for ipv6 - buffer size set to IP6_MAX_STR_SIZE, it was too short and returned value was empty addres "[]" - the function is used only by siptrace - patch from github pull request #381 --- Modified: ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/d6f313e61b3318924e6653c8ca1184b… Patch: https://github.com/kamailio/kamailio/commit/d6f313e61b3318924e6653c8ca1184b… --- diff --git a/ip_addr.h b/ip_addr.h index bce06fa..20176b0 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -741,14 +741,14 @@ static inline char* suip2a(union sockaddr_union* su, int su_len) return "<addr. error>"; buf[0]='['; offs=1+ip6tosbuf((unsigned char*)su->sin6.sin6_addr.s6_addr, &buf[1], - sizeof(buf)-4); + IP6_MAX_STR_SIZE); buf[offs]=']'; offs++; }else if (unlikely(su_len<sizeof(su->sin))) return "<addr. error>"; else - offs=ip4tosbuf((unsigned char*)&su->sin.sin_addr, buf, sizeof(buf)-2); + offs=ip4tosbuf((unsigned char*)&su->sin.sin_addr, buf, IP4_MAX_STR_SIZE); buf[offs]=0; return buf; }

8 years, 6 months

[kamailio] core: fixed passed buffer size in suip2a() (#381)

by topotomaso

- fix regarding issue #379 - it makes sense to backport this fix to 4.2 and 4.3 - Function suip2a() has never worked properly for IPv6 addresses before. The passed buffer size 'sizeof(buf)-4' to ip6tosbuf() was 1 byte to small. So ip6tosbuf() has never written any IPv6 ASCII string to the buffer and therefor suip2a() always returned an empty IPv6 reference string ("[]"). Fixed this by changing passed buffer size to IP6_MAX_STR_SIZE. For similarity also changed uncritical passed buffer size in call to ip4tosbuf() to IP4_MAX_STR_SIZE. The function suip2a() is only used by siptrace module when sip_trace() script function is explicitly called on sending side e.g. in onsend_route block. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/381 -- Commit Summary -- * core: fixed passed buffer size in suip2a() -- File Changes -- M ip_addr.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/381.patch https://github.com/kamailio/kamailio/pull/381.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/381

8 years, 6 months

[kamailio] Kamailio not compiling - systemd/sd-journal.h: No such file or directory (#380)

by Jay J

When trying to compile Kamailio, I get the following error: ``` CC (gcc) [M log_systemd.so] log_systemd_mod.o [91mlog_systemd_mod.c:27:32: fatal error: systemd/sd-journal.h: No such file or directory [0m[91mcompilation terminated. [0m../../Makefile.rules:97: recipe for target 'log_systemd_mod.o' failed [91mmake[1]: *** [log_systemd_mod.o] Error 1 [0m[91mmake: *** [modules] Error 1 [0mMakefile:511: recipe for target 'modules' failed The command '/bin/sh -c make all && make install' returned a non-zero code: 2 ``` Have tried versions 4.1 and 4.3.3, on Ubuntu Trusty & Wily, always get the same error. This is an automated Jenkins/Docker build that was previously succeeding, so that rules out the dependency problems. Can anyone point me in the right direction? --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/380

8 years, 6 months

git:master:850b7459: ims_usrloc_scscf: Remove first Entry, if maxcontacts reached and maxcontact_behaviour is 2 (delete oldest)

by Carsten Bock

Module: kamailio Branch: master Commit: 850b7459ec3fc04cf7e2e54038fcf4f12dcf797d URL: https://github.com/kamailio/kamailio/commit/850b7459ec3fc04cf7e2e54038fcf4f… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-10-23T19:50:15+02:00 ims_usrloc_scscf: Remove first Entry, if maxcontacts reached and maxcontact_behaviour is 2 (delete oldest) --- Modified: modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/850b7459ec3fc04cf7e2e54038fcf4f… Patch: https://github.com/kamailio/kamailio/commit/850b7459ec3fc04cf7e2e54038fcf4f… --- diff --git a/modules/ims_usrloc_scscf/impurecord.c b/modules/ims_usrloc_scscf/impurecord.c index 6d2869e..ba6141c 100644 --- a/modules/ims_usrloc_scscf/impurecord.c +++ b/modules/ims_usrloc_scscf/impurecord.c @@ -478,7 +478,7 @@ int insert_scontact(impurecord_t* _r, str* _contact, ucontact_info_t* _ci, ucont case 2://overwrite oldest LM_DBG("Too many contacts already registered, overwriting oldest for IMPU <%.*s>\n", _r->public_identity.len, _r->public_identity.s); //we can just remove the first one seeing the contacts are ordered on insertion with newest last and oldest first - //TODO:mem_delete_ucontact(_r, _r->contacts); + mem_delete_ucontact(_r->newcontacts[0]); break; default://unknown LM_ERR("unknown maxcontact behaviour..... ignoring\n");

8 years, 6 months

git:master:9cd4aef8: db_postgres: safety check to see if hasing is over non-null pointer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9cd4aef84d8e7a079486ff73285a9bd6a15e8db3 URL: https://github.com/kamailio/kamailio/commit/9cd4aef84d8e7a079486ff73285a9bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-23T18:56:45+02:00 db_postgres: safety check to see if hasing is over non-null pointer - inside implementation of replace command --- Modified: modules/db_postgres/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/9cd4aef84d8e7a079486ff73285a9bd… Patch: https://github.com/kamailio/kamailio/commit/9cd4aef84d8e7a079486ff73285a9bd… --- diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 816a512..7c9a1bb 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -905,12 +905,12 @@ int db_postgres_replace(const db1_con_t* _h, const db_key_t* _k, pos += VAL_UINT(&_v[i]); break; case DB1_STR: - pos += get_hash1_raw((VAL_STR(&_v[i])).s, - (VAL_STR(&_v[i])).len); + pos += ((VAL_STR(&_v[i])).s)?get_hash1_raw((VAL_STR(&_v[i])).s, + (VAL_STR(&_v[i])).len):0; break; case DB1_STRING: - pos += get_hash1_raw(VAL_STRING(&_v[i]), - strlen(VAL_STRING(&_v[i]))); + pos += (VAL_STRING(&_v[i]))?get_hash1_raw(VAL_STRING(&_v[i]), + strlen(VAL_STRING(&_v[i]))):0; break; default: break;

8 years, 6 months

git:master:13cde2bb: dmq_usrloc: proper handle of not found urecord by uuid

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 13cde2bb1deda9cc67925ca01910e41150c4435e URL: https://github.com/kamailio/kamailio/commit/13cde2bb1deda9cc67925ca01910e41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-23T17:49:31+02:00 dmq_usrloc: proper handle of not found urecord by uuid - return code is negative and in this case is not locking the slot --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/13cde2bb1deda9cc67925ca01910e41… Patch: https://github.com/kamailio/kamailio/commit/13cde2bb1deda9cc67925ca01910e41… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index 06ef6b6..4d53d0c 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -197,12 +197,12 @@ void usrloc_get_all_ucontact(dmq_node_t* node) memcpy( &aorhash, cp, sizeof(aorhash)); cp = (char*)cp + sizeof(aorhash); + r = 0; + ptr = 0; res = dmq_ul.get_urecord_by_ruid(_d, aorhash, &ruid, &r, &ptr); aor = r->aor; - if (res > 0) { + if (res < 0) { LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); - dmq_ul.release_urecord(r); - dmq_ul.unlock_udomain(_d, &aor); continue; } LM_DBG("- AoR: %.*s AoRhash=%d Flags=%d\n", aor.len, aor.s, aorhash, flags);

8 years, 6 months

Use rtpengine lua question

by Yuriy Gorlichenko

Hello. I want to rewrite some my configs by using lua scripts. At examples I saw that I can use constructions like sr.some_module.module_api("options") Can I use with this method rtpengine module api because many of projects that I have uses Webrtc and use rtpengine and ofcourse I dont want "to jump" from config file to scripts.

8 years, 6 months

git:4.3:60985a13: usrloc: fixed number of columns when loading urecord in db mode 3

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 60985a13878b9ec3b84b565c02be14927ba6357a URL: https://github.com/kamailio/kamailio/commit/60985a13878b9ec3b84b565c02be149… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-23T14:57:22+02:00 usrloc: fixed number of columns when loading urecord in db mode 3 - reported by GH#373 (cherry picked from commit 922e5818b02b6d5e1f082e861f97bc8868f5ae57) --- Modified: modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/60985a13878b9ec3b84b565c02be149… Patch: https://github.com/kamailio/kamailio/commit/60985a13878b9ec3b84b565c02be149… --- diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index 2bb1707..63db924 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -609,7 +609,7 @@ urecord_t* db_load_urecord(db1_con_t* _c, udomain_t* _d, str *_aor) return 0; } - if (ul_dbf.query(_c, keys, 0, vals, columns, (use_domain)?2:1, 16, order, + if (ul_dbf.query(_c, keys, 0, vals, columns, (use_domain)?2:1, 19, order, &res) < 0) { LM_ERR("db_query failed\n"); return 0; @@ -793,7 +793,7 @@ urecord_t* db_load_urecord_by_ruid(db1_con_t* _c, udomain_t* _d, str *_ruid) return 0; } - if (ul_dbf.query(_c, keys, 0, vals, columns, 1, 18, order, + if (ul_dbf.query(_c, keys, 0, vals, columns, 1, 21, order, &res) < 0) { LM_ERR("db_query failed\n"); return 0;

8 years, 6 months

git:master:922e5818: usrloc: fixed number of columns when loading urecord in db mode 3

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 922e5818b02b6d5e1f082e861f97bc8868f5ae57 URL: https://github.com/kamailio/kamailio/commit/922e5818b02b6d5e1f082e861f97bc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-23T14:15:54+02:00 usrloc: fixed number of columns when loading urecord in db mode 3 - reported by GH#373 --- Modified: modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/922e5818b02b6d5e1f082e861f97bc8… Patch: https://github.com/kamailio/kamailio/commit/922e5818b02b6d5e1f082e861f97bc8… --- diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index 6d135da..3ef2803 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -630,7 +630,7 @@ urecord_t* db_load_urecord(db1_con_t* _c, udomain_t* _d, str *_aor) return 0; } - if (ul_dbf.query(_c, keys, 0, vals, columns, (use_domain)?2:1, 16, order, + if (ul_dbf.query(_c, keys, 0, vals, columns, (use_domain)?2:1, 19, order, &res) < 0) { LM_ERR("db_query failed\n"); return 0; @@ -814,7 +814,7 @@ urecord_t* db_load_urecord_by_ruid(db1_con_t* _c, udomain_t* _d, str *_ruid) return 0; } - if (ul_dbf.query(_c, keys, 0, vals, columns, 1, 18, order, + if (ul_dbf.query(_c, keys, 0, vals, columns, 1, 21, order, &res) < 0) { LM_ERR("db_query failed\n"); return 0;

8 years, 6 months

← Newer
1
...
5
6
7
8
9
10
11
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2015