sr-dev July 2014

sr-dev@lists.kamailio.org

25 participants
141 discussions

git:master: uac: added commands to enable/ disable records in remote registration table
by Daniel-Constantin Mierla 21 Jul '14

21 Jul '14

Module: sip-router Branch: master Commit: dd1ca987775be186761f8c83ea7ee9584bbebc96 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd1ca98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 21 17:24:28 2014 +0200 uac: added commands to enable/disable records in remote registration table - introduced a mutex per slot in memory hash table to avoid races on updating the … [View More]fields of registration records --- modules/uac/uac_reg.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 173 insertions(+), 3 deletions(-) diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index 595f49a..da3fdd0 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -30,6 +30,7 @@ #include "../../ut.h" #include "../../trim.h" #include "../../hashes.h" +#include "../../locking.h" #include "../../parser/parse_uri.h" #include "../../parser/parse_from.h" #include "../../parser/parse_to.h" @@ -81,6 +82,7 @@ typedef struct _reg_entry unsigned int usize; reg_item_t *byuser; reg_item_t *byuuid; + gen_lock_t lock; } reg_entry_t; typedef struct _reg_ht @@ -164,6 +166,8 @@ int uac_reg_init_db(void) */ int uac_reg_init_ht(unsigned int sz) { + int i; + _reg_htable = (reg_ht_t*)shm_malloc(sizeof(reg_ht_t)); if(_reg_htable==NULL) { @@ -182,6 +186,22 @@ int uac_reg_init_ht(unsigned int sz) return -1; } memset(_reg_htable->entries, 0, _reg_htable->htsize*sizeof(reg_entry_t)); + for(i=0; i<_reg_htable->htsize; i++) + { + if(lock_init(&_reg_htable->entries[i].lock)==0) + { + LM_ERR("cannot initalize lock[%d] n", i); + i--; + while(i>=0) + { + lock_destroy(&_reg_htable->entries[i].lock); + i--; + } + shm_free(_reg_htable->entries); + shm_free(_reg_htable); + return -1; + } + } return 0; } @@ -202,6 +222,7 @@ int uac_reg_free_ht(void) } for(i=0; i<_reg_htable->htsize; i++) { + lock_get(&_reg_htable->entries[i].lock); /* free entries */ it = _reg_htable->entries[i].byuuid; while(it) @@ -218,6 +239,7 @@ int uac_reg_free_ht(void) shm_free(it0->r); shm_free(it0); } + lock_destroy(&_reg_htable->entries[i].lock); } shm_free(_reg_htable->entries); shm_free(_reg_htable); @@ -225,6 +247,48 @@ int uac_reg_free_ht(void) return 0; } +/** + * + */ +int uac_reg_reset_ht(void) +{ + int i; + reg_item_t *it = NULL; + reg_item_t *it0 = NULL; + + if(_reg_htable==NULL) + { + LM_DBG("no hash table\n"); + return -1; + } + for(i=0; i<_reg_htable->htsize; i++) + { + lock_get(&_reg_htable->entries[i].lock); + /* free entries */ + it = _reg_htable->entries[i].byuuid; + while(it) + { + it0 = it; + it = it->next; + shm_free(it0); + } + _reg_htable->entries[i].byuuid = NULL; + _reg_htable->entries[i].isize=0; + it = _reg_htable->entries[i].byuser; + while(it) + { + it0 = it; + it = it->next; + shm_free(it0->r); + shm_free(it0); + } + _reg_htable->entries[i].byuser = NULL; + _reg_htable->entries[i].usize = 0; + lock_release(&_reg_htable->entries[i].lock); + } + return 0; +} + #define reg_compute_hash(_s) get_hash1_raw((_s)->s,(_s)->len) #define reg_get_entry(_h,_size) ((_h)&((_size)-1)) @@ -251,9 +315,11 @@ int reg_ht_add_byuuid(reg_uac_t *reg) memset(ri, 0, sizeof(reg_item_t)); slot = reg_get_entry(reg->h_uuid, _reg_htable->htsize); ri->r = reg; + lock_get(&_reg_htable->entries[slot].lock); ri->next = _reg_htable->entries[slot].byuuid; _reg_htable->entries[slot].byuuid = ri; _reg_htable->entries[slot].isize++; + lock_release(&_reg_htable->entries[slot].lock); return 0; } @@ -280,9 +346,11 @@ int reg_ht_add_byuser(reg_uac_t *reg) memset(ri, 0, sizeof(reg_item_t)); slot = reg_get_entry(reg->h_user, _reg_htable->htsize); ri->r = reg; + lock_get(&_reg_htable->entries[slot].lock); ri->next = _reg_htable->entries[slot].byuser; _reg_htable->entries[slot].byuser = ri; _reg_htable->entries[slot].usize++; + lock_release(&_reg_htable->entries[slot].lock); return 0; } @@ -770,7 +838,7 @@ void uac_reg_timer(unsigned int ticks) tn = time(NULL); for(i=0; i<_reg_htable->htsize; i++) { - /* free entries */ + /* walk through entries */ it = _reg_htable->entries[i].byuuid; while(it) { @@ -1094,7 +1162,8 @@ static void rpc_uac_reg_dump(rpc_t* rpc, void* ctx) for(i=0; i<_reg_htable->htsize; i++) { - /* free entries */ + lock_get(&_reg_htable->entries[i].lock); + /* walk through entries */ reg = _reg_htable->entries[i].byuuid; while(reg) { @@ -1121,11 +1190,13 @@ static void rpc_uac_reg_dump(rpc_t* rpc, void* ctx) "timer_expires", (int)reg->r->timer_expires )<0) { + lock_release(&_reg_htable->entries[i].lock); rpc->fault(ctx, 500, "Internal error adding item"); return; } reg = reg->next; } + lock_release(&_reg_htable->entries[i].lock); } } @@ -1167,7 +1238,8 @@ static void rpc_uac_reg_info(rpc_t* rpc, void* ctx) for(i=0; i<_reg_htable->htsize; i++) { - /* free entries */ + /* walk through entries */ + lock_get(&_reg_htable->entries[i].lock); reg = _reg_htable->entries[i].byuuid; while(reg) { @@ -1180,6 +1252,7 @@ static void rpc_uac_reg_info(rpc_t* rpc, void* ctx) } else if(attr.len==13 && strncmp(attr.s, "auth_username", 13)==0) { rval = &reg->r->auth_username; } else { + lock_release(&_reg_htable->entries[i].lock); LM_ERR("usupoorted filter attribute %.*s\n", attr.len, attr.s); rpc->fault(ctx, 500, "Unsupported Filter Attribtue"); return; @@ -1209,6 +1282,7 @@ static void rpc_uac_reg_info(rpc_t* rpc, void* ctx) "timer_expires", (int)reg->r->timer_expires )<0) { + lock_release(&_reg_htable->entries[i].lock); rpc->fault(ctx, 500, "Internal error adding item"); return; } @@ -1216,12 +1290,108 @@ static void rpc_uac_reg_info(rpc_t* rpc, void* ctx) } reg = reg->next; } + lock_release(&_reg_htable->entries[i].lock); + } +} + + +static void rpc_uac_reg_update_flag(rpc_t* rpc, void* ctx, int mode, int fval) +{ + int i; + reg_item_t *reg = NULL; + void* th; + str none = {"none", 4}; + time_t tn; + str attr = {0}; + str val = {0}; + str *rval; + + if(_reg_htable==NULL) + { + rpc->fault(ctx, 500, "Not enabled"); + return; + } + + if(rpc->scan(ctx, "S.S", &attr, &group, &val)<2) + { + rpc->fault(ctx, 500, "Invalid Parameters"); + return; + } + if(attr.len<=0 || attr.s==NULL || val.len<=0 || val.s==NULL) + { + LM_ERR("bad parameter values\n"); + rpc->fault(ctx, 500, "Invalid Parameter Values"); + return; + } + + tn = time(NULL); + + for(i=0; i<_reg_htable->htsize; i++) + { + lock_get(&_reg_htable->entries[i].lock); + /* walk through entries */ + reg = _reg_htable->entries[i].byuuid; + while(reg) + { + if(attr.len==10 && strncmp(attr.s, "l_username", 10)==0) { + rval = &reg->r->l_username; + } else if(attr.len==10 && strncmp(attr.s, "r_username", 10)==0) { + rval = &reg->r->r_username; + } else if(attr.len==6 && strncmp(attr.s, "l_uuid", 6)==0) { + rval = &reg->r->l_uuid; + } else if(attr.len==13 && strncmp(attr.s, "auth_username", 13)==0) { + rval = &reg->r->auth_username; + } else { + lock_release(&_reg_htable->entries[i].lock); + LM_ERR("usupoorted filter attribute %.*s\n", attr.len, attr.s); + rpc->fault(ctx, 500, "Unsupported Filter Attribtue"); + return; + } + + if(rval->len==val.len && strncmp(val.s, rval->s, val.len)==0) { + /* found */ + if(mode==1) { + reg->r->flags |= fval; + } else { + reg->r->flags &= ~fval; + } + reg->r->timer_expires = time(NULL) + 1; + lock_release(&_reg_htable->entries[i].lock); + return; + } + reg = reg->next; + } + lock_release(&_reg_htable->entries[i].lock); } } +static const char* rpc_uac_reg_enable_doc[2] = { + "Enable registration for a particular record.", + 0 +}; + +static void rpc_uac_reg_enable(rpc_t* rpc, void* ctx) +{ + rpc_uac_reg_update_flag(rpc, ctx, 1, UAC_REG_DISABLED); +} + +static const char* rpc_uac_reg_disable_doc[2] = { + "Disable registration for a particular record.", + 0 +}; + +static void rpc_uac_reg_disable(rpc_t* rpc, void* ctx) +{ + rpc_uac_reg_update_flag(rpc, ctx, 0, UAC_REG_DISABLED); +} + + + rpc_export_t uac_reg_rpc[] = { {"uac.reg_dump", rpc_uac_reg_dump, rpc_uac_reg_dump_doc, 0}, {"uac.reg_info", rpc_uac_reg_info, rpc_uac_reg_info_doc, 0}, + {"uac.reg_enable", rpc_uac_reg_enable, rpc_uac_reg_enable_doc, 0}, + {"uac.reg_disable", rpc_uac_reg_disable, rpc_uac_reg_disable_doc, 0}, {0, 0, 0, 0} }; [View Less]

