[sr-dev] git:master: core & avpops: fix overlapping avp flag

Module: sip-router Branch: master Commit: 67ae0865fbdc175b0e72eadb6a098325e9168a70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67ae086… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Mon Aug 31 13:01:46 2009 +0300 core & avpops: fix overlapping avp flag - k avpops uses a flag to mark whether a loaded avp from db has changed, in order to decide if worth to update db - the value was overlapping with flags defined in sr core - reported by Juha Heinanen --- modules/avpops/avpops_impl.h | 2 +- usr_avp.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/avpops/avpops_impl.h b/modules/avpops/avpops_impl.h index 37afb6d..6e38007 100644 --- a/modules/avpops/avpops_impl.h +++ b/modules/avpops/avpops_impl.h @@ -41,7 +41,7 @@ /* flags used inside avps */ /* IMPORTANT: flagss 0-4 are reserved by core; 8-15 by script */ -#define AVP_IS_IN_DB (1<<7) +#define AVP_IS_IN_DB (1<<12) /* DB flags */ #define AVPOPS_DB_NAME_INT (1<<1) diff --git a/usr_avp.h b/usr_avp.h index 324bad4..b40ccdb 100644 --- a/usr_avp.h +++ b/usr_avp.h @@ -153,7 +153,11 @@ typedef struct avp_spec { #define AVP_INDEX_BACKWARD (1<<11) #define AVP_INDEX_ALL (AVP_INDEX_FORWARD | AVP_INDEX_BACKWARD) -#define AVP_CUSTOM_FLAGS 12 +/* AVP DB flag used by avpops module - defined in avpops + * - kept here for reference */ +// #define AVP_IS_IN_DB (1<<12) + +#define AVP_CUSTOM_FLAGS 13 #define GALIAS_CHAR_MARKER '$'