sr-dev July 2016

sr-dev@lists.kamailio.org

29 participants
297 discussions

git:master:5d8d5653: janssonrpc-c: init cfg framework for additional process

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5d8d565331111b80d72a20d19f2bcb14ea6301a4 URL: https://github.com/kamailio/kamailio/commit/5d8d565331111b80d72a20d19f2bcb1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-13T16:03:32+02:00 janssonrpc-c: init cfg framework for additional process - revealed by GH #708 --- Modified: modules/janssonrpc-c/janssonrpc_io.c Modified: modules/janssonrpc-c/janssonrpc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5d8d565331111b80d72a20d19f2bcb1… Patch: https://github.com/kamailio/kamailio/commit/5d8d565331111b80d72a20d19f2bcb1… --- diff --git a/modules/janssonrpc-c/janssonrpc_io.c b/modules/janssonrpc-c/janssonrpc_io.c index 1e1a82b..ed0be6c 100644 --- a/modules/janssonrpc-c/janssonrpc_io.c +++ b/modules/janssonrpc-c/janssonrpc_io.c @@ -39,6 +39,7 @@ #include "../../action.h" #include "../../route_struct.h" #include "../../lvalue.h" +#include "../../cfg/cfg_struct.h" #include "../../rand/fastrand.h" #include "../tm/tm_load.h" #include "../jansson/jansson_utils.h" @@ -57,11 +58,15 @@ void io_shutdown(int sig); int jsonrpc_io_child_process(int cmd_pipe) { + struct event* pipe_ev = NULL; + global_ev_base = event_base_new(); global_evdns_base = evdns_base_new(global_ev_base, 1); set_non_blocking(cmd_pipe); - struct event* pipe_ev = event_new(global_ev_base, cmd_pipe, EV_READ | EV_PERSIST, cmd_pipe_cb, NULL); + pipe_ev = event_new(global_ev_base, cmd_pipe, + EV_READ | EV_PERSIST, cmd_pipe_cb, NULL); + if(!pipe_ev) { ERR("Failed to create pipe event\n"); return -1; @@ -449,6 +454,7 @@ void cmd_pipe_cb(int fd, short event, void *arg) return; } + cfg_update(); switch(cmd->type) { case CMD_CLOSE: diff --git a/modules/janssonrpc-c/janssonrpc_mod.c b/modules/janssonrpc-c/janssonrpc_mod.c index 7db22cc..c69b843 100644 --- a/modules/janssonrpc-c/janssonrpc_mod.c +++ b/modules/janssonrpc-c/janssonrpc_mod.c @@ -29,6 +29,7 @@ #include "../../trim.h" #include "../../sr_module.h" #include "../../timer_proc.h" +#include "../../cfg/cfg_struct.h" #include "../tm/tm_load.h" #include "../jansson/jansson_utils.h" @@ -194,6 +195,7 @@ static int child_init(int rank) return -1; /* error */ if(pid==0){ /* child */ + if (cfg_child_init()) return -1; close(pipe_fds[1]); return jsonrpc_io_child_process(pipe_fds[0]); }

7 years, 11 months

git:master:c7bec332: tm: execut cfg_update() inside t_continue()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c7bec3320f6907c4edd8416a5e5cfa89b071a411 URL: https://github.com/kamailio/kamailio/commit/c7bec3320f6907c4edd8416a5e5cfa8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-13T15:36:09+02:00 tm: execut cfg_update() inside t_continue() - refresh the values changed inside cfg framework - reported by Victor Seva, GH #708 --- Modified: modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/c7bec3320f6907c4edd8416a5e5cfa8… Patch: https://github.com/kamailio/kamailio/commit/c7bec3320f6907c4edd8416a5e5cfa8… --- diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index e8096bb..6bb2547 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -22,6 +22,7 @@ #include "../../action.h" #include "../../script_cb.h" #include "../../dset.h" +#include "../../cfg/cfg_struct.h" #include "config.h" #include "sip_msg.h" @@ -178,6 +179,8 @@ int t_continue(unsigned int hash_index, unsigned int label, struct hdr_field *hdr, *prev = 0, *tmp = 0; int route_type_bk; + cfg_update(); + if (t_lookup_ident(&t, hash_index, label) < 0) { LM_ERR("transaction not found\n"); return -1;

