sr-dev June 2016

sr-dev@lists.kamailio.org

37 participants
345 discussions

git:master:bb1e6cea: app_java: skip throwing error of missing java for make readme

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bb1e6ceadacd2b38826ed996e44cc45f3d8d1a41 URL: https://github.com/kamailio/kamailio/commit/bb1e6ceadacd2b38826ed996e44cc45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-08T13:58:39+02:00 app_java: skip throwing error of missing java for make readme - controlled by DOCBUILD=yes --- Modified: modules/app_java/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/bb1e6ceadacd2b38826ed996e44cc45… Patch: https://github.com/kamailio/kamailio/commit/bb1e6ceadacd2b38826ed996e44cc45… --- diff --git a/modules/app_java/Makefile b/modules/app_java/Makefile index f3a40ae..c348ffd 100644 --- a/modules/app_java/Makefile +++ b/modules/app_java/Makefile @@ -24,7 +24,9 @@ LIBS += $(shell pkg-config libgcj --libs) -L$(JAVA_HOME)/lib -ljvm # At this point I don't see any universal method as explicit setting this variable at the compile phase. # -- ez ifeq ($(shell [ -d "${JAVA_HOME}" -a -f "$(JAVA_HOME)/include/jni.h" -a -f "$(JAVA_HOME)/lib/libjvm.so" ] && echo 1 || echo 0),0) - $(error Can't locate Java Development Kit. You have to specify environment JAVA_HOME to build app_java) +ifneq ($(DOCBUILD),yes) +$(error Cannot locate Java Development Kit. You have to specify environment JAVA_HOME to build app_java) +endif endif ifeq ($(OS), freebsd)

8 years, 2 months

git:master:0ea1b700: core: mem/tlsf - return unsigned long for function giving available memory

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0ea1b700458888f60d54f3ebf192e09b9ea56d37 URL: https://github.com/kamailio/kamailio/commit/0ea1b700458888f60d54f3ebf192e09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-08T10:39:25+02:00 core: mem/tlsf - return unsigned long for function giving available memory - aling it with mem api prototype --- Modified: mem/tlsf_malloc.c Modified: mem/tlsf_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/0ea1b700458888f60d54f3ebf192e09… Patch: https://github.com/kamailio/kamailio/commit/0ea1b700458888f60d54f3ebf192e09… --- diff --git a/mem/tlsf_malloc.c b/mem/tlsf_malloc.c index 73ae412..2570ae6 100644 --- a/mem/tlsf_malloc.c +++ b/mem/tlsf_malloc.c @@ -1138,10 +1138,10 @@ void tlsf_meminfo(tlsf_t pool, struct mem_info *info) info->total_size = control->total_size; } -size_t tlsf_available(tlsf_t pool) +unsigned long tlsf_available(tlsf_t pool) { control_t* control = tlsf_cast(control_t*, pool); - return control->total_size - control->real_used; + return (unsigned long)(control->total_size - control->real_used); } void tlsf_status(tlsf_t pool) diff --git a/mem/tlsf_malloc.h b/mem/tlsf_malloc.h index 97e962a..b92ae6f 100644 --- a/mem/tlsf_malloc.h +++ b/mem/tlsf_malloc.h @@ -79,7 +79,7 @@ int tlsf_check_pool(pool_t pool); void tlsf_meminfo(tlsf_t pool, struct mem_info *info); void tlsf_status(tlsf_t pool); void tlsf_sums(tlsf_t pool); -size_t tlsf_available(tlsf_t pool); +unsigned long tlsf_available(tlsf_t pool); void tlsf_mod_get_stats(tlsf_t pool, void **root); void tlsf_mod_free_stats(void *root);

8 years, 2 months

git:master:f17ac878: core: mem - qmalloc - cast size to unsigned long in debug messages

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f17ac878a555b9baad3954e0e8c6b390378bad5a URL: https://github.com/kamailio/kamailio/commit/f17ac878a555b9baad3954e0e8c6b39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-08T10:28:32+02:00 core: mem - qmalloc - cast size to unsigned long in debug messages - better for compatibility with C sepcs older than C99 - newer specs allow %zu, but 'z' specifier is not in older specs, %lu being the safer approach --- Modified: mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/f17ac878a555b9baad3954e0e8c6b39… Patch: https://github.com/kamailio/kamailio/commit/f17ac878a555b9baad3954e0e8c6b39…

8 years, 2 months

