sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
376 discussions

git:alexh/dialog-sync-wip: dialog: Correctly detect and handle state in DLG_DMQ_UPDATE
by Alex Hermann 04 Sep '14

04 Sep '14

Module: sip-router Branch: alexh/dialog-sync-wip Commit: f42a9fbf0a1206c5e3ee0eadb591495526354ca5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f42a9fb… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Tue Aug 26 16:28:29 2014 +0200 dialog: Correctly detect and handle state in DLG_DMQ_UPDATE --- modules/dialog/dlg_dmq.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/dialog/dlg_dmq.c b/modules/dialog/dlg_dmq.c index c8ea38c..3ea532e 100644 --- a/modules/dialog/dlg_dmq.c +++ b/modules/dialog/dlg_dmq.c @@ -97,7 +97,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp) str profiles = {0, 0}, callid = {0, 0}; str dummy = {0, 0}; unsigned int init_ts = 0, start_ts = 0, lifetime = 0; - unsigned int state = 0; + unsigned int state = 1; /* received dmq message */ LM_DBG("dmq message received\n"); @@ -194,8 +194,6 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp) dlg->h_id = iuid.h_id; /* prevent DB sync */ dlg->dflags &= ~(DLG_FLAG_NEW|DLG_FLAG_CHANGED); - dlg->init_ts = init_ts; - dlg->start_ts = start_ts; } else { /* remove existing profiles */ if (dlg->profile_links!=NULL) { @@ -204,6 +202,9 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp) } } + dlg->init_ts = init_ts; + dlg->start_ts = start_ts; + /* add profiles */ if(profiles.s!=NULL) { srjson_InitDoc(&prof_jdoc, NULL);

1 0

git:alexh/dialog-sync-wip: dialog: Introduce increment and offset for hash id's
by Alex Hermann 04 Sep '14

04 Sep '14

Module: sip-router Branch: alexh/dialog-sync-wip Commit: 7c717e04fa815556e102e92f03721a90d8800f17 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c717e0… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Aug 11 17:03:31 2014 +0200 dialog: Introduce increment and offset for hash id's When replicating dialogs via dmq, the id's must not overlap. introduce an offset and increment so each kamailio instance creates unique id's. The increment must be identical between all involved proxies, the offset must be unique. --- modules/dialog/dialog.c | 14 +++++++++++ modules/dialog/dlg_db_handler.c | 8 ++---- modules/dialog/dlg_hash.c | 30 +++++++++++++++++++++-- modules/dialog/dlg_hash.h | 5 ++++ modules/dialog/doc/dialog_admin.xml | 45 +++++++++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+), 8 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index 83a17c6..b5b6321 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -112,6 +112,8 @@ int initial_cbs_inscript = 1; int dlg_wait_ack = 1; static int dlg_timer_procs = 0; int dlg_enable_dmq = 0; +int dlg_id_offset = 1; +int dlg_id_increment = 1; int dlg_event_rt[DLG_EVENTRT_MAX]; @@ -297,6 +299,8 @@ static param_export_t mod_params[]={ { "timeout_noreset", INT_PARAM, &dlg_timeout_noreset }, { "timer_procs", PARAM_INT, &dlg_timer_procs }, { "enable_dmq", INT_PARAM, &dlg_enable_dmq }, + { "id_offset", INT_PARAM, &dlg_id_offset }, + { "id_increment", INT_PARAM, &dlg_id_increment }, { 0,0,0 } }; @@ -516,6 +520,16 @@ static int mod_init(void) return -1; } + if (dlg_id_increment < 1) { + LM_ERR("invalid value for id_increment\n"); + return -1; + } + + if (dlg_id_offset < 1 || dlg_id_offset > dlg_id_increment) { + LM_ERR("invalid value for id_offset\n"); + return -1; + } + if (timeout_spec.s) { if ( pv_parse_spec(&timeout_spec, &timeout_avp)==0 && (timeout_avp.type!=PVT_AVP)){ diff --git a/modules/dialog/dlg_db_handler.c b/modules/dialog/dlg_db_handler.c index a00f5ec..fcc04e8 100644 --- a/modules/dialog/dlg_db_handler.c +++ b/modules/dialog/dlg_db_handler.c @@ -304,7 +304,6 @@ static int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows) str cseq1, cseq2, contact1, contact2, rroute1, rroute2; str toroute_name; str xdata; - unsigned int next_id; srjson_doc_t jdoc; res = 0; @@ -363,10 +362,9 @@ static int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows) link_dlg(dlg, 0, 0); dlg->h_id = VAL_INT(values+1); - next_id = d_table->entries[dlg->h_entry].next_id; - - d_table->entries[dlg->h_entry].next_id = - (next_id < dlg->h_id) ? (dlg->h_id+1) : next_id; + if (dlg->h_id >= d_table->entries[dlg->h_entry].next_id) { + d_table->entries[dlg->h_entry].next_id = dlg_next_id(dlg->h_id); + } GET_STR_VALUE(to_tag, values, 6, 1, 1); diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index 2a7b055..169bef6 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -69,6 +69,8 @@ extern int dlg_ka_interval; extern int dlg_enable_dmq; +extern int dlg_id_offset; +extern int dlg_id_increment; /*! global dialog table */ struct dlg_table *d_table = 0; @@ -265,6 +267,27 @@ int dlg_clean_run(ticks_t ti) } /*! + * \brief Create next id based on offset and increment + * \param id current value + */ +unsigned int inline dlg_next_id(unsigned int id) +{ + unsigned int new; + + if (dlg_id_increment == 1) { + new = id + 1; + } else { + new = (((id + dlg_id_increment - dlg_id_offset) / dlg_id_increment) + * dlg_id_increment) + dlg_id_offset; + } + if (unlikely(new == 0)) { + new = dlg_id_offset; + } + return new; +} + + +/*! * \brief Initialize the global dialog table * \param size size of the table * \return 0 on success, -1 on failure @@ -326,7 +349,7 @@ int init_dlg_table(unsigned int size) for( i=0 ; i<size; i++ ) { memset( &(d_table->entries[i]), 0, sizeof(struct dlg_entry) ); - d_table->entries[i].next_id = rand() % (3*size); + d_table->entries[i].next_id = dlg_next_id(rand() % (3*size)); d_table->entries[i].lock_idx = i % d_table->locks_no; } @@ -824,8 +847,9 @@ void link_dlg(struct dlg_cell *dlg, int n, int mode) if(unlikely(mode==0)) dlg_lock( d_table, d_entry); /* keep id 0 for special cases */ - dlg->h_id = 1 + d_entry->next_id++; - if(dlg->h_id == 0) dlg->h_id = 1; + dlg->h_id = d_entry->next_id; + d_entry->next_id += dlg_id_increment; + if (unlikely(d_entry->next_id == 0)) d_entry->next_id = dlg_id_offset; LM_DBG("linking dialog [%u:%u]\n", dlg->h_entry, dlg->h_id); if (d_entry->first==0) { d_entry->first = d_entry->last = dlg; diff --git a/modules/dialog/dlg_hash.h b/modules/dialog/dlg_hash.h index 57aebb4..66b86e0 100644 --- a/modules/dialog/dlg_hash.h +++ b/modules/dialog/dlg_hash.h @@ -232,6 +232,11 @@ int init_dlg_table(unsigned int size); */ void destroy_dlg_table(void); +/*! + * \brief Create next id based on offset and increment + * \param id current value + */ +unsigned int dlg_next_id(unsigned int id); /*! * \brief Create a new dialog structure for a SIP dialog diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index 6597cd0..008e256 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -1301,6 +1301,51 @@ modparam("dialog", "enable_dmq", 1) </example> </section> + <section> + <title><varname>id_increment</varname> (int)</title> + <para> + If syncing via DMQ is enabled, this must be set to at least the number of + proxies in the pool. Together with the <varname>id_offset</varname> parameter, + this will guarantee unique id's in the hash tables. + </para> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>id_increment</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialog", "id_increment", 3) +... +</programlisting> + </example> + </section> + + <section> + <title><varname>id_offset</varname> (int)</title> + <para> + If syncing via DMQ is enabled, this must be set to a unique number + between 1 and the value of <varname>id_increment</varname> (inclusive) for + every proxy in the pool. Together with the <varname>id_increment</varname> + parameter, this will guarantee unique id's in the hash tables. + </para> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>id_offset</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialog", "id_offset", 2) +... +</programlisting> + </example> + </section> + </section>

