usr_avp.c
717bc5da
 /*
  * $Id$
  *
53c7e0f1
  * Copyright (C) 2001-2003 FhG Fokus
717bc5da
  *
  * This file is part of ser, a free SIP server.
  *
  * ser is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
  *
  * For a license to use the ser software under conditions
  * other than those described here, or to purchase support for this
  * software, please contact iptel.org by e-mail at the following addresses:
  *    info@iptel.org
  *
  * ser is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License 
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * History:
  * ---------
2be21e31
  *  2004-07-21  created (bogdan)
7dfb54d7
  *  2004-10-09  interface more flexible - more function available (bogdan)
cf152fbd
  *  2004-11-07  AVP string values are kept 0 terminated (bogdan)
7dfb54d7
  *  2004-11-14  global aliases support added
717bc5da
  */
 
 
2be21e31
 #include <assert.h>
7dfb54d7
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
2be21e31
 
717bc5da
 #include "sr_module.h"
 #include "dprint.h"
590612d3
 #include "str.h"
 #include "ut.h"
2be21e31
 #include "mem/shm_mem.h"
7dfb54d7
 #include "mem/mem.h"
717bc5da
 #include "usr_avp.h"
 
3da52f21
 enum idx {
 	IDX_FROM_USER = 0,
 	IDX_TO_USER,
 	IDX_FROM_DOMAIN,
 	IDX_TO_DOMAIN,
 	IDX_MAX
d34839a3
 };
 
3da52f21
 
7dfb54d7
 struct avp_galias {
 	str alias;
 	struct avp_spec  avp;
 	struct avp_galias *next;
 };
717bc5da
 
7dfb54d7
 static struct avp_galias *galiases = 0;
717bc5da
 
3da52f21
 static avp_list_t def_list[IDX_MAX];    /* Default AVP lists */
 static avp_list_t* crt_list[IDX_MAX];  /* Pointer to current AVP lists */
 
 /* Global AVP related variables go to shm mem */
 static avp_list_t* def_glist;
 static avp_list_t** crt_glist;
 
 
 /* Initialize AVP lists in private memory and allocate memory
  * for shared lists
  */
 int init_avps(void)
 {
 	int i;
 	     /* Empty default lists */
 	memset(def_list, 0, sizeof(avp_list_t) * IDX_MAX);
 	
 	     /* Point current pointers to default lists */
 	for(i = 0; i < IDX_MAX; i++) {
 		crt_list[i] = &def_list[i];
 	}
 
 	def_glist = (avp_list_t*)shm_malloc(sizeof(avp_list_t));
 	crt_glist = (avp_list_t**)shm_malloc(sizeof(avp_list_t*));
 	if (!def_glist || !crt_glist) {
 		LOG(L_ERR, "ERROR: No memory to allocate default global AVP list\n");
 		return -1;
 	}
 	*def_glist = 0;
 	*crt_glist = def_glist;
 	return 0;
 }
 
35f927fb
 
3da52f21
 /*
  * Select active AVP list based on the value of flags
  */
 static avp_list_t* select_list(unsigned short flags)
 {
 	if (flags & AVP_CLASS_USER) {
 		if (flags & AVP_TRACK_TO) {
 			return crt_list[IDX_TO_USER];
 		} else {
 			return crt_list[IDX_FROM_USER];
 		}
 	} else if (flags & AVP_CLASS_DOMAIN) {
 		if (flags & AVP_TRACK_TO) {
 			return crt_list[IDX_TO_DOMAIN];
 		} else {
 			return crt_list[IDX_FROM_DOMAIN];
 		}
 	}
35f927fb
 
3da52f21
 	return *crt_glist;
 }
2be21e31
 
 inline static unsigned short compute_ID( str *name )
717bc5da
 {
2be21e31
 	char *p;
 	unsigned short id;
 
 	id=0;
 	for( p=name->s+name->len-1 ; p>=name->s ; p-- )
 		id ^= *p;
 	return id;
 }
 
 
3da52f21
 int add_avp_list(avp_list_t* list, unsigned short flags, int_str name, int_str val)
