sr-dev December 2017

sr-dev@lists.kamailio.org

26 participants
476 discussions

git:master:61335063: misc_radius: fixed accessing str* params after previous commit
by Daniel-Constantin Mierla 05 Dec '17

05 Dec '17

Module: kamailio Branch: master Commit: 613350632c842c1775e1b5696b4cda4c96e5ba4c URL: https://github.com/kamailio/kamailio/commit/613350632c842c1775e1b5696b4cda4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T09:19:29+01:00 misc_radius: fixed accessing str* params after previous commit --- Modified: src/modules/misc_radius/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/613350632c842c1775e1b5696b4cda4… Patch: https://github.com/kamailio/kamailio/commit/613350632c842c1775e1b5696b4cda4… --- diff --git a/src/modules/misc_radius/functions.c b/src/modules/misc_radius/functions.c index c176084382..c10d3ce801 100644 --- a/src/modules/misc_radius/functions.c +++ b/src/modules/misc_radius/functions.c @@ -516,11 +516,11 @@ int radius_does_uri_user_host_exist(struct sip_msg *_m, str *user, str *host) } at = user_host; memcpy(at, user->s, user->len); - at += user.len; + at += user->len; *at = '@'; at++; memcpy(at, host->s, host->len); - at += host.len; + at += host->len; *at = '\0'; if(!rc_avpair_add( rh, &send, uri_attrs[SA_USER_NAME].v, user_host, -1, 0)) {

1 0

git:master:f06e4d4b: misc_radius: use spve fixup helper instead of pvar
by Daniel-Constantin Mierla 05 Dec '17

05 Dec '17

Module: kamailio Branch: master Commit: f06e4d4b81e0df1009c3f2bbc54f0be1bb4a5d32 URL: https://github.com/kamailio/kamailio/commit/f06e4d4b81e0df1009c3f2bbc54f0be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T09:17:49+01:00 misc_radius: use spve fixup helper instead of pvar - simplifies getting params --- Modified: src/modules/misc_radius/functions.c Modified: src/modules/misc_radius/misc_radius.c --- Diff: https://github.com/kamailio/kamailio/commit/f06e4d4b81e0df1009c3f2bbc54f0be… Patch: https://github.com/kamailio/kamailio/commit/f06e4d4b81e0df1009c3f2bbc54f0be…

1 0

git:master:f283fe29: misc_radius: clang format the code
by Daniel-Constantin Mierla 05 Dec '17

05 Dec '17

Module: kamailio Branch: master Commit: f283fe291917f67320061af3e35259859e448408 URL: https://github.com/kamailio/kamailio/commit/f283fe291917f67320061af3e352598… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-05T08:21:58+01:00 misc_radius: clang format the code --- Modified: src/modules/misc_radius/extra.c Modified: src/modules/misc_radius/extra.h Modified: src/modules/misc_radius/functions.c Modified: src/modules/misc_radius/functions.h Modified: src/modules/misc_radius/misc_radius.c Modified: src/modules/misc_radius/misc_radius.h Modified: src/modules/misc_radius/radius.h --- Diff: https://github.com/kamailio/kamailio/commit/f283fe291917f67320061af3e352598… Patch: https://github.com/kamailio/kamailio/commit/f283fe291917f67320061af3e352598…

1 0

git:master:cf043326: auth_radius: exported functions to kemi framework
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: master Commit: cf043326abc792317335954fe75927f8294fa40e URL: https://github.com/kamailio/kamailio/commit/cf043326abc792317335954fe75927f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T16:54:52+01:00 auth_radius: exported functions to kemi framework --- Modified: src/modules/auth_radius/auth_radius.c Modified: src/modules/auth_radius/authorize.c Modified: src/modules/auth_radius/authorize.h --- Diff: https://github.com/kamailio/kamailio/commit/cf043326abc792317335954fe75927f… Patch: https://github.com/kamailio/kamailio/commit/cf043326abc792317335954fe75927f…

1 0