2 1

RTPEngine in reINVITE/on-hold use case
by Waite, Hugh 21 Jul '14

21 Jul '14

Hi, I am using rtpengine to convert SRTP to RTP for audio and video and I am also doing this for reINVITEs. At the moment I am using Chrome on the SRTP side and Linphone on the RTP side. So far, Linphone has been the most stable for sending and receiving VP8 video calls. Linphone does not do ICE, but Chrome does. I need to force all traffic through rtpengine (to encrypt/decrypt) so I use the "ICE=force" flag in both directions. I've put the SDP content of an on-hold scenario at the end of … [View More]this email. When Linphone puts the call on hold, it sets the connection to "c=0.0.0.0" and the direction to "a=sendonly" in the reINVITE. However, it does keep the same valid port numbers on the m= lines. RTPEngine processes this and sends SDP to Chrome that has "c=0.0.0.0", "a=ice-lite" and "a=inactive". The port numbers are set to 0 (disabled/rejected) Chrome does some other interesting stuff with that, so I am investigating. RFC5245 (ICE) §9 is all about subsequent offer-answer exchanges. In this 'on-hold' scenario, I don't believe there is any need to restart the ICE processing. >From §9.1.1.1 These rules imply that setting the IP address in the c line to 0.0.0.0 will cause an ICE restart. Consequently, ICE implementations MUST NOT utilize this mechanism for call hold, and instead MUST use a=inactive and a=sendonly as described in [RFC3264<http://tools.ietf.org/html/rfc3264>]. In a lite implementation, I think that the "a=ice-ufrag" and "a=ice-pwd" attributes need to be included (with the same values) and also the currently selected (active) candidate §9.1.1.1 & §9.1.3.2. RTPEngine appears to have disabled the two media streams, rather than putting them on hold. Is this a deliberate choice or the best choice given the multiple possibilities of client implementations? And can this behaviour be improved? If the call is taken off-hold later, I would prefer not to have to do the full ICE restart, including TURN, DTLS handshakes etc. etc. if it can be avoided. Regards, Hugh This is what Linphone sent to rtpengine to put the call on hold. v=0 o=447707319033 2969 189 IN IP4 10.X.X.X s=Talk c=IN IP4 0.0.0.0 t=0 0 m=audio 7078 RTP/AVP 124 111 110 0 8 101 a=rtpmap:124 opus/48000 a=fmtp:124 useinbandfec=1; usedtx=1 a=rtpmap:111 speex/16000 a=fmtp:111 vbr=on a=rtpmap:110 speex/8000 a=fmtp:110 vbr=on a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 a=sendonly m=video 9078 RTP/AVP 103 a=rtpmap:103 VP8/90000 a=sendonly This is what rtpengine sent to Chrome v=0 o=447707319033 2969 189 IN IP4 10.X.X.X s=Talk c=IN IP4 0.0.0.0 t=0 0 a=ice-lite m=audio 0 RTP/SAVPF 124 111 110 0 8 101 a=rtpmap:124 opus/48000 a=fmtp:124 useinbandfec=1; usedtx=1 a=rtpmap:111 speex/16000 a=fmtp:111 vbr=on a=rtpmap:110 speex/8000 a=fmtp:110 vbr=on a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 a=inactive m=video 0 RTP/SAVPF 103 a=rtpmap:103 VP8/90000 a=inactive This is what Chrome sent back - note the ICE syntax errors! v=0 o=- 5839956538493318716 3 IN IP4 127.0.0.1 s=- t=0 0 a=msid-semantic: WMS FS1XDFSCVuztEO87Lm7NEzuFX2EVnOYDP8VS m=audio 0 RTP/SAVPF 0 8 101 c=IN IP4 0.0.0.0 a=rtcp:1 IN IP4 0.0.0.0 a=ice-ufrag: a=ice-pwd: a=mid:audio a=inactive a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:101 telephone-event/8000 a=ssrc:1220950669 cname:txfWFsmZxl5fElCV a=ssrc:1220950669 msid:FS1XDFSCVuztEO87Lm7NEzuFX2EVnOYDP8VS 6bcb6a56-c38d-474a-9e1b-372dc4206754 a=ssrc:1220950669 mslabel:FS1XDFSCVuztEO87Lm7NEzuFX2EVnOYDP8VS a=ssrc:1220950669 label:6bcb6a56-c38d-474a-9e1b-372dc4206754 m=video 0 RTP/SAVPF 103 c=IN IP4 0.0.0.0 a=rtcp:1 IN IP4 0.0.0.0 a=ice-ufrag: a=ice-pwd: a=mid:video a=inactive a=rtpmap:103 VP8/90000 a=ssrc:2854598716 cname:txfWFsmZxl5fElCV a=ssrc:2854598716 msid:FS1XDFSCVuztEO87Lm7NEzuFX2EVnOYDP8VS 2f5be791-cf7a-48cf-ac4b-8c060f606f78 a=ssrc:2854598716 mslabel:FS1XDFSCVuztEO87Lm7NEzuFX2EVnOYDP8VS a=ssrc:2854598716 label:2f5be791-cf7a-48cf-ac4b-8c060f606f78 And this was sent back to Linphone. Linphone didn't like it and cleared the call down. v=0 o=- 7461781248465050568 3 IN IP4 127.0.0.1 s=- t=0 0 a=msid-semantic: WMS iOUm0bgDPsb5B2riIq3JB1X3xkpkPhPgSRFc a=ice-lite m=audio 0 RTP/AVP 0 8 101 c=IN IP4 0.0.0.0 a=mid:audio a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:101 telephone-event/8000 a=ssrc:974659196 cname:YOhAbnOYADFFMGYH a=ssrc:974659196 msid:iOUm0bgDPsb5B2riIq3JB1X3xkpkPhPgSRFc ad66954d-2fad-4f30-9169-684b95f33abc a=ssrc:974659196 mslabel:iOUm0bgDPsb5B2riIq3JB1X3xkpkPhPgSRFc a=ssrc:974659196 label:ad66954d-2fad-4f30-9169-684b95f33abc a=inactive m=video 0 RTP/AVP 103 c=IN IP4 0.0.0.0 a=mid:video a=rtpmap:103 VP8/90000 a=ssrc:2605136941 cname:YOhAbnOYADFFMGYH a=ssrc:2605136941 msid:iOUm0bgDPsb5B2riIq3JB1X3xkpkPhPgSRFc c759c13f-b992-402c-bf57-00046d1a1008 a=ssrc:2605136941 mslabel:iOUm0bgDPsb5B2riIq3JB1X3xkpkPhPgSRFc a=ssrc:2605136941 label:c759c13f-b992-402c-bf57-00046d1a1008 a=inactive ________________________________ This e-mail and any attachment is for authorised use by the intended recipient(s) only. It may contain proprietary material, confidential information and/or be subject to legal privilege. It should not be copied, disclosed to, retained or used by, any other party. If you are not an intended recipient then please promptly delete this e-mail and any attachment and all copies and inform the sender. Thank you for understanding. [View Less]

2 3

PARAM_STR vs STR_PARAM
by Alekzander Spiridonov 21 Jul '14

21 Jul '14

Hi list, While going through mod_init's and finding things like rtpp_table_name.len = strlen(rtpp_table_name.s); I became curious if using of deprecated STR_PARAM in new modules is done on purpose. Why not using PARAM_STR for string module parameters? Quote from sr_module.h: #define PARAM_STRING (1U<<0) /**< String (char *) parameter type */ #define PARAM_STR (1U<<2) /**< struct str parameter type */ #define STR_PARAM PARAM_STRING P.S.: That's not only about … [View More]

2 7

git:master: uac: new rpc command to retrieve information for one registration record
by Daniel-Constantin Mierla 21 Jul '14

21 Jul '14

Module: sip-router Branch: master Commit: 529ebb934208160328a439b5048e9418e63e3e3c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=529ebb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 21 13:17:32 2014 +0200 uac: new rpc command to retrieve information for one registration record - uac.reg_info attr val - attr can be l_uuid, l_username, r_username, auth_username --- … [View More]modules/uac/uac_reg.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index 76ff9e6..595f49a 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -1129,8 +1129,99 @@ static void rpc_uac_reg_dump(rpc_t* rpc, void* ctx) } } +static const char* rpc_uac_reg_info_doc[2] = { + "Return the details of registration for a particular record.", + 0 +}; + +static void rpc_uac_reg_info(rpc_t* rpc, void* ctx) +{ + int i; + reg_item_t *reg = NULL; + void* th; + str none = {"none", 4}; + time_t tn; + str attr = {0}; + str val = {0}; + str *rval; + + if(_reg_htable==NULL) + { + rpc->fault(ctx, 500, "Not enabled"); + return; + } + + if(rpc->scan(ctx, "S.S", &attr, &group, &val)<2) + { + rpc->fault(ctx, 500, "Invalid Parameters"); + return; + } + if(attr.len<=0 || attr.s==NULL || val.len<=0 || val.s==NULL) + { + LM_ERR("bad parameter values\n"); + rpc->fault(ctx, 500, "Invalid Parameter Values"); + return; + } + + tn = time(NULL); + + for(i=0; i<_reg_htable->htsize; i++) + { + /* free entries */ + reg = _reg_htable->entries[i].byuuid; + while(reg) + { + if(attr.len==10 && strncmp(attr.s, "l_username", 10)==0) { + rval = &reg->r->l_username; + } else if(attr.len==10 && strncmp(attr.s, "r_username", 10)==0) { + rval = &reg->r->r_username; + } else if(attr.len==6 && strncmp(attr.s, "l_uuid", 6)==0) { + rval = &reg->r->l_uuid; + } else if(attr.len==13 && strncmp(attr.s, "auth_username", 13)==0) { + rval = &reg->r->auth_username; + } else { + LM_ERR("usupoorted filter attribute %.*s\n", attr.len, attr.s); + rpc->fault(ctx, 500, "Unsupported Filter Attribtue"); + return; + } + + if(rval->len==val.len && strncmp(val.s, rval->s, val.len)==0) { + /* add entry node */ + if (rpc->add(ctx, "{", &th) < 0) + { + rpc->fault(ctx, 500, "Internal error creating rpc"); + return; + } + if(rpc->struct_add(th, "SSSSSSSSSdddd", + "l_uuid", &reg->r->l_uuid, + "l_username", &reg->r->l_username, + "l_domain", &reg->r->l_domain, + "r_username", &reg->r->r_username, + "r_domain", &reg->r->r_domain, + "realm", &reg->r->realm, + "auth_username", &reg->r->auth_username, + "auth_password", &reg->r->auth_password, + "auth_proxy", (reg->r->auth_proxy.len)? + &reg->r->auth_proxy:&none, + "expires", (int)reg->r->expires, + "flags", (int)reg->r->flags, + "diff_expires", (int)(reg->r->timer_expires - tn), + "timer_expires", (int)reg->r->timer_expires + )<0) + { + rpc->fault(ctx, 500, "Internal error adding item"); + return; + } + return; + } + reg = reg->next; + } + } +} + rpc_export_t uac_reg_rpc[] = { {"uac.reg_dump", rpc_uac_reg_dump, rpc_uac_reg_dump_doc, 0}, + {"uac.reg_info", rpc_uac_reg_info, rpc_uac_reg_info_doc, 0}, {0, 0, 0, 0} }; [View Less]

