sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
295 discussions

git:master:7b67ab46: debugger: Restrict dbg_sip_msg() to REQUEST/ONSEND

by Stefan Mititelu

Module: kamailio Branch: master Commit: 7b67ab4623f63cbf823be47a35135ba052278c9e URL: https://github.com/kamailio/kamailio/commit/7b67ab4623f63cbf823be47a35135ba… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-01-15T13:08:29+02:00 debugger: Restrict dbg_sip_msg() to REQUEST/ONSEND Allow dbg_sip_msg only from REQUEST/ONSEND route in a similar way as for msg_apply_changes(). --- Modified: modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7b67ab4623f63cbf823be47a35135ba… Patch: https://github.com/kamailio/kamailio/commit/7b67ab4623f63cbf823be47a35135ba… --- diff --git a/modules/debugger/debugger_mod.c b/modules/debugger/debugger_mod.c index 9f8186d..7681586 100644 --- a/modules/debugger/debugger_mod.c +++ b/modules/debugger/debugger_mod.c @@ -99,11 +99,11 @@ static cmd_export_t cmds[]={ {"dbg_pv_dump", (cmd_function)w_dbg_dump, 2, fixup_dbg_pv_dump, 0, ANY_ROUTE}, {"dbg_sip_msg", (cmd_function)w_dbg_sip_msg, 0, - fixup_dbg_sip_msg, 0, REQUEST_ROUTE}, + fixup_dbg_sip_msg, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"dbg_sip_msg", (cmd_function)w_dbg_sip_msg, 1, - fixup_dbg_sip_msg, 0, REQUEST_ROUTE}, + fixup_dbg_sip_msg, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"dbg_sip_msg", (cmd_function)w_dbg_sip_msg, 2, - fixup_dbg_sip_msg, 0, REQUEST_ROUTE}, + fixup_dbg_sip_msg, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -777,6 +777,11 @@ static int w_dbg_sip_msg(struct sip_msg* msg, char *level, char *facility) struct dest_info send_info; str obuf; + if (msg->first_line.type != SIP_REPLY && get_route_type() != REQUEST_ROUTE) { + LM_ERR("invalid usage - not in request route\n"); + return -1; + } + if (level != NULL) { /* substract L_OFFSET previously added */ ilevel = (int)(long)level - L_OFFSET;

8 years, 11 months

git:master:21a7ce6f: debugger: debugger_mod.c indentation

by Stefan Mititelu

Module: kamailio Branch: master Commit: 21a7ce6fe07c2e645519603eaff908dfd96be3cc URL: https://github.com/kamailio/kamailio/commit/21a7ce6fe07c2e645519603eaff908d… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-01-15T13:08:29+02:00 debugger: debugger_mod.c indentation Tab-like indentations for debugger_mod.c file. --- Modified: modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/21a7ce6fe07c2e645519603eaff908d… Patch: https://github.com/kamailio/kamailio/commit/21a7ce6fe07c2e645519603eaff908d…

8 years, 11 months

git:master:8e8a71cc: debugger: Fix dbg_sip_msg() segfault

by Stefan Mititelu