7 years, 11 months

git:master:cc5e86d7: dialog: cseq update callback implemented inside the module

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cc5e86d79538395d2ce03abd10e0ac1ed5d723f5 URL: https://github.com/kamailio/kamailio/commit/cc5e86d79538395d2ce03abd10e0ac1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-13T10:18:49+02:00 dialog: cseq update callback implemented inside the module - keep related code together as it needs access to dlg vars --- Modified: modules/dialog/dialog.c Modified: modules/dialog/dlg_cseq.c Modified: modules/dialog/dlg_cseq.h --- Diff: https://github.com/kamailio/kamailio/commit/cc5e86d79538395d2ce03abd10e0ac1… Patch: https://github.com/kamailio/kamailio/commit/cc5e86d79538395d2ce03abd10e0ac1…

7 years, 11 months

git:master:d2363126: uac: use cseq update callback exported by dialog via core srapi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d236312676a3f7e9a66d5cc904ed6a377f5e36ef URL: https://github.com/kamailio/kamailio/commit/d236312676a3f7e9a66d5cc904ed6a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-13T10:18:49+02:00 uac: use cseq update callback exported by dialog via core srapi --- Modified: modules/uac/auth.c --- Diff: https://github.com/kamailio/kamailio/commit/d236312676a3f7e9a66d5cc904ed6a3… Patch: https://github.com/kamailio/kamailio/commit/d236312676a3f7e9a66d5cc904ed6a3… --- diff --git a/modules/uac/auth.c b/modules/uac/auth.c index 19283a5..867eed7 100644 --- a/modules/uac/auth.c +++ b/modules/uac/auth.c @@ -37,6 +37,7 @@ #include "../../hashes.h" #include "../../dset.h" #include "../../srapi.h" +#include "../../parser/parse_cseq.h" #include "../../modules/tm/tm_load.h" #include "auth.h" @@ -476,8 +477,10 @@ int uac_auth(sip_msg_t *msg) if(t->uas.request) { t->uas.request->msg_flags |= FL_UAC_AUTH; cenv = sr_cfgenv_get(); - if(cenv->cseq_update == 1) { - sr_hdr_add_zz(msg, "P-K-Auth-CSeq", "yes"); + if(cenv->cb_cseq_update != NULL) { + if(cenv->cb_cseq_update(msg)<0) { + goto error; + } } }

7 years, 11 months

git:master:3ccb1b83: core: add header helper uses after lump anchor insert

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3ccb1b83216b874405b7a63a73b2966aa7f91253 URL: https://github.com/kamailio/kamailio/commit/3ccb1b83216b874405b7a63a73b2966… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-13T10:18:49+02:00 core: add header helper uses after lump anchor insert --- Modified: data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/3ccb1b83216b874405b7a63a73b2966… Patch: https://github.com/kamailio/kamailio/commit/3ccb1b83216b874405b7a63a73b2966… --- diff --git a/data_lump.c b/data_lump.c index 19a6b90..5d085ec 100644 --- a/data_lump.c +++ b/data_lump.c @@ -743,7 +743,7 @@ int sr_hdr_add(sip_msg_t *msg, str *sname, str *sbody) struct lump* anchor; str h; - h.len = sname->len + 2 + sbody->len + 1 + CRLF_LEN; + h.len = sname->len + 2 + sbody->len + CRLF_LEN; h.s = (char*)pkg_malloc(h.len+1); if(h.s == 0) { LM_ERR("no more pkg\n"); @@ -761,7 +761,7 @@ int sr_hdr_add(sip_msg_t *msg, str *sname, str *sbody) memcpy(h.s+sname->len+2, sbody->s, sbody->len); memcpy(h.s+sname->len+2+sbody->len, CRLF, CRLF_LEN); h.s[h.len] = '\0'; - if (insert_new_lump_before(anchor, h.s, h.len, 0) == 0) + if (insert_new_lump_after(anchor, h.s, h.len, 0) == 0) { LM_ERR("cannot insert lump\n"); pkg_free(h.s);

7 years, 11 months

