sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

git:master:ba64899e: textopsx: exported several functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ba64899e3c8dce9c683a6c5d0c836add080a7eb9 URL: https://github.com/kamailio/kamailio/commit/ba64899e3c8dce9c683a6c5d0c836ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-17T20:27:01+02:00 textopsx: exported several functions to kemi framework --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/ba64899e3c8dce9c683a6c5d0c836ad… Patch: https://github.com/kamailio/kamailio/commit/ba64899e3c8dce9c683a6c5d0c836ad…

7 years, 7 months

git:master:64adb292: websocket: exported functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 64adb2926420b292e1fe180172e766560b11d042 URL: https://github.com/kamailio/kamailio/commit/64adb2926420b292e1fe180172e7665… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-17T20:27:01+02:00 websocket: exported functions to kemi framework --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_frame.c Modified: src/modules/websocket/ws_frame.h Modified: src/modules/websocket/ws_handshake.c Modified: src/modules/websocket/ws_handshake.h --- Diff: https://github.com/kamailio/kamailio/commit/64adb2926420b292e1fe180172e7665… Patch: https://github.com/kamailio/kamailio/commit/64adb2926420b292e1fe180172e7665…

7 years, 7 months

git:master:b36d012e: dialog: exported dlg_get() to kemi interface

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b36d012ef844bc2226656177776eacca3adf7bae URL: https://github.com/kamailio/kamailio/commit/b36d012ef844bc2226656177776eacc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-17T20:27:01+02:00 dialog: exported dlg_get() to kemi interface --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/b36d012ef844bc2226656177776eacc… Patch: https://github.com/kamailio/kamailio/commit/b36d012ef844bc2226656177776eacc… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index cd10120..7556a95 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1336,13 +1336,40 @@ static int fixup_dlg_bridge(void** param, int param_no) return 0; } -static int w_dlg_get(struct sip_msg *msg, char *ci, char *ft, char *tt) +static int ki_dlg_get(sip_msg_t *msg, str *sc, str *sf, str *st) { dlg_cell_t *dlg = NULL; + unsigned int dir = 0; + + if(sc==NULL || sc->s==NULL || sc->len == 0) { + LM_ERR("invalid Call-ID parameter\n"); + return -1; + } + if(sf==NULL || sf->s==NULL || sf->len == 0) { + LM_ERR("invalid From tag parameter\n"); + return -1; + } + if(st==NULL || st->s==NULL || st->len == 0) { + LM_ERR("invalid To tag parameter\n"); + return -1; + } + + dlg = get_dlg(sc, sf, st, &dir); + if(dlg==NULL) + return -1; + /* set shorcut to dialog internal unique id */ + _dlg_ctx.iuid.h_entry = dlg->h_entry; + _dlg_ctx.iuid.h_id = dlg->h_id; + _dlg_ctx.dir = dir; + dlg_release(dlg); + return 1; +} + +static int w_dlg_get(struct sip_msg *msg, char *ci, char *ft, char *tt) +{ str sc = {0,0}; str sf = {0,0}; str st = {0,0}; - unsigned int dir = 0; if(ci==0 || ft==0 || tt==0) { @@ -1355,21 +1382,13 @@ static int w_dlg_get(struct sip_msg *msg, char *ci, char *ft, char *tt) LM_ERR("unable to get Call-ID\n"); return -1; } - if(sc.s==NULL || sc.len == 0) - { - LM_ERR("invalid Call-ID parameter\n"); - return -1; - } + if(fixup_get_svalue(msg, (gparam_p)ft, &sf)!=0) { LM_ERR("unable to get From tag\n"); return -1; } - if(sf.s==NULL || sf.len == 0) - { - LM_ERR("invalid From tag parameter\n"); - return -1; - } + if(fixup_get_svalue(msg, (gparam_p)tt, &st)!=0) { LM_ERR("unable to get To Tag\n"); @@ -1381,15 +1400,7 @@ static int w_dlg_get(struct sip_msg *msg, char *ci, char *ft, char *tt) return -1; } - dlg = get_dlg(&sc, &sf, &st, &dir); - if(dlg==NULL) - return -1; - /* set shorcut to dialog internal unique id */ - _dlg_ctx.iuid.h_entry = dlg->h_entry; - _dlg_ctx.iuid.h_id = dlg->h_id; - _dlg_ctx.dir = dir; - dlg_release(dlg); - return 1; + return ki_dlg_get(msg, &sc, &sf, &st); } /** @@ -1552,6 +1563,11 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("dialog"), str_init("dlg_get"), + SR_KEMIP_INT, ki_dlg_get, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

