sr-dev

sr-dev@lists.kamailio.org

2 participants
45192 discussions

New feature: #!ifexp - conditional preprocessor blocks
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Hello, a new feature has landed to Kamailio devel version, bringing in more flexibility for preprocessing of the kamailio.cfg file. It is about #!ifexp, which allows to evaluate an expression created with defined IDs, string and number values. Based on evaluation result, being true or false, parts of the config file can be enabled or disabled. An extensive number of operators can be used in expressions, such as: +, -, *, /, ==, !=, <, >, <=, >=, ||, &&, etc. The evaluation is done using snexpr (https://github.com/miconda/snexpr), which was embedded inside Kamailio code. Here are some simple kamailio.cfg examples: #!ifexp KAMAILIO_VERSION >= 5006000 loadmodule "tlsa.so" #!else loadmodule "tls.so" #!endif #!ifexp MOD_xlog && (OS_NAME == "darwin") xlog("running on MacOS\n"); #!endif Documentation and more examples can be found on the wiki portal at: - https://www.kamailio.org/wikidocs/cookbooks/devel/core/#ifexp Testing would be appreciated, feedback can be addressed to sr-users mailing list! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

3 2

git:master:a2d9a2f9: pua_dialoginfo: use dlg api function get_dlg_varval()
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: a2d9a2f95e2212a9f5538ac25ac241206eff06a0 URL: https://github.com/kamailio/kamailio/commit/a2d9a2f95e2212a9f5538ac25ac2412… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-23T14:07:41+02:00 pua_dialoginfo: use dlg api function get_dlg_varval() --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/a2d9a2f95e2212a9f5538ac25ac2412… Patch: https://github.com/kamailio/kamailio/commit/a2d9a2f95e2212a9f5538ac25ac2412… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 10aa5b467d..50a1029289 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -315,11 +315,13 @@ void refresh_pubruri_avps(struct dlginfo_cell *dlginfo, str *uri) } void refresh_local_identity(struct dlg_cell *dlg, str *uri) { - str *s = dlg_api.get_dlg_var(dlg, &local_identity_dlg_var); + str s = {0}; - if(s != NULL) { - uri->s = s->s; - uri->len = s->len; + dlg_api.get_dlg_varval(dlg, &local_identity_dlg_var, &s); + + if(s.s != NULL) { + uri->s = s.s; + uri->len = s.len; LM_DBG("Found local_identity in dialog '%.*s'\n", uri->len, uri->s); } @@ -576,7 +578,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable { struct dlginfo_cell *dlginfo; int len; - str* s=NULL; + str dval = {0}; // generate new random uuid if(sruid_next_safe(&_puadi_sruid) < 0) { @@ -652,9 +654,10 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable } else { if(caller_dlg_var.len>0 - && (s = dlg_api.get_dlg_var(dlg, &caller_dlg_var))!=0) { + && (dlg_api.get_dlg_varval(dlg, &caller_dlg_var, &dval)==0) + && dval.s!=NULL) { dlginfo->pubruris_caller = - (struct str_list*)shm_malloc(sizeof(struct str_list) + s->len + 1); + (struct str_list*)shm_malloc(sizeof(struct str_list) + dval.len + 1); if (dlginfo->pubruris_caller==0) { SHM_MEM_ERROR; free_dlginfo_cell(dlginfo); @@ -663,17 +666,18 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable memset(dlginfo->pubruris_caller, 0, sizeof(struct str_list)); dlginfo->pubruris_caller->s.s = (char*)dlginfo->pubruris_caller + sizeof(sizeof(struct str_list)); - memcpy(dlginfo->pubruris_caller->s.s, s->s, s->len); - dlginfo->pubruris_caller->s.s[s->len] = '\0'; - dlginfo->pubruris_caller->s.len = s->len; + memcpy(dlginfo->pubruris_caller->s.s, dval.s, dval.len); + dlginfo->pubruris_caller->s.s[dval.len] = '\0'; + dlginfo->pubruris_caller->s.len = dval.len; LM_DBG("Found pubruris_caller in dialog '%.*s'\n", dlginfo->pubruris_caller->s.len, dlginfo->pubruris_caller->s.s); } if(callee_dlg_var.len>0 - && (s = dlg_api.get_dlg_var(dlg, &callee_dlg_var))!=0) { + && (dlg_api.get_dlg_varval(dlg, &callee_dlg_var, &dval)==0) + && dval.s!=NULL) { dlginfo->pubruris_callee = - (struct str_list*)shm_malloc(sizeof(struct str_list) + s->len + 1); + (struct str_list*)shm_malloc(sizeof(struct str_list) + dval.len + 1); if (dlginfo->pubruris_callee==0) { SHM_MEM_ERROR; free_dlginfo_cell(dlginfo); @@ -682,9 +686,9 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable memset(dlginfo->pubruris_callee, 0, sizeof(struct str_list)); dlginfo->pubruris_callee->s.s = (char*)dlginfo->pubruris_callee + sizeof(sizeof(struct str_list)); - memcpy(dlginfo->pubruris_callee->s.s, s->s, s->len); - dlginfo->pubruris_callee->s.s[s->len] = '\0'; - dlginfo->pubruris_callee->s.len = s->len; + memcpy(dlginfo->pubruris_callee->s.s, dval.s, dval.len); + dlginfo->pubruris_callee->s.s[dval.len] = '\0'; + dlginfo->pubruris_callee->s.len = dval.len; LM_DBG("Found pubruris_callee in dialog '%.*s'\n", dlginfo->pubruris_callee->s.len, dlginfo->pubruris_callee->s.s); }