2be21e31
 {
35f927fb
 	avp_t *avp;
2be21e31
 	str *s;
 	struct str_int_data *sid;
 	struct str_str_data *ssd;
 	int len;
 
35f927fb
 	assert(list != 0);
2be21e31
 
3da52f21
 	if (name.s.s == 0 && name.s.len == 0) {
6f432b99
 		LOG(L_ERR,"ERROR:avp:add_avp: 0 ID or NULL NAME AVP!");
 		goto error;
 	}
 
2be21e31
 	/* compute the required mem size */
 	len = sizeof(struct usr_avp);
 	if (flags&AVP_NAME_STR) {
3da52f21
 		if ( name.s.s==0 || name.s.len==0) {
6f432b99
 			LOG(L_ERR,"ERROR:avp:add_avp: EMPTY NAME AVP!");
 			goto error;
 		}
9d7f3515
 		if (flags&AVP_VAL_STR) {
 			len += sizeof(struct str_str_data)-sizeof(void*) 
3da52f21
 				+ name.s.len + 1 /* Terminating zero for regex search */
 				+ val.s.len + 1; /* Value is zero terminated */
9d7f3515
 		} else {
 			len += sizeof(struct str_int_data)-sizeof(void*) 
3da52f21
 				+ name.s.len + 1; /* Terminating zero for regex search */
9d7f3515
 		}
 	} else if (flags&AVP_VAL_STR) {
3da52f21
 		len += sizeof(str)-sizeof(void*) + val.s.len + 1;
9d7f3515
 	}
2be21e31
 
 	avp = (struct usr_avp*)shm_malloc( len );
 	if (avp==0) {
 		LOG(L_ERR,"ERROR:avp:add_avp: no more shm mem\n");
 		goto error;
 	}
 
598694f6
 	avp->flags = flags;
3da52f21
 	avp->id = (flags&AVP_NAME_STR)? compute_ID(&name.s) : name.n ;
2be21e31
 
35f927fb
 	avp->next = *list;
 	*list = avp;
2be21e31
 
 	switch ( flags&(AVP_NAME_STR|AVP_VAL_STR) )
 	{
 		case 0:
 			/* avp type ID, int value */
 			avp->data = (void*)(long)val.n;
 			break;
 		case AVP_NAME_STR:
 			/* avp type str, int value */
 			sid = (struct str_int_data*)&(avp->data);
 			sid->val = val.n;
3da52f21
 			sid->name.len =name.s.len;
2be21e31
 			sid->name.s = (char*)sid + sizeof(struct str_int_data);
3da52f21
 			memcpy( sid->name.s , name.s.s, name.s.len);
 			sid->name.s[name.s.len] = '\0'; /* Zero terminator */
2be21e31
 			break;
 		case AVP_VAL_STR:
 			/* avp type ID, str value */
 			s = (str*)&(avp->data);
3da52f21
 			s->len = val.s.len;
2be21e31
 			s->s = (char*)s + sizeof(str);
3da52f21
 			memcpy( s->s, val.s.s , s->len);
cf152fbd
 			s->s[s->len] = 0;
2be21e31
 			break;
 		case AVP_NAME_STR|AVP_VAL_STR:
 			/* avp type str, str value */
 			ssd = (struct str_str_data*)&(avp->data);
3da52f21
 			ssd->name.len = name.s.len;
2be21e31
 			ssd->name.s = (char*)ssd + sizeof(struct str_str_data);
3da52f21
 			memcpy( ssd->name.s , name.s.s, name.s.len);
 			ssd->name.s[name.s.len]='\0'; /* Zero terminator */
 			ssd->val.len = val.s.len;
9d7f3515
 			ssd->val.s = ssd->name.s + ssd->name.len + 1;
3da52f21
 			memcpy( ssd->val.s , val.s.s, val.s.len);
cf152fbd
 			ssd->val.s[ssd->val.len] = 0;
2be21e31
 			break;
717bc5da
 	}
 
 	return 0;
2be21e31
 error:
 	return -1;
717bc5da
 }
 
 