Module: kamailio Branch: master Commit: 8e8a71cc0b589bb881f56bbef370a1d19863d038 URL: https://github.com/kamailio/kamailio/commit/8e8a71cc0b589bb881f56bbef370a1d… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-01-15T13:07:55+02:00 debugger: Fix dbg_sip_msg() segfault Fix dbg_sip_msg() segfault when the function is called with no parameters. Change the dbg_sip_msg() output format. --- Modified: modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8e8a71cc0b589bb881f56bbef370a1d… Patch: https://github.com/kamailio/kamailio/commit/8e8a71cc0b589bb881f56bbef370a1d… --- diff --git a/modules/debugger/debugger_mod.c b/modules/debugger/debugger_mod.c index e37ab83..8334b97 100644 --- a/modules/debugger/debugger_mod.c +++ b/modules/debugger/debugger_mod.c @@ -707,6 +707,8 @@ static int fixup_dbg_sip_msg(void** param, int param_no) int level; struct action *dbg_sip_msg_action; + LM_DBG("dbg_sip_msg() called with %d params\n", param_no); + switch(param_no) { case 2: @@ -716,8 +718,9 @@ static int fixup_dbg_sip_msg(void** param, int param_no) return E_UNSPEC; } - *param = (void*)(long)facility; + *param = (void*)(long)facility; break; + case 1: switch(((char*)(*param))[2]) { @@ -737,6 +740,15 @@ static int fixup_dbg_sip_msg(void** param, int param_no) *param = (void*)(long)level; break; + + case 0: + _dbg_sip_msg_cline = -1; + return 0; + + default: + // should not reach here + _dbg_sip_msg_cline = -1; + return -1; } /* save the config line where this config function was called */ @@ -815,36 +827,23 @@ static int w_dbg_sip_msg(struct sip_msg* msg, char *level, char *facility) new_buf_offs = 0; process_lumps(msg, msg->body_lumps, bdy_lumps, &new_buf_offs, &orig_offs, &send_info, flag); - /* do the print */ - if (hdr_lumps != NULL && bdy_lumps != NULL) { - LOG_FC(ifacility, ilevel, "CONFIG LINE %d\n%s%.*s%s%s%s%s%s", - _dbg_sip_msg_cline, - start_txt, - obuf.len, obuf.s, - hdr_txt, hdr_lumps, - bdy_txt, bdy_lumps, - end_txt); - } else if (hdr_lumps != NULL) { - LOG_FC(ifacility, ilevel, "CONFIG LINE %d\n%s%.*s%s%s%s", - _dbg_sip_msg_cline, - start_txt, - obuf.len, obuf.s, - hdr_txt, hdr_lumps, - end_txt); - } else if (bdy_lumps != NULL) { - LOG_FC(ifacility, ilevel, "CONFIG LINE %d\n%s%.*s%s%s%s", - _dbg_sip_msg_cline, - start_txt, - obuf.len, obuf.s, - bdy_txt, bdy_lumps, - end_txt); - } else { - LOG_FC(ifacility, ilevel, "CONFIG LINE %d\n%s%.*s%s", - _dbg_sip_msg_cline, - start_txt, - obuf.len, obuf.s, - end_txt); - } + /* do the print */ + if (_dbg_sip_msg_cline < 0 ) { + LOG_FC(ifacility, ilevel, "CONFIG LINE unknown\n%s%.*s%s%s%s%s%s", + start_txt, + obuf.len, obuf.s, + hdr_txt, hdr_lumps, + bdy_txt, bdy_lumps, + end_txt); + } else { + LOG_FC(ifacility, ilevel, "CONFIG LINE %d\n%s%.*s%s%s%s%s%s", + _dbg_sip_msg_cline, + start_txt, + obuf.len, obuf.s, + hdr_txt, hdr_lumps, + bdy_txt, bdy_lumps, + end_txt); + } /* free lumps */ if (hdr_lumps) {

8 years, 11 months

