sr-dev September 2023

sr-dev@lists.kamailio.org

17 participants
296 discussions

[kamailio/kamailio] jwt: build jwt module for debian distributions (PR #3556)

by Emmanuel Schmidbauer

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I am not very familiar with the build/packaging process but I'm hoping we can get `jwt` module packaged for debian since the dependencies (`libjwt`) already ship with most recent debian distributions. Any feedback would be appreciated here, thanks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3556 -- Commit Summary -- * jwt: build jwt module for debian distributions -- File Changes -- M pkg/kamailio/deb/bionic/rules (1) M pkg/kamailio/deb/bookworm/rules (1) M pkg/kamailio/deb/bullseye/rules (1) M pkg/kamailio/deb/buster/rules (1) M pkg/kamailio/deb/debian/rules (1) M pkg/kamailio/deb/focal/rules (1) M pkg/kamailio/deb/jammy/rules (1) M pkg/kamailio/deb/jessie/rules (1) M pkg/kamailio/deb/precise/rules (1) M pkg/kamailio/deb/sid/rules (1) M pkg/kamailio/deb/stretch/rules (1) M pkg/kamailio/deb/trusty/rules (1) M pkg/kamailio/deb/wheezy/rules (1) M pkg/kamailio/deb/xenial/rules (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3556.patch https://github.com/kamailio/kamailio/pull/3556.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3556 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3556(a)github.com>

11 months, 2 weeks

git:master:ff323e8d: dispatcher: new variable $dsg(key) to get attributes of a dispatcher group

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ff323e8d7166fd781763608434da982e0918c7c9 URL: https://github.com/kamailio/kamailio/commit/ff323e8d7166fd781763608434da982… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-04T11:29:49+02:00 dispatcher: new variable $dsg(key) to get attributes of a dispatcher group --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/ff323e8d7166fd781763608434da982… Patch: https://github.com/kamailio/kamailio/commit/ff323e8d7166fd781763608434da982… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 5ba70524359..0264a37bc7e 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -184,6 +184,7 @@ static int w_ds_reload(struct sip_msg* msg, char*, char*); static int w_ds_is_active(sip_msg_t *msg, char *pset, char *p2); static int w_ds_is_active_uri(sip_msg_t *msg, char *pset, char *puri); +static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2); static int fixup_ds_is_from_list(void** param, int param_no); static int fixup_ds_list_exist(void** param,int param_no); @@ -194,10 +195,15 @@ static int ds_warn_fixup(void** param, int param_no); static int pv_get_dsv(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_dsv(pv_spec_p sp, str *in); +static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int pv_parse_dsg(pv_spec_p sp, str *in); +static void ds_dsg_fetch(int dg); static pv_export_t mod_pvs[] = { { {"dsv", (sizeof("dsv")-1)}, PVT_OTHER, pv_get_dsv, 0, pv_parse_dsv, 0, 0, 0 }, + { {"dsg", (sizeof("dsg")-1)}, PVT_OTHER, pv_get_dsg, 0, + pv_parse_dsg, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -255,6 +261,8 @@ static cmd_export_t cmds[]={ 0, 0, 0}, {"ds_reload", (cmd_function)w_ds_reload, 0, 0, 0, ANY_ROUTE}, + {"ds_dsg_fetch", (cmd_function)w_ds_dsg_fetch, 1, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -1349,6 +1357,106 @@ static int pv_parse_dsv(pv_spec_p sp, str *in) return -1; } +/** + * + */ +static int _pv_dsg_fetch = 1; + +/** + * + */ +static void ds_dsg_fetch(int dg) +{ + _pv_dsg_fetch = dg; +} + +/** + * + */ +static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2) +{ + int set; + + if(fixup_get_ivalue(msg, (gparam_p)pset, &set) != 0) { + LM_ERR("cannot get set id param value\n"); + return -1; + } + ds_dsg_fetch(set); + + return 1; +} + +/** + * + */ +static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + ds_set_t *dsg; + int count = 0; + int active = 0; + int inactive = 0; + + if(param == NULL) { + return -1; + } + dsg = ds_list_lookup(_pv_dsg_fetch); + + if(dsg == NULL) { + return pv_get_null(msg, param, res); + } + + switch(param->pvn.u.isname.name.n) { + case 0: /* count */ + return pv_get_sintval(msg, param, res, count); + case 1: /* active */ + return pv_get_sintval(msg, param, res, active); + case 2: /* inactive */ + return pv_get_sintval(msg, param, res, inactive); + default: + return pv_get_null(msg, param, res); + } +} + +/** + * + */ +static int pv_parse_dsg(pv_spec_p sp, str *in) +{ + if(sp == NULL || in == NULL || in->len <= 0) + return -1; + + switch(in->len) { + case 5: + if(strncmp(in->s, "count", 5) == 0) + sp->pvp.pvn.u.isname.name.n = 0; + else + goto error; + break; + case 6: + if(strncmp(in->s, "active", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 1; + else + goto error; + break; + case 8: + if(strncmp(in->s, "inactive", 8) == 0) + sp->pvp.pvn.u.isname.name.n = 2; + else + goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV key: %.*s\n", in->len, in->s); + return -1; +} + /* KEMI wrappers */ /** *

11 months, 2 weeks

git:master:4bbeaad2: dispatcher: helper function to return dispatcher set

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4bbeaad235f8db5216380c3b381071a45d469ee0 URL: https://github.com/kamailio/kamailio/commit/4bbeaad235f8db5216380c3b381071a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-01T21:49:33+02:00 dispatcher: helper function to return dispatcher set --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/4bbeaad235f8db5216380c3b381071a… Patch: https://github.com/kamailio/kamailio/commit/4bbeaad235f8db5216380c3b381071a… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 9356fe65e1b..f64ab45ab16 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1598,6 +1598,25 @@ int ds_list_exist(int set) return 1; /* True */ } +/* + * Return a destination set + */ +ds_set_t *ds_list_lookup(int set) +{ + ds_set_t *si = NULL; + LM_DBG("looking for destination set [%d]\n", set); + + /* get the index of the set */ + si = ds_avl_find(_ds_list, set); + + if(si == NULL) { + LM_DBG("destination set [%d] not found\n", set); + return NULL; + } + LM_DBG("destination set [%d] found\n", set); + return si; +} + /** * */ diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 1add2d7000f..7b4d59edb0f 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -160,7 +160,6 @@ int ds_log_sets(void); int ds_list_exist(int set); int ds_is_active_uri(sip_msg_t *msg, int group, str *uri); - int ds_load_unset(struct sip_msg *msg); int ds_load_update(struct sip_msg *msg); @@ -278,6 +277,8 @@ struct ds_filter_dest_cb_arg { ds_set_t *ds_get_list(void); int ds_get_list_nr(void); +ds_set_t *ds_list_lookup(int set); + int ds_ping_active_init(void); int ds_ping_active_get(void); int ds_ping_active_set(int v);

11 months, 2 weeks

git:master:f1ef0fa0: pv: added $viaX(params) to retun the parameters part of a Via body

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f1ef0fa09983969066784f20a78ec604e7ab66d2 URL: https://github.com/kamailio/kamailio/commit/f1ef0fa09983969066784f20a78ec60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-01T21:20:20+02:00 pv: added $viaX(params) to retun the parameters part of a Via body --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/f1ef0fa09983969066784f20a78ec60… Patch: https://github.com/kamailio/kamailio/commit/f1ef0fa09983969066784f20a78ec60… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index fc3cc7d125b..b81f37bc9a5 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4507,6 +4507,8 @@ int pv_parse_via_name(pv_spec_p sp, str *in) case 6: if(strncmp(in->s, "branch", 6) == 0) sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "params", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 8; else goto error; break; @@ -4580,6 +4582,11 @@ int pv_get_via_attr( return pv_get_strval(msg, param, res, &vb->i->value); } break; + case 8: /* params */ + if(vb->params.s != NULL && vb->params.len > 0) { + return pv_get_strval(msg, param, res, &vb->params); + } + break; default: return pv_get_null(msg, param, res);

11 months, 2 weeks

git:master:753a60bf: core: parser for overflow control parameters in via header

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 753a60bf538985a54f8b9eafb98b7ce86b616a63 URL: https://github.com/kamailio/kamailio/commit/753a60bf538985a54f8b9eafb98b7ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-01T21:08:07+02:00 core: parser for overflow control parameters in via header - RFC7339 --- Modified: src/core/parser/parse_via.c Modified: src/core/parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/753a60bf538985a54f8b9eafb98b7ce… Patch: https://github.com/kamailio/kamailio/commit/753a60bf538985a54f8b9eafb98b7ce… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index 9452ce51132..921911f1d17 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -2817,3 +2817,40 @@ int parse_via_header(struct sip_msg *msg, int n, struct via_body **q) } else return -1; } + + +/* + * Parse/link Via overload-control parameters + */ +int parse_via_oc(struct sip_msg *msg, struct via_body *vbp, via_oc_t *ocp) +{ + via_param_t *vp; + + if(vbp == NULL || ocp == NULL) { + return -1; + } + memset(ocp, 0, sizeof(via_oc_t)); + + for(vp = vbp->param_lst; vp != NULL; vp = vp->next) { + if(vp->name.len == 2 && strncasecmp(vp->name.s, "oc", 2) == 0) { + ocp->oc = 1; + } else if(vp->name.len == 7 + && strncasecmp(vp->name.s, "oc-algo", 7) == 0) { + if(vp->value.len > 0) { + ocp->algo.len = vp->value.len; + ocp->algo.s = vp->value.s; + } + } else if(vp->name.len == 11 + && strncasecmp(vp->name.s, "oc-validity", 11) == 0) { + if(vp->value.len > 0) { + str2ulong(&vp->value, &ocp->validity); + } + } else if(vp->name.len == 6 + && strncasecmp(vp->name.s, "oc-seq", 6) == 0) { + if(vp->value.len > 0) { + str2int(&vp->value, &ocp->seq); + } + } + } + return 0; +} diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index 4cd17ca3e19..bd0a4ffbb14 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -66,6 +66,15 @@ typedef struct via_param } via_param_t; +/* RFC7339 - overload control */ +typedef struct via_oc +{ + int oc; + str algo; + unsigned long validity; + unsigned int seq; +} via_oc_t; + /* Format: name/version/transport host:port;params comment */ /* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ typedef struct via_body @@ -123,5 +132,9 @@ void free_via_list(struct via_body *vb); */ int parse_via_header(struct sip_msg *msg, int n, struct via_body **q); +/* + * Parse/link Via overload-control parameters + */ +int parse_via_oc(struct sip_msg *msg, struct via_body *vbp, via_oc_t *ocp); #endif /* PARSE_VIA_H */

11 months, 2 weeks

Kamailio Patching Issues

by Bin LIU

Halo Experts, So sorry to disturb you for the kamailio start failure issue I faced recently when doing patching from version 5.5.4 to 5.5.6. Really appreciated if you could give me some assistance on it ! And attached is the start log. Thanks. Best regards, Louis LIU Senior Software Engineer (Cloud Platform && Audio/Video Intercom) M +86 18575580920 8F-A CES Building,No.3099 Global Offer Innovation E bin.liu2(a)se.com<mailto:bin.liu2@se.com> Keyuan South Road, Nanshan District Home & Distribution Division, Energy Management Shenzhen, China [cid:image001.png@01D9CAE5.A472D190] Download mySchneider app<https://www.se.com/ww/en/work/support/myschneider-app/> 24/7 support Mobile catalog. Acces to expert help. Internal

11 months, 2 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2023