Skip to content

Commit

Permalink
domain: exported functions to kemi framework
Browse files Browse the repository at this point in the history
  • Loading branch information
@miconda
miconda committed Apr 26, 2017
1 parent 5a87def commit c3c20ba
Show file tree
Hide file tree
Showing 3 changed files with 133 additions and 35 deletions.
111 changes: 80 additions & 31 deletions src/modules/domain/domain.c
View file
Expand Up @@ -100,7 +100,7 @@ int is_domain_local(str *_host)
/*
* Check if host in From uri is local
*/
int is_from_local(struct sip_msg *_msg, char *_s1, char *_s2)
int ki_is_from_local(struct sip_msg *_msg)
{
struct sip_uri *puri;
str did;
Expand All @@ -114,10 +114,18 @@ int is_from_local(struct sip_msg *_msg, char *_s1, char *_s2)
return hash_table_lookup(&(puri->host), &did, &attrs);
}

/*
* Wrapper: check if host in From uri is local
*/
int is_from_local(struct sip_msg *_msg, char *_s1, char *_s2)
{
return ki_is_from_local(_msg);
}

/*
* Check if host in Request URI is local
*/
int is_uri_host_local(struct sip_msg *_msg, char *_s1, char *_s2)
int ki_is_uri_host_local(struct sip_msg *_msg)
{
str branch;
qvalue_t q;
Expand Down Expand Up @@ -149,49 +157,59 @@ int is_uri_host_local(struct sip_msg *_msg, char *_s1, char *_s2)
}
}

/*
* Check if host in Request URI is local
*/
int is_uri_host_local(struct sip_msg *_msg, char *_s1, char *_s2)
{
return ki_is_uri_host_local(_msg);
}

/*
* Check if domain given as value of pseudo variable parameter is local.
*/
int w_is_domain_local(struct sip_msg *_msg, char *_sp, char *_s2)
int ki_is_domain_local(struct sip_msg *_msg, str *sdomain)
{
struct attr_list *attrs;
str did;

if(sdomain==NULL || sdomain->s==NULL) {
LM_ERR("invalid parameters\n");
return -1;
}
return hash_table_lookup(sdomain, &did, &attrs);
}

/*
* Check if domain given as value of pseudo variable parameter is local.
*/
int w_is_domain_local(struct sip_msg *_msg, char *_sp, char *_s2)
{
str sdomain;

if(fixup_get_svalue(_msg, (gparam_t *)_sp, &sdomain) < 0) {
LM_ERR("cannot get domain paramter\n");
return -1;
}

return hash_table_lookup(&sdomain, &did, &attrs);
return ki_is_domain_local(_msg, &sdomain);
}