git:master:fe0c386c: auth_radius: use core fixup helper functions
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: master Commit: fe0c386cebebbf6c68b598269ecdfc25bfe1bcc2 URL: https://github.com/kamailio/kamailio/commit/fe0c386cebebbf6c68b598269ecdfc2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T16:03:52+01:00 auth_radius: use core fixup helper functions --- Modified: src/modules/auth_radius/auth_radius.c Modified: src/modules/auth_radius/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/fe0c386cebebbf6c68b598269ecdfc2… Patch: https://github.com/kamailio/kamailio/commit/fe0c386cebebbf6c68b598269ecdfc2…

1 0

git:master:7453fc5f: acc_radius: clang format the code
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: master Commit: 7453fc5f8da8fed0941d5d8c759cec97e0647bfd URL: https://github.com/kamailio/kamailio/commit/7453fc5f8da8fed0941d5d8c759cec9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T15:50:06+01:00 acc_radius: clang format the code --- Modified: src/modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7453fc5f8da8fed0941d5d8c759cec9… Patch: https://github.com/kamailio/kamailio/commit/7453fc5f8da8fed0941d5d8c759cec9…

1 0

git:master:1c07ddb5: auth_radius: clang format the code
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: master Commit: 1c07ddb50cf56ea9566effb8ff7ada3de8f1d48b URL: https://github.com/kamailio/kamailio/commit/1c07ddb50cf56ea9566effb8ff7ada3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T15:47:40+01:00 auth_radius: clang format the code --- Modified: src/modules/auth_radius/auth_radius.c Modified: src/modules/auth_radius/authorize.c Modified: src/modules/auth_radius/authorize.h Modified: src/modules/auth_radius/extra.c Modified: src/modules/auth_radius/extra.h Modified: src/modules/auth_radius/sterman.c Modified: src/modules/auth_radius/sterman.h --- Diff: https://github.com/kamailio/kamailio/commit/1c07ddb50cf56ea9566effb8ff7ada3… Patch: https://github.com/kamailio/kamailio/commit/1c07ddb50cf56ea9566effb8ff7ada3…

1 0

git:master:afbc1a70: acc_radius: functions exported to kemi framework
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: master Commit: afbc1a7099eb59dcd8c11a202c9abb1bcf972751 URL: https://github.com/kamailio/kamailio/commit/afbc1a7099eb59dcd8c11a202c9abb1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T13:09:03+01:00 acc_radius: functions exported to kemi framework --- Modified: src/modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/afbc1a7099eb59dcd8c11a202c9abb1… Patch: https://github.com/kamailio/kamailio/commit/afbc1a7099eb59dcd8c11a202c9abb1… --- diff --git a/src/modules/acc_radius/acc_radius_mod.c b/src/modules/acc_radius/acc_radius_mod.c index 94e521f537..8e3c4482d4 100644 --- a/src/modules/acc_radius/acc_radius_mod.c +++ b/src/modules/acc_radius/acc_radius_mod.c @@ -41,6 +41,7 @@ #include "../../core/dprint.h" #include "../../core/mem/mem.h" #include "../../core/parser/parse_to.h" +#include "../../core/kemi.h" #include "../misc_radius/radius.h" #include "../../modules/acc/acc_api.h" #include "acc_radius_mod.h" @@ -444,3 +445,84 @@ static int w_acc_radius_request(struct sip_msg *rq, char *comment, char *foo) return accb.exec(rq, &_acc_radius_engine, (acc_param_t*)comment); } +static int acc_radius_parse_code(char *p, acc_param_t *param) +{ + if (p==NULL||param==NULL) + return -1; + + /* any code? */ + if (param->reason.len>=3 && isdigit((int)p[0]) + && isdigit((int)p[1]) && isdigit((int)p[2]) ) { + param->code = (p[0]-'0')*100 + (p[1]-'0')*10 + (p[2]-'0'); + param->code_s.s = p; + param->code_s.len = 3; + param->reason.s += 3; + for( ; isspace((int)param->reason.s[0]) ; param->reason.s++ ); + param->reason.len = strlen(param->reason.s); + } + return 0; +} + +/** + * + */ +static int acc_radius_param_parse(str *s, acc_param_t *accp) +{ + if(s==NULL || s->s==NULL || s->len<=0 || accp==NULL) { + LM_ERR("invalid parameters\n"); + return -1; + } + memset(accp, 0, sizeof(acc_param_t)); + accp->reason.s = s->s; + accp->reason.len = s->len; + if (strchr(s->s, PV_MARKER)!=NULL) { + /* there is a cfg variable - not through kemi */ + LM_ERR("cfg variable detected - not supported\n"); + return -1; + } else { + if(acc_radius_parse_code(s->s, accp)<0) { + LM_ERR("failed to parse: [%.*s] (expected [code text])\n", + s->len, s->s); + return -1; + } + } + return 0; +} + +/** + * + */ +static int ki_acc_radius_request(sip_msg_t *rq, str *comment) +{ + acc_param_t accp; + + if(acc_radius_param_parse(comment, &accp)<0) { + LM_ERR("failed to parse parameter\n"); + return -1; + } + return accb.exec(rq, &_acc_radius_engine, &accp); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_acc_radius_exports[] = { + { str_init("acc_radius"), str_init("request"), + SR_KEMIP_INT, ki_acc_radius_request, + { 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 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_acc_radius_exports); + return 0; +}

