sr-dev March 2017

sr-dev@lists.kamailio.org

31 participants
269 discussions

git:master:8cd194d4: Merge pull request #1033 from dunst0/fixpdbt

by GitHub

Module: kamailio Branch: master Commit: 8cd194d49759a4b14b906265837eb653cfff7a79 URL: https://github.com/kamailio/kamailio/commit/8cd194d49759a4b14b906265837eb65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-03-15T09:54:40+01:00 Merge pull request #1033 from dunst0/fixpdbt utils/pdbt: FreeBSD fix, gcc is hardcoded, header is missing --- Modified: utils/pdbt/Makefile Modified: utils/pdbt/pdbt.c --- Diff: https://github.com/kamailio/kamailio/commit/8cd194d49759a4b14b906265837eb65… Patch: https://github.com/kamailio/kamailio/commit/8cd194d49759a4b14b906265837eb65… --- diff --git a/utils/pdbt/Makefile b/utils/pdbt/Makefile index b16d3cb..e354f6c 100644 --- a/utils/pdbt/Makefile +++ b/utils/pdbt/Makefile @@ -1,3 +1,11 @@ +#set some vars from the environment (and not make builtins) +CC := $(shell echo "$${CC}") + +# find compiler name & version +ifeq ($(CC),) + CC=gcc +endif + .phony: all clean install header=common.h carrier.h dt.h dtm.h pdb_server_backend.h log.h @@ -10,13 +18,13 @@ extdep=Makefile all: pdbt pdb_server $(obj): %.o : %.c %.h $(header) $(extdep) - gcc $(cflags) -c $< + $(CC) $(cflags) -c $< pdbt: pdbt.c $(obj) $(header) $(extdep) - gcc $(cflags) -o $@ $< $(obj) + $(CC) $(cflags) -o $@ $< $(obj) pdb_server: pdb_server.c $(pdb_server_obj) $(header) $(extdep) - gcc $(cflags) -o $@ $< $(pdb_server_obj) + $(CC) $(cflags) -o $@ $< $(pdb_server_obj) clean: rm -f *~ *.o pdbt pdb_server diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index fac466a..afd3695 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -28,6 +28,7 @@ #include <poll.h> #include <ctype.h> #include <sys/socket.h> +#include <sys/stat.h> #include <netinet/in.h> #include <arpa/inet.h> #include <netdb.h>

7 years, 8 months

git:master:32e1e504: utils/pdbt: FreeBSD fix, gcc is hardcoded, header is missing

by Rick Barenthin

Module: kamailio Branch: master Commit: 32e1e5040d2ff5e13d5bd0373e7edd6cef56f172 URL: https://github.com/kamailio/kamailio/commit/32e1e5040d2ff5e13d5bd0373e7edd6… Author: Rick Barenthin <rb(a)terralink.de> Committer: Rick Barenthin <rb(a)terralink.de> Date: 2017-03-14T22:35:52+01:00 utils/pdbt: FreeBSD fix, gcc is hardcoded, header is missing - use CC environment variable if set - added missing sys/stat.h header --- Modified: utils/pdbt/Makefile Modified: utils/pdbt/pdbt.c --- Diff: https://github.com/kamailio/kamailio/commit/32e1e5040d2ff5e13d5bd0373e7edd6… Patch: https://github.com/kamailio/kamailio/commit/32e1e5040d2ff5e13d5bd0373e7edd6… --- diff --git a/utils/pdbt/Makefile b/utils/pdbt/Makefile index b16d3cb..e354f6c 100644 --- a/utils/pdbt/Makefile +++ b/utils/pdbt/Makefile @@ -1,3 +1,11 @@ +#set some vars from the environment (and not make builtins) +CC := $(shell echo "$${CC}") + +# find compiler name & version +ifeq ($(CC),) + CC=gcc +endif + .phony: all clean install header=common.h carrier.h dt.h dtm.h pdb_server_backend.h log.h @@ -10,13 +18,13 @@ extdep=Makefile all: pdbt pdb_server $(obj): %.o : %.c %.h $(header) $(extdep) - gcc $(cflags) -c $< + $(CC) $(cflags) -c $< pdbt: pdbt.c $(obj) $(header) $(extdep) - gcc $(cflags) -o $@ $< $(obj) + $(CC) $(cflags) -o $@ $< $(obj) pdb_server: pdb_server.c $(pdb_server_obj) $(header) $(extdep) - gcc $(cflags) -o $@ $< $(pdb_server_obj) + $(CC) $(cflags) -o $@ $< $(pdb_server_obj) clean: rm -f *~ *.o pdbt pdb_server diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index fac466a..afd3695 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -28,6 +28,7 @@ #include <poll.h> #include <ctype.h> #include <sys/socket.h> +#include <sys/stat.h> #include <netinet/in.h> #include <arpa/inet.h> #include <netdb.h>