1 0

git:alexh/dialog-sync-wip: dialog: Add syncing via DMQ
by Alex Hermann 04 Sep '14

04 Sep '14

Module: sip-router Branch: alexh/dialog-sync-wip Commit: be2a3cc70a8d31643d00d5c50470811c01c00fef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be2a3cc… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Aug 7 17:13:17 2014 +0200 dialog: Add syncing via DMQ Primary purpose is to sync profiles. This implements just that. Enough of the state is synced to maintain identical profiles counts on all kamailio instances. Changed profiles are only synced as the request is sent out, adding multiple profiles will result in just 1 sync message at the moment the request is being sent. It is not possible for the 'other' instances to send in-dialog requests. --- modules/dialog/dialog.c | 9 + modules/dialog/dlg_dmq.c | 425 +++++++++++++++++++++++++++++++++++ modules/dialog/dlg_dmq.h | 47 ++++ modules/dialog/dlg_handlers.c | 64 +++++- modules/dialog/dlg_hash.c | 15 +- modules/dialog/dlg_hash.h | 2 + modules/dialog/dlg_profile.c | 2 + modules/dialog/doc/dialog_admin.xml | 23 ++ 8 files changed, 576 insertions(+), 11 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=be2…

1 0

git:alexh/dialog-sync-wip: dialog: Delete dialog on negative ack, not tm destroy
by Alex Hermann 04 Sep '14