1 0

git:master:fb7c4978: acc: use get_dlg_varval() to get values for dialog variables
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: fb7c497893f05587bda1c37e09d73a7ebb522715 URL: https://github.com/kamailio/kamailio/commit/fb7c497893f05587bda1c37e09d73a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-23T13:42:18+02:00 acc: use get_dlg_varval() to get values for dialog variables --- Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_extra.c --- Diff: https://github.com/kamailio/kamailio/commit/fb7c497893f05587bda1c37e09d73a7… Patch: https://github.com/kamailio/kamailio/commit/fb7c497893f05587bda1c37e09d73a7…

1 0

git:master:cd4e2259: uac: use dlg api functions get_dlg_varval() and get_dlg_varref()
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: cd4e2259526bc4642259201ee96b00624f300437 URL: https://github.com/kamailio/kamailio/commit/cd4e2259526bc4642259201ee96b006… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-23T13:59:36+02:00 uac: use dlg api functions get_dlg_varval() and get_dlg_varref() --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/cd4e2259526bc4642259201ee96b006… Patch: https://github.com/kamailio/kamailio/commit/cd4e2259526bc4642259201ee96b006… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index 6e77eafe94..513623ba26 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -391,7 +391,7 @@ int replace_uri( struct sip_msg *msg, str *display, str *uri, if (dlg) { dlgvar_names = (uac_flag==FL_USE_UAC_FROM)?from_dlgvar:to_dlgvar; - if(dlg_api.get_dlg_var(dlg, &dlgvar_names[0])) { + if(dlg_api.get_dlg_varref(dlg, &dlgvar_names[0])) { LM_INFO("Already called uac_replace for this dialog\n"); /* delete the from_new dlg var */ @@ -873,8 +873,8 @@ static void replace_callback(struct dlg_cell *dlg, int type, struct hdr_field *hdr; struct to_body *body; str old_uri; - str* new_uri; - str* new_display; + str new_uri = {0}; + str new_display = {0}; str buf = STR_NULL; char *p; unsigned int uac_flag; @@ -927,20 +927,22 @@ static void replace_callback(struct dlg_cell *dlg, int type, " with the original uri\n"); } - if ((new_uri = dlg_api.get_dlg_var(dlg, &dlgvar_names[dlgvar_index])) == 0) { + dlg_api.get_dlg_varval(dlg, &dlgvar_names[dlgvar_index], &new_uri); + if (new_uri.s == NULL) { LM_DBG("<%.*s> param not found\n", dlgvar_names[dlgvar_index].len, dlgvar_names[dlgvar_index].s); return; } - if ((new_display = dlg_api.get_dlg_var(dlg, &dlgvar_names[dlgvar_dpindex])) == 0) { + dlg_api.get_dlg_varval(dlg, &dlgvar_names[dlgvar_dpindex], &new_display); + if (new_display.s == NULL) { LM_DBG("<%.*s> param not found\n", dlgvar_names[dlgvar_dpindex].len, dlgvar_names[dlgvar_dpindex].s); return; } LM_DBG("Replace [%.*s %.*s] with [%.*s %.*s]\n", body->display.len, body->display.s, - old_uri.len, old_uri.s, new_display->len, new_display->s, - new_uri->len, new_uri->s); + old_uri.len, old_uri.s, new_display.len, new_display.s, + new_uri.len, new_uri.s); /* deal with display name */ l = 0; @@ -955,17 +957,17 @@ static void replace_callback(struct dlg_cell *dlg, int type, return; } } - if (new_display->s && new_display->len > 0) { + if (new_display.s && new_display.len > 0) { LM_DBG("inserting display [%.*s]\n", - new_display->len, new_display->s); + new_display.len, new_display.s); /* add the new display exactly over the deleted one */ - buf.s = pkg_malloc(new_display->len + 2); + buf.s = pkg_malloc(new_display.len + 2); if (buf.s==0) { PKG_MEM_ERROR; return; } - memcpy( buf.s, new_display->s, new_display->len); - buf.len = new_display->len; + memcpy(buf.s, new_display.s, new_display.len); + buf.len = new_display.len; if (l==0 && (l=get_display_anchor(msg, hdr, body, &buf)) == 0) { LM_ERR("failed to insert anchor\n"); pkg_free(buf.s); @@ -979,12 +981,12 @@ static void replace_callback(struct dlg_cell *dlg, int type, } /* uri update - duplicate the decoded value */ - p = pkg_malloc( new_uri->len); + p = pkg_malloc(new_uri.len); if (!p) { PKG_MEM_ERROR; return; } - memcpy(p, new_uri->s, new_uri->len); + memcpy(p, new_uri.s, new_uri.len); /* build del/add lumps */ l = del_lump(msg, old_uri.s-msg->buf, old_uri.len, 0); @@ -994,7 +996,7 @@ static void replace_callback(struct dlg_cell *dlg, int type, return; } - if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { + if (insert_new_lump_after(l, p, new_uri.len, 0)==0) { LM_ERR("insert new lump failed\n"); pkg_free(p); return;