git:master:7e8b679b: core: mem - fmalloc - cast size to unsigned long in debug messages

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7e8b679b6a2c66b3695da3f1e076cfa525607d34 URL: https://github.com/kamailio/kamailio/commit/7e8b679b6a2c66b3695da3f1e076cfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-08T10:19:20+02:00 core: mem - fmalloc - cast size to unsigned long in debug messages - better for compatibility with C sepcs older than C99 - newer specs allow %zu, but 'z' specifier is not in older specs, %lu being the safer approach --- Modified: mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/7e8b679b6a2c66b3695da3f1e076cfa… Patch: https://github.com/kamailio/kamailio/commit/7e8b679b6a2c66b3695da3f1e076cfa…

8 years, 2 months

git:master:587e24a4: core: mem - use size_t for tlsf memory management functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 587e24a48094ad672aa625461a69363219de6922 URL: https://github.com/kamailio/kamailio/commit/587e24a48094ad672aa625461a69363… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-08T10:04:08+02:00 core: mem - use size_t for tlsf memory management functions --- Modified: mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/587e24a48094ad672aa625461a69363… Patch: https://github.com/kamailio/kamailio/commit/587e24a48094ad672aa625461a69363… --- diff --git a/mem/tlsf_malloc.c b/mem/tlsf_malloc.c index 85afcff..73ae412 100644 --- a/mem/tlsf_malloc.c +++ b/mem/tlsf_malloc.c @@ -1370,7 +1370,7 @@ static tlsf_t _tlsf_shm_block = 0; /*SHM wrappers to sync the access to memory block*/ #ifdef DBG_TLSF_MALLOC -void* tlsf_shm_malloc(void* tlsfmp, unsigned long size, +void* tlsf_shm_malloc(void* tlsfmp, size_t size, const char* file, const char* func, unsigned int line, const char* mname) { void *r; @@ -1379,7 +1379,7 @@ void* tlsf_shm_malloc(void* tlsfmp, unsigned long size, shm_unlock(); return r; } -void* tlsf_shm_realloc(void* tlsfmp, void* p, unsigned long size, +void* tlsf_shm_realloc(void* tlsfmp, void* p, size_t size, const char* file, const char* func, unsigned int line, const char* mname) { void *r; @@ -1388,7 +1388,7 @@ void* tlsf_shm_realloc(void* tlsfmp, void* p, unsigned long size, shm_unlock(); return r; } -void* tlsf_shm_resize(void* tlsfmp, void* p, unsigned long size, +void* tlsf_shm_resize(void* tlsfmp, void* p, size_t size, const char* file, const char* func, unsigned int line, const char* mname) { void *r; @@ -1406,7 +1406,7 @@ void tlsf_shm_free(void* tlsfmp, void* p, const char* file, const char* func, shm_unlock(); } #else -void* tlsf_shm_malloc(void* tlsfmp, unsigned long size) +void* tlsf_shm_malloc(void* tlsfmp, size_t size) { void *r; shm_lock(); @@ -1414,7 +1414,7 @@ void* tlsf_shm_malloc(void* tlsfmp, unsigned long size) shm_unlock(); return r; } -void* tlsf_shm_realloc(void* tlsfmp, void* p, unsigned long size) +void* tlsf_shm_realloc(void* tlsfmp, void* p, size_t size) { void *r; shm_lock(); @@ -1422,7 +1422,7 @@ void* tlsf_shm_realloc(void* tlsfmp, void* p, unsigned long size) shm_unlock(); return r; } -void* tlsf_shm_resize(void* tlsfmp, void* p, unsigned long size) +void* tlsf_shm_resize(void* tlsfmp, void* p, size_t size) { void *r; shm_lock();

8 years, 2 months

git:master:7a5c95d7: core: mem - use size_t for qm memory management functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7a5c95d77f863d4af6115b2b744549bd7fe6fc89 URL: https://github.com/kamailio/kamailio/commit/7a5c95d77f863d4af6115b2b744549b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-08T10:03:50+02:00 core: mem - use size_t for qm memory management functions --- Modified: mem/q_malloc.c Modified: mem/q_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/7a5c95d77f863d4af6115b2b744549b… Patch: https://github.com/kamailio/kamailio/commit/7a5c95d77f863d4af6115b2b744549b…

8 years, 2 months

git:master:b2f1456a: core: mem - use size_t for fm memory management functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b2f1456ae03f2c75aceab8eea177464dc4cc3672 URL: https://github.com/kamailio/kamailio/commit/b2f1456ae03f2c75aceab8eea177464… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-08T10:03:18+02:00 core: mem - use size_t for fm memory management functions --- Modified: mem/f_malloc.c Modified: mem/f_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/b2f1456ae03f2c75aceab8eea177464… Patch: https://github.com/kamailio/kamailio/commit/b2f1456ae03f2c75aceab8eea177464…

8 years, 2 months