1 0

git:5.0:782b76b4: jansson: fix the include guard in header file
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.0 Commit: 782b76b40672075756348297bea61d2d38f96022 URL: https://github.com/kamailio/kamailio/commit/782b76b40672075756348297bea61d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T12:55:47+01:00 jansson: fix the include guard in header file (cherry picked from commit d17a48c186b0b8066518db2106037fe925846d2e) (cherry picked from commit 90b1b0e1f00f72dcac7f7ef1c734ea43afd1cd83) --- Modified: src/modules/jansson/jansson_path.h --- Diff: https://github.com/kamailio/kamailio/commit/782b76b40672075756348297bea61d2… Patch: https://github.com/kamailio/kamailio/commit/782b76b40672075756348297bea61d2… --- diff --git a/src/modules/jansson/jansson_path.h b/src/modules/jansson/jansson_path.h index 9aefb49a00..b31050702d 100644 --- a/src/modules/jansson/jansson_path.h +++ b/src/modules/jansson/jansson_path.h @@ -2,12 +2,12 @@ * Copyright (c) 2012 Rogerz Zhang <rogerz.zhang(a)gmail.com> * * Jansson is free software; you can redistribute it and/or modify - * it under the terms of the MIT license. + * it under the terms of the MIT license. */ -#ifndef _JANSSON_FUNCS_H_ -#define _JANSSON_FUNCS_H_ +#ifndef _JANSSON_PATH_H_ +#define _JANSSON_PATH_H_ #include <jansson.h> json_t *json_path_get(const json_t *json, const char *path);

1 0

git:5.1:90b1b0e1: jansson: fix the include guard in header file
by Daniel-Constantin Mierla 04 Dec '17

04 Dec '17

Module: kamailio Branch: 5.1 Commit: 90b1b0e1f00f72dcac7f7ef1c734ea43afd1cd83 URL: https://github.com/kamailio/kamailio/commit/90b1b0e1f00f72dcac7f7ef1c734ea4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-04T12:54:54+01:00 jansson: fix the include guard in header file (cherry picked from commit d17a48c186b0b8066518db2106037fe925846d2e) --- Modified: src/modules/jansson/jansson_path.h --- Diff: https://github.com/kamailio/kamailio/commit/90b1b0e1f00f72dcac7f7ef1c734ea4… Patch: https://github.com/kamailio/kamailio/commit/90b1b0e1f00f72dcac7f7ef1c734ea4… --- diff --git a/src/modules/jansson/jansson_path.h b/src/modules/jansson/jansson_path.h index 9aefb49a00..b31050702d 100644 --- a/src/modules/jansson/jansson_path.h +++ b/src/modules/jansson/jansson_path.h @@ -2,12 +2,12 @@ * Copyright (c) 2012 Rogerz Zhang <rogerz.zhang(a)gmail.com> * * Jansson is free software; you can redistribute it and/or modify - * it under the terms of the MIT license. + * it under the terms of the MIT license. */ -#ifndef _JANSSON_FUNCS_H_ -#define _JANSSON_FUNCS_H_ +#ifndef _JANSSON_PATH_H_ +#define _JANSSON_PATH_H_ #include <jansson.h> json_t *json_path_get(const json_t *json, const char *path);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2017