1 0

git:master:a7cecdcb: dialog: internal api functions to get dlg variable reference or value
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: a7cecdcbc3c1d53fce22a33a3768da2a1907d64e URL: https://github.com/kamailio/kamailio/commit/a7cecdcbc3c1d53fce22a33a3768da2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-23T13:17:02+02:00 dialog: internal api functions to get dlg variable reference or value --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_cb.h Modified: src/modules/dialog/dlg_load.h Modified: src/modules/dialog/dlg_var.c Modified: src/modules/dialog/dlg_var.h --- Diff: https://github.com/kamailio/kamailio/commit/a7cecdcbc3c1d53fce22a33a3768da2… Patch: https://github.com/kamailio/kamailio/commit/a7cecdcbc3c1d53fce22a33a3768da2…

1 0

git:master:ce3cd426: dialog: init output dlg var value param eariler
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: ce3cd42631ac06a6a20892bd308901c6acd58f7a URL: https://github.com/kamailio/kamailio/commit/ce3cd42631ac06a6a20892bd308901c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-23T13:33:03+02:00 dialog: init output dlg var value param eariler --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/ce3cd42631ac06a6a20892bd308901c… Patch: https://github.com/kamailio/kamailio/commit/ce3cd42631ac06a6a20892bd308901c… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 4db8d84c35..04a645309b 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -310,14 +310,14 @@ int get_dlg_varval(struct dlg_cell *dlg, str *key, str *val) { str *var = NULL; + val->s = NULL; + val->len = 0; + if( !dlg || !key || key->len > strlen(key->s)) { LM_ERR("BUG - bad parameters\n"); return -1; } - val->s = NULL; - val->len = 0; - dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); var = get_dlg_variable_unsafe(dlg, key); if(var) {

1 0

