sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

by Torrey Searle

I was looking at the wiki and see there is no defined section id syntax for pseudo variables? Is it possible to define one? Thanks! Torrey

11 years, 8 months

git:master: uac: added possibility to authenticate generated requests

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b89c747bc717c0f9053e53c53a74f9744c1b8606 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b89c747… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 23 11:52:13 2013 +0200 uac: added possibility to authenticate generated requests - $uac_req(auser) - specify the authentication username - $uac_req(apasswd) - specify the authentication password - if both attributes above are set and the request is challenged with 401/407, then the request is resent with auth header --- modules/uac/uac_send.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 234 insertions(+), 10 deletions(-) diff --git a/modules/uac/uac_send.c b/modules/uac/uac_send.c index 47744cd..50bff25 100644 --- a/modules/uac/uac_send.c +++ b/modules/uac/uac_send.c @@ -21,9 +21,17 @@ */ #include "../../dprint.h" +#include "../../trim.h" #include "../../modules/tm/tm_load.h" +#include "../../parser/parse_uri.h" +#include "../../parser/parse_from.h" +#include "../../parser/parse_to.h" +#include "../../parser/contact/parse_contact.h" + +#include "auth.h" +#include "auth_hdr.h" #include "uac_send.h" #define MAX_UACH_SIZE 2048 @@ -32,7 +40,7 @@ /** TM bind */ struct tm_binds tmb; -struct _uac_send_info { +typedef struct _uac_send_info { unsigned int flags; char b_method[32]; str s_method; @@ -48,11 +56,38 @@ struct _uac_send_info { str s_body; char b_ouri[MAX_URI_SIZE]; str s_ouri; + char b_auser[128]; + str s_auser; + char b_apasswd[64]; + str s_apasswd; unsigned int onreply; -}; +} uac_send_info_t; static struct _uac_send_info _uac_req; +uac_send_info_t *uac_send_info_clone(uac_send_info_t *ur) +{ + uac_send_info_t *tp = NULL; + tp = (uac_send_info_t*)shm_malloc(sizeof(uac_send_info_t)); + if(tp==NULL) + { + LM_ERR("no more shm memory\n"); + return NULL; + } + memcpy(tp, ur, sizeof(uac_send_info_t)); + tp->s_method.s = tp->b_method; + tp->s_ruri.s = tp->b_ruri; + tp->s_turi.s = tp->b_turi; + tp->s_furi.s = tp->b_furi; + tp->s_hdrs.s = tp->b_hdrs; + tp->s_body.s = tp->b_body; + tp->s_ouri.s = tp->b_ouri; + tp->s_auser.s = tp->b_auser; + tp->s_apasswd.s = tp->b_apasswd; + + return tp; +} + int pv_get_uac_req(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { @@ -91,6 +126,14 @@ int pv_get_uac_req(struct sip_msg *msg, pv_param_t *param, if(_uac_req.s_method.len<=0) return pv_get_null(msg, param, res); return pv_get_strval(msg, param, res, &_uac_req.s_method); + case 9: + if(_uac_req.s_auser.len<=0) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &_uac_req.s_auser); + case 10: + if(_uac_req.s_apasswd.len<=0) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &_uac_req.s_apasswd); default: return pv_get_uintval(msg, param, res, _uac_req.flags); } @@ -277,6 +320,46 @@ int pv_set_uac_req(struct sip_msg* msg, pv_param_t *param, } _uac_req.onreply = val->ri; break; + case 9: + if(val==NULL) + { + _uac_req.s_auser.len = 0; + return 0; + } + if(!(val->flags&PV_VAL_STR)) + { + LM_ERR("Invalid auth user type\n"); + return -1; + } + if(val->rs.len>=128) + { + LM_ERR("Value size too big\n"); + return -1; + } + memcpy(_uac_req.s_auser.s, val->rs.s, val->rs.len); + _uac_req.s_auser.s[val->rs.len] = '\0'; + _uac_req.s_auser.len = val->rs.len; + break; + case 10: + if(val==NULL) + { + _uac_req.s_apasswd.len = 0; + return 0; + } + if(!(val->flags&PV_VAL_STR)) + { + LM_ERR("Invalid auth password type\n"); + return -1; + } + if(val->rs.len>=64) + { + LM_ERR("Value size too big\n"); + return -1; + } + memcpy(_uac_req.s_apasswd.s, val->rs.s, val->rs.len); + _uac_req.s_apasswd.s[val->rs.len] = '\0'; + _uac_req.s_apasswd.len = val->rs.len; + break; } return 0; } @@ -308,6 +391,11 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 6; else goto error; break; + case 5: + if(strncmp(in->s, "auser", 5)==0) + sp->pvp.pvn.u.isname.name.n = 9; + else goto error; + break; case 6: if(strncmp(in->s, "method", 6)==0) sp->pvp.pvn.u.isname.name.n = 7; @@ -316,6 +404,8 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) case 7: if(strncmp(in->s, "onreply", 7)==0) sp->pvp.pvn.u.isname.name.n = 8; + else if(strncmp(in->s, "apasswd", 7)==0) + sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; default: @@ -347,25 +437,148 @@ void uac_req_init(void) _uac_req.s_hdrs.s = _uac_req.b_hdrs; _uac_req.s_body.s = _uac_req.b_body; _uac_req.s_method.s = _uac_req.b_method; + _uac_req.s_auser.s = _uac_req.b_auser; + _uac_req.s_apasswd.s = _uac_req.b_apasswd; return; } +int uac_send_tmdlg(dlg_t *tmdlg, sip_msg_t *rpl) +{ + if(tmdlg==NULL || rpl==NULL) + return -1; + + if (parse_headers(rpl, HDR_EOH_F, 0) < 0) { + LM_ERR("error while parsing all headers in the reply\n"); + return -1; + } + if(parse_to_header(rpl)<0 || parse_from_header(rpl)<0) { + LM_ERR("error while parsing From/To headers in the reply\n"); + return -1; + } + memset(tmdlg, 0, sizeof(dlg_t)); + + str2int(&(get_cseq(rpl)->number), &tmdlg->loc_seq.value); + tmdlg->loc_seq.is_set = 1; + + tmdlg->id.call_id = rpl->callid->body; + trim(&tmdlg->id.call_id); + + if (get_from(rpl)->tag_value.len) { + tmdlg->id.loc_tag = get_from(rpl)->tag_value; + } +#if 0 + if (get_to(rpl)->tag_value.len) { + tmdlg->id.rem_tag = get_to(rpl)->tag_value; + } +#endif + tmdlg->loc_uri = get_from(rpl)->uri; + tmdlg->rem_uri = get_to(rpl)->uri; + tmdlg->state= DLG_CONFIRMED; + return 0; +} + +#define MAX_UACH_SIZE 2048 + /** * TM callback function */ -void uac_send_tm_callback( struct cell *t, int type, struct tmcb_params *ps) +void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) { - unsigned int onreply; + int ret; + struct hdr_field *hdr; + HASHHEX response; + str *new_auth_hdr = NULL; + static struct authenticate_body auth; + struct uac_credential cred; + char b_hdrs[MAX_UACH_SIZE]; + str s_hdrs; + uac_req_t uac_r; + dlg_t tmdlg; + uac_send_info_t *tp = NULL; + if(ps->param==NULL || *ps->param==0) { LM_DBG("message id not received\n"); goto done; } - onreply = *((unsigned int*)ps->param); - LM_DBG("completed with status %d [onreply: %u]\n", - ps->code, onreply); + tp = (uac_send_info_t*)(*ps->param); + if(ps->code != 401 && ps->code != 407) + { + LM_DBG("completed with status %d\n", ps->code); + goto done; + } + + LM_DBG("completed with status %d\n", ps->code); + + hdr = get_autenticate_hdr(ps->rpl, ps->code); + if (hdr==0) + { + LM_ERR("failed to extract authenticate hdr\n"); + goto error; + } + + LM_DBG("auth header body [%.*s]\n", + hdr->body.len, hdr->body.s); + + if (parse_authenticate_body(&hdr->body, &auth)<0) + { + LM_ERR("failed to parse auth hdr body\n"); + goto error; + } + + cred.realm = auth.realm; + cred.user = tp->s_auser; + cred.passwd = tp->s_apasswd; + cred.next = NULL; + + do_uac_auth(&tp->s_method, &tp->s_ruri, &cred, &auth, response); + new_auth_hdr=build_authorization_hdr(ps->code, &tp->s_ruri, &cred, + &auth, response); + if (new_auth_hdr==0) + { + LM_ERR("failed to build authorization hdr\n"); + goto error; + } + + if(tp->s_hdrs.len <= 0) { + snprintf(b_hdrs, MAX_UACH_SIZE, + "%.*s", + new_auth_hdr->len, new_auth_hdr->s); + } else { + snprintf(b_hdrs, MAX_UACH_SIZE, + "%.*s%.*s", + tp->s_hdrs.len, tp->s_hdrs.s, + new_auth_hdr->len, new_auth_hdr->s); + } + + s_hdrs.s = b_hdrs; s_hdrs.len = strlen(s_hdrs.s); + pkg_free(new_auth_hdr->s); + + memset(&uac_r, 0, sizeof(uac_r)); + if(uac_send_tmdlg(&tmdlg, ps->rpl)<0) + { + LM_ERR("failed to build tm dialog\n"); + goto error; + } + tmdlg.rem_target = tp->s_ruri; + if(tp->s_ouri.len>0) + tmdlg.dst_uri = tp->s_ouri; + uac_r.method = &tp->s_method; + uac_r.headers = &s_hdrs; + uac_r.body = (tp->s_body.len <= 0) ? NULL : &tp->s_body; + uac_r.dialog = &tmdlg; + uac_r.cb_flags = TMCB_LOCAL_COMPLETED; + ret = tmb.t_request_within(&uac_r); + + if(ret<0) { + LM_ERR("failed to send request with authentication\n"); + goto error; + } done: +error: + if(tp!=NULL) + shm_free(tp); return; } @@ -374,6 +587,7 @@ int uac_req_send(struct sip_msg *msg, char *s1, char *s2) { int ret; uac_req_t uac_r; + uac_send_info_t *tp = NULL; if(_uac_req.s_ruri.len<=0 || _uac_req.s_method.len == 0 || tmb.t_request==NULL) @@ -383,13 +597,20 @@ int uac_req_send(struct sip_msg *msg, char *s1, char *s2) uac_r.method = &_uac_req.s_method; uac_r.headers = (_uac_req.s_hdrs.len <= 0) ? NULL : &_uac_req.s_hdrs; uac_r.body = (_uac_req.s_body.len <= 0) ? NULL : &_uac_req.s_body; - if(_uac_req.onreply > 0) + if(_uac_req.s_auser.len > 0 && _uac_req.s_apasswd.len>0) { + tp = uac_send_info_clone(&_uac_req); + if(tp==NULL) + { + LM_ERR("cannot clone the uac structure\n"); + return -1; + } + uac_r.cb_flags = TMCB_LOCAL_COMPLETED; /* Callback function */ uac_r.cb = uac_send_tm_callback; /* Callback parameter */ - uac_r.cbp = (void*)(long)_uac_req.onreply; + uac_r.cbp = (void*)tp; } ret = tmb.t_request(&uac_r, /* UAC Req */ &_uac_req.s_ruri, /* Request-URI */ @@ -398,8 +619,11 @@ int uac_req_send(struct sip_msg *msg, char *s1, char *s2) (_uac_req.s_ouri.len<=0)?NULL:&_uac_req.s_ouri /* outbound uri */ ); - if(ret<0) + if(ret<0) { + if(tp!=NULL) + shm_free(tp); return -1; + } return 1; }