598694f6
 int add_avp(unsigned short flags, int_str name, int_str val)
 {
 	unsigned short avp_class;
3da52f21
 	avp_list_t* list;
 
 	     /* Add avp to user class if no class has been
 	      * specified by the caller
 	      */
 	if ((flags & AVP_CLASS_ALL) == 0) flags |= AVP_CLASS_USER;
 	if ((flags & AVP_TRACK_ALL) == 0) flags |= AVP_TRACK_FROM;
 	list = select_list(flags);
 
 	if (flags & AVP_CLASS_USER) avp_class = AVP_CLASS_USER;
 	else if (flags & AVP_CLASS_DOMAIN) avp_class = AVP_CLASS_DOMAIN;
 	else avp_class = AVP_CLASS_GLOBAL;
 
 	     /* Make that only the selected class is set
 	      * if the caller set more classes in flags
 	      */
 	return add_avp_list(list, flags & (~(AVP_CLASS_ALL) | avp_class), name, val);
598694f6
 }
 
 
a564ae7a
 /* get value functions */
35f927fb
 inline str* get_avp_name(avp_t *avp)
590612d3
 {
2be21e31
 	switch ( avp->flags&(AVP_NAME_STR|AVP_VAL_STR) )
 	{
 		case 0:
 			/* avp type ID, int value */
 		case AVP_VAL_STR:
 			/* avp type ID, str value */
 			return 0;
 		case AVP_NAME_STR:
 			/* avp type str, int value */
 			return &((struct str_int_data*)&avp->data)->name;
 		case AVP_NAME_STR|AVP_VAL_STR:
 			/* avp type str, str value */
 			return &((struct str_str_data*)&avp->data)->name;
 	}
 
 	LOG(L_ERR,"BUG:avp:get_avp_name: unknown avp type (name&val) %d\n",
3da52f21
 	    avp->flags&(AVP_NAME_STR|AVP_VAL_STR));
2be21e31
 	return 0;
590612d3
 }
 
717bc5da
 
35f927fb
 inline void get_avp_val(avp_t *avp, int_str *val)
717bc5da
 {
2be21e31
 	if (avp==0 || val==0)
 		return;
717bc5da
 
2be21e31
 	switch ( avp->flags&(AVP_NAME_STR|AVP_VAL_STR) ) {
 		case 0:
 			/* avp type ID, int value */
 			val->n = (long)(avp->data);
 			break;
 		case AVP_NAME_STR:
 			/* avp type str, int value */
 			val->n = ((struct str_int_data*)(&avp->data))->val;
 			break;
 		case AVP_VAL_STR:
 			/* avp type ID, str value */
3da52f21
 			val->s = *(str*)(avp->data);
2be21e31
 			break;
 		case AVP_NAME_STR|AVP_VAL_STR:
 			/* avp type str, str value */
3da52f21
 			val->s = (((struct str_str_data*)(&avp->data))->val);
2be21e31
 			break;
717bc5da
 	}
 }
 
 
35f927fb
 /* Return the current list of user attributes */
3da52f21
 avp_list_t get_avp_list(unsigned short flags)
a564ae7a
 {
3da52f21
 	return *select_list(flags);
35f927fb
 }
717bc5da
 
 
35f927fb
 /*
  * Compare given id with id in avp, return true if they match
  */
 static inline int match_by_id(avp_t* avp, unsigned short id)
2be21e31
 {
35f927fb
 	if (avp->id == id && (avp->flags&AVP_NAME_STR)==0) {
 		return 1;
2be21e31
 	}
 	return 0;
717bc5da
 }
 
 
35f927fb
 /*
  * Compare given name with name in avp, return true if they are same
  */
 static inline int match_by_name(avp_t* avp, unsigned short id, str* name)
590612d3
 {
35f927fb
 	str* avp_name;
 	if (id==avp->id && avp->flags&AVP_NAME_STR &&
 	    (avp_name=get_avp_name(avp))!=0 && avp_name->len==name->len
 	    && !strncasecmp( avp_name->s, name->s, name->len) ) {
 		return 1;
 	}
2be21e31
 	return 0;
590612d3
 }
 
 