7 years, 7 months

git:master:8960972b: htable: exported iterator functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8960972b2ad5d460ed494b24a3bba1cb118e8b1f URL: https://github.com/kamailio/kamailio/commit/8960972b2ad5d460ed494b24a3bba1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-17T20:27:01+02:00 htable: exported iterator functions to kemi framework --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/8960972b2ad5d460ed494b24a3bba1c… Patch: https://github.com/kamailio/kamailio/commit/8960972b2ad5d460ed494b24a3bba1c… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 1876b28..18a3ab8 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -458,6 +458,18 @@ static int w_ht_iterator_start(struct sip_msg* msg, char* iname, char* hname) return 1; } +static int ki_ht_iterator_start(sip_msg_t *msg, str *iname, str *hname) +{ + if(iname==NULL || iname->s==NULL || iname->len<=0 + || hname==NULL || hname->s==NULL || hname->len<=0) { + LM_ERR("invalid parameters\n"); + return -1; + } + if(ht_iterator_start(iname, hname)<0) + return -1; + return 1; +} + static int w_ht_iterator_next(struct sip_msg* msg, char* iname, char* foo) { str siname; @@ -472,6 +484,17 @@ static int w_ht_iterator_next(struct sip_msg* msg, char* iname, char* foo) return 1; } +static int ki_ht_iterator_next(sip_msg_t *msg, str *iname) +{ + if(iname==NULL || iname->s==NULL || iname->len<=0) { + LM_ERR("invalid parameters\n"); + return -1; + } + if(ht_iterator_next(iname)<0) + return -1; + return 1; +} + static int w_ht_iterator_end(struct sip_msg* msg, char* iname, char* foo) { str siname; @@ -486,6 +509,17 @@ static int w_ht_iterator_end(struct sip_msg* msg, char* iname, char* foo) return 1; } +static int ki_ht_iterator_end(sip_msg_t *msg, str *iname) +{ + if(iname==NULL || iname->s==NULL || iname->len<=0) { + LM_ERR("invalid parameters\n"); + return -1; + } + if(ht_iterator_end(iname)<0) + return -1; + return 1; +} + static int ki_ht_slot_xlock(sip_msg_t *msg, str *htname, str *skey, int lmode) { ht_t *ht; @@ -1138,6 +1172,21 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_iterator_start"), + SR_KEMIP_INT, ki_ht_iterator_start, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_iterator_next"), + SR_KEMIP_INT, ki_ht_iterator_next, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_iterator_end"), + SR_KEMIP_INT, ki_ht_iterator_end, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

7 years, 7 months

git:master:60e27773: xhttp: exported http reply function to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 60e2777358fb7ea0a8eef0be2d5c4fb07f7e4acd URL: https://github.com/kamailio/kamailio/commit/60e2777358fb7ea0a8eef0be2d5c4fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-17T20:27:01+02:00 xhttp: exported http reply function to kemi framework --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/60e2777358fb7ea0a8eef0be2d5c4fb… Patch: https://github.com/kamailio/kamailio/commit/60e2777358fb7ea0a8eef0be2d5c4fb… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index 05b45c3..d104883 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -41,6 +41,7 @@ #include "../../core/sip_msg_clone.h" #include "../../core/mod_fix.h" #include "../../core/pvar.h" +#include "../../core/kemi.h" #include "api.h" #include "xhttp_trans.h" @@ -168,10 +169,6 @@ static int mod_init(void) return 0; } -int mod_register(char *path, int *dlflags, void *p1, void *p2) -{ - return register_trans_mod(path, mod_trans); -} /** * @@ -517,4 +514,28 @@ int bind_xhttp(xhttp_api_t* api) return 0; } -/** @} */ +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_xhttp_exports[] = { + { str_init("xhttp"), str_init("reply"), + SR_KEMIP_INT, xhttp_send_reply, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_xhttp_exports); + return register_trans_mod(path, mod_trans); +} + +/** @} */ \ No newline at end of file