11 years, 8 months

git:master: docbook: uptdated wiki link in entities file

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2b97e81b281802283ebc665da6f9190f0a9705ab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b97e81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 23 11:58:17 2013 +0200 docbook: uptdated wiki link in entities file --- docbook/entities.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docbook/entities.xml b/docbook/entities.xml index e414d32..2498298 100644 --- a/docbook/entities.xml +++ b/docbook/entities.xml @@ -10,7 +10,7 @@ <!ENTITY kamailioname "Kamailio SIP Server Platform"> <!ENTITY kamailioconfig "kamailio.cfg"> -<!ENTITY kamwiki "http://www.kamailio.org/dokuwiki/"> +<!ENTITY kamwiki "http://www.kamailio.org/wiki/"> <!ENTITY kamwikilink "<ulink url='&kamwiki;'>&kamwiki;</ulink>"> <!ENTITY kamailiohome "http://www.kamailio.org/">

11 years, 8 months

git:master: uac: regenerated readme with new wiki link

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6835b9bc1c80035a603016cf8149afefbf535929 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6835b9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 23 11:59:09 2013 +0200 uac: regenerated readme with new wiki link --- modules/uac/README | 66 ++++++++++++++++++++++++++-------------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/modules/uac/README b/modules/uac/README index 408f536..d1f4e37 100644 --- a/modules/uac/README +++ b/modules/uac/README @@ -14,9 +14,9 @@ Ramona-Elena Modroiu <ramona(a)rosdev.ro> - Copyright © 2009-2010 asipto.com + Copyright � 2009-2010 asipto.com - Copyright © 2005 Voice Sistem + Copyright � 2005 Voice Sistem __________________________________________________________________ Table of Contents @@ -158,7 +158,7 @@ Chapter 1. Admin Guide * Authentication does not support qop auth-int, just qop auth; * CSeq is not increased during authentication - the response may be rejected. - * The “uac_replace_*” functions can only be run once on the same SIP + * The "uac_replace_*" functions can only be run once on the same SIP request. Try to save needed changes in a pseudovariable and apply them once. @@ -172,9 +172,9 @@ Chapter 1. Admin Guide The following modules must be loaded before this module: * TM - Transaction Module * RR - Record-Route Module, but only if restore mode for From: URI is - set to “auto”. + set to "auto". * Dialog Module, but only if restore mode for From: URI is set to - “auto” and you want uac_replace_from or uac_replace_to to store the + "auto" and you want uac_replace_from or uac_replace_to to store the values of the URIs as dialog variables. 2.2. External Libraries or Applications @@ -207,7 +207,7 @@ Chapter 1. Admin Guide Name of Record-Route header parameter that will be used to store an encoded version of the original FROM URI. - This parameter is optional, it's default value being “vsf”. + This parameter is optional, it's default value being "vsf". Example 1.1. Set rr_from_store_param parameter ... @@ -219,7 +219,7 @@ modparam("uac","rr_from_store_param","my_param") Name of Record-Route header parameter that will be used to store (encoded) the original TO URI. - This parameter is optional, it's default value being “vst”. + This parameter is optional, it's default value being "vst". Example 1.2. Set rr_to_store_param parameter ... @@ -230,16 +230,16 @@ modparam("uac","rr_to_store_param","my_param") There are 3 modes of restoring the original FROM URI and the original TO URI: - * “none” - no information about original URI is stored; restoration + * "none" - no information about original URI is stored; restoration is not possible. - * “manual” - all following replies will be restored, but not also the + * "manual" - all following replies will be restored, but not also the sequential requests - this must be manually updated based on original URI. - * “auto” - all sequential requests and replies will be automatically + * "auto" - all sequential requests and replies will be automatically updated based on stored original URI. For this option you have to - set “modparam("rr", "append_fromtag", 1)”. + set "modparam("rr", "append_fromtag", 1)". - This parameter is optional, it's default value being “auto”. + This parameter is optional, it's default value being "auto". Example 1.3. Set restore_mode parameter ... @@ -331,9 +331,9 @@ modparam("uac","credential","username:domain:password") This can be used if the realm upstream will be using is not known in advance. - If you define it, you also need to define “auth_username_avp” - (Section 3.10, “auth_username_avp (string)”) and “auth_username_avp” - (Section 3.11, “auth_password_avp (string)”). + If you define it, you also need to define "auth_username_avp" + (Section 3.10, "auth_username_avp (string)") and "auth_username_avp" + (Section 3.11, "auth_password_avp (string)"). Example 1.9. Set auth_realm_avp parameter ... @@ -345,9 +345,9 @@ modparam("uac","auth_realm_avp","$avp(i:10)") The definition of an AVP that might contain the username to be used to perform authentication. - If you define it, you also need to define “auth_realm_avp” - (Section 3.9, “auth_realm_avp (string)”) and “auth_username_avp” - (Section 3.11, “auth_password_avp (string)”). + If you define it, you also need to define "auth_realm_avp" + (Section 3.9, "auth_realm_avp (string)") and "auth_username_avp" + (Section 3.11, "auth_password_avp (string)"). Example 1.10. Set auth_username_avp parameter ... @@ -359,9 +359,9 @@ modparam("uac","auth_username_avp","$avp(i:11)") The definition of an AVP that might contain the password to be used to perform authentication. - If you define it, you also need to define “auth_password_avp” - (Section 3.11, “auth_password_avp (string)”) and “auth_username_avp” - (Section 3.11, “auth_password_avp (string)”). + If you define it, you also need to define "auth_password_avp" + (Section 3.11, "auth_password_avp (string)") and "auth_username_avp" + (Section 3.11, "auth_password_avp (string)"). Example 1.11. Set auth_password_avp parameter ... @@ -408,7 +408,7 @@ modparam("uac", "reg_retry_interval", 300) DB table name to fetch user profiles for registration. - This parameter is optional, it's default value being “uacreg”. + This parameter is optional, it's default value being "uacreg". Example 1.15. Set reg_db_table parameter ... @@ -440,7 +440,7 @@ modparam("uac", "reg_contact_addr", "192.168.1.2:5080") 4.9. uac_reg_lookup(uuid, dst) 4.10. uac_reg_request_to(user, mode) -4.1. uac_replace_from(display,uri) +4.1. uac_replace_from(display,uri) Replace in FROM header the display name and the URI part. @@ -478,7 +478,7 @@ uac_replace_from("","sip:robin@gotham.org"); uac_replace_from("",""); ... -4.2. uac_replace_from(uri) +4.2. uac_replace_from(uri) Replace in FROM header the URI part without altering the display name. @@ -491,7 +491,7 @@ uac_replace_from("",""); uac_replace_from("sip:batman@gotham.org"); ... -4.3. uac_restore_from() +4.3. uac_restore_from() This function will check if the FROM URI was modified and will use the information stored in header parameter to restore the original FROM URI @@ -504,7 +504,7 @@ uac_replace_from("sip:batman@gotham.org"); uac_restore_from(); ... -4.4. uac_replace_to(display,uri) +4.4. uac_replace_to(display,uri) Replace in TO header the display name and the URI part. @@ -524,7 +524,7 @@ uac_replace_to("","sip:robin@gotham.org"); uac_replace_to("",""); ... -4.5. uac_replace_to(uri) +4.5. uac_replace_to(uri) Replace in TO header the URI part without altering the display name. @@ -555,7 +555,7 @@ uac_replace_to("",""); uac_replace_to("sip:batman@gotham.org"); ... -4.6. uac_restore_to() +4.6. uac_restore_to() This function will check if the TO URI was modified and will use the information stored in header parameter to restore the original TO URI @@ -568,7 +568,7 @@ uac_replace_to("sip:batman@gotham.org"); uac_restore_to(); ... -4.7. uac_auth() +4.7. uac_auth() This function can be called only from failure route and will build the authentication response header and insert it into the request without @@ -581,7 +581,7 @@ uac_restore_to(); uac_auth(); ... -4.8. uac_req_send() +4.8. uac_req_send() This function sends a SIP message from the configuration file. The message is built out of $uac_req(...) pseudo-variable. @@ -598,7 +598,7 @@ $uac_req(turi)="sip:kamailio.org"; uac_req_send(); ... -4.9. uac_reg_lookup(uuid, dst) +4.9. uac_reg_lookup(uuid, dst) This function sets the PV dst to SIP URI that correspond to uuid in uac registations table. uuid and dst must be pseudo-variables. @@ -614,7 +614,7 @@ if(uac_reg_lookup("$rU", "$ru")) } ... -4.10. uac_reg_request_to(user, mode) +4.10. uac_reg_request_to(user, mode) This function can be used to send an authenticated request to a remote user in the uac registrations table. It sets the request-uri, dst-uri @@ -652,7 +652,7 @@ failure_route[REMOTE_AUTH] { * $uac_req(key) Exported pseudo-variables are documented at - http://www.kamailio.org/dokuwiki/. + http://www.kamailio.org/wiki/. 6. Remote Registration

11 years, 8 months

[tracker] Comment added: app_lua: added sr.xavp.get function (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#289 - app_lua: added sr.xavp.get function User who did this - Víctor Seva (linuxmaniac) ---------- I forgot to attach the patch :-/ I only push string and integer fields to the stack. ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=289#comment846 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.

11 years, 8 months

git:master: modules/sipt forgot to stage the documentation (pvars added)

by Torrey Searle

Module: sip-router Branch: master Commit: b57d14afeed443bd3ff847a455c1f07bdca7dd09 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b57d14a… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Tue Apr 23 10:39:01 2013 +0200 modules/sipt forgot to stage the documentation (pvars added) --- modules/sipt/doc/sipt_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sipt/doc/sipt_admin.xml b/modules/sipt/doc/sipt_admin.xml index 41864e9..dbcad85 100644 --- a/modules/sipt/doc/sipt_admin.xml +++ b/modules/sipt/doc/sipt_admin.xml @@ -80,7 +80,7 @@ sipt_set_calling($fU, 4, 0, 3); <section> <title><varname>$sipt_presentation</varname></title> <para> - Returns the value of the Address presentation restricted indicator contains in the + Returns the value of the Address presentation restricted indicator contained in the Calling Party Number header of the IAM message if it exists. Returns -1 if there isn't a Calling Party Number header. </para>

11 years, 8 months

git:master: modules/sipt refactor get functions into pvars

by Torrey Searle

Module: sip-router Branch: master Commit: 781b0a68cbf3a9b93bda0ebafb9ae64257c202d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=781b0a6… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Tue Apr 23 10:30:11 2013 +0200 modules/sipt refactor get functions into pvars return value of 0 in a function causes the script to exit, so pvars are used instead to safely get the values also getting screening and presentation information added --- modules/sipt/doc/sipt_admin.xml | 85 +++++++++++++++++++++++------- modules/sipt/sipt.c | 109 ++++++++++++++++++++++++++------------- modules/sipt/ss7.h | 2 + modules/sipt/ss7_parser.c | 22 ++++++++ 4 files changed, 163 insertions(+), 55 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=781…

11 years, 8 months

git:master: modules/sipt regenerate README with new api

by Torrey Searle

Module: sip-router Branch: master Commit: d02ebb2584d2e4f676a9f8c4e0f6095045de86db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d02ebb2… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Tue Apr 23 10:37:09 2013 +0200 modules/sipt regenerate README with new api --- modules/sipt/README | 112 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 81 insertions(+), 31 deletions(-) diff --git a/modules/sipt/README b/modules/sipt/README index e10f9d7..3a93928 100644 --- a/modules/sipt/README +++ b/modules/sipt/README @@ -18,19 +18,26 @@ Torrey Searle 3.1. sipt_destination(destination, hops, nai) 3.2. sipt_set_calling(origin, nai, presentation, screening) - 3.3. sipt_get_hop_counter() - 3.4. sipt_get_cpc() - 3.5. sipt_get_calling_party_nai() - 3.6. sipt_get_called_party_nai() + + 4. Exported pseudo-variables + + 4.1. $sipt_presentation + 4.2. $sipt_screening + 4.3. $sipt_hop_counter + 4.4. $sipt_cpc + 4.5. $sipt_calling_party_nai + 4.6. $sipt_called_party_nai List of Examples 1.1. sipt_destination(destination, hops, nai) usage 1.2. sipt_set_calling(origin, nai, presentation, screening) usage - 1.3. sipt_get_hop_counter() usage - 1.4. sipt_get_cpc() usage - 1.5. sipt_get_calling_party_nai() usage - 1.6. sipt_get_called_party_nai() usage + 1.3. sipt_presentation pseudo-variable usage + 1.4. sipt_screening pseudo-variable usage + 1.5. sipt_hop_counter pseudo-variable usage + 1.6. sipt_cpc pseudo-variable usage + 1.7. sipt_calling_party_nai pseudo-variable usage + 1.8. sipt_called_party_nai pseudo-variable usage Chapter 1. Admin Guide @@ -42,10 +49,15 @@ Chapter 1. Admin Guide 3.1. sipt_destination(destination, hops, nai) 3.2. sipt_set_calling(origin, nai, presentation, screening) - 3.3. sipt_get_hop_counter() - 3.4. sipt_get_cpc() - 3.5. sipt_get_calling_party_nai() - 3.6. sipt_get_called_party_nai() + + 4. Exported pseudo-variables + + 4.1. $sipt_presentation + 4.2. $sipt_screening + 4.3. $sipt_hop_counter + 4.4. $sipt_cpc + 4.5. $sipt_calling_party_nai + 4.6. $sipt_called_party_nai 1. Overview @@ -65,10 +77,6 @@ Chapter 1. Admin Guide 3.1. sipt_destination(destination, hops, nai) 3.2. sipt_set_calling(origin, nai, presentation, screening) - 3.3. sipt_get_hop_counter() - 3.4. sipt_get_cpc() - 3.5. sipt_get_calling_party_nai() - 3.6. sipt_get_called_party_nai() 3.1. sipt_destination(destination, hops, nai) @@ -99,15 +107,60 @@ sipt_destination($rU, 31, 4); sipt_set_calling($fU, 4, 0, 3); ... -3.3. sipt_get_hop_counter() +4. Exported pseudo-variables + + 4.1. $sipt_presentation + 4.2. $sipt_screening + 4.3. $sipt_hop_counter + 4.4. $sipt_cpc + 4.5. $sipt_calling_party_nai + 4.6. $sipt_called_party_nai + +4.1. $sipt_presentation + + Returns the value of the Address presentation restricted indicator + contained in the Calling Party Number header of the IAM message if it + exists. Returns -1 if there isn't a Calling Party Number header. + + Example 1.3. sipt_presentation pseudo-variable usage +... +# add privacy header if restriction is requested +if($sipt_presentation == 1) +{ + append_hf("Privacy: id\r\n"); + $fn = "Anonymous"; +} + +... + +4.2. $sipt_screening + + Returns the value of the Screening Indicator contained in the Calling + Party Number header of the IAM message if it exists. Returns -1 if + there isn't a Calling Party Number header. + + Example 1.4. sipt_screening pseudo-variable usage +... + +# remove P-Asserted-Identity header if the screening isn't verified +# or network provided +$avp(s:screening) = $sipt_screening; +if($avp(s:screening) != 1 && $avp(s:screening) != 3) +{ + remove_hf("P-Asserted-Id"); +} + +... + +4.3. $sipt_hop_counter Returns the value of the Hop Counter for the IAM message if it exists. Returns -1 if there isn't a hop counter. - Example 1.3. sipt_get_hop_counter() usage + Example 1.5. sipt_hop_counter pseudo-variable usage ... # get the hop counter and update the Max-Forwards header if it exists -$avp(s:hop) = sipt_get_hop_counter(); +$avp(s:hop) = $sipt_hop_counter; if($avp(s:hop) > 0) { remove_hf("Max-Forwards"); @@ -116,46 +169,43 @@ if($avp(s:hop) > 0) ... -3.4. sipt_get_cpc() +4.4. $sipt_cpc Returns the value of the Calling Party Category for the IAM message. Returns -1 if there is a parsing error. - Example 1.4. sipt_get_cpc() usage + Example 1.6. sipt_cpc pseudo-variable usage ... # get the Cpc code and set put it in a custom sip header -$avp(s:cpc) = sipt_get_cpc(); -append_hf("X-CPC: $avp(s:cpc)\r\n"); +append_hf("X-CPC: $sipt_cpc\r\n"); ... -3.5. sipt_get_calling_party_nai() +4.5. $sipt_calling_party_nai Returns the value of the Nature of Address Indicator of the Calling Party for the IAM message. Returns -1 if there is a parsing error or if the Calling Party Number is not present. - Example 1.5. sipt_get_calling_party_nai() usage + Example 1.7. sipt_calling_party_nai pseudo-variable usage ... # get the Calling Nai and add country code if national -$avp(s:from_nai) = sipt_get_calling_party_nai(); -if($avp(s:from_nai) == 3) +if($sipt_calling_party_nai == 3) { $fU = "32" + "$fU"; } ... -3.6. sipt_get_called_party_nai() +4.6. $sipt_called_party_nai Returns the value of the Nature of Address Indicator of the Called Party for the IAM message. Returns -1 if there is a parsing error. - Example 1.6. sipt_get_called_party_nai() usage + Example 1.8. sipt_called_party_nai pseudo-variable usage ... # get the Called Nai and add country code if national -$avp(s:to_nai) = sipt_get_called_party_nai(); -if($avp(s:to_nai) == 3) +if($sipt_called_party_nai == 3) { $rU = "32" + "$rU"; }

11 years, 8 months

git:tmp/tm_async_reply_support: Merge branch 'master' into tmp/ tm_async_reply_support

by Richard Good

Module: sip-router Branch: tmp/tm_async_reply_support Commit: dd0fb36831c57fd2ee239344d086c74c412b3bb9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd0fb36… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Apr 23 09:50:05 2013 +0200 Merge branch 'master' into tmp/tm_async_reply_support tmp/tm_async_reply_support: Merging all latest master commits into tm_async_reply_support branch to ensure we are up to date and not conflicting ---

11 years, 8 months

[tracker] Comment added: app_lua: added sr.xavp.get_keys function

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#288 - app_lua: added sr.xavp.get_keys function User who did this - Daniel-Constantin Mierla (miconda) ---------- I suggest to make the list of xavp names null terminated from the core. Because you use two times pkg malloc just to store the same value, ending up in using twice memory at the same moment. There is no problem to allocate len+1 from core and build the str list with such values. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=288#comment845 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.

11 years, 8 months

← Newer
1
...
10
11
12
13
14
15
16
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013