2 2

git:master: uac: documented the new rpc command uac.reg_info
by Daniel-Constantin Mierla 21 Jul '14

21 Jul '14

Module: sip-router Branch: master Commit: 54d7dcb7574589a831b1561f5ec93a7d9a572459 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54d7dcb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 21 13:25:38 2014 +0200 uac: documented the new rpc command uac.reg_info --- modules/uac/README | 21 +++++++++++++++++++-- modules/uac/doc/uac_admin.xml | 22 +++++++++++++… [View More]+++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/modules/uac/README b/modules/uac/README index ac635c7..6bd44b2 100644 --- a/modules/uac/README +++ b/modules/uac/README @@ -65,6 +65,7 @@ Ramona-Elena Modroiu 6. RPC Commands 6.1. uac.reg_dump + 6.2. uac.reg_info 7. Remote Registration @@ -97,7 +98,8 @@ Ramona-Elena Modroiu 1.25. uac_reg_lookup usage 1.26. uac_reg_request_to usage 1.27. uac.reg_dump usage - 1.28. lookup remote registrations usage + 1.28. uac.reg_info usage + 1.29. lookup remote registrations usage Chapter 1. Admin Guide @@ -145,6 +147,7 @@ Chapter 1. Admin Guide 6. RPC Commands 6.1. uac.reg_dump + 6.2. uac.reg_info 7. Remote Registration @@ -677,6 +680,7 @@ failure_route[REMOTE_AUTH] { 6. RPC Commands 6.1. uac.reg_dump + 6.2. uac.reg_info 6.1. uac.reg_dump @@ -687,6 +691,19 @@ failure_route[REMOTE_AUTH] { kamcmd uac.reg_dump ... +6.2. uac.reg_info + + Return the details of a remote registration record based on a filter. + The command has two parameter: attribute and value. The attribute can + be: l_uuid, l_username, r_username or auth_username. The value is what + should be matcheg against the value of the attribute in the remote + registration record. + + Example 1.28. uac.reg_info usage +... + kamcmd uac.reg_info l_uuid account123 +... + 7. Remote Registration The module can register contact addresses to remote REGISTRAR servers. @@ -720,7 +737,7 @@ failure_route[REMOTE_AUTH] { if the call is coming from a remote SIP provider and can change the R-URI to local username@domain. Afterwards you can run location lookup. - Example 1.28. lookup remote registrations usage + Example 1.29. lookup remote registrations usage ... if(uac_reg_lookup("$rU", "$ru")) { xlog("request from a remote SIP provider [$ou => $ru]\n"); diff --git a/modules/uac/doc/uac_admin.xml b/modules/uac/doc/uac_admin.xml index b312f5c..a579255 100644 --- a/modules/uac/doc/uac_admin.xml +++ b/modules/uac/doc/uac_admin.xml @@ -815,6 +815,28 @@ failure_route[REMOTE_AUTH] { </example> </section> + <section id="uac.r.uac.reg_info"> + <title> + <function moreinfo="none">uac.reg_info</function> + </title> + <para> + Return the details of a remote registration record based on + a filter. The command has two parameter: attribute and value. + The attribute can be: l_uuid, l_username, r_username or auth_username. + The value is what should be matcheg against the value of the attribute + in the remote registration record. + </para> + <example> + <title><function>uac.reg_info</function> usage</title> + <programlisting format="linespecific"> +... + kamcmd uac.reg_info l_uuid account123 +... + </programlisting> + </example> + + </section> + </section> <section> [View Less]

1 0

git:master: uac: refreshed the readme file
by Daniel-Constantin Mierla 21 Jul '14

21 Jul '14

Module: sip-router Branch: master Commit: eb29edeea30603ebc57ed1771058fc10aee76ce2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb29ede… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 21 13:22:45 2014 +0200 uac: refreshed the readme file --- modules/uac/README | 102 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 62 insertions(+), 40 deletions(-… [View More]) diff --git a/modules/uac/README b/modules/uac/README index fc3846d..ac635c7 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 @@ -61,8 +61,12 @@ Ramona-Elena Modroiu 4.9. uac_reg_lookup(uuid, dst) 4.10. uac_reg_request_to(user, mode) - 5. Exported pseudo-variables - 6. Remote Registration + 5. Pseudo Variables + 6. RPC Commands + + 6.1. uac.reg_dump + + 7. Remote Registration List of Examples @@ -92,7 +96,8 @@ Ramona-Elena Modroiu 1.24. uac_req_send usage 1.25. uac_reg_lookup usage 1.26. uac_reg_request_to usage - 1.27. lookup remote registrations usage + 1.27. uac.reg_dump usage + 1.28. lookup remote registrations usage Chapter 1. Admin Guide @@ -136,8 +141,12 @@ Chapter 1. Admin Guide 4.9. uac_reg_lookup(uuid, dst) 4.10. uac_reg_request_to(user, mode) - 5. Exported pseudo-variables - 6. Remote Registration + 5. Pseudo Variables + 6. RPC Commands + + 6.1. uac.reg_dump + + 7. Remote Registration 1. Overview @@ -158,7 +167,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 +181,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 +216,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 +228,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 +239,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 +340,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 +354,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 +368,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 +417,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 +449,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. @@ -483,7 +492,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. @@ -496,7 +505,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 @@ -509,7 +518,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. @@ -534,7 +543,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. @@ -565,7 +574,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 @@ -578,7 +587,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 @@ -591,7 +600,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. @@ -609,7 +618,7 @@ $uac_req(callid)=$(mb{s.md5}); 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. @@ -625,7 +634,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 @@ -658,14 +667,27 @@ failure_route[REMOTE_AUTH] { } ... -5. Exported pseudo-variables +5. Pseudo Variables * $uac_req(key) Exported pseudo-variables are documented at http://www.kamailio.org/wiki/. -6. Remote Registration +6. RPC Commands + + 6.1. uac.reg_dump + +6.1. uac.reg_dump + + Dump the content of remote registration table from memory. + + Example 1.27. uac.reg_dump usage +... + kamcmd uac.reg_dump +... + +7. Remote Registration The module can register contact addresses to remote REGISTRAR servers. You have to add records to uacreg table. The table stores following @@ -698,7 +720,7 @@ failure_route[REMOTE_AUTH] { if the call is coming from a remote SIP provider and can change the R-URI to local username@domain. Afterwards you can run location lookup. - Example 1.27. lookup remote registrations usage + Example 1.28. lookup remote registrations usage ... if(uac_reg_lookup("$rU", "$ru")) { xlog("request from a remote SIP provider [$ou => $ru]\n"); [View Less]

1 0

git:master: uac: documented old uac.reg_dump rpc command
by Daniel-Constantin Mierla 21 Jul '14

21 Jul '14

Module: sip-router Branch: master Commit: 6173c75eb967a20bb25bb0d71e464415f6488156 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6173c75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 21 13:22:20 2014 +0200 uac: documented old uac.reg_dump rpc command --- modules/uac/doc/uac_admin.xml | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) … [View More]

1 0

git:master: corex: new function send_data(uri, data)
by Daniel-Constantin Mierla 21 Jul '14

21 Jul '14

Module: sip-router Branch: master Commit: f4c26ffb8e0aaf05def0adc64bdcf07e8173c984 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4c26ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 21 12:32:30 2014 +0200 corex: new function send_data(uri, data) - send arbitrary formated data to uri - uri param has to be a valid sip uri - both parameters can include pseudo-variables … [View More]--- modules/corex/corex_lib.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ modules/corex/corex_lib.h | 1 + modules/corex/corex_mod.c | 22 +++++++++++++ 3 files changed, 98 insertions(+), 0 deletions(-) diff --git a/modules/corex/corex_lib.c b/modules/corex/corex_lib.c index 23c9a8c..dcbe550 100644 --- a/modules/corex/corex_lib.c +++ b/modules/corex/corex_lib.c @@ -302,3 +302,78 @@ int corex_send(sip_msg_t *msg, gparam_t *pu, enum sip_protos proto) error: return ret; } + +/** + * + */ +int corex_send_data(str *puri, str *pdata) +{ + struct dest_info dst; + sip_uri_t next_hop; + int ret = 0; + char proto; + + if(parse_uri(puri->s, puri->len, &next_hop)<0) + { + LM_ERR("bad dst sip uri <%.*s>\n", puri->len, puri->s); + return -1; + } + + init_dest_info(&dst); + LM_DBG("sending data to sip uri <%.*s>\n", puri->len, puri->s); + proto = next_hop.proto; + if(sip_hostport2su(&dst.to, &next_hop.host, next_hop.port_no, + &proto)!=0) { + LM_ERR("failed to resolve [%.*s]\n", next_hop.host.len, + ZSW(next_hop.host.s)); + return -1; + } + dst.proto = proto; + if(dst.proto==PROTO_NONE) dst.proto = PROTO_UDP; + + if (dst.proto == PROTO_UDP) + { + dst.send_sock=get_send_socket(0, &dst.to, PROTO_UDP); + if (dst.send_sock!=0) { + ret=udp_send(&dst, pdata->s, pdata->len); + } else { + LM_ERR("no socket for dst sip uri <%.*s>\n", puri->len, puri->s); + ret=-1; + } + } +#ifdef USE_TCP + else if(dst.proto == PROTO_TCP) { + /*tcp*/ + dst.id=0; + ret=tcp_send(&dst, 0, pdata->s, pdata->len); + } +#endif +#ifdef USE_TLS + else if(dst.proto == PROTO_TLS) { + /*tls*/ + dst.id=0; + ret=tcp_send(&dst, 0, pdata->s, pdata->len); + } +#endif +#ifdef USE_SCTP + else if(dst.proto == PROTO_SCTP) { + /*sctp*/ + dst.send_sock=get_send_socket(0, &dst.to, PROTO_SCTP); + if (dst.send_sock!=0) { + ret=sctp_core_msg_send(&dst, pdata->s, pdata->len); + } else { + LM_ERR("no socket for dst sip uri <%.*s>\n", puri->len, puri->s); + ret=-1; + } + } +#endif + else { + LM_ERR("unknown proto [%d] for dst sip uri <%.*s>\n", + dst.proto, puri->len, puri->s); + ret=-1; + } + + if (ret>=0) ret=1; + + return ret; +} diff --git a/modules/corex/corex_lib.h b/modules/corex/corex_lib.h index 433e28a..5f2f872 100644 --- a/modules/corex/corex_lib.h +++ b/modules/corex/corex_lib.h @@ -26,6 +26,7 @@ int corex_append_branch(sip_msg_t *msg, gparam_t *pu, gparam_t *pq); int corex_send(sip_msg_t *msg, gparam_t *pu, enum sip_protos proto); +int corex_send_data(str *puri, str *pdata); int corex_add_alias_subdomains(char* aliasval); diff --git a/modules/corex/corex_mod.c b/modules/corex/corex_mod.c index 8d62498..5cd4aec 100644 --- a/modules/corex/corex_mod.c +++ b/modules/corex/corex_mod.c @@ -37,6 +37,7 @@ MODULE_VERSION static int w_append_branch(sip_msg_t *msg, char *su, char *sq); static int w_send(sip_msg_t *msg, char *su, char *sq); static int w_send_tcp(sip_msg_t *msg, char *su, char *sq); +static int w_send_data(sip_msg_t *msg, char *suri, char *sdata); int corex_alias_subdomains_param(modparam_t type, void *val); @@ -66,6 +67,8 @@ static cmd_export_t cmds[]={ 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_tcp", (cmd_function)w_send_tcp, 1, fixup_spve_null, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"send_data", (cmd_function)w_send_data, 2, fixup_spve_spve, + 0, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} @@ -157,6 +160,25 @@ static int w_send_tcp(sip_msg_t *msg, char *su, char *sq) return 1; } +static int w_send_data(sip_msg_t *msg, char *suri, char *sdata) +{ + str uri; + str data; + + if (fixup_get_svalue(msg, (gparam_t*)suri, &uri)) + { + LM_ERR("cannot get the destination parameter\n"); + return -1; + } + if (fixup_get_svalue(msg, (gparam_t*)sdata, &data)) + { + LM_ERR("cannot get the destination parameter\n"); + return -1; + } + if(corex_send_data(&uri, &data) < 0) + return -1; + return 1; +} int corex_alias_subdomains_param(modparam_t type, void *val) { [View Less]

1 0

git:master: corex: docs for send_data() function
by Daniel-Constantin Mierla 21 Jul '14

21 Jul '14

Module: sip-router Branch: master Commit: dab956c0f9faca63dde6b2ce25386ca42ddc33e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dab956c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 21 12:41:01 2014 +0200 corex: docs for send_data() function --- modules/corex/README | 17 +++++++++++++++++ modules/corex/doc/corex_admin.xml | 23 +++++++++++++++++++++… [View More]++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/modules/corex/README b/modules/corex/README index 9c1aecf..5d63316 100644 --- a/modules/corex/README +++ b/modules/corex/README @@ -32,6 +32,7 @@ Daniel-Constantin Mierla 4.1. append_branch([ uri, [ q ] ]) 4.2. send([ host [ :port ] ]) 4.3. send_tcp([ host [ :port ] ]) + 4.4. send_data(uri, data) 5. RPC Commands @@ -45,6 +46,7 @@ Daniel-Constantin Mierla 1.1. Set alias_subdomains parameter 1.2. append_branch usage 1.3. send usage + 1.4. send_data usage Chapter 1. Admin Guide @@ -65,6 +67,7 @@ Chapter 1. Admin Guide 4.1. append_branch([ uri, [ q ] ]) 4.2. send([ host [ :port ] ]) 4.3. send_tcp([ host [ :port ] ]) + 4.4. send_data(uri, data) 5. RPC Commands @@ -126,6 +129,7 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") 4.1. append_branch([ uri, [ q ] ]) 4.2. send([ host [ :port ] ]) 4.3. send_tcp([ host [ :port ] ]) + 4.4. send_data(uri, data) 4.1. append_branch([ uri, [ q ] ]) @@ -176,6 +180,19 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") This function is identical to send() described above, except that it sends the SIP message using the TCP protocol instead of UDP. +4.4. send_data(uri, data) + + Send the data to address specified by uri. Both parameters can contain + pseudo-variables. The uri parameter has to be a valid SIP URI. The data + parameter can by any arbitrary content. + + This function can be used from ANY_ROUTE. + + Example 1.4. send_data usage +... + send("sip:example.com:5070;transport=sctp", "Message at $Ts"); +... + 5. RPC Commands 5.1. corex.list_sockets diff --git a/modules/corex/doc/corex_admin.xml b/modules/corex/doc/corex_admin.xml index e7a75a5..964fdf1 100644 --- a/modules/corex/doc/corex_admin.xml +++ b/modules/corex/doc/corex_admin.xml @@ -178,6 +178,29 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") TCP protocol instead of UDP. </para> </section> + + <section> + <title> + <function moreinfo="none">send_data(uri, data)</function> + </title> + <para> + Send the data to address specified by uri. Both parameters can + contain pseudo-variables. The uri parameter has to be a valid + SIP URI. The data parameter can by any arbitrary content. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>send_data</function> usage</title> + <programlisting format="linespecific"> +... + send("sip:example.com:5070;transport=sctp", "Message at $Ts"); +... +</programlisting> + </example> + </section> + </section> <section> [View Less]

1 0

git:master: msilo: check if the register has contacts with positive expires value
by Daniel-Constantin Mierla 21 Jul '14

21 Jul '14

Module: sip-router Branch: master Commit: 6559c4383858d472637807c6ec4dd1e0616507fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6559c43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 21 10:10:45 2014 +0200 msilo: check if the register has contacts with positive expires value - otherwise is un-registration and no new contact to dump messages - reported by Anthony … [View More]

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
15
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2014