git:master:bab8a6b1: core: mem - use size_t for memory management api prototypes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bab8a6b172e2a0a6155515587e72d674205dbe0c URL: https://github.com/kamailio/kamailio/commit/bab8a6b172e2a0a6155515587e72d67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-08T10:01:51+02:00 core: mem - use size_t for memory management api prototypes - be compatible with standard malloc(...) prototype --- Modified: mem/memapi.h --- Diff: https://github.com/kamailio/kamailio/commit/bab8a6b172e2a0a6155515587e72d67… Patch: https://github.com/kamailio/kamailio/commit/bab8a6b172e2a0a6155515587e72d67… --- diff --git a/mem/memapi.h b/mem/memapi.h index 28e9f86..2e1b7fe 100644 --- a/mem/memapi.h +++ b/mem/memapi.h @@ -20,27 +20,29 @@ #ifndef _sr_mem_api_ #define _sr_mem_api_ +#include <string.h> + #include "src_loc.h" #include "meminfo.h" #include "memdbg.h" #ifdef DBG_SR_MEMORY -typedef void* (*sr_malloc_f)(void* mbp, unsigned long size, +typedef void* (*sr_malloc_f)(void* mbp, size_t size, const char* file, const char* func, unsigned int line, const char* mname); typedef void (*sr_free_f)(void* mbp, void* p, const char* file, const char* func, unsigned int line, const char* mname); -typedef void* (*sr_realloc_f)(void* mbp, void* p, unsigned long size, +typedef void* (*sr_realloc_f)(void* mbp, void* p, size_t size, const char* file, const char* func, unsigned int line, const char* mname); -typedef void* (*sr_resize_f)(void* mbp, void* p, unsigned long size, +typedef void* (*sr_resize_f)(void* mbp, void* p, size_t size, const char* file, const char* func, unsigned int line, const char* mname); #else /*DBG_SR_MEMORY*/ -typedef void* (*sr_malloc_f)(void* mbp, unsigned long size); +typedef void* (*sr_malloc_f)(void* mbp, size_t size); typedef void (*sr_free_f)(void* mbp, void* p); -typedef void* (*sr_realloc_f)(void* mbp, void* p, unsigned long size); -typedef void* (*sr_resize_f)(void* mbp, void* p, unsigned long size); +typedef void* (*sr_realloc_f)(void* mbp, void* p, size_t size); +typedef void* (*sr_resize_f)(void* mbp, void* p, size_t size); #endif /*DBG_SR_MEMORY*/

8 years, 2 months

xmlrpc: missing declaration of vsnprintf

by Juha Heinanen

While compiling Kamailio 4.3 on Debian Jessie, I got this: CC (gcc) [M xmlrpc.so] xmlrpc.o xmlrpc.c: In function 'set_fault': xmlrpc.c:886:2: warning: implicit declaration of function 'vsnprintf' [-Wimplicit-function-declaration] vsnprintf(buf, REASON_BUF_LEN, fmt, ap); ^ xmlrpc.c: In function 'print_value': xmlrpc.c:1015:3: warning: implicit declaration of function 'snprintf' [-Wimplicit-function-declaration] body.len = snprintf(buf, 256, "%f", va_arg(*ap, double)); ^ xmlrpc.c:1015:14: warning: incompatible implicit declaration of built-in function 'snprintf' body.len = snprintf(buf, 256, "%f", va_arg(*ap, double)); ^ Sounds pretty serious. -- Juha

8 years, 2 months

git:4.2:851a06c6: xmlrpc: fix compiler warning #612

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 851a06c6f6a9f142b6c1fd51cd4a3d5b39ef5831 URL: https://github.com/kamailio/kamailio/commit/851a06c6f6a9f142b6c1fd51cd4a3d5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-08T09:34:56+02:00 xmlrpc: fix compiler warning #612 > CC (gcc) [M xmlrpc.so] xmlrpc.o > In file included from /usr/include/strings.h:26:0, > from xmlrpc.c:28: > /usr/include/features.h:148:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp] > # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" (cherry picked from commit 947fe8673c3014f4d011583bed95d44408b907f4) (cherry picked from commit 42be15030909cf31cedbb3642e2a6b51b2b5ae9f) (cherry picked from commit 1582200618c8be92ac5aab0e15d2aaf82f8bfa57) --- Modified: modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/851a06c6f6a9f142b6c1fd51cd4a3d5… Patch: https://github.com/kamailio/kamailio/commit/851a06c6f6a9f142b6c1fd51cd4a3d5… --- diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index 6743a30..7ba2e90 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -28,6 +28,7 @@ #endif #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #define _SVID_SOURCE 1 /* timegm */ +#define _DEFAULT_SOURCE 1 /* _SVID_SOURCE is deprecated */ #include <strings.h> #include <time.h>

8 years, 2 months

← Newer
1
...
20
21
22
23
24
25
26
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2016