sr-dev August 2014

sr-dev@lists.kamailio.org

25 participants
195 discussions

git:master: dialog: added cleanup of expired remote profiles via internal timer

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 157a50f7fe6034213741b2a4cd5dc3142cc8dcee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=157a50f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 22 14:11:37 2014 +0200 dialog: added cleanup of expired remote profiles via internal timer --- modules/dialog/dialog.c | 1 + modules/dialog/dlg_profile.c | 45 ++++++++++++++++++++++++++++++++++++++++++ modules/dialog/dlg_profile.h | 7 ++++++ 3 files changed, 53 insertions(+), 0 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index 1baa714..86bafbf 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -1235,6 +1235,7 @@ void dlg_ka_timer_exec(unsigned int ticks, void* param) void dlg_clean_timer_exec(unsigned int ticks, void* param) { dlg_clean_run(ticks); + remove_expired_remote_profiles(time(NULL)); } static int fixup_dlg_bye(void** param, int param_no) diff --git a/modules/dialog/dlg_profile.c b/modules/dialog/dlg_profile.c index aba19c4..3600728 100644 --- a/modules/dialog/dlg_profile.c +++ b/modules/dialog/dlg_profile.c @@ -320,6 +320,50 @@ inline static unsigned int calc_hash_profile(str *value1, str *value2, /*! + * \brief Remove remote profile items that are expired + * \param te expiration time + */ +void remove_expired_remote_profiles(time_t te) +{ + struct dlg_profile_table *profile; + struct dlg_profile_entry *p_entry; + struct dlg_profile_hash *lh; + struct dlg_profile_hash *kh; + int i; + + for( profile=profiles ; profile ; profile=profile->next ) { + if(profile->flags&FLAG_PROFILE_REMOTE) { + for(i=0; i<profile->size; i++) { + /* space for optimization */ + lock_get(&profile->lock); + p_entry = &profile->entries[i]; + lh = p_entry->first; + while(lh) { + kh = lh->next; + if(lh->dlg==NULL && lh->expires>0 && lh->expires<te) { + /* last element on the list? */ + if (lh==lh->next) { + p_entry->first = NULL; + } else { + if (p_entry->first==lh) + p_entry->first = lh->next; + lh->next->prev = lh->prev; + lh->prev->next = lh->next; + } + lh->next = lh->prev = NULL; + if(lh->linker) shm_free(lh->linker); + p_entry->content--; + return; + } + lh = kh; + } + lock_release(&profile->lock); + } + } + } +} + +/*! * \brief Remove profile * \param profile pointer to profile * \param value profile value @@ -611,6 +655,7 @@ int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profi } else { vkey.s = linker->hash_linker.puid; vkey.len = linker->hash_linker.puid_len; + profile->flags |= FLAG_PROFILE_REMOTE; link_profile(linker, &vkey); } return 0; diff --git a/modules/dialog/dlg_profile.h b/modules/dialog/dlg_profile.h index 0773fe1..17ae242 100644 --- a/modules/dialog/dlg_profile.h +++ b/modules/dialog/dlg_profile.h @@ -76,12 +76,14 @@ typedef struct dlg_profile_entry { unsigned int content; /*!< content of the entry */ } dlg_profile_entry_t; +#define FLAG_PROFILE_REMOTE 1 /*! dialog profile table */ typedef struct dlg_profile_table { str name; /*!< name of the dialog profile */ unsigned int size; /*!< size of the dialog profile */ unsigned int has_value; /*!< 0 for profiles without value, otherwise it has a value */ + int flags; /*!< flags related to the profile */ gen_lock_t lock; /*! lock for concurrent access */ struct dlg_profile_entry *entries; struct dlg_profile_table *next; @@ -228,4 +230,9 @@ int dlg_profiles_to_json(dlg_cell_t *dlg, srjson_doc_t *jdoc); */ int dlg_json_to_profiles(dlg_cell_t *dlg, srjson_doc_t *jdoc); +/*! + * \brief Remove expired remove profiles + */ +void remove_expired_remote_profiles(time_t te); + #endif

9 years, 8 months