git:master:023af516: acc_json: moved global vars declaration to .c file
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: 023af516f4ede3742f2e1836474978b596a4a3a8 URL: https://github.com/kamailio/kamailio/commit/023af516f4ede3742f2e1836474978b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-22T20:30:52+02:00 acc_json: moved global vars declaration to .c file - made them static --- Modified: src/modules/acc_json/acc_json_mod.c Modified: src/modules/acc_json/acc_json_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/023af516f4ede3742f2e1836474978b… Patch: https://github.com/kamailio/kamailio/commit/023af516f4ede3742f2e1836474978b… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index accd054de6..ab6f9b4498 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -37,6 +37,26 @@ MODULE_VERSION +static str acc_method_key = str_init("method"); +static str acc_fromtag_key = str_init("from_tag"); +static str acc_totag_key = str_init("to_tag"); +static str acc_callid_key = str_init("callid"); +static str acc_sipcode_key = str_init("sip_code"); +static str acc_sipreason_key = str_init("sip_reason"); +static str acc_time_key = str_init("time"); + +static str cdr_start_str = str_init("start_time"); +static str cdr_end_str = str_init("end_time"); +static str cdr_duration_str = str_init("duration"); + +static char acc_time_format_buf[ACC_TIME_FORMAT_SIZE]; +static char *acc_time_format = "%Y-%m-%d %H:%M:%S"; + +static int acc_log_level = L_NOTICE; +static int acc_log_facility = LOG_DAEMON; +static int cdr_log_level = L_NOTICE; +static int cdr_log_facility = LOG_DAEMON; + static int mod_init(void); static void destroy(void); static int child_init(int rank); diff --git a/src/modules/acc_json/acc_json_mod.h b/src/modules/acc_json/acc_json_mod.h index 25a3ac120e..62c3350faa 100644 --- a/src/modules/acc_json/acc_json_mod.h +++ b/src/modules/acc_json/acc_json_mod.h @@ -24,25 +24,6 @@ #ifndef _ACC_JSON_MOD_H_ #define _ACC_JSON_MOD_H_ -str acc_method_key = str_init("method"); -str acc_fromtag_key = str_init("from_tag"); -str acc_totag_key = str_init("to_tag"); -str acc_callid_key = str_init("callid"); -str acc_sipcode_key = str_init("sip_code"); -str acc_sipreason_key = str_init("sip_reason"); -str acc_time_key = str_init("time"); - -str cdr_start_str = str_init("start_time"); -str cdr_end_str = str_init("end_time"); -str cdr_duration_str = str_init("duration"); - #define ACC_TIME_FORMAT_SIZE 128 -static char acc_time_format_buf[ACC_TIME_FORMAT_SIZE]; -char *acc_time_format = "%Y-%m-%d %H:%M:%S"; - -int acc_log_level = L_NOTICE; -int acc_log_facility = LOG_DAEMON; -int cdr_log_level = L_NOTICE; -int cdr_log_facility = LOG_DAEMON; #endif

1 0

git:master:3e2b5d9e: acc_json: use the variable for the time key
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: 3e2b5d9ed6a0f18199359444c5ae33a1d6b94eb2 URL: https://github.com/kamailio/kamailio/commit/3e2b5d9ed6a0f18199359444c5ae33a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-22T20:32:52+02:00 acc_json: use the variable for the time key --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3e2b5d9ed6a0f18199359444c5ae33a… Patch: https://github.com/kamailio/kamailio/commit/3e2b5d9ed6a0f18199359444c5ae33a… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index ab6f9b4498..97b1c666bd 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -311,9 +311,9 @@ int acc_json_send_request(struct sip_msg *req, acc_info_t *inf) <= 0) { acc_time_format_buf[0] = '\0'; } - json_object_set_new(object, "time", json_string(acc_time_format_buf)); + json_object_set_new(object, acc_time_key.s, json_string(acc_time_format_buf)); } else { // default acc_time_mode==1 - json_object_set_new(object, "time", json_integer(inf->env->ts)); + json_object_set_new(object, acc_time_key.s, json_integer(inf->env->ts)); } LM_DBG("text[%.*s]\n", inf->env->text.len, inf->env->text.s);

1 0