35f927fb
 /*
  * Compare name with name in AVP using regular expressions, return
  * true if they match
  */
 static inline int match_by_re(avp_t* avp, regex_t* re)
9d7f3515
 {
 	regmatch_t pmatch;
35f927fb
 	str * avp_name;
 	     /* AVP identifiable by name ? */
 	if (!(avp->flags&AVP_NAME_STR)) return 0;
 	if ((avp_name=get_avp_name(avp))==0) /* valid AVP name ? */
9d7f3515
 		return 0;
35f927fb
 	if (!avp_name->s) /* AVP name validation */
 		return 0;
 	if (regexec(re, avp_name->s, 1, &pmatch,0)==0) { /* re match ? */
 		return 1;
9d7f3515
 	}
 	return 0;
 }
 
2be21e31
 
35f927fb
 avp_t *search_first_avp(unsigned short flags, int_str name, int_str *val, struct search_state* s)
590612d3
 {
3da52f21
 	avp_t* ret;
35f927fb
 	static struct search_state st;
3da52f21
 	avp_list_t* list;
590612d3
 
3da52f21
 	if (name.s.s==0 && name.s.len == 0) {
6f432b99
 		LOG(L_ERR,"ERROR:avp:search_first_avp: 0 ID or NULL NAME AVP!");
 		return 0;
 	}
 
35f927fb
 	if (!s) s = &st;
 
3da52f21
 	if ((flags & AVP_CLASS_ALL) == 0) {
35f927fb
 		     /* The caller did not specify any class to search in, so enable
 		      * all of them by default
 		      */
3da52f21
 		flags |= AVP_CLASS_ALL;
35f927fb
 	}
3da52f21
 
 	list = select_list(flags);
 
35f927fb
 	s->flags = flags;
3da52f21
 	s->avp = *list;
35f927fb
 	s->name = name;
 
8c5c7993
 	if (flags & AVP_NAME_STR) {
3da52f21
 		s->id = compute_ID(&name.s);
9d7f3515
 	}
35f927fb
 
3da52f21
         ret = search_next_avp(s, val);
 
 	     /* Make sure that search next avp stays in the same class as the first
 	      * avp found
 	      */
 	if (s && ret) s->flags = (flags & ~AVP_CLASS_ALL) | (ret->flags & AVP_CLASS_ALL);
 	return ret;
590612d3
 }
 
 
 
35f927fb
 avp_t *search_next_avp(struct search_state* s, int_str *val )
590612d3
 {
35f927fb
 	int matched;
3da52f21
 	avp_t* avp;
9d7f3515
 
35f927fb
 	if (s == 0) {
 		LOG(L_ERR, "search_next:avp: Invalid parameter value\n");
2be21e31
 		return 0;
9d7f3515
 	}
590612d3
 
35f927fb
 	while(1) {
 		for( ; s->avp; s->avp = s->avp->next) {
 			if (s->flags & AVP_NAME_RE) {
 				matched = match_by_re(s->avp, s->name.re);
 			} else if (s->flags & AVP_NAME_STR) {
3da52f21
 				matched = match_by_name(s->avp, s->id, &s->name.s);
35f927fb
 			} else {
 				matched = match_by_id(s->avp, s->name.n);
 			}
 			if (matched) {
 				avp = s->avp;
 				s->avp = s->avp->next;
 				if (val) get_avp_val(avp, val);
 				return avp;
 			}
 		}
590612d3
 
3da52f21
 		if (s->flags & AVP_CLASS_USER) {
 			s->flags &= ~AVP_CLASS_USER;
 			s->avp = *select_list(s->flags);
 		} else if (s->flags & AVP_CLASS_DOMAIN) {
 			s->flags &= ~AVP_CLASS_DOMAIN;
 			s->avp = *select_list(s->flags);
35f927fb
 		} else {
3da52f21
 			s->flags &= ~AVP_CLASS_GLOBAL;
35f927fb
 			return 0;
 		}
9d7f3515
 	}
590612d3
 
35f927fb
 	return 0;
2be21e31
 }