git:master: pua_dialoginfo: proper jump to end of the structure

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4108c7a125a3e50d1d670bc4c842b29cc32ec438 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4108c7a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 22 15:53:47 2014 +0200 pua_dialoginfo: proper jump to end of the structure - void has no standard size - descovered on a report by Charles Chance --- modules/pua_dialoginfo/pua_dialoginfo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/pua_dialoginfo/pua_dialoginfo.c b/modules/pua_dialoginfo/pua_dialoginfo.c index 3413dd0..0665cdc 100644 --- a/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/modules/pua_dialoginfo/pua_dialoginfo.c @@ -347,7 +347,7 @@ struct str_list* get_str_list(unsigned short avp_flags, int_str avp_name) { memset( list_current, 0, len); - list_current->s.s = (char*)( (void*) list_current + sizeof(struct str_list)); + list_current->s.s = (char*)list_current + sizeof(struct str_list); list_current->s.len = avp_value.s.len; memcpy(list_current->s.s,avp_value.s.s,avp_value.s.len);

9 years, 8 months

git:master: dialog: new config function - dlg_remote_profile

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9c8020d2ab0b522bd63dc521270e80d0f7bd6212 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c8020d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 22 15:37:53 2014 +0200 dialog: new config function - dlg_remote_profile - dlg_remote_profile(cmd, profile, value, uid, expires) - manage non-local profiles from configuration file - cmd can be add (insert a remote profile) and rm (remove a remote profile) --- modules/dialog/dialog.c | 55 ++++++++++++++++++++++++++++++++++++++++++ modules/dialog/dlg_profile.c | 2 +- modules/dialog/dlg_profile.h | 6 ++++ 3 files changed, 62 insertions(+), 1 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index 86bafbf..2f5acc7 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -181,6 +181,10 @@ static int fixup_dlg_bridge(void** param, int param_no); static int w_dlg_get(struct sip_msg*, char*, char*, char*); static int w_is_known_dlg(struct sip_msg *); +static int w_dlg_remote_profile(sip_msg_t *msg, char *cmd, char *pname, + char *pval, char *puid, char *expires); +static int fixup_dlg_remote_profile(void** param, int param_no); + static cmd_export_t cmds[]={ {"dlg_manage", (cmd_function)w_dlg_manage, 0,0, 0, REQUEST_ROUTE }, @@ -228,6 +232,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"dlg_set_property", (cmd_function)w_dlg_set_property,1,fixup_spve_null, 0, ANY_ROUTE }, + {"dlg_remote_profile", (cmd_function)w_dlg_remote_profile, 5, fixup_dlg_remote_profile, + 0, ANY_ROUTE }, {"load_dlg", (cmd_function)load_dlg, 0, 0, 0, 0}, {0,0,0,0,0,0} }; @@ -1357,6 +1363,55 @@ static int w_dlg_get(struct sip_msg *msg, char *ci, char *ft, char *tt) return 1; } +/** + * + */ +static int w_dlg_remote_profile(sip_msg_t *msg, char *cmd, char *pname, + char *pval, char *puid, char *expires) +{ + str scmd; + str sname; + str sval; + str suid; + int ival; + int ret; + + if(fixup_get_svalue(msg, (gparam_t*)cmd, &scmd)!=0) { + LM_ERR("unable to get command\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)pname, &sname)!=0) { + LM_ERR("unable to get profile name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)pval, &sval)!=0) { + LM_ERR("unable to get profile value\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)puid, &suid)!=0) { + LM_ERR("unable to get profile uid\n"); + return -1; + } + if(fixup_get_ivalue(msg, (gparam_t*)expires, &ival)!=0) { + LM_ERR("no hash entry value value\n"); + return -1; + } + + ret = dlg_cmd_remote_profile(&scmd, &sname, &sval, &suid, (time_t)ival, 0); + if(ret==0) + return 1; + return ret; +} + +static int fixup_dlg_remote_profile(void** param, int param_no) +{ + if(param_no>=1 && param_no<=4) + return fixup_spve_null(param, 1); + if(param_no==5) + return fixup_igp_null(param, 1); + return 0; +} + struct mi_root * mi_dlg_bridge(struct mi_root *cmd_tree, void *param) { str from = {0,0}; diff --git a/modules/dialog/dlg_profile.c b/modules/dialog/dlg_profile.c index 3600728..c363fd6 100644 --- a/modules/dialog/dlg_profile.c +++ b/modules/dialog/dlg_profile.c @@ -1297,7 +1297,7 @@ int dlg_json_to_profiles(dlg_cell_t *dlg, srjson_doc_t *jdoc) return 0; } -/** +/*! * */ int dlg_cmd_remote_profile(str *cmd, str *pname, str *value, str *puid, diff --git a/modules/dialog/dlg_profile.h b/modules/dialog/dlg_profile.h index 17ae242..29625e4 100644 --- a/modules/dialog/dlg_profile.h +++ b/modules/dialog/dlg_profile.h @@ -235,4 +235,10 @@ int dlg_json_to_profiles(dlg_cell_t *dlg, srjson_doc_t *jdoc); */ void remove_expired_remote_profiles(time_t te); +/*! + * + */ +int dlg_cmd_remote_profile(str *cmd, str *pname, str *value, str *puid, + time_t expires, int flags); + #endif

9 years, 8 months

git:master: dialog: internal refactoring to allow adding remote profile

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8d2e86cabe73195463937f4945f600ceabe3585a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d2e86c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 22 00:16:01 2014 +0200 dialog: internal refactoring to allow adding remote profile - this is a profile item without a local dialog - allow opperations to add or remove such profiles --- modules/dialog/dlg_profile.c | 193 +++++++++++++++++++++++++++++++++--------- modules/dialog/dlg_profile.h | 1 + 2 files changed, 153 insertions(+), 41 deletions(-) diff --git a/modules/dialog/dlg_profile.c b/modules/dialog/dlg_profile.c index 0efa1cd..aba19c4 100644 --- a/modules/dialog/dlg_profile.c +++ b/modules/dialog/dlg_profile.c @@ -297,6 +297,73 @@ void destroy_linkers(struct dlg_profile_link *linker) /*! + * \brief Calculate the hash profile from a dialog + * \see core_hash + * \param value hash source + * \param dlg dialog cell + * \param profile dialog profile table (for hash size) + * \return value hash if the value has a value, hash over dialog otherwise + */ +inline static unsigned int calc_hash_profile(str *value1, str *value2, + dlg_profile_table_t *profile) +{ + if (profile->has_value) { + /* do hash over the value1 */ + return core_hash( value1, NULL, profile->size); + } else { + /* do hash over the value2 */ + if(value2) + return core_hash( value2, NULL, profile->size); + return 0; + } +} + + +/*! + * \brief Remove profile + * \param profile pointer to profile + * \param value profile value + * \param puid profile unique id + */ +int remove_profile(dlg_profile_table_t *profile, str *value, str *puid) +{ + unsigned int hash; + struct dlg_profile_entry *p_entry; + struct dlg_profile_hash *lh; + struct dlg_profile_hash *kh; + + hash = calc_hash_profile(value, puid, profile); + lock_get(&profile->lock ); + p_entry = &profile->entries[hash]; + lh = p_entry->first; + while(lh) { + kh = lh->next; + if(lh->dlg==NULL && lh->puid_len==puid->len + && lh->value.len==value->len + && strncmp(lh->puid, puid->s, puid->len)==0 + && strncmp(lh->value.s, value->s, value->len)==0) { + /* last element on the list? */ + if (lh==lh->next) { + p_entry->first = NULL; + } else { + if (p_entry->first==lh) + p_entry->first = lh->next; + lh->next->prev = lh->prev; + lh->prev->next = lh->next; + } + lh->next = lh->prev = NULL; + if(lh->linker) shm_free(lh->linker); + p_entry->content--; + return 1; + } + lh = kh; + } + lock_release(&profile->lock ); + return 0; +} + + +/*! * \brief Cleanup a profile * \param msg SIP message * \param flags unused @@ -328,30 +395,37 @@ int profile_cleanup( struct sip_msg *msg, unsigned int flags, void *param ) } - /*! - * \brief Calculate the hash profile from a dialog - * \see core_hash - * \param value hash source - * \param dlg dialog cell - * \param profile dialog profile table (for hash size) - * \return value hash if the value has a value, hash over dialog otherwise + * \brief Link a dialog profile + * \param linker dialog linker + * \param vkey key for profile hash table */ -inline static unsigned int calc_hash_profile(str *value1, str *value2, - dlg_profile_table_t *profile) +static void link_profile(struct dlg_profile_link *linker, str *vkey) { - if (profile->has_value) { - /* do hash over the value1 */ - return core_hash( value1, NULL, profile->size); + unsigned int hash; + struct dlg_profile_entry *p_entry; + struct dlg_entry *d_entry; + + /* calculate the hash position */ + hash = calc_hash_profile(&linker->hash_linker.value, vkey, linker->profile); + linker->hash_linker.hash = hash; + + /* insert into profile hash table */ + p_entry = &linker->profile->entries[hash]; + lock_get( &linker->profile->lock ); + if (p_entry->first) { + linker->hash_linker.prev = p_entry->first->prev; + linker->hash_linker.next = p_entry->first; + p_entry->first->prev->next = &linker->hash_linker; + p_entry->first->prev = &linker->hash_linker; } else { - /* do hash over the value2 */ - if(value2) - return core_hash( value2, NULL, profile->size); - return 0; + p_entry->first = linker->hash_linker.next + = linker->hash_linker.prev = &linker->hash_linker; } + p_entry->content ++; + lock_release( &linker->profile->lock ); } - /*! * \brief Link a dialog profile * \param linker dialog linker @@ -379,24 +453,7 @@ static void link_dlg_profile(struct dlg_profile_link *linker, struct dlg_cell *d linker->hash_linker.dlg = dlg; } - /* calculate the hash position */ - hash = calc_hash_profile(&linker->hash_linker.value, &dlg->callid, linker->profile); - linker->hash_linker.hash = hash; - - /* insert into profile hash table */ - p_entry = &linker->profile->entries[hash]; - lock_get( &linker->profile->lock ); - if (p_entry->first) { - linker->hash_linker.prev = p_entry->first->prev; - linker->hash_linker.next = p_entry->first; - p_entry->first->prev->next = &linker->hash_linker; - p_entry->first->prev = &linker->hash_linker; - } else { - p_entry->first = linker->hash_linker.next - = linker->hash_linker.prev = &linker->hash_linker; - } - p_entry->content ++; - lock_release( &linker->profile->lock ); + link_profile(linker, &dlg->callid); } @@ -461,8 +518,9 @@ int set_dlg_profile(struct sip_msg *msg, str *value, struct dlg_profile_table *p } memset(linker, 0, sizeof(struct dlg_profile_link)); - /* set backpointer to profile */ + /* set backpointers to profile and linker (itself) */ linker->profile = profile; + linker->hash_linker.linker = linker; /* set the value */ if (profile->has_value) { @@ -514,9 +572,7 @@ int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profi str *puid, time_t expires, int flags) { dlg_profile_link_t *linker; - - if (dlg==NULL) - return -1; + str vkey; /* build new linker */ linker = (struct dlg_profile_link*)shm_malloc( @@ -527,8 +583,9 @@ int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profi } memset(linker, 0, sizeof(struct dlg_profile_link)); - /* set backpointer to profile */ + /* set backpointers to profile and linker (itself) */ linker->profile = profile; + linker->hash_linker.linker = linker; /* set the value */ if (profile->has_value) { @@ -539,6 +596,7 @@ int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profi } if(puid && puid->s && puid->len>0 && puid->len<SRUID_SIZE) { strcpy(linker->hash_linker.puid, puid->s); + linker->hash_linker.puid_len = puid->len; } else { sruid_next_safe(&_dlg_profile_sruid); strcpy(linker->hash_linker.puid, _dlg_profile_sruid.uid.s); @@ -548,7 +606,13 @@ int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profi linker->hash_linker.flags = flags; /* add linker directly to the dialog and profile */ - link_dlg_profile( linker, dlg); + if(dlg!=NULL) { + link_dlg_profile(linker, dlg); + } else { + vkey.s = linker->hash_linker.puid; + vkey.len = linker->hash_linker.puid_len; + link_profile(linker, &vkey); + } return 0; error: return -1; @@ -1187,3 +1251,50 @@ int dlg_json_to_profiles(dlg_cell_t *dlg, srjson_doc_t *jdoc) } return 0; } + +/** + * + */ +int dlg_cmd_remote_profile(str *cmd, str *pname, str *value, str *puid, + time_t expires, int flags) +{ + dlg_profile_table_t *dprofile; + int ret; + + if(cmd==NULL || cmd->s==NULL || cmd->len<=0 + || pname==NULL || pname->s==NULL || pname->len<=0 + || puid==NULL || puid->s==NULL || puid->len<=0) { + LM_ERR("invalid parameters\n"); + return -1; + } + dprofile = search_dlg_profile(pname); + if(dprofile==NULL) { + LM_ERR("profile [%.*s] not found\n", pname->len, pname->s); + return -1; + } + if(dprofile->has_value) { + if(value==NULL || value->s==NULL || value->len<=0) { + LM_ERR("profile [%.*s] requires a value\n", pname->len, pname->s); + return -1; + } + } + + if(cmd->len==3 && strncmp(cmd->s, "add", 3)==0) { + if(value && value->s && value->len>0) { + ret = dlg_add_profile(NULL, value, dprofile, puid, expires, flags); + } else { + ret = dlg_add_profile(NULL, NULL, dprofile, puid, expires, flags); + } + if(ret<0) { + LM_ERR("failed to add to profile [%.*s]\n", pname->len, pname->s); + return -1; + } + } else if(cmd->len==2 && strncmp(cmd->s, "rm", 2)==0) { + ret = remove_profile(dprofile, value, puid); + return ret; + } else { + LM_ERR("unknown command [%.*s]\n", cmd->len, cmd->s); + return -1; + } + return 0; +} diff --git a/modules/dialog/dlg_profile.h b/modules/dialog/dlg_profile.h index 00ef276..0773fe1 100644 --- a/modules/dialog/dlg_profile.h +++ b/modules/dialog/dlg_profile.h @@ -55,6 +55,7 @@ typedef struct dlg_profile_hash { int puid_len; time_t expires; int flags; + struct dlg_profile_link *linker; struct dlg_profile_hash *next; struct dlg_profile_hash *prev; unsigned int hash; /*!< position in the hash table */

9 years, 8 months

git:master: dialog: add a unique id for each profile item

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 219ac1743051d05396d13203aee6115ffbc9a7d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=219ac17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 21 18:21:14 2014 +0200 dialog: add a unique id for each profile item - internal sruid is used for generating uids --- modules/dialog/dlg_profile.c | 42 +++++++++++++++++++++++++++++++----------- modules/dialog/dlg_profile.h | 4 +++- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/modules/dialog/dlg_profile.c b/modules/dialog/dlg_profile.c index 0fd32c2..0efa1cd 100644 --- a/modules/dialog/dlg_profile.c +++ b/modules/dialog/dlg_profile.c @@ -39,6 +39,7 @@ #include "../../ut.h" #include "../../route.h" #include "../../modules/tm/tm_load.h" +#include "../../lib/srutils/sruid.h" #include "dlg_hash.h" #include "dlg_var.h" #include "dlg_handlers.h" @@ -67,6 +68,8 @@ static dlg_profile_table_t* new_dlg_profile( str *name, extern int update_dlg_timeout(dlg_cell_t *, int); +static sruid_t _dlg_profile_sruid; + /*! * \brief Add profile definitions to the global list * \see new_dlg_profile @@ -214,10 +217,12 @@ static struct dlg_profile_table* new_dlg_profile( str *name, unsigned int size, /* link profile */ for( ptmp=profiles ; ptmp && ptmp->next; ptmp=ptmp->next ); - if (ptmp==NULL) + if (ptmp==NULL) { profiles = profile; - else + sruid_init(&_dlg_profile_sruid, '-', "dlgp", SRUID_INC); + } else { ptmp->next = profile; + } return profile; } @@ -332,15 +337,17 @@ int profile_cleanup( struct sip_msg *msg, unsigned int flags, void *param ) * \param profile dialog profile table (for hash size) * \return value hash if the value has a value, hash over dialog otherwise */ -inline static unsigned int calc_hash_profile(str *value, dlg_cell_t *dlg, +inline static unsigned int calc_hash_profile(str *value1, str *value2, dlg_profile_table_t *profile) { if (profile->has_value) { - /* do hash over the value */ - return core_hash( value, NULL, profile->size); + /* do hash over the value1 */ + return core_hash( value1, NULL, profile->size); } else { - /* do hash over dialog pointer */ - return ((unsigned long)dlg) % profile->size ; + /* do hash over the value2 */ + if(value2) + return core_hash( value2, NULL, profile->size); + return 0; } } @@ -373,7 +380,7 @@ static void link_dlg_profile(struct dlg_profile_link *linker, struct dlg_cell *d } /* calculate the hash position */ - hash = calc_hash_profile(&linker->hash_linker.value, dlg, linker->profile); + hash = calc_hash_profile(&linker->hash_linker.value, &dlg->callid, linker->profile); linker->hash_linker.hash = hash; /* insert into profile hash table */ @@ -463,6 +470,9 @@ int set_dlg_profile(struct sip_msg *msg, str *value, struct dlg_profile_table *p memcpy( linker->hash_linker.value.s, value->s, value->len); linker->hash_linker.value.len = value->len; } + sruid_next_safe(&_dlg_profile_sruid); + strcpy(linker->hash_linker.puid, _dlg_profile_sruid.uid.s); + linker->hash_linker.puid_len = _dlg_profile_sruid.uid.len; if (dlg!=NULL) { /* add linker directly to the dialog and profile */ @@ -500,7 +510,8 @@ error: * \param profile dialog profile table * \return 0 on success, -1 on failure */ -int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profile) +int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profile, + str *puid, time_t expires, int flags) { dlg_profile_link_t *linker; @@ -526,6 +537,15 @@ int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profi linker->hash_linker.value.len = value->len; linker->hash_linker.value.s[value->len] = '\0'; } + if(puid && puid->s && puid->len>0 && puid->len<SRUID_SIZE) { + strcpy(linker->hash_linker.puid, puid->s); + } else { + sruid_next_safe(&_dlg_profile_sruid); + strcpy(linker->hash_linker.puid, _dlg_profile_sruid.uid.s); + linker->hash_linker.puid_len = _dlg_profile_sruid.uid.len; + } + linker->hash_linker.expires = expires; + linker->hash_linker.flags = flags; /* add linker directly to the dialog and profile */ link_dlg_profile( linker, dlg); @@ -1149,7 +1169,7 @@ int dlg_json_to_profiles(dlg_cell_t *dlg, srjson_doc_t *jdoc) if(val.s!=NULL) { if(profile->has_value) { - if(dlg_add_profile(dlg, &val, profile) < 0) + if(dlg_add_profile(dlg, &val, profile, &puid, expires, flags) < 0) LM_ERR("dynamic profile cannot be added, ignore!\n"); else LM_DBG("dynamic profile added [%s : %s]\n", name.s, val.s); @@ -1157,7 +1177,7 @@ int dlg_json_to_profiles(dlg_cell_t *dlg, srjson_doc_t *jdoc) } else { if(!profile->has_value) { - if(dlg_add_profile(dlg, NULL, profile) < 0) + if(dlg_add_profile(dlg, NULL, profile, &puid, expires, flags) < 0) LM_ERR("static profile cannot be added, ignore!\n"); else LM_DBG("static profile added [%s]\n", name.s); diff --git a/modules/dialog/dlg_profile.h b/modules/dialog/dlg_profile.h index af27faf..00ef276 100644 --- a/modules/dialog/dlg_profile.h +++ b/modules/dialog/dlg_profile.h @@ -52,6 +52,7 @@ typedef struct dlg_profile_hash { str value; /*!< hash value */ struct dlg_cell *dlg; /*!< dialog cell */ char puid[SRUID_SIZE]; + int puid_len; time_t expires; int flags; struct dlg_profile_hash *next; @@ -213,7 +214,8 @@ int dlg_set_timeout_by_profile(struct dlg_profile_table *, str *, int); * \param profile dialog profile table * \return 0 on success, -1 on failure */ -int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profile); +int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profile, + str *puid, time_t expires, int flags); /*! * \brief Serialize dialog profiles to json

9 years, 8 months

git:master: dialog: refactored json serialization for dialog profiles

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6677714ccfaa395a70fd1ce2cd99cab58e46d2c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6677714… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 19 17:44:55 2014 +0200 dialog: refactored json serialization for dialog profiles - there is no restriction to add a dialog in same profile many times (could be with/without different value). Current serialization resulted in having many fields with same name in an object structure, which was ok for local json handling, but failed for various external tools - profile structure extended in memory with unique id, expires and flags, to be used for better identification of the profile cell - note: upon kamailio upgrade, old dialog profiles are no longer loaded, as the json structure is now different --- modules/dialog/dlg_profile.c | 141 ++++++++++++++++++++++-------------------- modules/dialog/dlg_profile.h | 6 ++ 2 files changed, 81 insertions(+), 66 deletions(-) diff --git a/modules/dialog/dlg_profile.c b/modules/dialog/dlg_profile.c index f7ecad1..3ce4783 100644 --- a/modules/dialog/dlg_profile.c +++ b/modules/dialog/dlg_profile.c @@ -1009,8 +1009,8 @@ error: int dlg_profiles_to_json(dlg_cell_t *dlg, srjson_doc_t *jdoc) { dlg_profile_link_t *l; - srjson_t *sj = NULL; - srjson_t *dj = NULL; + srjson_t *aj = NULL; + srjson_t *pj = NULL; LM_DBG("serializing profiles for dlg[%u:%u]\n", dlg->h_entry, dlg->h_id); @@ -1020,33 +1020,38 @@ int dlg_profiles_to_json(dlg_cell_t *dlg, srjson_doc_t *jdoc) dlg->h_entry, dlg->h_id); for (l = dlg->profile_links ; l ; l=l->next) { - if(l->profile->has_value) + if(aj==NULL) { - if(dj==NULL) + aj = srjson_CreateArray(jdoc); + if(aj==NULL) { - dj = srjson_CreateObject(jdoc); - if(dj==NULL) - { - LM_ERR("cannot create json dynamic profiles obj\n"); - goto error; - } + LM_ERR("cannot create json profiles array object\n"); + goto error; } - srjson_AddStrStrToObject(jdoc, dj, - l->profile->name.s, l->profile->name.len, + } + pj = srjson_CreateObject(jdoc); + if(pj==NULL) + { + LM_ERR("cannot create json dynamic profiles obj\n"); + goto error; + } + + srjson_AddStrStrToObject(jdoc, pj, + "name", 4, + l->profile->name.s, l->profile->name.len); + if(l->profile->has_value) + { + srjson_AddStrStrToObject(jdoc, pj, + "value", 5, l->hash_linker.value.s, l->hash_linker.value.len); - } else { - if(sj==NULL) - { - sj = srjson_CreateArray(jdoc); - if(sj==NULL) - { - LM_ERR("cannot create json static profiles obj\n"); - goto error; - } - } - srjson_AddItemToArray(jdoc, sj, - srjson_CreateStr(jdoc, l->profile->name.s, l->profile->name.len)); } + if(l->hash_linker.puid[0]!='\0') + srjson_AddStringToObject(jdoc, pj, "puid", l->hash_linker.puid); + if(l->hash_linker.expires!=0) + srjson_AddNumberToObject(jdoc, pj, "expires", l->hash_linker.expires); + if(l->hash_linker.flags!=0) + srjson_AddNumberToObject(jdoc, pj, "flags", l->hash_linker.flags); + srjson_AddItemToArray(jdoc, aj, pj); } if(jdoc->root==NULL) @@ -1058,10 +1063,8 @@ int dlg_profiles_to_json(dlg_cell_t *dlg, srjson_doc_t *jdoc) goto error; } } - if(dj!=NULL) - srjson_AddItemToObject(jdoc, jdoc->root, "dprofiles", dj); - if(sj!=NULL) - srjson_AddItemToObject(jdoc, jdoc->root, "sprofiles", sj); + if(aj!=NULL) + srjson_AddItemToObject(jdoc, jdoc->root, "profiles", aj); if(jdoc->buf.s != NULL) { jdoc->free_fn(jdoc->buf.s); @@ -1079,8 +1082,7 @@ int dlg_profiles_to_json(dlg_cell_t *dlg, srjson_doc_t *jdoc) return -1; error: - srjson_Delete(jdoc, dj); - srjson_Delete(jdoc, sj); + srjson_Delete(jdoc, aj); return -1; } @@ -1090,12 +1092,15 @@ error: */ int dlg_json_to_profiles(dlg_cell_t *dlg, srjson_doc_t *jdoc) { - srjson_t *sj = NULL; - srjson_t *dj = NULL; + srjson_t *aj = NULL; srjson_t *it = NULL; + srjson_t *jt = NULL; dlg_profile_table_t *profile; str name; str val; + str puid; + time_t expires; + int flags; if(dlg==NULL || jdoc==NULL || jdoc->buf.s==NULL) return -1; @@ -1109,49 +1114,53 @@ int dlg_json_to_profiles(dlg_cell_t *dlg, srjson_doc_t *jdoc) return -1; } } - dj = srjson_GetObjectItem(jdoc, jdoc->root, "dprofiles"); - sj = srjson_GetObjectItem(jdoc, jdoc->root, "sprofiles"); - if(dj!=NULL) + aj = srjson_GetObjectItem(jdoc, jdoc->root, "profiles"); + if(aj!=NULL) { - for(it=dj->child; it; it = it->next) + for(it=aj->child; it; it = it->next) { - name.s = it->string; - name.len = strlen(name.s); - val.s = it->valuestring; - val.len = strlen(val.s); - profile = search_dlg_profile(&name); - if(profile==NULL) - { - LM_ERR("profile [%.*s] not found\n", name.len, name.s); - continue; - } - if(profile->has_value) - { - if(dlg_add_profile(dlg, &val, profile) < 0) - LM_ERR("dynamic profile cannot be added, ignore!\n"); - else - LM_DBG("dynamic profile added [%s : %s]\n", name.s, val.s); + name.s = val.s = puid.s = NULL; + expires = 0; flags = 0; + for(jt = it->child; jt; jt = jt->next) { + if(strcmp(jt->string, "name")==0) { + name.s = jt->valuestring; + name.len = strlen(name.s); + } else if(strcmp(jt->string, "value")==0) { + val.s = jt->valuestring; + val.len = strlen(val.s); + } else if(strcmp(jt->string, "puid")==0) { + puid.s = jt->valuestring; + puid.len = strlen(val.s); + } else if(strcmp(jt->string, "puid")==0) { + expires = (time_t)jt->valueint; + } else if(strcmp(jt->string, "flags")==0) { + flags = jt->valueint; + } } - } - } - if(sj!=NULL) - { - for(it=sj->child; it; it = it->next) - { - name.s = it->valuestring; - name.len = strlen(name.s); + if(name.s==NULL) + continue; profile = search_dlg_profile(&name); if(profile==NULL) { LM_ERR("profile [%.*s] not found\n", name.len, name.s); continue; } - if(!profile->has_value) - { - if(dlg_add_profile(dlg, NULL, profile) < 0) - LM_ERR("static profile cannot be added, ignore!\n"); - else - LM_DBG("static profile added [%s]\n", name.s); + if(val.s!=NULL) { + if(profile->has_value) + { + if(dlg_add_profile(dlg, &val, profile) < 0) + LM_ERR("dynamic profile cannot be added, ignore!\n"); + else + LM_DBG("dynamic profile added [%s : %s]\n", name.s, val.s); + } + } else { + if(!profile->has_value) + { + if(dlg_add_profile(dlg, NULL, profile) < 0) + LM_ERR("static profile cannot be added, ignore!\n"); + else + LM_DBG("static profile added [%s]\n", name.s); + } } } } diff --git a/modules/dialog/dlg_profile.h b/modules/dialog/dlg_profile.h index 041fc44..af27faf 100644 --- a/modules/dialog/dlg_profile.h +++ b/modules/dialog/dlg_profile.h @@ -28,8 +28,11 @@ #ifndef _DIALOG_DLG_PROFILE_H_ #define _DIALOG_DLG_PROFILE_H_ +#include <time.h> + #include "../../parser/msg_parser.h" #include "../../lib/srutils/srjson.h" +#include "../../lib/srutils/sruid.h" #include "../../locking.h" #include "../../str.h" #include "../../modules/tm/h_table.h" @@ -48,6 +51,9 @@ typedef struct dlg_profile_hash { str value; /*!< hash value */ struct dlg_cell *dlg; /*!< dialog cell */ + char puid[SRUID_SIZE]; + time_t expires; + int flags; struct dlg_profile_hash *next; struct dlg_profile_hash *prev; unsigned int hash; /*!< position in the hash table */

9 years, 8 months

git:master: lib/srutils: add sruid_next_safe() function

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d2e6918acc75178d8669615bff068914bd34abfa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d2e6918… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 20 12:17:25 2014 +0200 lib/srutils: add sruid_next_safe() function - checks to see if the sruid was initialized by same process and if not, triggers a reinit - pid is stored inside the sruid struct --- lib/srutils/sruid.c | 10 ++++++++++ lib/srutils/sruid.h | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/lib/srutils/sruid.c b/lib/srutils/sruid.c index db84550..ca67bfc 100644 --- a/lib/srutils/sruid.c +++ b/lib/srutils/sruid.c @@ -96,6 +96,7 @@ int sruid_init(sruid_t *sid, char sep, char *cid, int mode) sid->out = sid->buf + i + 5; sid->uid.s = sid->buf; sid->mode = (sruid_mode_t)mode; + sid->pid = my_pid(); LM_DBG("root for sruid is [%.*s] (%u / %d)\n", i+5, sid->uid.s, sid->counter, i+5); return 0; @@ -131,6 +132,7 @@ int sruid_reinit(sruid_t *sid, int mode) sid->out = sid->buf + i + 5; sid->uid.s = sid->buf; sid->mode = (sruid_mode_t)mode; + sid->pid = my_pid(); LM_DBG("re-init root for sruid is [%.*s] (%u / %d)\n", i+5, sid->uid.s, sid->counter, i+5); return 0; @@ -177,3 +179,11 @@ int sruid_next(sruid_t *sid) return 0; } +/** + * + */ +int sruid_next_safe(sruid_t *sid) +{ + if(unlikely(sid->pid!=my_pid())) sruid_reinit(sid, sid->mode); + return sruid_next(sid); +} diff --git a/lib/srutils/sruid.h b/lib/srutils/sruid.h index 8124d5c..a459188 100644 --- a/lib/srutils/sruid.h +++ b/lib/srutils/sruid.h @@ -36,10 +36,12 @@ typedef struct sruid { char *out; str uid; unsigned int counter; + int pid; sruid_mode_t mode; } sruid_t; int sruid_init(sruid_t *sid, char sep, char *cid, int mode); int sruid_next(sruid_t *sid); +int sruid_next_safe(sruid_t *sid); #endif

9 years, 8 months

git:master: dlg: keep dialog value 0-terminated in memory

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 542336ab49a7b8cbca953a69c138a5ec38a96d7a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=542336a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 19 18:00:49 2014 +0200 dlg: keep dialog value 0-terminated in memory - more flexibility in searching/matching --- modules/dialog/dlg_profile.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/dialog/dlg_profile.c b/modules/dialog/dlg_profile.c index 3ce4783..0fd32c2 100644 --- a/modules/dialog/dlg_profile.c +++ b/modules/dialog/dlg_profile.c @@ -509,7 +509,7 @@ int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profi /* build new linker */ linker = (struct dlg_profile_link*)shm_malloc( - sizeof(struct dlg_profile_link) + (profile->has_value?value->len:0) ); + sizeof(struct dlg_profile_link) + (profile->has_value?(value->len+1):0) ); if (linker==NULL) { LM_ERR("no more shm memory\n"); goto error; @@ -524,6 +524,7 @@ int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profi linker->hash_linker.value.s = (char*)(linker+1); memcpy( linker->hash_linker.value.s, value->s, value->len); linker->hash_linker.value.len = value->len; + linker->hash_linker.value.s[value->len] = '\0'; } /* add linker directly to the dialog and profile */

9 years, 8 months

git:master: acc: fix cdr extra2strar allocation issues

by Lucian Balaceanu

Module: sip-router Branch: master Commit: 295716363562d88bce3db39e0f1bc605b1cc8257 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2957163… Author: Pawel.Kuzak <pawel.kuzak(a)1und1.de> Committer: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Date: Wed Jul 30 13:59:49 2014 +0300 acc: fix cdr extra2strar allocation issues - for more than 10 string cdr_extra parameters, the addresses used by the new parameters overwrite the previous ones; our solution is to allocate memory for the cdr extra params with pkg_malloc() and free it once it is no longer needed. --- modules/acc/acc.c | 7 ++++++- modules/acc/acc_cdr.c | 27 ++++++++++++++++++++------- modules/acc/acc_extra.c | 39 ++++++++++++++++++--------------------- modules/acc/acc_extra.h | 12 ++++++++++++ modules/acc/acc_mod.c | 3 --- 5 files changed, 56 insertions(+), 32 deletions(-) diff --git a/modules/acc/acc.c b/modules/acc/acc.c index 418e709..51dfde5 100644 --- a/modules/acc/acc.c +++ b/modules/acc/acc.c @@ -229,6 +229,7 @@ int acc_log_request( struct sip_msg *rq) char *p; int n; int m; + int o = 0; int i; struct tm *t; @@ -236,7 +237,9 @@ int acc_log_request( struct sip_msg *rq) m = core2strar( rq, val_arr, int_arr, type_arr); /* get extra values */ - m += extra2strar( log_extra, rq, val_arr+m, int_arr+m, type_arr+m); + o += extra2strar( log_extra, rq, val_arr+m, int_arr+m, type_arr+m); + + m += o; for ( i=0,p=log_msg ; i<m ; i++ ) { if (p+1+log_attrs[i].len+1+val_arr[i].len >= log_msg_end) { @@ -314,6 +317,8 @@ int acc_log_request( struct sip_msg *rq) acc_env.text.len, acc_env.text.s,(unsigned long)acc_env.ts, log_msg); } + /* free memory allocated by extra2strar */ + free_strar_mem( &(type_arr[m-o]), &(val_arr[m-o]), o, m); return 1; } diff --git a/modules/acc/acc_cdr.c b/modules/acc/acc_cdr.c index c8d2684..bc2e66b 100644 --- a/modules/acc/acc_cdr.c +++ b/modules/acc/acc_cdr.c @@ -131,6 +131,7 @@ static int db_write_cdr( struct dlg_cell* dialog, struct sip_msg* message) { int m = 0; + int n = 0; int i; db_func_t *df=NULL; db1_con_t *dh=NULL; @@ -163,11 +164,12 @@ static int db_write_cdr( struct dlg_cell* dialog, /* get extra values */ if (message) { - m += extra2strar( cdr_extra, + n += extra2strar( cdr_extra, message, cdr_value_array + m, cdr_int_array + m, cdr_type_array + m); + m += n; } else if (cdr_expired_dlg_enable){ LM_WARN( "fallback to dlg_only search because of message doesn't exist.\n"); m += extra2strar_dlg_only( cdr_extra, @@ -187,27 +189,34 @@ static int db_write_cdr( struct dlg_cell* dialog, if (df->use_table(dh, &acc_cdrs_table /*table*/) < 0) { LM_ERR("error in use_table\n"); - return -1; + goto error; } if(acc_db_insert_mode==1 && df->insert_delayed!=NULL) { if (df->insert_delayed(dh, db_cdr_keys, db_cdr_vals, m) < 0) { LM_ERR("failed to insert delayed into database\n"); - return -1; + goto error; } } else if(acc_db_insert_mode==2 && df->insert_async!=NULL) { if (df->insert_async(dh, db_cdr_keys, db_cdr_vals, m) < 0) { LM_ERR("failed to insert async into database\n"); - return -1; + goto error; } } else { if (df->insert(dh, db_cdr_keys, db_cdr_vals, m) < 0) { LM_ERR("failed to insert into database\n"); - return -1; + goto error; } } + /* Free memory allocated by acc_extra.c/extra2strar */ + free_strar_mem( &(cdr_type_array[m-n]), &(cdr_value_array[m-n]), n, m); return 0; + +error: + /* Free memory allocated by acc_extra.c/extra2strar */ + free_strar_mem( &(cdr_type_array[m-n]), &(cdr_value_array[m-n]), n, m); + return -1; } #endif @@ -221,6 +230,7 @@ static int log_write_cdr( struct dlg_cell* dialog, 2;// -2 because of the string ending '\n\0' char* message_position = NULL; int message_index = 0; + int extra_index = 0; int counter = 0; if(cdr_log_enable==0) @@ -235,7 +245,7 @@ static int log_write_cdr( struct dlg_cell* dialog, /* get extra values */ if (message) { - message_index += extra2strar( cdr_extra, + extra_index += extra2strar( cdr_extra, message, cdr_value_array + message_index, cdr_int_array + message_index, @@ -249,7 +259,7 @@ static int log_write_cdr( struct dlg_cell* dialog, cdr_type_array + message_index, &dlgb); } - + message_index += extra_index; for( counter = 0, message_position = cdr_message; counter < message_index ; @@ -296,6 +306,9 @@ static int log_write_cdr( struct dlg_cell* dialog, LM_GEN2( cdr_facility, log_level, "%s", cdr_message); + /* free memory allocated by extra2strar, nothing is done in case no extra strings were found by extra2strar */ + free_strar_mem( &(cdr_type_array[message_index-extra_index]), &(cdr_value_array[message_index-extra_index]), + extra_index, message_index); return 0; } diff --git a/modules/acc/acc_extra.c b/modules/acc/acc_extra.c index 4847109..e9b6e4d 100644 --- a/modules/acc/acc_extra.c +++ b/modules/acc/acc_extra.c @@ -63,16 +63,6 @@ /* here we copy the strings returned by int2str (which uses a static buffer) */ static char int_buf[INT2STR_MAX_LEN*MAX_ACC_INT_BUF]; -static char *static_detector = 0; - -void init_acc_extra(void) -{ - int i; - /* ugly trick to get the address of the static buffer */ - static_detector = int2str( (unsigned long)3, &i) + i; -} - - struct acc_extra *parse_acc_leg(char *extra_str) { struct acc_extra *legs; @@ -249,10 +239,10 @@ int extra2strar(struct acc_extra *extra, struct sip_msg *rq, str *val_arr, { pv_value_t value; int n; - int r; + int i; n = 0; - r = 0; + i = 0; while (extra) { /* get the value */ @@ -272,15 +262,22 @@ int extra2strar(struct acc_extra *extra, struct sip_msg *rq, str *val_arr, val_arr[n].len = 0; type_arr[n] = TYPE_NULL; } else { - /* set the value into the acc buffer */ - if (value.rs.s+value.rs.len==static_detector) { - val_arr[n].s = int_buf + r*INT2STR_MAX_LEN; - val_arr[n].len = value.rs.len; - memcpy(val_arr[n].s, value.rs.s, value.rs.len); - r++; - } else { - val_arr[n] = value.rs; - } + val_arr[n].s = (char *)pkg_malloc(value.rs.len); + if (val_arr[n].s == NULL ) { + LM_ERR("extra2strar: out of memory.\n"); + /* Cleanup already allocated memory and + return that we didn't do anything */ + for (i = 0; i < n ; i++) { + if (NULL != val_arr[i].s){ + pkg_free(val_arr[i].s); + val_arr[i].s = NULL; + } + } + n = 0; + goto done; + } + memcpy(val_arr[n].s, value.rs.s, value.rs.len); + val_arr[n].len = value.rs.len; if (value.flags&PV_VAL_INT) { int_arr[n] = value.ri; type_arr[n] = TYPE_INT; diff --git a/modules/acc/acc_extra.h b/modules/acc/acc_extra.h index 13112b9..c906683 100644 --- a/modules/acc/acc_extra.h +++ b/modules/acc/acc_extra.h @@ -43,6 +43,7 @@ #ifndef _ACC_EXTRA_H_ #define _ACC_EXTRA_H_ +#include "acc_api.h" #include "../../str.h" #include "../../pvar.h" #include "../../parser/msg_parser.h" @@ -72,5 +73,16 @@ int extra2int( struct acc_extra *extra, int *attrs ); int extra2attrs( struct acc_extra *extra, struct attr *attrs, int offset); #endif +static inline void free_strar_mem( char* type_arr, str* alloc_arr, int dim_arr, int dim_ext){ + int i = 0; + for ( i = 0; i < dim_arr; i ++ ) { + if (( TYPE_NULL != type_arr[i] ) && ( NULL != alloc_arr[i].s)) { + LM_DBG("Freeing memory, type is %d, message_index %d, index i %d\n", + type_arr[i], dim_ext - dim_arr, i); + pkg_free( alloc_arr[i].s) ; + alloc_arr[i].s = NULL; + } + } +} #endif diff --git a/modules/acc/acc_mod.c b/modules/acc/acc_mod.c index acd620c..831a137 100644 --- a/modules/acc/acc_mod.c +++ b/modules/acc/acc_mod.c @@ -528,9 +528,6 @@ static int mod_init( void ) return -1; } - /* init the extra engine */ - init_acc_extra(); - /* configure multi-leg accounting */ if (leg_info_str && (leg_info=parse_acc_leg(leg_info_str))==0 ) { LM_ERR("failed to parse multileg_info param\n");

9 years, 8 months

[tracker] Task opened: force_send_socket in event route tm:local-request

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Kristian Høgh (kfhdk) Attached to Project - sip-router Summary - force_send_socket in event route tm:local-request Task Type - Improvement Category - Core Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - Would it be possible to use force_send_socket in event route tm:local-request? In our setup we use a public IP for "normal" traffic and pua (for dialoginfo) uses outbound_proxy on other/private interface. Or could it be possible to set: * mhomed per module? * Auto "mhomed=1" on pua, when outbound_proxy is set, and kamailio listens on multiple interfaces? * Add "outbound_socket" module parameter on pua * A "much better solution"(tm) than the above Regards, Kristian Høgh Uni-tel On 21/08/14 12:00, Kristian F. Høgh wrote: > Hi, > > Our kamailio 4.0.6 proxy uses pua/pua_dialoginfo and an external presence server. > The PUBLISH requests generated by pua* appear in tm:local-request event route. > > Before sending, we call set_advertised_address and force_send_socket. > Still the requests have the IP address from the first "listen=" as source and Via address. > The requests are send out using the correct interface and no errors are logged. > > When forwarding SUBSCRIBE requests received from clients, force_send_socket before t_relay_to_udp do work as expected. > > mhomed=1 solves the issue, but I prefer force_send_socket. > > Regards, > Kristian Høgh > Uni-tel Hello, I think the ougoing request is already created in that event route, the set advertise address being used too late from that perspective -- however, there is no hook before to set it. Open an enhancement issue on the tracker not to forget about it and I will check to see if there is a possibility to add this feature. Cheers, Daniel More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=462 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 8 months

← Newer
1
2
3
4
5
6
7
8
9
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2014