/*
* Check if domain is local and, if it is, add attributes as AVPs
*/
int w_lookup_domain(struct sip_msg *_msg, char *_sp, char *_prefix)
int ki_lookup_domain_prefix(struct sip_msg *_msg, str *_sdomain, str *_sprefix)
{

int_str name, val;
struct attr_list *attrs;
str *prefix, did;
unsigned short flags;
str sdomain;
str sprefix;

if(fixup_get_svalue(_msg, (gparam_t *)_sp, &sdomain) < 0) {
LM_ERR("cannot get domain paramter\n");
return -1;
}
if(_prefix) {
if(fixup_get_svalue(_msg, (gparam_t *)_prefix, &sprefix) < 0) {
LM_ERR("cannot get prefix paramter\n");
return -1;
}
}
if(_sdomain==NULL || _sdomain->s==NULL) {
LM_ERR("invalid domain paramter\n");
return -1; }

if(hash_table_lookup(&sdomain, &did, &attrs) != 1) {
if(hash_table_lookup(_sdomain, &did, &attrs) != 1) {
return -1;
}

Expand All @@ -200,56 +218,87 @@ int w_lookup_domain(struct sip_msg *_msg, char *_sp, char *_prefix)
flags = AVP_NAME_STR | AVP_VAL_STR;
else
flags = AVP_NAME_STR;
if(_prefix) {
name.s.len = sprefix.len + attrs->name.len;
if(_sprefix && _sprefix->s) {
name.s.len = _sprefix->len + attrs->name.len;
name.s.s = pkg_malloc(name.s.len);
if(name.s.s == NULL) {
ERR("no pkg memory for avp name\n");
return -1;
}
memcpy(name.s.s, sprefix.s, sprefix.len);
memcpy(name.s.s + sprefix.len, attrs->name.s, attrs->name.len);
memcpy(name.s.s, _sprefix->s, _sprefix->len);
memcpy(name.s.s + _sprefix->len, attrs->name.s, attrs->name.len);
} else {
name.s = attrs->name;
}
if(add_avp(flags, name, attrs->val) < 0) {
LM_ERR("unable to add a new AVP '%.*s'\n", name.s.len, name.s.s);
if(_prefix)
if(_sprefix && _sprefix->s)
pkg_free(name.s.s);
return -1;
}
LM_DBG("added AVP '%.*s'\n", name.s.len, name.s.s);
if(prefix)
if(_sprefix && _sprefix->s)
pkg_free(name.s.s);
attrs = attrs->next;
}
flags = AVP_NAME_STR | AVP_VAL_STR;
if(_prefix) {
name.s.len = sprefix.len + 3;
if(_sprefix && _sprefix->s) {
name.s.len = _sprefix->len + 3;
name.s.s = pkg_malloc(name.s.len);
if(name.s.s == NULL) {
ERR("no pkg memory for avp name\n");
return -1;
}
memcpy(name.s.s, sprefix.s, sprefix.len);
memcpy(name.s.s + sprefix.len, "did", 3);
memcpy(name.s.s, _sprefix->s, _sprefix->len);
memcpy(name.s.s + _sprefix->len, "did", 3);
} else {
name.s.s = "did";
name.s.len = 3;
}
val.s = did;
if(add_avp(flags, name, val) < 0) {
LM_ERR("unable to add a new AVP '%.*s'\n", name.s.len, name.s.s);
if(_prefix)
if(_sprefix)
pkg_free(name.s.s);
return -1;
}
LM_DBG("added AVP '%.*s'\n", name.s.len, name.s.s);
if(_prefix)
if(_sprefix && _sprefix->s)
pkg_free(name.s.s);
return 1;
}

/*
* Check if domain is local and, if it is, add attributes as AVPs
*/
int ki_lookup_domain(struct sip_msg *_msg, str *_sdomain)
{
return ki_lookup_domain_prefix(_msg, _sdomain, NULL);
}

/*
* Check if domain is local and, if it is, add attributes as AVPs
*/
int w_lookup_domain(struct sip_msg *_msg, char *_sp, char *_prefix)
{

str sdomain;
str sprefix;

if(fixup_get_svalue(_msg, (gparam_t *)_sp, &sdomain) < 0) {
LM_ERR("cannot get domain paramter\n");
return -1;
}
if(_prefix) {
if(fixup_get_svalue(_msg, (gparam_t *)_prefix, &sprefix) < 0) {
LM_ERR("cannot get prefix paramter\n");
return -1;
}
}

return ki_lookup_domain_prefix(_msg, &sdomain, (_prefix)?&sprefix:NULL);
}

/*
* Check if domain is local and, if it is, add attributes as AVPs
*/
Expand Down
7 changes: 5 additions & 2 deletions src/modules/domain/domain.h
View file
Expand Up @@ -32,13 +32,13 @@
* Check if host in From uri is local
*/
int is_from_local(struct sip_msg *_msg, char *_s1, char *_s2);

int ki_is_from_local(struct sip_msg *_msg);

/*
* Check if host in Request URI is local
*/
int is_uri_host_local(struct sip_msg *_msg, char *_s1, char *_s2);

int ki_is_uri_host_local(struct sip_msg *_msg);

/*
* Check if domain given by parameter is local
Expand All @@ -50,9 +50,12 @@ int is_uri_host_local(struct sip_msg *_msg, char *_s1, char *_s2);
* pointed by the avp name/alias
*/
int w_is_domain_local(struct sip_msg *_msg, char *_s1, char *_s2);
int ki_is_domain_local(struct sip_msg *_msg, str *_sdomain);

int w_lookup_domain(struct sip_msg *_msg, char *_s1, char *_s2);
int w_lookup_domain_no_prefix(struct sip_msg *_msg, char *_s1, char *_s2);
int ki_lookup_domain(struct sip_msg *_msg, str *_sdomain);
int ki_lookup_domain_prefix(struct sip_msg *_msg, str *_sdomain, str *_prefix);

int is_domain_local(str *domain);

Expand Down
50 changes: 48 additions & 2 deletions src/modules/domain/domain_mod.c
View file
Expand Up @@ -32,10 +32,11 @@
#include "../../core/mod_fix.h"
#include "../../core/rpc.h"
#include "../../core/rpc_lookup.h"
#include "../../core/locking.h"
#include "../../core/kemi.h"
#include "domain.h"
#include "hash.h"
#include "api.h"
#include "../../core/locking.h"

/*
* Module management function prototypes
Expand Down Expand Up @@ -325,7 +326,8 @@ static void domain_rpc_dump(rpc_t *rpc, void *ctx)

rpc_export_t domain_rpc_list[] = {
{"domain.reload", domain_rpc_reload, domain_rpc_reload_doc, 0},
{"domain.dump", domain_rpc_dump, domain_rpc_dump_doc, 0}, {0, 0, 0, 0}};
{"domain.dump", domain_rpc_dump, domain_rpc_dump_doc, 0}, {0, 0, 0, 0}
};

static int domain_init_rpc(void)
{
Expand All @@ -334,4 +336,48 @@ static int domain_init_rpc(void)
return -1;
}
return 0;
}

/**
*
*/
/* clang-format off */
static sr_kemi_t sr_kemi_domain_exports[] = {
{ str_init("domain"), str_init("is_from_local"),
SR_KEMIP_INT, ki_is_from_local,
{ SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,
SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
},
{ str_init("domain"), str_init("is_uri_host_local"),
SR_KEMIP_INT, ki_is_uri_host_local,
{ SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,
SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
},
{ str_init("domain"), str_init("is_domain_local"),
SR_KEMIP_INT, ki_is_domain_local,
{ SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,
SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
},
{ str_init("domain"), str_init("lookup_domain"),
SR_KEMIP_INT, ki_lookup_domain,
{ SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,
SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
},
{ str_init("domain"), str_init("lookup_domain_prefix"),
SR_KEMIP_INT, ki_lookup_domain_prefix,
{ SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,
SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
},

{ {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } }
};
/* clang-format on */

/**
*
*/
int mod_register(char *path, int *dlflags, void *p1, void *p2)
{
sr_kemi_modules_add(sr_kemi_domain_exports);
return 0;
}

0 comments on commit c3c20ba

Please sign in to comment.