590612d3
 
 
3da52f21
 /* FIXME */
2be21e31
 /********* free functions ********/
32a19992
 
3da52f21
 void destroy_avp(avp_t *avp_del)
2be21e31
 {
3da52f21
 	int i;
35f927fb
 	avp_t *avp, *avp_prev;
2be21e31
 
3da52f21
 	for (i = 0; i < IDX_MAX; i++) {
 		for( avp_prev=0,avp=*crt_list[i] ; avp ; 
 		     avp_prev=avp,avp=avp->next ) {
 			if (avp==avp_del) {
 				if (avp_prev) {
 					avp_prev->next=avp->next;
 				} else {
 					*crt_list[i] = avp->next;
 				}
 				shm_free(avp);
 				return;
 			}
 		}
 	}
 
 	for( avp_prev=0,avp=**crt_glist ; avp ; 
 	     avp_prev=avp,avp=avp->next ) {
2be21e31
 		if (avp==avp_del) {
3da52f21
 			if (avp_prev) {
2be21e31
 				avp_prev->next=avp->next;
3da52f21
 			} else {
 				**crt_glist = avp->next;
 			}
2be21e31
 			shm_free(avp);
 			return;
590612d3
 		}
 	}
 }
 
 
3da52f21
 void destroy_avp_list_unsafe(avp_list_t* list)
590612d3
 {
35f927fb
 	avp_t *avp, *foo;
590612d3
 
2be21e31
 	avp = *list;
 	while( avp ) {
 		foo = avp;
 		avp = avp->next;
 		shm_free_unsafe( foo );
 	}
 	*list = 0;
590612d3
 }
 
 
3da52f21
 inline void destroy_avp_list(avp_list_t* list)
2be21e31
 {
35f927fb
 	avp_t *avp, *foo;
2be21e31
 
7dfb54d7
 	DBG("DEBUG:destroy_avp_list: destroying list %p\n", *list);
2be21e31
 	avp = *list;
 	while( avp ) {
 		foo = avp;
 		avp = avp->next;
 		shm_free( foo );
 	}
 	*list = 0;
 }
590612d3
 
2be21e31
 
3da52f21
 void reset_avps(void)
590612d3
 {
3da52f21
 	int i;
 	for(i = 0; i < IDX_MAX; i++) {
 		crt_list[i] = &def_list[i];
 		destroy_avp_list(crt_list[i]);
2be21e31
 	}
717bc5da
 }
 
7dfb54d7
 
7a2138c3
 avp_list_t* set_avp_list( unsigned short flags, avp_list_t* list )
35f927fb
 {
3da52f21
 	avp_list_t* prev;
35f927fb
 
3da52f21
 	if (flags & AVP_CLASS_USER) {
 		if (flags & AVP_TRACK_FROM) {
 			prev = crt_list[IDX_FROM_USER];
 			crt_list[IDX_FROM_USER] = list;
 		} else {
 			prev = crt_list[IDX_TO_USER];
 			crt_list[IDX_TO_USER] = list;
 		}
 	} else if (flags & AVP_CLASS_DOMAIN) {
 		if (flags & AVP_TRACK_FROM) {
 			prev = crt_list[IDX_FROM_DOMAIN];
 			crt_list[IDX_FROM_DOMAIN] = list;
 		} else {
 			prev = crt_list[IDX_TO_DOMAIN];
 			crt_list[IDX_TO_DOMAIN] = list;
 		}
 	} else {
 		prev = *crt_glist;
 	        *crt_glist = list;
 	}
35f927fb
 
7a2138c3
 	return prev;
35f927fb
 }