git:master:bcb3970d: acc_json: code formatting updates
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: bcb3970d7a89ab27b43f86aee5b93a473a8b790b URL: https://github.com/kamailio/kamailio/commit/bcb3970d7a89ab27b43f86aee5b93a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-22T20:41:32+02:00 acc_json: code formatting updates --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bcb3970d7a89ab27b43f86aee5b93a4… Patch: https://github.com/kamailio/kamailio/commit/bcb3970d7a89ab27b43f86aee5b93a4… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index 97b1c666bd..7e0698f18c 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -101,37 +101,41 @@ str cdr_json_pre_encoded_prefix = {0, 0}; static cmd_export_t cmds[] = {{0, 0, 0, 0, 0, 0}}; -static param_export_t params[] = {{"acc_flag", INT_PARAM, &acc_flag}, - {"acc_missed_flag", INT_PARAM, &acc_missed_flag}, - {"acc_extra", PARAM_STRING, &acc_extra_str}, - {"acc_pre_encoded_prefix", PARAM_STRING, &acc_json_pre_encoded_prefix_str}, - {"acc_time_mode", INT_PARAM, &acc_time_mode}, - {"acc_time_format", PARAM_STRING, &acc_time_format}, - {"acc_log_level", INT_PARAM, &acc_log_level}, - {"acc_log_facility", PARAM_STRING, &acc_log_facility_str}, - {"acc_output_mqueue", PARAM_STRING, &acc_output_mqueue_str}, - {"acc_output_syslog", INT_PARAM, &acc_output_syslog}, - {"cdr_extra", PARAM_STRING, &cdr_extra_str}, - {"cdr_pre_encoded_prefix", PARAM_STRING, &cdr_json_pre_encoded_prefix_str}, - {"cdr_enable", INT_PARAM, &cdr_enable}, - {"cdr_expired_dlg_enable", INT_PARAM, &cdr_expired_dlg_enable}, - {"cdr_log_level", INT_PARAM, &cdr_log_level}, - {"cdr_log_facility", PARAM_STRING, &cdr_log_facility_str}, - {"cdr_output_mqueue", PARAM_STRING, &cdr_output_mqueue_str}, - {"cdr_output_syslog", INT_PARAM, &cdr_output_syslog}, {0, 0, 0}}; +static param_export_t params[] = { + {"acc_flag", INT_PARAM, &acc_flag}, + {"acc_missed_flag", INT_PARAM, &acc_missed_flag}, + {"acc_extra", PARAM_STRING, &acc_extra_str}, + {"acc_pre_encoded_prefix", PARAM_STRING, &acc_json_pre_encoded_prefix_str}, + {"acc_time_mode", INT_PARAM, &acc_time_mode}, + {"acc_time_format", PARAM_STRING, &acc_time_format}, + {"acc_log_level", INT_PARAM, &acc_log_level}, + {"acc_log_facility", PARAM_STRING, &acc_log_facility_str}, + {"acc_output_mqueue", PARAM_STRING, &acc_output_mqueue_str}, + {"acc_output_syslog", INT_PARAM, &acc_output_syslog}, + {"cdr_extra", PARAM_STRING, &cdr_extra_str}, + {"cdr_pre_encoded_prefix", PARAM_STRING, &cdr_json_pre_encoded_prefix_str}, + {"cdr_enable", INT_PARAM, &cdr_enable}, + {"cdr_expired_dlg_enable", INT_PARAM, &cdr_expired_dlg_enable}, + {"cdr_log_level", INT_PARAM, &cdr_log_level}, + {"cdr_log_facility", PARAM_STRING, &cdr_log_facility_str}, + {"cdr_output_mqueue", PARAM_STRING, &cdr_output_mqueue_str}, + {"cdr_output_syslog", INT_PARAM, &cdr_output_syslog}, + + {0, 0, 0} +}; struct module_exports exports = { - "acc_json", - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported params */ - 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* initialization module */ - child_init, /* per-child init function */ - destroy /* destroy function */ + "acc_json", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported params */ + 0, /* exported RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* initialization module */ + child_init, /* per-child init function */ + destroy /* destroy function */ }; @@ -306,8 +310,7 @@ int acc_json_send_request(struct sip_msg *req, acc_info_t *inf) } else { t = gmtime(&inf->env->ts); } - if(strftime(acc_time_format_buf, ACC_TIME_FORMAT_SIZE, acc_time_format, - t) + if(strftime(acc_time_format_buf, ACC_TIME_FORMAT_SIZE, acc_time_format, t) <= 0) { acc_time_format_buf[0] = '\0'; }

1 0

git:master:41babc99: core: added #!defexps preprocessor directive
by Daniel-Constantin Mierla 22 Sep '22