7 years, 7 months

git:master:90e44290: corex: exported append_branch() to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 90e44290889cd00e0b2edd566d923b8eecdf5437 URL: https://github.com/kamailio/kamailio/commit/90e44290889cd00e0b2edd566d923b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-17T20:27:01+02:00 corex: exported append_branch() to kemi framework --- Modified: src/modules/corex/corex_lib.c Modified: src/modules/corex/corex_lib.h Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/90e44290889cd00e0b2edd566d923b8… Patch: https://github.com/kamailio/kamailio/commit/90e44290889cd00e0b2edd566d923b8…

7 years, 7 months

git:master:7e693ac3: kazoo: add alternative name for sender

by lazedo

Module: kamailio Branch: master Commit: 7e693ac32ceae7bcc34d6359043d6d9963933d4f URL: https://github.com/kamailio/kamailio/commit/7e693ac32ceae7bcc34d6359043d6d9… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-04-17T18:08:42+01:00 kazoo: add alternative name for sender --- Modified: src/modules/kazoo/defs.h Modified: src/modules/kazoo/kz_pua.c --- Diff: https://github.com/kamailio/kamailio/commit/7e693ac32ceae7bcc34d6359043d6d9… Patch: https://github.com/kamailio/kamailio/commit/7e693ac32ceae7bcc34d6359043d6d9… --- diff --git a/src/modules/kazoo/defs.h b/src/modules/kazoo/defs.h index 91877c8..616d8ac 100644 --- a/src/modules/kazoo/defs.h +++ b/src/modules/kazoo/defs.h @@ -52,6 +52,7 @@ #define BLF_JSON_CALLID "Call-ID" #define BLF_JSON_DIALOGID "Dialog-ID" #define BLF_JSON_SENDER "Sender-URI" +#define BLF_JSON_SWITCH_URI "Switch-URI" #define BLF_JSON_ETAG "ETag" #define BLF_JSON_TOTAG "To-Tag" #define BLF_JSON_FROMTAG "From-Tag" diff --git a/src/modules/kazoo/kz_pua.c b/src/modules/kazoo/kz_pua.c index d69100e..44a7448 100644 --- a/src/modules/kazoo/kz_pua.c +++ b/src/modules/kazoo/kz_pua.c @@ -392,6 +392,10 @@ int kz_pua_publish_dialoginfo_to_presentity(struct json_object *json_obj) json_extract_field(BLF_JSON_ETAG, etag); json_extract_field(BLF_JSON_SENDER, sender); + if (sender.len == 0) { + json_extract_field(BLF_JSON_SWITCH_URI, sender); + } + struct json_object* ExpiresObj = kz_json_get_object(json_obj, BLF_JSON_EXPIRES); if (ExpiresObj != NULL) { expires = json_object_get_int(ExpiresObj);

7 years, 7 months

git:master:1ca77084: kazoo: call cfg_update on child init

by lazedo