git:master:2880cd62: core: srapi - cseq update field update to be a function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2880cd627802920b20514a62fc90ff450a5c6b30 URL: https://github.com/kamailio/kamailio/commit/2880cd627802920b20514a62fc90ff4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-13T10:18:49+02:00 core: srapi - cseq update field update to be a function --- Modified: srapi.h --- Diff: https://github.com/kamailio/kamailio/commit/2880cd627802920b20514a62fc90ff4… Patch: https://github.com/kamailio/kamailio/commit/2880cd627802920b20514a62fc90ff4… --- diff --git a/srapi.h b/srapi.h index d45fe35..d480fbf 100644 --- a/srapi.h +++ b/srapi.h @@ -20,6 +20,7 @@ #define __SRAPI_H__ #include "str.h" +#include "parser/msg_parser.h" typedef void (*sr_generate_callid_f)(str*); @@ -27,8 +28,9 @@ int sr_register_callid_func(sr_generate_callid_f f); sr_generate_callid_f sr_get_callid_func(void); +typedef int (*sr_cseq_update_f)(sip_msg_t*); typedef struct sr_cfgenv { - int cseq_update; + sr_cseq_update_f cb_cseq_update; } sr_cfgenv_t; void sr_cfgenv_init(void);

7 years, 11 months

git:master:4e49312d: core: helper functions to add headers with str parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4e49312d0d7a90f0234b8a29036867452771a8b7 URL: https://github.com/kamailio/kamailio/commit/4e49312d0d7a90f0234b8a290368674… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-13T10:18:49+02:00 core: helper functions to add headers with str parameters --- Modified: data_lump.c Modified: data_lump.h --- Diff: https://github.com/kamailio/kamailio/commit/4e49312d0d7a90f0234b8a290368674… Patch: https://github.com/kamailio/kamailio/commit/4e49312d0d7a90f0234b8a290368674… --- diff --git a/data_lump.c b/data_lump.c index 1431222..19a6b90 100644 --- a/data_lump.c +++ b/data_lump.c @@ -738,19 +738,12 @@ int remove_lump(sip_msg_t *msg, struct lump *l) /** * */ -int sr_hdr_add_zz(sip_msg_t *msg, char *hname, char *hbody) +int sr_hdr_add(sip_msg_t *msg, str *sname, str *sbody) { struct lump* anchor; str h; - str sname; - str sbody; - sname.s = hname; - sname.len = strlen(sname.s); - sbody.s = hbody; - sbody.len = strlen(sbody.s); - - h.len = sname.len + 2 + sbody.len + 1 + CRLF_LEN; + h.len = sname->len + 2 + sbody->len + 1 + CRLF_LEN; h.s = (char*)pkg_malloc(h.len+1); if(h.s == 0) { LM_ERR("no more pkg\n"); @@ -763,10 +756,10 @@ int sr_hdr_add_zz(sip_msg_t *msg, char *hname, char *hbody) pkg_free(h.s); return -1; } - memcpy(h.s, sname.s, sname.len); - memcpy(h.s+sname.len, ": ", 2); - memcpy(h.s+sname.len+2, sbody.s, sbody.len); - memcpy(h.s+sname.len+2+sbody.len, CRLF, CRLF_LEN); + memcpy(h.s, sname->s, sname->len); + memcpy(h.s+sname->len, ": ", 2); + memcpy(h.s+sname->len+2, sbody->s, sbody->len); + memcpy(h.s+sname->len+2+sbody->len, CRLF, CRLF_LEN); h.s[h.len] = '\0'; if (insert_new_lump_before(anchor, h.s, h.len, 0) == 0) { @@ -781,6 +774,35 @@ int sr_hdr_add_zz(sip_msg_t *msg, char *hname, char *hbody) /** * */ +int sr_hdr_add_zz(sip_msg_t *msg, char *hname, char *hbody) +{ + str sname; + str sbody; + + sname.s = hname; + sname.len = strlen(sname.s); + sbody.s = hbody; + sbody.len = strlen(sbody.s); + + return sr_hdr_add(msg, &sname, &sbody); +} + +/** + * + */ +int sr_hdr_add_zs(sip_msg_t *msg, char *hname, str *sbody) +{ + str sname; + + sname.s = hname; + sname.len = strlen(sname.s); + + return sr_hdr_add(msg, &sname, sbody); +} + +/** + * + */ hdr_field_t *sr_hdr_get_z(sip_msg_t *msg, char *hname) { hdr_field_t *hf; diff --git a/data_lump.h b/data_lump.h index 8cdee5b..ff129c0 100644 --- a/data_lump.h +++ b/data_lump.h @@ -87,7 +87,9 @@ void del_nonshm_lump( struct lump** lump_list ); /*! \brief remove the lump from the internal lists */ int remove_lump(sip_msg_t *msg, struct lump *l); +int sr_hdr_add(sip_msg_t *msg, str *sname, str *sbody); int sr_hdr_add_zz(sip_msg_t *msg, char *hname, char *hbody); +int sr_hdr_add_zs(sip_msg_t *msg, char *hname, str *sbody); int sr_hdr_del_z(sip_msg_t *msg, char *hname); hdr_field_t *sr_hdr_get_z(sip_msg_t *msg, char *hname);