22 Sep '22

Module: kamailio Branch: master Commit: 41babc99c83c74ca3d1494698455394dd8458e87 URL: https://github.com/kamailio/kamailio/commit/41babc99c83c74ca3d1494698455394… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-22T09:35:04+02:00 core: added #!defexps preprocessor directive - similar to #!defexp but the resulted value is enclosed in double quotes --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/41babc99c83c74ca3d1494698455394… Patch: https://github.com/kamailio/kamailio/commit/41babc99c83c74ca3d1494698455394… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index e508d420e3..cc0afb8f22 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -576,6 +576,7 @@ ENDIF endif TRYDEF "trydefine"|"trydef" REDEF "redefine"|"redef" DEFEXP defexp +DEFEXPS defexps DEFENV defenv DEFENVS defenvs TRYDEFENV trydefenv @@ -1344,6 +1345,10 @@ IMPORTFILE "import_file" ksr_cfg_print_part(yytext); pp_define_set_type(KSR_PPDEF_DEFEXP); state = DEFINE_S; BEGIN(DEFINE_ID); } +<INITIAL,CFGPRINTMODE>{PREP_START}{DEFEXPS}{EAT_ABLE}+ { count(); + ksr_cfg_print_part(yytext); + pp_define_set_type(KSR_PPDEF_DEFEXPS); + state = DEFINE_S; BEGIN(DEFINE_ID); } <DEFINE_ID>{ID}{MINUS} { count(); ksr_cfg_print_part(yytext); LM_CRIT( @@ -2150,8 +2155,13 @@ int pp_define_set(int len, char *text, int mode) return -1; } - if(pp_defines[ppos].dtype == KSR_PPDEF_DEFEXP) { - sval = pp_defexp_eval(text, len); + if(pp_defines[ppos].dtype == KSR_PPDEF_DEFEXP + || pp_defines[ppos].dtype == KSR_PPDEF_DEFEXPS) { + if(pp_defines[ppos].dtype == KSR_PPDEF_DEFEXP) { + sval = pp_defexp_eval(text, len, 0); + } else { + sval = pp_defexp_eval(text, len, 1); + } if(sval==NULL) { LM_NOTICE("no value returned to set the defexp [%.*s]\n", pp_defines[ppos].name.len, pp_defines[ppos].name.s); diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 8e43e9722d..e8aac78233 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -461,7 +461,7 @@ void pp_ifexp_eval(char *exval, int exlen) snexpr_destroy(e, &vars); } -char *pp_defexp_eval(char *exval, int exlen) +char *pp_defexp_eval(char *exval, int exlen, int qmode) { str exstr; struct snexpr_var_list vars = {0}; @@ -505,13 +505,25 @@ char *pp_defexp_eval(char *exval, int exlen) sval.len = strlen(result->param.stz.sval); } - res = (char*)pkg_malloc(sval.len + 1); + if(qmode==1) { + res = (char*)pkg_malloc(sval.len + 3); + } else { + res = (char*)pkg_malloc(sval.len + 1); + } if(res==NULL) { PKG_MEM_ERROR; goto done; } - memcpy(res, sval.s, sval.len); - res[sval.len] = '\0'; + if(qmode==1) { + res[0] = '"'; + memcpy(res, sval.s+1, sval.len); + res[sval.len+1] = '"'; + res[sval.len+2] = '\0'; + LM_DBG("expression quoted string result: [%s]\n", res); + } else { + memcpy(res, sval.s, sval.len); + res[sval.len] = '\0'; + } done: snexpr_result_free(result); diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 7b5b016c08..f461535ed8 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -35,6 +35,7 @@ #define KSR_PPDEF_TRYDEF 1 #define KSR_PPDEF_REDEF 2 #define KSR_PPDEF_DEFEXP 3 +#define KSR_PPDEF_DEFEXPS 4 typedef struct ksr_ppdefine { str name; @@ -68,7 +69,7 @@ void ksr_cfg_print_initial_state(void); void pp_ifexp_eval(char *exval, int exlen); void pp_ifexp_state(int state); -char *pp_defexp_eval(char *exval, int exlen); +char *pp_defexp_eval(char *exval, int exlen, int qmode); #endif /*_PPCFG_H_*/

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