04 Sep '14

Module: sip-router Branch: alexh/dialog-sync-wip Commit: 966dae63edd0df87f53a4172116caf0c31f98622 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=966dae6… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Aug 7 11:22:53 2014 +0200 dialog: Delete dialog on negative ack, not tm destroy Do what the comments say, destroy the dialog on reception of a negative ACK instead of delaying it until the transaction is cleaned up. Keep the old behaviour as backup for when the ACK is missing. --- modules/dialog/dlg_handlers.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 3e3c047..9d78dca 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -466,7 +466,7 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) goto done; } - if (type==TMCB_DESTROY) + if (type & (TMCB_DESTROY|TMCB_ACK_NEG_IN)) event = DLG_EVENT_TDEL; else if (param->code<200) event = DLG_EVENT_RPL1xx; @@ -963,7 +963,7 @@ int dlg_set_tm_waitack(tm_cell_t *t, dlg_cell_t *dlg) } dlg_ref(dlg, 1); if ( d_tmb.register_tmcb( NULL, t, - TMCB_DESTROY, + TMCB_DESTROY|TMCB_ACK_NEG_IN, dlg_ontdestroy, (void*)iuid, dlg_iuid_sfree)<0 ) { LM_ERR("failed to register TMCB to wait for negative ACK\n"); dlg_unref(dlg, 1);

1 0

git:alexh/dialog-sync-wip DELETED: dialog: Fix typo in receiving init_ts via DMQ
by Alex Hermann 04 Sep '14

04 Sep '14

Module: sip-router Branch: alexh/dialog-sync-wip DELETED Commit: 2ad249c954dfd13356fe1b2bba303667e8b5c191 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ad249c… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Aug 25 13:54:57 2014 +0200 dialog: Fix typo in receiving init_ts via DMQ --- modules/dialog/dlg_dmq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/dialog/dlg_dmq.c b/modules/dialog/dlg_dmq.c index 1ba8b89..d3b5ce1 100644 --- a/modules/dialog/dlg_dmq.c +++ b/modules/dialog/dlg_dmq.c @@ -145,7 +145,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp) } else if (strcmp(it->string, "h_id")==0) { iuid.h_id = it->valueint; } else if (strcmp(it->string, "init_ts")==0) { - start_ts = it->valueint; + init_ts = it->valueint; } else if (strcmp(it->string, "start_ts")==0) { start_ts = it->valueint; } else if (strcmp(it->string, "state")==0) {

1 0

New commits on branch master
by Alex Hermann 04 Sep '14

04 Sep '14

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e990a74… Author: Alex Hermann <alex(a)speakup.nl> Date: Mon Sep 1 17:54:38 2014 +0200 dmq: Add an RPC interface to query the nodes in the cluster URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc2fd3e… Author: Alex Hermann <alex(a)speakup.nl> Date: Mon Sep 1 15:28:23 2014 +0200 jsonrpc-s: Link to srutils for access to srjson URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a55331… Author: Alex Hermann <alex(a)speakup.nl> Date: Mon Sep 1 17:50:54 2014 +0200 jsonrpc-s: Don't make up a random reply when the reply is empty In case the function was registered with RET_ARRAY, return an empty array, as that is a valid response. Else, there is no sane response, send an empty object for now. This should maybe become an error repsonse instead. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=549f96e… Author: Alex Hermann <alex(a)speakup.nl> Date: Tue Aug 26 18:52:38 2014 +0200 dmq: Parse Content-Length header if it isn't parsed yet URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4abbae4… Author: Alex Hermann <alex(a)speakup.nl> Date: Fri Aug 22 15:55:05 2014 +0200 dmq: More efficient peer storage Allocate only 1 hunk of memory for the entire peer's storage needs. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78a8797… Author: Alex Hermann <alex(a)speakup.nl> Date: Fri Aug 22 15:51:49 2014 +0200 dmq: Broadcast nodelists to all hosts Update all hosts with updated state on shutdown. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c3524a… Author: Alex Hermann <alex(a)speakup.nl> Date: Fri Aug 22 15:48:28 2014 +0200 dmq: Handle Max-Forwards correctly when maxfwd module is used. The maxfwd module will change the current msg buffer with a decreased Max-Forwards header. Detect this sitation via the 'parsed' field and handle it. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42e653b… Author: Alex Hermann <alex(a)speakup.nl> Date: Fri Aug 22 15:46:08 2014 +0200 dmq: Use the received status updates from peer hosts to update in-memory status URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4d75916… Author: Alex Hermann <alex(a)speakup.nl> Date: Fri Aug 22 15:42:51 2014 +0200 dmq: Set node status to value in uri The status was forced to ACTIVE regardless of the status in the uri. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e34dbf… Author: Alex Hermann <alex(a)speakup.nl> Date: Mon Aug 11 19:06:42 2014 +0200 dmq: Various sanity checks and initializations URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd3eb9f… Author: Alex Hermann <alex(a)speakup.nl> Date: Thu Aug 7 17:20:20 2014 +0200 dmq: fix copy-paste error resulting in the peer's description not being copied URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e53527… Author: Alex Hermann <alex(a)speakup.nl> Date: Thu Jul 17 13:02:12 2014 +0200 dmq: Set send_socket to the correct address Documentation says the server_address is the address used to send messages from. Make the code actually do this. UDP is hardcoded for now because DMQ doesn't work with other protocols (yet). URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=02932c9… Author: Alex Hermann <alex(a)speakup.nl> Date: Tue Sep 2 16:38:15 2014 +0200 dmq: Fix indenting URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d77ac3… Author: Alex Hermann <alex(a)speakup.nl> Date: Tue Jul 15 10:26:42 2014 +0200 dialog: Allow '_' in dlg profile names URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=684afd9… Author: Alex Hermann <alex(a)speakup.nl> Date: Fri Aug 22 11:44:56 2014 +0200 dialog: Send properly structured responses on RPC requests Instead of dumping random blobs in structured protocols (json, xmlrpc), return properly structured data. Each dialog is a struct with named fields, a list of dialogs is an array of structs. Variables and profiles are arrays in the dialog struct. Dialog contexts still todo. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d5f8af… Author: Alex Hermann <alex(a)speakup.nl> Date: Fri Aug 22 13:55:42 2014 +0200 dialog: Correctly restore dialog lifetime from DB Restore the lifetime to the configured value instead of the offset from the time the reload from the DB took place. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=811bb51… Author: Alex Hermann <alex(a)speakup.nl> Date: Mon Jul 7 16:38:29 2014 +0200 dialog: Set the dialog context on transaction failure Before, the dialog context would be derived from the callid and tags. This could select the wrong dialog in case of spirals. This patch sets the correct dialog context by storing the it in the transaction and restoring it on a failure. Now the correct dialog variables are available in failure_route. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25a3297… Author: Alex Hermann <alex(a)speakup.nl> Date: Mon Jul 7 16:38:29 2014 +0200 dialog: Set the dialog context on incoming replies Before, the dialog context would be derived from the callid and tags. This could select the wrong dialog in case of spirals. This patch sets the correct dialog context by storing the it in the transaction and restoring it on an incoming response. Now the correct dialog variables are available in onreply_route.

1 0

db_text module internal structure
by Luis Azedo 03 Sep '14

03 Sep '14

Hi Daniel, the internal structure of the query results in the db_text module are saved at the connection level. this leads to memory leaks when the connection is shared between processes. please find the attachment with a patch to make bind the resulting internal structure to the db_result. Best

1 0

git:master: modules/ims_auth: ims_www_challenge allows specification of auth algorithm from cfg
by Jason Penton 03 Sep '14

03 Sep '14

Module: sip-router Branch: master Commit: 33f054a793dc843959de356f0dc201e66d306583 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33f054a… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed Sep 3 22:32:03 2014 +0200 modules/ims_auth: ims_www_challenge allows specification of auth algorithm from cfg - e.g. ims_www_challenge("REG_MAR_REPLY", "$td", "MD5"); - useful for non-ims clients that do not do AKA --- modules/ims_auth/authims_mod.c | 8 +++- modules/ims_auth/authorize.c | 23 ++++++++-- modules/ims_auth/doc/ims_auth_admin.xml | 68 +++++++++++++++++++++++++------ 3 files changed, 80 insertions(+), 19 deletions(-) diff --git a/modules/ims_auth/authims_mod.c b/modules/ims_auth/authims_mod.c index 716f75c..8d8afd1 100644 --- a/modules/ims_auth/authims_mod.c +++ b/modules/ims_auth/authims_mod.c @@ -113,6 +113,7 @@ int ignore_failed_auth = 0; static cmd_export_t cmds[] = { {"ims_www_authenticate", (cmd_function) www_authenticate, 1, auth_fixup, 0, REQUEST_ROUTE}, {"ims_www_challenge", (cmd_function) www_challenge, 2, challenge_fixup_async, 0, REQUEST_ROUTE}, + {"ims_www_challenge", (cmd_function) www_challenge, 3, challenge_fixup_async, 0, REQUEST_ROUTE}, {"ims_www_resync_auth", (cmd_function) www_resync_auth, 2, challenge_fixup_async, 0, REQUEST_ROUTE}, {"ims_proxy_authenticate", (cmd_function) proxy_authenticate, 1, auth_fixup, 0, REQUEST_ROUTE}, {"ims_proxy_challenge", (cmd_function) proxy_challenge, 2, auth_fixup_async, 0, REQUEST_ROUTE}, @@ -262,7 +263,12 @@ static int challenge_fixup_async(void** param, int param_no) { return 0; } else if (param_no == 2) { if (fixup_var_str_12(param, 1) == -1) { - LM_ERR("Erroring doing fixup on challenge"); + LM_ERR("Error doing fixup on challenge"); + return -1; + } + } else if (param_no == 3) /* algorithm */ { + if (fixup_var_str_12(param, 1) == -1) { + LM_ERR("Error doing fixup on challenge"); return -1; } } diff --git a/modules/ims_auth/authorize.c b/modules/ims_auth/authorize.c index c409b4a..bb93ffa 100644 --- a/modules/ims_auth/authorize.c +++ b/modules/ims_auth/authorize.c @@ -269,13 +269,13 @@ int proxy_authenticate(struct sip_msg* _m, char* _realm, char* _table) { return digest_authenticate(_m, &srealm, &stable, HDR_PROXYAUTH_T); } */ -int challenge(struct sip_msg* msg, char* str1, char* str2, int is_proxy_auth, char *route) { +int challenge(struct sip_msg* msg, char* str1, char* alg, int is_proxy_auth, char *route) { - str realm = {0, 0}; + str realm = {0, 0}, algo = {0,0}; unsigned int aud_hash; str private_identity, public_identity, auts = {0, 0}, nonce = {0, 0}; auth_vector *av = 0; - int algo_type; + int algo_type = 0; str route_name; saved_transaction_t* saved_t; @@ -287,6 +287,15 @@ int challenge(struct sip_msg* msg, char* str1, char* str2, int is_proxy_auth, ch return -1; } + if (!alg) { + LM_DBG("no algorithm specified in cfg... using default\n"); + } else { + if (get_str_fparam(&algo, msg, (fparam_t*) alg) < 0) { + LM_ERR("failed to get auth algorithm\n"); + return -1; + } + } + LM_DBG("Looking for route block [%.*s]\n", route_name.len, route_name.s); int ri = route_get(&main_rt, route_name.s); if (ri < 0) { @@ -343,8 +352,12 @@ int challenge(struct sip_msg* msg, char* str1, char* str2, int is_proxy_auth, ch return CSCF_RETURN_BREAK; } - algo_type = registration_default_algorithm_type; - + if (algo.len > 0) { + algo_type = get_algorithm_type(algo); + } else { + algo_type = registration_default_algorithm_type; + } + // /* check if it is a synchronization request */ // //TODO this is MAR syncing - have removed it currently - TOD maybe put back in // auts = ims_get_auts(msg, realm, is_proxy_auth); diff --git a/modules/ims_auth/doc/ims_auth_admin.xml b/modules/ims_auth/doc/ims_auth_admin.xml index ca57bd3..d5a1e0f 100644 --- a/modules/ims_auth/doc/ims_auth_admin.xml +++ b/modules/ims_auth/doc/ims_auth_admin.xml @@ -422,17 +422,17 @@ if (!www_authorize("kamailio.org", "subscriber")) { </section> <section> - <title><function moreinfo="none">ims_www_authenticate(realm, - table)</function></title> + <title><function + moreinfo="none">ims_www_authenticate(realm)</function></title> - <para>It is same function as www_authenticate(realm, table). This name - is kept for backward compatibility, since it was named this way first - time by it actually does user authentication.</para> + <para>It is the same function as www_authenticate(realm, table). This + name is kept for backward compatibility, since it was named this way + first time by it actually does user authentication.</para> </section> <section> - <title><function moreinfo="none">ims_www_challenge(route_block, realm, - table)</function></title> + <title><function moreinfo="none">ims_www_challenge(route_block, + realm)</function></title> <para>Name alias: proxy_authorize(realm, table)</para> @@ -471,17 +471,12 @@ if (!www_authorize("kamailio.org", "subscriber")) { <para>The string may contain pseudo variables.</para> </listitem> - - <listitem> - <para><emphasis>table</emphasis> - Table to be used to lookup - usernames and passwords (usually subscribers table).</para> - </listitem> </itemizedlist> <para>This function can be used from REQUEST_ROUTE.</para> <example> - <title>proxy_authorize usage</title> + <title>ims_www_challenge usage</title> <programlisting format="linespecific"> ... @@ -518,6 +513,53 @@ route[REG_MAR_REPLY] </section> <section> + <title><function moreinfo="none">ims_www_challenge(route_block, realm, + algorithm)</function></title> + + <para>Same as 4.3 except here there is the addiional option to specify + the authorisation algorithm</para> + + <itemizedlist> + <listitem> + <para><emphasis>algorithm</emphasis> - The algorithm to be used when + challenging the client. Can be AKAv1-MD5, AKAv2-MD5, MD5, or + HSS-Selected. If left as an empty string, the default algorithm will + be chosen according to the parameter registration_default_algorithm + (see section 3.7)</para> + </listitem> + </itemizedlist> + + <para>This function can be used from REQUEST_ROUTE.</para> + + <example> + <title>ims_www_challenge usage</title> + + <programlisting format="linespecific"> +... + if (!ims_www_authenticate(NETWORKNAME)) { + #user has not been authenticated. Lets send a challenge via 401 Unauthorized + if ($? == -2) { + t_reply("403", "Authentication Failed"); + exit; + } else if ($? == -3) { + t_reply("400", "Bad Request"); + exit; + } else if ($? == -9) { + xlog("L_DBG", "Authentication re-sync requested\n"); + ims_www_resync_auth("REG_RESYNC_REPLY", "$td"); + exit; + } else { + xlog("L_DBG","About to challenge! auth_ims\n"); + ims_www_challenge("REG_MAR_REPLY", "$td", "MD5"); + exit; + } + } + +</programlisting> + </example> + </section> + + <section> <title><function moreinfo="none">ims_proxy_challenge(route_block, realm, table)</function></title>

1 0

git:master: modules/pv: added pseudo-variable ($aa) for access to algorithm in autorization header
by Jason Penton 03 Sep '14

03 Sep '14

Module: sip-router Branch: master Commit: 961542fa1ce9d077d0737e4971a827409b74a122 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=961542f… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed Sep 3 19:57:22 2014 +0200 modules/pv: added pseudo-variable ($aa) for access to algorithm in autorization header --- modules/pv/pv.c | 3 +++ modules/pv/pv_core.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/pv/pv.c b/modules/pv/pv.c index 8488b67..02726e2 100644 --- a/modules/pv/pv.c +++ b/modules/pv/pv.c @@ -115,6 +115,9 @@ static pv_export_t mod_pvs[] = { {{"aU", (sizeof("aU")-1)}, /* */ PVT_OTHER, pv_get_authattr, 0, 0, 0, pv_init_iname, 5}, + {{"aa", (sizeof("aa")-1)}, /* auth algorithm */ + PVT_OTHER, pv_get_authattr, 0, + 0, 0, pv_init_iname, 6}, {{"Au", (sizeof("Au")-1)}, /* */ PVT_OTHER, pv_get_acc_username, 0, 0, 0, pv_init_iname, 1}, diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index d41a399..c0943e8 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -1242,6 +1242,9 @@ int pv_get_authattr(struct sip_msg *msg, pv_param_t *param, } switch(param->pvn.u.isname.name.n) { + case 6: + return pv_get_strval(msg, param, res, + &((auth_body_t*)(hdr->parsed))->digest.alg.alg_str); case 4: return pv_get_strval(msg, param, res, &((auth_body_t*)(hdr->parsed))->digest.username.domain);

1 0

git:master: db_text: fix clang compiler warning
by Ovidiu Sas 03 Sep '14

03 Sep '14

Module: sip-router Branch: master Commit: f4cfbe9a7ca5fbf1cb44c544abcc27aa65198ae1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4cfbe9… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Sep 3 13:26:14 2014 -0400 db_text: fix clang compiler warning --- modules/db_text/dbt_lib.c | 3 +++ modules/db_text/dbt_res.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules/db_text/dbt_lib.c b/modules/db_text/dbt_lib.c index 4626f81..c4aee80 100644 --- a/modules/db_text/dbt_lib.c +++ b/modules/db_text/dbt_lib.c @@ -460,6 +460,9 @@ int dbt_is_neq_type(db_type_t _t0, db_type_t _t1) case DB1_BITMAP: if (_t0==DB1_INT) return 0; + default: + LM_ERR("invalid datatype %d\n", _t1); + return 1; } return 1; } diff --git a/modules/db_text/dbt_res.c b/modules/db_text/dbt_res.c index da0f249..428a86b 100644 --- a/modules/db_text/dbt_res.c +++ b/modules/db_text/dbt_res.c @@ -499,8 +499,10 @@ int dbt_cmp_val(dbt_val_p _vp, db_val_t* _v) case DB1_BITMAP: return (_vp->val.int_val<_v->val.bitmap_val)?-1: (_vp->val.int_val>_v->val.bitmap_val)?1:0; + default: + LM_ERR("invalid datatype %d\n", VAL_TYPE(_v)); + return -2; } - LM_ERR("invalid datatype %d\n", VAL_TYPE(_v)); return -2; }

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014