7 years, 11 months

git:master:79cf8d58: modules: readme files regenerated - avpops ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 79cf8d5829c23757c500d50b83d351d358cd8de7 URL: https://github.com/kamailio/kamailio/commit/79cf8d5829c23757c500d50b83d351d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-07-12T18:01:18+02:00 modules: readme files regenerated - avpops ... --- Modified: modules/avpops/README --- Diff: https://github.com/kamailio/kamailio/commit/79cf8d5829c23757c500d50b83d351d… Patch: https://github.com/kamailio/kamailio/commit/79cf8d5829c23757c500d50b83d351d… --- diff --git a/modules/avpops/README b/modules/avpops/README index acbc983..27ea1cb 100644 --- a/modules/avpops/README +++ b/modules/avpops/README @@ -579,8 +579,11 @@ avp_check("$xavp(op=>foo[*])","fm/$xavp(op=>fm[$var(id)])/g"); + name = ( avp_name | avp_alias ) ['/'flags] + flags = 'g' | 'G' | 'd' | 'D' | 'n' | 'N' | 's' | 'S' - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, - BRANCH_ROUTE, LOCAL_ROUTE and ONREPLY_ROUTE. + NOTE: if a list of AVPs is copied/moved (flag g|G), then the order of + the values is reversed. Copy/move twice in order to get the same order + as in original list. + + This function can be used from ANY_ROUTE. Example 1.19. avp_copy usage ...

7 years, 11 months

[kamailio/kamailio] avpops: documentation of avp_copy incomplete (#706)

by Rick

The avp_copy function from the avpops seems to revert the avplist, but it is not documented. Would be great to have that behavior documented. --- 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/706

7 years, 11 months

git:master:5f2c2bb5: avpops: note that avp_copy() is reversing the order of the values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5f2c2bb5883a43cb01140b730aa126fc5d2f58d6 URL: https://github.com/kamailio/kamailio/commit/5f2c2bb5883a43cb01140b730aa126f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-12T17:51:53+02:00 avpops: note that avp_copy() is reversing the order of the values - reported by GH #706 --- Modified: modules/avpops/doc/avpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5f2c2bb5883a43cb01140b730aa126f… Patch: https://github.com/kamailio/kamailio/commit/5f2c2bb5883a43cb01140b730aa126f… --- diff --git a/modules/avpops/doc/avpops_admin.xml b/modules/avpops/doc/avpops_admin.xml index 81cdc37..f000480 100644 --- a/modules/avpops/doc/avpops_admin.xml +++ b/modules/avpops/doc/avpops_admin.xml @@ -826,8 +826,12 @@ avp_check("$xavp(op=>foo[*])","fm/$xavp(op=>fm[$var(id)])/g"); </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, - BRANCH_ROUTE, LOCAL_ROUTE and ONREPLY_ROUTE. + NOTE: if a list of AVPs is copied/moved (flag g|G), then the order + of the values is reversed. Copy/move twice in order to get the same + order as in original list. + </para> + <para> + This function can be used from ANY_ROUTE. </para> <example> <title><function>avp_copy</function> usage</title>

7 years, 11 months

← Newer
1
...
10
11
12
13
14
15
16
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2016