Module: kamailio Branch: master Commit: 1ca77084e075bd78bc0603e838a268e470480a17 URL: https://github.com/kamailio/kamailio/commit/1ca77084e075bd78bc0603e838a268e… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-04-17T14:28:44+01:00 kazoo: call cfg_update on child init --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/1ca77084e075bd78bc0603e838a268e… Patch: https://github.com/kamailio/kamailio/commit/1ca77084e075bd78bc0603e838a268e… --- diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index 8574de6..d3078fe 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -370,6 +370,7 @@ static int mod_child_init(int rank) if(pid==0){ if (cfg_child_init()) return -1; close(kz_worker_pipes_fds[i*2+1]); + cfg_update(); return(kz_amqp_consumer_worker_proc(kz_worker_pipes_fds[i*2])); } } @@ -383,6 +384,7 @@ static int mod_child_init(int rank) return -1; /* error */ if(pid==0){ if (cfg_child_init()) return -1; + cfg_update(); return(kz_amqp_consumer_proc(s)); } } @@ -395,6 +397,7 @@ static int mod_child_init(int rank) if(pid==0){ if (cfg_child_init()) return -1; close(kz_cmd_pipe_fds[1]); + cfg_update(); kz_amqp_publisher_proc(kz_cmd_pipe_fds[0]); } return 0; diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 6657443..4664c25 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2256,7 +2256,7 @@ int kz_pv_get_event_payload(struct sip_msg *msg, pv_param_t *param, pv_value_t * int kz_amqp_consumer_fire_event(char *eventkey) { - struct sip_msg *fmsg; + sip_msg_t *fmsg; struct run_act_ctx ctx; int rtb, rt; @@ -2268,9 +2268,7 @@ int kz_amqp_consumer_fire_event(char *eventkey) return -2; } LM_DBG("executing event_route[%s] (%d)\n", eventkey, rt); - if(faked_msg_init()<0) - return -2; - fmsg = faked_msg_next(); + fmsg = faked_msg_get_next(); rtb = get_route_type(); set_route_type(REQUEST_ROUTE); init_run_actions_ctx(&ctx);

7 years, 7 months

git:master:00523675: Merge pull request #1073 from btriller/fix-hep3-capture-id

by GitHub

Module: kamailio Branch: master Commit: 0052367550d02927ce844da3b8e27039faac6beb URL: https://github.com/kamailio/kamailio/commit/0052367550d02927ce844da3b8e2703… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-04-16T18:49:38+02:00 Merge pull request #1073 from btriller/fix-hep3-capture-id sipcapture: fix HEP3 capture-id >= 2^16 --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/0052367550d02927ce844da3b8e2703… Patch: https://github.com/kamailio/kamailio/commit/0052367550d02927ce844da3b8e2703… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index c398c72..10f15a6 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -271,7 +271,7 @@ enum hash_source source = hs_error; //unsigned int rr_idx = 0; -struct hep_timehdr* heptime; +struct hep_timeinfo* heptime; /*! \brief * Exported functions @@ -1150,7 +1150,7 @@ static int child_init(int rank) } - heptime = (struct hep_timehdr*)pkg_malloc(sizeof(struct hep_timehdr)); + heptime = (struct hep_timeinfo*)pkg_malloc(sizeof(struct hep_timeinfo)); if(heptime==NULL) { LM_ERR("no more pkg memory left\n"); return -1;

7 years, 7 months

git:master:dbd57c3e: sipcapture: fix HEP3 capture-id >= 2^16

by Bastian Triller

Module: kamailio Branch: master Commit: dbd57c3eac30e1de54d98eb2ba8f608a17f7adbf URL: https://github.com/kamailio/kamailio/commit/dbd57c3eac30e1de54d98eb2ba8f608… Author: Bastian Triller <btriller(a)broadsoft.com> Committer: Bastian Triller <btriller(a)broadsoft.com> Date: 2017-04-16T13:36:44+02:00 sipcapture: fix HEP3 capture-id >= 2^16 --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/dbd57c3eac30e1de54d98eb2ba8f608… Patch: https://github.com/kamailio/kamailio/commit/dbd57c3eac30e1de54d98eb2ba8f608… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index c398c72..10f15a6 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -271,7 +271,7 @@ enum hash_source source = hs_error; //unsigned int rr_idx = 0; -struct hep_timehdr* heptime; +struct hep_timeinfo* heptime; /*! \brief * Exported functions @@ -1150,7 +1150,7 @@ static int child_init(int rank) } - heptime = (struct hep_timehdr*)pkg_malloc(sizeof(struct hep_timehdr)); + heptime = (struct hep_timeinfo*)pkg_malloc(sizeof(struct hep_timeinfo)); if(heptime==NULL) { LM_ERR("no more pkg memory left\n"); return -1;

7 years, 7 months

← Newer
1
...
23
24
25
26
27
28
29
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017