7dfb54d7
 
 
 /********* global aliases functions ********/
 
 static inline int check_avp_galias(str *alias, int type, int_str avp_name)
 {
 	struct avp_galias *ga;
 
 	type &= AVP_NAME_STR;
 
 	for( ga=galiases ; ga ; ga=ga->next ) {
 		/* check for duplicated alias names */
 		if ( alias->len==ga->alias.len &&
 		(strncasecmp( alias->s, ga->alias.s, alias->len)==0) )
 			return -1;
 		/*check for duplicated avp names */
 		if (type==ga->avp.type) {
 			if (type&AVP_NAME_STR){
3da52f21
 				if (avp_name.s.len==ga->avp.name.s.len &&
 				    (strncasecmp(avp_name.s.s, ga->avp.name.s.s,
 						 avp_name.s.len)==0) )
7dfb54d7
 					return -1;
 			} else {
 				if (avp_name.n==ga->avp.name.n)
 					return -1;
 			}
 		}
 	}
 	return 0;
 }
 
 
 int add_avp_galias(str *alias, int type, int_str avp_name)
 {
 	struct avp_galias *ga;
 
3da52f21
 	if ((type&AVP_NAME_STR && (!avp_name.s.s ||
 				   !avp_name.s.len)) ||!alias || !alias->s ||
7dfb54d7
 		!alias->len ){
 		LOG(L_ERR, "ERROR:add_avp_galias: null params received\n");
 		goto error;
 	}
 
 	if (check_avp_galias(alias,type,avp_name)!=0) {
 		LOG(L_ERR, "ERROR:add_avp_galias: duplicate alias/avp entry\n");
 		goto error;
 	}
 
 	ga = (struct avp_galias*)pkg_malloc( sizeof(struct avp_galias) );
 	if (ga==0) {
 		LOG(L_ERR, "ERROR:add_avp_galias: no more pkg memory\n");
 		goto error;
 	}
 
 	ga->alias.s = (char*)pkg_malloc( alias->len+1 );
 	if (ga->alias.s==0) {
 		LOG(L_ERR, "ERROR:add_avp_galias: no more pkg memory\n");
 		goto error1;
 	}
 	memcpy( ga->alias.s, alias->s, alias->len);
 	ga->alias.len = alias->len;
 
 	ga->avp.type = type&AVP_NAME_STR;
 
 	if (type&AVP_NAME_STR) {
3da52f21
 		ga->avp.name.s.s = (char*)pkg_malloc( avp_name.s.len+1 );
 		if (ga->avp.name.s.s==0) {
7dfb54d7
 			LOG(L_ERR, "ERROR:add_avp_galias: no more pkg memory\n");
 			goto error2;
 		}
3da52f21
 		ga->avp.name.s.len = avp_name.s.len;
 		memcpy( ga->avp.name.s.s, avp_name.s.s, avp_name.s.len);
 		ga->avp.name.s.s[avp_name.s.len] = 0;
7dfb54d7
 		DBG("DEBUG:add_avp_galias: registering <%s> for avp name <%s>\n",
3da52f21
 			ga->alias.s, ga->avp.name.s.s);
7dfb54d7
 	} else {
 		ga->avp.name.n = avp_name.n;
 		DBG("DEBUG:add_avp_galias: registering <%s> for avp id <%d>\n",
 			ga->alias.s, ga->avp.name.n);
 	}
 
 	ga->next = galiases;
 	galiases = ga;
 
 	return 0;
 error2:
 	pkg_free(ga->alias.s);
 error1:
 	pkg_free(ga);
 error:
 	return -1;
 }
 
 
d34839a3
 int lookup_avp_galias(str *alias, int *type, int_str *avp_name)