[kamailio] debugger: fix segfault when dbg_sip_msg() is called with no params (#478)

by Stefan Mititelu

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/478 -- Commit Summary -- * debugger: Fix dbg_sip_msg() segfault * debugger: Restrict dbg_sip_msg() to REQUEST/ONSEND * debugger: debugger_mod.c indentation -- File Changes -- M modules/debugger/debugger_mod.c (324) -- Patch Links -- https://github.com/kamailio/kamailio/pull/478.patch https://github.com/kamailio/kamailio/pull/478.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/478

8 years, 11 months

git:master:2d612982: Makefile.groups: added crypto module to tls group

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2d612982966d87ed1cc6f56b10886fe89a1c10c4 URL: https://github.com/kamailio/kamailio/commit/2d612982966d87ed1cc6f56b10886fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-20T23:35:49+01:00 Makefile.groups: added crypto module to tls group - dependency on libssl --- Modified: Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/2d612982966d87ed1cc6f56b10886fe… Patch: https://github.com/kamailio/kamailio/commit/2d612982966d87ed1cc6f56b10886fe… --- diff --git a/Makefile.groups b/Makefile.groups index 96b3605..c7895db 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -90,7 +90,7 @@ mod_list_purple=purple mod_list_memcached=memcached # - modules depending on openssl library -mod_list_tlsdeps=auth_identity tls +mod_list_tlsdeps=auth_identity crypto tls # - modules depending on openssl library mod_list_outbound=outbound

8 years, 11 months

git:master:760c1d55: crypto: new module offering various cryptographic functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 760c1d55dfa53e09ab1d6b87e157ea61fba24c24 URL: https://github.com/kamailio/kamailio/commit/760c1d55dfa53e09ab1d6b87e157ea6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-20T23:32:58+01:00 crypto: new module offering various cryptographic functions - AES encryption/decryption functions - encrypted data is given as base64 string to be able to use it with config and sip messages --- Added: modules/crypto/Makefile Added: modules/crypto/README Added: modules/crypto/crypto_mod.c Added: modules/crypto/doc/Makefile Added: modules/crypto/doc/crypto.xml Added: modules/crypto/doc/crypto_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/760c1d55dfa53e09ab1d6b87e157ea6… Patch: https://github.com/kamailio/kamailio/commit/760c1d55dfa53e09ab1d6b87e157ea6…

8 years, 11 months

git:master:edb11dd0: utils: bock indentations fixed

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: edb11dd06b895e0b532c81ddc703420f7e5e81a1 URL: https://github.com/kamailio/kamailio/commit/edb11dd06b895e0b532c81ddc703420… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-20T22:46:14+01:00 utils: bock indentations fixed --- Modified: modules/utils/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/edb11dd06b895e0b532c81ddc703420… Patch: https://github.com/kamailio/kamailio/commit/edb11dd06b895e0b532c81ddc703420…

8 years, 11 months

git:master:0ce66908: topoh: proper detection of cancel reply for processing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0ce66908ee9da74806e2fa506ef98b5f9043e47c URL: https://github.com/kamailio/kamailio/commit/0ce66908ee9da74806e2fa506ef98b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-20T18:30:30+01:00 topoh: proper detection of cancel reply for processing - reported by Alex Balashov --- Modified: modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0ce66908ee9da74806e2fa506ef98b5… Patch: https://github.com/kamailio/kamailio/commit/0ce66908ee9da74806e2fa506ef98b5… --- diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index 343a745..fcdcc8c 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -331,7 +331,7 @@ int th_msg_received(void *data) { /* one Via in received reply -- it is for local generated request * - nothing to unhide unless is CANCEL/ACK */ - if((get_cseq(&msg)->method_id)&(METHOD_CANCEL)) + if(!((get_cseq(&msg)->method_id)&(METHOD_CANCEL))) goto done; }

8 years, 11 months

git:master:8d2a7a9d: Merge pull request #477 from mslehto/stdbool

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8d2a7a9d9ce530112a52d7489185710914c8cc67 URL: https://github.com/kamailio/kamailio/commit/8d2a7a9d9ce530112a52d7489185710… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-20T14:10:08+01:00 Merge pull request #477 from mslehto/stdbool Use C99 boolean --- Modified: modules/nat_traversal/nat_traversal.c Modified: modules/statsd/lib_statsd.c Modified: modules/statsd/lib_statsd.h --- Diff: https://github.com/kamailio/kamailio/commit/8d2a7a9d9ce530112a52d7489185710… Patch: https://github.com/kamailio/kamailio/commit/8d2a7a9d9ce530112a52d7489185710…

8 years, 11 months

git:master:648d95e1: modules/nat_traversal: use C99 boolean

by Mikko Lehto

Module: kamailio Branch: master Commit: 648d95e126a13986684db94136dc47d69a7cc27c URL: https://github.com/kamailio/kamailio/commit/648d95e126a13986684db94136dc47d… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-01-15T02:48:39+02:00 modules/nat_traversal: use C99 boolean --- Modified: modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/648d95e126a13986684db94136dc47d… Patch: https://github.com/kamailio/kamailio/commit/648d95e126a13986684db94136dc47d…

8 years, 11 months

← Newer
1
...
14
15
16
17
18
19
20
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2016