7 years, 8 months

[kamailio/kamailio] utils/pdbt: FreeBSD fix, gcc is hardcoded, header is missing (#1033)

by Rick

- use CC environment variable if set - added missing sys/stat.h header You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1033 -- Commit Summary -- * utils/pdbt: FreeBSD fix, gcc is hardcoded, header is missing -- File Changes -- M utils/pdbt/Makefile (14) M utils/pdbt/pdbt.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1033.patch https://github.com/kamailio/kamailio/pull/1033.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/1033

7 years, 8 months

[kamailio/kamailio] substr transformation error does not include config line number (#1019)

by juha-h

I noticed that when there is an error in substr transformation, config file line number is not included in the error message: Mar 4 22:40:24 lohi /usr/bin/sip-proxy[7801]: ERROR: pv [pv_trans.c:572]: tr_eval_string(): substr out of range -- 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/issues/1019

7 years, 8 months

git:master:b926e403: Merge pull request #1031 from kamailio/lazedo-patch-1

by GitHub

Module: kamailio Branch: master Commit: b926e403f1709d0fc15f1dc8991f4369d57586ed URL: https://github.com/kamailio/kamailio/commit/b926e403f1709d0fc15f1dc8991f436… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-03-14T20:14:40+01:00 Merge pull request #1031 from kamailio/lazedo-patch-1 presence : fix fast_notify usage --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/b926e403f1709d0fc15f1dc8991f436… Patch: https://github.com/kamailio/kamailio/commit/b926e403f1709d0fc15f1dc8991f436… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index e8c9cea..8dab786 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -1114,7 +1114,7 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain) goto error; } - if (pres_notifier_processes > 0 && pa_dbf.start_transaction) + if (pres_notifier_processes > 0 && !send_fast_notify && pa_dbf.start_transaction) { if (pa_dbf.use_table(pa_db, &active_watchers_table) < 0) { @@ -1241,7 +1241,7 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain) LM_DBG("subscription status= %s - %s\n", get_status_str(subs.status), (found==0)?"inserted":"found in watcher table"); - if (pres_notifier_processes > 0) + if (pres_notifier_processes > 0 && !send_fast_notify) { if (update_subscription_notifier(msg, &subs, to_tag_gen, &sent_reply) < 0) @@ -1255,7 +1255,8 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain) LM_ERR("in update_subscription\n"); goto error; } - if (pres_notifier_processes > 0 && pa_dbf.end_transaction) + + if (pres_notifier_processes > 0 && !send_fast_notify && pa_dbf.end_transaction) { if (pa_dbf.end_transaction(pa_db) < 0) {

7 years, 8 months

git:master:0411c078: presence : fix fast_notify usage

by GitHub

Module: kamailio Branch: master Commit: 0411c078b525ffa78b1bc252e161914205b6ac4b URL: https://github.com/kamailio/kamailio/commit/0411c078b525ffa78b1bc252e161914… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: GitHub <noreply(a)github.com> Date: 2017-03-11T16:04:32Z presence : fix fast_notify usage fast_notify not used when pres_notifier_processes > 0 --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/0411c078b525ffa78b1bc252e161914… Patch: https://github.com/kamailio/kamailio/commit/0411c078b525ffa78b1bc252e161914… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index e8c9cea..8dab786 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -1114,7 +1114,7 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain) goto error; } - if (pres_notifier_processes > 0 && pa_dbf.start_transaction) + if (pres_notifier_processes > 0 && !send_fast_notify && pa_dbf.start_transaction) { if (pa_dbf.use_table(pa_db, &active_watchers_table) < 0) { @@ -1241,7 +1241,7 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain) LM_DBG("subscription status= %s - %s\n", get_status_str(subs.status), (found==0)?"inserted":"found in watcher table"); - if (pres_notifier_processes > 0) + if (pres_notifier_processes > 0 && !send_fast_notify) { if (update_subscription_notifier(msg, &subs, to_tag_gen, &sent_reply) < 0) @@ -1255,7 +1255,8 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain) LM_ERR("in update_subscription\n"); goto error; } - if (pres_notifier_processes > 0 && pa_dbf.end_transaction) + + if (pres_notifier_processes > 0 && !send_fast_notify && pa_dbf.end_transaction) { if (pa_dbf.end_transaction(pa_db) < 0) {

7 years, 8 months

[kamailio/kamailio] presence : fix fast_notify usage (#1031)

by lazedo

fast_notify not used when pres_notifier_processes > 0 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1031 -- Commit Summary -- * presence : fix fast_notify usage -- File Changes -- M src/modules/presence/subscribe.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1031.patch https://github.com/kamailio/kamailio/pull/1031.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/1031

7 years, 8 months

git:master:a5c4dbc2: ims_dialog: remove execinfo usage

by Fabrice Fontaine

Module: kamailio Branch: master Commit: a5c4dbc280742ff2b2aadb7ae3ea45ae5a091e64 URL: https://github.com/kamailio/kamailio/commit/a5c4dbc280742ff2b2aadb7ae3ea45a… Author: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> Committer: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> Date: 2017-03-10T07:20:00+01:00 ims_dialog: remove execinfo usage Currently, ims_dialog includes execinfo.h to use backtrace in the backtrace2str function. However, all calls to backtrace2str are commented so disable this function through "if 0" and comment the include on execinfo.h to allow the cross-compilation of the ims_dialog module as some libc's don't always have this header (uclibc-ng, musl) Signed-off-by: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> --- Modified: src/modules/ims_dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/a5c4dbc280742ff2b2aadb7ae3ea45a… Patch: https://github.com/kamailio/kamailio/commit/a5c4dbc280742ff2b2aadb7ae3ea45a… --- diff --git a/src/modules/ims_dialog/dlg_hash.c b/src/modules/ims_dialog/dlg_hash.c index 999ae01..a7afdbc 100644 --- a/src/modules/ims_dialog/dlg_hash.c +++ b/src/modules/ims_dialog/dlg_hash.c @@ -17,7 +17,7 @@ #include "dlg_profile.h" #include "dlg_handlers.h" #include "dlg_db_handler.h" -#include <execinfo.h> +//#include <execinfo.h> #define MAX_LDG_LOCKS 2048 #define MIN_LDG_LOCKS 2 @@ -70,6 +70,7 @@ static int dlg_hash_size_out = 4096; }\ }while(0) +#if 0 inline static int backtrace2str(char* buf, int size) { void* bt[32]; @@ -87,6 +88,7 @@ inline static int backtrace2str(char* buf, int size) } return 0; } +#endif /*! * \brief Initialize the global dialog table

7 years, 8 months

git:master:263546f9: Merge pull request #996 from ffontaine/master

by GitHub

Module: kamailio Branch: master Commit: 263546f932cb517caf6d15472350d58132e916d3 URL: https://github.com/kamailio/kamailio/commit/263546f932cb517caf6d15472350d58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-03-14T20:13:17+01:00 Merge pull request #996 from ffontaine/master Fix execinfo error in ims_dialog module --- Modified: src/modules/ims_dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/263546f932cb517caf6d15472350d58… Patch: https://github.com/kamailio/kamailio/commit/263546f932cb517caf6d15472350d58… --- diff --git a/src/modules/ims_dialog/dlg_hash.c b/src/modules/ims_dialog/dlg_hash.c index 999ae01..a7afdbc 100644 --- a/src/modules/ims_dialog/dlg_hash.c +++ b/src/modules/ims_dialog/dlg_hash.c @@ -17,7 +17,7 @@ #include "dlg_profile.h" #include "dlg_handlers.h" #include "dlg_db_handler.h" -#include <execinfo.h> +//#include <execinfo.h> #define MAX_LDG_LOCKS 2048 #define MIN_LDG_LOCKS 2 @@ -70,6 +70,7 @@ static int dlg_hash_size_out = 4096; }\ }while(0) +#if 0 inline static int backtrace2str(char* buf, int size) { void* bt[32]; @@ -87,6 +88,7 @@ inline static int backtrace2str(char* buf, int size) } return 0; } +#endif /*! * \brief Initialize the global dialog table

7 years, 8 months

[kamailio/kamailio] Fix execinfo error in ims_dialog module (#996)

by Fabrice Fontaine

Currently, ims_dialog includes execinfo.h to use backtrace in the backtrace2str function. However, all calls to backtrace2str are commented so disable this function through "if 0" and comment the include on execinfo.h to allow the cross-compilation of the ims_dialog module as some libc's don't always have this header (uclibc-ng, musl) Signed-off-by: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/996 -- Commit Summary -- * Fix execinfo error in ims_dialog module -- File Changes -- M src/modules/ims_dialog/dlg_hash.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/996.patch https://github.com/kamailio/kamailio/pull/996.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/996

7 years, 8 months

← Newer
1
...
12
13
14
15
16
17
18
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2017