7dfb54d7
 {
 	struct avp_galias *ga;
 
 	for( ga=galiases ; ga ; ga=ga->next )
d34839a3
 		if (alias->len==ga->alias.len &&
 		(strncasecmp( alias->s, ga->alias.s, alias->len)==0) ) {
 			*type = ga->avp.type;
 			*avp_name = ga->avp.name;
 			return 0;
 		}
7dfb54d7
 
d34839a3
 	return -1;
7dfb54d7
 }
 
 
 /* parsing functions */
 
 int parse_avp_name( str *name, int *type, int_str *avp_name)
 {
 	unsigned int id;
 	char c;
 
d34839a3
 	if (name==0 || name->s==0 || name->len==0)
 		goto error;
 
7dfb54d7
 	if (name->len>=2 && name->s[1]==':') {
 		c = name->s[0];
 		name->s += 2;
 		name->len -= 2;
 		if (name->len==0)
 			goto error;
 		switch (c) {
 			case 's': case 'S':
 				*type = AVP_NAME_STR;
3da52f21
 				avp_name->s = *name;
7dfb54d7
 				break;
 			case 'i': case 'I':
 				*type = 0;
 				if (str2int( name, &id)!=0) {
 					LOG(L_ERR, "ERROR:parse_avp_name: invalid ID "
 						"<%.*s> - not a number\n", name->len, name->s);
 					goto error;
 				}
 				avp_name->n = (int)id;
 				break;
 			default:
 				LOG(L_ERR, "ERROR:parse_avp_name: unsupported type "
 					"[%c]\n", c);
 				goto error;
 		}
 	} else {
 		/*default is string name*/
 		*type = AVP_NAME_STR;
3da52f21
 		avp_name->s = *name;
7dfb54d7
 	}
 
 	return 0;
 error:
 	return -1;
 }
 
 
d34839a3
 int parse_avp_spec( str *name, int *type, int_str *avp_name)
 {
 	str alias;
 
 	if (name==0 || name->s==0 || name->len==0)
 		return -1;
 
 	if (name->s[0]==GALIAS_CHAR_MARKER) {
 		/* it's an avp alias */
 		if (name->len==1) {
 			LOG(L_ERR,"ERROR:parse_avp_spec: empty alias\n");
 			return -1;
 		}
 		alias.s = name->s+1;
 		alias.len = name->len-1;
 		return lookup_avp_galias( &alias, type, avp_name);
 	} else {
 		return parse_avp_name( name, type, avp_name);
 	}
 }
 
 
7dfb54d7
 int add_avp_galias_str(char *alias_definition)
 {
 	int_str avp_name;
 	char *s;
 	str  name;
 	str  alias;
 	int  type;
 
 	s = alias_definition;
 	while(*s && isspace((int)*s))
 		s++;
 
 	while (*s) {
 		/* parse alias name */
 		alias.s = s;
 		while(*s && *s!=';' && !isspace((int)*s) && *s!='=')
 			s++;
 		if (alias.s==s || *s==0 || *s==';')
 			goto parse_error;
 		alias.len = s-alias.s;
 		while(*s && isspace((int)*s))
 			s++;
 		/* equal sign */
 		if (*s!='=')
 			goto parse_error;
 		s++;
 		while(*s && isspace((int)*s))
 			s++;
 		/* avp name */
 		name.s = s;
 		while(*s && *s!=';' && !isspace((int)*s))
 			s++;
 		if (name.s==s)
 			goto parse_error;
 		name.len = s-name.s;
 		while(*s && isspace((int)*s))
 			s++;
 		/* check end */
 		if (*s!=0 && *s!=';')
 			goto parse_error;
 		if (*s==';') {
 			for( s++ ; *s && isspace((int)*s) ; s++ );
 			if (*s==0)
 				goto parse_error;
 		}
 
 		if (parse_avp_name( &name, &type, &avp_name)!=0) {
 			LOG(L_ERR, "ERROR:add_avp_galias_str: <%.*s> not a valid AVP "
 				"name\n", name.len, name.s);
 			goto error;
 		}
 
 		if (add_avp_galias( &alias, type, avp_name)!=0) {
 			LOG(L_ERR, "ERROR:add_avp_galias_str: add global alias failed\n");
 			goto error;
 		}
 	} /*end while*/
 
 	return 0;
 parse_error:
 	LOG(L_ERR, "ERROR:add_avp_galias_str: parse error in <%s> around "
 		"pos %ld\n", alias_definition, (long)(s-alias_definition));
 error:
 	return -1;
 }
3da52f21
 
 
3d942590
 void delete_avp(unsigned short flags, int_str name)
3da52f21
 {
 	struct search_state st;
 	avp_t* avp;
 
 	avp = search_first_avp(flags, name, 0, &st);
 	while(avp) {
 		destroy_avp(avp);
 		avp = search_next_avp(&st, 0);
 	}
 }